Frontend v2 updated (#93)

* Admin backend integ (#78) * Backend integ of missions * updated fetching routes * Mission page backend integ * Delete App.js * Updated App.js * Updated admin navigation * Frontend auth navigation (#86) * added admin navigation * added admin navigation * auth navigation added * Admin backend integ (#85) * updated fetching routes * Updated admin navigation * Updated new mission form with new field names * Added back buttons * Added integ for admin mission list * Backend integ for editing and deleting missions * Fix: Rendering of mission detail with mission id * Auth routes added * scoreboard added * navigation change * client side notification setup Co-authored-by: saisandhya01 <[email protected]>
SpiderNitt · Jan 20, 2021 · 8770c84 · 8770c84
1 parent 0aa438d
commit 8770c84
Show file tree

Hide file tree

Showing 44 changed files with 1,404 additions and 902 deletions.
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
diff --git a/frontend/package.json b/frontend/package.json
@@ -19,11 +19,13 @@
     "react": "^17.0.1",
     "react-dom": "^17.0.1",
     "react-html5-camera-photo": "^1.5.4",
+    "react-lottie": "^1.2.3",
     "react-router-dom": "^5.2.0",
     "react-scripts": "4.0.1",
     "react-social": "^1.10.0",
     "react-swipeable-views": "^0.13.9",
     "react-webcam": "^5.2.2",
+    "socket.io-client": "^3.1.0",
     "web-vitals": "^0.2.4",
     "yup": "^0.32.8"
   },

diff --git a/frontend/src/AdminLogin.jsx b/frontend/src/AdminLogin.jsx
diff --git a/frontend/src/App.js b/frontend/src/App.js
@@ -1,18 +1,21 @@
-import React, { useState } from "react";
+import React from "react";
 import "./App.css";
 
-import UserNav from "./navigation/userNavigation";
-import AdminNav from "./navigation/AdminNavigation";
-import AuthContext from "./api/authContext";
+import AppNavigation from "./navigation/userNavigation";
+import { AuthProvider } from "./api/authContext";
+import { BrowserRouter, Switch } from "react-router-dom";
 
 function App() {
-  const [user, setUser] = useState();
   return (
-    <AuthContext.Provider value={{ user, setUser }}>
+    <AuthProvider>
       <div className='App'>
-        <AdminNav />
+        <BrowserRouter>
+          <Switch>
+            <AppNavigation />
+          </Switch>
+        </BrowserRouter>
       </div>
-    </AuthContext.Provider>
+    </AuthProvider>
   );
 }