Split user

server/routes/admin.js

@@ -26,12 +26,12 @@ const smsBroadcastController = require('../controllers/smsBroadcastController')
 const surveyController = require('../controllers/surveyController')
 const complaintController = require('../controllers/complaintController')
 const brandController = require('../controllers/brandController')
-const requestController = require('../controllers/GPS.Request')
 const withdraw = require('../controllers/GPS.Withdraw')
 const installedDevice = require('../controllers/GPS.InstalledDevice')
 const device = require('../controllers/GPS.Device')
 const award = require('../controllers/GPS.Award')
 const awardRequest = require('../controllers/GPS.AwardRequest')
+const userGPS = require('../controllers/GPS.User')
 
 
 /// //////////////////////////////////////////////////////// routes
@@ -39,6 +39,15 @@ const awardRequest = require('../controllers/GPS.AwardRequest')
 
 /// ///////////////////////////// GPS
 
+/// /////////////// User
+
+router.get('/gps/users',hasPermission('gps'), userGPS.getUsersForAdmin)
+router.get('/gps/users/:id',hasPermission('gps'), userGPS.getUserForAdmin)
+
+router.patch('/gps/users/:id/:status',hasPermission('gps'), userGPS.activeUser)
+
+
+
 /// ////////////// Award
 router.post('/gps/award',hasPermission('gps'), award.createAward)
 router.get('/gps/award',hasPermission('gps'), award.findAllAdmin)
@@ -50,11 +59,6 @@ router.get('/gps/award-request',hasPermission('gps'), awardRequest.findAllAdmin)
 router.get('/gps/award-request/:id',hasPermission('gps'), awardRequest.findOne)
 router.put('/gps/award-request/:id',hasPermission('gps'), awardRequest.update)
 
-/// ////////////// request for access to gps
-router.get('/gps/request',hasPermission('gps'), requestController.getAllRequest)
-router.get('/gps/request/:id',hasPermission('gps'), requestController.getOneRequest)
-router.patch('/gps/request/:id/:status',hasPermission('gps'), requestController.changeStatus)
-
 /// ////////////// Withdraw
 router.get('/gps/withdraw',hasPermission('gps'), withdraw.getAllForAdmin)
 router.patch('/gps/withdraw/:id/:type',hasPermission('gps'), withdraw.updateReq)

server/routes/auth.js

@@ -1,16 +1,21 @@
 const { Router } = require('express')
 const router = Router()
 const userController = require('../controllers/userController')
-const gpsAuthController = require('../controllers/GPS.Auth')
+const userAuthGPS = require('../controllers/GPS.Auth')
+const userGPS = require('../controllers/GPS.User')
+/// //////////////////GPS section
+router.post('/gps/register', userGPS.register_user)
 
-/// /////////////////// gps routes
-router.post('/gps/login', gpsAuthController.login)
+router.post('/gps/login/pass', userAuthGPS.login_with_pass)
+router.post('/gps/login/otp', userAuthGPS.login_with_otp)
 
+router.post('/gps/otp/send', userGPS.send_otp)
+router.post('/gps/otp/check', userGPS.check_otp)
 
-/// /////////////////// 
-// router.post('/register/admin', userController.register_admin)
+router.post('/gps/otp/reset-pass', userGPS.resetpass_otp)
+
+/// ////////////////////////
 router.post('/register/user', userController.register_user)
-// router.post('/activation/:key', userController.activation)
 router.post('/reset-pass-token', userController.generate_reset_user_password_link)
 router.post('/set-new-pass', userController.reset_password_using_token)
 

server/routes/gps.js

@@ -7,6 +7,13 @@ const score = require('../controllers/GPS.Score')
 const award = require('../controllers/GPS.Award')
 const awardRequest = require('../controllers/GPS.AwardRequest')
 const overview = require('../controllers/GPS.Overview')
+const userGPS = require('../controllers/GPS.User')
+
+/// /////////////// User
+router.get('/user/me', userGPS.getCurrent)
+router.put('/user/me', userGPS.update_user)
+
+router.post('/user/reset-pass', userGPS.update_user_password)
 
 /// /////////////// Overview page
 router.get('/overview/main', overview.mainPage)

server/routes/user.js

@@ -6,10 +6,8 @@ const representationController = require('../controllers/representationControlle
 const transactionDraftsController = require('../controllers/transactionDraftsController')
 const transactionController = require('../controllers/transactionController')
 const surveyController = require('../controllers/surveyController')
-const requestController = require('../controllers/GPS.Request')
 
-/// // GPS
-router.post('/gps/request', requestController.gpsRequest)
+
 
 /// // profile
 router.put('/update_profile', userController.update_user)