Skip to content

Commit b7d4f8a

Browse files
larslllarsll
committed
Fix context sequence
1 parent a94ac4d commit b7d4f8a

File tree

2 files changed

+191
-184
lines changed

2 files changed

+191
-184
lines changed

‎website/src/app.tsx

+174-172
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import LoginPage from "./pages/login";
1414
import EditNetworkPage from "./pages/edit-network";
1515
import UpdateNetworkPage from "./pages/update-network";
1616
import SystemUnavailablePage from "./pages/system-unavailable";
17-
import { ContextProvider, AuthProvider } from "./components/context-provider";
17+
import { ContextProvider, AuthProvider, ApiProvider } from "./components/context-provider";
1818

1919
// Protected Route wrapper component
2020
const ProtectedRoute = ({ children }: { children: JSX.Element }) => {
@@ -37,178 +37,180 @@ export default function App() {
3737
<div style={{ height: "100%" }}>
3838
<AuthProvider>
3939
<Router>
40-
<ContextProvider>
41-
<GlobalHeader />
42-
<div style={{ height: "56px", backgroundColor: "#000716" }}>&nbsp;</div>
43-
<div>
44-
<Routes>
45-
{/* Public routes */}
46-
<Route path="/login" element={<LoginPage />} />
47-
<Route path="/system-unavailable" element={<SystemUnavailablePage />} />
48-
<Route path="/logout" element={<LoginPage />} />
40+
<ApiProvider>
41+
<ContextProvider>
42+
<GlobalHeader />
43+
<div style={{ height: "56px", backgroundColor: "#000716" }}>&nbsp;</div>
44+
<div>
45+
<Routes>
46+
{/* Public routes */}
47+
<Route path="/login" element={<LoginPage />} />
48+
<Route path="/system-unavailable" element={<SystemUnavailablePage />} />
49+
<Route path="/logout" element={<LoginPage />} />
4950

50-
{/* Protected routes */}
51-
{isDeepracerAws ? (
52-
<Route
53-
path="*"
54-
element={
55-
<ProtectedRoute>
56-
<UpdateNetworkPage />
57-
</ProtectedRoute>
58-
}
59-
/>
60-
) : (
61-
<>
62-
<Route
63-
path="/logs"
64-
element={
65-
<ProtectedRoute>
66-
<LogsPage />
67-
</ProtectedRoute>
68-
}
69-
/>
70-
<Route
71-
path="/settings"
72-
element={
73-
<ProtectedRoute>
74-
<SettingsPage />
75-
</ProtectedRoute>
76-
}
77-
/>
78-
<Route
79-
path="/edit-network"
80-
element={
81-
<ProtectedRoute>
82-
<EditNetworkPage />
83-
</ProtectedRoute>
84-
}
85-
/>
86-
<Route
87-
path="/calibration"
88-
element={
89-
<ProtectedRoute>
90-
<CalibrationPage />
91-
</ProtectedRoute>
92-
}
93-
/>
94-
<Route
95-
path="/recalibrate-steering"
96-
element={
97-
<ProtectedRoute>
98-
<RecalibrateSteeringPage />
99-
</ProtectedRoute>
100-
}
101-
/>
102-
<Route
103-
path="/ground"
104-
element={
105-
<ProtectedRoute>
106-
<RecalibrateSteeringPage />
107-
</ProtectedRoute>
108-
}
109-
/>
110-
<Route
111-
path="/center"
112-
element={
113-
<ProtectedRoute>
114-
<RecalibrateSteeringPage />
115-
</ProtectedRoute>
116-
}
117-
/>
118-
<Route
119-
path="/left"
120-
element={
121-
<ProtectedRoute>
122-
<RecalibrateSteeringPage />
123-
</ProtectedRoute>
124-
}
125-
/>
126-
<Route
127-
path="/right"
128-
element={
129-
<ProtectedRoute>
130-
<RecalibrateSteeringPage />
131-
</ProtectedRoute>
132-
}
133-
/>
134-
<Route
135-
path="/recalibrate-speed"
136-
element={
137-
<ProtectedRoute>
138-
<RecalibrateSpeedPage />
139-
</ProtectedRoute>
140-
}
141-
/>
142-
<Route
143-
path="/raise"
144-
element={
145-
<ProtectedRoute>
146-
<RecalibrateSpeedPage />
147-
</ProtectedRoute>
148-
}
149-
/>
150-
<Route
151-
path="/stopped"
152-
element={
153-
<ProtectedRoute>
154-
<RecalibrateSpeedPage />
155-
</ProtectedRoute>
156-
}
157-
/>
158-
<Route
159-
path="/direction"
160-
element={
161-
<ProtectedRoute>
162-
<RecalibrateSpeedPage />
163-
</ProtectedRoute>
164-
}
165-
/>
166-
<Route
167-
path="/forward"
168-
element={
169-
<ProtectedRoute>
170-
<RecalibrateSpeedPage />
171-
</ProtectedRoute>
172-
}
173-
/>
174-
<Route
175-
path="/backward"
176-
element={
177-
<ProtectedRoute>
178-
<RecalibrateSpeedPage />
179-
</ProtectedRoute>
180-
}
181-
/>
182-
<Route
183-
path="/models"
184-
element={
185-
<ProtectedRoute>
186-
<ModelsPage />
187-
</ProtectedRoute>
188-
}
189-
/>
190-
<Route
191-
path="/home"
192-
element={
193-
<ProtectedRoute>
194-
<HomePage />
195-
</ProtectedRoute>
196-
}
197-
/>
198-
<Route
199-
path="/"
200-
element={
201-
<ProtectedRoute>
202-
<HomePage />
203-
</ProtectedRoute>
204-
}
205-
/>
206-
<Route path="*" element={<NotFound />} />
207-
</>
208-
)}
209-
</Routes>
210-
</div>
211-
</ContextProvider>
51+
{/* Protected routes */}
52+
{isDeepracerAws ? (
53+
<Route
54+
path="*"
55+
element={
56+
<ProtectedRoute>
57+
<UpdateNetworkPage />
58+
</ProtectedRoute>
59+
}
60+
/>
61+
) : (
62+
<>
63+
<Route
64+
path="/logs"
65+
element={
66+
<ProtectedRoute>
67+
<LogsPage />
68+
</ProtectedRoute>
69+
}
70+
/>
71+
<Route
72+
path="/settings"
73+
element={
74+
<ProtectedRoute>
75+
<SettingsPage />
76+
</ProtectedRoute>
77+
}
78+
/>
79+
<Route
80+
path="/edit-network"
81+
element={
82+
<ProtectedRoute>
83+
<EditNetworkPage />
84+
</ProtectedRoute>
85+
}
86+
/>
87+
<Route
88+
path="/calibration"
89+
element={
90+
<ProtectedRoute>
91+
<CalibrationPage />
92+
</ProtectedRoute>
93+
}
94+
/>
95+
<Route
96+
path="/recalibrate-steering"
97+
element={
98+
<ProtectedRoute>
99+
<RecalibrateSteeringPage />
100+
</ProtectedRoute>
101+
}
102+
/>
103+
<Route
104+
path="/ground"
105+
element={
106+
<ProtectedRoute>
107+
<RecalibrateSteeringPage />
108+
</ProtectedRoute>
109+
}
110+
/>
111+
<Route
112+
path="/center"
113+
element={
114+
<ProtectedRoute>
115+
<RecalibrateSteeringPage />
116+
</ProtectedRoute>
117+
}
118+
/>
119+
<Route
120+
path="/left"
121+
element={
122+
<ProtectedRoute>
123+
<RecalibrateSteeringPage />
124+
</ProtectedRoute>
125+
}
126+
/>
127+
<Route
128+
path="/right"
129+
element={
130+
<ProtectedRoute>
131+
<RecalibrateSteeringPage />
132+
</ProtectedRoute>
133+
}
134+
/>
135+
<Route
136+
path="/recalibrate-speed"
137+
element={
138+
<ProtectedRoute>
139+
<RecalibrateSpeedPage />
140+
</ProtectedRoute>
141+
}
142+
/>
143+
<Route
144+
path="/raise"
145+
element={
146+
<ProtectedRoute>
147+
<RecalibrateSpeedPage />
148+
</ProtectedRoute>
149+
}
150+
/>
151+
<Route
152+
path="/stopped"
153+
element={
154+
<ProtectedRoute>
155+
<RecalibrateSpeedPage />
156+
</ProtectedRoute>
157+
}
158+
/>
159+
<Route
160+
path="/direction"
161+
element={
162+
<ProtectedRoute>
163+
<RecalibrateSpeedPage />
164+
</ProtectedRoute>
165+
}
166+
/>
167+
<Route
168+
path="/forward"
169+
element={
170+
<ProtectedRoute>
171+
<RecalibrateSpeedPage />
172+
</ProtectedRoute>
173+
}
174+
/>
175+
<Route
176+
path="/backward"
177+
element={
178+
<ProtectedRoute>
179+
<RecalibrateSpeedPage />
180+
</ProtectedRoute>
181+
}
182+
/>
183+
<Route
184+
path="/models"
185+
element={
186+
<ProtectedRoute>
187+
<ModelsPage />
188+
</ProtectedRoute>
189+
}
190+
/>
191+
<Route
192+
path="/home"
193+
element={
194+
<ProtectedRoute>
195+
<HomePage />
196+
</ProtectedRoute>
197+
}
198+
/>
199+
<Route
200+
path="/"
201+
element={
202+
<ProtectedRoute>
203+
<HomePage />
204+
</ProtectedRoute>
205+
}
206+
/>
207+
<Route path="*" element={<NotFound />} />
208+
</>
209+
)}
210+
</Routes>
211+
</div>
212+
</ContextProvider>
213+
</ApiProvider>
212214
</Router>
213215
</AuthProvider>
214216
</div>

0 commit comments

Comments
 (0)