Skip to content

Commit

Permalink
Merge pull request #442 from Ojas-Arora/test
Browse files Browse the repository at this point in the history
Login/Signup Page
  • Loading branch information
PranavBarthwal authored Jul 29, 2024
2 parents 3897134 + c6a73c2 commit 6bc09a5
Show file tree
Hide file tree
Showing 4 changed files with 443 additions and 1 deletion.
6 changes: 5 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
},
"dependencies": {
"@emailjs/browser": "^4.3.3",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.2",
"@hookform/resolvers": "^3.6.0",
"@react-three/drei": "^9.106.0",
"@react-three/fiber": "^8.16.6",
"@tsparticles/all": "^3.4.0",
Expand All @@ -24,7 +27,8 @@
"react-router-dom": "^6.23.1",
"react-scroll": "^1.9.0",
"three": "^0.164.1",
"typed.js": "^2.1.0"
"typed.js": "^2.1.0",
"zod": "^3.23.8"
},
"devDependencies": {
"@types/react": "^18.2.66",
Expand Down
3 changes: 3 additions & 0 deletions src/components/Navbar/Navbar.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,9 @@ function Navbar() {
<li className="navbar-list-item" onClick={handleMenuClose}>
<NavLink className={({ isActive }) => ("rem-default " + (isActive ? ' active' : ''))} to="/about">About us</NavLink>
</li>
<li className="navbar-list-item" onClick={handleMenuClose}>
<NavLink className={({ isActive }) => ("rem-default " + (isActive ? ' active' : ''))} to="/login">AstroAccess</NavLink>
</li>
{renderContactLink()}
</ul>
</div>
Expand Down
3 changes: 3 additions & 0 deletions src/main.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,21 @@ import { createBrowserRouter, createRoutesFromElements, RouterProvider, Route }
import './index.css'
import App from './App.jsx'
import Home from "./pages/Home/Home.jsx"
import Login from './pages/Login/page.jsx'
import MarsRover from './pages/MarsRover/MarsRover.jsx'
import NasaProjects from "./pages/NasaProjects/NasaProjects.jsx"
import About from "./pages/About/About.jsx"
import NotFoundPage from "./pages/404 Page/NotfoundPage.jsx"


const router = createBrowserRouter(
createRoutesFromElements(
<Route path='/' element={<App />}>
<Route index element={<Home />} />
<Route path='/marsrover' element={<MarsRover />} />
<Route path='/nasaprojects' element={<NasaProjects />} />
<Route path='/about' element={<About />} />
<Route path='/login' element={<Login />} />
<Route path='*' element={<NotFoundPage />} />
</Route>
)
Expand Down
Loading

0 comments on commit 6bc09a5

Please sign in to comment.