Merge pull request #28 from kushwahramkumar2003/features

update question added, react-scroll lib added and many more
kushwahramkumar2003 · Dec 13, 2023 · 607bb2d · 607bb2d
2 parents 67c70a7 + 934c278
commit 607bb2d
Show file tree

Hide file tree

Showing 17 changed files with 294 additions and 164 deletions.
diff --git a/Server/src/controllers/quiz.controllers.js b/Server/src/controllers/quiz.controllers.js
@@ -4,7 +4,7 @@ const QuizResult = require("../models/Result.model.js");
 const asyncHandler = require("./../services/asyncHandler.js");
 
 /**********************************************************************
- * @desc    Create a quiz
+ * @desc    Create a quiz with title, description and category  
  * @route   POST /api/v1/quiz/create
  * @access  Private/Admin
  * @kushwahramkumar2003
@@ -281,9 +281,9 @@ exports.getQuizForAttempt = asyncHandler(async (req, res) => {
 });
 
 /*************************************************************************
- * @desc    Submit quiz answers
- * @route   POST /api/quizzes/:id/submit
- * @access  Public
+ * @desc    Submit quiz answers                                          *
+ * @route   POST /api/quizzes/:id/submit                                 *
+ * @access  Public                                                       *
  *************************************************************************/
 exports.submitQuizAnswers = asyncHandler(async (req, res) => {
   const quizId = req.params.id;
@@ -334,9 +334,9 @@ exports.submitQuizAnswers = asyncHandler(async (req, res) => {
 });
 
 /*************************************************************************
- * @desc    Get quiz results
- * @route   GET /api/quizzes/:id/results
- * @access  Private/Admin
+ * @desc    Get quiz results                                             *
+ * @route   GET /api/quizzes/:id/results                                 *
+ * @access  Private/Admin                                                *
  *************************************************************************/
 exports.getQuizResults = asyncHandler(async (req, res) => {
   try {

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -20,6 +20,7 @@
     "react-icons": "^4.12.0",
     "react-redux": "^9.0.2",
     "react-router-dom": "^6.19.0",
+    "react-scroll": "^1.9.0",
     "web-vitals": "^2.1.4"
   },
   "scripts": {

diff --git a/public/graduate.svg b/public/graduate.svg
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="./graduate.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
@@ -13,34 +13,11 @@
       rel="stylesheet"
       href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.0.0/css/all.min.css"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
-    <!--
-      manifest.json provides metadata used when your web app is installed on a
-      user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/
-    -->
+    <link rel="apple-touch-icon" href="./graduate.svg" />
 
-    <!--
-      Notice the use of %PUBLIC_URL% in the tags above.
-      It will be replaced with the URL of the `public` folder during the build.
-      Only files inside the `public` folder can be referenced from the HTML.
-
-      Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
-      work correctly both with client-side routing and a non-root public URL.
-      Learn how to configure a non-root public URL by running `npm run build`.
-    -->
-    <title>Online-Quiz App</title>
+    <title>QuizGrad</title>
   </head>
   <body>
     <div id="root"></div>
-    <!--
-      This HTML file is a template.
-      If you open it directly in the browser, you will see an empty page.
-
-      You can add webfonts, meta tags, or analytics to this file.
-      The build step will place the bundled scripts into the <body> tag.
-
-      To begin the development, run `npm start` or `yarn start`.
-      To create a production bundle, use `npm run build` or `yarn build`.
-    -->
   </body>
 </html>
diff --git a/src/App.js b/src/App.js
@@ -1,7 +1,7 @@
 import Login from "./pages/login/login.jsx";
 import Signup from "./pages/signup/SignUp.jsx";
 import Home from "./pages/home/Home.jsx";
-import { Toaster } from "react-hot-toast";
+
 import { Routes, Route } from "react-router-dom";
 
 import "./App.css";
@@ -16,12 +16,10 @@ function App() {
         <Route path="/" element={<Home />}></Route>
         <Route exact path="/login" element={<Login />}></Route>
         <Route exact path="/SignUp" element={<Signup />}></Route>
-
         <Route exact path="/User" element={<UserPage />}></Route>
         <Route exact path="/Admin" element={<Admin />}></Route>
         <Route exact path="/quiz/edit/:quiz_id" element={<EditQuiz />}></Route>
       </Routes>
-      <Toaster />
     </div>
   );
 }

diff --git a/src/Components/Admin/EditQuestion.jsx b/src/Components/Admin/EditQuestion.jsx
diff --git a/src/Components/Admin/QuestionCard.jsx b/src/Components/Admin/QuestionCard.jsx
@@ -1,7 +1,9 @@
-import React from "react";
+import React, { useState } from "react";
 import { useMutation } from "@tanstack/react-query";
 import toast from "react-hot-toast";
 import { deleteQuestionByQuizId } from "../../services/quiz";
+import Modal from "../modal/Modal";
+import UpdateQuestion from "./UpdateQuestion";
 
 const QuestionCard = ({
   question,
@@ -11,6 +13,9 @@ const QuestionCard = ({
   quizId,
   setRefresh,
 }) => {
+  const [isEdit, setIsEdit] = useState(false);
+
+
   const { mutate, isLoading } = useMutation({
     mutationFn: ({ questionId, quizId }) => {
       return deleteQuestionByQuizId({
@@ -34,18 +39,33 @@ const QuestionCard = ({
   };
   return (
     <div>
+      {isEdit && (
+        <Modal setIsOpen={setIsEdit}>
+          <UpdateQuestion
+            quizId={quizId}
+            question={question}
+            options={options}
+            questionId={questionId}
+            answer={answer}
+            setRefresh={setRefresh}
+            setIsEdit={setIsEdit}
+          />
+        </Modal>
+      )}
       <div>
-        <h3>{question}</h3>
-        <ul>
-          {options.map((option, index) => {
-            return <li key={questionId + index}>{option}</li>;
-          })}
-        </ul>
-        <p>Answer: {answer}</p>
-      </div>
-      <div>
-        <button>Edit</button>
-        <button onClick={deleteHandler}>Delete</button>
+        <div>
+          <h3>{question}</h3>
+          <ul>
+            {options.map((option, index) => {
+              return <li key={questionId + index}>{option}</li>;
+            })}
+          </ul>
+          <p>Answer: {answer}</p>
+        </div>
+        <div>
+          <button onClick={() => setIsEdit(true)}>Edit</button>
+          <button onClick={deleteHandler}>Delete</button>
+        </div>
       </div>
     </div>
   );