Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Location #1

Merged
merged 14 commits into from
Jul 28, 2024
Merged

Location #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
1c2ecc3
added some gmap api thing?
wongwh2002 Jul 22, 2024
9ecfee4
gitignore
wongwh2002 Jul 22, 2024
f5770dd
Delete .env
wongwh2002 Jul 24, 2024
5ec553e
google maps is decent now, have not improved the UI and integrate dat…
wongwh2002 Jul 25, 2024
29d29c2
comments
wongwh2002 Jul 25, 2024
89ccf46
created context, move mapcomponent out, markers currently doesnt work…
wongwh2002 Jul 25, 2024
d76a6fd
checkpoint! all works with context now
wongwh2002 Jul 25, 2024
6293076
update for register location input
wongwh2002 Jul 27, 2024
b50083d
adding to database works first try letsgo!
wongwh2002 Jul 27, 2024
1075196
successfully pull data from db to calculate distance, moved functions…
wongwh2002 Jul 27, 2024
a5f9346
fix problem with canter customer position
wongwh2002 Jul 28, 2024
d4b7ef4
has distance now :D
wongwh2002 Jul 28, 2024
e80f3d3
edited only run map when consumer or not logged in
wongwh2002 Jul 28, 2024
e39f682
Merge remote-tracking branch 'origin/main' into location
wongwh2002 Jul 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
VITE_REACT_APP_gmap=AIzaSyDCs25ivx55QjPoixKSzGreSw-feBeJVms
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,3 +25,6 @@ dist-ssr

# Firebase Key
./src/config/*

#gmap api key
./env
4 changes: 2 additions & 2 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
206 changes: 205 additions & 1 deletion package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
31 changes: 18 additions & 13 deletions src/App.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
);
}

Expand Down
Loading
Loading