From 34d8213156a2041c6ee0d738db1c9f2ef9f0c558 Mon Sep 17 00:00:00 2001 From: Simeon Pursiainen Date: Sat, 17 May 2025 13:23:17 +0300 Subject: [PATCH 1/7] Master --- src/components/Navigation.tsx | 1 + src/pages/fukseille_en.tsx | 18 ++++++++++++++++++ .../ForFreshmenPage/ForFreshmenPageView.tsx | 13 +++++++++++++ .../MembershipPage/MembershipPageHero.tsx | 13 +++++++++++++ 4 files changed, 45 insertions(+) create mode 100644 src/pages/fukseille_en.tsx create mode 100644 src/views/ForFreshmenPage/ForFreshmenPageView.tsx diff --git a/src/components/Navigation.tsx b/src/components/Navigation.tsx index c71f9c8..f3b09c2 100644 --- a/src/components/Navigation.tsx +++ b/src/components/Navigation.tsx @@ -20,6 +20,7 @@ export const renderNavigationItems = (mobile = false): JSX.Element => ( Kuvagalleria Kilta-avustus + diff --git a/src/pages/fukseille_en.tsx b/src/pages/fukseille_en.tsx new file mode 100644 index 0000000..9dafb74 --- /dev/null +++ b/src/pages/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 = () => ( + <> + + + + + + + +); + +export default ContactsPage; diff --git a/src/views/ForFreshmenPage/ForFreshmenPageView.tsx b/src/views/ForFreshmenPage/ForFreshmenPageView.tsx new file mode 100644 index 0000000..f1cc6e8 --- /dev/null +++ b/src/views/ForFreshmenPage/ForFreshmenPageView.tsx @@ -0,0 +1,13 @@ +import React from "react"; +import { TextSection } from "@components/index"; + +const ForFreshmenPageView: React.FC = () => ( + +

Hello!

+
+

Hi there! This site is under construction and will be updated during the summer!

+
+ +); + +export default ForFreshmenPageView; diff --git a/src/views/MembershipPage/MembershipPageHero.tsx b/src/views/MembershipPage/MembershipPageHero.tsx index fe7fe03..2633f30 100644 --- a/src/views/MembershipPage/MembershipPageHero.tsx +++ b/src/views/MembershipPage/MembershipPageHero.tsx @@ -13,6 +13,19 @@ const MembershipPageHero: React.FC = () => ( Jäseneksi haluavien tulee täyttää jäsenhakemus ja maksaa jäsenmaksu. Linkin jäsenhakemukseen löydät vierestä ja maksutiedot alempaa tältä sivulta." /> + + + + + ); From fe015c3bcea39b73a1a675ee1f4af874cb30c7bb Mon Sep 17 00:00:00 2001 From: SimeonPursiainen Date: Tue, 1 Jul 2025 19:37:07 +0300 Subject: [PATCH 2/7] testing force push to refresh site --- src/views/FreshmenPage/FreshmenPageView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/FreshmenPage/FreshmenPageView.tsx b/src/views/FreshmenPage/FreshmenPageView.tsx index a73e38b..52a31db 100644 --- a/src/views/FreshmenPage/FreshmenPageView.tsx +++ b/src/views/FreshmenPage/FreshmenPageView.tsx @@ -96,7 +96,7 @@ const FreshmenPageView: React.FC = () => ( Fuksikipparit tavoitat - Liity jäseneksi + Liity jäseneksi tästä Fuksipisteohje From 984966f3afc213a93f7244919853e17a68072d7c Mon Sep 17 00:00:00 2001 From: SimeonPursiainen Date: Tue, 1 Jul 2025 20:56:44 +0300 Subject: [PATCH 3/7] added replica in case of a failure --- stack-compose.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/stack-compose.yml b/stack-compose.yml index 744ace3..6f90d05 100644 --- a/stack-compose.yml +++ b/stack-compose.yml @@ -4,8 +4,13 @@ services: frontend: image: registry.gitlab.com/sahkoinsinoorikilta/vtmk/web2.0-frontend:prod deploy: - replicas: 1 + replicas: 2 # TEMP 2 for testing update_config: order: start-first ports: - 3000:3000 + healthcheck: + test: ["CMD", "curl", "-f", "http://localhost:3000"] + interval: 10s + timeout: 3s + retries: 3 From cdff86c0f3fe53699a5836f29e2eb94161742aeb Mon Sep 17 00:00:00 2001 From: SimeonPursiainen Date: Wed, 2 Jul 2025 07:34:19 +0300 Subject: [PATCH 4/7] english fuksiguide --- src/views/ForFreshmenPage/ForFreshmenPageView.tsx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/ForFreshmenPage/ForFreshmenPageView.tsx b/src/views/ForFreshmenPage/ForFreshmenPageView.tsx index 354c34d..0aa2da4 100644 --- a/src/views/ForFreshmenPage/ForFreshmenPageView.tsx +++ b/src/views/ForFreshmenPage/ForFreshmenPageView.tsx @@ -100,13 +100,13 @@ const ForFreshmenPageView: React.FC = () => ( Join the guild! - Fuksipoint guide + Fuksipoint guide - This will be translated later so don't worry if you don't understand Finnish!
Fuksiguide
- + @@ -114,7 +114,8 @@ const ForFreshmenPageView: React.FC = () => (

It's a good idea to take a look at the fuksiguide before starting your studies! - The guide will appear to this page sooner than you might expect! here!. + The guide contains lots of useful information about the guild, the student union, and the student life in Otaniemi. + You can find the guide here.


Telegram?
@@ -129,7 +130,7 @@ const ForFreshmenPageView: React.FC = () => ( src="https://static.sahkoinsinoorikilta.fi/FTMK/SIK-Fuksit-2025.jpg" />

or press me!

-

Also join the notifications channel fo SIK fuksis, to stay in the loop!:

+

Also join the notifications channel for SIK fuksis, to stay in the loop!:

From b7c06890fe9dbfe51eb4a7aca7f3b07ef1f8c5cc Mon Sep 17 00:00:00 2001 From: SimeonPursiainen Date: Wed, 2 Jul 2025 07:35:57 +0300 Subject: [PATCH 5/7] english fuksipoint guide --- src/views/ForFreshmenPage/ForFreshmenPageView.tsx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/ForFreshmenPage/ForFreshmenPageView.tsx b/src/views/ForFreshmenPage/ForFreshmenPageView.tsx index 0aa2da4..4ae752f 100644 --- a/src/views/ForFreshmenPage/ForFreshmenPageView.tsx +++ b/src/views/ForFreshmenPage/ForFreshmenPageView.tsx @@ -70,7 +70,8 @@ const ForFreshmenPageView: React.FC = () => (
Freshmen captains

- We are your freshman captains Teemu and Henri and we'll be here to support you and monitor your progress throughout the freshman year adventures toward earning your engineer's hat (= teekkarilakki), + We are your freshman captains Teemu and Henri and we'll be here to support you and monitor your + progress throughout the freshman year adventures toward earning your engineer's hat (= teekkarilakki), which you might possibly earn during May Day next spring. If you have any questions, feel free to contact us via Telegram or email.

@@ -100,7 +101,7 @@ const ForFreshmenPageView: React.FC = () => ( Join the guild! - Fuksipoint guide - This will be translated later so don't worry if you don't understand Finnish! + Fuksipoint guide - This will be translated later so don't worry if you don't understand Finnish!
From 5439ff9a5665dd35d7f3c404900457148af1096c Mon Sep 17 00:00:00 2001 From: SimeonPursiainen Date: Wed, 2 Jul 2025 07:36:43 +0300 Subject: [PATCH 6/7] fixing lint --- src/views/ForFreshmenPage/ForFreshmenPageView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/ForFreshmenPage/ForFreshmenPageView.tsx b/src/views/ForFreshmenPage/ForFreshmenPageView.tsx index 4ae752f..e9cdfc4 100644 --- a/src/views/ForFreshmenPage/ForFreshmenPageView.tsx +++ b/src/views/ForFreshmenPage/ForFreshmenPageView.tsx @@ -70,7 +70,7 @@ const ForFreshmenPageView: React.FC = () => (
Freshmen captains

- We are your freshman captains Teemu and Henri and we'll be here to support you and monitor your + We are your freshman captains Teemu and Henri and we'll be here to support you and monitor your progress throughout the freshman year adventures toward earning your engineer's hat (= teekkarilakki), which you might possibly earn during May Day next spring. If you have any questions, feel free to contact us via Telegram or email. From 482be66b43a60f656ec186f4330e83914458dfa3 Mon Sep 17 00:00:00 2001 From: SimeonPursiainen Date: Wed, 9 Jul 2025 20:58:23 +0300 Subject: [PATCH 7/7] new links for fopas --- src/views/ForFreshmenPage/ForFreshmenPageHero.tsx | 2 +- src/views/FreshmenPage/FreshmenPageHero.tsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/ForFreshmenPage/ForFreshmenPageHero.tsx b/src/views/ForFreshmenPage/ForFreshmenPageHero.tsx index dc44f88..22bdfe2 100644 --- a/src/views/ForFreshmenPage/ForFreshmenPageHero.tsx +++ b/src/views/ForFreshmenPage/ForFreshmenPageHero.tsx @@ -14,7 +14,7 @@ const ForFreshmenPageHero: React.FC = () => ( diff --git a/src/views/FreshmenPage/FreshmenPageHero.tsx b/src/views/FreshmenPage/FreshmenPageHero.tsx index b4e53e9..41642fa 100644 --- a/src/views/FreshmenPage/FreshmenPageHero.tsx +++ b/src/views/FreshmenPage/FreshmenPageHero.tsx @@ -13,7 +13,7 @@ const FreshmenPageHero: React.FC = () => (