baseurl added

.github/workflows/deployer.yml

@@ -2,7 +2,7 @@ name: Deploy to GitHub Pages
 on:
   push:
     branches:
-      - main
+      - publish
   workflow_dispatch:
 permissions:
   contents: read

package.json

@@ -3,7 +3,6 @@
   "homepage": "https://kushwahramkumar2003.github.io/Online-Quiz",
   "version": "0.1.0",
   "private": true,
-  "proxy": "https://quiz-app-test-01.azurewebsites.net/",
   "dependencies": {
     "@reduxjs/toolkit": "^2.0.1",
     "@svgr/webpack": "^8.1.0",

src/App.js

@@ -15,7 +15,7 @@ function App() {
   return (
     <div>
       <Routes>
-        <Route path="/Online-Quiz" element={<Home />}></Route>
+        <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>

src/index.js

@@ -1,6 +1,6 @@
 import React from "react";
 import ReactDOM from "react-dom/client";
-import { BrowserRouter } from "react-router-dom";
+import { HashRouter } from "react-router-dom";
 import { QueryClientProvider, QueryClient } from "@tanstack/react-query";
 import { Provider } from "react-redux";
 import { Toaster } from "react-hot-toast";
@@ -12,12 +12,12 @@ const queryClient = new QueryClient();
 
 const root = ReactDOM.createRoot(document.getElementById("root"));
 root.render(
-  <BrowserRouter>
+  <HashRouter>
     <Provider store={store}>
       <QueryClientProvider client={queryClient}>
         <App className="transition-all scroll-smooth " />
         <Toaster />
       </QueryClientProvider>
     </Provider>
-  </BrowserRouter>
+  </HashRouter>
 );

src/pages/login/login.jsx

@@ -24,15 +24,15 @@ export default function Login() {
     color: "black",
   };
 
-  const { mutate} = useMutation({
+  const { mutate } = useMutation({
     mutationFn: ({ email, password }) => {
       return login({ email, password });
     },
-    onSuccess: (data) => {
+    onSuccess: async (data) => {
       const { user } = data;
 
-      dispatch(userActions.setUserInfo(data.user));
-      localStorage.setItem("account", JSON.stringify(data));
+      await dispatch(userActions.setUserInfo(data.user));
+      await localStorage.setItem("account", JSON.stringify(data));
       toast.success("Login successfully");
 
       // console.log("User.role : ", user.role);

src/services/baseUrl.js

@@ -0,0 +1,8 @@
+import axios from "axios";
+
+const api = axios.create({
+  baseURL: "https://quiz-app-test-01.azurewebsites.net",
+  //   baseURL: "http://localhost:3001",
+});
+
+export default api;

src/services/feedback.js

@@ -1,9 +1,9 @@
-import  axios  from "axios";
+import api from "./baseUrl";
 
 export const submitFeedback = async (formData) => {
   try {
     // Assuming you have a backend endpoint to handle feedback submission
-    const { data } = await axios.post("/api/v1/feedback/submit", formData);
+    const { data } = await api.post("/api/v1/feedback/submit", formData);
     // Optionally, you can add logic to handle success (e.g., redirect)
     return data;
   } catch (error) {

src/services/quiz.js

@@ -1,4 +1,4 @@
-import axios from "axios";
+import api from "./baseUrl";
 
 export const createNewQuiz = async ({
   title,
@@ -14,7 +14,7 @@ export const createNewQuiz = async ({
   console.log("Level", level);
 
   try {
-    const { data } = await axios.post("/api/v1/quiz/create", {
+    const { data } = await api.post("/api/v1/quiz/create", {
       title,
       description,
       category,
@@ -41,7 +41,7 @@ export const addQuestionInQuiz = async ({
     console.log("Question", question);
     console.log("Options", options);
     console.log("Correct Answer", correctAnswer);
-    const { data } = await axios.post(
+    const { data } = await api.post(
       `/api/v1/quiz//create/addQuestion/${quizId}`,
       {
         question,
@@ -60,7 +60,9 @@ export const addQuestionInQuiz = async ({
 
 export const getAllQuizs = async () => {
   try {
-    const { data } = await axios.get(`/api/v1/quiz`);
+    const { data } = await api.get(`/api/v1/quiz`, {
+      withCredentials: true,
+    });
     console.log("All Quezzes", data);
     return data;
   } catch (error) {
@@ -74,7 +76,7 @@ export const getAllQuizs = async () => {
 export const getQuizById = async ({ quizId }) => {
   try {
     console.log("Quiz Id", quizId);
-    const { data } = await axios.get(`/api/v1/quiz/${quizId}`);
+    const { data } = await api.get(`/api/v1/quiz/${quizId}`);
     return data;
   } catch (error) {
     if (error.response) {
@@ -86,7 +88,7 @@ export const getQuizById = async ({ quizId }) => {
 
 export const updateQuizById = async ({ title, quizId }) => {
   try {
-    const { data } = await axios.put(`/api/v1/quiz/${quizId}/update`, {
+    const { data } = await api.put(`/api/v1/quiz/${quizId}/update`, {
       title,
     });
     return data;
@@ -106,7 +108,7 @@ export const updateQuestionByQuizId = async ({
   correctAnswer,
 }) => {
   try {
-    const { data } = await axios.put(
+    const { data } = await api.put(
       `/api/v1/quiz/${quizId}/question/${questionId}/update`,
       {
         question,
@@ -125,7 +127,7 @@ export const updateQuestionByQuizId = async ({
 
 export const deleteQuiz = async ({ quizId }) => {
   try {
-    const { data } = await axios.delete(`/api/v1/quiz/${quizId}/delete`);
+    const { data } = await api.delete(`/api/v1/quiz/${quizId}/delete`);
     return data;
   } catch (error) {
     if (error.response) {
@@ -137,7 +139,7 @@ export const deleteQuiz = async ({ quizId }) => {
 
 export const deleteQuestionByQuizId = async ({ quizId, questionId }) => {
   try {
-    const { data } = await axios.delete(
+    const { data } = await api.delete(
       `/api/v1/quiz/${quizId}/question/${questionId}/delete`
     );
     return data;
@@ -149,10 +151,10 @@ export const deleteQuestionByQuizId = async ({ quizId, questionId }) => {
   }
 };
 
-export const publishQuiz = async ({ quizId,publish }) => {
+export const publishQuiz = async ({ quizId, publish }) => {
   try {
-    const { data } = await axios.put(`/api/v1/quiz/${quizId}/publish`, {
-      publish
+    const { data } = await api.put(`/api/v1/quiz/${quizId}/publish`, {
+      publish,
     });
     return data;
   } catch (error) {

src/services/user.js

@@ -1,8 +1,8 @@
-import axios from "axios";
+import api from "./baseUrl";
 
 export const signup = async ({ name, email, password }) => {
   try {
-    const { data } = await axios.post("api/v1/auth/register", {
+    const { data } = await api.post("api/v1/auth/register", {
       name,
       email,
       password,
@@ -19,7 +19,7 @@ export const signup = async ({ name, email, password }) => {
 
 export const login = async ({ email, password }) => {
   try {
-    const { data } = await axios.post("/api/v1/auth/login", {
+    const { data } = await api.post("/api/v1/auth/login", {
       email,
       password,
     });

src/services/userQuiz.js

@@ -1,11 +1,13 @@
-import axios from "axios";
+import api from "./baseUrl";
 import { toast } from "react-hot-toast";
 
 export const getQuizByIdForUser = async ({ quizId }) => {
   try {
     console.log("Quiz Id", quizId);
 
-    const { data } = await axios.get(`/api/v1/userQuiz/${quizId}`);
+    const { data } = await api.get(`/api/v1/userQuiz/${quizId}`, {
+      withCredentials: true,
+    });
 
     // let data = undefined;
     console.log("User Quiz Data : ", data);
@@ -25,11 +27,17 @@ export const getQuizByIdForUser = async ({ quizId }) => {
 
 export const submitOneQuestion = async ({ quizId, questionId, answer }) => {
   try {
-    const { data } = await axios.post(`/api/v1/userQuiz/submitAnswer`, {
-      quizId,
-      questionId,
-      answer,
-    });
+    const { data } = await api.post(
+      `/api/v1/userQuiz/submitAnswer`,
+      {
+        quizId,
+        questionId,
+        answer,
+      },
+      {
+        withCredentials: true,
+      }
+    );
     // console.log("USer Quiz Data : ", data);
     return data;
   } catch (error) {
@@ -44,7 +52,9 @@ export const submitOneQuestion = async ({ quizId, questionId, answer }) => {
 
 export const submitQuiz = async ({ quizId }) => {
   try {
-    const { data } = await axios.post(`/api/v1/userQuiz/${quizId}/finishQuiz`);
+    const { data } = await api.post(`/api/v1/userQuiz/${quizId}/finishQuiz`, {
+      withCredentials: true,
+    });
     // console.log("USer Quiz Data : ", data);
     return data;
   } catch (error) {
@@ -59,8 +69,11 @@ export const submitQuiz = async ({ quizId }) => {
 
 export const getResultByIds = async ({ quizId, resultId }) => {
   try {
-    const { data } = await axios.get(
-      `/api/v1/userQuiz/result/${quizId}/${resultId}`
+    const { data } = await api.get(
+      `/api/v1/userQuiz/result/${quizId}/${resultId}`,
+      {
+        withCredentials: true,
+      }
     );
     // console.log("USer Quiz Data : ", data);
     return data;