Merge branch 'develop' into SS-1.4-Medhat

.prettierrc

@@ -1,4 +1,4 @@
 {
-    "singleQuote": true,
-    "tabWidth": 4
+  "singleQuote": true,
+  "tabWidth": 4
 }

src/app.js

@@ -34,9 +34,9 @@ app.options('*', cors());
 // app.use(helmet.contentSecurityPolicy({}));
 
 const limiter = rateLimit({
-    max: 100,
-    windowMs: 60 * 60 * 1000,
-    message: 'Too many requests from this IP, please try again in an hour!'
+  max: 100,
+  windowMs: 60 * 60 * 1000,
+  message: 'Too many requests from this IP, please try again in an hour!'
 });
 app.use('/api', limiter);
 
@@ -57,20 +57,20 @@ app.use(xss());
 // app.use(hpp());
 //--------------------------------//
 app.use('/api/v1/auth', authRouter);
+app.use('/api/v1/skills', skillsRouter);
 app.use(isLogin);
 app.use('/api/v1/users', usersRouter);
 app.use('/api/v1/admins', adminRouter);
-app.use('/api/v1/skills', skillsRouter);
 app.use('/api/v1/mentors', mentorsRouter);
 app.use('/api/v1/courses', coursesRouter);
 app.use('/api/v1/reviews', reviewsRouter);
 app.use('/api/v1/friends', friendsRouter);
 app.use('/api/v1/meetings', meetingsRouter);
 
 app.all('*', (req, res, next) => {
-    res.status(res.locals.statusCode || 404).json({
-        message: 'Invalid route, please check URL'
-    });
+  res.status(res.locals.statusCode || 404).json({
+    message: 'Invalid route, please check URL'
+  });
 });
 //--------------------------------//
 app.use(globalErrorHandler);

src/routes/skill.routes.js

@@ -1,17 +1,20 @@
 const express = require('express');
+const { isLogin } = require('../controllers/auth.controller');
 const authController = require('../controllers/auth.controller');
 const skillController = require('../controllers/skill.controller.js');
+const app = require('../app');
 //-----------------------------------------//
 const router = express.Router();
 //-------------------Router----------------//
 router
-    .get('/', skillController.getAllSkills)
-    .get('/:id', skillController.getSkill);
+  .get('/', skillController.getAllSkills)
+  .get('/:id', skillController.getSkill);
 
+router.use(isLogin);
 router.use(authController.restrictTo('admin'));
 router
-    .post('/', skillController.createSkill)
-    .patch('/:id', skillController.updateSkill)
-    .delete('/:id', skillController.deleteSkill);
+  .post('/', skillController.createSkill)
+  .patch('/:id', skillController.updateSkill)
+  .delete('/:id', skillController.deleteSkill);
 //-------------------------------------------//
 module.exports = router;