From 0339332a0d701f707b4d9f320637bea1315c8994 Mon Sep 17 00:00:00 2001 From: John Moore <126381092+John-Moore-UOA@users.noreply.github.com> Date: Mon, 4 Mar 2024 22:32:23 +1300 Subject: [PATCH 1/3] Update README.MD --- README.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.MD b/README.MD index d67ef56..7ef9fe6 100644 --- a/README.MD +++ b/README.MD @@ -18,7 +18,7 @@ FERN ## Branch convensions 1. One Branch per Task 2. Name branch VLT-/what-is-being-done, e.g. VLT-001/add-user-authentication - +3. Pull Requests will be into 'development-main' branch as 'main' is deployed ## Setup Runbook From 3f55cfa593cee0528596ee412c34efa7825550f3 Mon Sep 17 00:00:00 2001 From: John Moore <126381092+John-Moore-UOA@users.noreply.github.com> Date: Mon, 11 Mar 2024 18:21:15 +1300 Subject: [PATCH 2/3] Added folder structure with Temp MainMenu --- web/src/App.tsx | 7 +- web/src/components/NavBar.tsx | 19 +++++ web/src/index.css | 11 --- web/src/main.tsx | 2 +- web/src/pages/MainMenu.tsx | 14 ++++ web/src/styles/componentStyles/NavBar.css | 35 ++++++++++ web/src/styles/index.css | 85 +++++++++++++++++++++++ web/src/styles/pageStyles/MainMenu.css | 0 8 files changed, 160 insertions(+), 13 deletions(-) create mode 100644 web/src/components/NavBar.tsx delete mode 100644 web/src/index.css create mode 100644 web/src/pages/MainMenu.tsx create mode 100644 web/src/styles/componentStyles/NavBar.css create mode 100644 web/src/styles/index.css create mode 100644 web/src/styles/pageStyles/MainMenu.css diff --git a/web/src/App.tsx b/web/src/App.tsx index e97286c..d5eb3e3 100644 --- a/web/src/App.tsx +++ b/web/src/App.tsx @@ -2,12 +2,17 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { createBrowserRouter, RouterProvider } from 'react-router-dom'; import { useState } from 'react'; import Home from '@pages/Home'; +import MainMenu from '@pages/MainMenu'; const router = createBrowserRouter([ { path: '/:name', element: , }, + { + path: '/', + element: , + }, ]); export default function App() { @@ -17,4 +22,4 @@ export default function App() { ); -} +} \ No newline at end of file diff --git a/web/src/components/NavBar.tsx b/web/src/components/NavBar.tsx new file mode 100644 index 0000000..638c94a --- /dev/null +++ b/web/src/components/NavBar.tsx @@ -0,0 +1,19 @@ +// NavBar.js +import '../styles/componentStyles/NavBar.css'; + +function NavBar() { + return ( + + ); +} + +export default NavBar; diff --git a/web/src/index.css b/web/src/index.css deleted file mode 100644 index f576e08..0000000 --- a/web/src/index.css +++ /dev/null @@ -1,11 +0,0 @@ -@import url('https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&family=Open+Sans:wdth,wght@75..100,300..800&display=swap'); -@tailwind base; -@tailwind components; -@tailwind utilities; - -* { - margin: 0; - padding: 0; - box-sizing: border-box; - min-width: 0; -} diff --git a/web/src/main.tsx b/web/src/main.tsx index 93db379..637b72e 100644 --- a/web/src/main.tsx +++ b/web/src/main.tsx @@ -1,7 +1,7 @@ import React from 'react'; import ReactDOM from 'react-dom/client'; import App from './App.tsx'; -import './index.css'; +import './styles/index.css'; ReactDOM.createRoot(document.getElementById('root')!).render( diff --git a/web/src/pages/MainMenu.tsx b/web/src/pages/MainMenu.tsx new file mode 100644 index 0000000..06c80b5 --- /dev/null +++ b/web/src/pages/MainMenu.tsx @@ -0,0 +1,14 @@ +import React from 'react'; + +import NavBar from '../components/NavBar' + +import '../styles/pageStyles/MainMenu.css'; + + +function MainMenu() { + return ( + + ); +} + +export default MainMenu; diff --git a/web/src/styles/componentStyles/NavBar.css b/web/src/styles/componentStyles/NavBar.css new file mode 100644 index 0000000..88a330d --- /dev/null +++ b/web/src/styles/componentStyles/NavBar.css @@ -0,0 +1,35 @@ +/* NavBar.css */ + +/* Navigation Bar */ +.nav-bar { + background-color: #333; + padding: 1rem; + } + + .nav-content { + display: flex; + justify-content: space-between; + align-items: center; + } + + .site-title { + color: #fff; + font-size: 1.5rem; + } + + .nav-links { + display: flex; + gap: 1rem; + list-style-type: none; + } + + .nav-links li { + color: #fff; + font-size: 1rem; + cursor: pointer; + } + + .nav-links li:hover { + text-decoration: underline; + } + \ No newline at end of file diff --git a/web/src/styles/index.css b/web/src/styles/index.css new file mode 100644 index 0000000..944ea7a --- /dev/null +++ b/web/src/styles/index.css @@ -0,0 +1,85 @@ +@import url('https://fonts.googleapis.com/css2?family=Montserrat:ital,wght@0,100..900;1,100..900&family=Open+Sans:wdth,wght@75..100,300..800&display=swap'); +@tailwind base; +@tailwind components; +@tailwind utilities; +/* global.css */ + +/* Reset */ +body, h1, h2, h3, h4, h5, h6, p, ul, ol, li, button, input { + margin: 0; + padding: 0; + box-sizing: border-box; +} + +/* Typography */ +body { + font-family: 'Helvetica Neue', Arial, sans-serif; + font-size: 16px; + line-height: 1.6; +} + +h1 { + font-size: 2.5rem; + font-weight: 700; + line-height: 1.2; + margin-bottom: 1rem; +} + +h2 { + font-size: 2rem; + font-weight: 600; + margin-bottom: 1rem; +} + +h3 { + font-size: 1.75rem; + font-weight: 600; + margin-bottom: 1rem; +} + +p { + font-size: 1rem; + margin-bottom: 1rem; +} + +/* Links */ +a { + color: #007bff; + text-decoration: none; +} + +a:hover { + text-decoration: underline; +} + +/* Buttons */ +button { + cursor: pointer; + background-color: #007bff; + color: #fff; + border: none; + border-radius: 4px; + padding: 0.5rem 1rem; + font-size: 1rem; +} + +button:hover { + background-color: #0056b3; +} + +/* Containers */ +.container { + max-width: 1200px; + margin: 0 auto; + padding: 0 20px; +} + +/* Flexbox Utilities */ +.flex { + display: flex; +} + +.flex-center { + justify-content: center; + align-items: center; +} diff --git a/web/src/styles/pageStyles/MainMenu.css b/web/src/styles/pageStyles/MainMenu.css new file mode 100644 index 0000000..e69de29 From d6d93ce6d7e951b4475f2d08d229793d656566fd Mon Sep 17 00:00:00 2001 From: John Moore <126381092+John-Moore-UOA@users.noreply.github.com> Date: Mon, 8 Apr 2024 13:13:48 +1200 Subject: [PATCH 3/3] Update README.MD --- README.MD | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.MD b/README.MD index 768b8dc..b39f326 100644 --- a/README.MD +++ b/README.MD @@ -3,6 +3,7 @@ ## Tech Stack FERN + - Firebase - Express - React @@ -12,13 +13,13 @@ FERN 1. install node v21.6.2 (or >= v14.17.3) 2. install yarn -3. in ./api run yarn, then yarn build, then yarn dev (local host backend) +3. in ./api run yarn, then yarn build, then yarn dev (local host backend) 4. in ./web run yarn, then yarn build, then yarn dev (local host frontend) ## Branch convensions + 1. One Branch per Task 2. Name branch VOL-/what-is-being-done, e.g. VLT-001/add-user-authentication -3. Pull Requests will be into 'development-main' branch as 'main' is deployed ## Setup Runbook