mirror of
https://github.com/Motion-Games/MotionWebStudio.git
synced 2026-04-21 17:10:54 +02:00
Compare commits
13 Commits
258dadb087
...
b0c22f30e3
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b0c22f30e3 | ||
|
|
f79fd74f0a | ||
|
|
90cad63768 | ||
|
|
bfe9bd425a | ||
|
|
1c7d687cb6 | ||
|
|
bca7783458 | ||
|
|
9312e356f1 | ||
|
|
58390b626b | ||
|
|
b7c8c67210 | ||
|
|
7af86179b3 | ||
|
|
e1d8050569 | ||
|
|
e047e299e6 | ||
|
|
846190e6b0 |
114
App.tsx
114
App.tsx
@@ -29,68 +29,70 @@ import { BlueWave } from './pages/demos/BlueWave';
|
||||
import { Steelguard } from './pages/demos/Steelguard';
|
||||
|
||||
// Helper component to scroll to top on route change
|
||||
// TEST COMMENT TO TEST VPS UPLOAD 1
|
||||
// TEST COMMENT TO TEST VPS UPLOAD 2
|
||||
const ScrollToTopHelper = () => {
|
||||
return <ScrollToTop />;
|
||||
return <ScrollToTop />;
|
||||
};
|
||||
|
||||
const App: React.FC = () => {
|
||||
return (
|
||||
<AuthProvider>
|
||||
<Router>
|
||||
<div className="min-h-screen bg-white flex flex-col font-sans text-gray-900">
|
||||
<ScrollToTopHelper />
|
||||
<AnalyticsTracker />
|
||||
<ProfileCompleter />
|
||||
<CookieBanner />
|
||||
|
||||
<Routes>
|
||||
{/* Main Application Routes */}
|
||||
<Route path="/" element={<><Navbar /><main className="flex-grow"><Home /></main><Footer /></>} />
|
||||
<Route path="/services" element={<><Navbar /><main className="flex-grow"><Services /></main><Footer /></>} />
|
||||
<Route path="/products" element={<><Navbar /><main className="flex-grow"><Products /></main><Footer /></>} />
|
||||
<Route path="/references" element={<><Navbar /><main className="flex-grow"><References /></main><Footer /></>} />
|
||||
<Route path="/contact" element={<><Navbar /><main className="flex-grow"><Contact /></main><Footer /></>} />
|
||||
|
||||
{/* Info Pages */}
|
||||
<Route path="/privacy" element={<><Navbar /><main className="flex-grow"><Privacy /></main><Footer /></>} />
|
||||
<Route path="/terms" element={<><Navbar /><main className="flex-grow"><Terms /></main><Footer /></>} />
|
||||
<Route path="/faq" element={<><Navbar /><main className="flex-grow"><FAQ /></main><Footer /></>} />
|
||||
return (
|
||||
<AuthProvider>
|
||||
<Router>
|
||||
<div className="min-h-screen bg-white flex flex-col font-sans text-gray-900">
|
||||
<ScrollToTopHelper />
|
||||
<AnalyticsTracker />
|
||||
<ProfileCompleter />
|
||||
<CookieBanner />
|
||||
|
||||
{/* Auth Routes */}
|
||||
<Route path="/auth/login" element={<><Navbar /><main className="flex-grow"><Login /></main><Footer /></>} />
|
||||
<Route path="/auth/register" element={<><Navbar /><main className="flex-grow"><Register /></main><Footer /></>} />
|
||||
<Route path="/auth/forgot-password" element={<><Navbar /><main className="flex-grow"><ForgotPassword /></main><Footer /></>} />
|
||||
<Route path="/auth/reset-password" element={<><Navbar /><main className="flex-grow"><ResetPassword /></main><Footer /></>} />
|
||||
|
||||
{/* Protected Routes */}
|
||||
<Route
|
||||
path="/dashboard"
|
||||
element={
|
||||
<ProtectedRoute>
|
||||
<><Navbar /><main className="flex-grow"><Dashboard /></main><Footer /></>
|
||||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
<Routes>
|
||||
{/* Main Application Routes */}
|
||||
<Route path="/" element={<><Navbar /><main className="flex-grow"><Home /></main><Footer /></>} />
|
||||
<Route path="/services" element={<><Navbar /><main className="flex-grow"><Services /></main><Footer /></>} />
|
||||
<Route path="/products" element={<><Navbar /><main className="flex-grow"><Products /></main><Footer /></>} />
|
||||
<Route path="/references" element={<><Navbar /><main className="flex-grow"><References /></main><Footer /></>} />
|
||||
<Route path="/contact" element={<><Navbar /><main className="flex-grow"><Contact /></main><Footer /></>} />
|
||||
|
||||
<Route
|
||||
path="/admin"
|
||||
element={
|
||||
<ProtectedRoute>
|
||||
<><Navbar /><main className="flex-grow"><Admin /></main><Footer /></>
|
||||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
{/* Info Pages */}
|
||||
<Route path="/privacy" element={<><Navbar /><main className="flex-grow"><Privacy /></main><Footer /></>} />
|
||||
<Route path="/terms" element={<><Navbar /><main className="flex-grow"><Terms /></main><Footer /></>} />
|
||||
<Route path="/faq" element={<><Navbar /><main className="flex-grow"><FAQ /></main><Footer /></>} />
|
||||
|
||||
{/* Demo Routes - These have their own custom layouts/navbars */}
|
||||
<Route path="/demos/sweetcraving" element={<SweetCraving />} />
|
||||
<Route path="/demos/bluewave" element={<BlueWave />} />
|
||||
<Route path="/demos/steelguard" element={<Steelguard />} />
|
||||
</Routes>
|
||||
|
||||
</div>
|
||||
</Router>
|
||||
</AuthProvider>
|
||||
);
|
||||
{/* Auth Routes */}
|
||||
<Route path="/auth/login" element={<><Navbar /><main className="flex-grow"><Login /></main><Footer /></>} />
|
||||
<Route path="/auth/register" element={<><Navbar /><main className="flex-grow"><Register /></main><Footer /></>} />
|
||||
<Route path="/auth/forgot-password" element={<><Navbar /><main className="flex-grow"><ForgotPassword /></main><Footer /></>} />
|
||||
<Route path="/auth/reset-password" element={<><Navbar /><main className="flex-grow"><ResetPassword /></main><Footer /></>} />
|
||||
|
||||
{/* Protected Routes */}
|
||||
<Route
|
||||
path="/dashboard"
|
||||
element={
|
||||
<ProtectedRoute>
|
||||
<><Navbar /><main className="flex-grow"><Dashboard /></main><Footer /></>
|
||||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
|
||||
<Route
|
||||
path="/admin"
|
||||
element={
|
||||
<ProtectedRoute>
|
||||
<><Navbar /><main className="flex-grow"><Admin /></main><Footer /></>
|
||||
</ProtectedRoute>
|
||||
}
|
||||
/>
|
||||
|
||||
{/* Demo Routes - These have their own custom layouts/navbars */}
|
||||
<Route path="/demos/sweetcraving" element={<SweetCraving />} />
|
||||
<Route path="/demos/bluewave" element={<BlueWave />} />
|
||||
<Route path="/demos/steelguard" element={<Steelguard />} />
|
||||
</Routes>
|
||||
|
||||
</div>
|
||||
</Router>
|
||||
</AuthProvider>
|
||||
);
|
||||
};
|
||||
|
||||
export default App;
|
||||
export default App;
|
||||
|
||||
Reference in New Issue
Block a user