TTMK/web2.0-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 'production'

Browse Source 
Merge branch 'master' into 'production'

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!96
This commit is contained in:
Ilari Ojakorpi
2022-01-31 21:38:25 +00:00
parent 4449003cc8 0b810e04d0
commit bb3b9cb27f
19 changed files with 437 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.env.development
-4
View File
@@ -1,4 +0,0 @@
NEXT_PUBLIC_DEPLOY_ENV=development
NEXT_PUBLIC_SENTRY_DSN=https://3ad96a8fb4ee46dab4a913049e2a8b38@o1039142.ingest.sentry.io/6007885
NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api
NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi
.env.local.example
+3
View File
@@ -0,0 +1,3 @@
NEXT_PUBLIC_DEPLOY_ENV=local
NEXT_PUBLIC_API_URL=https://api.dev.sahkoinsinoorikilta.fi/api
NEXT_PUBLIC_SITE_URL=https://dev.sahkoinsinoorikilta.fi
.env.prod
-4
View File
@@ -1,4 +0,0 @@
NEXT_PUBLIC_DEPLOY_ENV=production
NEXT_PUBLIC_SENTRY_DSN=https://3ad96a8fb4ee46dab4a913049e2a8b38@o1039142.ingest.sentry.io/6007885
NEXT_PUBLIC_API_URL=https://api.sahkoinsinoorikilta.fi/api
NEXT_PUBLIC_SITE_URL=https://sahkoinsinoorikilta.fi
README.md
+3 -2
View File
@@ -4,14 +4,15 @@ This is a [Next.js](https://nextjs.org/) project bootstrapped with [`create-next
* **[React](https://facebook.github.io/react/)** (17.x)
* **[Typescript](https://www.typescriptlang.org/)** (4.x)
* **[Next.js](https://nextjs.org/)** (10.x)
* **[Next.js](https://nextjs.org/)** (12.x)
* [Testcafe](https://devexpress.github.io/testcafe/) - E2E Testing framework
## Installation
1. Clone/download repo
2. Install node v16 ([`nvm`](https://github.com/nvm-sh/nvm))
3. `npm install`
3. `cp .env.local.example .env.local`
4. `npm install`
## Getting Started
src/views/ContactsPage/ContactsPageView.tsx
+26 -20
View File
@@ -5,29 +5,35 @@ import colors from "@theme/colors";
import ContactCard from "@components/ContactCard";
import BoardJson from "./board.json";
// import HvtmkJson from "./hvtmk.json";
// import MtmkJson from "./mtmk.json";
// import OptmkJson from "./optmk.json";
// import OtmkJson from "./otmk.json";
// import EPtmkJson from "./eptmk.json";
// import SstmkJson from "./sstmk.json";
// import TtmkJson from "./ttmk.json";
// import UtmkJson from "./utmk.json";
// import YtmkJson from "./ytmk.json";
// import Others from "./others.json";
import HvtmkJson from "./hvtmk.json";
import MtmkJson from "./mtmk.json";
import NtmkJson from "./ntmk.json";
import OptmkJson from "./optmk.json";
import OtmkJson from "./otmk.json";
import EPtmkJson from "./eptmk.json";
import SstmkJson from "./sstmk.json";
import ShntmkJson from "./shntmk.json";
import ShtmkJson from "./shtmk.json";
import TtmkJson from "./ttmk.json";
import UtmkJson from "./utmk.json";
import YtmkJson from "./ytmk.json";
import Others from "./others.json";
const orderedCommittees = [
BoardJson,
// HvtmkJson,
// MtmkJson,
// OptmkJson,
// OtmkJson,
// EPtmkJson,
// SstmkJson,
// TtmkJson,
// UtmkJson,
// YtmkJson,
// Others,
HvtmkJson,
MtmkJson,
NtmkJson,
OptmkJson,
OtmkJson,
EPtmkJson,
SstmkJson,
ShntmkJson,
ShtmkJson,
TtmkJson,
UtmkJson,
YtmkJson,
Others,
];
const blankProfile = "/img/blank_profile.png";
src/views/ContactsPage/eptmk.json
+14 -14
View File
@@ -3,6 +3,15 @@
"name_fi": "Elepajatoimikunta",
"name_en": "",
"roles": [
{
"name_fi": "Pajapäävastaava",
"name_en": "",
"representatives": [
{
"name": "Oskari Ponkala"
}
]
},
{
"name_fi": "Pajavastaava",
"name_en": "",
@@ -16,35 +25,26 @@
"name_fi": "Pajakisälli",
"name_en": "",
"representatives": [
{
"name": "Tommi Sytelä"
},
{
"name": "Eerikki Eskola"
},
{
"name": "Arkadii Kolchin"
},
{
"name": "Samu Nyman"
},
{
"name": "Konsta Langi"
"name": "Veikko Räty"
},
{
"name": "Johannes Viirimäki"
"name": "Ville Lairila"
},
{
"name": "Justus Ojala"
},
{
"name": "Ville Tujunen"
"name": "Tommi Sytelä"
},
{
"name": "Antti Tarkka"
"name": "Visa Kurvi"
},
{
"name": "Pyry Vaara"
"name": "Petrus Asikainen"
}
]
}
src/views/ContactsPage/hvtmk.json
+16 -16
View File
@@ -8,7 +8,7 @@
"name_en": "Master of Wellbeing",
"representatives": [
{
"name": "Sauli Norja"
"name": "Sofia Öhman"
}
]
},
@@ -20,10 +20,10 @@
"name": "Juha Anttila"
},
{
"name": "Aino Suomi"
"name": "Aleksi Helin"
},
{
"name": "Nestori Yrjönkoski"
"name": "Julia Pykälä-aho"
}
]
},
@@ -32,10 +32,16 @@
"name_en": "Sports Representative",
"representatives": [
{
"name": "Elmeri Pälikkö"
"name": "Aaro Niskanen"
},
{
"name": "Joel Wickström"
"name": "Sauli Norja"
},
{
"name": "Viola Palolahti"
},
{
"name": "Eero Tihtonen"
}
]
},
@@ -44,7 +50,7 @@
"name_en": "Guild Room Representative",
"representatives": [
{
"name": "Ilari Ojakorpi"
"name": "Patrick Linnanen"
}
]
},
@@ -53,7 +59,7 @@
"name_en": "",
"representatives": [
{
"name": "Samuel Laine"
"name": "Samu Nyman"
},
{
"name": "Aleksanteri Vesala"
@@ -61,20 +67,14 @@
]
},
{
"name_fi": "Retkivastaava",
"name_fi": "Retkeilyvastaava",
"name_en": "",
"representatives": [
{
"name": "Jarno Mustonen"
"name": "Vilhelmiina Honkanen"
},
{
"name": "Suvi Karanta"
},
{
"name": "Jesse Räisänen"
},
{
"name": "Mikko Suhonen"
"name": "Pinja Leppänen"
}
]
}
src/views/ContactsPage/mtmk.json
+33 -49
View File
@@ -1,6 +1,6 @@
{
"slug": "mtmk",
"name_fi": "Mediatoimikunta",
"name_fi": "Sössö-toimikunta",
"name_en": "Media Committee",
"roles": [
{
@@ -8,55 +8,34 @@
"name_en": "Chair, Editor in Chief",
"representatives": [
{
"name": "Sasu Saalasti",
"name": "Aino Suomi",
"phone_number": null,
"email": null,
"image": null
}
]
},
{
"name_fi": "Mediamestari",
"name_en": "Master of Media",
"representatives": [
{
"name": "Salla Lyytikäinen"
}
]
},
{
"name_fi": "Toimittaja",
"name_en": "Journalist",
"representatives": [
{
"name": "Tuukka Syrjänen"
},
{
"name": "Ilmari Kasvi"
"name": "Emmaleena Ahonen"
},
{
"name": "Elias Hirvonen"
},
{
"name": "Miika Koskela"
"name": "Ville Lairila"
},
{
"name": "Taneli Myllykangas"
"name": "Olli Komulainen"
},
{
"name": "Emmaleena Ahonen"
"name": "Pinja Salo"
},
{
"name": "Ville-Pekka Laakkonen"
},
{
"name": "Sofia Öhman"
},
{
"name": "Nestori Yrjönkoski"
},
{
"name": "Jami Hyytiäinen"
"name": "Tuukka Syrjänen"
},
{
"name": "Aleksanteri Vesala"
@@ -68,22 +47,7 @@
"name_en": "Journalist & Photographer",
"representatives": [
{
"name": "Kiia Einola"
}
]
},
{
"name_fi": "Taittaja",
"name_en": "Layout Artist",
"representatives": [
{
"name": "Aino Suomi"
},
{
"name": "Olli Komulainen"
},
{
"name": "Emilia Kortelainen"
"name": "Jarno Mustonen"
}
]
},
@@ -93,6 +57,19 @@
"representatives": [
{
"name": "Jonna Tammikivi"
},
{
"name": "Sasu Saalasti"
}
]
},
{
"name_fi": "Taittaja & Toimittaja",
"name_en": "Layout Artist & Journalist",
"representatives": [
{
"name": "Juuli Leppänen"
}
]
},
@@ -101,14 +78,15 @@
"name_en": "Photographer",
"representatives": [
{
"name": "Suvi Karanta"
"name": "Toni Lyttinen"
},
{
"name": "Mikko Haaparanta"
"name": "Sauli Norja"
},
{
"name": "Johannes Viirimäki"
"name": "Rasmus Räsänen"
}
]
},
{
@@ -117,9 +95,15 @@
"representatives": [
{
"name": "Kalle Petäjäaho"
},
}
]
},
{
"name_fi": "Graafikko",
"name_en": "Photographer & Graphic Artist",
"representatives": [
{
"name": "Maria Pöllä"
"name": "Otto Julkunen"
}
]
},
src/views/ContactsPage/ntmk.json
+82
View File
@@ -0,0 +1,82 @@
{
"slug": "ntmk",
"name_fi": "N-Toimikunta",
"name_en": "",
"roles": [
{
"name_fi": "N-toimikunnan puheenjohtaja",
"name_en": "",
"representatives": [
{
"name": "Ville Kaakinen"
}
]
},
{
"name_fi": "N-toimikunnan varapuheenjohtaja",
"name_en": "",
"representatives": [
{
"name": "Jami Hyytiäinen"
}
]
},
{
"name_fi": "Sklubi-yhdyshenkilö",
"name_en": "",
"representatives": [
{
"name": "Ville-Pekka Laakkonen"
}
]
},
{
"name_fi": "Alumivastaava",
"name_en": "",
"representatives": [
{
"name": "Ella Eilola"
}
]
},
{
"name_fi": "N-Toimihenkilö",
"name_en": "",
"representatives": [
{
"name": "Timi Tiira"
},
{
"name": "Erna Virtanen"
},
{
"name": "Emmaleena Ahonen"
},
{
"name": "Jarno Mustonen"
},
{
"name": "Pekka Aho"
},
{
"name": "Mikko Haapamäki"
},
{
"name": "Jonna Tammikivi"
},
{
"name": "Juuli Leppänen"
},
{
"name": "Simo Hakanummi"
},
{
"name": "Tuomo Leino"
},
{
"name": "Sasu Saalasti"
}
]
}
]
}
src/views/ContactsPage/optmk.json
+24 -8
View File
@@ -8,7 +8,7 @@
"name_en": "Master of Studies",
"representatives": [
{
"name": "Simo Hakanummi"
"name": "Iikka Huttu"
}
]
},
@@ -17,30 +17,46 @@
"name_en": "Study Coordinator",
"representatives": [
{
"name": "Miina-Maija Simonen"
"name": "Juulia Härkönen"
},
{
"name": "Tomi Valkonen"
"name": "Patrick Linnanen"
},
{
"name": "Leo Lahti"
"name": "Veeti Lahtinen"
},
{
"name": "Ville-Pekka Laakkonen"
"name": "Pinja Leppänen"
},
{
"name": "Samu Nyman"
"name": "Mikko Sandström"
}
]
},
{
"name_fi": "Abimarkkinointi Vastaava",
"name_fi": "Abimarkkinointipäävastaava",
"name_en": "",
"representatives": [
{
"name": "Iikka Huttu"
"name": "Vilhelmiina Honkanen"
}
]
},
{
"name_fi": "Abimarkkinointivastaava",
"name_en": "",
"representatives": [
{
"name": "Liisa Haltia"
},
{
"name": "Jenni Marttinen"
},
{
"name": "Venla Vastamäki"
}
]
}
]
}
src/views/ContactsPage/others.json
+41 -15
View File
@@ -8,7 +8,7 @@
"name_en": "Guild elder",
"representatives": [
{
"name": "Erna Virtanen",
"name": "Toni Lyttinen",
"phone_number": null,
"email": null
},
@@ -16,6 +16,16 @@
"name": "Emmaleena Ahonen",
"phone_number": null,
"email": null
},
{
"name": "Johannes Ora",
"phone_number": null,
"email": null
},
{
"name": "Antti Mäki",
"phone_number": null,
"email": null
}
]
},
@@ -24,18 +34,7 @@
"name_en": "TEK contact person",
"representatives": [
{
"name": "Mikael Liimatainen",
"phone_number": null,
"email": null
}
]
},
{
"name_fi": "Sklubi-yhdyshenkilö",
"name_en": "Sklubi contact person",
"representatives": [
{
"name": "Ella Eilola",
"name": "Oskari Ponkala",
"phone_number": null,
"email": null
}
@@ -46,12 +45,39 @@
"name_en": "Archivist",
"representatives": [
{
"name": "Antti Mäki",
"name": "Timi Tiira",
"phone_number": null,
"email": null
}
]
},
{
"name_fi": "Häirintäyhdydyshenkilö",
"name_en": "",
"representatives": [
{
"name": "Toni Ojala",
"phone_number": null,
"email": null
},
{
"name": "Jonna Tammikivi",
"name": "Aino Suomi",
"phone_number": null,
"email": null
},
{
"name": "Sauli Norja",
"phone_number": null,
"email": null
}
]
},
{
"name_fi": "Somevastaava",
"name_en": "",
"representatives": [
{
"name": "Aaron Löfgren",
"phone_number": null,
"email": null
}
src/views/ContactsPage/otmk.json
+30 -39
View File
@@ -8,7 +8,7 @@
"name_en": "Master of Ceremonies",
"representatives": [
{
"name": "Eveliina Ahonen"
"name": "Sakke Kangas"
}
]
},
@@ -17,43 +17,40 @@
"name_en": "Court Counsellor",
"representatives": [
{
"name": "Melisa Dönmez"
"name": "Eero Ketonen"
}
]
},
{
"name_fi": "Emäntä",
"name_en": "",
"name_en": "Hostess",
"representatives": [
{
"name": "Oona Karjalainen"
},
{
"name": "Emilia Kortelainen"
},
{
"name": "Venla Vastamäki"
"name": "Elina Huttunen"
}
]
},
{
"name_fi": "Isäntä",
"name_en": "",
"name_en": "Host",
"representatives": [
{
"name": "Henry Jaakkola"
"name": "Aleksi Saajakari"
},
{
"name": "Sakke Kangas"
"name": "Aaron Löfgren"
},
{
"name": "Otto Torkkeli"
"name": "Verneri Turkki"
},
{
"name": "Tommi Oinonen"
"name": "Elias Lindberg"
},
{
"name": "Eero Ketonen"
"name": "Roni Vallius"
},
{
"name": "Elias Damski"
}
]
},
@@ -62,28 +59,22 @@
"name_en": "",
"representatives": [
{
"name": "Tuomo Leino"
},
{
"name": "Jami Hyytiäinen"
},
{
"name": "Tuomas Pajunpää"
},
{
"name": "Samuel Laine"
},
{
"name": "Toni Miilunpalo"
},
{
"name": "Ville Kaakinen"
"name": "Sakari Harjunpää"
},
{
"name": "Eero Torpo"
},
{
"name": "Sauli Norja"
"name": "Niilo Ojala"
},
{
"name": "Samuel Laine"
},
{
"name": "Toni Ojala"
},
{
"name": "Ville Kaakinen"
}
]
},
@@ -92,22 +83,22 @@
"name_en": "",
"representatives": [
{
"name": "Jesse Räisänen"
"name": "Oona Karjalainen"
},
{
"name": "Eino Laakso"
"name": "Peter Lindahl"
},
{
"name": "Sakari Harjunpää"
"name": "Aino Suomi"
},
{
"name": "Niilo Ojala"
"name": "Sauli Norja"
},
{
"name": "Iikka Huttu"
"name": "Venla Vastamäki"
},
{
"name": "Akseli Järvinen"
"name": "Kasper Skog"
}
]
}
src/views/ContactsPage/shntmk.json
+37
View File
@@ -0,0 +1,37 @@
{
"slug": "shntmk",
"name_fi": "SIK100-historianäyttelytiimi",
"name_en": "",
"roles": [
{
"name_fi": "SIK100-historianäyttelyvastaava",
"name_en": "",
"representatives": [
{
"name": "Timi Tiira"
}
]
},
{
"name_fi": "Yrityssuhdevastaava",
"name_en": "",
"representatives": [
{
"name": "Ella Eilola"
},
{
"name": "Taneli Myllykangas"
},
{
"name": "Jesse Räisänen"
},
{
"name": "Ville Kaakinen"
},
{
"name": "Ville-Pekka Laakkonen"
}
]
}
]
}
src/views/ContactsPage/shtmk.json
+34
View File
@@ -0,0 +1,34 @@
{
"slug": "shntmk",
"name_fi": "SIK100-historiatoimikunta",
"name_en": "",
"roles": [
{
"name_fi": "SIK100-historiatoimikunnan puheenjohtaja",
"name_en": "",
"representatives": [
{
"name": "Joni Kurvinen"
}
]
},
{
"name_fi": "SIK100-historiatoimihenkilö",
"name_en": "",
"representatives": [
{
"name": "Anni Parkkila"
},
{
"name": "Erna Virtanen"
},
{
"name": "Tommi Askola"
},
{
"name": "Mikko Leino"
}
]
}
]
}
src/views/ContactsPage/sstmk.json
+1 -1
View File
@@ -70,7 +70,7 @@
]
},
{
"name_fi": "PoTa100-jatkokuvernööri",
"name_fi": "PoTa100-jatkotirehtööri",
"name_en": "",
"representatives": [
{
src/views/ContactsPage/ttmk.json
+27 -33
View File
@@ -5,49 +5,43 @@
"roles": [
{
"name_fi": "Teknologiamestari",
"name_en": "",
"representatives": [
{
"name": "Oskari Ponkala"
}
]
},
{
"name_fi": "Tekniikkavastaava",
"name_en": "",
"representatives": [
{
"name": "Antti Mäki"
}
]
},
{
"name_fi": "Web-Kisälli",
"name_en": "",
"name_en": "Master of technology",
"representatives": [
{
"name": "Ilari Ojakorpi"
},
}
]
},
{
"name_fi": "Teknologianeuvos",
"name_en": "Technology Advisor",
"representatives": [
{
"name": "Leo Lahti"
},
{
"name": "Jyri Korhonen"
},
{
"name": "Tuukka Syrjänen"
},
{
"name": "Emmaleena Ahonen"
},
{
"name": "Mikko Suhonen"
"name": "Aarni Halinen"
},
{
"name": "Jaakko Koskela"
},
{
"name": "Toni Lyttinen"
}
]
},
{
"name_fi": "Teknologiakisälli",
"name_en": "",
"representatives": [
{
"name": "Elmo Kankkunen"
},
{
"name": "Antti Eronen"
},
{
"name": "Justus Ojala"
},
{
"name": "Lasse Ruokokoski"
}
]
}
src/views/ContactsPage/utmk.json
+38 -7
View File
@@ -8,7 +8,16 @@
"name_en": "Master of External Affairs",
"representatives": [
{
"name": "Oliver Hiekkamies"
"name": "Heidi Mäkitalo"
}
]
},
{
"name_fi": "Kv-Fuksikapteeni",
"name_en": "",
"representatives": [
{
"name": "Suvi Karanta"
}
]
},
@@ -17,7 +26,7 @@
"name_en": "International Tutor Coordinator",
"representatives": [
{
"name": "Elias Hirvonen"
"name": "Pyry Vaara"
}
]
},
@@ -26,7 +35,17 @@
"name_en": "International Helper",
"representatives": [
{
"name": "Ville-Pekka Laakkonen"
"name": "Aaro Niskanen"
},
{
"name": "Eerik Eskola"
}
,
{
"name": "Oona Karjalainen"
},
{
"name": "Aleksi Helin"
}
]
},
@@ -35,22 +54,34 @@
"name_en": "Apprentice of External Affairs",
"representatives": [
{
"name": "Leo Müller"
"name": "Nestori Yrjönkoski"
},
{
"name": "Johannes Ora"
},
{
"name": "Eino Tyrvänen"
},
{
"name": "Pekka Aho"
"name": "Jenni Marttinen"
}
]
},
{
"name_fi": "Ulkowanhus",
"name_fi": "Ulkowanhus & Ulkopatruuna",
"name_en": "",
"representatives": [
{
"name": "Jyri Korhonen"
"name": "Oliver Hiekkamies"
}
]
},
{
"name_fi": "KVummisetä",
"name_en": "",
"representatives": [
{
"name": "Elias Hirvonen"
}
]
}
src/views/ContactsPage/ytmk.json
+15 -12
View File
@@ -8,7 +8,7 @@
"name_en": "Master of Corporate Relations",
"representatives": [
{
"name": "Otto Julkunen"
"name": "Tommi Oinonen"
}
]
},
@@ -21,30 +21,33 @@
}
]
},
{
"name_fi": "Excursiovastaava",
"name_en": "",
"representatives": [
{
"name": "Visa Kurvi"
}
]
},
{
"name_fi": "Yrityssuhdevastaava",
"name_en": "Apprentice of Corporate Relations",
"representatives": [
{
"name": "Iikka Huttu"
},
{
"name": "Arkadii Kolchin"
},
{
"name": "Oskari Luukkonen"
},
{
"name": "Niilo Ojala"
"name": "Melina Sundell"
},
{
"name": "Emma Reinikainen"
},
{
"name": "Melina Sundell"
"name": "Iida Luoma"
},
{
"name": "Elma Tuohimetsä"
},
{
"name": "Nestori Yrjönkoski"
}
]
}
src/views/HonoraryPage/HonoraryPageView.tsx
+13
View File
@@ -530,6 +530,19 @@ const HonoraryPageView: React.FC = () => (
<li>2020 Tuomas Lampinen</li>
<li>2020 Toni Ojala</li>
</ul>
<ul>
<li>2021 Elma Tuohimetsä</li>
<li>2021 Emmaleena Ahonen</li>
<li>2021 Jonna Tammikivi</li>
<li>2021 Samuel Laine</li>
<li>2021 Ilari Ojakorpi</li>
<li>2021 Jyri Korhonen</li>
<li>2021 Oskari Luostarinen</li>
<li>2021 Mikko Suhonen</li>
<li>2021 Jesse Räisänen</li>
<li>2021 Sofia Öhman</li>
<li>2021 Suvi Karanta</li>
</ul>
</div>
</TextSection>
</>