Migrate api's to use async and change their import in server js

.gitignore

@@ -1,3 +1,4 @@
+node_modules*/
 node_modules/
 client/build/
 **/.DS_Store
@@ -9,3 +10,4 @@ client/src/.sass-cache/
 server/package-lock.json
 client/package-lock.json
 package-lock.json
+package-lock_old.json

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "eslint.autoFixOnSave": true,
     "editor.codeActionsOnSave": {
-        "source.fixAll.eslint": true
+        "source.fixAll.eslint": "explicit"
     },
 }

server/src/controllers/examplesController.js

@@ -3,19 +3,18 @@ const exampleRoutes = express.Router();
 const Page = require('../models/page.js');
 const User = require('../models/user.js');
 
-export function getExamples(req, res) {
-  return User.find({ name: 'peblioexamples' }, (userFindError, user) => {
-    if (userFindError) {
-      return res.status(500).send(userFindError);
+export async function getExamples(req, res) {
+  try {
+    const user = await User.findOne({ name: 'peblioexamples' }).exec();
+    if(user && user._id) {
+      const pages = await Page.find({ user: user._id }).exec();
+      return res.status(200).send(pages);
     }
-    return Page.find({ user: user[0]._id }, (pageFindError, page) => {
-      if (pageFindError) {
-        return res.status(500).send(pageFindError);
-      }
-      return res.status(200).send(page);
-    });
-  });
+    return res.status(500).send('Error while retrieving examples');
+  } catch (err) {
+    return res.status(500).send({ error: 'Error while retrieving examples' });
+  }
 }
 
 exampleRoutes.route('/').get(getExamples);
-export default exampleRoutes;
+module.exports = exampleRoutes;

server/src/controllers/tagController.js

@@ -2,19 +2,19 @@ const express = require('express');
 const tagRoutes = express.Router();
 import * as tagService from '../service/tagService.js';
 
-export function saveTag(req, res) {
+function saveTag(req, res) {
   return tagService.saveTag(req, res);
 }
 
-export function getAllTags(req, res) {
+function getAllTags(req, res) {
   return tagService.getAllTags(req, res);
 }
 
-export function getAllTagsStartingWith(req, res) {
+function getAllTagsStartingWith(req, res) {
   return tagService.getAllTagsStartingWith(req, res);
 }
 
 tagRoutes.route('/').post(saveTag);
 tagRoutes.route('/startingWith/:tagPrefix').get(getAllTagsStartingWith);
 tagRoutes.route('/').get(getAllTags);
-export default tagRoutes;
+module.exports = tagRoutes;

server/src/controllers/userController.js

@@ -2,23 +2,23 @@ const express = require('express');
 const userRoutes = express.Router();
 import * as userService from '../service/userService.js';
 
-export function getUserProfile(req, res) {
+function getUserProfile(req, res) {
   return userService.getUserProfile(req, res);
 }
 
-export function getUserDetailsById(req, res) {
+function getUserDetailsById(req, res) {
   return userService.getUserDetailsById(req, res);
 }
 
-export function getUserDetailsForPage(req, res) {
+function getUserDetailsForPage(req, res) {
   return userService.getUserDetailsForPage(req, res);
 };
 
-export function getUserDetailsForParentPage(req, res) {
+function getUserDetailsForParentPage(req, res) {
   return userService.getUserDetailsForParentPage(req, res);
 };
 
-export function makePayment(req, res) {
+function makePayment(req, res) {
   return userService.makePayment(req, res);
 };
 
@@ -27,4 +27,4 @@ userRoutes.route('/:userObjectId').get(getUserDetailsById);
 userRoutes.route('/pageAuthor/:pageId').get(getUserDetailsForPage);
 userRoutes.route('/parentPageAuthor/:pageId').get(getUserDetailsForParentPage);
 userRoutes.route('/payment').post(makePayment);
-export default userRoutes;
+module.exports = userRoutes;

server/src/server.js

@@ -5,16 +5,19 @@ const mongoose = require('mongoose');
 mongoose.Promise = Promise;
 const bodyParser = require('body-parser');
 import express from 'express';
-import userRoutes from './controllers/userController';
-import examplesRoutes from './controllers/examplesController';
-import tagRoutes from './controllers/tagController';
+
 const passport = require('passport');
 const cors = require('cors');
 let app = express();
 const expressWs = require('express-ws')(app);
 app = expressWs.app;
 const session = require('express-session');
 const MongoStore = require('connect-mongo')(session);
+
+
+const userRoutes = require('./controllers/userController');
+const examplesRoutes = require('./controllers/examplesController');
+const tagRoutes = require('./controllers/tagController');
 const currentUserRoutes = require('./controllers/currentUserController');
 const webSocketRoutes = require('./routes/webSocketRoutes.js')(expressWs);
 const pageRoutes = require('./routes/pageRoutes.js');