fixed build issues

UoaWDCC · Jun 6, 2024 · 1d655ee · 1d655ee
1 parent 15ff30f
commit 1d655ee
Show file tree

Hide file tree

Showing 3 changed files with 279 additions and 74 deletions.
diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -1,20 +1,21 @@
-import { Outlet } from 'react-router-dom';
-import Header from './components/Header';
-import Footer from './components/Footer';
+import { Outlet } from "react-router-dom";
+import Header from "./components/Header";
+import Footer from "./components/Footer";
 
 const App = () => {
   return (
-      <>
-        {/* <Header /> */}
-        <main className="py-3">
-          {/* <div className="max-w-6xl mx-auto px-4"> */}
+    <>
+      <Header />
+      <main className="py-3">
+        <div className="max-w-6xl mx-auto px-4">
           <div>
             <Outlet />
           </div>
-        </main>
-        {/* <Footer /> */}
-      </>
+        </div>
+      </main>
+      <Footer />
+    </>
   );
-}
+};
 
 export default App;
diff --git a/web/src/screens/HomeScreen.tsx b/web/src/screens/HomeScreen.tsx
@@ -1,10 +1,10 @@
-import { useQuery } from '@tanstack/react-query';
-import QueryKeys from '@utils/queryKeys';
-import axios from 'axios';
-import { useParams } from 'react-router';
-import urls from '@utils/urls';
-import auisLogo from '../assets/peacock.png'
-import auisAbbrev from '../assets/AUIS_black 3.png'
+import { useQuery } from "@tanstack/react-query";
+import QueryKeys from "@utils/queryKeys";
+import axios from "axios";
+import { useParams } from "react-router";
+import urls from "@utils/urls";
+import auisLogo from "../assets/peacock.png";
+import auisAbbrev from "../assets/AUIS_black 3.png";
 
 export default function HomeScreen() {
   const { name } = useParams();
@@ -13,7 +13,7 @@ export default function HomeScreen() {
     queryKey: [QueryKeys.GetIntro, name],
     queryFn: async () => {
       const { data } = await axios(`/hello/${name}`, {
-        method: 'get',
+        method: "get",
         baseURL: urls.apiUrl,
       });
       return data;
@@ -26,24 +26,29 @@ export default function HomeScreen() {
   if (isError) {
     return <div>Error: {error.name}</div>;
   }
-  // return <div>{data}</div>;
-  return <div>
-    <div className="hero min-h-screen w-screen bg-gradient-to-br from-orange-500 to-orange-50"> 
-      <div className="h-screen hero-content flex-row">
-        <div className='grid grid-cols-1 md:grid-cols-2 place-items-center'>
 
-          <div className='grid grid-rows-3 place-items-center'>
-            <img src={auisAbbrev} className="h-auto max-w-lg rounded-lg" />
-            <p className='py: text-3xl text-black text-center font-bold justify-self-stretch pt-6'>Not a member?</p>
-            <div className='btn text-red-50 justify-self-stretch'>Sign-Up</div>
-          </div>
+  return (
+    <div>
+      <div>{data}</div>;
+      <div className="hero min-h-screen w-screen bg-gradient-to-br from-orange-500 to-orange-50">
+        <div className="h-screen hero-content flex-row">
+          <div className="grid grid-cols-1 md:grid-cols-2 place-items-center">
+            <div className="grid grid-rows-3 place-items-center">
+              <img src={auisAbbrev} className="h-auto max-w-lg rounded-lg" />
+              <p className="py: text-3xl text-black text-center font-bold justify-self-stretch pt-6">
+                Not a member?
+              </p>
+              <div className="btn text-red-50 justify-self-stretch">
+                Sign-Up
+              </div>
+            </div>
 
-          <div>
-            <img src={auisLogo} className="ml-70" />
+            <div>
+              <img src={auisLogo} className="ml-70" />
+            </div>
           </div>
-
         </div>
-  </div>
-</div>
-  </div>;
+      </div>
+    </div>
+  );
 }