Merge pull request #1 from TPH777/location

Location
TPH777 · Jul 28, 2024 · faed70f · faed70f
2 parents bca7952 + e39f682
commit faed70f
Show file tree

Hide file tree

Showing 16 changed files with 862 additions and 89 deletions.
diff --git a/.env b/.env
@@ -0,0 +1 @@
+VITE_REACT_APP_gmap=AIzaSyDCs25ivx55QjPoixKSzGreSw-feBeJVms
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,6 @@ dist-ssr
 
 # Firebase Key
 ./src/config/*
+
+#gmap api key
+./env
diff --git a/index.html b/index.html
@@ -1,8 +1,8 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image" href=src\pictures\food-saviour-logo.png />
+    <link rel="icon" type="image" href="src\pictures\food-saviour-logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Food Saviour</title>
   </head>

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -14,7 +14,11 @@
     "@anatoliygatt/heart-switch": "^1.0.13",
     "@emotion/react": "^11.11.4",
     "@emotion/styled": "^11.11.5",
+    "@react-google-maps/api": "^2.19.3",
+    "@vis.gl/react-google-maps": "^1.1.0",
+    "axios": "^1.7.2",
     "bootstrap": "^5.3.3",
+    "dotenv": "^16.4.5",
     "firebase": "^10.12.2",
     "react": "^18.2.0",
     "react-bootstrap": "^2.10.3",

diff --git a/src/App.tsx b/src/App.tsx
@@ -7,22 +7,27 @@ import { RegisterPage } from "./pages/Register";
 import { Dashboard } from "./pages/Dashboard";
 import { FavoritePage } from "./pages/Favorites";
 import { AuthContextProvider } from "./context/Auth";
+import { LocationContextProvider } from "./context/Location";
+import MapComponent from "./components/MapComponent";
 
 function App() {
   return (
-    <AuthContextProvider>
-      <Router>
-        <Routes>
-          <Route element={<Layout />}>
-            <Route path="/" element={<Home />} />
-            <Route path="/login" element={<LoginPage />} />
-            <Route path="/dashboard" element={<Dashboard />} />
-            <Route path="/register" element={<RegisterPage />} />
-            <Route path="/favorites" element={<FavoritePage />} />
-          </Route>
-        </Routes>
-      </Router>
-    </AuthContextProvider>
+    <LocationContextProvider>
+      <AuthContextProvider>
+        <Router>
+          <Routes>
+            <Route element={<Layout />}>
+              <Route path="/" element={<Home />} />
+              <Route path="/login" element={<LoginPage />} />
+              <Route path="/dashboard" element={<Dashboard />} />
+              <Route path="/register" element={<RegisterPage />} />
+              <Route path="/favorites" element={<FavoritePage />} />
+            </Route>
+          </Routes>
+        </Router>
+        {/* <MapComponent /> */}
+      </AuthContextProvider>
+    </LocationContextProvider>
   );
 }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		VITE_REACT_APP_gmap=AIzaSyDCs25ivx55QjPoixKSzGreSw-feBeJVms