Skip to content

service change #15

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

Merged
sahil2832005 merged 1 commit into from
Mar 5, 2025
Merged

service change #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
62 changes: 37 additions & 25 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { useState } from 'react';
import { BrowserRouter as Router, Route, Routes } from 'react-router-dom';
// import './App.css'
import { BrowserRouter as Router, Route, Routes, useLocation } from 'react-router-dom';
import LandingPage from './components/pages/LandingPage';
import Service from './components/pages/Service';
import DeploymentProgress from './components/pages/DeploymentProgress';
Expand All @@ -10,35 +9,48 @@ import ProjectLister from './components/pages/ProjectLister';
import NavBar from './components/NavBar';
import Footer from './components/Footer';
import { useUser } from './context/userContext';
import ProtectedRoute from './components/ProctedRoutes/ProtectedRoute'; //this will be route which authenticated user is logined or not

import ProtectedRoute from './components/ProctedRoutes/ProtectedRoute';

function App() {
const { user, setUserData } = useUser();
const location = useLocation(); // Move this inside the Router

return (
<>
<Router>
{/* plcae navbar here as common shared components */}
<NavBar />
<Routes>
{/* public routes */}
<Route path="/" element={<LandingPage />} />
<Route path="/login" element={<LoginPage />} />
{/* private routes */}
<Route path="/new" element={<ProtectedRoute><Service /></ProtectedRoute>} />
<Route path="/new/callback" element={<ProtectedRoute><Service /></ProtectedRoute>} /> {/* Add GitHub callback route */}

<Route path="/progress/:id" element={<ProtectedRoute><DeploymentProgress /></ProtectedRoute>} />
<Route path="/service/:id" element={<ProtectedRoute><DeployForm /></ProtectedRoute>} />
<Route path="/projects" element={<ProjectLister />} />
</Routes>
{/* Conditionally render Footer */}
{location.pathname !== '/login' && <Footer />}
</Router>
<NavBar />
<Routes>
{/* public routes */}
<Route path="/" element={<LandingPage />} />
<Route path="/login" element={<LoginPage />} />

{/* private routes */}
<Route path="/new" element={
<ProtectedRoute>
<Service />
</ProtectedRoute>
} />
<Route path="/new/callback" element={
<ProtectedRoute>
<Service />
</ProtectedRoute>
} />

<Route path="/progress/:id" element={
<ProtectedRoute>
<DeploymentProgress />
</ProtectedRoute>
} />
<Route path="/service/:id" element={
<ProtectedRoute>
<DeployForm />
</ProtectedRoute>
} />
<Route path="/projects" element={<ProjectLister />} />
</Routes>

{location.pathname !== '/login' && <Footer />}
</>

)
);
}

export default App
export default App;