From ea82b493d5b4daf6dc395bcb9decd4639a669e81 Mon Sep 17 00:00:00 2001 From: Tommi S Date: Thu, 23 Mar 2023 11:49:17 +0200 Subject: [PATCH 01/12] Updated sikpaja info and links --- src/views/ActualPage/ActualPageView.tsx | 8 ++++---- src/views/InEnglishPage/InEnglishPageView.tsx | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/ActualPage/ActualPageView.tsx b/src/views/ActualPage/ActualPageView.tsx index 22dc2e7..f63bb2f 100644 --- a/src/views/ActualPage/ActualPageView.tsx +++ b/src/views/ActualPage/ActualPageView.tsx @@ -111,13 +111,13 @@ const ActualPageView: React.FC = ({ events, feed }) => (
Rakenna kaikkea elektroniikkaan liittyvää

- Elepaja on sähköinsinöörikillan ylläpitämä elektroniikkapaja, jossa opiskelijat pääsevät soveltamaan koulussa oppimiaan taitojaan käytännön projekteissa. + SIK-PAJA on sähköinsinöörikillan ylläpitämä elektroniikkapaja, jossa opiskelijat pääsevät soveltamaan koulussa oppimiaan taitojaan käytännön projekteissa. Opiskelijat ovat aikojen saatossa rakentaneet pajalla mitä monimuotoisempia projekteja kuten ensimmäisiä ledivilkkujaan, teslakäämejä, robotteja ja radiolähettimiä. Jos elektroniikan rakentelu kiinnostaa tai tarvitset jonkun projektin kanssa apua niin tule ihmeessä käymään elepajalla. - Pajan varustukseen kuluu perustyökalut, piirilevyn syövytysvälineet, kolvit, komponentit, pylväsporakone sekä laaja valikoima mittauslaitteita. - Ota siis kola ja tule nauttimaan elepajan mukavasta ilmapiiristä Elepajan uusissa tiloissa kanditaattikeskuksessa ruokala alvarin alla. + Pajan varustukseen kuluu perustyökalut, kolvit, komponentit sekä laaja valikoima mittauslaitteita. + Tule tutustumaan toimintaamme Kandidaattikeskuksessa ruokala Alvarin alapuolella sijaitseviin tiloihimme. {" "} - Tästä pääset liittymään elepajan Telegram-ryhmään. + Tästä pääset liittymään pajan Telegram-ryhmään.

Urheilua ja lajikokeiluja

diff --git a/src/views/InEnglishPage/InEnglishPageView.tsx b/src/views/InEnglishPage/InEnglishPageView.tsx index 713c064..e0afe03 100644 --- a/src/views/InEnglishPage/InEnglishPageView.tsx +++ b/src/views/InEnglishPage/InEnglishPageView.tsx @@ -128,7 +128,7 @@ const InEnglishPageView: React.FC = ({ events, feed }) =

Balance your studies and get connected

Build everything related to electronics
-

Elepaja is an electronics workshop run by the guild, where students get to apply skills they have learned at school in practical projects. Over time, students have built diverse projects in the workshop, such as their first LED flashlights, tesla windings, robots and radio transmitters. If you are interested in building electronics or you need help with a project, then come visit the workshop located at Otakaari 1 h023b. The workshop is equipped with basic tools such as circuit boards, etching tools, soldering tools, various components, column drill and a wide range of measuring equipment. You can join elepaja's Telegram group here.

+

SIK-PAJA is an electronics workshop run by the guild, where students get to apply skills they have learned at school in practical projects. Over time, students have built diverse projects in the workshop, such as their first LED overall badges, tesla windings, robots and radio transmitters. If you are interested in building electronics or you need help with a project, then come visit the workshop located at Otakaari 1 h023b. The workshop is equipped with basic tools such as circuit boards, etching tools, soldering tools, various components and a wide range of measuring equipment. You can join sikpaja's Telegram group here.

Sports events

The committee of Well Being runs many things in our guild. One of these is providing sports events to the guild members. In cooperation with other guilds, we regularly organize opportunities to play floorball and other sports. Sports tryouts are available throughout the year and are organized in co-operation with various sports organizations in Otaniemi. Keep your eyes open in the events section and join the sports Telegram group.

Culture from culinarism to theater
From b4d41cd6a74906cafd922390640d93c7390f16c9 Mon Sep 17 00:00:00 2001 From: Tommi S Date: Fri, 19 May 2023 17:53:54 +0300 Subject: [PATCH 02/12] Removed sik100 info --- src/views/CorporatePage/CorporatePageView.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx index ae5e8e5..dc2cd00 100644 --- a/src/views/CorporatePage/CorporatePageView.tsx +++ b/src/views/CorporatePage/CorporatePageView.tsx @@ -68,8 +68,6 @@ const CorporatePageView: React.FC = ({ jobAds }) => ( Kiltamme viettää perinteikkäitä vuosijuhliaan helmikuun kolmantena lauantaina. Potentiaalin Tasaus on kiltamme juhlavin ja rakkain tapahtuma. Yrityksillä on mahdollisuus osallistua vuosijuhliin niin pienellä kuin suurellakin panoksella. - Killan 100-vuotisjuhla PoTa100 lähestyy myös kovaa vauhtia. - Jos yrityksesi on kiinnostunut 100-vuotisjuhlasta, kannattaa ohjautua osoitteeseen sik100.fi.

Killan nettisivut ja työpaikkamainokset
From d101931020292ee9f05e6304a38faf391e4d8110 Mon Sep 17 00:00:00 2001 From: Tommi S Date: Sat, 20 May 2023 11:54:48 +0300 Subject: [PATCH 03/12] Remove sik100 info --- src/views/CorporatePage/CorporatePageView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx index dc2cd00..41a9d62 100644 --- a/src/views/CorporatePage/CorporatePageView.tsx +++ b/src/views/CorporatePage/CorporatePageView.tsx @@ -67,7 +67,7 @@ const CorporatePageView: React.FC = ({ jobAds }) => (

Kiltamme viettää perinteikkäitä vuosijuhliaan helmikuun kolmantena lauantaina. Potentiaalin Tasaus on kiltamme juhlavin ja rakkain tapahtuma. - Yrityksillä on mahdollisuus osallistua vuosijuhliin niin pienellä kuin suurellakin panoksella. + Yrityksillä on mahdollisuus osallistua vuosijuhliin niin pienellä kuin suurellakin panoksella.

Killan nettisivut ja työpaikkamainokset
From 0dc349161e4f7c86a9cf31e0525dc6f229129f4d Mon Sep 17 00:00:00 2001 From: Tommi S Date: Sat, 20 May 2023 12:05:48 +0300 Subject: [PATCH 04/12] Remove sik100 info --- src/views/CorporatePage/CorporatePageView.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx index 41a9d62..8b1d944 100644 --- a/src/views/CorporatePage/CorporatePageView.tsx +++ b/src/views/CorporatePage/CorporatePageView.tsx @@ -67,7 +67,7 @@ const CorporatePageView: React.FC = ({ jobAds }) => (

Kiltamme viettää perinteikkäitä vuosijuhliaan helmikuun kolmantena lauantaina. Potentiaalin Tasaus on kiltamme juhlavin ja rakkain tapahtuma. - Yrityksillä on mahdollisuus osallistua vuosijuhliin niin pienellä kuin suurellakin panoksella. + Yrityksillä on mahdollisuus osallistua vuosijuhliin niin pienellä kuin suurellakin panoksella!

Killan nettisivut ja työpaikkamainokset
From bdcf4840f5f1a0a0c57d843efedd7f7bc4f1bf1a Mon Sep 17 00:00:00 2001 From: Tommi S Date: Wed, 24 May 2023 15:57:17 +0300 Subject: [PATCH 05/12] Add google calendar link to front page --- src/components/Feed/Events.tsx | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/Feed/Events.tsx b/src/components/Feed/Events.tsx index 4875430..06df13e 100644 --- a/src/components/Feed/Events.tsx +++ b/src/components/Feed/Events.tsx @@ -28,6 +28,9 @@ const Events: React.FC = ({ events, lang }) => { const pageLinkText = t("Kaikki tapahtumat"); const pageLinkDesc = `${t("löydät tapahtumakalenterista")}\xa0›`; + const g_calendarText = t("Lisää killan"); + const g_calendarDesc = `${t("Google-kalenteri")}\xa0›`; + const locale = isFi ? "fi-FI" : "en-GB"; const filteredEvents = events.map((e) => ({ @@ -62,6 +65,9 @@ const Events: React.FC = ({ events, lang }) => { {pageLinkText} + + {g_calendarText} + From 63df5e6f5f2609c9e7985451e443a8dc09e74151 Mon Sep 17 00:00:00 2001 From: Tommi S Date: Wed, 24 May 2023 16:03:44 +0300 Subject: [PATCH 06/12] Add google calendar link to front page --- src/components/Feed/Events.tsx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/Feed/Events.tsx b/src/components/Feed/Events.tsx index 06df13e..690ee0e 100644 --- a/src/components/Feed/Events.tsx +++ b/src/components/Feed/Events.tsx @@ -28,8 +28,8 @@ const Events: React.FC = ({ events, lang }) => { const pageLinkText = t("Kaikki tapahtumat"); const pageLinkDesc = `${t("löydät tapahtumakalenterista")}\xa0›`; - const g_calendarText = t("Lisää killan"); - const g_calendarDesc = `${t("Google-kalenteri")}\xa0›`; + const gCalendarText = t("Lisää killan"); + const gCalendarDesc = `${t("Google-kalenteri")}\xa0›`; const locale = isFi ? "fi-FI" : "en-GB"; @@ -65,8 +65,8 @@ const Events: React.FC = ({ events, lang }) => { {pageLinkText} - - {g_calendarText} + + {gCalendarText} From cfc7dd11f54ce667af0bd1ce43f510923793eca0 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 28 May 2023 23:13:39 +0300 Subject: [PATCH 07/12] Test deploy token --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8abc04..08fba05 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ publish:dev: - master script: - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - docker build . -t "$IMAGE_NAME":latest --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" --build-arg NEXT_PUBLIC_DEPLOY_ENV=development --build-arg NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api --build-arg NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi - docker push "$IMAGE_NAME":latest @@ -100,7 +100,7 @@ publish:prod: - production script: - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY - docker build . -t "$IMAGE_NAME":prod --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" - docker push "$IMAGE_NAME":prod @@ -120,7 +120,7 @@ deploy:dev: - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem - echo "$DEV_TLSCERT" > ~/.docker/cert.pem - echo "$DEV_TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" after_script: @@ -142,7 +142,7 @@ deploy:prod: - echo "$TLSCACERT" > ~/.docker/ca.pem - echo "$TLSCERT" > ~/.docker/cert.pem - echo "$TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" after_script: From 0e4e02e1b33f643490bc6cbc61e0b34d9ba49883 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 28 May 2023 23:30:29 +0300 Subject: [PATCH 08/12] Revert "Test deploy token" This reverts commit cfc7dd11f54ce667af0bd1ce43f510923793eca0. --- .gitlab-ci.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 08fba05..e8abc04 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -87,7 +87,7 @@ publish:dev: - master script: - docker info - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build . -t "$IMAGE_NAME":latest --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" --build-arg NEXT_PUBLIC_DEPLOY_ENV=development --build-arg NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api --build-arg NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi - docker push "$IMAGE_NAME":latest @@ -100,7 +100,7 @@ publish:prod: - production script: - docker info - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build . -t "$IMAGE_NAME":prod --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" - docker push "$IMAGE_NAME":prod @@ -120,7 +120,7 @@ deploy:dev: - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem - echo "$DEV_TLSCERT" > ~/.docker/cert.pem - echo "$DEV_TLSKEY" > ~/.docker/key.pem - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" after_script: @@ -142,7 +142,7 @@ deploy:prod: - echo "$TLSCACERT" > ~/.docker/ca.pem - echo "$TLSCERT" > ~/.docker/cert.pem - echo "$TLSKEY" > ~/.docker/key.pem - - docker login -u $CI_DEPLOY_USER -p $CI_DEPLOY_PASSWORD $CI_REGISTRY + - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" after_script: From 9f33c667d351114ff9b2e528b8ecf041a5d8cee2 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 28 May 2023 23:34:34 +0300 Subject: [PATCH 09/12] Copy working login from build step --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8abc04..c10752e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -120,7 +120,7 @@ deploy:dev: - echo "$DEV_TLSCACERT" > ~/.docker/ca.pem - echo "$DEV_TLSCERT" > ~/.docker/cert.pem - echo "$DEV_TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" after_script: @@ -142,7 +142,7 @@ deploy:prod: - echo "$TLSCACERT" > ~/.docker/ca.pem - echo "$TLSCERT" > ~/.docker/cert.pem - echo "$TLSKEY" > ~/.docker/key.pem - - docker login -u gitlab-ci-token -p "$CI_BUILD_TOKEN" "$CI_REGISTRY" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" after_script: From 32e541533f9e3a2e5ac35a4e4b7fe883652e7b5e Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Sun, 28 May 2023 23:35:48 +0300 Subject: [PATCH 10/12] Small CI/CD cleanup --- .gitlab-ci.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c10752e..c439e02 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -86,9 +86,8 @@ publish:dev: only: - master script: - - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build . -t "$IMAGE_NAME":latest --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" --build-arg NEXT_PUBLIC_DEPLOY_ENV=development --build-arg NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api --build-arg NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker push "$IMAGE_NAME":latest publish:prod: @@ -99,9 +98,8 @@ publish:prod: only: - production script: - - docker info - - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker build . -t "$IMAGE_NAME":prod --build-arg SENTRY_AUTH_TOKEN="$SENTRY_AUTH_TOKEN" + - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker push "$IMAGE_NAME":prod deploy:dev: @@ -123,8 +121,6 @@ deploy:dev: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose-dev.yml "$SERVICE_NAME" - after_script: - - docker logout "$CI_REGISTRY" deploy:prod: stage: deploy @@ -145,5 +141,3 @@ deploy:prod: - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY script: - docker stack deploy --with-registry-auth -c stack-compose.yml "$SERVICE_NAME" - after_script: - - docker logout "$CI_REGISTRY" From 3ffe8a1e1740d62aecfe6c8e421cd827bdad65e1 Mon Sep 17 00:00:00 2001 From: Tommi S Date: Mon, 29 May 2023 00:23:53 +0300 Subject: [PATCH 11/12] Front page google calendar link added and corporate page text updated --- src/components/Feed/Events.tsx | 10 ++++++---- src/views/CorporatePage/CorporatePageView.tsx | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/components/Feed/Events.tsx b/src/components/Feed/Events.tsx index 690ee0e..a49b6e1 100644 --- a/src/components/Feed/Events.tsx +++ b/src/components/Feed/Events.tsx @@ -28,8 +28,8 @@ const Events: React.FC = ({ events, lang }) => { const pageLinkText = t("Kaikki tapahtumat"); const pageLinkDesc = `${t("löydät tapahtumakalenterista")}\xa0›`; - const gCalendarText = t("Lisää killan"); - const gCalendarDesc = `${t("Google-kalenteri")}\xa0›`; + const googleCalendarText = t("Lisää killan"); + const googleCalendarDesc = `${t("Google-kalenteri")}\xa0›`; const locale = isFi ? "fi-FI" : "en-GB"; @@ -65,8 +65,10 @@ const Events: React.FC = ({ events, lang }) => { {pageLinkText} - - {gCalendarText} + + {googleCalendarText} diff --git a/src/views/CorporatePage/CorporatePageView.tsx b/src/views/CorporatePage/CorporatePageView.tsx index 8b1d944..4fec540 100644 --- a/src/views/CorporatePage/CorporatePageView.tsx +++ b/src/views/CorporatePage/CorporatePageView.tsx @@ -65,7 +65,7 @@ const CorporatePageView: React.FC = ({ jobAds }) => (
Potentiaalin Tasaus

- Kiltamme viettää perinteikkäitä vuosijuhliaan helmikuun kolmantena lauantaina. + Kiltamme viettää perinteikästä vuosijuhlaansa helmikuun kolmantena lauantaina. Potentiaalin Tasaus on kiltamme juhlavin ja rakkain tapahtuma. Yrityksillä on mahdollisuus osallistua vuosijuhliin niin pienellä kuin suurellakin panoksella!

From 8bf38f512c35e890a37fe0d7ca284c3b5e1b02cc Mon Sep 17 00:00:00 2001 From: Tommi S Date: Mon, 29 May 2023 00:29:01 +0300 Subject: [PATCH 12/12] Add google calendar link to front page --- src/components/Feed/Events.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/Feed/Events.tsx b/src/components/Feed/Events.tsx index a49b6e1..ecba442 100644 --- a/src/components/Feed/Events.tsx +++ b/src/components/Feed/Events.tsx @@ -65,9 +65,7 @@ const Events: React.FC = ({ events, lang }) => { {pageLinkText} - + {googleCalendarText}