antibot

Edit board.json

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

.eslintignore

@@ -5,4 +5,3 @@ node_modules
 # don't lint nyc coverage output
 coverage
 next-env.d.ts
-tests

.gitlab-ci.yml

@@ -8,7 +8,7 @@ stages:
   - deploy
 
 install:
-  image: node:20
+  image: node:16
   stage: setup
   script:
     - npm ci
@@ -21,7 +21,7 @@ install:
     expire_in: 1 week
 
 audit:
-  image: node:20
+  image: node:16
   needs: ["install"]
   allow_failure: true  
   stage: audit
@@ -29,27 +29,27 @@ audit:
     - npm audit --audit-level=critical
 
 es:lint:
-  image: node:20
+  image: node:16
   needs: ["install"]
   stage: lint
   script:
     - npm run lint:es
 
 css:lint:
-  image: node:20
+  image: node:16
   needs: ["install"]
   stage: lint
   script:
     - npm run lint:css
 
 # test:unit:
-#     image: node:20
+#     image: node:16
 #     stage: test
 #     script:
 #         - npm run test:unit
 
 build:
-  image: node:20
+  image: node:16
   needs: ["install"]
   stage: build
   script:
@@ -67,20 +67,11 @@ build:
       - .next/cache/
 
 test:e2e:
-  # Use a Cypress image which has Node 20 + Chrome and runs as root (solves permission issues)
-  image: cypress/browsers:latest
+  image: circleci/node:16-browsers
   needs: ["install", "build"]
   stage: test
   script:
-    # No sudo needed if running as root. 
-    # If permissions are still wrong, we CAN fix them because we are root.
-    # But usually, being root means we can overwrite/rm the files anyway.
-    
-    # 1. Clean install to ensure native modules match this container's environment
-    - npm ci
-
-    # 2. Run TestCafe (using the CI script for headless mode)
-    - npm run testcafe:ci
+    - npm run testcafe
   artifacts:
     paths:
       - e2e-screenshots

next-env.d.ts

@@ -1,6 +1,5 @@
 /// <reference types="next" />
 /// <reference types="next/image-types/global" />
-import "./.next/types/routes.d.ts";
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.
+// see https://nextjs.org/docs/basic-features/typescript for more information.

next.config.js

@@ -1,54 +1,29 @@
-// web2.0-frontend/next.config.js
 const { withSentryConfig } = require("@sentry/nextjs");
 const withBundleAnalyzer = require("@next/bundle-analyzer")({
   enabled: process.env.ANALYZE === "true",
 });
 
-/** @type {import('next').NextConfig} */
-const nextConfig = {
-  compiler: {
-    styledComponents: true,
-  },
+const sentryWebpackPluginOptions = {
+  // Additional config options for the Sentry Webpack plugin. Keep in mind that
+  // the following options are set automatically, and overriding them is not
+  // recommended:
+  //   release, url, org, project, authToken, configFile, stripPrefix,
+  //   urlPrefix, include, ignore
+
+  silent: true, // Suppresses all logs
+  // For all available options, see:
+  // https://github.com/getsentry/sentry-webpack-plugin#options.
+};
+
+module.exports = withBundleAnalyzer(withSentryConfig({
   images: {
-    remotePatterns: [
-      {
-        protocol: "https",
-        hostname: "api.sahkoinsinoorikilta.fi",
-      },
-      {
-        protocol: "https",
-        hostname: "static.sahkoinsinoorikilta.fi",
-      },
-      {
-        protocol: "https",
-        hostname: "api.dev.sahkoinsinoorikilta.fi",
-      },
+    domains: [
+      "api.sahkoinsinoorikilta.fi",
+      "static.sahkoinsinoorikilta.fi",
+      "api.dev.sahkoinsinoorikilta.fi",
     ],
   },
-  // Note: The 'sentry' key is removed from here as it is no longer supported in v8
-};
-
-// Sentry options are now passed as a single object in the second argument
-const sentryOptions = {
-  // For all available options, see:
-  // https://github.com/getsentry/sentry-webpack-plugin#options
-
-  // Suppresses all logs
-  silent: true,
-
-  // Hides source maps from generated client bundles
-  hideSourceMaps: true,
-
-  // Automatically tree-shake Sentry logger statements to reduce bundle size
-  disableLogger: true,
-
-  // Upload a larger set of source maps for prettier stack traces (increases build time)
-  widenClientFileUpload: true,
-
-  // (Optional) You can add org and project if not set in environment variables
-  // org: "your-org-slug",
-  // project: "your-project-slug",
-};
-
-// Wrap the config with Sentry first, then Bundle Analyzer
-module.exports = withBundleAnalyzer(withSentryConfig(nextConfig, sentryOptions));
+  sentry: {
+    hideSourceMaps: true, // Hide source maps, see: https://docs.sentry.io/platforms/javascript/guides/nextjs/manual-setup/#configure-source-maps
+  },
+}, sentryWebpackPluginOptions));

package.json

@@ -1,103 +1,102 @@
 {
-    "name": "web2.0-frontend",
-    "version": "0.1.0",
-    "description": "Web 2.0 Frontend. React, Typescript.",
-    "repository": {
-        "type": "git",
-        "url": "https://gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-frontend.git"
-    },
-    "keywords": [
-        "react",
-        "next.js",
-        "typescript",
-        "styled-components"
-    ],
-    "author": "Aarni Halinen",
-    "license": "MIT",
-    "homepage": "https://sahkoinsinoorikilta.fi",
-    "scripts": {
-        "build": "next build",
-        "postbuild": "next-sitemap",
-        "export": "next export",
-        "lint": "npm run lint:es && npm run lint:css",
-        "lint:es": "eslint . --ext .js,.jsx,.ts,.tsx",
-        "lint:es:fix": "eslint . --ext .js,.jsx,.ts,.tsx --fix",
-        "lint:css": "stylelint \"./src/**/*.{ts,tsx}\"",
-        "dev": "next dev --webpack",
-        "start": "next dev --webpack",
-        "start-prod": "next start --port ${SERVER_PORT:=80}",
-        "serve": "next start --port 3000",
-        "test:unit": "jest --coverage",
-        "test": "npm run testcafe",
-        "testcafe": "testcafe --config-file testcafe.json",
-        "testcafe:ci": "testcafe 'chrome:headless --no-sandbox --disable-dev-shm-usage' --config-file  testcafe.json",
-        "build-analyze": "ANALYZE=true npm run build",
-        "prepare": "husky install"
-    },
-    "devDependencies": {
-        "@types/jest": "^30.0.0",
-        "@types/js-cookie": "^3.0.1",
-        "@types/node": "^16.11.36",
-        "@types/react": "^18.0.15",
-        "@types/react-csv": "^1.1.3",
-        "@types/react-dom": "^18.0.6",
-        "@types/shortid": "^0.0.29",
-        "@types/styled-components": "^5.1.25",
-        "@typescript-eslint/eslint-plugin": "^5.18.0",
-        "@typescript-eslint/parser": "^5.18.0",
-        "babel-plugin-styled-components": "^2.0.7",
-        "eslint": "^8.57.1",
-        "eslint-config-airbnb": "^19.0.4",
-        "eslint-config-airbnb-typescript": "^17.0.0",
-        "eslint-config-next": "^13.5.11",
-        "eslint-plugin-import": "^2.26.0",
-        "husky": "^7.0.4",
-        "jest": "^30.2.0",
-        "next-sitemap": "^3.1.11",
-        "npm-run-all": "^4.1.5",
-        "postcss-jsx": "^0.36.4",
-        "postcss-syntax": "^0.36.2",
-        "stylelint": "^14.2.0",
-        "stylelint-config-recommended": "^6.0.0",
-        "stylelint-config-styled-components": "^0.1.1",
-        "testcafe": "^3.7.2",
-        "ts-jest": "^29.4.6",
-        "typescript": "^5.9.3"
-    },
-    "dependencies": {
-        "@next/bundle-analyzer": "^12.2.3",
-        "@rjsf/core": "^4.2.0",
-        "@sentry/nextjs": "^10.29.0",
-        "axios": "^1.13.2",
-        "date-fns": "^2.28.0",
-        "fast-deep-equal": "^3.1.3",
-        "js-cookie": "^3.0.1",
-        "lodash": "^4.17.21",
-        "mqtt": "^5.14.1",
-        "next": "^16.0.8",
-        "normalize.css": "^8.0.1",
-        "react": "^18.2.0",
-        "react-csv": "^2.2.2",
-        "react-dnd": "15.0.2",
-        "react-dnd-html5-backend": "15.0.2",
-        "react-dnd-touch-backend": "15.0.2",
-        "react-dom": "^18.2.0",
-        "react-is": "^18.2.0",
-        "react-markdown": "^8.0.3",
-        "react-mde": "^11.5.0",
-        "react-toastify": "^9.0.7",
-        "rehype-raw": "^6.1.1",
-        "rehype-sanitize": "^5.0.1",
-        "sharp": "^0.34.5",
-        "shortid": "^2.2.16",
-        "styled-components": "^5.3.5",
-        "swr": "^1.2.2",
-        "uuid": "^13.0.0"
-    },
-    "overrides": {
-        "react-mde": {
-            "react": "$react",
-            "react-dom": "$react-dom"
-        }
+  "name": "web2.0-frontend",
+  "version": "0.1.0",
+  "description": "Web 2.0 Frontend. React, Typescript.",
+  "repository": {
+    "type": "git",
+    "url": "https://gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-frontend.git"
+  },
+  "keywords": [
+    "react",
+    "next.js",
+    "typescript",
+    "styled-components"
+  ],
+  "author": "Aarni Halinen",
+  "license": "MIT",
+  "homepage": "https://sahkoinsinoorikilta.fi",
+  "scripts": {
+    "build": "next build",
+    "postbuild": "next-sitemap",
+    "export": "next export",
+    "lint": "npm run lint:es && npm run lint:css",
+    "lint:es": "next lint",
+    "lint:es:fix": "next lint --fix",
+    "lint:css": "stylelint \"./src/**/*.{ts,tsx}\"",
+    "dev": "next dev",
+    "start": "next dev",
+    "start-prod": "next start --port ${SERVER_PORT:=80}",
+    "serve": "next start --port 3000",
+    "test:unit": "jest --coverage",
+    "test": "npm run testcafe",
+    "testcafe": "testcafe --config-file testcafe.json",
+    "build-analyze": "ANALYZE=true npm run build",
+    "prepare": "husky install"
+  },
+  "devDependencies": {
+    "@types/jest": "^27.4.1",
+    "@types/js-cookie": "^3.0.1",
+    "@types/node": "^16.11.36",
+    "@types/react": "^18.0.15",
+    "@types/react-csv": "^1.1.3",
+    "@types/react-dom": "^18.0.6",
+    "@types/shortid": "^0.0.29",
+    "@types/styled-components": "^5.1.25",
+    "@typescript-eslint/eslint-plugin": "^5.18.0",
+    "@typescript-eslint/parser": "^5.18.0",
+    "babel-plugin-styled-components": "^2.0.7",
+    "eslint": "^8.13.0",
+    "eslint-config-airbnb": "^19.0.4",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-config-next": "^13.1.6",
+    "eslint-plugin-import": "^2.26.0",
+    "husky": "^7.0.4",
+    "jest": "^27.5.1",
+    "next-sitemap": "^3.1.11",
+    "npm-run-all": "^4.1.5",
+    "postcss-jsx": "^0.36.4",
+    "postcss-syntax": "^0.36.2",
+    "stylelint": "^14.2.0",
+    "stylelint-config-recommended": "^6.0.0",
+    "stylelint-config-styled-components": "^0.1.1",
+    "testcafe": "^1.18.5",
+    "ts-jest": "^27.1.4",
+    "typescript": "^4.6.3"
+  },
+  "dependencies": {
+    "@next/bundle-analyzer": "^12.2.3",
+    "@rjsf/core": "^4.2.0",
+    "@sentry/nextjs": "^7.34.0",
+    "axios": "^0.26.1",
+    "date-fns": "^2.28.0",
+    "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",
+    "react-csv": "^2.2.2",
+    "react-dnd": "15.0.2",
+    "react-dnd-html5-backend": "15.0.2",
+    "react-dnd-touch-backend": "15.0.2",
+    "react-dom": "^18.2.0",
+    "react-is": "^18.2.0",
+    "react-markdown": "^8.0.3",
+    "react-mde": "^11.5.0",
+    "react-toastify": "^9.0.7",
+    "rehype-raw": "^6.1.1",
+    "rehype-sanitize": "^5.0.1",
+    "sharp": "^0.30.3",
+    "shortid": "^2.2.16",
+    "styled-components": "^5.3.5",
+    "swr": "^1.2.2",
+    "uuid": "^13.0.0"
+  },
+  "overrides": {
+    "react-mde": {
+      "react": "$react",
+      "react-dom": "$react-dom"
     }
+  }
 }

sentry.client.config.js

@@ -1,4 +1,7 @@
-/* eslint-disable import/prefer-default-export */
+// This file configures the initialization of Sentry on the browser.
+// The config you add here will be used whenever a page is visited.
+// https://docs.sentry.io/platforms/javascript/guides/nextjs/
+
 import * as Sentry from "@sentry/nextjs";
 
 const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
@@ -11,6 +14,3 @@ Sentry.init({
   // `release` value here - use the environment variable `SENTRY_RELEASE`, so
   // that it will also get attached to your source maps
 });
-
-// This is required by Sentry v8 to instrument navigation (tracing)
-export const onRouterTransitionStart = Sentry.captureRouterTransitionStart;

sentry.edge.config.js

@@ -1,18 +0,0 @@
-// This file configures the initialization of Sentry for edge features (middleware, edge routes, and so on).
-// The config you add here will be used whenever one of the edge features is loaded.
-// Note that this config is unrelated to the Vercel Edge Runtime and is also required when running locally.
-// https://docs.sentry.io/platforms/javascript/guides/nextjs/
-
-import * as Sentry from "@sentry/nextjs";
-
-const SENTRY_DSN = process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
-const ENV = process.env.NEXT_PUBLIC_DEPLOY_ENV;
-
-Sentry.init({
-  dsn: SENTRY_DSN,
-  environment: ENV,
-  // Adjust this value in production, or use tracesSampler for greater control
-  // tracesSampleRate: 1.0, // Commented out as client/server configs don't have it
-  // Setting this option to true will print useful information to the console while you're setting up Sentry.
-  // debug: false, // Commented out as client/server configs don't have it
-});

src/components/AddIcon.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 
 const Icon = "/img/add-icon.png";
 

src/components/Card.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import colors from "@theme/colors";
 import Link from "@components/Link";
@@ -22,7 +22,6 @@ const StyledCard = styled.article`
   display: flex;
   flex-direction: column;
   color: ${colors.black};
-  position: relative;
   margin: 1rem;
   text-align: center;
 
@@ -73,7 +72,7 @@ const WrappedCard: React.FC<WrappedCardProps> = ({
 }) => (
   <StyledCard {...props}>
     {image && (
-      <Image src={image.src} alt={image.alt} fill sizes="(max-width: 640px) 100vw, (max-width: 1024px) 50vw, 33vw" style={{ objectFit: "scale-down" }} />
+      <Image src={image.src} alt={image.alt} layout="responsive" width={0} height={0} objectFit="scale-down" />
     )}
     <p>{startTime}</p>
     <h3>{title}</h3>

src/components/ContactCard.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import colors from "@theme/colors";
 
@@ -73,9 +73,8 @@ const ContactCard: React.FC<ContactCardProps> = ({
           <Image
             src={image}
             alt={name}
-            fill
-            sizes="128px"
-            style={{ objectFit: "cover" }}
+            layout="fill"
+            objectFit="cover"
           />
         </ImageContainer>
       ) : null}

src/components/CrossFadeImages.tsx

@@ -1,16 +1,16 @@
 import React from "react";
-import Image from "next/image";
+import Image, { ImageProps } from "next/legacy/image";
 import styled, { keyframes, Keyframes } from "styled-components";
 
 interface CrossFadeImagesProps {
-  width: number | string;
-  height: number | string;
+  width: ImageProps["width"];
+  height: ImageProps["height"];
   images: string[];
   presentationTime: number;
   fadeTime: number;
 }
 
-const AnimatedImage = styled(Image) <{ $delay: number }>`
+const AnimatedImage = styled(Image)<{ layout: string; $delay: number }>`
   animation-delay: ${(p) => p.$delay}s;
 `;
 
@@ -69,15 +69,14 @@ const CrossFadeImages: React.FC<CrossFadeImagesProps> = ({
       $animation={animation}
       $duration={len * SINGLE_IMAGE_TIME}
     >
-      {images.map((image, idx) => (
+      { images.map((image, idx) => (
         // eslint-disable-next-line react/no-array-index-key
         <div key={idx} className={idx > 0 ? "not-first" : undefined}>
           <AnimatedImage
             src={image}
             objectFit="cover"
-            alt=""
-            width={width as any}
-            height={height as any}
+            width={width}
+            height={height}
             layout="responsive"
             $delay={delays[idx]}
           />

src/components/HeaderLogo.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import { Link } from "@components/index";
 
@@ -18,9 +18,8 @@ const HeaderLogo: React.FC = () => (
     <Image
       src={TitleImage}
       alt="logo"
-      fill
-      sizes="200px"
-      style={{ objectFit: "scale-down" }}
+      layout="fill"
+      objectFit="scale-down"
     />
   </Logo>
 );

src/i18n/index.tsx

@@ -1,5 +1,5 @@
 import React, {
-  createContext, useContext, useMemo, useReducer, useEffect,
+  createContext, useContext, useMemo, useReducer,
 } from "react";
 import fi from "./locales/fi/common.json";
 import en from "./locales/en/common.json";
@@ -36,10 +36,16 @@ interface Store {
   changeLanguage: React.Dispatch<Lang>,
 }
 
-// Always default to 'fi' for the initial state to ensure Server/Client match.
-// We will hydrate the user's preference in useEffect below.
+let initialLanguage: Lang = "fi";
+try {
+  const storedLang = localStorage.getItem(LOCAL_STORAGE_KEY) as Lang;
+  initialLanguage = storedLang;
+} catch (err) {
+  // Just ignore if fails to get value from browser (server etc.)
+}
+
 const initialState: Store = {
-  language: "fi",
+  language: initialLanguage,
   changeLanguage: null,
 };
 
@@ -63,22 +69,6 @@ const Reducer = (state: Store, action: Lang) => {
 const LocaleContext = createContext(initialState);
 const LocaleStore: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
   const [state, dispatch] = useReducer(Reducer, initialState);
-
-  // Sync with localStorage only after the component has mounted (client-side)
-  useEffect(() => {
-    try {
-      const storedLang = localStorage.getItem(LOCAL_STORAGE_KEY) as Lang;
-      if (storedLang && (storedLang === "fi" || storedLang === "en")) {
-        // Only dispatch if different to prevent unnecessary re-renders
-        if (storedLang !== state.language) {
-          dispatch(storedLang);
-        }
-      }
-    } catch (err) {
-      // Just ignore if fails to get value from browser
-    }
-  }, []); // Empty dependency array ensures this runs once on mount
-
   const changeLanguage = (action: Lang) => {
     dispatch(action);
     try {

src/instrumentation.ts

@@ -1,13 +0,0 @@
-import * as Sentry from "@sentry/nextjs";
-
-export async function register() {
-  if (process.env.NEXT_RUNTIME === "nodejs") {
-    await import("../sentry.server.config");
-  }
-
-  if (process.env.NEXT_RUNTIME === "edge") {
-    await import("../sentry.edge.config");
-  }
-}
-
-export const onRequestError = Sentry.captureRequestError;

src/pages/signup/[id].tsx

@@ -23,6 +23,9 @@ 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}/`;
@@ -44,6 +47,13 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
   }
 
   const onSubmit = async ({ formData }: ISubmitEvent<string>) => {
+
+    if (honeypot !== "") {
+      console.log("bot cought in honeypot cought lacking");
+      toast.success("Sign-up submitted successfully 😎");
+      return;
+    }
+
     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,
@@ -66,6 +76,23 @@ const SignUpPage: NextPage<InitialProps> = ({ initialForm }) => {
         <link rel="canonical" href={`${process.env.NEXT_PUBLIC_SITE_URL}/signup/${signupForm.id}`} />
       </Head>
       <PageWrapper>
+        {/* 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>
+
         <SignUpPageView
           signUpForm={signupForm}
           formData={{}}

src/views/BoardPage/board.json

@@ -8,10 +8,10 @@
       "name_en": "Chairman of the Board",
       "representatives": [
         {
-          "name": "Emma Uusküla",
+          "name": "Sauli Hakala",
           "phone_number": null,
-          "email": "emma.uuskula@sahkoinsinoorikilta.fi",
-          "image": "https://static.sahkoinsinoorikilta.fi/img/board/Emma.jpg"
+          "email": "sauli.hakala@sahkoinsinoorikilta.fi",
+          "image": "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": "Milja Kuusela"
-        },
-        {
-          "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é Paloari"
+                },
+                {
+                    "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 Nikkinen"
+                }
+            ]
+        },
+        {
+            "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ähkö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 Tram"
+                }
+            ]
         }
-      ]
-    },
-    {
-      "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 Comittee Counsil",
+    "name_en": "SIK International Comittee Counsil",
+    "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ähkö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/EventPage/EventPageView.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import rehypeRaw from "rehype-raw";
 import rehypeSanitize from "rehype-sanitize";
@@ -81,9 +81,10 @@ const EventPageView: React.FC<EventPageViewProps> = ({ event }) => {
           <Image
             src={event.image || event.tags[0].icon}
             alt={title}
+            objectFit="scale-down"
+            layout="responsive"
             width={16}
             height={9}
-            style={{ objectFit: "scale-down" }}
           />
         </h1>
         <div>

src/views/FeedPage/FeedPageView.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import rehypeRaw from "rehype-raw";
 import rehypeSanitize from "rehype-sanitize";
@@ -65,9 +65,10 @@ const FeedPageView: React.FC<FeedPageViewProps> = ({ post }) => {
           <Image
             src={post.image}
             alt={title}
+            objectFit="scale-down"
+            layout="responsive"
             width={16}
             height={9}
-            style={{ objectFit: "scale-down" }}
           />
           )}
         </h1>

src/views/ForFreshmenPage/ForFreshmenPageView.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import {
   CTASection, TextSection, InfoBox, PageLink, Link,
@@ -61,9 +61,10 @@ const ForFreshmenPageView: React.FC = () => (
           <Image
             src="https://static.sahkoinsinoorikilta.fi/FTMK/IMG_6539.JPG"
             alt="Kipparit"
+            layout="responsive"
             width={100}
             height={80}
-            style={{ objectFit: "contain" }}
+            objectFit="contain"
           />
         </ImageContainer>
 

src/views/ForInternationalPage/ForIntlPageView.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import {
   CTASection, TextSection, InfoBox, PageLink, Link,
@@ -78,9 +78,10 @@ const ForIntlPageView: React.FC = () => (
           <Image
             src="https://static.sahkoinsinoorikilta.fi/FTMK/Captains2025.jpg"
             alt="Kipparit"
+            layout="responsive"
             width={100}
             height={80}
-            style={{ objectFit: "contain" }}
+            objectFit="contain"
           />
         </ImageContainer>
 

src/views/FreshmenPage/FreshmenPageView.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import {
   CTASection, TextSection, InfoBox, PageLink, Link,
@@ -60,9 +60,10 @@ const FreshmenPageView: React.FC = () => (
           <Image
             src="https://static.sahkoinsinoorikilta.fi/FTMK/IMG_6539.JPG"
             alt="Kipparit"
+            layout="responsive"
             width={100}
             height={80}
-            style={{ objectFit: "contain" }}
+            objectFit="contain"
           />
         </ImageContainer>
 

src/views/FrontPage/FrontPageView.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import styled from "styled-components";
 import {
   Divider,
@@ -93,43 +93,43 @@ const FrontPageView: React.FC<FrontPageViewProps> = ({ events, feed }) => (
         <SponsorReel>
           <div>
             <Link to="https://new.abb.com/fi/">
-              <Image src={ABB} alt="ABB" width={200} height={100} style={{ objectFit: "contain" }} />
+              <Image src={ABB} alt="ABB" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
             <Link to="https://caruna.fi/">
-              <Image src={Caruna} alt="Caruna" width={200} height={100} style={{ objectFit: "contain" }} />
+              <Image src={Caruna} alt="Caruna" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
             <Link to="https://www.nokia.com/">
-              <Image src={Nokia} alt="Nokia" width={200} height={100} style={{ objectFit: "contain" }} />
+              <Image src={Nokia} alt="Nokia" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
             <Link to="https://www.ensto.com/fi/">
-              <Image src={Ensto} alt="Ensto" width={200} height={100} style={{ objectFit: "contain" }} />
+              <Image src={Ensto} alt="Ensto" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
             <Link to="https://www.esett.com/">
-              <Image src={eSett} alt="eSett" width={200} height={100} style={{ objectFit: "contain" }} />
+              <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" width={200} height={100} style={{ objectFit: "contain" }} />
+              <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" width={200} height={100} style={{ objectFit: "contain" }} />
+              <Image src={Okmetic} alt="Okmetic" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
             <Link to="https://www.granlund.fi/">
-              <Image src={Granlund} alt="Granlund" width={200} height={100} style={{ objectFit: "contain" }} />
+              <Image src={Granlund} alt="Granlund" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
             <Link to="https://www.eaton.com/fi/fi-fi.html">
-              <Image src={Eaton} alt="Eaton" width={200} height={100} style={{ objectFit: "contain" }} />
+              <Image src={Eaton} alt="Eaton" layout="responsive" width={200} height={100} objectFit="contain" />
             </Link>
             <Link to="https://www.ericsson.com/en">
-              <Image src={Ericsson} alt="Ericsson" width={200} height={100} style={{ objectFit: "contain" }} />
+              <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" width={200} height={100} style={{ objectFit: "contain" }} />
+              <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" width={200} height={100} style={{ objectFit: "contain" }} />
+              <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" width={200} height={100} style={{ objectFit: "contain" }} />
+              <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>

src/views/StudiesPage/StudiesPageView.tsx

@@ -1,5 +1,5 @@
 import React from "react";
-import Image from "next/image";
+import Image from "next/legacy/image";
 import {
   CTASection, TextSection, PageLink, Link,
 } from "@components/index";
@@ -81,7 +81,8 @@ const StudiesPageView: React.FC = () => (
           alt="Ville Viikari"
           width={300}
           height={150}
-          style={{ objectFit: "contain" }}
+          layout="responsive"
+          objectFit="contain"
         />
         <h6>Ville Viikari</h6>
         <p>

testcafe.json

@@ -8,5 +8,5 @@
   },
   "skipJsErrors": true,
   "appCommand": "npm run serve",
-  "appInitDelay": 10000
+  "appInitDelay": 2000
 }

tests/testcafe/admin/create-signup.test.ts

@@ -1,6 +1,6 @@
 import { Selector } from "testcafe";
 import {
-  getSiteRoot, getPageUrl, deleteForm, doLogin, generateAccessToken, getPostRequestLogger, waitForLogger,
+  getSiteRoot, getPageUrl, deleteForm, doLogin, generateAccessToken, getPostRequestLogger, waitForLogger
 } from "../utils";
 
 const LOGGER = getPostRequestLogger("signupForm/");

tests/testcafe/utils.ts

@@ -159,10 +159,10 @@ export const generateTestEvent = async (formIds = [], jwt_access: string) => (
 export const sleep = async (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
 export const waitForLogger = async (logger: RequestLogger) => {
-  for (let i = 0; i < 50; i += 1) {
+  for (let i = 0; i < 50; i++) {
     await sleep(100);
-    if (logger.requests.length > 0) {
-      return;
+    if (logger.requests.length > 0 ) {
+      return;  
     }
   }
-};
+}

tsconfig.json

@@ -5,7 +5,7 @@
     "esModuleInterop": true,
     "forceConsistentCasingInFileNames": true,
     "isolatedModules": true,
-    "jsx": "react-jsx",
+    "jsx": "preserve",
     "lib": [
       "dom",
       "esnext"