Skip to content

Commit

Permalink
merge with main
Browse files Browse the repository at this point in the history
  • Loading branch information
danielyu12 committed Sep 10, 2023
2 parents 1d15f4d + 7576733 commit b6ff171
Show file tree
Hide file tree
Showing 111 changed files with 6,536 additions and 10,537 deletions.
6,102 changes: 2,226 additions & 3,876 deletions package-lock.json

Large diffs are not rendered by default.

7 changes: 6 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,18 @@
"preview": "vite preview"
},
"dependencies": {
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@mui/material": "^5.14.5",
"firebase": "^10.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-dropdown-select": "^4.10.0",
"react-hook-form": "^7.45.4",
"react-firebase-hooks": "^5.1.1",
"react-router-dom": "^6.14.2"
"react-responsive": "^9.0.2",
"react-router-dom": "^6.14.2",
"vite-plugin-svgr": "^3.2.0"
},
"devDependencies": {
"@types/react": "^18.2.15",
Expand Down
2 changes: 2 additions & 0 deletions src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import LandingPage from './pages/LandingPage';
import SponsorPage from './pages/SponsorPage';
import Application from './pages/Application';
import Login from './pages/Login';
import Dashboard from './pages/HackerDashboard';

const router = createBrowserRouter(
createRoutesFromElements(
Expand All @@ -17,6 +18,7 @@ const router = createBrowserRouter(
<Route path="sponsor" element={<SponsorPage />} />
<Route path="application" element={<Application />} />
<Route path="login" element={<Login />} />
<Route path="dashboard" element={<Dashboard />} />
</Route>
)
);
Expand Down
1 change: 1 addition & 0 deletions src/assets/images/BannerLabel.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/images/BannerLabel_2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions src/assets/images/BannerLabel_3.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/BigTreasureChest_Closed.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/assets/images/BigTreasureChest_Open.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/DialogBoxFull.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/FelizBox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/images/HeartTimer.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit b6ff171

Please sign in to comment.