From 5cc8495b5faa9c0d26d70171393833774444956f Mon Sep 17 00:00:00 2001
From: Khushi Mehta <khushimehta8282@gmail.com>
Date: Thu, 16 Jun 2022 15:46:11 +0530
Subject: [PATCH] application form changes

---
 frontend/src/App.js                | 12 +++++-
 frontend/src/components/Details.js | 68 ++++++++++++++++--------------
 frontend/src/components/login.js   | 11 ++++-
 3 files changed, 56 insertions(+), 35 deletions(-)

diff --git a/frontend/src/App.js b/frontend/src/App.js
index 99f3e18..de0bd30 100644
--- a/frontend/src/App.js
+++ b/frontend/src/App.js
@@ -14,18 +14,24 @@ import ResourcePage from "./pages/ResourcePage";
 import ApplicationForm from "./pages/ApplicationForm";
 import AdminPanel from "./pages/AdminPanel";
 import FaqPage from "./pages/FaqPage";
+import { useNavigate } from "react-router";
 
 function App() {
+
   const PrivateRoute = () => {
     const token = localStorage.getItem("token");
+    const is_interviewer = localStorage.getItem("is_interviewer");
+
     return token ? <Outlet /> : <Navigate to="/login" />;
   };
   return (
     <Router>
+
       <div className="App">
         <Routes>
           // open routes
-          <Route path="/admin" element={<AdminPanel />} />
+
+
           <Route path="/login" element={<Login_signup />} />
           <Route path="/signup" element={<SignupPage />} />
           <Route path="/timeline" element={<TimeLine />} />
@@ -41,6 +47,7 @@ function App() {
           {/* <Route path="/signup" element={<PrivateRoute />}>
 						<Route path="/signup" element={<SignupPage />} />
 					</Route> */}
+
           <Route path="/ApplicationForm" element={<PrivateRoute />}>
             <Route path="/ApplicationForm" element={<ApplicationForm />} />
           </Route>
@@ -50,6 +57,9 @@ function App() {
           <Route path="/profile" element={<PrivateRoute />}>
             <Route path="/profile" element={<Profile />} />
           </Route>
+          <Route path="/admin" element={<PrivateRoute />}>
+            <Route path="/admin" element={<AdminPanel />} />
+          </Route>
         </Routes>
       </div>
     </Router>
diff --git a/frontend/src/components/Details.js b/frontend/src/components/Details.js
index d52d88e..b785569 100644
--- a/frontend/src/components/Details.js
+++ b/frontend/src/components/Details.js
@@ -147,38 +147,42 @@ const Details = () => {
 		onSubmit: (values) => {
 			console.log(values);
 
-			var data = JSON.stringify({
-				stack: [
-					{
-						name: "Frontend",
-						repo_link: values.frontend,
-					},
-					{
-						name: "Node",
-						repo_link: values.node,
-					},
-					{
-						name: "Django",
-						repo_link: values.django,
-					},
-					{
-						name: "Flutter",
-						repo_link: values.flutter,
-					},
+			let stack = [
+				{
+					name: "Frontend",
+					repo_link: values.frontend,
+				},
+				{
+					name: "Node",
+					repo_link: values.node,
+				},
+				{
+					name: "Django",
+					repo_link: values.django,
+				},
+				{
+					name: "Flutter",
+					repo_link: values.flutter,
+				},
 
-					{
-						name: "Fullstack Django",
-						repo_link: values.fullStackDjango,
-					},
-					{
-						name: "React Native",
-						repo_link: values.reactNative,
-					},
-					{
-						name: "Fullstack Node",
-						repo_link: values.fullStackNode,
-					},
-				],
+				{
+					name: "Fullstack Django",
+					repo_link: values.fullStackDjango,
+				},
+				{
+					name: "React Native",
+					repo_link: values.reactNative,
+				},
+				{
+					name: "Fullstack Node",
+					repo_link: values.fullStackNode,
+				},
+			]
+
+			let stackArray = stack.filter((singleStack) => singleStack.repo_link !== "")
+			console.log(stackArray);
+			var data = JSON.stringify({
+				stack: stackArray,
 				resume_link: values.resume,
 			});
 			console.log(data);
@@ -464,7 +468,7 @@ const Details = () => {
 								disabled={!formik.values.stacks.includes("fullStackDjango")}
 								helperText={
 									formik.touched.fullStackDjango &&
-									formik.errors.fullStackDjango
+										formik.errors.fullStackDjango
 										? formik.errors.fullStackDjango
 										: null
 								}
diff --git a/frontend/src/components/login.js b/frontend/src/components/login.js
index 6492ea5..45ad207 100644
--- a/frontend/src/components/login.js
+++ b/frontend/src/components/login.js
@@ -50,13 +50,20 @@ const Login = () => {
           console.log(response.data);
           if (response.data.token) {
             console.log(response.data.token);
-            navigate("/dashboard");
+            if (response.data.is_interviewer) {
+              navigate('/admin')
+            }
+            else {
+              navigate('/dashboard')
+            }
           } else {
             navigate("/signup");
             alert("Invalid cred");
           }
           localStorage.setItem("token", response.data.token);
-          navigate("/dashboard");
+          localStorage.setItem("is_interviewer", response.data.is_interviewer);
+
+          // navigate("/dashboard");
         })
         .catch(function (error) {
           console.log(error);