add hyphens to cards if text needs breaks

Edit board.json

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!195

.env.local.example

@@ -1,3 +1,4 @@
 NEXT_PUBLIC_DEPLOY_ENV=local
 NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api
 NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi
+NEXT_MQTT_HOST=mqtt.dev.sahkoinsinoorikilta.fi

.gitlab-ci.yml

@@ -23,6 +23,7 @@ install:
 audit:
   image: node:16
   needs: ["install"]
+  allow_failure: true  
   stage: audit
   script:
     - npm audit --audit-level=critical

package.json

@@ -72,6 +72,7 @@
     "fast-deep-equal": "^3.1.3",
     "js-cookie": "^3.0.1",
     "lodash": "^4.17.21",
+    "mqtt": "^5.14.1",
     "next": "^13.1.6",
     "normalize.css": "^8.0.1",
     "react": "^18.2.0",
@@ -89,7 +90,8 @@
     "sharp": "^0.30.3",
     "shortid": "^2.2.16",
     "styled-components": "^5.3.5",
-    "swr": "^1.2.2"
+    "swr": "^1.2.2",
+    "uuid": "^13.0.0"
   },
   "overrides": {
     "react-mde": {

src/components/Card.tsx

@@ -43,6 +43,7 @@ const StyledCard = styled.article`
   }
 
   h3 {
+    hyphens: auto;
     padding: 0.5rem;
     font-size: 1.5rem;
     font-weight: 300;

src/components/DropDownBox.tsx

@@ -12,8 +12,8 @@ interface DropDownBoxProps {
 const Box = styled.div`
   background-color: ${colors.white};
   border: 1px solid ${colors.black};
-  margin-top: 0.8rem;
   position: absolute;
+  /* margin-top: 0.8rem; hides cool onhover effect but fixes a gap problem */
   left: 0;
   top: 2.5rem;
   z-index: 20;

src/components/Footer/FooterContent.tsx

@@ -1,6 +1,7 @@
 import React from "react";
 import styled from "styled-components";
 import { Link } from "@components/index";
+import Icon, { IconType } from "@components/Icon";
 import colors from "@theme/colors";
 import breakpoints from "@theme/breakpoints";
 
@@ -28,6 +29,7 @@ const Content = styled.div`
   h4 {
     color: ${colors.lightBlue};
     padding: 1.5rem 0;
+    text-align: center;
   }
 
   a {
@@ -67,6 +69,27 @@ const Map = styled.div`
   }
 `;
 
+const SomeContainer = styled.div`
+  display: flex;
+  flex-flow: column nowrap;
+  justify-content: space-between;
+  a {
+    display: flex;
+    flex-flow: row nowrap;
+    justify-content: center;
+    margin-right: 0.5rem;
+
+    color: inherit;
+    text-decoration: none;
+
+  }
+  svg{
+    width: 24px;
+    height: 24px;
+    fill: ${colors.white};
+}
+`;
+
 const FooterContent: React.FC = () => (
   <Content>
     <div>
@@ -90,6 +113,13 @@ const FooterContent: React.FC = () => (
             <Link to="https://sik.kuvat.fi">Kuvagalleria</Link>
             <Link to="https://static.sahkoinsinoorikilta.fi/logot-ja-grafiikka/">Logot ja grafiikka</Link>
           </div>
+          <div>
+            <SomeContainer>
+              <Icon name={IconType.Facebook} link="https://www.facebook.com/AaltoYliopistonSIK/" />
+              <Icon name={IconType.Instagram} link="https://www.instagram.com/sahkoinsinoorikilta/" />
+              <Icon name={IconType.LinkedIn} link="https://www.linkedin.com/groups/8103057/" />
+            </SomeContainer>
+          </div>
         </Columns>
       </MarginSpace>
     </div>

src/components/Header.tsx

@@ -26,6 +26,13 @@ const Sticky = styled.div<{ $isHidden?: boolean; $mobileMenuOpen?: boolean }>`
   transition: all 200ms ease-out;
   height: ${(p) => (p.$mobileMenuOpen ? "100vh" : "unset")};
 
+  /* tape to allow mobile dropdown menu scrolling */
+  @media screen and (max-width: ${breakpoints.mobile}) {
+    overflow-y: ${(p) => (p.$mobileMenuOpen ? "auto" : "visible")};
+    overflow-x: hidden;
+    -webkit-overflow-scrolling: touch; /* apparently some ios optimization for smoother scrolin' */
+  }
+
   ${(p) => (p.$isHidden ? (`
     transition: all 200ms ease-in;
     transform: translateY(-100%);

src/components/Navigation.tsx

@@ -11,7 +11,6 @@ export const renderNavigationItems = (mobile = false): JSX.Element => (
     <NavbarDropdownLink to="/kilta" text="Kilta ›" exploded={mobile}>
       <NavbarChildLink to="/kilta/toiminta">Toiminta</NavbarChildLink>
       <NavbarChildLink to="/kilta/jasenyys">Jäsenyys</NavbarChildLink>
-      <NavbarChildLink to="/kilta/fuksi">Fukseille</NavbarChildLink>
       <NavbarChildLink to="/kilta/hallitus">Hallitus</NavbarChildLink>
       <NavbarChildLink to="/kilta/toimihenkilot">Toimihenkilöt</NavbarChildLink>
       <NavbarChildLink to="/kilta/vuokraa">Vuokraa kalustoa</NavbarChildLink>
@@ -20,6 +19,11 @@ export const renderNavigationItems = (mobile = false): JSX.Element => (
       <NavbarChildLink to="https://sik.kuvat.fi">Kuvagalleria</NavbarChildLink>
       <NavbarChildLink to="/kilta/kilta-avustus">Kilta-avustus</NavbarChildLink>
     </NavbarDropdownLink>
+    <NavbarDropdownLink to="/" text="New students ›" exploded={mobile}>
+      <NavbarChildLink to="/newStudent/fuksi">Fukseille</NavbarChildLink>
+      <NavbarChildLink to="/newStudent/fukseille_en">For Freshmen</NavbarChildLink>
+      <NavbarChildLink to="/newStudent/forExchangers">For Exchange/MSc students</NavbarChildLink>
+    </NavbarDropdownLink>
     <NavbarDropdownLink to="/opinnot_ja_ura" text="Opinnot ja ura" exploded={mobile} />
     <NavbarDropdownLink to="/yritysyhteistyo" text="Yritysyhteistyö" exploded={mobile} />
     <NavbarDropdownLink to="/yhteystiedot" text="Yhteystiedot" exploded={mobile}>
@@ -29,7 +33,6 @@ export const renderNavigationItems = (mobile = false): JSX.Element => (
     <NavbarDropdownLink to="/in_english" text="In English" exploded={mobile} />
   </>
 );
-
 const Nav = styled.div`
   flex: 1 0 auto;
   display: flex;
@@ -53,6 +56,11 @@ const Nav = styled.div`
   @media screen and (max-width: ${breakpoints.mobile}) {
     justify-content: center;
     margin-left: 0;
+    /* line 59 */
+    border-top: 2px solid ${colors.lightBlue}; /* Add line above */
+    padding-top: 0.5rem; /* Add some spacing */
+    padding-bottom: 0.5rem; /* Add some spacing */
+    cursor: pointer; /* Make entire nav clickable */
   }
 
   svg {
@@ -74,22 +82,12 @@ const DesktopContainer = styled.div`
   }
 `;
 
-const SomeContainer = styled.div`
-  display: flex;
-  flex-flow: row nowrap;
-
-  a {
-    display: flex;
-    flex-flow: row nowrap;
-    justify-content: center;
-    margin: 1rem;
-  }
-`;
-
 const MobileMenu = styled.div`
   display: flex;
   margin: 0 1rem;
+  align-items: center;
   cursor: pointer;
+  padding: 0 50%; /* Large clickable area horizontally cheeze */
 
   span {
     display: flex;
@@ -99,9 +97,6 @@ const MobileMenu = styled.div`
     display: none;
   }
 
-  @media screen and (max-width: ${breakpoints.mobile}) {
-    margin-left: 3rem;
-  }
 `;
 
 interface NavigationProps {
@@ -115,13 +110,8 @@ const Navigation: React.FC<NavigationProps> = ({ onMobileMenuOpen }) => {
       <DesktopContainer>
         {desktopItems}
       </DesktopContainer>
-      <SomeContainer>
-        <Icon name={IconType.Facebook} link="https://www.facebook.com/AaltoYliopistonSIK/" />
-        <Icon name={IconType.Instagram} link="https://www.instagram.com/sahkoinsinoorikilta/" />
-        <Icon name={IconType.LinkedIn} link="https://www.linkedin.com/groups/8103057/" />
-      </SomeContainer>
-      <MobileMenu>
-        <Icon name={IconType.HamburgerMenu} onClick={onMobileMenuOpen} />
+      <MobileMenu onClick={onMobileMenuOpen}>
+        <Icon name={IconType.HamburgerMenu} />
       </MobileMenu>
     </Nav>
   );

src/components/NavigationMobile.tsx

@@ -4,8 +4,8 @@ import colors from "@theme/colors";
 import { renderNavigationItems } from "./Navigation";
 
 const Nav = styled.nav`
-  padding: 1rem 2rem;
-
+  padding: 1rem 1rem;
+  padding-bottom: 20rem;
   a {
     fill: ${colors.lightBlue};
     color: ${colors.lightBlue};

src/models/Signup.ts

@@ -1,7 +1,8 @@
 import { OptionTypes } from "@components/Widgets/SignupQuestionsWidget/common";
 
 export interface Signup {
-  id?: number;
+  id?: number; // Database id for completed signup
+  submit_id?: string; // Signup request idempotency key
   signupForm_id: number;
   answer: string;
 }

src/pages/kilta/guildroom.tsx

@@ -0,0 +1,18 @@
+import React from "react";
+import { NextPage } from "next";
+import Head from "next/head";
+import GuildroomPageView from "@views/GuildroomPage/GuildroomPageView";
+import PageWrapper from "@views/common/PageWrapper";
+
+const GuildroomPage: NextPage = () => (
+  <>
+    <Head>
+      <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/kilta/guildroom`} />
+    </Head>
+    <PageWrapper>
+      <GuildroomPageView />
+    </PageWrapper>
+  </>
+);
+
+export default GuildroomPage;

src/pages/newStudent/forExchangers.tsx

@@ -0,0 +1,18 @@
+import React from "react";
+import { NextPage } from "next";
+import Head from "next/head";
+import ForInternationalPageView from "@views/ForInternationalPage/ForIntlPageView";
+import PageWrapper from "@views/common/PageWrapper";
+
+const ForInternationalPage: NextPage = () => (
+  <>
+    <Head>
+      <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/newStudent/ForIntl`} />
+    </Head>
+    <PageWrapper>
+      <ForInternationalPageView />
+    </PageWrapper>
+  </>
+);
+
+export default ForInternationalPage;

src/pages/newStudent/fukseille_en.tsx

@@ -0,0 +1,18 @@
+import React from "react";
+import { NextPage } from "next";
+import Head from "next/head";
+import ContactsPageView from "@views/ForFreshmenPage/ForFreshmenPageView";
+import PageWrapper from "@views/common/PageWrapper";
+
+const ContactsPage: NextPage = () => (
+  <>
+    <Head>
+      <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/newStudent/ForFreshmen`} />
+    </Head>
+    <PageWrapper>
+      <ContactsPageView />
+    </PageWrapper>
+  </>
+);
+
+export default ContactsPage;

src/pages/newStudent/fuksi.tsx

@@ -7,7 +7,7 @@ import PageWrapper from "@views/common/PageWrapper";
 const FreshmenPage: NextPage = () => (
   <>
     <Head>
-      <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/kilta/fuksi`} />
+      <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/newStudent/fuksi`} />
     </Head>
     <PageWrapper>
       <FreshmenPageView />

src/pages/signup/[id].tsx

@@ -13,6 +13,7 @@ import PageWrapper from "@views/common/PageWrapper";
 import LoadingView from "@views/common/LoadingView";
 import noop from "@utils/noop";
 import NotFoundPage from "@pages/404";
+import { v4 as uuid } from "uuid";
 
 type InitialProps = {
   initialForm: SignupForm;
@@ -23,6 +24,7 @@ const FORM_URL = `${process.env.NEXT_PUBLIC_API_URL}/signupForm/`;
 const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
   const router = useRouter();
   const id = String(initialForm?.id ?? "");
+  const SUBMIT_ID = uuid(); // Submission key, generated on page refresh
   const URL = `${FORM_URL}${id}/`;
   const { data: signupForm, error } = useSWR<SignupForm>(URL, (url) => axios.get(url).then((res) => res.data), { fallbackData: initialForm });
 
@@ -43,6 +45,7 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
 
   const onSubmit = async ({ formData }: ISubmitEvent<string>) => {
     const payload: Signup = {
+      submit_id: SUBMIT_ID, // This is for preventing duplicate requests; NOT RELATED TO THE SIGNUP ID IN DATABASE
       signupForm_id: signupForm.id,
       answer: formData,
     };

src/views/BoardPage/board.json

@@ -8,10 +8,10 @@
       "name_en": "Chairman of the Board",
       "representatives": [
         {
-          "name": "Emma Uusküla",
+          "name": "Sauli Hakala",
           "phone_number": null,
-          "email": "emma.uuskula@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Emma.jpg"
+          "email": "sauli.hakala@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -20,10 +20,10 @@
       "name_en": "Vice Chair",
       "representatives": [
         {
-          "name": "Johannes Viirimäki",
+          "name": "Eemeli Hintsanen",
           "phone_number": null,
-          "email": "johannes.viirimaki@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Johannes.jpg"
+          "email": "eemeli.hintsanen@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -32,10 +32,10 @@
       "name_en": "Treasurer",
       "representatives": [
         {
-          "name": "Nelli Liljasto",
+          "name": "Nea Kanerva",
           "phone_number": null,
-          "email": "nelli.liljasto@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Nelli.jpg"
+          "email": "nea.kanerva@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -44,10 +44,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Teemu Heikkinen",
+          "name": "Aura Friman",
           "phone_number": null,
-          "email": "teemu.heikkinen@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Teemu.jpg"
+          "email": "aura.friman@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -56,10 +56,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Henri Aito",
+          "name": "Antti Salpakari",
           "phone_number": null,
-          "email": "henri.aito@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Henri.jpg"
+          "email": "antti.salpakari@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -68,10 +68,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Tuomas Rantamäki",
+          "name": "Aino Saarela",
           "phone_number": null,
-          "email": "tuomas.rantamaki@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/TuomasR.jpg"
+          "email": "aino.saarela@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -80,10 +80,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Matilda Ahonen",
+          "name": "Rosanna Reims",
           "phone_number": null,
-          "email": "matilda.ahonen@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Matilda.jpg"
+          "email": "rosanna.reims@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -92,9 +92,9 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Niklas Ritalahti",
+          "name": "Valentin Juhela",
           "phone_number": null,
-          "email": "niklas.ritalahti@sahkoinsinoorikilta.fi",
+          "email": "valentin.juhela@sahkoinsinoorikilta.fi",
           "image": ""
         }
       ]
@@ -104,10 +104,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Mikael Vatiainen",
+          "name": "Elida Widgren",
           "phone_number": null,
-          "email": "mikael.vatiainen@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Mikael.jpg"
+          "email": "elida.widgren@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -116,10 +116,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Simeon Pursiainen",
+          "name": "Joona Maaranen",
           "phone_number": null,
-          "email": "simeon.pursiainen@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Simeon.jpg"
+          "email": "joona.maaranen@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -128,10 +128,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Markus Aaltio",
+          "name": "Jere Oinonen",
           "phone_number": null,
-          "email": "markus.aaltio@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Markus.jpg"
+          "email": "jere.oinonen@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -140,10 +140,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Tuomas Hintikka",
+          "name": "Into Saarinen",
           "phone_number": null,
-          "email": "tuomas.hintikka@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/TuomasH.jpg"
+          "email": "into.saarinen@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     },
@@ -152,10 +152,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Yassine Ramid",
+          "name": "Aino Svahn",
           "phone_number": null,
-          "email": "yassine.ramid@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Yassine.jpg"
+          "email": "aino.svahn@sahkoinsinoorikilta.fi",
+          "image": ""
         }
       ]
     }

src/views/CommitteePage/hvtmk.json

@@ -54,7 +54,7 @@
       "name_en": "Guild Room Representative",
       "representatives": [
         {
-          "name": "Justus Ojala"
+          "name": "Milja Kuusela"
         },
         {
           "name": "Aaro Rasilainen"

src/views/CorporatePage/CorporatePageView.tsx

@@ -100,8 +100,8 @@ const CorporatePageView: React.FC<CorporatePageViewProps> = ({ jobAds }) => (
 
     <CTASection
       bgColor="orange1"
-      link="https://sosso.fi/wp-content/uploads/2023/01/sossomediakortti23.pdf"
-      linkText="Killan lehden mediakortin löydät täältä&nbsp;›"
+      link="https://static.sahkoinsinoorikilta.fi/sekalaista/sossomediakortti25-web.pdf"
+      linkText="Killan lehden mediakortti&nbsp;›"
     >
       Mainos Sössöön?
     </CTASection>
@@ -110,7 +110,7 @@ const CorporatePageView: React.FC<CorporatePageViewProps> = ({ jobAds }) => (
       <h3 id="tyopaikat">Työpaikkailmoitukset</h3>
       <div>
         <JobAdList jobAds={jobAds} />
-        <p>Voit saada yrityksesi työpaikkailmoituksen listalle lähettämällä sen osoitteeseen <a href={`mailto:${CORPORATE_MASTER_INFO.email}`}>{CORPORATE_MASTER_INFO.email}</a></p>
+        <p> Haluatko työpaikkailmoituksesti näkyviin listalle? Lähetä tarjous osoitteeseen <a href={`mailto:${CORPORATE_MASTER_INFO.email}`}>{CORPORATE_MASTER_INFO.email}</a></p>
       </div>
 
     </TextSection>

src/views/ForFreshmenPage/ForFreshmenPageHero.tsx

@@ -0,0 +1,35 @@
+import React from "react";
+import {
+  Hero, HeroPrimarySection, HeroAside, HeroAsideItem,
+} from "@components/Hero";
+
+const ForFreshmenPageHero: React.FC = () => (
+  <Hero>
+    <HeroPrimarySection
+      header="Welcome to study in Otaniemi!"
+      text="This is the frontpage for fuksis (freshmen). Here we have collected all the most important information that you will need during your first year.
+      Of course, everything happening in the guild can't fit here, so it is recommended that you also check out the more general 'in english' page."
+    />
+
+    <HeroAside bgColor="lightTurquoise">
+      <HeroAsideItem
+        header="Read the guild freshman guide"
+        link="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_en_web.pdf"
+        linkText="read the freshman guide here!"
+      />
+
+      <HeroAsideItem
+        header="Follow the guild's announcements"
+        link="https://t.me/+KxOI-aQ0jpFhNTJk"
+        linkText="Join the guild's Telegram-group!"
+      />
+      <HeroAsideItem
+        header="Fuksi groups and ISOs?"
+        link="#isos"
+        linkText="Information about the fuksi groups"
+      />
+    </HeroAside>
+  </Hero>
+);
+
+export default ForFreshmenPageHero;

src/views/ForFreshmenPage/ForFreshmenPageView.tsx

@@ -0,0 +1,170 @@
+import React from "react";
+import Image from "next/legacy/image";
+import styled from "styled-components";
+import {
+  CTASection, TextSection, InfoBox, PageLink, Link,
+} from "@components/index";
+import ForFreshmenPageHero from "./ForFreshmenPageHero";
+
+const FUKSI_POINTS_LINK = "https://static.sahkoinsinoorikilta.fi/FTMK/Fuksipisteohje.pdf";
+const TG_GROUP_CHAT_LINK = "https://t.me/+ctpg4H0-Y3hlZTY0";
+const TG_NOTIFICATIONS_LINK = "https://t.me/+v30Nts-MrIMyMjNk";
+const EMAIL_LINK = "ftmk@sahkoinsinoorikilta.fi";
+const EMAIL_LINK_MAILTO = `mailto:${EMAIL_LINK}`;
+
+const ImageContainer = styled.div`
+  width: 100%;
+  display: block;
+  margin: auto;
+`;
+
+const QRImages = styled.img`
+  width: 10em;
+  height: 10em;
+`;
+
+const FopasImage = styled.img`
+  width: 15em;
+  margin-bottom: 1em;
+`;
+
+const ForFreshmenPageView: React.FC = () => (
+  <>
+    <ForFreshmenPageHero />
+    <TextSection>
+      <h3 id="abeille">Congratulations on an awesome choice of studies!</h3>
+      <div>
+        <p>
+          You have made an excellent choice by taking the first step on a journey where you will first become an engineering student, ...known better in finnish
+          as &quot;teekkari&quot; and later a Master of Science in Engineering &quot;Diplomi-insinööri&quot;.
+          You have just become a technical high school graduate and a freshman.
+          A great achievement that certainly deserves celebration, and there is no better place for that celebration than Otaniemi.
+          Welcome!
+        </p>
+        <p>
+          As a first step, we recommend that you join the Telegram channels created for freshmen.
+          {" "}
+          <Link to={TG_GROUP_CHAT_LINK} target="_blank">Click here</Link> to get acquainted with your fellow freshmen and ISOs, and <Link to={TG_NOTIFICATIONS_LINK} target="_blank">click here</Link> to join the notification channel.
+        </p>
+
+        <h6>A story named Teekkarius</h6>
+        <p>
+          Every teekkari&apos;s journey is unique.
+          The guild, the student union, and the other organizations in Otaniemi will undoubtedly offer something for everyone.
+          You are now part of Aalto University&apos;s Electrical Engineering Guild, and we will support you throughout your teekkari journey so that you can find the places that are perfect for you to make an impact and pursue your hobbies.
+          To make this possible, we have placed you in a freshman group, which you will get to know during orientation week and which will serve as your support group for new adventures.
+          Your freshman group also includes a few tutors better known as ISOs.
+          You can find more information about them <Link to="#isot">below</Link>.
+        </p>
+
+        <ImageContainer>
+          <Image
+            src="https://static.sahkoinsinoorikilta.fi/FTMK/IMG_6539.JPG"
+            alt="Kipparit"
+            layout="responsive"
+            width={100}
+            height={80}
+            objectFit="contain"
+          />
+        </ImageContainer>
+
+        <h6>Freshmen captains</h6>
+        <p>
+          We are your freshman captains <strong>Teemu</strong> and <strong>Henri</strong> and we&apos;ll be here to support you and monitor your
+          progress throughout the freshman year adventures toward earning your engineer&apos;s hat (= teekkarilakki),
+          which you might possibly earn during May Day next spring.
+          If you have any questions, feel free to contact us via <Link to={TG_GROUP_CHAT_LINK} target="_blank">Telegram</Link> or <a href={EMAIL_LINK_MAILTO}>email</a>.
+        </p>
+
+        <h6>Smile When We Meet!</h6>
+        <p>
+          Although the first days in Otaniemi might bring along some funny and strange experiences, don&apos;t be alarmed by them!
+          Over time, the pieces of the puzzle will come together to form an image that reflects you, and you&apos;ll have the opportunity to shape what the final result looks like.
+        </p>
+        <p>
+          Orientation week is held from August 25th to 29th, 2025, but even before then, you&apos;ll have the chance to meet us, other freshmen, and the ISOs at a relaxed Pre-Start event.
+          The Pre-Start for the freshman year is organized on Saturday, August 16th, 2025. Find more details in the Telegram groups!
+        </p>
+
+        <h6>Teemu Heikkinen</h6>
+        <p>040 097 1835<br />teemu.heikkinen (ät) sahkoinsinoorikilta.fi <br />@heikkinenteemu</p>
+
+        <h6>Henri Aito</h6>
+        <p>045 328 2883<br />henri.aito (ät) sahkoinsinoorikilta.fi <br />@henriaito</p>
+      </div>
+      <aside>
+        <div>
+          <PageLink to={EMAIL_LINK_MAILTO} desc={EMAIL_LINK}>
+            You can reach the freshman captains at
+          </PageLink>
+          <PageLink to="https://api.sahkoinsinoorikilta.fi/members/application" desc="And join our activities!&nbsp;›">
+            Join the guild!
+          </PageLink>
+          <PageLink to={FUKSI_POINTS_LINK} desc="Take a look at the fuksipoints&nbsp;›">
+            Fuksipoint guide - This will be translated later so don&apos;t worry if you don&apos;t understand Finnish!
+          </PageLink>
+        </div>
+        <div>
+          <InfoBox>
+            <h6>Fuksiguide</h6>
+            <Link to="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_en_web.pdf" target="_blank">
+              <FopasImage
+                src="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_kansi.jpg"
+              />
+            </Link>
+
+            <p>
+              It&apos;s a good idea to take a look at the fuksiguide before starting your studies!
+              The guide contains lots of useful information about the guild, the student union, and the student life in Otaniemi.
+              You can find the guide <Link to="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_en_web.pdf" target="_blank">here</Link>.
+            </p>
+            <br />
+            <h6>Telegram?</h6>
+            <p>
+              Telegram is a messaging app used in Otaniemi.
+              More info can be found here: <Link to="https://telegram.org/faq" target="_blank">https://telegram.org/faq</Link>.
+            </p>
+            <p>
+              SIK fuksis have a group chat, which you can join by scanning the QR code below:
+            </p>
+            <QRImages
+              src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2025.jpg"
+            />
+            <p>or <Link to={TG_GROUP_CHAT_LINK} target="_blank">press me!</Link></p>
+            <p>Also join the notifications channel for SIK fuksis, to stay in the loop!:</p>
+            <QRImages
+              src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-tiedotus-2025.jpg"
+            />
+            <p>or <Link to={TG_NOTIFICATIONS_LINK} target="_blank">press me!</Link></p>
+          </InfoBox>
+        </div>
+      </aside>
+    </TextSection>
+    <CTASection
+      bgColor="lightBlue"
+      link="/kilta/toiminta"
+      linkText="Follow what the guild is up to"
+    >
+      The guild organises lots of things!
+    </CTASection>
+
+    <TextSection>
+      <h3 id="isos">Freshman groups and ISOs</h3>
+      <div>
+        <p>SIK freshmen enjoy the guidance and care of their wonderful ISOs in their own freshman groups</p>
+        <p>
+          ISOs are older students and guild members, who are there to support you throughout your freshman year. You will be divided into groups.
+          You can ask your ISOs anything regarding studying and student life. Even though they don&apos;t know all the answers, they can likely help you finding them.
+        </p>
+        <p>
+          As stated above, your ISOs will support you through your whole freshman year, but you will see them most during the orientation week,
+          during which they will wander through Otaniemi together with your group and guide you into the ways of the teekkari.
+          They will also help you find whatever is needed to start your studies here, and will support you in creating your timetable and getting your library, HSL and student cards.
+        </p>
+        <p>ISOs are also invited to the first event of the freshman year, the head start. Come meet them there early!</p>
+      </div>
+    </TextSection>
+  </>
+);
+
+export default ForFreshmenPageView;

src/views/ForInternationalPage/ForIntlPageHero.tsx

@@ -0,0 +1,35 @@
+import React from "react";
+import {
+  Hero, HeroPrimarySection, HeroAside, HeroAsideItem,
+} from "@components/Hero";
+
+const ForFreshmenPageHero: React.FC = () => (
+  <Hero>
+    <HeroPrimarySection
+      header="Welcome to Aalto and Otaniemi!"
+      text="This is the frontpage for fuksis (freshmen). Here we have collected all the most important information that you will need during your first year.
+      Of course, everything happening in the guild can't fit here, so it is recommended that you also check out the more general 'in english' page."
+    />
+
+    <HeroAside bgColor="lightTurquoise">
+      <HeroAsideItem
+        header="Read the guild&apos;s fuksi guide"
+        link="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_en_web.pdf"
+        linkText="Read the fuksi guide here!"
+      />
+
+      <HeroAsideItem
+        header="Follow the guild&apos;s announcements"
+        link="https://t.me/+KxOI-aQ0jpFhNTJk"
+        linkText="Join the guild's Telegram group!"
+      />
+      <HeroAsideItem
+        header="Fuksi groups and ISOs?"
+        link="#isos"
+        linkText="Information about the fuksi groups"
+      />
+    </HeroAside>
+  </Hero>
+);
+
+export default ForFreshmenPageHero;

src/views/ForInternationalPage/ForIntlPageView.tsx

@@ -0,0 +1,191 @@
+import React from "react";
+import Image from "next/legacy/image";
+import styled from "styled-components";
+import {
+  CTASection, TextSection, InfoBox, PageLink, Link,
+} from "@components/index";
+import ForIntlPageHero from "./ForIntlPageHero";
+
+const FUKSI_POINTS_LINK = "https://static.sahkoinsinoorikilta.fi/FTMK/Fuksipisteohje.pdf";
+const TG_GROUP_CHAT_LINK = "https://t.me/+oNrBDLI5cXZhNDEx";
+const TG_NOTIFICATIONS_LINK = "https://t.me/sikhotline2526";
+const EMAIL_LINK = "ftmk@sahkoinsinoorikilta.fi";
+const EMAIL_LINK_MAILTO = `mailto:${EMAIL_LINK}`;
+
+const ImageContainer = styled.div`
+  width: 100%;
+  display: block;
+  margin: auto;
+`;
+
+const QRImages = styled.img`
+  width: 10em;
+  height: 10em;
+`;
+
+const FopasImage = styled.img`
+  width: 15em;
+  margin-bottom: 1em;
+`;
+
+const ForIntlPageView: React.FC = () => (
+  <>
+    <ForIntlPageHero />
+    <TextSection>
+      <h3 id="abeille">Congratulations on your admission!</h3>
+      <div>
+        <p>
+          You&apos;ve not only become a new student at Aalto, but also what&apos;s known as a teekkari
+          – a term used to describe students of technology in Finland, and which is synonymous
+          with a distinct, tradition-filled student culture.
+        </p>
+        <p>
+          Whether you&apos;ve learned about this before or it&apos;s your first time hearing about it, it&apos;s absolutely worth celebrating, and the best place for this is definitely our campus in Otaniemi. Welcome!
+        </p>
+        <p>
+          As a first step, we recommend that you join the Telegram channels made for fuksis. This is where you can get to know your fellow new students and your student tutors known as ISOs. This is also where you can access the information channel.
+          {" "}
+          <Link to={TG_GROUP_CHAT_LINK} target="_blank">Click here</Link> to get acquainted with your fellow freshmen and ISOs, and <Link to={TG_NOTIFICATIONS_LINK} target="_blank">click here</Link> to join the notification channel.
+        </p>
+
+        <h6>A journey called Teekkarius</h6>
+        <p>
+          Every teekkari&apos;s journey is unique.
+          The guild, the student union, and the other organizations in Otaniemi will undoubtedly offer something for everyone.
+          You are now part of Aalto University&apos;s Electrical Engineering Guild, and we will support you throughout your teekkari journey so that you can find the places that are perfect for you to make an impact and pursue your hobbies.
+          To make this possible, we have placed you in a freshman group, which you will get to know during orientation week and which will serve as your support group for new adventures.
+          Your freshman group also includes a few tutors better known as ISOs.
+          You can find more information about them <Link to="#isot">below</Link>.
+        </p>
+        <p>
+          The journey of a teekkari is unique to everyone. The guild, the Aalto Student Union,
+          and other organizations in Otaniemi offer various opportunities to pursue hobbies,
+          passions, and social lives.
+        </p>
+        <p>
+          You are now part of the Aalto University Guid of Electrical Engineering
+          (SIK, short for Sähköinsinöörikilta in Finnish) and we will support you in
+          settling in and finding the right places to have fun and make an impact.
+        </p>
+        <p>
+          To make this successful, we’ve placed you in a small “fuksi group” with other new students,
+          whom you will get to know and adventure with starting in Orientation Week.
+          Your fuksi group also includes a few ISOs, who have studied here for at least a year and will
+          lean on their experience to show you around and help you get comfortable.
+        </p>
+
+        <ImageContainer>
+          <Image
+            src="https://static.sahkoinsinoorikilta.fi/FTMK/Captains2025.jpg"
+            alt="Kipparit"
+            layout="responsive"
+            width={100}
+            height={80}
+            objectFit="contain"
+          />
+        </ImageContainer>
+
+        <h6>International captains</h6>
+        <p>
+          We are your International Fuksi Captains <strong>Markus</strong> and <strong>Apollo</strong>,
+          and we will be there to support you in getting started at Aalto, but also to guide you through
+          the awesome (and distinctly Finnish) process of becoming a full-blown teekkari.
+          This involves participating in many fun activities and traditions, culminating in earning the famous
+          Teekkari Cap and having an amazing community alongside you. If you have any questions,
+          please contact us on Telegram or by email.
+        </p>
+
+        <h6>Looking forward to meeting you!</h6>
+        <p>
+          Even though your first few days in Otaniemi may bring some new and unfamiliar experiences,
+          please don&apos;t be intimidated! Over time, the pieces of the puzzle will come together and you&apos;ll be
+          having just as much fun as we are. Always remember that as a teekkari in Otaniemi, you&apos;re never alone.
+        </p>
+        <p>
+          Orientation week will be held from 25 to 29 August 2025, but even before that you have the
+          opportunity to come and get to know us, other freshmen and ISOs at a relaxed Headstart event.
+          This will be held on Saturday 16 August 2025. More about that in the Telegram groups!
+        </p>
+
+        <h6>Apollo Ailus</h6>
+        <p>+358 045 803 3662<br />apollo.ailus@sahkoinsinoorikilta.fi <br />@SIKCaptain</p>
+
+        <h6>Markus Aaltio</h6>
+        <p>+358 044 050 4028<br />markus.aaltio@sahkoinsinoorikilta.fi <br />@KvCaptain</p>
+      </div>
+      <aside>
+        <div>
+          <PageLink to={EMAIL_LINK_MAILTO} desc={EMAIL_LINK}>
+            You can reach the freshman captains at
+          </PageLink>
+          <PageLink to="https://api.sahkoinsinoorikilta.fi/members/application" desc="And join our activities!&nbsp;›">
+            Join the guild!
+          </PageLink>
+          <PageLink to={FUKSI_POINTS_LINK} desc="Take a look at the fuksipoints&nbsp;›">
+            Fuksipoint guide - This will be translated later so don&apos;t worry if you don&apos;t understand Finnish!
+          </PageLink>
+        </div>
+        <div>
+          <InfoBox>
+            <h6>Fuksiguide</h6>
+            <Link to="https://static.sahkoinsinoorikilta.fi/FTMK/Fuksiguide_25_web.pdf" target="_blank">
+              <FopasImage
+                src="https://static.sahkoinsinoorikilta.fi/FTMK/Fuksiguide_25_cover.png"
+              />
+            </Link>
+
+            <p>
+              It&apos;s a good idea to take a look at the fuksiguide before starting your studies!
+              The guide contains lots of useful information about the guild, the student union, and the student life in Otaniemi.
+              You can find the guide <Link to="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_en_web.pdf" target="_blank">here</Link>.
+            </p>
+            <br />
+            <h6>Telegram?</h6>
+            <p>
+              Telegram is a messaging app used in Otaniemi.
+              More info can be found here: <Link to="https://telegram.org/faq" target="_blank">https://telegram.org/faq</Link>.
+            </p>
+            <p>
+              SIK fuksis have a group chat, which you can join by scanning the QR code below:
+            </p>
+            <QRImages
+              src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2025.jpg"
+            />
+            <p>or <Link to={TG_GROUP_CHAT_LINK} target="_blank">press me!</Link></p>
+            <p>Also join the notifications channel for SIK fuksis, to stay in the loop!:</p>
+            <QRImages
+              src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-tiedotus-2025.jpg"
+            />
+            <p>or <Link to={TG_NOTIFICATIONS_LINK} target="_blank">press me!</Link></p>
+          </InfoBox>
+        </div>
+      </aside>
+    </TextSection>
+    <CTASection
+      bgColor="lightBlue"
+      link="/kilta/toiminta"
+      linkText="Follow what the guild is up to"
+    >
+      The guild organises lots of things!
+    </CTASection>
+
+    <TextSection>
+      <h3 id="isos">Freshman groups and ISOs</h3>
+      <div>
+        <p>SIK freshmen enjoy the guidance and care of their wonderful ISOs in their own freshman groups</p>
+        <p>
+          ISOs are older students and guild members, who are there to support you throughout your freshman year. You will be divided into groups.
+          You can ask your ISOs anything regarding studying and student life. Even though they don&apos;t know all the answers, they can likely help you finding them.
+        </p>
+        <p>
+          As stated above, your ISOs will support you through your whole freshman year, but you will see them most during the orientation week,
+          during which they will wander through Otaniemi together with your group and guide you into the ways of the teekkari.
+          They will also help you find whatever is needed to start your studies here, and will support you in creating your timetable and getting your library, HSL and student cards.
+        </p>
+        <p>ISOs are also invited to the first event of the freshman year, the head start. Come meet them there early!</p>
+      </div>
+    </TextSection>
+  </>
+);
+
+export default ForIntlPageView;

src/views/FreshmenPage/FreshmenPageHero.tsx

@@ -13,7 +13,7 @@ const FreshmenPageHero: React.FC = () => (
     <HeroAside bgColor="lightTurquoise">
       <HeroAsideItem
         header="Lue killan fuksiopas"
-        link="https://static.sahkoinsinoorikilta.fi/FTMK/Fuksiopas2024.pdf"
+        link="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_web.pdf"
         linkText="lue fuksiopas täältä!"
       />
 

src/views/FreshmenPage/FreshmenPageView.tsx

@@ -7,8 +7,8 @@ import {
 import FreshmenPageHero from "./FreshmenPageHero";
 
 const FUKSI_POINTS_LINK = "https://static.sahkoinsinoorikilta.fi/FTMK/Fuksipisteohje.pdf";
-const TG_GROUP_CHAT_LINK = "https://t.me/+8McxwmHvXu80YmFk";
-const TG_NOTIFICATIONS_LINK = "https://t.me/+GGTLMfwce1gxM2Q8";
+const TG_GROUP_CHAT_LINK = "https://t.me/+ctpg4H0-Y3hlZTY0";
+const TG_NOTIFICATIONS_LINK = "https://t.me/+v30Nts-MrIMyMjNk";
 const EMAIL_LINK = "ftmk@sahkoinsinoorikilta.fi";
 const EMAIL_LINK_MAILTO = `mailto:${EMAIL_LINK}`;
 
@@ -43,7 +43,7 @@ const FreshmenPageView: React.FC = () => (
         <p>
           Ensi askeleina suosittelemme, että liityt teille fukseille tehdyille Telegram-kanaville.
           {" "}
-          <Link to={TG_GROUP_CHAT_LINK} target="_blank">Tästä</Link> tutustumaan fuksikavereihin ja ISOihisi ja <Link to={TG_NOTIFICATIONS_LINK} target="_blank">tästä</Link> pääset tiedotuskanavalle.
+          <Link to={TG_GROUP_CHAT_LINK} target="_blank">Tästä</Link> pääset tutustumaan fuksikavereihisi sekä ISOihin ja <Link to={TG_NOTIFICATIONS_LINK} target="_blank">tästä</Link> pääset tiedotuskanavalle.
         </p>
 
         <h6>Matka nimeltä Teekkarius</h6>
@@ -58,7 +58,7 @@ const FreshmenPageView: React.FC = () => (
 
         <ImageContainer>
           <Image
-            src="https://static.sahkoinsinoorikilta.fi/FTMK/fuksikipparit-2024.jpg"
+            src="https://static.sahkoinsinoorikilta.fi/FTMK/IMG_6539.JPG"
             alt="Kipparit"
             layout="responsive"
             width={100}
@@ -69,7 +69,7 @@ const FreshmenPageView: React.FC = () => (
 
         <h6>Fuksikapteenit</h6>
         <p>
-          Me olemme fuksikapteenisi <strong>Sauli</strong> ja <strong>Valentin</strong> ja tulemme olemaan tukenasi sekä valvomassa suorituksiasi fuksivuoden seikkailuissa kohti teekkarilakkia,
+          Me olemme fuksikapteenisi <strong>Teemu</strong> ja <strong>Henri</strong> ja tulemme olemaan tukenasi sekä valvomassa suorituksiasi fuksivuoden seikkailuissa kohti teekkarilakkia,
           jonka voit ansaita mahdollisesti järjestettävänä Wappuna ensi keväällä.
           Jos sinulla on mitään kysymyksiä, ota ihmeessä meihin yhteyttä esimerkiksi <Link to={TG_GROUP_CHAT_LINK} target="_blank">Telegramissa</Link> tai <a href={EMAIL_LINK_MAILTO}>sähköpostitse</a>.
         </p>
@@ -80,15 +80,15 @@ const FreshmenPageView: React.FC = () => (
           Ajan myötä palapelin palat muodostavat sinun näköisesi kuvan ja pääset itse vaikuttamaan siihen, miltä lopputulos näyttää.
         </p>
         <p>
-          Orientaatioviikko järjestetään 26-30.8.2024, mutta jo ennen sitä sinulla on mahdollisuus tulla tutustumaan meihin, muihin fukseihin ja ISOihin rentoon Varaslähtöön.
-          Varaslähtö fuksivuoteen järjestetään lauantaina 17.8.2024. Siitä lisää Telegram-ryhmissä!
+          Orientaatioviikko järjestetään 25.-29.8.2025, mutta jo ennen sitä sinulla on mahdollisuus tulla tutustumaan meihin, muihin fukseihin ja ISOihin rentoon Varaslähtöön.
+          Varaslähtö fuksivuoteen järjestetään lauantaina 16.8.2025. Siitä lisää Telegram-ryhmissä!
         </p>
 
-        <h6>Sauli Hakala</h6>
-        <p>045 317 1800<br />sauli.hakala (ät) sahkoinsinoorikilta.fi <br />@saulihakala</p>
+        <h6>Teemu Heikkinen</h6>
+        <p>040 097 1835<br />teemu.heikkinen (ät) sahkoinsinoorikilta.fi <br />@heikkinenteemu</p>
 
-        <h6>Valentin Juhela</h6>
-        <p>040 968 1644<br />valentin.juhela (ät) sahkoinsinoorikilta.fi <br />@ValentinJuhela</p>
+        <h6>Henri Aito</h6>
+        <p>045 328 2883<br />henri.aito (ät) sahkoinsinoorikilta.fi <br />@henriaito</p>
       </div>
       <aside>
         <div>
@@ -96,7 +96,7 @@ const FreshmenPageView: React.FC = () => (
             Fuksikipparit tavoitat
           </PageLink>
           <PageLink to="https://api.sahkoinsinoorikilta.fi/members/application" desc="ja tule mukaan toimintaamme&nbsp;›">
-            Liity jäseneksi
+            Liity jäseneksi tästä
           </PageLink>
           <PageLink to={FUKSI_POINTS_LINK} desc="Katso fuksipisteitä&nbsp;›">
             Fuksipisteohje
@@ -105,15 +105,15 @@ const FreshmenPageView: React.FC = () => (
         <div>
           <InfoBox>
             <h6>Killan Fuksiopas</h6>
-            <Link to="https://static.sahkoinsinoorikilta.fi/FTMK/Fuksiopas2024.pdf" target="_blank">
+            <Link to="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_web.pdf" target="_blank">
               <FopasImage
-                src="https://static.sahkoinsinoorikilta.fi/FTMK/Fuksiopas2024-kansi.jpg"
+                src="https://static.sahkoinsinoorikilta.fi/FTMK/Fopas_25_kansi.jpg"
               />
             </Link>
 
             <p>
               Ennen opintojen alkua on hyvä tutustua killan fuksioppaaseen.
-              Sitä pääset selailemaan <Link to="https://static.sahkoinsinoorikilta.fi/FTMK/Fuksiopas2024.pdf" target="_blank">tästä</Link>.
+              Oppaan pääset lukemaan tästä!
             </p>
             <br />
             <h6>Telegram?</h6>
@@ -126,12 +126,12 @@ const FreshmenPageView: React.FC = () => (
               SIK:n fukseilla on oma Telegram-ryhmä, jonne pääset liitymään tästä:
             </p>
             <QRImages
-              src="https://static.sahkoinsinoorikilta.fi/FTMK/sik-fuksit-2024.jpg"
+              src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2025.jpg"
             />
             <p>tai <Link to={TG_GROUP_CHAT_LINK} target="_blank">tästä</Link></p>
             <p>Liity myös samalla SIK-fuksien tiedotuskanavalle tästä:</p>
             <QRImages
-              src="https://static.sahkoinsinoorikilta.fi/FTMK/sik-fuksit-2024-tiedotus.jpg"
+              src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-tiedotus-2025.jpg"
             />
             <p>tai <Link to={TG_NOTIFICATIONS_LINK} target="_blank">tästä</Link></p>
           </InfoBox>

src/views/FrontPage/FrontPageHero.tsx

@@ -30,7 +30,7 @@ const FrontPageHero: React.FC = () => (
       <HeroAsideItem
         header="Vasta-aloittaneelle opiskelijalle"
         text="Fuksikasvatusta ja ISOtoimintaa"
-        link="/kilta/fuksi"
+        link="/newStudent/fuksi"
         linkText="Fuksit&nbsp; ›"
       />
       <HeroAsideItem

src/views/FrontPage/FrontPageView.tsx

@@ -25,9 +25,10 @@ const Okmetic = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/okmet
 const Nokia = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/nokia.jpg";
 const Granlund = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/granlund.jpg";
 const Eaton = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/eaton.png";
-const MerusPower = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/meruspower.png";
-const Ramboll = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ramboll.png";
 const Ericsson = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ericsson.png";
+const Saab = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/Saab.png";
+const STUL = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/stul_logo.png";
+const Metso = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/Metso-logo.png";
 
 interface FrontPageViewProps {
   events: Event[];
@@ -118,15 +119,18 @@ const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
             <Link to="https://www.eaton.com/fi/fi-fi.html">
               <Image src={Eaton} alt="Eaton" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
-            <Link to="https://meruspower.com/">
-              <Image src={MerusPower} alt="Merus Power" layout="responsive" width={200} height={100} objectFit="contain" />
-            </Link>
-            <Link to="https://www.ramboll.com/fi-fi">
-              <Image src={Ramboll} alt="Ramboll" layout="responsive" width={200} height={100} objectFit="contain" />
-            </Link>
             <Link to="https://www.ericsson.com/en">
               <Image src={Ericsson} alt="Ericsson" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
+            <Link to="https://www.saab.com/fi/markets/finland">
+              <Image src={Saab} alt="Saab" layout="responsive" width={200} height={100} objectFit="contain" />
+            </Link>
+            <Link to="https://www.stul.fi/">
+              <Image src={STUL} alt="STUL" layout="responsive" width={200} height={100} objectFit="contain" />
+            </Link>
+            <Link to="https://www.metso.com/fi/">
+              <Image src={Metso} alt="Metso" layout="responsive" width={200} height={100} objectFit="contain" />
+            </Link>
           </div>
           <Link to="/yritysyhteistyo">Haluatko kuulla lisää yhteistyöstä kanssamme?</Link>
         </SponsorReel>

src/views/GuildroomPage/GuildroomPageView.tsx

@@ -0,0 +1,97 @@
+import { useState, useEffect } from "react";
+import mqtt from "mqtt";
+import { TextSection } from "@components/index";
+import styled from "styled-components";
+
+const CoffeeTitle = styled.div`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-size: 3rem;
+  font-weight: bold;
+`;
+
+const Cups = styled.div`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-size: 7rem;
+  font-variant-numeric: tabular-nums;
+`;
+
+const Time = styled.div`
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  font-size: 1rem;
+`;
+
+const GuildroomView = () => {
+  const [brewing, setBrewing] = useState<boolean>(false);
+  const [time, setTime] = useState<number>(0);
+  const [cups, setCups] = useState<number>(0);
+  const [client, setClient] = useState<mqtt.MqttClient | null>(null);
+  const [status, setStatus] = useState<boolean>(false);
+
+  useEffect(() => {
+    setStatus(false);
+    if (process.env.NEXT_PUBLIC_MQTT_HOST) {
+      setClient(mqtt.connect(`wss://${process.env.NEXT_PUBLIC_MQTT_HOST}`));
+    } else {
+      console.error("MQTT host undefined");
+    }
+  }, []);
+
+  useEffect(() => {
+    if (client) {
+      client.on("connect", () => {
+        setStatus(true);
+        client.subscribe("sik/kiltahuone/kahvivaaka/#", (err) => {
+          if (!err) {
+            console.log("Connected to MQTT server!");
+          }
+        });
+      });
+      client.on("error", (err) => {
+        console.error("Connection error: ", err);
+        client.end();
+      });
+      client.on("reconnect", () => {
+        setStatus(false);
+      });
+      client.on("offline", () => {
+        setStatus(false);
+      });
+      client.on("message", (topic, message) => {
+        if (topic === "sik/kiltahuone/kahvivaaka/cups") {
+          setCups(Number(message.toString()));
+        }
+        if (topic === "sik/kiltahuone/kahvivaaka/brewtime") {
+          setTime(Number(message.toString()));
+        }
+        if (topic === "sik/kiltahuone/kahvivaaka/brewing") {
+          setBrewing(Boolean(message.toString()));
+        }
+      });
+    }
+  }, [client]);
+
+  if (!status) {
+    return (
+      <CoffeeTitle style={{ margin: "10%" }}>NO MQTT CONNECTION</CoffeeTitle>
+    );
+  }
+
+  return (
+    <div style={{ margin: "10%" }}>
+      <CoffeeTitle>{brewing ? "Brewing more..." : "Cups left"}</CoffeeTitle>
+      <Cups>{cups}</Cups>
+      <Time>Brewed {time} min ago</Time>
+    </div>
+  );
+};
+
+export default GuildroomView;

src/views/MembershipPage/MembershipPageView.tsx

@@ -19,6 +19,19 @@ const MembershipPageView: React.FC = () => (
           Killan ulkojäseneksi voidaan hyväksyä jäsenmaksun maksanut henkilö, joita ei voida hyväksyä varsinaiseksi jäseneksi.
           Killan kannatusjäseneksi voidaan hyväksyä henkilö tai yhteisö, joka haluaa tukea killan toimintaa.
         </p>
+        <p>
+          Killan sääntöjen mukaan jäsenmaksuista määrätään seuraavasti:
+          <br />
+        </p>
+        <p>
+          <h5>8 § Jäsenmaksut</h5>
+          <br />
+          Jäsenet ovat velvollisia suorittamaan lukuvuosittain killalle jäsenmaksun.
+          Kunniajäsenet ovat vapautettuja jäsenmaksuista.
+        </p>
+        <p>
+          Jäsenmaksujen suuruudet määrää killan yleinen kokous.
+        </p>
 
         <h6 id="jasenmaksu">Jäsenmaksu</h6>
         <p>
@@ -36,6 +49,11 @@ const MembershipPageView: React.FC = () => (
             Jäsenrekisterin tietosuojaseloste
           </Link>
         </p>
+        <p>
+          <Link to="https://static.sahkoinsinoorikilta.fi/saannot/killansaannot.pdf">
+            Killan säännöt
+          </Link>
+        </p>
       </div>
     </TextSection>
   </>

src/views/RentPage/RentPageView.tsx

@@ -11,6 +11,7 @@ const RentPageView: React.FC = () => (
         <li>Mökämasiina <a href="https://static.sahkoinsinoorikilta.fi/img/equipment/mokamasiina.jpg">kuva</a> 50 €/päivä</li>
         <li>SIK-Teltta <a href="https://sik.kuvat.fi/kuvat/2021/Varaslähtö/Varaslähtö-Suvi-Karanta-16.jpg">kuva</a> 50 €/päivä</li>
         <li>Gongi ilmainen</li>
+        <li>Kyykkäsetti 10 €</li>
         <li>80 kpl kevytpeitteet</li>
         <ul>
           <li>Alle 5 kpl ilmainen</li>

stack-compose.yml

@@ -9,3 +9,4 @@ services:
         order: start-first
     ports:
       - 3000:3000
+