Added new ui changes

aju-alen · Oct 21, 2024 · 3a65acd · 3a65acd
1 parent deda69e
commit 3a65acd
Show file tree

Hide file tree

Showing 8 changed files with 971 additions and 471 deletions.
diff --git a/api/controllers/excel-controller.js b/api/controllers/excel-controller.js
diff --git a/api/controllers/survey-controller.js b/api/controllers/survey-controller.js
@@ -11,6 +11,7 @@ export const createNewSurvey = async (req, res) => {
                 surveyTitle,
                 surveyDescription: "Test",
                 userId,
+                surveyStatus: 'Active',
             }
         });
         await prisma.$disconnect();
@@ -192,3 +193,22 @@ export const deleteUserSurvey = async (req, res) => {
     }
 }
 
+export const updateUserStatus = async (req, res) => {
+    const surveyId = req.params.surveyId;
+    try {
+        const updateStatus = await prisma.survey.update({
+            where: {
+                id: surveyId
+            },
+            data: {
+                surveyStatus: req.body.surveyStatus
+            }
+        });
+        await prisma.$disconnect();
+        res.status(200).send({ message: 'Survey status updated successfully' });
+    }
+    catch (err) {
+        console.log(err);
+        res.status(500).send({ message: 'Internal server error' });
+    }
+}
diff --git a/api/routes/survey-route.js b/api/routes/survey-route.js
@@ -1,6 +1,6 @@
 import express from 'express';
 const router = express.Router();
-import { createNewSurvey,getUserSurvey,getSurveyById,updateSurveyById,getAllSurveyResponse,getAllSurveyOfOneUser,updateUserView,deleteUserSurvey} from '../controllers/survey-controller.js';
+import { createNewSurvey,getUserSurvey,getSurveyById,updateSurveyById,getAllSurveyResponse,getAllSurveyOfOneUser,updateUserView,deleteUserSurvey,updateUserStatus} from '../controllers/survey-controller.js';
 import { apiCallLimiter } from '../middleware/rateLimiter.js'
 import { verifyJwt } from '../middleware/verifyJwt.js';
 
@@ -13,6 +13,7 @@ router.get('/get-all-sruvey-from-oneuser/:userId',apiCallLimiter,verifyJwt, getA
 router.put('/update-user-view/:surveyId',apiCallLimiter,verifyJwt, updateUserView); // Get all the survey of a particular user
 
 router.delete('/delete-survey/:surveyId',apiCallLimiter,verifyJwt, deleteUserSurvey); // Get all the survey of a particular user
+router.put('/update-survey-status/:surveyId',apiCallLimiter,verifyJwt, updateUserStatus)
 
 
 export default router;
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/src/pages/Dashboard.jsx b/client/src/pages/Dashboard.jsx
@@ -98,6 +98,13 @@ const Dashboard = () => {
         }
     }, [userSurveyData]);
 
+    const handleDeleteSurveyFromParent = (surveyId) => {
+        console.log('delete survey from parent', surveyId);
+
+        setUserSurveyData(userSurveyData.filter((survey) => survey.id !== surveyId));
+      };
+
+
     return isLoading ? (
 
         <Box sx={{ display: 'flex', justifyContent: 'center', alignItems: "center", height: '100vh' }}>
@@ -160,7 +167,7 @@ const Dashboard = () => {
 </Grid>
 
 
-            <MySurvery userSurveyData={userSurveyData} isSubscribed={isSubscribed} />
+            <MySurvery userSurveyData={userSurveyData} isSubscribed={isSubscribed}  onDeleteSurvey={handleDeleteSurveyFromParent} />
             <Snackbar open={open} autoHideDuration={6000} onClose={handleClose}>
                 <Alert onClose={handleClose} severity={alertColor} variant="filled" sx={{ width: '100%' }}>
                     {alertMessage}

diff --git a/client/src/pages/Login.jsx b/client/src/pages/Login.jsx
@@ -160,18 +160,19 @@ export default function Login() {
                 mt: 1,
                 display: 'flex',
                 justifyContent: 'center',
+
               }}
 
             >
-             <GoogleOAuthProvider clientId={import.meta.env.VITE_GOOGLE_LOGIN_CLIENT_ID}>
-                <div>
-                  <h1>Google Login</h1>
+             {/* <GoogleOAuthProvider clientId={import.meta.env.VITE_GOOGLE_LOGIN_CLIENT_ID}>
+                <div >
+                  
                   <GoogleLogin
                     onSuccess={handleLoginSuccess}
                     onError={handleLoginError}
                   />
                 </div>
-              </GoogleOAuthProvider>
+              </GoogleOAuthProvider> */}
             </Box>
             <Grid container>
               <Grid item xs>

diff --git a/client/src/pages/Register.jsx b/client/src/pages/Register.jsx
@@ -192,15 +192,15 @@ export default function Register() {
 
             }}
             >
-          <GoogleOAuthProvider clientId={import.meta.env.VITE_GOOGLE_LOGIN_CLIENT_ID}>
+          {/* <GoogleOAuthProvider clientId={import.meta.env.VITE_GOOGLE_LOGIN_CLIENT_ID}>
                 <div >
                   
                   <GoogleLogin
                     onSuccess={handleLoginSuccess}
                     onError={handleLoginError}
                   />
                 </div>
-              </GoogleOAuthProvider>
+              </GoogleOAuthProvider> */}
               </Box>
           <Grid  container justifyContent="flex-end">
             <Grid item>

diff --git a/client/src/pages/UserSubmitSurvey.jsx b/client/src/pages/UserSubmitSurvey.jsx
@@ -1234,7 +1234,9 @@ const UserSubmitSurvey = () => {
             <div className=" flex justify-center items-center h-screen">
                 {(surveyData.surveyResponses > 500) && (<h1 className=' font-bold text-blue-500 text-xl'> This survey has exceeded it's alloted responses. Please contact host.</h1>)}
 
-                {(introduction && welcomePage && surveyData.surveyResponses <= 500) && (<div className=" flex flex-col">
+                {(surveyData.surveyStatus !== 'Active') && (<h1 className=' font-bold text-blue-500 text-xl'> This survey is not active. Please contact host.</h1>)}
+
+                {(introduction && welcomePage && surveyData.surveyResponses <= 500 && surveyData.surveyStatus==='Active') && (<div className=" flex flex-col">
                     <h1 className=' font-bold text-blue-500 text-xl text-center'>Hello, welcome to the survey!</h1>