Format/design fixes, cleanup, rm unused packages

marianopolis-robotics · Jan 16, 2023 · 526ceff · 526ceff
1 parent f05eee4
commit 526ceff
Show file tree

Hide file tree

Showing 12 changed files with 162 additions and 2,008 deletions.
diff --git a/components/agents-students/Cards.js b/components/agents-students/Cards.js
@@ -9,6 +9,7 @@ export default function Cards({ fr }) {
         <div>
             <h1 className={styles.title}>
                 {fr? "Étudiants et personnel" : "Student Body and Staff"}
+                <img className={styles.sticker} src="/backgrounds/sticker.svg" alt={fr ? "Étoile" : "Star"} />
             </h1>
             <div className={styles.div}>
                 {students.map((member, index) => 
@@ -21,7 +22,6 @@ export default function Cards({ fr }) {
 }
 
 function Carte(props) {
-
     return (
         <Card className={styles.card} imgSrc={props.src} horizontal = {true}>
             <div className="font-kiwi">

diff --git a/components/agents-students/variablesMembers.js b/components/agents-students/variablesMembers.js
@@ -1,45 +1,45 @@
 export const engS = [
     {name: "Adam Abbas", age: 17, year: "First year", club:"Arduino", fun: "When I sleep, I can't see.", src:"/members/Adam_S.JPG"},    
-    {name: "Andrea Abou-Haidar", age: 17, year: "Second year", club:"Arduino and DIY", fun: "It should work... let's test it!", src:"/members/Andrea_S.JPG"},
+    {name: "Andrea Abou-Haidar", age: 17, year: "Second year", club:"Arduino (executive) and DIY", fun: "It should work... let's test it!", src:"/members/Andrea_S.JPG"},
     {name: "Adelina Badea", age: 17, year: "First year", club:"Arduino", fun: "ADAM!!!", src:"/members/Adelina_S.JPG"},
     {name: "Yau Hong Chau", age: 18, year: "Second year", club:"Film", fun: "I'm so cold.", src:"/members/Yau_S.JPG"},
     {name: "Sofia Del Raso", age: 19, year: "Second year", club:"Arduino", fun: "I got a way with the screws.", src:"/members/Sofia_S.JPG"},
-    {name: "Audrey Dumais", age: 17, year: "First year", club:"Web Development",fun: "Just reading a boring French book.", src:"/members/Audrey_S.JPG"},
+    {name: "Audrey Dumais", age: 17, year: "First year", club:"Film, DIY and Web Development",fun: "Just reading a boring French book.", src:"/members/Audrey_S.JPG"},
     {name: "Zoe Hadziaras", age: 18, year: "First year", club:"DIY", fun: "I'm scared of the rats.", src:"/members/Zoe_S.JPG"},
     {name: "Isabella Hensley", age: 18, year: "Second year", club:"Arduino", fun: "Give me a hammer, I'll fix that.", src:"/members/Isabella_S.JPG"},
-    {name: "Victoria Hoang", age: 18, year: "Second year", club:"Web Development", fun: "Pigeons can't fly", src:"/members/Victoria_S.JPG"},
+    {name: "Victoria Hoang", age: 18, year: "Second year", club:"Web Development, DIY and film", fun: "Pigeons can't fly.", src:"/members/Victoria_S.JPG"},
     {name: "Vincent Ly", age: 18, year: "Second year", club:"Arduino and programming", fun: "I am losing my sanity.", src:"/members/Vincent_S.JPG"},
-    {name: "Nehna Patel", age: 18, year: "Second year", club:"DIY", fun: "I can't sneeze.", src:"/members/Nehna_S.jpg"},
+    {name: "Nehna Patel", age: 18, year: "Second year", club:"DIY (executive)", fun: "I can't sneeze.", src:"/members/Nehna_S.jpg"},
     {name: "Ruwa Qatmash", age: 17, year: "First year", club:"Arduino", fun: "WD-40 for life", src:"/members/Ruwa_S.JPG"},
-    {name: "Celia Shi", age: 18, year: "Second year", club:"Web Development", fun: "I'll never sing again. *starts singing*", src:"/members/Celia_S.JPG"},
+    {name: "Celia Shi", age: 18, year: "Second year", club:"Web Development, Film and DIY", fun: "I'll never sing again. *starts singing*", src:"/members/Celia_S.JPG"},
     {name: "Sangeeta Vidyarthi", age : 18, year: "Second year", club:"Arduino and film", fun: "Screw the credits.", src:"/members/Sangeeta_S.JPG"},
-    {name: "Zi Heng Wang", age: 18, year: "First year", club:"Arduino", fun: "It's okay, we have a fire extinguisher.", src:"/members/ZiHeng_S.JPG"},
-    {name: "Carolyn Wu", age: 18, year: "First year", club:"Web Development", fun: "I'll be your sanity keeper.", src:"/members/Carolyn_S.JPG"},
+    {name: "Zi Heng Wang", age: 18, year: "First year", club:"Arduino and DIY", fun: "It's okay, we have a fire extinguisher.", src:"/members/ZiHeng_S.JPG"},
+    {name: "Carolyn Wu", age: 18, year: "First year", club:"Web Development, DIY, programming and film", fun: "I'll be your sanity keeper.", src:"/members/Carolyn_S.JPG"},
     {name: "Elisa Xue", age: 18, year: "First year", club:"Film", fun: "I just realized why fx stands for effects.", src:"/members/Elisa_S.JPG"},
     {name: "Jennifer Zhang", age: 17, year: "First year", club:"Arduino", fun: "Soldered a million times!", src:"/members/Jennifer_S.JPG"},
-    {name: "Dominique Paradis", age: "(Confidential)", year: "", club:"(Confidential)", fun: "That's okay if you want to be wrong.", src:"/members/Paradis.png"},
+    {name: "Dominique Paradis", age: "(Confidential)", year: "Staff member", club:"(Confidential)", fun: "That's okay if you want to be wrong.", src:"/members/Paradis.png"},
 ];
 
 export const frS = [
     {name: "Adam Abbas", age: 17, year: "Première année", club:"Arduino", fun: "Quand je dors, je ne vois pas.", src:"/members/Adam_S.JPG"},    
-    {name: "Andrea Abou-Haidar", age: 17, year: "Deuxième année", club:"Arduino et bricolage", fun: "Ça devrait fonctionner.. Essayons-le!", src:"/members/Andrea_S.JPG"},
+    {name: "Andrea Abou-Haidar", age: 17, year: "Deuxième année", club:"Arduino (directrice) et bricolage", fun: "Ça devrait fonctionner... Essayons-le!", src:"/members/Andrea_S.JPG"},
     {name: "Adelina Badea", age: 17, year: "Première année", club:"Arduino", fun: "ADAM!!!", src:"/members/Adelina_S.JPG"},
     {name: "Yau Hong Chau", age: 18, year: "Deuxième année", club:"Film", fun: "J'ai tellement froid!", src:"/members/Yau_S.JPG"},
-    {name: "Sofia Del Raso", age: 19, year: "Second year", club:"Arduino", fun: "J'ai une spécialité avec les vis.", src:"/members/Sofia_S.JPG"},
-    {name: "Audrey Dumais", age: 17, year: "Première année", club:"Développement web", fun: "Je lis un livre français ennuyant", src:"/members/Audrey_S.JPG"},
+    {name: "Sofia Del Raso", age: 19, year: "Deuxième année", club:"Arduino", fun: "J'ai une spécialité avec les vis.", src:"/members/Sofia_S.JPG"},
+    {name: "Audrey Dumais", age: 17, year: "Première année", club:"Film, bricolage et développement web", fun: "Je lis un livre français ennuyant.", src:"/members/Audrey_S.JPG"},
     {name: "Zoe Hadziaras", age: 18, year: "Première année", club:"Bricolage", fun: "J'ai peur des rats.", src:"/members/Zoe_S.JPG"},
     {name: "Isabella Hensley", age: 18, year: "Deuxième année", club:"Arduino", fun: "Donne-moi un marteau, je le réparerai.", src:"/members/Isabella_S.JPG"},
-    {name: "Victoria Hoang", age: 17, year: "Deuxième année", club:"Développement web", fun: "Les pigeons ne peuvent pas voler", src:"/members/Victoria_S.JPG"},
+    {name: "Victoria Hoang", age: 17, year: "Deuxième année", club:"Développement web, bricolage et film", fun: "Les pigeons ne peuvent pas voler.", src:"/members/Victoria_S.JPG"},
     {name: "Vincent Ly", age: 18, year: "Deuxième année", club:"Arduino et programmation", fun: "Je sombre dans la folie.", src:"/members/Vincent_S.JPG"},
-    {name: "Nehna Patel", age: 18, year: "Deuxième année", club:"bricolage", fun: "Je ne peux pas éternuer", src:"/members/Nehna_S.jpg"},
+    {name: "Nehna Patel", age: 18, year: "Deuxième année", club:"Bricolage (directrice)", fun: "Je ne peux pas éternuer", src:"/members/Nehna_S.jpg"},
     {name: "Ruwa Qatmash", age: 17, year: "Première année", club:"Arduino", fun: "WD-40, c'est la vie!", src:"/members/Ruwa_S.JPG"},
-    {name: "Celia Shi", age: 18, year: "Deuxième année", club:"Développement web", fun: "Je ne chanterai plus jamais *et puis elle recommence de chanter*", src:"/members/Celia_S.JPG"},
+    {name: "Celia Shi", age: 18, year: "Deuxième année", club:"Développement web, film et bricolage", fun: "Je ne chanterai plus jamais *et puis elle recommence de chanter*", src:"/members/Celia_S.JPG"},
     {name: "Sangeeta Vidyarthi", age: 18, year: "Deuxième année", club:"Arduino et film", fun: "Je ne veux plus faire les génériques de la vidéo.", src:"/members/Sangeeta_S.JPG"},
     {name: "Zi Heng Wang", age: 18, year: "Première année", club:"Arduino", fun: "Tout va bien aller, nous avons un extincteur de feu.", src:"/members/ZiHeng_S.JPG"},
-    {name: "Carolyn Wu", age: 18, year: "First year", club:"Développement web", fun: "J'empêche mes amis de sombrer dans la folie.", src:"/members/Carolyn_S.JPG"},  
+    {name: "Carolyn Wu", age: 18, year: "First year", club:"Développement web, bricolage, programmation et film", fun: "J'empêche mes amis de sombrer dans la folie.", src:"/members/Carolyn_S.JPG"},  
     {name: "Elisa Xue", age: 18, year: "Première année", club:"Film", fun: "Je viens de découvrir que fx signifie effets.", src:"/members/Elisa_S.JPG"},
     {name: "Jennifer Zhang", age: 17, year: "Première année", club:"Arduino", fun: "J'ai soudé un million de fois!", src:"/members/Jennifer_S.JPG"},
-    {name: "Dominique Paradis", age: "Confidentiel", year: "Confidentiel", club:"Confidentiel", fun: "C'est correct si tu veux avoir tort.", src:"/members/Paradis.png"},
+    {name: "Dominique Paradis", age: "(Confidentiel)", year: "Membre du personnel", club:"(Confidentiel)", fun: "C'est correct si tu veux avoir tort.", src:"/members/Paradis.png"},
 ];
 
 

diff --git a/components/avia-robot/Avia.js b/components/avia-robot/Avia.js
@@ -81,7 +81,7 @@ const Avia = ({ fr }) => {
             <p className={styles.textOnly}>{fr ? `Nous avons besoin de tous nos agents MOOHP pendant trois jours, du 16 au 18 février, à l'École Curé-Antoine-Labelle. Nous comptons sur vous, agent${name}!` 
                 : `We need all MOOHP agents to convene over three days, from February 16th to 18th, at École Curé-Antoine-Labelle. We're counting on you, Agent${name}!`}</p>
             <Countdown fr={fr} />
-            <h1 className={styles.vidHeader}>{fr ? `Pour plus d'informations` : `For Further Information`}</h1>
+            <h1 className={styles.vidHeader}>{fr ? `Pour plus d'informations — Vidéo` : `For Further Information — Video`}</h1>
             <iframe className={styles.video} src="https://www.youtube.com/embed/XZcGbwce7fU" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowFullScreen></iframe>
         </>
     )

diff --git a/components/avia-robot/Robot.js b/components/avia-robot/Robot.js
@@ -95,7 +95,7 @@ const Robot = ({ fr }) => {
         </video>
       </div>
       <div className={styles.vidContainer}>
-        <h1 className={styles.vidHeader}>{fr ? `Comment construire le bras robotique` : `How to Build the Robotic Arm`}</h1>
+        <h1 className={styles.vidHeader}>{fr ? `Tutoriel: Comment construire le bras robotique` : `Tutorial: How to Build the Robotic Arm`}</h1>
         <iframe className={styles.video} src="https://www.youtube.com/embed/XZcGbwce7fU" title="YouTube video player" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowFullScreen></iframe>
       </div>
     </div>