Skip to content

Commit 6807a48

Browse files
authored
Merge pull request #1418 from rit-construct-makerspace/ZZwatermelon/SpringCleaning
Spring Cleaning
2 parents 0defb78 + b7cc71d commit 6807a48

295 files changed

Lines changed: 447 additions & 2803 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

client/package.json

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@
3838
"use-immer": "^0.11.0",
3939
"uuid": "^8.3.2",
4040
"vite": "^7.1.11",
41-
"vite-plugin-eslint2": "^5.0.4",
42-
"web-vitals": "^2.1.4"
41+
"vite-plugin-eslint2": "^5.0.4"
4342
},
4443
"scripts": {
4544
"start": "vite",
@@ -85,4 +84,4 @@
8584
"typescript-eslint": "^8.39.0",
8685
"vite-bundle-analyzer": "^1.2.0"
8786
}
88-
}
87+
}

client/src/AppRouter.tsx

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ import LogoutPromptPage from "./pages/both/logout/LogoutPromptPage";
88
import TermsPage from "./pages/both/policy/TermsPage";
99
import UserSettingsPage from "./pages/both/user_page/user_settings/UserSettingsPage";
1010
import UserTraingingsPage from "./pages/both/user_page/user_trainings/UserTrainingsPage";
11-
import StorefrontPage from "./pages/lab_management/storefront/StorefrontPage";
12-
import StorefrontPreviewPage from "./pages/lab_management/storefront_preview/StorefrontPreviewPage";
1311
import HelpPage from "./pages/maker/signup/HelpPage";
1412
import SignupPage from "./pages/maker/signup/SignupPage";
1513
import MakerspacePage from "./pages/makerspace_page/MakerspacePage";
@@ -26,7 +24,6 @@ import NewAnnouncementPage from "./pages/lab_management/announcements/NewAnnounc
2624
import StaffBar from "./pages/makerspace_page/StaffBar";
2725
import UsersPage from "./pages/lab_management/users/UsersPage";
2826
import UserPage from "./pages/lab_management/users/UserPage";
29-
import { CartListPage } from "./pages/lab_management/storefront/internal/CartListPage";
3027
import TrainingModulesPage from "./pages/lab_management/training_modules/TrainingModulesPage";
3128
import NewModulePage from "./pages/lab_management/edit_module/NewModulePage";
3229
import EditActiveModulePage from "./pages/lab_management/edit_module/EditActiveModulePage";
@@ -37,7 +34,6 @@ import OrganizationsPage from "./pages/lab_management/organizations/Organization
3734
import ManageMakerspacePage from "./pages/makerspace_page/ManageMakerspacePage";
3835
import CurrencyPage from "./pages/lab_management/currency/CurrencyPage";
3936
import ManageRoomPage from "./pages/makerspace_page/MonitorRoomPage";
40-
import { CartPage } from "./pages/lab_management/storefront/internal/CartPage";
4137
import ManageEquipmentPage from "./pages/makerspace_page/equipment_pages/ManageEquipmentPage";
4238
import ReservationRequestPage from "./pages/makerspace_page/reservation_pages/ReservationRequestPage";
4339
import ManageReservationsPage from "./pages/makerspace_page/reservation_pages/ManageReservationsPage";
@@ -119,7 +115,6 @@ export const routes = [
119115
element: <AppRoot />,
120116
children: [
121117
{ path: "/signup", element: <SignupPage /> },
122-
{ path: "/admin/storefront/preview", element: <StorefrontPreviewPage /> },
123118

124119
/* Routes for the static displays around the makerspaces */
125120
{
@@ -141,7 +136,6 @@ export const routes = [
141136
{ path: "/makerspace/:makerspaceID", element: <MakerspacePage /> },
142137
{ path: "/terms", element: <TermsPage /> },
143138
{ path: "/help", element: <HelpPage /> },
144-
{ path: "/storefront", element: <StorefrontPage /> },
145139

146140
/* Routes that need to be protected by auth */
147141
{
@@ -162,8 +156,6 @@ export const routes = [
162156
children: [
163157
{ path: "/makerspace/:makerspaceID/people", element: <UsersPage /> },
164158
{ path: "/makerspace/:makerspaceID/people/:userID", element: <UserPage /> },
165-
{ path: "/makerspace/:makerspaceID/storefront/carts", element: <CartListPage /> },
166-
{ path: "/makerspace/:makerspaceID/storefront/carts/:cartID", element: <CartPage /> },
167159

168160
/* Routes for staff + higher */
169161
{
@@ -241,8 +233,6 @@ export const routes = [
241233
},
242234
/* END OF PROTECTED ROUTES */
243235

244-
{ path: "/storefront", element: <StorefrontPage /> },
245-
246236
{ path: "/logoutprompt", element: <LogoutPromptPage /> },
247237

248238
{ path: "*", element: <NotFoundPage /> },

client/src/common/ClientOnly.tsx

Lines changed: 0 additions & 23 deletions
This file was deleted.

client/src/common/DeleteButton.tsx

Lines changed: 0 additions & 25 deletions
This file was deleted.

client/src/common/InvItemCount.tsx

Lines changed: 0 additions & 20 deletions
This file was deleted.

client/src/common/InvItemNamePic.tsx

Lines changed: 0 additions & 14 deletions
This file was deleted.

client/src/common/PreviewInventoryRow.tsx

Lines changed: 0 additions & 29 deletions
This file was deleted.

client/src/common/TrainingModuleRow.tsx

Lines changed: 0 additions & 72 deletions
This file was deleted.

client/src/common/UseCurrentUser.ts

Whitespace-only changes.

client/src/pages/lab_management/storefront/AddToCartModal.tsx

Lines changed: 0 additions & 113 deletions
This file was deleted.

0 commit comments

Comments
 (0)