diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index db217ff..50530e1 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -2,11 +2,11 @@ import React from "react"; import { BrowserRouter, Routes, Route } from "react-router-dom"; import Login from "./Login"; import Home from "./Home"; -import Assignment from "./Assignment"; -import Deposit from "./Deposit"; +import Assignment from "./pages/generation/Assignment"; +import Deposit from "./pages/generation/Deposit"; import Intro from "./Intro"; -import Admin from "./Admin"; -import Attendance from "./Attendance"; +import Admin from "./pages/admin/Admin"; +import Attendance from "./pages/generation/Attendance"; function App() { return ( diff --git a/frontend/src/Admin.jsx b/frontend/src/pages/admin/Admin.jsx similarity index 100% rename from frontend/src/Admin.jsx rename to frontend/src/pages/admin/Admin.jsx diff --git a/frontend/src/Assignment.jsx b/frontend/src/pages/generation/Assignment.jsx similarity index 85% rename from frontend/src/Assignment.jsx rename to frontend/src/pages/generation/Assignment.jsx index f24604a..d1c0115 100644 --- a/frontend/src/Assignment.jsx +++ b/frontend/src/pages/generation/Assignment.jsx @@ -1,10 +1,10 @@ import React, { useEffect, useState } from "react"; -import WeeklyListBlock from "./components/WeeklyListBlock"; -import Header from "./components/Header"; -import AssignmentInfoBlock from "./components/AssignmentInfoBlock"; +import WeeklyListBlock from "../../components/WeeklyListBlock"; +import Header from "../../components/Header"; +import AssignmentInfoBlock from "../../components/AssignmentInfoBlock"; import styles from "./Assignment.module.css"; -import { mapStatus } from "./utils/AssignmentStatus.js"; -import { fetchAssignmentsByUser } from "./api/assignment.js"; +import { mapStatus } from "../../utils/AssignmentStatus.js"; +import { fetchAssignmentsByUser } from "../../api/assignment.js"; const Assignment = () => { const [weeks, setWeeks] = useState([]); diff --git a/frontend/src/Assignment.module.css b/frontend/src/pages/generation/Assignment.module.css similarity index 100% rename from frontend/src/Assignment.module.css rename to frontend/src/pages/generation/Assignment.module.css diff --git a/frontend/src/Attendance.jsx b/frontend/src/pages/generation/Attendance.jsx similarity index 96% rename from frontend/src/Attendance.jsx rename to frontend/src/pages/generation/Attendance.jsx index 0e72c16..dce08b1 100644 --- a/frontend/src/Attendance.jsx +++ b/frontend/src/pages/generation/Attendance.jsx @@ -1,9 +1,9 @@ import { useEffect, useState } from "react"; -import Header from "./components/Header"; -import InputBlock from "./components/InputBlock"; -import AttendanceWeekInfo from "./components/AttendanceWeekInfo"; +import Header from "../../components/Header"; +import InputBlock from "../../components/InputBlock"; +import AttendanceWeekInfo from "../../components/AttendanceWeekInfo"; import styles from "./Attendance.module.css"; -import api from "./api/api"; +import api from "../../api/api"; const Attendance = () => { const [attendanceCode, setAttendanceCode] = useState([""]); diff --git a/frontend/src/Attendance.module.css b/frontend/src/pages/generation/Attendance.module.css similarity index 100% rename from frontend/src/Attendance.module.css rename to frontend/src/pages/generation/Attendance.module.css diff --git a/frontend/src/Deposit.jsx b/frontend/src/pages/generation/Deposit.jsx similarity index 94% rename from frontend/src/Deposit.jsx rename to frontend/src/pages/generation/Deposit.jsx index 3a84615..8b9c17b 100644 --- a/frontend/src/Deposit.jsx +++ b/frontend/src/pages/generation/Deposit.jsx @@ -1,8 +1,8 @@ -import Header from "./components/Header"; +import Header from "../../components/Header"; import styles from "./Deposit.module.css"; import axios from "axios"; import { useEffect, useState } from "react"; -import api from "./api/api"; +import api from "../../api/api"; const Deposit = () => { const [deposit, setDeposit] = useState(null); diff --git a/frontend/src/Deposit.module.css b/frontend/src/pages/generation/Deposit.module.css similarity index 100% rename from frontend/src/Deposit.module.css rename to frontend/src/pages/generation/Deposit.module.css