Skip to content

Commit 322e6a8

Browse files
committed
update import, refactor code
1 parent b16b067 commit 322e6a8

33 files changed

Lines changed: 149 additions & 1937 deletions

frontend/src/App.tsx

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { LanguageProvider } from "./contexts/LanguageContext";
1717
import { Header } from "./components/layout/Header";
1818
import { Footer } from "./components/layout/Footer";
1919
import { ProtectedRoute } from "./components/ProtectedRoute";
20-
import Modal from "./components/ui/Modal";
20+
import { Modal } from "./components/ui";
2121

2222
// Context and Hooks
2323
import { ModalProvider, useModal } from "./contexts/ModalContext";
@@ -26,26 +26,25 @@ import { ModalProvider, useModal } from "./contexts/ModalContext";
2626
import { LandingPage } from "./pages/LandingPage";
2727
import { AuthForm } from "./pages/AuthForm";
2828
import { DocumentLibrary } from "./pages/DocumentLibrary";
29-
import { IeltsCenter } from "./pages/IeltsCenter";
30-
import { IeltsSubmissionsList } from "./pages/IeltsSubmissionsList";
31-
import { IeltsSubmissionDetail } from "./pages/IeltsSubmissionDetail";
32-
import { OnlineQuizzes } from "./pages/OnlineQuizzes";
33-
import { QuizManagement } from "./pages/QuizManagement";
34-
import { QuizDashboardPage } from "./pages/QuizDashboardPage";
35-
import { QuizSubmissionView } from "./pages/QuizSubmissionView";
29+
import { IeltsView } from "./pages/IeltsView";
30+
import { IeltsReadingSubmissionsList } from "./pages/IeltsReadingSubmissionsList";
31+
import { IeltsReadingSubmissionDetail } from "./pages/IeltsReadingSubmissionDetail";
32+
import { QuizListStudentView } from "./pages/QuizListStudentView";
33+
import { QuizManagementTeacherView } from "./pages/QuizManagementTeacherView";
34+
import { QuizDashboardTeacherView } from "./pages/QuizDashboardTeacherView";
35+
import { QuizSubmissionsTeacherView } from "./pages/QuizSubmissionsTeacherView";
3636
import { WritingGrader } from "./pages/WritingGrader";
37-
import { ExerciseEditor } from "./pages/ExerciseEditor";
38-
import { ExerciseDetailView } from "./pages/ExerciseDetailView";
39-
import { SubmissionsList } from "./pages/SubmissionsList";
40-
import { StudentSubmissionDetail } from "./pages/StudentSubmissionDetail";
41-
import { TeacherSubmissionView } from "./pages/TeacherSubmissionView";
42-
import { QuizStudentReview } from "./pages/QuizStudentReview";
37+
import { ExerciseListTeacherView } from "./pages/ExerciseListTeacherView";
38+
import { ExerciseDetailStudentView } from "./pages/ExerciseDetailStudentView";
39+
import { ExerciseSubmissionListTeacherView } from "./pages/ExerciseSubmissionListTeacherView";
40+
import { TeacherSubmissionView } from "./pages/ExerciseSubmissionDetailTeacherView";
41+
import { QuizStudentReview } from "./pages/QuizReviewStudentView";
4342
import { IeltsTestPlayer } from "./pages/IeltsTestPlayer";
44-
import { IeltsResultPage } from "./pages/IeltsResultPage";
4543
import { IeltsWritingResultPage } from "./pages/IeltsWritingResultPage";
4644
import { IeltsWritingSubmissionsList } from "./pages/IeltsWritingSubmissionsList";
4745
import { IeltsWritingSubmissionDetail } from "./pages/IeltsWritingSubmissionDetail";
4846
import { Role } from "./types/api";
47+
import { IeltsResultStudentView } from "./pages/IeltsResultStudentView";
4948

5049
const RoleBasedRedirect = () => {
5150
const { user } = useAuth();
@@ -157,7 +156,7 @@ function AppContent() {
157156
setMobileMenuOpen={setMobileMenuOpen}
158157
/>
159158
<main>
160-
<ExerciseEditor />
159+
<ExerciseListTeacherView />
161160
</main>
162161
</ProtectedRoute>
163162
}
@@ -173,7 +172,7 @@ function AppContent() {
173172
setMobileMenuOpen={setMobileMenuOpen}
174173
/>
175174
<main>
176-
<ExerciseDetailView />
175+
<ExerciseDetailStudentView />
177176
</main>
178177
</ProtectedRoute>
179178
}
@@ -189,7 +188,7 @@ function AppContent() {
189188
setMobileMenuOpen={setMobileMenuOpen}
190189
/>
191190
<main>
192-
<SubmissionsList />
191+
<ExerciseSubmissionListTeacherView />
193192
</main>
194193
</ProtectedRoute>
195194
}
@@ -221,7 +220,7 @@ function AppContent() {
221220
setMobileMenuOpen={setMobileMenuOpen}
222221
/>
223222
<main>
224-
<StudentSubmissionDetail />
223+
<QuizSubmissionsTeacherView />
225224
</main>
226225
</ProtectedRoute>
227226
}
@@ -253,7 +252,7 @@ function AppContent() {
253252
setMobileMenuOpen={setMobileMenuOpen}
254253
/>
255254
<main>
256-
<OnlineQuizzes />
255+
<QuizListStudentView />
257256
</main>
258257
</ProtectedRoute>
259258
}
@@ -269,7 +268,7 @@ function AppContent() {
269268
setMobileMenuOpen={setMobileMenuOpen}
270269
/>
271270
<main>
272-
<QuizManagement />
271+
<QuizManagementTeacherView />
273272
</main>
274273
</ProtectedRoute>
275274
}
@@ -285,7 +284,7 @@ function AppContent() {
285284
setMobileMenuOpen={setMobileMenuOpen}
286285
/>
287286
<main>
288-
<QuizDashboardPage />
287+
<QuizDashboardTeacherView />
289288
</main>
290289
</ProtectedRoute>
291290
}
@@ -301,7 +300,7 @@ function AppContent() {
301300
setMobileMenuOpen={setMobileMenuOpen}
302301
/>
303302
<main>
304-
<QuizSubmissionView />
303+
<QuizSubmissionsTeacherView />
305304
</main>
306305
</ProtectedRoute>
307306
}
@@ -328,7 +327,7 @@ function AppContent() {
328327
element={
329328
<ProtectedRoute>
330329
<main>
331-
<OnlineQuizzes />
330+
<QuizListStudentView />
332331
</main>
333332
</ProtectedRoute>
334333
}
@@ -343,7 +342,7 @@ function AppContent() {
343342
setMobileMenuOpen={setMobileMenuOpen}
344343
/>
345344
<main>
346-
<OnlineQuizzes />
345+
<QuizListStudentView />
347346
</main>
348347
</ProtectedRoute>
349348
}
@@ -359,7 +358,7 @@ function AppContent() {
359358
setMobileMenuOpen={setMobileMenuOpen}
360359
/>
361360
<main>
362-
<IeltsCenter />
361+
<IeltsView />
363362
</main>
364363
</ProtectedRoute>
365364
}
@@ -374,7 +373,7 @@ function AppContent() {
374373
setMobileMenuOpen={setMobileMenuOpen}
375374
/>
376375
<main>
377-
<IeltsSubmissionsList />
376+
<IeltsReadingSubmissionsList />
378377
</main>
379378
</ProtectedRoute>
380379
}
@@ -389,7 +388,7 @@ function AppContent() {
389388
setMobileMenuOpen={setMobileMenuOpen}
390389
/>
391390
<main>
392-
<IeltsSubmissionDetail />
391+
<IeltsReadingSubmissionDetail />
393392
</main>
394393
</ProtectedRoute>
395394
}
@@ -411,7 +410,7 @@ function AppContent() {
411410
element={
412411
<ProtectedRoute>
413412
<main>
414-
<IeltsResultPage />
413+
<IeltsResultStudentView />
415414
</main>
416415
</ProtectedRoute>
417416
}

0 commit comments

Comments
 (0)