From b97464498906d67e02d7815d89f20d7bd3d24add Mon Sep 17 00:00:00 2001 From: Mr Swift Date: Fri, 23 Aug 2024 15:47:53 +0330 Subject: [PATCH] Gps User Page --- components/admin/TheSidebar.vue | 66 +++++++- pages/admin/gps/users/index.vue | 149 ++++++++++++++++++ .../controllers/admin_EventsController.js | 4 +- server/controllers/GPS.User.js | 7 +- server/database.js | 2 +- server/routes/admin.js | 1 + 6 files changed, 223 insertions(+), 6 deletions(-) create mode 100644 pages/admin/gps/users/index.vue diff --git a/components/admin/TheSidebar.vue b/components/admin/TheSidebar.vue index 56816a3..34399f1 100644 --- a/components/admin/TheSidebar.vue +++ b/components/admin/TheSidebar.vue @@ -316,6 +316,66 @@ :exact="false" /> + + + + + + + + + + + @@ -345,7 +405,11 @@ export default { newOldPieceRequests: state => state.admin.newOldPieceRequests, newBufferRequests: state => state.admin.newBufferRequests, newGuaranteeReports: state => state.admin.newGuaranteeReports, - newComplaintReports: state => state.admin.newComplaintReports + newComplaintReports: state => state.admin.newComplaintReports, + newWithdrawRequest: state => state.admin.newWithdrawRequest, + pendingUsers: state => state.admin.pendingUsers, + newAwardRequest: state => state.admin.newAwardRequest, + newInstallDeviceRequest: state => state.admin.newInstallDeviceRequest }) }, methods: { diff --git a/pages/admin/gps/users/index.vue b/pages/admin/gps/users/index.vue new file mode 100644 index 0000000..8a606ea --- /dev/null +++ b/pages/admin/gps/users/index.vue @@ -0,0 +1,149 @@ + + + diff --git a/server/WebSocket/controllers/admin_EventsController.js b/server/WebSocket/controllers/admin_EventsController.js index fdf4647..fab02ec 100644 --- a/server/WebSocket/controllers/admin_EventsController.js +++ b/server/WebSocket/controllers/admin_EventsController.js @@ -65,7 +65,7 @@ module.exports.getAllNotifs = async socket => { const newGuaranteeReports = allData[7] const newComplaintReports = allData[8] const newWithdrawRequest = allData[9] - const newGpsRequest = allData[10] + const pendingUsers = allData[10] const newAwardRequest = allData[11] const newInstallDeviceRequest = allData[12] @@ -81,7 +81,7 @@ module.exports.getAllNotifs = async socket => { newGuaranteeReports, newComplaintReports, newWithdrawRequest, - newGpsRequest, + pendingUsers, newAwardRequest, newInstallDeviceRequest }) diff --git a/server/controllers/GPS.User.js b/server/controllers/GPS.User.js index 4570e2e..d5814c2 100644 --- a/server/controllers/GPS.User.js +++ b/server/controllers/GPS.User.js @@ -369,10 +369,13 @@ module.exports.getCurrent = async (req, res) => { } module.exports.getUsersForAdmin = async (req, res) => { - const user = await User.find({}).sort({ active: 1, created_at: -1 }).select('-password -token -otp -seenByAdmin') + const user = await User.find({}).sort({ active: 1, created_at: -1 }).select('-password -token -otp -seenByAdmin -cardBank') + res.status(200).json(user) +} +module.exports.getPendingUsersForAdmin = async (req, res) => { + const user = await User.find({active:false}).sort({ active: 1, created_at: -1 }).select('-password -token -otp -seenByAdmin -cardBank') res.status(200).json(user) } - module.exports.getUserForAdmin = async (req, res) => { const user = await User.findById(req.params.id).select('-password -token -otp -seenByAdmin') if (!user) { diff --git a/server/database.js b/server/database.js index 0f6c099..d59a6d9 100644 --- a/server/database.js +++ b/server/database.js @@ -5,7 +5,7 @@ const inHostUrl = 'mongodb://root:KPTt76tImNBBMm4Kor8QA9gB@asan-service:27017/as const outHostUrl = 'mongodb://root:KPTt76tImNBBMm4Kor8QA9gB@hotaka.liara.cloud:33794/asanserv_database?authSource=admin' const init = ()=>{ try { - mongoose.connect(inHostUrl, { + mongoose.connect(outHostUrl, { useNewUrlParser: true, useUnifiedTopology: true, useFindAndModify: false, diff --git a/server/routes/admin.js b/server/routes/admin.js index ebed870..fe5bbbb 100644 --- a/server/routes/admin.js +++ b/server/routes/admin.js @@ -42,6 +42,7 @@ const userGPS = require('../controllers/GPS.User') /// /////////////// User router.get('/gps/users',hasPermission('gps'), userGPS.getUsersForAdmin) +router.get('/gps/users/pending',hasPermission('gps'), userGPS.getPendingUsersForAdmin) router.get('/gps/users/:id',hasPermission('gps'), userGPS.getUserForAdmin) router.patch('/gps/users/:id/:status',hasPermission('gps'), userGPS.activeUser)