Skip to content

Commit

Permalink
Merge pull request #35 from UoaWDCC/feat/karmveer/web-structure
Browse files Browse the repository at this point in the history
Made the structure for web folder
  • Loading branch information
gmat224 authored Apr 17, 2024
2 parents 38c5bdb + c365fdc commit ba25738
Show file tree
Hide file tree
Showing 8 changed files with 4,511 additions and 523 deletions.
4,121 changes: 4,121 additions & 0 deletions web/package-lock.json

Large diffs are not rendered by default.

31 changes: 15 additions & 16 deletions web/src/App.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,19 @@
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { createBrowserRouter, RouterProvider } from 'react-router-dom';
import { useState } from 'react';
import Home from '@pages/Home';
import { Outlet } from 'react-router-dom';
import Header from './components/Header';
import Footer from './components/Footer';

const router = createBrowserRouter([
{
path: '/:name',
element: <Home />,
},
]);

export default function App() {
const [queryClient] = useState(() => new QueryClient());
const App = () => {
return (
<QueryClientProvider client={queryClient}>
<RouterProvider router={router} />
</QueryClientProvider>
<>
<Header />
<main className="py-3">
<div className="max-w-6xl mx-auto px-4">
<Outlet />
</div>
</main>
<Footer />
</>
);
}

export default App;
10 changes: 10 additions & 0 deletions web/src/components/Footer.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
function Footer() {
const currentTime = new Date().getFullYear();
return (
<footer>
<h1>Footer | {currentTime}</h1>
</footer>
)
}

export default Footer
11 changes: 11 additions & 0 deletions web/src/components/Header.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@

function Header() {

return (
<header>
<h1>Header</h1>
</header>
)
}

export default Header
28 changes: 25 additions & 3 deletions web/src/main.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,32 @@
import React from 'react';
import ReactDOM from 'react-dom/client';
import { createBrowserRouter, createRoutesFromElements, Route } from 'react-router-dom';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { RouterProvider } from 'react-router-dom';

import App from './App.tsx';
import './index.css';

import HomeScreen from "./screens/Home.tsx"
import TestScreen from "./screens/Test.tsx"


//Add any routes for screens below
const router = createBrowserRouter(
createRoutesFromElements(
<Route path="/" element={<App />}>
<Route index={true} element={<HomeScreen />} />
<Route path="/test" element={<TestScreen />} />
</Route>
)
);

const queryClient = new QueryClient();

ReactDOM.createRoot(document.getElementById('root')!).render(
<React.StrictMode>
<App />
</React.StrictMode>
<React.StrictMode>
<QueryClientProvider client={queryClient}>
<RouterProvider router={router} />
</QueryClientProvider>
</React.StrictMode>
);
File renamed without changes.
9 changes: 9 additions & 0 deletions web/src/screens/Test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
function TestScreen() {
return (
<div>
<h2> Test Screen</h2>
</div>
)
}

export default TestScreen
824 changes: 320 additions & 504 deletions web/yarn.lock

Large diffs are not rendered by default.

0 comments on commit ba25738

Please sign in to comment.