Merge pull request #295 from datasektionen/main

Hotfix images
datasektionen · Jan 31, 2024 · 960344f · 960344f
2 parents cf1181b + 6d20215
commit 960344f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/src/locales/en.ts b/src/locales/en.ts
@@ -347,7 +347,7 @@ export default {
       "We'd be thrilled to collaborate with you, both before and after D-Dagen! Whether you're interested in hosting a lunch lecture, hackathon, or something completely different, we're open to your ideas. For more information, please contact our sponsorship manager at <a className='text-cerise' href='mailto:farhan.syed@ddagen.se'>farhan.syed@ddagen.se</a>.",
     productCatalog: "PRODUCT CATALOG",
     header: "COMPANY FAQ",
-    catalogPath: "https://ddagen.se/downloadables/Product_Catalog_sv.pdf",
+    catalogPath: "https://ddagen.se/downloadables/Product_Catalog_en.pdf",
   },
   contact: {
     header: "Contact",

diff --git a/src/pages/kontakt.tsx b/src/pages/kontakt.tsx
@@ -27,7 +27,10 @@ export default function Contact() {
     "/img/projectGroup/p_viktor.jpg", 
     "/img/projectGroup/p_mortada.jpg", 
     "/img/projectGroup/p_linus.jpg", 
-    "/img/projectGroup/p_oscar.jpg"
+    "/img/projectGroup/p_oscar.jpg",
+    "/img/projectGroup/p_oscar.jpg",
+    "/img/projectGroup/p_oscar.jpg",
+    "/img/projectGroup/p_oscar.jpg",
   ];
   const mails = [
     "ansvarig@ddagen.se",
@@ -42,18 +45,19 @@ export default function Contact() {
   const layout1 = [
     [0, 1, 2],
     [3, 4, 5],
-    [6]
+    [6, 7, 8]
   ];
   const rows2 = [0, 1, 2, 3];
   const layout2 = [
     [0, 1],
     [2, 3],
     [4, 5],
-    [6]
+    [6, 7]
   ];
   const rows3 = [0, 1, 2, 3, 4, 5, 6];
   const layout3 = [[0], [1], [2], [3], [4], [5], [6]];
 
+
   return (
     <div className="pt-[200px] pb-[150px] flex flex-col items-center">
       <h1 className="text-cerise text-5xl font-medium uppercase">
@@ -98,8 +102,8 @@ export default function Contact() {
         {rows1.map((i, _) => (
           <div className="hidden lg:flex flex-row justify-between gap-10 px-[100px] mb-[50px]" key={i}>
             {layout1[i].map((i, _) => (
-              <div className="flex flex-col" key={i}>
-                <img className="grayscale" src={images[i]}></img>
+              <div className="flex flex-col" key={i} style={{ visibility: i > 6 ? 'hidden' : 'visible' }}> {/** Cheat to ensure even design*/}
+                <img className="grayscale w-full" src={images[i]} ></img>
                 <p className="px-[10px] text-cerise text-xl font-normal mt-5">
                   {names[i]}
                 </p>
@@ -117,7 +121,7 @@ export default function Contact() {
         {rows2.map((i, _) => (
           <div className=" hidden lg:hidden sm:flex justify-center flex-row px-[50px] mb-[50px] gap-10" key={i}>
             {layout2[i].map((i, _) => (
-              <div className="flex flex-col" key={i}>
+              <div className="flex flex-col" key={i} style={{ visibility: i > 6 ? 'hidden' : 'visible' }}> {/** Cheat to ensure even design*/}
                 <img className="grayscale" src={images[i]}></img>
                 <p className="w-[10px] px-[10px] text-cerise text-2xl font-normal mt-5">
                   {names[i]}

diff --git a/src/pages/om-oss.tsx b/src/pages/om-oss.tsx
@@ -9,7 +9,8 @@ function formatImagePath(name: string) {
 }
 
 function stripLastName(name: string) {
-  return name.split(" ")[0];
+
+  return name.split(" ")[0].toLocaleLowerCase();
 }
 
 const managersList = ["Toshihide Sakao", "William Nordwall"]
@@ -19,8 +20,8 @@ const salesList = ["Linus Markström", "Leo Modahed", "Johanna Plant", "Ella Hed
 const massList = ["Mortada Nasser", "Abhinav Sasikumar","Arman Montazeri","Max Berglund", "Adam Njegovanovic","Abdelrahman Aldaker"]
 const ecoList = ["Oscar Witt","Roger Chen"]
 
-const managersName = create2DArrayWithValues(3, 1, managersList);
-const managers = create2DArrayWithValues(3, 1, managersList.map(stripLastName).map(formatImagePath))
+const managersName = create2DArrayWithValues(2, 1, managersList);
+const managers = create2DArrayWithValues(2, 1, managersList.map(stripLastName).map(formatImagePath))
 
 const prName = create2DArrayWithValues(3, 2, prList);
 const prTeam = create2DArrayWithValues(3, 2, prList.map(stripLastName).map(formatImagePath))
@@ -75,9 +76,9 @@ function Team({
 
       <div className=" pt-5 lx:w-[1300px] lg:w-[600px] m:w-[500px] bg-white/80 flex flex-col overflow-x-auto overflow-y-visible lg:py-10 gap-10">
         {team.map((row, i) => (
-          <div className="flex flex-row gap-2 justify-center  pb-3" key={row.toString()}>
+          <div className="flex flex-row gap-2 justify-center pb-3" key={row.toString()}>
             {row.map((image, j) => (
-              <div className="flex flex-col" key={image}>
+              <div className="flex flex-col" key={image != null ? image : "about_img"+(i*3+j).toString() }>
                 <div className=" w-[90px] sm:w-[100px] lg:w-[120px]  xl:w-[120px] 2xl:w-[150px]">
                   <img src={image} className=" rounded-[20px]"></img>
                   <div className="mt-2">