deconflict naming

appventure-nush · Oct 24, 2024 · 3fe33ab · 3fe33ab
1 parent d6caa81
commit 3fe33ab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/frontend/src/main.tsx b/frontend/src/main.tsx
@@ -21,7 +21,8 @@ import BoothMainPage from "./routes/booth_main_view";
 import BoothConfirmPaymentPage from "./routes/booth_confirm_payment_view";
 import AdminPage from "./routes/admin_view";
 import UserProvider from "./UserProvider";
-import StudentTransactionPage from "./routes/student_transactions_view";
+import StudentTransactionHistoryPage from "./routes/student_transactions_view";
+import StudentTopupHistoryPage from "./routes/student_topups_view";
 
 const router = createBrowserRouter([
   {
@@ -51,11 +52,11 @@ const router = createBrowserRouter([
       },
       {
         path: "/student/transactions",
-        element: <StudentTransactionPage />,
+        element: <StudentTransactionHistoryPage />,
       },
       {
         path: "/student/topups",
-        element: <StudentTopupPage />,
+        element: <StudentTopupHistoryPage />,
       },
       {
         path: "/booth",

diff --git a/frontend/src/routes/student_topups_view.tsx b/frontend/src/routes/student_topups_view.tsx
@@ -8,7 +8,7 @@ import { UserContext } from "../UserProvider";
 import { getTopupHistory } from "../api";
 import { TopupHistoryDetails } from "../types/topup";
 
-export default function StudentTopupPage() {
+export default function StudentTopupHistoryPage() {
   const navigate = useNavigate();
   const { user } = useContext(UserContext);
   const [topupDetails, setTopupDetails] = useState<

diff --git a/frontend/src/routes/student_transactions_view.tsx b/frontend/src/routes/student_transactions_view.tsx
@@ -8,7 +8,7 @@ import { UserContext } from "../UserProvider";
 import { TransactionHistoryDetails } from "../types/transaction";
 import { getTransactionHistory } from "../api";
 
-export default function StudentTransactionPage() {
+export default function StudentTransactionHistoryPage() {
   const navigate = useNavigate();
   const { user } = useContext(UserContext);
   const [transactionDetails, setTransactionDetails] = useState<