shyamlal

Author: bhavitgrover

routers/driverStatus.js

@@ -0,0 +1,7 @@
+const router = require('express').Router()
+
+router.get('/', async (req,res) => {
+    res.render("driverStatus", {user: req.user})
+})
+
+module.exports = router

routers/indexRouter.js

@@ -6,6 +6,7 @@ const Users = require('../schemas/userSchema')
 router.get('/', async (req, res) => {
     if (!req.user) return res.redirect('/login')
     if (!req.user.kyc) return res.redirect('/kyc')
+    if (req.user.type == "Driver") return res.redirect("/driverStatus")
     if (req.user.status == 'busy') return res.redirect('/status')
     res.render('index', {user: req.user})
 })

routers/statusRouter.js

@@ -42,7 +42,9 @@ router.get('/', async (req, res) => {
             break
         }
     }
-    res.render('status', {user: req.user, ride: myRide})
+    const isDriver = req.user.type === "Driver"
+    // console.log("BC", isDriver)
+    res.render('status', {user: req.user, ride: myRide, isDriver: isDriver})
 })
 
 router.post('/vehicle', async (req, res) => {

server.js

@@ -24,6 +24,7 @@ const indexRouter = require('./routers/indexRouter'),
     apiRouter = require('./routers/apiRouter'),
     selectRouter = require('./routers/selectRouter'),
     tempRouter = require('./routers/tempRouter'),
+    driverStatusRouter = require('./routers/driverStatus'),
     verifyRouter = require('./routers/verifyRouter')
 
 app.use(express.static('public'))
@@ -59,6 +60,7 @@ app.use('/status', ensureAuthenticated, ensureKyc, statusRouter)
 app.use('/help', ensureAuthenticated, ensureKyc, helpRouter)
 app.use('/rewards', ensureAuthenticated, ensureKyc, rewardsRouter)
 app.use('/select', ensureAuthenticated, selectRouter)
+app.use('/driverStatus', ensureAuthenticated, driverStatusRouter)
 app.use('/temp', tempRouter)
 app.use('/verify', verifyRouter)
 

views/driverStatus.ejs

@@ -100,14 +100,21 @@
     .logout {
         font-size: 1vw;
     }
+    .rideStatusPageLink {
+        color: #466eff !important;
+    }
 </style>
 <div class="nav">
     <div id="cursor"></div>
     <div id="cursor-border"></div>
     <img src="fullLogo.png">
     <div class="navIcons">
         <a data-cursor="pointer" href="/" class="homePageLink">Home</a>
-        <a data-cursor="pointer" href="/status" class="rideStatusPageLink">Ride Status</a>
+        <% if (user.type === "Driver") { %>
+            <a data-cursor="pointer" href="/driverStatus" class="rideStatusPageLink">Ride Status</a>
+        <% } else { %>
+            <a data-cursor="pointer" href="/status" class="rideStatusPageLink">Ride Status</a>
+        <% } %>    
         <a data-cursor="pointer" href="/rewards" class="rewardsPageLink">Rewards</a>
         <a data-cursor="pointer" href="/help" class="helpPageLink">Help</a>
         <div class="navIcon" data-cursor="pointer">

views/partials/cursor.ejs

@@ -315,10 +315,18 @@
             <div class="right">
                 <div class="top">
                     <div class="creds">
-                        <img src="<%= ride.driver.pfp %>" class="pfp" alt="">
+                        <% if (isDriver) { %>
+                            <img src="<%= user.pfp %>" class="pfp" alt="">
+                        <% } else { %>
+                            <img src="<%= ride.driver.pfp %>" class="pfp" alt="">
+                        <% } %>
                         <div class="names">
                             <div class="headings2">
-                                <p><%= ride.driver.fname + ' ' + ride.driver.lname %></p>
+                                <% if (isDriver) { %>
+                                    <p><%= user.fname + ' ' + user.lname %></p>
+                                <% } else { %>
+                                    <p><%= ride.driver.fname + ' ' + ride.driver.lname %></p>
+                                <% } %>
                             </div>
                             <div class="times">
                                 <p class="special"><%= ride.time %> Mins</p>