Merge pull request #46 from UoaWDCC/emma/feature/25/exec-page

Created Exec Screen
UoaWDCC · May 17, 2024 · 7509ff1 · 7509ff1
2 parents 2ab48d1 + a6842de
commit 7509ff1
Show file tree

Hide file tree

Showing 8 changed files with 122 additions and 13 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/tailwind.config.js b/tailwind.config.js
@@ -0,0 +1,9 @@
+/** @type {import('tailwindcss').Config} */
+module.exports = {
+  content: [],
+  theme: {
+    extend: {},
+  },
+  plugins: [],
+}
+
diff --git a/web/exec.png b/web/exec.png
diff --git a/web/src/App.tsx b/web/src/App.tsx
@@ -1,6 +1,7 @@
 import { Outlet } from 'react-router-dom';
 import Header from './components/Header';
 import Footer from './components/Footer';
+import Exec from './components/ExecInfo';
 
 const App = () => {
   return (
@@ -9,6 +10,7 @@ const App = () => {
         <main className="py-3">
           <div className="max-w-6xl mx-auto px-4">
             <Outlet />
+            <Exec/>
           </div>
         </main>
         <Footer />

diff --git a/web/src/components/ExecInfo.tsx b/web/src/components/ExecInfo.tsx
@@ -0,0 +1,64 @@
+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...',
+    },
+];
+
+function ExecScreen() {
+    return (
+        <div>
+            <ExecCard execs= {execs}/>
+        </div>
+    );
+}
+
+export default ExecScreen;
diff --git a/web/src/main.tsx b/web/src/main.tsx
@@ -16,6 +16,7 @@ import PhotosScreen from "./screens/PhotosScreen.tsx";
 import PPVScreen from "./screens/PPVScreen.tsx";
 
 
+
 //Add any routes for screens below
 const router = createBrowserRouter(
     createRoutesFromElements(

diff --git a/web/src/screens/ExecScreen.tsx b/web/src/screens/ExecScreen.tsx
@@ -1,9 +1,37 @@
-function ExecScreen() {
+import React from 'react';
+
+interface Exec {
+    id: number;
+    image: string;
+    position: string;
+    name: string;
+    bio: string;
+}
+
+interface Props {
+    execs: Exec[];
+}
+
+function ExecScreen({ execs }: Props) {
     return (
         <div>
-            <h2> Exec Screen</h2>
+        <h1>Meet the Execs</h1>
+        <div className="grid grid-cols-2 gap-10">
+            {execs.map(exec => (
+                <div key={exec.id} className="bg-white text-black p-5 rounded-lg">
+                    <div className="flex items-center">
+                        <img className="rounded-full max-w-40 max-h-40 mr-4" src={exec.image} alt="exec image" />
+                        <div>
+                            <h1 className="text-xl font-bold">{exec.name}</h1>
+                            <h2 className="text-lg">{exec.position}</h2>
+                            <p className="text-base">{exec.bio}</p>
+                        </div>
+                    </div>
+                </div>
+            ))}
+        </div>
         </div>
-    )
+    );
 }
 
-export default ExecScreen
+export default ExecScreen;
diff --git a/web/yarn.lock b/web/yarn.lock
@@ -19,10 +19,10 @@
   dependencies:
     regenerator-runtime "^0.14.0"
 
-"@esbuild/win32[email protected]":
+"@esbuild/darwin[email protected]":
   version "0.19.12"
-  resolved "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.19.12.tgz"
-  integrity sha512-T1QyPSDCyMXaO3pzBkF96E8xMkiRYbUEZADd29SyPGabqxMViNoii+NcK7eWJAEoU6RZyEm5lVSIjTmcdoB9HA==
+  resolved "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.19.12.tgz"
+  integrity sha512-hKoVkKzFiToTgn+41qGhsUJXFlIjxI/jSYeZf3ugemDYZldIXIxhvwN6erJGlX4t5h417iFuheZ7l+YVn05N3A==
 
 "@eslint-community/eslint-utils@^4.2.0", "@eslint-community/eslint-utils@^4.4.0":
   version "4.4.0"
@@ -150,15 +150,15 @@
   resolved "https://registry.npmjs.org/@remix-run/router/-/router-1.15.0.tgz"
   integrity sha512-HOil5aFtme37dVQTB6M34G95kPM3MMuqSmIRVCC52eKV+Y/tGSqw9P3rWhlAx6A+mz+MoX+XxsGsNJbaI5qCgQ==
 
-"@rollup/rollup-win32-x64-msvc@4.9.6":
+"@rollup/rollup-darwin[email protected]":
   version "4.9.6"
-  resolved "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.9.6.tgz"
-  integrity sha512-jqzNLhNDvIZOrt69Ce4UjGRpXJBzhUBzawMwnaDAwyHriki3XollsewxWzOzz+4yOFDkuJHtTsZFwMxhYJWmLQ==
+  resolved "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.9.6.tgz"
+  integrity sha512-zRDtdJuRvA1dc9Mp6BWYqAsU5oeLixdfUvkTHuiYOHwqYuQ4YgSmi6+/lPvSsqc/I0Omw3DdICx4Tfacdzmhog==
 
-"@swc/core-win32-x64-msvc@1.4.0":
+"@swc/core-darwin[email protected]":
   version "1.4.0"
-  resolved "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.4.0.tgz"
-  integrity sha512-e2xVezU7XZ2Stzn4i7TOQe2Kn84oYdG0M3A7XI7oTdcpsKCcKwgiMoroiAhqCv+iN20KNqhnWwJiUiTj/qN5AA==
+  resolved "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.4.0.tgz"
+  integrity sha512-f8v58u2GsGak8EtZFN9guXqE0Ep10Suny6xriaW2d8FGqESPyNrnBzli3aqkSeQk5gGqu2zJ7WiiKp3XoUOidA==
 
 "@swc/core@^1.3.107":
   version "1.4.0"
@@ -930,6 +930,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"
   integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
 
+fsevents@~2.3.2, fsevents@~2.3.3:
+  version "2.3.3"
+  resolved "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz"