diff --git a/web/src/App.tsx b/web/src/App.tsx
index 45cd5700..ab2fb994 100644
--- a/web/src/App.tsx
+++ b/web/src/App.tsx
@@ -1,21 +1,19 @@
-import { Outlet } from 'react-router-dom';
-import Header from './components/Header';
-import Footer from './components/Footer';
-import Exec from './components/ExecInfo';
+import { Outlet } from "react-router-dom";
+import Header from "./components/Header";
+import Footer from "./components/Footer";
const App = () => {
return (
- <>
-
-
-
-
-
-
-
-
- >
+ <>
+
+
+
+
+
+
+
+ >
);
-}
+};
export default App;
diff --git a/web/src/components/ExecInfo.tsx b/web/src/components/ExecInfo.tsx
index 2acf919e..a98755c9 100644
--- a/web/src/components/ExecInfo.tsx
+++ b/web/src/components/ExecInfo.tsx
@@ -1,64 +1,12 @@
-import ExecCard from '../screens/ExecScreen'
-
-interface Exec {
- id: number;
- image: string;
- position: string;
- name: string;
- bio: string;
-}
-
-const execs: Exec[] = [
- {
- id: 1,
- image: 'exec.png',
- position: 'President',
- name: 'Manas Sonar',
- bio: 'Consectetur adipiscing elit',
- },
- {
- id: 2,
- image: 'exec.png',
- position: 'Vice-President',
- name: 'Sanchani Brabhaharan',
- bio: 'Consectetur adipiscing elit...',
- },
- {
- id: 3,
- image: 'exec.png',
- position: 'Secretary',
- name: 'Diya Chottera',
- bio: 'Consectetur adipiscing elit...',
- },
- {
- id: 4,
- image: 'exec.png',
- position: 'Treasurer',
- name: 'Krish Kumar',
- bio: 'Consectetur adipiscing elit...',
- },
- {
- id: 5,
- image: 'exec.png',
- position: 'Secretary',
- name: 'Diya Chottera',
- bio: 'Consectetur adipiscing elit...',
- },
- {
- id: 6,
- image: 'exec.png',
- position: 'Treasurer',
- name: 'Krish Kumar',
- bio: 'Consectetur adipiscing elit...',
- },
-];
+import { execs } from "../data/data";
+import ExecCard from "../screens/ExecScreen";
function ExecScreen() {
- return (
-
-
-
- );
+ return (
+
+
+
+ );
}
export default ExecScreen;
diff --git a/web/src/components/Footer.tsx b/web/src/components/Footer.tsx
index a0cc46ea..d7c1ac51 100644
--- a/web/src/components/Footer.tsx
+++ b/web/src/components/Footer.tsx
@@ -1,10 +1,10 @@
function Footer() {
- const currentTime = new Date().getFullYear();
- return (
-
- )
+ const currentTime = new Date().getFullYear();
+ return (
+
+ );
}
-export default Footer
\ No newline at end of file
+export default Footer;
diff --git a/web/src/components/Header.tsx b/web/src/components/Header.tsx
index 243e0ad5..35c19f55 100644
--- a/web/src/components/Header.tsx
+++ b/web/src/components/Header.tsx
@@ -1,11 +1,9 @@
-
function Header() {
-
- return (
-
- )
+ return (
+
+ );
}
-export default Header
+export default Header;
diff --git a/web/src/components/LoadingSpinner.tsx b/web/src/components/LoadingSpinner.tsx
new file mode 100644
index 00000000..f03418cd
--- /dev/null
+++ b/web/src/components/LoadingSpinner.tsx
@@ -0,0 +1,9 @@
+const LoadingSpinner = () => {
+ return (
+
+ );
+};
+
+export default LoadingSpinner;
diff --git a/web/src/data/data.ts b/web/src/data/data.ts
index eb512aed..1c6609d8 100644
--- a/web/src/data/data.ts
+++ b/web/src/data/data.ts
@@ -3,9 +3,44 @@ import { Exec } from "../types/types";
export const execs: Exec[] = [
{
id: 1,
- image: "Gury",
- position: "Gury is the best",
- name: "Guryash Da Goat",
- bio: "This guy is too good to be true",
+ image: "exec.png",
+ position: "President",
+ name: "Manas Sonar",
+ bio: "Consectetur adipiscing elit",
+ },
+ {
+ id: 2,
+ image: "exec.png",
+ position: "Vice-President",
+ name: "Sanchani Brabhaharan",
+ bio: "Consectetur adipiscing elit...",
+ },
+ {
+ id: 3,
+ image: "exec.png",
+ position: "Secretary",
+ name: "Diya Chottera",
+ bio: "Consectetur adipiscing elit...",
+ },
+ {
+ id: 4,
+ image: "exec.png",
+ position: "Treasurer",
+ name: "Krish Kumar",
+ bio: "Consectetur adipiscing elit...",
+ },
+ {
+ id: 5,
+ image: "exec.png",
+ position: "Secretary",
+ name: "Diya Chottera",
+ bio: "Consectetur adipiscing elit...",
+ },
+ {
+ id: 6,
+ image: "exec.png",
+ position: "Treasurer",
+ name: "Krish Kumar",
+ bio: "Consectetur adipiscing elit...",
},
];
diff --git a/web/src/index.css b/web/src/index.css
index f576e08b..3e0d7f98 100644
--- a/web/src/index.css
+++ b/web/src/index.css
@@ -1,4 +1,4 @@
-@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');
+@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;
diff --git a/web/src/layouts/Layout.tsx b/web/src/layouts/Layout.tsx
index 7433dc1d..34c9ebc3 100644
--- a/web/src/layouts/Layout.tsx
+++ b/web/src/layouts/Layout.tsx
@@ -1,4 +1,4 @@
-import { twMerge } from 'tailwind-merge';
+import { twMerge } from "tailwind-merge";
interface LayoutProps {
children?: React.ReactNode;
@@ -7,7 +7,7 @@ interface LayoutProps {
export default function Layout({ children, className }: LayoutProps) {
const mergedClassName = twMerge(
- 'w-screen h-screen flex flex-col justify-center items-center bg-base-100',
+ "w-screen h-screen flex flex-col justify-center items-center bg-base-100",
className
);
return {children}
;
diff --git a/web/src/screens/CreditsScreen.tsx b/web/src/screens/CreditsScreen.tsx
index f90cee39..c5b07b98 100644
--- a/web/src/screens/CreditsScreen.tsx
+++ b/web/src/screens/CreditsScreen.tsx
@@ -1,9 +1,9 @@
function CreditsScreen() {
- return (
-
-
Credits Screen
-
- )
+ return (
+
+
Credits Screen
+
+ );
}
-export default CreditsScreen
\ No newline at end of file
+export default CreditsScreen;
diff --git a/web/src/screens/HomeScreen.tsx b/web/src/screens/HomeScreen.tsx
index da17c32c..a0c32251 100644
--- a/web/src/screens/HomeScreen.tsx
+++ b/web/src/screens/HomeScreen.tsx
@@ -1,8 +1,9 @@
-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 { 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 LoadingSpinner from "@components/LoadingSpinner";
export default function HomeScreen() {
const { name } = useParams();
@@ -11,7 +12,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;
@@ -19,7 +20,7 @@ export default function HomeScreen() {
});
if (isLoading) {
- return ;
+ return ;
}
if (isError) {
return Error: {error.name}
;
diff --git a/web/src/screens/LoginScreen.tsx b/web/src/screens/LoginScreen.tsx
index 0cb97edb..0a56b9f2 100644
--- a/web/src/screens/LoginScreen.tsx
+++ b/web/src/screens/LoginScreen.tsx
@@ -1,9 +1,9 @@
function LoginScreen() {
- return (
-
-
Login Screen
-
- )
+ return (
+
+
Login Screen
+
+ );
}
-export default LoginScreen
\ No newline at end of file
+export default LoginScreen;
diff --git a/web/src/screens/PPVScreen.tsx b/web/src/screens/PPVScreen.tsx
index 4aee9a3a..770a9782 100644
--- a/web/src/screens/PPVScreen.tsx
+++ b/web/src/screens/PPVScreen.tsx
@@ -1,9 +1,9 @@
function PPVScreen() {
- return (
-
-
PPV Screen
-
- )
+ return (
+
+
PPV Screen
+
+ );
}
-export default PPVScreen
\ No newline at end of file
+export default PPVScreen;
diff --git a/web/src/screens/PhotosScreen.tsx b/web/src/screens/PhotosScreen.tsx
index 7093b52b..65cc6ac4 100644
--- a/web/src/screens/PhotosScreen.tsx
+++ b/web/src/screens/PhotosScreen.tsx
@@ -1,9 +1,9 @@
function PhotosScreen() {
- return (
-
-
PhotosScreen Screen
-
- )
+ return (
+
+
PhotosScreen Screen
+
+ );
}
-export default PhotosScreen
\ No newline at end of file
+export default PhotosScreen;
diff --git a/web/src/screens/SignUpScreen.tsx b/web/src/screens/SignUpScreen.tsx
index 126721d0..2a9bfcda 100644
--- a/web/src/screens/SignUpScreen.tsx
+++ b/web/src/screens/SignUpScreen.tsx
@@ -1,9 +1,9 @@
function SignUpScreen() {
- return (
-
-
Sign Up Screen
-
- )
+ return (
+
+
Sign Up Screen
+
+ );
}
-export default SignUpScreen
\ No newline at end of file
+export default SignUpScreen;
diff --git a/web/src/screens/Test.tsx b/web/src/screens/Test.tsx
index 64f9cb30..3aeaa2da 100644
--- a/web/src/screens/Test.tsx
+++ b/web/src/screens/Test.tsx
@@ -1,9 +1,9 @@
function TestScreen() {
- return (
-
-
Test Screen
-
- )
+ return (
+
+
Test Screen
+
+ );
}
-export default TestScreen
\ No newline at end of file
+export default TestScreen;
diff --git a/web/src/utils/queryKeys.ts b/web/src/utils/queryKeys.ts
index 39660c2a..53b86449 100644
--- a/web/src/utils/queryKeys.ts
+++ b/web/src/utils/queryKeys.ts
@@ -1,5 +1,5 @@
enum QueryKeys {
- GetIntro = 'get-intro',
+ GetIntro = "get-intro",
}
export default QueryKeys;
diff --git a/web/src/utils/urls.ts b/web/src/utils/urls.ts
index d1aefe72..1389f8b9 100644
--- a/web/src/utils/urls.ts
+++ b/web/src/utils/urls.ts
@@ -1,6 +1,6 @@
-let apiUrl: string = import.meta.env.VITE_API_URL || 'http://localhost:3000';
+let apiUrl: string = import.meta.env.VITE_API_URL || "http://localhost:3000";
-if (apiUrl.endsWith('/')) {
+if (apiUrl.endsWith("/")) {
apiUrl = apiUrl.slice(0, -1);
}