Use Kiwi Maru and reg theme adjustments

components/agents-students/Agents.js

@@ -18,8 +18,9 @@ export default function Agents({ fr }) {
                 <strong><Typewrite page='agents' /></strong>
             </h1>
             <p className={styles.intro}>
-                {fr ? `Agent${name}, une équipe de 18 agents de MOOHP ont été soigneusement sélectionnés pour vous accompagner dans cette mission. Nous vous suggérons de vous familiariser avec eux avant de nous rejoindre au siège de MOOHP.`
-                    : `Agent${name}, a team of 18 MOOHP agents were carefully selected for this mission alongside you. We suggest that you familiarise yourself with them before joining us at MOOHP headquarters.`}
+              <strong>Agent{name},</strong>
+                {fr ? ` une équipe de 18 agents de MOOHP ont été soigneusement sélectionnés pour vous accompagner dans cette mission. Nous vous suggérons de vous familiariser avec eux avant de nous rejoindre au siège de MOOHP.`
+                    : ` a team of 18 MOOHP agents were carefully selected for this mission alongside you. We suggest that you familiarise yourself with them before joining us at MOOHP headquarters.`}
             </p>
             {students.map((member, index) => 
                 <FlipImg fr={fr} key={index} src={member.src} name={member.name} 

components/agents-students/Cards.js

@@ -24,7 +24,7 @@ function Carte(props) {
 
     return (
         <Card className={styles.card} imgSrc={props.src} horizontal = {true}>
-            <div className="font-verdana">
+            <div className="font-kiwi">
                 <p>
                     <b>{props.fr ? 'Nom: ' : 'Name: '}</b> {`${props.name}`}
                 </p>

components/agents-students/variablesMembers.js

@@ -1,43 +1,43 @@
 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 construction", fun: "It should work... let's test it!", src:"/members/Andrea_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: "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: "Zoe Hadziaras", age: 18, year: "First year", club:"Arduino", fun: "I'm scared of the rats.", src:"/members/Zoe_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: "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:"Construction", fun: "I can't sneeze.", src:"/members/Nehna_S.jpg"},
+    {name: "Nehna Patel", age: 18, year: "Second year", club:"DIY", 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: "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: "Elisa Xue", age: 18, year: "First year", club:"Arduino", fun: "I just realized why fx stands for effects.", src:"/members/Elisa_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"},
 ];
 
 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 construction", fun: "Ça devrait fonctionner.. Essayons-le!", src:"/members/Andrea_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: "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: "Zoe Hadziaras", age: 18, year: "Première année", club:"Arduino", fun: "J'ai peur des rats.", src:"/members/Zoe_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: "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:"Construction", fun: "Je ne peux pas éternuer", src:"/members/Nehna_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: "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: "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: "Elisa Xue", age: 18, year: "Première année", club:"Arduino", fun: "Je viens de découvrir que fx signifie effets.", src:"/members/Elisa_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"},
 ];

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` : `For Further Information`}</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>
         </>
     )

components/avia-robot/Robot.js

@@ -15,7 +15,8 @@ const Robot = ({ fr }) => {
     <div className={styles.pageWrapper}>
       <h3 className={styles.title}><Typewrite page='robot' /></h3>
       <p className={styles.intro}>
-        {fr ? `Agent${name}, voici toutes les informations dont vous aurez besoin sur le robot à construire — il sera crucial pour l'accomplissement de la mission AVIA.` : `Agent${name}, here is all the information you will need on the robot to build — it will be crucial towards the completion of mission AVIA.`}
+        <strong>Agent{name},</strong>
+        {fr ? ` voici toutes les informations dont vous aurez besoin sur le robot à construire — il sera crucial pour l'accomplissement de la mission AVIA.` : ` here is all the information you will need on the robot to build — it will be crucial towards the completion of mission AVIA.`}
       </p>
       <div className={styles.rowOne}>
         <RobotBase />
@@ -33,12 +34,12 @@ const Robot = ({ fr }) => {
             following prototypes</p>
         </div>
         <div className={styles.container}>
-          <p className={styles.div}>The Chosen Arm : Claudine</p>
+          <h3 className={styles.subheading}>The Chosen Arm: Claudine</h3>
           <p>The arm of the robot is composed of 3 two-wire motors that ensure two motion 
             systems: linear motion and rotation. The horizontal linear motion is necessary for 
             picking up and dropping game pieces, whilst the rotation of the arm allows the coloured 
-            face corresponding to agents’ team to face upwards.</p>
-            <p>The Base</p>
+            face corresponding to agents&apos; team to face upwards.</p>
+          <h3 className={styles.subheading}>The Base</h3>
           <p>The [dimension] base of the robot consists of 4 [type] wheels, motorized individually
              by [motor type]. The wheels are surrounded by an aluminium extrusion frame, and 3D-printed 
              adapters to allow them to use bearings for circular shafts for the hexagonal shaft. (LOL WHAT). </p>
@@ -47,10 +48,10 @@ const Robot = ({ fr }) => {
       <div className={styles.rowThree}>
         <div className={styles.imageContainer}>
           <img src="/robot/electric.png" alt="Cabbage ball (temp photo)" />
-          <img src="/robot/sauder.png" alt="Cabbage ball (temp photo)" />
+          <img src="/robot/solder.png" alt="Cabbage ball (temp photo)" />
         </div>
         <div className={styles.container}>
-          <p>The Lift</p>
+          <h3 className={styles.subheading}>The Lift</h3>
           <p>After careful research, the Machinery agents determined that a three stage 
             cascading lift would be the best option to build a mechanism capable of both 
             reaching great heights as well as retracting itself, creating a cascading motion. 
@@ -67,6 +68,7 @@ const Robot = ({ fr }) => {
         </div>
       </div>
       <div className={styles.container}>
+        <h3 className={styles.subheading}>Struggles</h3>
         <p>The Machinery Division encountered many challenges as they prepared for the mission. Having 
           not anticipated how many small adjustments would be necessary to their original design, they 
           quickly learnt of the importance of leaving time for testing. Agents working on the lift faced 
@@ -78,7 +80,7 @@ const Robot = ({ fr }) => {
         <p>Agents working on the base originally designed a rectangular base for the robot. However, after 
           struggling to arrange space for the lift, they modified the design to a U-shaped base. This change 
           resulted in further problems; due to the weight of the 4 motor, the base would incline itself towards 
-          the robot’s center. Therefore, they added a thick double aluminium extrusion to the base to support 
+          the robot&apos;s center. Therefore, they added a thick double aluminium extrusion to the base to support 
           its center.</p>
       </div>
       <div className={styles.rowOne}>
@@ -92,6 +94,10 @@ const Robot = ({ fr }) => {
           <source src="/robot/lift.mp4"></source>
         </video>
       </div>
+      <div className={styles.vidContainer}>
+        <h1 className={styles.vidHeader}>{fr ? `Comment construire le bras robotique` : `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>
   )
 }

components/home/Carousel.js

@@ -7,9 +7,9 @@ export default function Carouselle({ fr }) {
         {bg: "#F6F1D6", colourSlide: "#F6EBC3", colourHeader: "#FE5F00", border: 0,
             header: fr ? 'Portes ouvertes 2010' : 'Open House 2010', 
             text1: fr ? `L'Institut de recherche académique de Marianopolis (M.A.R.I) est ravi d'accueillir 
-                les futurs étudiants aux portes ouvertes 2023.`: 
+                les futurs étudiants aux portes ouvertes 2010.`: 
                 `The Marianopolis Academic Research Institute is thrilled to invite prospective students 
-                and their families to our 2023 open house.`, 
+                and their families to our 2010 open house.`, 
             text2: fr ? `Découvrez M.A.R.I. et sa communauté et informez-vous sur le programme que vous voulez choisir.`: 
                 `Discover M.A.R.I., meet our community, and get all the information you need to choose the best program for you.`,
             text3: ""
@@ -18,8 +18,8 @@ export default function Carouselle({ fr }) {
             header: fr ? 'Foire aux comités' : 'Join-A-Club Day', 
             text1: fr ? 'M.A.R.I offre une grande variété de comités diversifiés pour leurs étudiants!': 
                 'M.A.R.I. offers a wide selection of clubs to the student body!', 
-            text2: fr ? `Rencontrez le comité de film, de développement web, de construction, de programmation et Arduino.` : 
-                `Get to know the robot builders club, the programming club, the website club, the kiosk club, the film club, and many more.`,
+            text2: fr ? `Rencontrez le comité de film, de développement web, de bricolage, de programmation et Arduino.` : 
+                `Get to know the Arduino club, the programming club, the web development club, the DIY club, the film club, and many more.`,
             text3: fr ? 'Inscrivez-vous au bureau de Jerriella.' : `Sign up in Jerriella's office.`
         },
         {bg: "#F4C6E4", colourSlide: "#D4BFF5", colourHeader: "#b251ea", border: 75, 

components/home/MoohpIntro.js

@@ -57,7 +57,7 @@ const MoohpIntro = ({ fr }) => {
         <li><strong>{fr ? 'Machinerie' : 'Machinery'}</strong>, {fr ? 'pour nos formidables constructeurs de robot' : 'for our totally awesome robot builders'}</li>
         <li><strong>{fr ? 'Réseau virtuel' : 'Virtual Network'}</strong>, {fr ? 'qui gère notre site web ' : 'which keeps our website running'}</li>
         <li><strong>{fr ? 'Piratage informatique' : 'Hacking'}</strong>, {fr ? 'où nos programmeurs créent des programmes qui s\'attaquent à des problèmes informatiques (de façon éthique!)' : 'where our programmers solve problems (ethically!) with code'}</li>
-        <li><strong>{fr ? 'Production' : 'Manufacturing/Production'}</strong>, {fr ? 'composé d\'experts en construction de kiosque' : 'composed of kiosk construction experts'}</li>
+        <li><strong>{fr ? 'Production' : 'Manufacturing/Production'}</strong>, {fr ? 'composé d\'experts en DIY de kiosque' : 'composed of kiosk DIY experts'}</li>
         <li><strong>{fr ? 'Marketing' : 'Marketing'}</strong>, {fr ? 'pour nos réalisateurs et producteurs vidéo' : 'for our video directors and producers'}</li>
       </ul>
 

components/journal/Post.js

@@ -18,7 +18,7 @@ export default function Post({ fr }) {
 
 function Info(props) {
     return (
-        <div className={`${styles.container}` + " font-verdana"}>
+      <div className={`${styles.container} font-kiwi`}>
             <Avatar img={props.avatar} rounded={true} className={styles.avatarContainer}
                 alt="student profile picture" status={props.status}>
             </Avatar>

components/nav/RegNav.js

@@ -40,7 +40,7 @@ const RegNav = () => {
 
   return (
     <Navbar fluid={true} id='regNav' className='relative z-50 pl-0 sm:pl-0 md:pl-4'>
-      <Navbar.Toggle className='text-gray-700' />
+      <Navbar.Toggle className='text-white' />
       <Navbar.Collapse className='z-40'>
         <Navbar.Link href={linkCounterparts[currentRoute]}>{fr? 'English' : 'Français'}</Navbar.Link>
         <Navbar.Link href={fr? '/fr' : '/'} className={currentRoute === '/' || currentRoute === '/fr' ? 'navActive' : ''}>{fr? 'Accueil' : 'Home'}</Navbar.Link>

pages/fr/vie-etudiante.js

@@ -6,7 +6,7 @@ export default function vieEtudiante() {
   return (
     <>
       <Meta title='Vie étudiante | M.A.R.I.' description='Vie étudiante à M.A.R.I.' />
-      <h1 className={styles.header}>Vie étudiante</h1>
+      <h1 className={styles.header}>Vie étudiante <img className={styles.sticker} src="/journal/sticker.svg" alt="Étoile" /></h1>
       <Post fr={true} />
     </>
   );

pages/student-life.js

@@ -6,7 +6,7 @@ export default function studentLife() {
   return (
     <>
       <Meta title='Student Life | M.A.R.I.' description="M.A.R.I. student life" />
-      <h1 className={styles.header}>Student Life</h1>
+      <h1 className={styles.header}>Student Life <img className={styles.sticker} src="/journal/sticker.svg" alt="Star" /></h1>
       <Post />
     </>
   );

styles/Agent.module.css

@@ -52,6 +52,7 @@
 .intro {
   color: white;
   font-size: 1.2rem;
+  font-weight: 500;
   padding: 1rem 1.5rem;
   margin: 0px 0.5rem 2rem;
   background-color: #4148a488;
@@ -113,7 +114,18 @@
   }
 }
 
+@media screen and (min-width: 768px) {
+  .intro {
+    font-size: 1.4rem;
+    padding: 1rem 2.25rem;
+  }
+}
+
 @media screen and (min-width: 1024px) {
+  .intro {
+    font-size: 1.6rem;
+    padding: 1rem 2.5rem 1.5rem;
+  }
   .cardContainer {
     grid-template-columns: 25% 70%;
     column-gap: 3rem;