From fa613b35270ccdd9f32a9ac1ed52cf2e7e5a705b Mon Sep 17 00:00:00 2001
From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com>
Date: Sun, 22 Sep 2024 12:40:37 -0400
Subject: [PATCH 1/4] Remove test page
---
apps/frontend/src/app.tsx | 5 -----
apps/frontend/src/containers/test.tsx | 12 ------------
2 files changed, 17 deletions(-)
delete mode 100644 apps/frontend/src/containers/test.tsx
diff --git a/apps/frontend/src/app.tsx b/apps/frontend/src/app.tsx
index a51df65b..aaf90f6e 100644
--- a/apps/frontend/src/app.tsx
+++ b/apps/frontend/src/app.tsx
@@ -4,7 +4,6 @@ import { createBrowserRouter, RouterProvider } from 'react-router-dom';
import apiClient from '@api/apiClient';
import Root from '@containers/root';
import NotFound from '@containers/404';
-import Test from '@containers/test';
const router = createBrowserRouter([
{
@@ -12,10 +11,6 @@ const router = createBrowserRouter([
element: ,
errorElement: ,
},
- {
- path: '/test',
- element: ,
- },
]);
export const App: React.FC = () => {
diff --git a/apps/frontend/src/containers/test.tsx b/apps/frontend/src/containers/test.tsx
deleted file mode 100644
index 28d48042..00000000
--- a/apps/frontend/src/containers/test.tsx
+++ /dev/null
@@ -1,12 +0,0 @@
-// import { Button } from '@shared/src/components/button';
-
-const Test: React.FC = () => {
- return (
- <>
-
I am test page
- {/* */}
- >
- );
-};
-
-export default Test;
From 090e4988705e477f7eeb7800d5ebd2564251d638 Mon Sep 17 00:00:00 2001
From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com>
Date: Sun, 22 Sep 2024 19:44:58 -0400
Subject: [PATCH 2/4] Add new pages
---
apps/frontend/src/containers/landingPage.tsx | 5 +++++
apps/frontend/src/containers/orders.tsx | 5 +++++
apps/frontend/src/containers/pantries.tsx | 5 +++++
apps/frontend/src/containers/pantryOverview.tsx | 5 +++++
apps/frontend/src/containers/pantryPastOrders.tsx | 5 +++++
5 files changed, 25 insertions(+)
create mode 100644 apps/frontend/src/containers/landingPage.tsx
create mode 100644 apps/frontend/src/containers/orders.tsx
create mode 100644 apps/frontend/src/containers/pantries.tsx
create mode 100644 apps/frontend/src/containers/pantryOverview.tsx
create mode 100644 apps/frontend/src/containers/pantryPastOrders.tsx
diff --git a/apps/frontend/src/containers/landingPage.tsx b/apps/frontend/src/containers/landingPage.tsx
new file mode 100644
index 00000000..0e1a72b4
--- /dev/null
+++ b/apps/frontend/src/containers/landingPage.tsx
@@ -0,0 +1,5 @@
+const LandingPage: React.FC = () => {
+ return <>Landing page>;
+};
+
+export default LandingPage;
diff --git a/apps/frontend/src/containers/orders.tsx b/apps/frontend/src/containers/orders.tsx
new file mode 100644
index 00000000..b4aa4db9
--- /dev/null
+++ b/apps/frontend/src/containers/orders.tsx
@@ -0,0 +1,5 @@
+const Orders: React.FC = () => {
+ return <>Orders>;
+};
+
+export default Orders;
diff --git a/apps/frontend/src/containers/pantries.tsx b/apps/frontend/src/containers/pantries.tsx
new file mode 100644
index 00000000..91e9e22d
--- /dev/null
+++ b/apps/frontend/src/containers/pantries.tsx
@@ -0,0 +1,5 @@
+const Pantries: React.FC = () => {
+ return <>Pantries>;
+};
+
+export default Pantries;
diff --git a/apps/frontend/src/containers/pantryOverview.tsx b/apps/frontend/src/containers/pantryOverview.tsx
new file mode 100644
index 00000000..aceb09a5
--- /dev/null
+++ b/apps/frontend/src/containers/pantryOverview.tsx
@@ -0,0 +1,5 @@
+const PantryOverview: React.FC = () => {
+ return <>Pantry overview>;
+};
+
+export default PantryOverview;
diff --git a/apps/frontend/src/containers/pantryPastOrders.tsx b/apps/frontend/src/containers/pantryPastOrders.tsx
new file mode 100644
index 00000000..260a492f
--- /dev/null
+++ b/apps/frontend/src/containers/pantryPastOrders.tsx
@@ -0,0 +1,5 @@
+const PantryPastOrders: React.FC = () => {
+ return <>Pantry past orders>;
+};
+
+export default PantryPastOrders;
From d31a1ec11f6458ce824fc9a7e0d0099cea08dc9d Mon Sep 17 00:00:00 2001
From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com>
Date: Sun, 22 Sep 2024 20:03:24 -0400
Subject: [PATCH 3/4] Add routes for new pages
---
apps/frontend/src/app.tsx | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/apps/frontend/src/app.tsx b/apps/frontend/src/app.tsx
index aaf90f6e..4b419f1a 100644
--- a/apps/frontend/src/app.tsx
+++ b/apps/frontend/src/app.tsx
@@ -4,12 +4,39 @@ import { createBrowserRouter, RouterProvider } from 'react-router-dom';
import apiClient from '@api/apiClient';
import Root from '@containers/root';
import NotFound from '@containers/404';
+import LandingPage from '@containers/landingPage';
+import PantryOverview from '@containers/pantryOverview';
+import PantryPastOrders from '@containers/pantryPastOrders';
+import Pantries from '@containers/pantries';
+import Orders from '@containers/orders';
const router = createBrowserRouter([
{
path: '/',
element: ,
errorElement: ,
+ children: [
+ {
+ path: '/landing-page',
+ element: ,
+ },
+ {
+ path: '/pantry-overview',
+ element: ,
+ },
+ {
+ path: '/pantry-past-orders',
+ element: ,
+ },
+ {
+ path: '/pantries',
+ element: ,
+ },
+ {
+ path: '/orders',
+ element: ,
+ },
+ ],
},
]);
From 0f707883758629d3f7650aa38d045bb6e51ba9ca Mon Sep 17 00:00:00 2001
From: Sam Schumacher <42777208+sam-schu@users.noreply.github.com>
Date: Sun, 22 Sep 2024 22:02:30 -0400
Subject: [PATCH 4/4] Remove template test file
---
apps/frontend/src/app.spec.tsx | 15 ---------------
1 file changed, 15 deletions(-)
delete mode 100644 apps/frontend/src/app.spec.tsx
diff --git a/apps/frontend/src/app.spec.tsx b/apps/frontend/src/app.spec.tsx
deleted file mode 100644
index 95caf44d..00000000
--- a/apps/frontend/src/app.spec.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import { render } from '@testing-library/react';
-
-import App from './app';
-
-describe('App', () => {
- it('should render successfully', () => {
- const { baseElement } = render();
- expect(baseElement).toBeTruthy();
- });
-
- it('should have a greeting as the title', () => {
- const { getByText } = render();
- expect(getByText(/Welcome frontend/gi)).toBeTruthy();
- });
-});