Merge pull request #61 from appKom/60-add-new-fond-members

appKom · Sep 17, 2024 · 2d1cf07 · 2d1cf07
2 parents 2a04346 + 7b7ea27
commit 2d1cf07
Show file tree

Hide file tree

Showing 12 changed files with 32 additions and 18 deletions.
diff --git a/public/members/byrkjeland.JPG b/public/members/byrkjeland.JPG
diff --git a/public/members/hilmir-straumland.jpg b/public/members/hilmir-straumland.jpg
diff --git a/public/members/jakob.jpg b/public/members/jakob.jpg
diff --git a/public/members/johanna-wilmers.jpg b/public/members/johanna-wilmers.jpg
diff --git a/public/members/magnus-byrkjeland.jpg b/public/members/magnus-byrkjeland.jpg
diff --git a/public/members/ouren.jpeg b/public/members/ouren.jpeg
diff --git a/public/members/william-andersson.jpg b/public/members/william-andersson.jpg
diff --git a/src/components/about/PastMembers.tsx b/src/components/about/PastMembers.tsx
@@ -1,6 +1,6 @@
 import { useState } from 'react';
 import { motion, AnimatePresence } from 'framer-motion';
-import { pastMembers } from '../../content';
+import { pastMembers } from '../../lib/content';
 
 export default function PastMembers() {
   const [expandedYear, setExpandedYear] = useState<string | null>(null);

diff --git a/src/content.ts → src/lib/content.ts b/src/content.ts → src/lib/content.ts
@@ -1,4 +1,4 @@
-import { TMember } from './lib/types';
+import { TMember } from './types';
 
 export const homeText =
   'Et fond er en kollektiv investering der flere går sammen for å plassere penger i verdipapirmarkedet. Dette kalles ofte kollektiv sparing, og man kan se for seg at et fond er en kurv med investeringer. Online har et slikt fond, noe som betyr at ulike parter investerer i Online, noe vi setter stor pris på. Under finner du en graf, som gir en oversikt over utviklingen av Onlines fond. Grafen inkluderer også en oversikt over OSEBX, som er hovedindeksen på Oslo Børs. Disse grafene kan sammenlignes for å se hvordan Onlines fond har utviklet seg i forhold til hovedindeksen på Oslo Børs.';
@@ -15,37 +15,49 @@ export const aboutUsText = [
 
 export const currentMembers: TMember[] = [
   {
-    name: 'Hilmir Straumland',
-    imagePath: 'members/hilmir-straumland.jpg',
+    name: 'Magnus Byrkjeland',
+    imagePath: 'members/byrkjeland.jpg',
     role: 'Leder',
   },
   {
-    name: 'Johanna Wilmers',
-    imagePath: 'members/johanna-wilmers.jpg',
+    name: 'Brinje Marie Haugli',
+    imagePath: 'members/female.jpg',
   },
   {
-    name: 'Magnus Byrkjeland',
-    imagePath: 'members/magnus-byrkjeland.jpg',
+    name: 'Duvara Nishaharan',
+    imagePath: 'members/female.jpg',
   },
   {
-    name: 'Maiken Lie',
-    imagePath: 'members/female.jpg',
+    name: 'Jacob Gullesen Hagen',
+    imagePath: 'members/jakob.jpg',
   },
   {
-    name: 'William Andersson',
-    imagePath: 'members/william-andersson.jpg',
+    name: 'Maiken Lie',
+    imagePath: 'members/female.jpg',
   },
   {
     name: 'Thea Karin Fladby',
     imagePath: 'members/thea-karin-fladby.jpg',
   },
   {
-    name: 'Johanne Tronstad',
-    imagePath: 'members/female.jpg',
+    name: 'Magnus Tomter Ouren',
+    imagePath: 'members/ouren.jpeg',
   },
 ];
 
 export const pastMembers = [
+  {
+    year: '2023',
+    members: [
+      'Hilmir Straumland (Leder)',
+      'Johanna Wilmers',
+      'Magnus Byrkjeland',
+      'Maiken Lie',
+      'William Andersson',
+      'Thea Karin Fladby',
+      'Johanne Tronstad',
+    ],
+  },
   {
     year: '2022',
     members: [

diff --git a/src/pages/about.tsx b/src/pages/about.tsx
@@ -1,5 +1,5 @@
 import Member from '../components/about/Member';
-import { aboutUsText, currentMembers } from '../content';
+import { aboutUsText, currentMembers } from '../lib/content';
 import { TMember } from '../lib/types';
 import PastMembers from '../components/about/PastMembers';
 import { motion } from 'framer-motion';

diff --git a/src/pages/application.tsx b/src/pages/application.tsx
@@ -1,5 +1,5 @@
 import { ArrowRightIcon } from 'lucide-react';
-import { applicationText } from '../content';
+import { applicationText } from '../lib/content';
 
 const email = '[email protected]';
 

diff --git a/src/pages/home.tsx b/src/pages/home.tsx
@@ -3,7 +3,7 @@ import Splash from '../components/home/Splash';
 import ScrollDownIcon from '../components/home/ScrollDownIcon';
 import PieChart from '../components/graphs/PieChart';
 import PerformanceDisplay from '../components/graphs/PerformanceDisplay';
-import { homeText } from '../content';
+import { homeText } from '../lib/content';
 
 const HomePage = () => (
   <div className="flex flex-col items-center justify-center h-full">
@@ -12,7 +12,9 @@ const HomePage = () => (
       <ScrollDownIcon />
     </div>
     <h1 className="my-4 mt-10 text-2xl md:hidden">Online Fondet</h1>
-    <div id="home-text" className="w-3/4 py-20 text-lg text-justify">{homeText}</div>
+    <div id="home-text" className="w-3/4 py-20 text-lg text-justify">
+      {homeText}
+    </div>
     <PerformanceDisplay />
     <div className="hidden w-full mb-10 md:block">
       <div className="w-full mt-40 mb-10 text-lg text-center">