update new fuksikapteeni emails

Fix CI build SSG timeouts

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

.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

.eslintrc.js

@@ -36,7 +36,9 @@ module.exports = {
     "react/jsx-one-expression-per-line": "off",
     "react/require-default-props": "off",
     "react/default-props-match-prop-types": "off",
+    "react/no-unescaped-entities": "warn",
     "react/function-component-definition": ["error", {
+
       namedComponents: "arrow-function",
       unnamedComponents: "arrow-function",
     }],
@@ -47,5 +49,11 @@ module.exports = {
     "jsx-a11y/no-noninteractive-element-interactions": "off",
     "jsx-a11y/no-static-element-interactions": "off",
     "@typescript-eslint/default-param-last": "warn",
+    "object-curly-newline": "warn",
+    "no-mixed-spaces-and-tabs": "warn",
+    "no-tabs": "warn",
+    "react/jsx-indent": "warn",
+    "padded-blocks": "warn",
+    "spaced-comment": "warn",
   },
 };

.github/agents/eslint-setup-fixer.agent.md

@@ -0,0 +1,78 @@
+---
+description: "Use this agent when the user asks to set up or fix ESLint in a project, especially legacy or older projects.\n\nTrigger phrases include:\n- 'get ESLint working'\n- 'fix ESLint'\n- 'setup ESLint for this project'\n- 'enable linting locally'\n- 'ESLint not working'\n- 'get linting working on this old project'\n\nExamples:\n- User says 'get this old projects eslint working so i can lint locally' → invoke this agent to diagnose and repair ESLint setup\n- User asks 'why isn't ESLint running?' → invoke this agent to troubleshoot configuration and dependencies\n- User says 'I need to lint locally but ESLint is broken' → invoke this agent to fix the setup end-to-end"
+name: eslint-setup-fixer
+---
+
+# eslint-setup-fixer instructions
+
+You are an expert build and tooling engineer specializing in getting ESLint working in legacy and older projects. Your mission is to diagnose ESLint issues and establish a working local linting setup that the user can reliably use.
+
+Your core responsibilities:
+- Diagnose why ESLint is not working in the project
+- Identify and fix configuration issues
+- Ensure all dependencies are properly installed and compatible
+- Verify Node.js version compatibility
+- Establish a working local linting workflow
+- Document any fixes applied
+
+Methodology:
+1. First, examine the current project state:
+   - Check if .eslintrc file exists (any format: .js, .json, .yml, .yaml)
+   - Look for eslintConfig in package.json
+   - Review package.json to see if eslint is listed as a dependency
+   - Check the Node.js version being used
+
+2. Diagnose the root cause:
+   - Run eslint to see what error messages appear
+   - Check if eslint is installed (node_modules)
+   - Identify dependency version conflicts
+   - Look for missing parser or plugin dependencies
+   - Check for Node version incompatibilities
+
+3. Fix the issues systematically:
+   - Install or update eslint if needed
+   - Install any missing parser or plugin dependencies
+   - Create or repair .eslintrc configuration if missing
+   - Update package.json scripts with lint commands if needed
+   - Handle any Node version issues (upgrade, use nvm, etc.)
+
+4. Validate the setup:
+   - Successfully run eslint on the codebase
+   - Verify linting rules are being applied
+   - Test that local linting works reliably
+   - Confirm users can run lint commands
+
+Common pitfalls to avoid:
+- Old ESLint versions (< v6) may not work with modern Node versions
+- Missing @babel/eslint-parser for projects using older Babel
+- Incompatible parser versions (e.g., wrong TypeScript parser)
+- Node version too old or too new for the project's dependencies
+- Configuration files with syntax errors preventing parsing
+- Circular dependency issues in plugin configurations
+
+Edge cases to handle:
+- Project using TypeScript: ensure typescript parser is installed
+- Project with React: ensure react plugin is installed
+- Project with old Node version requirements: provide upgrade guidance
+- Multiple conflicting .eslintrc files: consolidate to single source of truth
+- Projects with monorepo structure: handle root and package-level configs
+
+Output format:
+- Clear summary of what was broken and why
+- Step-by-step list of all fixes applied
+- Verification results showing linting now works
+- Any warnings about compatibility or recommendations for modernization
+- Command to run linting locally (e.g., `npm run lint` or `npm run eslint`)
+
+Quality checks:
+- Verify eslint command runs without errors
+- Confirm linting actually processes files (not just succeeding with no output)
+- Test that rules are being enforced
+- Ensure the fix is reproducible for other developers
+- Document any version constraints or platform-specific requirements
+
+When to ask for clarification:
+- If you're unsure whether the project uses TypeScript, React, or other special configs
+- If multiple conflicting approaches exist and you need user preference
+- If Node version constraints prevent a standard fix
+- If the project has unusual structure that prevents standard ESLint discovery

.gitlab-ci.yml

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

.husky/pre-push

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-npm run lint
+npm run lint:es

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,11 @@
     "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"
+  },
+  "engines": {
+    "node": "16"
   },
   "overrides": {
     "react-mde": {

src/api/backend.ts

@@ -1,8 +1,11 @@
 import axios, { AxiosInstance, AxiosRequestConfig } from "axios";
 import { getAccessTokenCookie } from "@utils/auth";
 
+const API_TIMEOUT_MS = 10000;
+
 const axiosInstance: AxiosInstance = axios.create({
   baseURL: process.env.NEXT_PUBLIC_API_URL,
+  timeout: API_TIMEOUT_MS,
 });
 
 export enum APIPath {

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/events/[id].tsx

@@ -14,14 +14,13 @@ interface InitialProps {
 
 const EventPage: NextPage<InitialProps> = ({ event }) => {
   const router = useRouter();
-  const { id } = router.query;
 
   if (router.isFallback) return <LoadingView />;
 
   return (
     <>
       <Head>
-        <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/events/${id}`} />
+        <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/events/${event.id}`} />
       </Head>
       <PageWrapper>
         <EventPageView event={event} />
@@ -30,36 +29,34 @@ const EventPage: NextPage<InitialProps> = ({ event }) => {
   );
 };
 
-export const getStaticPaths: GetStaticPaths = async () => {
-  const allEvents = await EventApi.getEvents();
-  const paths = allEvents.map((e: Event) => ({
-    params: {
-      id: String(e.id),
-    },
-  }
-  ));
-  return {
-    paths,
-    fallback: true,
-  };
-};
+export const getStaticPaths: GetStaticPaths = async () => ({
+  paths: [],
+  fallback: "blocking",
+});
 
 export const getStaticProps: GetStaticProps<InitialProps> = async ({ params }) => {
-  const { id } = params;
-  let notFound = false;
-  let event: Event;
-  try {
-    event = await EventApi.getEvent(Number(id));
-  } catch (err) {
-    notFound = true;
+  const id = Number(params?.id);
+  if (!id) {
+    return {
+      notFound: true,
+      revalidate: 10,
+    };
+  }
+
+  try {
+    const event = await EventApi.getEvent(id);
+    return {
+      props: {
+        event,
+      },
+      revalidate: 10, // Required for deleting hidden pages
+    };
+  } catch {
+    return {
+      notFound: true,
+      revalidate: 10,
+    };
   }
-  return {
-    props: {
-      event,
-    },
-    revalidate: 10, // Required for deleting hidden pages
-    notFound,
-  };
 };
 
 export default EventPage;

src/pages/feed/[id].tsx

@@ -14,14 +14,13 @@ interface InitialProps {
 
 const FeedPage: NextPage<InitialProps> = ({ post }) => {
   const router = useRouter();
-  const { id } = router.query;
 
   if (router.isFallback) return <LoadingView />;
 
   return (
     <>
       <Head>
-        <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/feed/${id}`} />
+        <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/feed/${post.id}`} />
       </Head>
       <PageWrapper>
         <FeedPageView post={post} />
@@ -30,37 +29,34 @@ const FeedPage: NextPage<InitialProps> = ({ post }) => {
   );
 };
 
-export const getStaticPaths: GetStaticPaths = async () => {
-  const feed = await FeedApi.getFeed();
-  const paths = feed.map((post: Post) => ({
-    params: {
-      id: String(post.id),
-    },
-  }
-  ));
-  return {
-    paths,
-    fallback: true,
-  };
-};
+export const getStaticPaths: GetStaticPaths = async () => ({
+  paths: [],
+  fallback: "blocking",
+});
 
 export const getStaticProps: GetStaticProps<InitialProps> = async ({ params }) => {
-  const { id } = params;
-  let notFound = false;
-  let post: Post;
-  try {
-    post = await FeedApi.getPost(Number(id));
-  } catch (err) {
-    notFound = true;
+  const id = Number(params?.id);
+  if (!id) {
+    return {
+      notFound: true,
+      revalidate: 10,
+    };
   }
 
-  return {
-    props: {
-      post,
-    },
-    revalidate: 10, // Required for deleting hidden pages
-    notFound,
-  };
+  try {
+    const post = await FeedApi.getPost(id);
+    return {
+      props: {
+        post,
+      },
+      revalidate: 10, // Required for deleting hidden pages
+    };
+  } catch {
+    return {
+      notFound: true,
+      revalidate: 10,
+    };
+  }
 };
 
 export default FeedPage;

src/pages/in_english.tsx

@@ -44,12 +44,15 @@ const InEnglishPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) =
 };
 
 export const getStaticProps: GetStaticProps<InitialProps> = async () => {
-  const initialEvents = await fetcher<Event[]>(eventApi);
-  const initialFeed = await fetcher<Post[]>(feedApi);
+  const [eventsResult, feedResult] = await Promise.allSettled([
+    fetcher<Event[]>(eventApi),
+    fetcher<Post[]>(feedApi),
+  ]);
+
   return {
     props: {
-      initialEvents,
-      initialFeed,
+      initialEvents: eventsResult.status === "fulfilled" ? eventsResult.value : [],
+      initialFeed: feedResult.status === "fulfilled" ? feedResult.value : [],
     },
     revalidate: 10,
   };

src/pages/index.tsx

@@ -43,12 +43,15 @@ const FrontPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
 };
 
 export const getStaticProps: GetStaticProps<InitialProps> = async () => {
-  const initialEvents = fetcher<Event[]>(eventApi);
-  const initialFeed = fetcher<Post[]>(feedApi);
+  const [eventsResult, feedResult] = await Promise.allSettled([
+    fetcher<Event[]>(eventApi),
+    fetcher<Post[]>(feedApi),
+  ]);
+
   return {
     props: {
-      initialEvents: await initialEvents,
-      initialFeed: await initialFeed,
+      initialEvents: eventsResult.status === "fulfilled" ? eventsResult.value : [],
+      initialFeed: feedResult.status === "fulfilled" ? feedResult.value : [],
     },
     revalidate: 10,
   };

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/kilta/toiminta.tsx

@@ -3,9 +3,7 @@ import { NextPage, GetStaticProps } from "next";
 import Head from "next/head";
 import useSWR from "swr";
 import Event from "@models/Event";
-import EventApi from "@api/eventApi";
 import Post from "@models/Feed";
-import FeedApi from "@api/feedApi";
 import ActualPageView from "@views/ActualPage/ActualPageView";
 import PageWrapper from "@views/common/PageWrapper";
 import { fetcher, APIPath, API } from "@api/backend";
@@ -40,12 +38,15 @@ const ActualPage: NextPage<InitialProps> = ({ initialEvents, initialFeed }) => {
 };
 
 export const getStaticProps: GetStaticProps<InitialProps> = async () => {
-  const initialEvents = await EventApi.getEvents();
-  const initialFeed = await FeedApi.getFeed();
+  const [eventsResult, feedResult] = await Promise.allSettled([
+    fetcher<Event[]>(eventApi),
+    fetcher<Post[]>(feedApi),
+  ]);
+
   return {
     props: {
-      initialEvents,
-      initialFeed,
+      initialEvents: eventsResult.status === "fulfilled" ? eventsResult.value : [],
+      initialFeed: feedResult.status === "fulfilled" ? feedResult.value : [],
     },
     revalidate: 10,
   };

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;
@@ -22,7 +23,11 @@ const FORM_URL = `${process.env.NEXT_PUBLIC_API_URL}/signupForm/`;
 
 const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
   const router = useRouter();
+
+  const [honeypot, setHoneypot] = useState("");
+
   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 });
 
@@ -41,10 +46,23 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
     );
   }
 
-  const onSubmit = async ({ formData }: ISubmitEvent<string>) => {
+  const onSubmit = async ({ formData }: ISubmitEvent<any>) => {
+    // for bot detection
+
+    if (honeypot !== "") {
+      console.log("bot cought in honeypot cought lacking");
+      toast.success("Sign-up submitted successfully 😎");
+      return;
+    }
+    const trackedForm = {
+      ...formData,
+      _source: "from the webs submit",
+    };
+
     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,
+      answer: trackedForm,
     };
 
     try {
@@ -69,41 +87,59 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
           onChange={noop}
           onSubmit={onSubmit}
         />
+        {/* 3. HONEYPOT INPUT FIELD */}
+        <div
+          style={
+            {
+              position: "absolute", top: "-9999px", left: "-9999px", opacity: 0,
+            }
+          }
+          aria-hidden="true"
+        >
+          <label htmlFor="website_url">Do not fill this out if you are human</label>
+          <input
+            id="website_url"
+            type="text"
+            name="website_url"
+            value={honeypot}
+            onChange={(e) => setHoneypot(e.target.value)}
+            tabIndex={-1} // Removes it from the "tab" cycle so keyboard users don't hit it
+            autoComplete="off"
+          />
+        </div>
       </PageWrapper>
     </>
   );
 };
 
-export const getStaticPaths: GetStaticPaths = async () => {
-  const allForms = await SignupApi.getForms();
-  const paths = allForms.map((e: SignupForm) => ({
-    params: {
-      id: String(e.id),
-    },
-  }
-  ));
-  return {
-    paths,
-    fallback: true,
-  };
-};
+export const getStaticPaths: GetStaticPaths = async () => ({
+  paths: [],
+  fallback: "blocking",
+});
 
 export const getStaticProps: GetStaticProps<InitialProps> = async ({ params }) => {
-  const { id } = params;
-  let notFound = false;
-  let initialForm: SignupForm;
-  try {
-    initialForm = await SignupApi.getForm(Number(id));
-  } catch {
-    notFound = true;
+  const id = Number(params?.id);
+  if (!id) {
+    return {
+      notFound: true,
+      revalidate: 10,
+    };
+  }
+
+  try {
+    const initialForm = await SignupApi.getForm(id);
+    return {
+      props: {
+        initialForm,
+      },
+      revalidate: 10, // Required for deleting hidden pages
+    };
+  } catch {
+    return {
+      notFound: true,
+      revalidate: 10,
+    };
   }
-  return {
-    props: {
-      initialForm,
-    },
-    revalidate: 10, // Required for deleting hidden pages
-    notFound,
-  };
 };
 
 export default SignUpPage;

src/pages/yritysyhteistyo.tsx

@@ -30,10 +30,13 @@ const CorporatePage: NextPage<InitialProps> = ({ initialJobAds }) => {
 };
 
 export const getStaticProps: GetStaticProps<InitialProps> = async () => {
-  const initialJobAds = await fetcher<JobAd[]>(jobAdApi);
+  const jobAdsResult = await Promise.allSettled([
+    fetcher<JobAd[]>(jobAdApi),
+  ]);
+
   return {
     props: {
-      initialJobAds,
+      initialJobAds: jobAdsResult[0].status === "fulfilled" ? jobAdsResult[0].value : [],
     },
     revalidate: 10,
   };

src/views/BoardPage/BoardPageView.tsx

@@ -38,10 +38,17 @@ const Container = styled.div`
   }
 
   @media (max-width: 950px) {
-    width: 100vw;
+    width: 80vw;
   }
 `;
 
+const BoardImage = styled.img`
+  width: 100%;
+  height: auto;
+  margin-bottom: 2rem;
+  border-radius: 8px;
+`;
+
 const ContactContainer = styled.div`
   overflow-x: hidden;
   @media (max-width: 950px) {
@@ -54,6 +61,12 @@ const CommitteeContainer: React.FC<{
   children: React.ReactNode;
 }> = ({ committee, children }) => (
   <Container>
+    {committee.slug === "board" && (
+      <BoardImage
+        src="https://static.sahkoinsinoorikilta.fi/img/board/2026/Pota105_sikh26_webiin.jpg"
+        alt="Hallitus 2026"
+      />
+    )}
     <div>
       {committee.roles.map((role) => (
         role.representatives.map((representative) => (
@@ -74,6 +87,7 @@ const CommitteeContainer: React.FC<{
 );
 
 interface Committee {
+  slug: string;
   name_fi: string;
   name_en: string;
   roles: Array<Role>;
@@ -107,6 +121,9 @@ const BoardPageView: React.FC = () => (
           </BlueLink>
           .
         </p>
+        <p>
+          Muut yhteystiedot löydät <Link to="/yhteystiedot">täältä.</Link>
+        </p>
         <p>
           {"Hallitukselle voi myös lähettää palautetta täyttämällä "}
           <BlueLink to="https://docs.google.com/forms/d/e/1FAIpQLSeD8Hm66uvwr7Xa2WGgOCfI2RS1NrZsmISf2QBKUcJf_stv8g/viewform?usp=sf_link">

src/views/BoardPage/board.json

@@ -1,6 +1,6 @@
 {
   "slug": "board",
-  "name_fi": "Hallitus 2024",
+  "name_fi": "Hallitus 2026",
   "name_en": "Board",
   "roles": [
     {
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/sauli.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/eemeli.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/nea.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/aura.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/antti.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/aino_sa.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/rosanna.jpg"
         }
       ]
     },
@@ -92,10 +92,10 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Niklas Ritalahti",
+          "name": "Valentin Juhela",
           "phone_number": null,
-          "email": "niklas.ritalahti@sahkoinsinoorikilta.fi",
-          "image": ""
+          "email": "valentin.juhela@sahkoinsinoorikilta.fi",
+          "image": "https://static.sahkoinsinoorikilta.fi/img/board/2026/valentin.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/elida.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/joona.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/jere.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/into.jpg"
         }
       ]
     },
@@ -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": "https://static.sahkoinsinoorikilta.fi/img/board/2026/aino_sv.jpg"
         }
       ]
     }

src/views/CommitteePage/CommitteePageView.tsx

@@ -16,6 +16,9 @@ import YtmkJson from "./ytmk.json";
 import SwtmkJson from "./swtmk.json";
 import VtmkJson from "./vtmk.json";
 import LtmkJson from "./ltmk.json";
+import SiccJson from "./sicc.json";
+import SptmkJson from "./sptmk.json";
+import PotatmkJson from "./potatmk.json";
 import Others from "./others.json";
 
 const orderedCommittees = [
@@ -31,6 +34,9 @@ const orderedCommittees = [
   VtmkJson,
   SwtmkJson,
   NtmkJson,
+  SiccJson,
+  SptmkJson,
+  PotatmkJson,
   Others,
 ];
 

src/views/CommitteePage/ftmk.json

@@ -9,7 +9,7 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Teemu Heikkinen"
+          "name": "Aura Friman"
         }
       ]
     },
@@ -18,7 +18,7 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Henri Aito"
+          "name": "Antti Salpakari"
         }
       ]
     },
@@ -27,10 +27,10 @@
       "name_en": "International Fuksi Captain",
       "representatives": [
         {
-          "name": "Markus Aaltio"
+          "name": "Jere Oinonen"
         },
         {
-          "name": "Apollo Ailus"
+          "name": "Hocine Montenez"
         }
       ]
     },
@@ -39,7 +39,7 @@
       "name_en": "Tutor Coordinator",
       "representatives": [
         {
-          "name": "Axel Aurola"
+          "name": "Veera Lindroos"
         }
       ]
     },
@@ -48,9 +48,9 @@
       "name_en": "International Tutor Coordinator",
       "representatives": [
         {
-          "name": "Igor Oinonen"
+          "name": "Janne Yrjölä"
         }
       ]
     }
   ]
-}
+}

src/views/CommitteePage/htmk.json

@@ -1,56 +1,59 @@
 {
-  "slug": "htmk",
-  "name_fi": "Hupitoimikunta",
-  "name_en": "Entertainment Committee",
-  "info": "Hupitoimikunta järjestää päätoimenaan kaikenkirjavia tapahtumia, kuten sitsejä, saunailtoja sekä muita juhlia. Hupitoimikuntaa johtaa Hovimestari ja Hovineuvos. Toimikunnassa toimii Hovin lisäksi emäntiä ja isäntiä, jotka hoitavat juhlien käytännön järjestelyjä, esimerkiksi ruoanlaiton, kattauksen ja tarjoilun Hovin johdolla.",
-  "roles": [
-    {
-      "name_fi": "Hovimestari",
-      "name_en": "Master of Ceremonies",
-      "representatives": [
+    "slug": "htmk",
+    "name_fi": "Hupitoimikunta",
+    "name_en": "Entertainment Committee",
+    "info": "Hupitoimikunta järjestää päätoimenaan kaikenkirjavia tapahtumia, kuten sitsejä, saunailtoja sekä muita juhlia. Hupitoimikuntaa johtaa Hovimestari ja Hovineuvos. Toimikunnassa toimii Hovin lisäksi emäntiä ja isäntiä, jotka hoitavat juhlien käytännön järjestelyjä, esimerkiksi ruoanlaiton, kattauksen ja tarjoilun Hovin johdolla.",
+    "roles": [
         {
-          "name": "Tuomas Rantamäki"
-        }
-      ]
-    },
-    {
-      "name_fi": "Hovineuvos",
-      "name_en": "Court Counsellor",
-      "representatives": [
-        {
-          "name": "Matilda Ahonen"
-        }
-      ]
-    },
-    {
-      "name_fi": "Emäntä",
-      "name_en": "Hostess",
-      "representatives": [
-        {
-          "name": "Veera Lindroos"
+            "name_fi": "Hovimestari",
+            "name_en": "Master of Ceremonies",
+            "representatives": [
+                {
+                    "name": "Aino Saarela"
+                }
+            ]
         },
         {
-          "name": "Aino Saarela"
+            "name_fi": "Hovineuvos",
+            "name_en": "Court Counsellor",
+            "representatives": [
+                {
+                    "name": "Rosanna Reims"
+                }
+            ]
         },
         {
-          "name": "Nea Kanerva"
+            "name_fi": "Emäntä",
+            "name_en": "Hostess",
+            "representatives": [
+                {
+                    "name": "Elina Pyylampi"
+                },
+                {
+                    "name": "Elle Leivo"
+                },
+                {
+                    "name": "Emma Salmenaho"
+                }
+            ]
         },
         {
-          "name": "Rosanna Reims"
+            "name_fi": "Isäntä",
+            "name_en": "Host",
+            "representatives": [
+                {
+                    "name": "Aleksi Nuutinen"
+                },
+                {
+                    "name": "Juho Rosnell"
+                },
+                {
+                    "name": "Julius Härkönen"
+                },
+                {
+                    "name": "Joonas Hilvo"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Isäntä",
-      "name_en": "Host",
-      "representatives": [
-        {
-          "name": "Eemeli Hintsanen"
-        },
-        {
-          "name": "André Palosaari"
-        }
-      ]
-    }
-  ]
+    ]
 }

src/views/CommitteePage/hvtmk.json

@@ -1,99 +1,101 @@
 {
-  "slug": "hvtmk",
-  "name_fi": "Hyvinvointitoimikunta",
-  "name_en": "Committee of Wellbeing",
-  "info": "Hyvinvointitoimikunta järjestää monipuolisesti kiltalaisten hyvinvointia edistävää hyvän mielen toimintaa. Toimikunta koostuu liikunta-, retkeily-, kulttuuri- ja kiltahuonevastaavista, ja toimikuntaa johtaa hyvinvointimestari.",
-  "roles": [
-    {
-      "name_fi": "Hyvinvointimestari",
-      "name_en": "Master of Wellbeing",
-      "representatives": [
+    "slug": "hvtmk",
+    "name_fi": "Hyvinvointitoimikunta",
+    "name_en": "Committee of Wellbeing",
+    "info": "Hyvinvointitoimikunta järjestää monipuolisesti kiltalaisten hyvinvointia edistävää hyvän mielen toimintaa. Toimikunta koostuu liikunta-, retkeily-, kulttuuri- ja kiltahuonevastaavista, ja toimikuntaa johtaa hyvinvointimestari.",
+    "roles": [
         {
-          "name": "Niklas Ritalahti"
+            "name_fi": "Hyvinvointimestari",
+            "name_en": "Master of Wellbeing",
+            "representatives": [
+                {
+                    "name": "Valentin Juhela"
+                }
+            ]
+        },
+        {
+            "name_fi": "Kulttuurivastaava",
+            "name_en": "Culture Representative",
+            "representatives": [
+                {
+                    "name": "Johannes Viirimäki"
+                },
+                {
+                    "name": "Linnea Viitasalo"
+                },
+                {
+                    "name": "Matilda Ahonen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Liikuntavastaava",
+            "name_en": "Sports Representative",
+            "representatives": [
+                {
+                    "name": "Aino Salmi"
+                },
+                {
+                    "name": "Eeda Alasaari"
+                },
+                {
+                    "name": "Iiris Kuulusa"
+                }
+            ]
+        },
+        {
+            "name_fi": "Kiltahuonevastaava",
+            "name_en": "Guild Room Representative",
+            "representatives": [
+                {
+                    "name": "Milja Kuusela"
+                },
+                {
+                    "name": "Tuomas Rantamäki"
+                }
+            ]
+        },
+        {
+            "name_fi": "Retkeilyvastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Arvi Virkkunen"
+                },
+                {
+                    "name": "Auli Purolinna"
+                },
+                {
+                    "name": "Ville Lairila"
+                },
+                {
+                    "name": "Tiitus Koski"
+                }
+            ]
+        },
+        {
+            "name_fi": "Yhdenvertaisuusvastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Teemu Heikkinen"
+                },
+                {
+                    "name": "Aaron Löfgren"
+                },
+                {
+                    "name": "Matilda Ahonen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Kiltamuori",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Markus Aaltio"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Kulttuurivastaava",
-      "name_en": "Culture Representative",
-      "representatives": [
-        {
-          "name": "Peter Lindahl"
-        },
-        {
-          "name": "Kuura Janhunen"
-        },
-        {
-          "name": "Valentin Juhela"
-        },
-        {
-          "name": "Leevi Leinonen"
-        }, 
-        {
-          "name": "Milla Heino"
-        },
-        {
-          "name": "Hocine Montenez"
-        }
-      ]
-    },
-    {
-      "name_fi": "Liikuntavastaava",
-      "name_en": "Sports Representative",
-      "representatives": [
-        {
-          "name": "Matias Hendolin"
-        },
-        {
-          "name": "Sauli Hakala"
-        }
-      ]
-    },
-    {
-      "name_fi": "Kiltahuonevastaava",
-      "name_en": "Guild Room Representative",
-      "representatives": [
-        {
-          "name": "Justus Ojala"
-        },
-        {
-          "name": "Aaro Rasilainen"
-        }
-      ]
-    },
-    {
-      "name_fi": "Retkeilyvastaava",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Tommi Sytelä"
-        },
-        {
-          "name": "Konsta Hakala"
-        },
-        {
-          "name": "Ville Lairila"
-        }
-
-      ]
-    },
-    {
-    "name_fi": "Yhdenvertaisuusvastaava",
-    "name_en": "",
-    "representatives": [
-      {
-        "name": "Saara Rossi"
-      },
-      {
-        "name": "Aaron Löfgren"
-      },
-      {
-        "name": "Milla Heino"
-      },
-      {
-        "name": "Sauli Hakala"
-      }
     ]
-  }
-  ]
 }

src/views/CommitteePage/ltmk.json

@@ -1,62 +1,65 @@
 {
-  "slug": "ltmk",  
-  "name_fi": "Lukkaritoimikunta",
-  "name_en": "",
-  "info": "Lukkaritoimikunta on vastuussa killan laulukulttuurin kehittämisestä sekä ylläpitämisestä. Toimikunnan muodostaa lukkarimestari, lukkarit sekä lukkarikisällit. Meidät tapaat sitseillä sekä muissa tapahtumissa muistuttamassa, että teekkari laulaa mieluummin kuin hyvin.",
-  "roles": [
-    {
-      "name_fi": "Lukkarimestari",
-      "name_en": "",
-      "representatives": [
-         {
-          "name": "Leevi Oikarinen"
-         } 
-      ]
-    },
-    {
-      "name_fi": "Lukkari",
-      "name_en": "",
-      "representatives": [
+    "slug": "ltmk",
+    "name_fi": "Lukkaritoimikunta",
+    "name_en": "",
+    "info": "Lukkaritoimikunta on vastuussa killan laulukulttuurin kehittämisestä sekä ylläpitämisestä. Toimikunnan muodostaa lukkarimestari, lukkarit sekä lukkarikisällit. Meidät tapaat sitseillä sekä muissa tapahtumissa muistuttamassa, että teekkari laulaa mieluummin kuin hyvin.",
+    "roles": [
         {
-          "name": "Aino Salmi"
+            "name_fi": "Lukkarimestari",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aino Salmi"
+                }
+            ]
         },
         {
-          "name": "Ilmari Reponen"
+            "name_fi": "Lukkari",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Alex Hyytinen"
+                },
+                {
+                    "name": "Ilmari Reponen"
+                },
+                {
+                    "name": "Iiris Kuulusa"
+                },
+                {
+                    "name": "Samuel Södervall"
+                },
+                {
+                    "name": "Tapio Immonen"
+                }
+            ]
         },
         {
-          "name": "Jenni Marttinen"
-        },
-        {
-          "name": "Peter Lindahl"
-        },
-        {
-          "name": "Patrik Varteva"
-        },
-        {
-          "name": "Tapio Immonen"
+            "name_fi": "Lukkarikisälli",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aapo Palojärvi"
+                },
+                {
+                    "name": "André Palosaari"
+                },
+                {
+                    "name": "Kaisa Lehtimäki"
+                },
+                {
+                    "name": "Olav Hamel"
+                },
+                {
+                    "name": "Otto Tuominen"
+                },
+                {
+                    "name": "Panu Leinonen"
+                },
+                {
+                    "name": "Terhi Lukkari"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Lukkarikisälli",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Alex Hyytinen"
-        },
-        {
-          "name": "Antti Salpakari"
-        },
-        {
-          "name": "Iiris Kuulusa"
-        },
-        {
-          "name": "Roman Shalamov"
-        },
-        {
-          "name": "Samuel Södervall"
-        }
-      ]
-    }
-  ]
-}
+    ]
+}

src/views/CommitteePage/mtmk.json

@@ -1,104 +1,110 @@
 {
-  "slug": "mtmk",
-  "name_fi": "Sössö-toimikunta",
-  "name_en": "Media Committee",
-  "info": "Sössö-toimikunta toimittaa Sössöä, Sähköinsinöörikillan ikiomaa lehteä, joka on ikänsä ja laatunsa puolesta Otaniemen eliittiä. Toimikunta julkaisee vuodessa kaksi painettua lehteä sekä lukuisia nettiartikkeleita ynnä muuta. Toimikunta hoitaa lisäksi myös valokuvat ja live-striimit.",
-  "roles": [
-    {
-      "name_fi": "Päätoimittaja",
-      "name_en": "Editor in Chief",
-      "representatives": [
+    "slug": "mtmk",
+    "name_fi": "Sössö-toimikunta",
+    "name_en": "Media Committee",
+    "info": "Sössö-toimikunta toimittaa Sössöä, Sähköinsinöörikillan ikiomaa lehteä, joka on ikänsä ja laatunsa puolesta Otaniemen eliittiä. Toimikunta julkaisee vuodessa kaksi painettua lehteä sekä lukuisia nettiartikkeleita ynnä muuta. Toimikunta hoitaa lisäksi myös valokuvat ja live-striimit.",
+    "roles": [
         {
-          "name": "Topi Manskinen",
-          "phone_number": null,
-          "email": null,
-          "image": null
+            "name_fi": "Päätoimittaja",
+            "name_en": "Editor in Chief",
+            "representatives": [
+                {
+                    "name": "Joona Komonen",
+                    "phone_number": null,
+                    "email": null,
+                    "image": null
+                }
+            ]
+        },
+        {
+            "name_fi": "Tyhjäntoimittaja",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Topi Manskinen",
+                    "phone_number": null,
+                    "email": null,
+                    "image": null
+                }
+            ]
+        },
+        {
+            "name_fi": "Toimittaja",
+            "name_en": "Journalist",
+            "representatives": [
+                {
+                    "name": "Aake Laukkanen"
+                },
+                {
+                    "name": "Alex Hyytinen"
+                },
+                {
+                    "name": "Apollo Ailus"
+                },
+                {
+                    "name": "Eetu Tossavainen"
+                },
+                {
+                    "name": "Jenni Marttinen"
+                },
+                {
+                    "name": "Juho Laukka"
+                },
+                {
+                    "name": "Lauri Anttila"
+                },
+                {
+                    "name": "Otto kievimaa"
+                },
+                {
+                    "name": "Sampo Haarala"
+                },
+                {
+                    "name": "Venla Nikkanen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Taittaja",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Atte Vitie"
+                },
+                {
+                    "name": "Lauri Anttila"
+                },
+                {
+                    "name": "Otto Kievimaa"
+                },
+                {
+                    "name": "Partrik Varteva"
+                }
+            ]
+        },
+        {
+            "name_fi": "Graafikko",
+            "name_en": "Photographer & Graphic Artist",
+            "representatives": [
+                {
+                    "name": "Annika Tattari"
+                },
+                {
+                    "name": "Elian Salmimaa"
+                },
+                {
+                    "name": "Lotta Kähönen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Heevistriimaaja",
+            "name_en": "Heevistreamer",
+            "representatives": [
+                {
+                    "name": "Aaro Rasilainen"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Tyhjäntoimittaja",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Visa Kurvi",
-          "phone_number": null,
-          "email": null,
-          "image": null
-        }
-      ]
-    },
-    {
-      "name_fi": "Toimittaja",
-      "name_en": "Journalist",
-      "representatives": [
-        {
-          "name": "Joona Komonen"
-        },
-        {
-          "name": "Olli Vaismaa"
-        },
-        {
-          "name": "Jenni Marttinen"
-        },
-        {
-          "name": "Ilmari Reponen"
-        },
-        {
-          "name": "Igor Oinonen"
-        },
-        {
-          "name": "Otto Kievimaa"
-        }
-      ]
-    },
-    {
-      "name_fi": "Toimittaja, Taittaja",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Atte Vitie"
-        }
-      ]
-    },
-    {
-      "name_fi": "Taittaja",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Otto Kievimaa"
-        }
-      ]
-    },
-    {
-      "name_fi": "Graafikko",
-      "name_en": "Photographer & Graphic Artist",
-      "representatives": [
-        {
-          "name": "Elian Salmimaa"
-        }
-      ]
-    },
-    {
-      "name_fi": "Valokuvaaja",
-      "name_en": "Photographer",
-      "representatives": [
-        {
-          "name": "Veikko Räty"
-        },
-        {
-          "name": "Into Saarinen"
-        },
-        {
-          "name": "Aaro Rasilainen"
-        },
-        {
-          "name": "Anton Niemi"
-        },
-        {
-          "name": "Veera Melvasalo"
-        }
-      ]
-    }
-  ]
+    ]
 }

src/views/CommitteePage/ntmk.json

@@ -5,93 +5,85 @@
     "info": "N-toimikunta järjestää erinäisiä tapahtumia vanhemmille ja vanhemmanmielisille kiltalaisille, kuten sitsejä, aftereita, ulkoilutapahtumia ja mitä ikinä keksitäänkään. N-toimikunta toimii myös matalan kynnyksen välinä Sklubiin, eli alumniyhdistykseemme. N-toimikuntaan kuuluu myös killan kiltapatruunat, jotka pitävät huolta killan jatkuvuudesta.",
     "roles": [
         {
-            "name_fi": "N-toimikunnan nestori",
+            "name_fi": "N-toimikunnan puheenjohtaja",
             "name_en": "",
             "representatives": [
-            {
-                "name": "Karoliina Talvikangas"
-            }
+                {
+                    "name": "Elina Huttunen"
+                }
             ]
         },
         {
-          "name_fi": "N-toimikunnan varanestori, Kiltapatruuna",
-          "name_en": "",
-          "representatives": [
-          {
-              "name": "Aaron Löfgren"
-          }
-          ]
-        },
-        {
-          "name_fi": "Sklubi-yhdyshenkilö",
-          "name_en": "",
-          "representatives": [
-          {
-              "name": "Melisa Dönmez"
-          },
-          {
-              "name": "Eveliina Ahonen"
-          }
-          ]
-        },
-        {
-          "name_fi": "Kiltapatruuna",
-          "name_en": "",
-          "representatives": [
-            {
-              "name": "Ville Lairila"
-            },
-            {
-              "name": "Visa Kurvi"
-            }
-          ]
-        },
-        {
-            "name_fi": 
-              "Kiltapatruuna, Nipsu",
+            "name_fi": "N-toimikunnan Varapuheenjohtaja",
             "name_en": "",
             "representatives": [
-            {
-                "name": "Mikko Sandström"
-            },
-            {
-                "name": "Liisa Haltia"
-            },
-            {
-                "name": "Elina Huttunen"
-            }
+                {
+                    "name": "Ville Lairila"
+                }
             ]
         },
-
         {
-            "name_fi": "Nipsu",
+            "name_fi": "Kiltapatruuna",
             "name_en": "",
             "representatives": [
-            {
-                "name": "Mikael Siikonen"
-            },
-            {
-                "name": "Axel Aurola"
-            },
-            {
-                "name": "Elian Salmimaa"
-            },
-            {
-                "name": "Elias Damski"
-            },
-            {
-                "name": "Elias Lindberg"
-            },
-            {
-                "name": "Eero Ketonen"
-            },
-            {
-                "name": "Verneri Turkki"
-            },
-            {
-                "name": "Akseli Heikkinen"
-            }
+                {
+                    "name": "Aaron Löfgren"
+                },
+                {
+                    "name": "Axel Aurola"
+                },
+                {
+                    "name": "Emma Uusküla"
+                },
+                {
+                    "name": "Johannes Viirimäki"
+                },
+                {
+                    "name": "Tuomas Rantamäki"
+                },
+                {
+                    "name": "Yassine Ramid"
+                }
+            ]
+        },
+        {
+            "name_fi": "N-vastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aaron Löfgren"
+                },
+                {
+                    "name": "Aleksi Saajakari"
+                },
+                {
+                    "name": "Elian Salmimaa"
+                },
+                {
+                    "name": "Johannes Viirimäki"
+                },
+                {
+                    "name": "Karoliina Talvikangas"
+                },
+                {
+                    "name": "Markus Aaltio"
+                },
+                {
+                    "name": "Miika Helminen"
+                },
+                {
+                    "name": "Mikael Siikonen"
+                },
+                {
+                    "name": "Peter Lindahl"
+                },
+                {
+                    "name": "Veikko Räty"
+                },
+                {
+                    "name": "Verneri Turkki"
+                }
             ]
         }
     ]
-}
+}

src/views/CommitteePage/optmk.json

@@ -1,41 +1,54 @@
 {
-  "slug": "optmk",
-  "name_fi": "Opintotoimikunta",
-  "name_en": "Study Committee",
-  "info": "Opintotoimikunta vastaa edunvalvonnasta, killan tekemästä abimarkkinoinnista, sekä pitää yhteyttä korkeakoulun henkilökuntaan. Toimikunta järjestää opintoihin liittyviä tapahtumia, kuten opintosaunoja. Tomikunta koostuu opintomestarista ja opintovastaavista.",
-  "roles": [
-    {
-      "name_fi": "Opintomestari",
-      "name_en": "Master of Studies",
-      "representatives": [
+    "slug": "optmk",
+    "name_fi": "Opintotoimikunta",
+    "name_en": "Study Committee",
+    "info": "Opintotoimikunta vastaa edunvalvonnasta, killan tekemästä abimarkkinoinnista, sekä pitää yhteyttä korkeakoulun henkilökuntaan. Toimikunta järjestää opintoihin liittyviä tapahtumia, kuten opintosaunoja. Tomikunta koostuu opintomestarista ja opintovastaavista.",
+    "roles": [
         {
-          "name": "Mikael Vatiainen"
+            "name_fi": "Opintomestari",
+            "name_en": "Master of Studies",
+            "representatives": [
+                {
+                    "name": "Elida Widgren"
+                }
+            ]
+        },
+        {
+            "name_fi": "Opintovastaava",
+            "name_en": "Study Coordinator",
+            "representatives": [
+                {
+                    "name": "Aapo Tynninen"
+                },
+                {
+                    "name": "Aleksi Liukkonen"
+                },
+                {
+                    "name": "Antti Lehtonen"
+                },
+                {
+                    "name": "Atu Vahla"
+                },
+                {
+                    "name": "Iiris Kuulusa"
+                },
+                {
+                    "name": "Ilmari Reponen"
+                },
+                {
+                    "name": "Jesper Seppäläinen"
+                },
+                {
+                    "name": "Mikael Vatiainen"
+                },
+                {
+                    "name": "Vi Tam"
+                },
+                {
+                    "name": "Yassine Ramid"
+                }
+
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Opintovastaava",
-      "name_en": "Study Coordinator",
-      "representatives": [
-        {
-          "name": "Atu Vahla"
-        },
-        {
-          "name": "Antti Lehtonen"
-        },
-        {
-          "name": "Aleksi Liukkonen"
-        },
-        {
-          "name": "Ilmari Reponen"
-        },
-        {
-          "name": "Milla Heino"
-        },
-        {
-          "name": "Samuel Södervall"
-        }
-      ]
-    }
-  ]
+    ]
 }

src/views/CommitteePage/others.json

@@ -1,32 +1,52 @@
 {
-  "slug": "others",
-  "name_fi": "Muut",
-  "name_en": "Other officials",
-  "info": "",
-  "roles": [
-    {
-      "name_fi": "Merikapteeni",
-      "name_en": "Sea captain",
-      "representatives": [
+    "slug": "others",
+    "name_fi": "Muut",
+    "name_en": "Other officials",
+    "info": "",
+    "roles": [
         {
-          "name": "Ville Lairila",
-          "phone_number": null,
-          "email": null
-        }
-        
-      ]
-    },
-    {
-      "name_fi": "Meripojankloppi",
-      "name_en": "ship's boy",
-      "representatives": [
+            "name_fi": "Arkistovastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aaron Löfgren",
+                    "phone_number": null,
+                    "email": null
+                }
+            ]
+        },
         {
-          "name": "Peter Lindahl",
-          "phone_number": null,
-          "email": null
+            "name_fi": "Sklubi-yhdyshenkilö",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Ville Kurko",
+                    "phone_number": null,
+                    "email": null
+                }
+            ]
+        },
+        {
+            "name_fi": "Teekkarikokousen kiltaedustaja",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aaron Löfgren",
+                    "phone_number": null,
+                    "email": null
+                }
+            ]
+        },
+        {
+            "name_fi": "TEK-yhdyshenkilö",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Visa Kurvi",
+                    "phone_number": null,
+                    "email": null
+                }
+            ]
         }
-        
-      ]
-    }
-  ]
+    ]
 }

src/views/CommitteePage/potatmk.json

@@ -0,0 +1,83 @@
+{
+    "slug": "potatmk",
+    "name_fi": "Potentiaalin Tasaus 105-toimikunta",
+    "name_en": "",
+    "info": "Killan vuosijuhlat",
+    "roles": [
+        {
+            "name_fi": "PoTa-tirehtööri",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Axel Aurola"
+                },
+                {
+                    "name": "Karoliina Talvikangas"
+                }
+            ]
+        },
+        {
+            "name_fi": "Kukkohäntävastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Antti Salpakari"
+                },
+                {
+                    "name": "Tuomas Rantamäki"
+                }
+            ]
+        },
+        {
+            "name_fi": "Seremoniamestari",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Henri Aito"
+                }
+            ]
+        },
+        {
+            "name_fi": "Jatkovastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aino Tasapuro"
+                },
+                {
+                    "name": "Eemeli Hintsanen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Koristeluvastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Elina Huttunen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Sillisvastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Leevi Oikarinen"
+                },
+                {
+                    "name": "Valentin Juhela"
+                }
+            ]
+        },
+        {
+            "name_fi": "Graafikko",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Elian Salmimaa"
+                }
+            ]
+        }
+    ]
+}

src/views/CommitteePage/ptmk.json

@@ -1,53 +1,56 @@
 {
-  "slug": "ptmk",
-  "name_fi": "Pajatoimikunta",
-  "name_en": "",
-  "info": "Pajatoimikunta vastaa killan oman elektroniikkapajan eli SIK-pajan ylläpidosta ja kehityksestä. Toimikuntaa johtaa pajamestari ja toimikunta koostuu pajavastaavista ja pajakisälleistä.",
-  "roles": [
-    {
-      "name_fi": "Pajamestari",
-      "name_en": "",
-      "representatives": [
+    "slug": "ptmk",
+    "name_fi": "Pajatoimikunta",
+    "name_en": "",
+    "info": "Pajatoimikunta vastaa killan oman elektroniikkapajan eli SIK-pajan ylläpidosta ja kehityksestä. Toimikuntaa johtaa pajamestari ja toimikunta koostuu pajavastaavista ja pajakisälleistä.",
+    "roles": [
         {
-          "name": "Jere Oinonen"
+            "name_fi": "Pajamestari",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Simeon Pursiainen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Pajavastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Axel Söderberg"
+                },
+                {
+                    "name": "Đình Minh Trần"
+                }
+            ]
+        },
+        {
+            "name_fi": "Pajakisälli",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aapo Tynninen"
+                },
+                {
+                    "name": "Aarni Kämppi"
+                },
+                {
+                    "name": "Atte Elo"
+                },
+                {
+                    "name": "Emma Uusküla"
+                },
+                {
+                    "name": "Jusi Seppälä"
+                },
+                {
+                    "name": "Tuomas Rantamäki"
+                },
+                {
+                    "name": "Vi Tam"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Pajakisälli",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Otto Kievimaa"
-        },
-        {
-          "name": "Đình Minh Trần"
-        },
-        {
-          "name": "Valentin Juhela"
-        },
-        {
-          "name": "Axel Söderberg"
-        },
-        {
-          "name": "Auli Purolinna"
-        },
-        {
-          "name": "Karl Lipping"
-        },
-        {
-          "name": "Petrus Asikainen"
-        },
-        {
-          "name": "Elmo Kankkunen"
-        },
-        {
-          "name": "Samu Nyman"
-        },
-        {
-          "name": "Hilkka Gröhn"
-        }
-      ]
-    }
-  ]
+    ]
 }

src/views/CommitteePage/sicc.json

@@ -0,0 +1,44 @@
+{
+    "slug": "sicc",
+    "name_fi": "SIK International Committee Council",
+    "name_en": "SIK International Committee Council",
+    "info": "*coming soon*",
+    "roles": [
+        {
+            "name_fi": "International Ambassador",
+            "name_en": "International Ambassador",
+            "representatives": [
+                {
+                    "name": "Igor Oinonen"
+                }
+            ]
+        },
+        {
+            "name_fi": "International Attaché",
+            "name_en": "International Attaché",
+            "representatives": [
+                {
+                    "name": "Kuura Janhunen"
+                }
+            ]
+        },
+        {
+            "name_fi": "International Envoy",
+            "name_en": "International Envoy",
+            "representatives": [
+                {
+                    "name": "Aleksanteri Vesala"
+                },
+                {
+                    "name": "Apollo Ailus"
+                },
+                {
+                    "name": "Juho Aikio"
+                },
+                {
+                    "name": "Léo Di Poi"
+                }
+            ]
+        }
+    ]
+}

src/views/CommitteePage/sptmk.json

@@ -0,0 +1,45 @@
+{
+    "slug": "sptmk",
+    "name_fi": "Sähköpäivätoimikunta",
+    "name_en": "",
+    "info": "",
+    "roles": [
+        {
+            "name_fi": "Sähköpäivätirehtööri",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aino Tasapuro"
+                },
+                {
+                    "name": "Matilda Ahonen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Sähköpäivävastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Aapo Nyyssönen"
+                },
+                {
+                    "name": "Aapo Saranpää"
+                },
+                {
+                    "name": "André Palosaari"
+                },
+                {
+                    "name": "Ilmari Reponen"
+                },
+                {
+                    "name": "Oliver Hannula"
+                },
+                {
+                    "name": "Teemu Heikkinen"
+                }
+
+            ]
+        }
+    ]
+}

src/views/CommitteePage/swtmk.json

@@ -1,38 +1,47 @@
 {
-  "slug": "swtmk",
-  "name_fi": "SIKin Wapaa-aika -toimikunta",
-  "name_en": "",
-  "info": "Sikin Wapaa-aika -toimikunta eli tuttavallisemmin SiWa on killan uusin toimikunta. Toimikunnan tavoitteena on järjestää monipuolisesti erilaisia hassunhauskoja matalan kynnyksen tapahtumia kiltalaisille laidasta laitaan. Esimerkkejä SiWan tapahtumista ovat mm. wappulautta, pitsapäivä ja pokeriturnaus.",
-  "roles": [
-    {
-      "name_fi": "Myymäläpäällikkö",
-      "name_en": "Head of sales",
-      "representatives": [
+    "slug": "swtmk",
+    "name_fi": "SIKin Wapaa-aika -toimikunta",
+    "name_en": "",
+    "info": "Sikin Wapaa-aika -toimikunta eli tuttavallisemmin SiWa on killan uusin toimikunta. Toimikunnan tavoitteena on järjestää monipuolisesti erilaisia hassunhauskoja matalan kynnyksen tapahtumia kiltalaisille laidasta laitaan. Esimerkkejä SiWan tapahtumista ovat mm. wappulautta, pitsapäivä ja pokeriturnaus.",
+    "roles": [
         {
-          "name": "Tiitus Koski"
+            "name_fi": "Myymäläpäällikkö",
+            "name_en": "Head of sales",
+            "representatives": [
+                {
+                    "name": "Leevi Oikarinen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Myyjä",
+            "name_en": "Clerk",
+            "representatives": [
+                {
+                    "name": "Alexandr Lemin"
+                },
+                {
+                    "name": "Henri Aito"
+                },
+                {
+                    "name": "Ossi Jalkanen"
+                },
+                {
+                    "name": "Tiitus Koski"
+                },
+                {
+                    "name": "Veikko Räty"
+                }
+            ]
+        },
+        {
+            "name_fi": "Kiltapäiväkerhovastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Matilda Ahonen"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Myyjä",
-      "name_en": "Clerk",
-      "representatives": [
-        {
-          "name": "Arvi Virkkunen"
-        },
-        {
-          "name": "Valentin Juhela"
-        },
-        {
-          "name": "Otto Rinne"
-        },
-        {
-          "name": "Auli Purolinna"
-        },
-        {
-          "name": "Patrik Varteva"
-        }
-      ]
-    }
-  ]
-}
+    ]
+}

src/views/CommitteePage/ttmk.json

@@ -1,38 +1,35 @@
 {
-  "slug": "ttmk",
-  "name_fi": "Teknologiatoimikunta",
-  "name_en": "Technology Committee",
-  "info": "Teknologiatoimikunta huolehtii killan tekniikan toiminnasta. Toimikunnan vastuulle kuuluu killan tietojärjestelmien ylläpito ja kehitys sekä viestintäkanavien toimivuudesta huolehtiminen. Toimikunta koostuu teknologiamestarista ja teknologiavastaavista.",
-  "roles": [
-    {
-      "name_fi": "Teknologiamestari",
-      "name_en": "Master of technology",
-      "representatives": [
+    "slug": "ttmk",
+    "name_fi": "Teknologiatoimikunta",
+    "name_en": "Technology Committee",
+    "info": "Teknologiatoimikunta huolehtii killan tekniikan toiminnasta. Toimikunnan vastuulle kuuluu killan tietojärjestelmien ylläpito ja kehitys sekä viestintäkanavien toimivuudesta huolehtiminen. Toimikunta koostuu teknologiamestarista ja teknologiavastaavista.",
+    "roles": [
         {
-          "name": "Simeon Pursiainen"
+            "name_fi": "Teknologiamestari",
+            "name_en": "Master of technology",
+            "representatives": [
+                {
+                    "name": "Joona Maaranen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Teknologiavastaava",
+            "name_en": "",
+            "representatives": [
+                {
+                    "name": "Alekdsandr Lemin"
+                },
+                {
+                    "name": "Atte Elo"
+                },
+                {
+                    "name": "Dat Tram"
+                },
+                {
+                    "name": "Oiva Haapaniemi"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Teknologiavastaava",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Joona Maaranen"
-        },
-        {
-          "name": "Aleksi Liukkonen"
-        },
-        {
-          "name": "Elmo Kankkunen"
-        },
-        {
-          "name": "Justus Ojala"
-        }, 
-        {
-          "name": "Tommi Sytelä"
-        }
-      ]
-    }
-  ]
+    ]
 }

src/views/CommitteePage/vtmk.json

@@ -9,7 +9,7 @@
       "name_en": "Head of communcations",
       "representatives": [
         {
-          "name": "Yassine Ramid"
+          "name": "Aino Svahn"
         }
       ]
     },
@@ -18,25 +18,22 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Aaron Löfgren"
+          "name": "Aada Tättilä"
         },
         {
-          "name": "Elina Huttunen"
+          "name": "Ada Minkkinen"
         },
         {
-          "name": "Aura Friman"
-        }
-      ]
-    },
-    {
-      "name_fi": "Somevastaava, Brändivastaava",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Aapo Saranpää"
+          "name": "Aino Tasapuro"
         },
         {
-          "name": "Aino Svahn"
+          "name": "Ira Kosunen"
+        },
+        {
+          "name": "Lukas Iles"
+        },
+        {
+          "name": "Tytti Solonen"
         }
       ]
     },
@@ -45,23 +42,15 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Aleksandr Lemin"
-        },
-        {
-          "name": "Roope Jaskari"
-        },
-        {
-          "name": "Sauli Hakala"
-        },
-        {
-          "name": "Ville Lairila"
+          "name": "Aapo Saranpää"
         },
         {
           "name": "Aapo Nyyssönen"
         },
         {
-          "name": "Mikko Sandström"
+          "name": "Kehrä Halme"
         }
+
       ]
     },
     {
@@ -69,12 +58,37 @@
       "name_en": "",
       "representatives": [
         {
-          "name": "Veera Melvasalo"
+          "name": "Apollo Ailus"
         },
+        {
+          "name": "Julius Männistö"
+        }
+      ]
+    },
+    {
+      "name_fi": "Valokuvaaja",
+      "name_en": "",
+      "representatives": [
         {
           "name": "Aaro Rasilainen"
+        },
+        {
+          "name": "Apollo Ailus"
+        },
+        {
+          "name": "Arvi Virkkunen"
+        },
+        {
+          "name": "Julius Männistö"
+        },
+        {
+          "name": "Lotta Kähönen"
+        },
+        {
+          "name": "Veikko Räty"
         }
       ]
     }
+
   ]
-}
+}

src/views/CommitteePage/ytmk.json

@@ -1,86 +1,56 @@
 {
-  "slug": "ytmk",
-  "name_fi": "Yrityssuhdetoimikunta",
-  "name_en": "Corporate Relations Committee",
-  "info": "Yrityssuhdetoimikunta toimii linkkinä yritysmaailman ja Sähköinsinöörikillan välillä. Toimikunnan tehtäviin kuuluu esimerkiksi excursioiden eli yritysvierailujen järjestäminen, yrityssaunailtojen ja muiden yhteistyösopimuksilla rahoitettujen tapahtumien järjestäminen, sekä sponsoreiden hankinta Sähköinsinöörikillan puhtaanvalkoisiin haalareihin. Lisäksi yrityssuhdetoimikunnan vastuulla on ulkosuhteiden ylläpito ystävyysainejärjestöihin kotimaassa ja ulkomailla.",
-  "roles": [
-    {
-      "name_fi": "Yrityssuhdemestari",
-      "name_en": "Head of Corporate Relations",
-      "representatives": [
+    "slug": "ytmk",
+    "name_fi": "Yrityssuhdetoimikunta",
+    "name_en": "Corporate Relations Committee",
+    "info": "Yrityssuhdetoimikunta toimii linkkinä yritysmaailman ja Sähköinsinöörikillan välillä. Toimikunnan tehtäviin kuuluu esimerkiksi excursioiden eli yritysvierailujen järjestäminen, yrityssaunailtojen ja muiden yhteistyösopimuksilla rahoitettujen tapahtumien järjestäminen, sekä sponsoreiden hankinta Sähköinsinöörikillan puhtaanvalkoisiin haalareihin. Lisäksi yrityssuhdetoimikunnan vastuulla on ulkosuhteiden ylläpito ystävyysainejärjestöihin kotimaassa ja ulkomailla.",
+    "roles": [
         {
-          "name": "Tuomas Hintikka"
+            "name_fi": "Yrityssuhdemestari",
+            "name_en": "Head of Corporate Relations",
+            "representatives": [
+                {
+                    "name": "Into Saarinen"
+                }
+            ]
+        },
+        {
+            "name_fi": "Yrityssuhdeguru",
+            "name_en": "Guru of yritysuhde",
+            "representatives": [
+                {
+                    "name": "Tuomas Hintikka"
+                }
+            ]
+        },
+        {
+            "name_fi": "Excursiomestari",
+            "name_en": "Head of Excursions",
+            "representatives": [
+                {
+                    "name": "Roope Palo"
+                }
+            ]
+        },
+        {
+            "name_fi": "Yrityssuhde- ja excursiovastaava",
+            "name_en": "Apprentice of Corporate Relations",
+            "representatives": [
+                {
+                    "name": "Axel Aurola"
+                },
+                {
+                    "name": "Mikael Sundell"
+                },
+                {
+                    "name": "Kaisa Lehtimäki"
+                },
+                {
+                    "name": "Timo Kaleva"
+                },
+                {
+                    "name": "Väinö Saarinen"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "name_fi": "Excursiomestari",
-      "name_en": "Head of Excursions",
-      "representatives": [
-        {
-          "name": "Aino Tasapuro"
-        }
-      ]
-    },
-    {
-      "name_fi": "Yrityssuhdevastaava",
-      "name_en": "Apprentice of Corporate Relations",
-      "representatives": [
-        {
-          "name": "Mikael Sundell"
-        },
-        {
-          "name": "Henrik Ervasti"
-        },
-        {
-          "name": "Samuel Södervall"
-        },
-        {
-          "name": "Markus Määttänen"
-        },
-        {
-          "name": "Aura Friman"
-        },
-        {
-          "name": "Anton Niemi"
-        },
-        {
-          "name": "Iida Toivanen"
-        },
-        {
-          "name": "Joona Kivioja"
-        },
-        {
-          "name": "Jussi Seppälä"
-        },
-        {
-          "name": "Roope Palo"
-        },
-        {
-          "name": "Väinö Saarinen"
-        },
-        {
-          "name": "Junias Vasama"
-        },
-        {
-          "name": "Anton Saari"
-        },
-        {
-          "name": "Väinö Silvenius"
-        }
-      ]
-    },
-    {
-      "name_fi": "Excursiovastaava",
-      "name_en": "",
-      "representatives": [
-        {
-          "name": "Into Saarinen"
-        },
-        {
-          "name": "Otto Rinne"
-        }
-      ]
-    }
-  ]
+    ]
 }

src/views/ContactsPage/ContactsPageView.tsx

@@ -21,7 +21,7 @@ const ContactsPageView: React.FC = () => (
       <p>
         Yhdistys : Aalto-yliopiston Sähköinsinöörikilta ry <br />
         Y-tunnus: 1627010-1 <br />
-        Sähköpostilaskut: <a href="mailto:rahastonhoitaja@sahkoinsinoorikilta.fi">rahastonhoitaja@sahkoinsinoorikilta.fi </a>
+        Sähköpostilaskut: <a href="mailto:rahastonhoitaja@sahkoinsinoorikilta.fi">rahastonhoitaja@sahkoinsinoorikilta.fi</a>
       </p>
       <h6>Kiltahuone</h6>
       <p>

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,172 @@
+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/+U8dQfkCWBaIxMDc0";
+const TG_NOTIFICATIONS_LINK = "https://t.me/+IcZONKWXiNNkODRk";
+const EMAIL_LINK = "fuksikapteenit@sahkoinsinoorikilta.fi";
+const EMAIL_LINK_MAILTO = `mailto:${EMAIL_LINK}`;
+const SIK_QR = "https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2026-telegram.jpg";
+const SIK_QR_TIEDOTUS = "https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2026-telegram-tiedotus.jpg";
+
+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 undergraduate and a fuksi (= 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 fuksis.
+          {" "}
+          <Link to={TG_GROUP_CHAT_LINK} target="_blank">Click here</Link> to get acquainted with your fellow fuksis 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 fuksi group, which you will get to know during orientation week and which will serve as your support group for new adventures.
+          Your fuksi 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/kipparit-26.jpg"
+            alt="Kipparit"
+            layout="responsive"
+            width={100}
+            height={80}
+            objectFit="contain"
+          />
+        </ImageContainer>
+
+        <h6>Fuksicaptains</h6>
+        <p>
+          We are your fuksicaptains <strong>Aura</strong> and <strong>Antti</strong> and we&apos;ll be here to support you and monitor your
+          progress throughout the fuksi year adventures toward earning your Teekkari cap (= teekkarilakki),
+          which you might possibly earn during Wappu (= 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 24th to 28th, 2026, but even before then, you&apos;ll have the chance to meet us, other fuksis, and the ISOs at a relaxed Head Start event.
+          The Head Start for the fuksi year is organized on Saturday, August 15th, 2026. Find more details in the Telegram groups!
+        </p>
+
+        <h6>Aura Friman</h6>
+        <p>aura.friman (ät) sahkoinsinoorikilta.fi <br />@aurafarmaamassa</p>
+
+        <h6>Antti Salpakari</h6>
+        <p>antti.salpakari (ät) sahkoinsinoorikilta.fi <br />@Salpakari</p>
+      </div>
+      <aside>
+        <div>
+          <PageLink to={EMAIL_LINK_MAILTO} desc={EMAIL_LINK}>
+            You can reach the fuksicaptains 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'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. This year's fuksi guide will be updated later.
+              You can find the last year's 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={SIK_QR}
+            />
+            <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={SIK_QR_TIEDOTUS}
+            />
+            <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">Fuksi groups and ISOs</h3>
+      <div>
+        <p>SIK fuksis enjoy the guidance and care of their wonderful ISOs in their own fuksi groups.</p>
+        <p>
+          ISOs are older students and guild members, who are there to support you throughout your fuksi 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 fuksi 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 teekkarius.
+          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 fuksi 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,193 @@
+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 SIK_QR = "https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2026-telegram.jpg";
+const SIK_QR_TIEDOTUS = "https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2026-telegram-tiedotus.jpg";
+
+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/Captains2026.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 2026, 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 2026. 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={SIK_QR}
+            />
+            <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={SIK_QR_TIEDOTUS}
+            />
+            <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,10 +7,12 @@ 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 EMAIL_LINK = "ftmk@sahkoinsinoorikilta.fi";
+const TG_GROUP_CHAT_LINK = "https://t.me/+U8dQfkCWBaIxMDc0";
+const TG_NOTIFICATIONS_LINK = "https://t.me/+IcZONKWXiNNkODRk";
+const EMAIL_LINK = "fuksikapteenit@sahkoinsinoorikilta.fi";
 const EMAIL_LINK_MAILTO = `mailto:${EMAIL_LINK}`;
+const SIK_QR = "https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2026-telegram.jpg";
+const SIK_QR_TIEDOTUS = "https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2026-telegram-tiedotus.jpg";
 
 const ImageContainer = styled.div`
   width: 100%;
@@ -43,7 +45,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 +60,7 @@ const FreshmenPageView: React.FC = () => (
 
         <ImageContainer>
           <Image
-            src="https://static.sahkoinsinoorikilta.fi/FTMK/fuksikipparit-2024.jpg"
+            src="https://static.sahkoinsinoorikilta.fi/FTMK/kipparit-26.jpg"
             alt="Kipparit"
             layout="responsive"
             width={100}
@@ -69,7 +71,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>Aura</strong> ja <strong>Antti</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 +82,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 24.-28.8.2026, 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 15.8.2026. Siitä lisää Telegram-ryhmissä!
         </p>
 
-        <h6>Sauli Hakala</h6>
-        <p>045 317 1800<br />sauli.hakala (ät) sahkoinsinoorikilta.fi <br />@saulihakala</p>
+        <h6>Aura Friman</h6>
+        <p>aura.friman (ät) sahkoinsinoorikilta.fi <br />@aurafarmaamassa</p>
 
-        <h6>Valentin Juhela</h6>
-        <p>040 968 1644<br />valentin.juhela (ät) sahkoinsinoorikilta.fi <br />@ValentinJuhela</p>
+        <h6>Antti Salpakari</h6>
+        <p>antti.salpakari (ät) sahkoinsinoorikilta.fi <br />@Salpakari</p>
       </div>
       <aside>
         <div>
@@ -96,7 +98,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 +107,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>.
+              Tämän vuoden fuksiopas päivitetään tänne kesäkuun loppuun mennessä!
             </p>
             <br />
             <h6>Telegram?</h6>
@@ -126,12 +128,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={SIK_QR}
             />
             <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={SIK_QR_TIEDOTUS}
             />
             <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

@@ -20,13 +20,15 @@ const ABB = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/abb.jpg";
 const Caruna = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/caruna.jpg";
 const Ensto = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/ensto.jpg";
 const eSett = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/esett.jpg";
+const Fingrid = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/fingrid.jpg";
 const Okmetic = "https://static.sahkoinsinoorikilta.fi/img/corporate_logos/okmetic.jpg";
 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[];
@@ -105,6 +107,9 @@ const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
             <Link to="https://www.esett.com/">
               <Image src={eSett} alt="eSett" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
+            <Link to="https://www.fingrid.fi/">
+              <Image src={Fingrid} alt="Fingrid" layout="responsive" width={200} height={100} objectFit="contain" />
+            </Link>
             <Link to="https://www.okmetic.com/fi/">
               <Image src={Okmetic} alt="Okmetic" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
@@ -114,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/HonoraryPage/HonoraryPageView.tsx

@@ -40,7 +40,8 @@ const HonoraryPageView: React.FC = () => (
           <li>Keijo Nikoskinen 2011–2014</li>
           <li>Jussi Ryynänen 2014–2017</li>
           <li>Ville Viikari 2017–2020</li>
-          <li>Anu Lehtovuori 2020–</li>
+          <li>Anu Lehtovuori 2020–2026</li>
+          <li>Marko Hinkkanen 2026-</li>
         </ul>
         <h2>Pro SIK</h2>
         <p>
@@ -91,6 +92,8 @@ const HonoraryPageView: React.FC = () => (
           <li>2023 Emmaleena Ahonen</li>
           <li>2024 Jonna Tammikivi</li>
           <li>2025 Eveliina Ahonen</li>
+          <li>2026 Otto Julkunen</li>
+          <li>2026 Melisa Dönmez</li>
         </ul>
         <h2>Standaari</h2>
         <p>Standaari voidaan hallituksen päätöksellä lahjoittaa killan toimintaan myönteisesti vaikuttaneille tahoille. Standaarit on numeroitu lahjoittamisjärjestyksessä.</p>
@@ -233,6 +236,12 @@ const HonoraryPageView: React.FC = () => (
           <li>2025 Iikka Huttu</li>
           <li>2025 Heidi Mäkitalo</li>
         </ul>
+        <ul>
+          <li>2026 Aaron Löfgren</li>
+          <li>2025 Elina Huttunen</li>
+          <li>2026 Karoliina Talvikangas</li>
+          <li>2026 Tommi Sytelä</li>
+        </ul>
         <h2>Hopeiset ansiomerkit</h2>
         <p>Killan hallitus voi myöntää hopeisen ansiomerkin killan jäsenelle tai perustellusta syystä myös muulle henkilölle tunnustuksena erityisestä kiinnostuksesta kiltaa kohtaan sekä ansioituneesta toiminnasta killan hyväksi.</p>
         <ul>
@@ -630,6 +639,20 @@ const HonoraryPageView: React.FC = () => (
           <li>2024 Veikko Räty</li>
           <li>2024 Visa Kurvi</li>
         </ul>
+        <ul>
+          <li>2025 Alisa Ahonen</li>
+          <li>2025 Axel Aurola</li>
+          <li>2025 Axel Söderberg</li>
+          <li>2025 Leevi Oikarinen</li>
+          <li>2025 Liisa Haltia</li>
+          <li>2025 Mikael Siikonen</li>
+          <li>2025 Mikko Sandström</li>
+          <li>2025 Peter Lindahl</li>
+          <li>2025 Roope Jaskari</li>
+          <li>2025 Sauli Hakala</li>
+          <li>2025 Valentin Juhela</li>
+          <li>2025 Ville Lairila</li>
+        </ul>
       </div>
     </TextSection>
   </>

src/views/MembershipPage/MembershipPageView.tsx

@@ -15,10 +15,23 @@ const MembershipPageView: React.FC = () => (
           sekä pääsyn killan tiloihin kuten kiltahuoneelle ja SIK-pajalle.
         </p>
         <p>
-          Killan varsinaiseksi jäseneksi voidaan hyväksyä kaikki killan toiminnasta kiinnotuneet AYY:n jäsenet.
-          Killan ulkojäseneksi voidaan hyväksyä jäsenmaksun maksanut henkilö, joita ei voida hyväksyä varsinaiseksi jäseneksi.
+          Killan varsinaiseksi jäseneksi voidaan hyväksyä kaikki killan toiminnasta kiinnostuneet AYY:n jäsenet.
+          Killan ulkojäseneksi voidaan hyväksyä jäsenmaksun maksanut henkilö, jota 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
+