diff --git a/frontend/src/App.js b/frontend/src/App.js index 18e28d8..42ecd80 100644 --- a/frontend/src/App.js +++ b/frontend/src/App.js @@ -14,19 +14,25 @@ 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"; import PanelName from "./components/PanelName"; function App() { + const PrivateRoute = () => { const token = localStorage.getItem("token"); + const is_interviewer = localStorage.getItem("is_interviewer"); + return token ? : ; }; return ( +
// open routes - } /> + + } /> } /> } /> @@ -43,6 +49,7 @@ function App() { {/* }> } /> */} + }> } /> @@ -52,6 +59,9 @@ function App() { }> } /> + }> + } /> +
diff --git a/frontend/src/components/Details.js b/frontend/src/components/Details.js index 950be81..fadd391 100644 --- a/frontend/src/components/Details.js +++ b/frontend/src/components/Details.js @@ -148,38 +148,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); @@ -465,7 +469,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);