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 
Production deploy

See merge request sahkoinsinoorikilta/vtmk/web2.0-frontend!30
This commit is contained in:
Toni Lyttinen
2021-02-10 19:06:20 +00:00
parent 2b1e9c6a0b 932ff327d8
commit 830538d56e
12 changed files with 48 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/assets/json/board.json
+3 -3
View File
@@ -4,7 +4,7 @@
"roles": [
{
"name_fi": "Puheenjohtaja",
"name_en": "Chairman",
"name_en": "Chairman of the Board",
"representatives": [
{
"name": "Johannes Ora"
@@ -25,7 +25,7 @@
},
{
"name_fi": "Rahastonhoitaja",
"name_en": "",
"name_en": "Treasurer",
"representatives": [
{
"name": "Santeri Huhtala",
@@ -156,4 +156,4 @@
]
}
]
}
}
src/assets/json/hvtmk.json
+6 -6
View File
@@ -1,17 +1,17 @@
{
"name_fi": "Hyvinvointitoimikunta",
"name_en": "",
"name_en": "Committee of Wellbeing",
"roles": [
{
"name_fi": "Hyvinvointimestari",
"name_en": "",
"name_en": "Master of Wellbeing",
"representatives": [
{ "name": "Sauli Norja" }
]
},
{
"name_fi": "Kulttuurivastaava",
"name_en": "",
"name_en": "Culture Representative",
"representatives": [
{ "name": "Juha Anttila" },
{ "name": "Aino Suomi" },
@@ -20,7 +20,7 @@
},
{
"name_fi": "Liikuntavastaava",
"name_en": "",
"name_en": "Sports Representative",
"representatives": [
{ "name": "Elmeri Pälikkö" },
{ "name": "Joel Wickström" }
@@ -28,7 +28,7 @@
},
{
"name_fi": "Kiltahuonevastaava",
"name_en": "",
"name_en": "Guild Room Representative",
"representatives": [
{ "name": "Ilari Ojakorpi" }
]
@@ -52,4 +52,4 @@
]
}
]
}
}
src/assets/json/mtmk.json
+12 -12
View File
@@ -1,10 +1,10 @@
{
"name_fi": "Mediatoimikunta",
"name_en": "",
"name_en": "Media Committee",
"roles": [
{
"name_fi": "Puheenjohtaja",
"name_en": "",
"name_fi": "Puheenjohtaja, Päätoimittaja",
"name_en": "Chair, Editor in Chief",
"representatives": [
{
"name": "Sasu Saalasti",
@@ -16,14 +16,14 @@
},
{
"name_fi": "Mediamestari",
"name_en": "",
"name_en": "Master of Media",
"representatives": [
{ "name": "Salla Lyytikäinen" }
]
},
{
"name_fi": "Toimittaja",
"name_en": "",
"name_en": "Journalist",
"representatives": [
{ "name": "Tuukka Syrjänen" },
{ "name": "Ilmari Kasvi" },
@@ -40,14 +40,14 @@
},
{
"name_fi": "Toimittaja & Valokuvaaja",
"name_en": "",
"name_en": "Journalist & Photographer",
"representatives": [
{ "name": "Kiia Einola" }
]
},
{
"name_fi": "Taittaja",
"name_en": "",
"name_en": "Layout Artist",
"representatives": [
{ "name": "Aino Suomi" },
{ "name": "Olli Komulainen" },
@@ -56,14 +56,14 @@
},
{
"name_fi": "Taittaja & Valokuvaaja",
"name_en": "",
"name_en": "Layout Artist & Photographer",
"representatives": [
{ "name": "Jonna Tammikivi" }
]
},
{
"name_fi": "Valokuvaaja",
"name_en": "",
"name_en": "Photographer",
"representatives": [
{ "name": "Suvi Karanta" },
{ "name": "Mikko Haaparanta" },
@@ -72,7 +72,7 @@
},
{
"name_fi": "Valokuvaaja & Graafikko",
"name_en": "",
"name_en": "Photographer & Graphic Artist",
"representatives": [
{ "name": "Kalle Petäjäaho" },
{ "name": "Maria Pöllä" }
@@ -80,10 +80,10 @@
},
{
"name_fi": "Videokuvaaja",
"name_en": "",
"name_en": "Videographer",
"representatives": [
{ "name": "Aaro Rasilainen" }
]
}
]
}
}
src/assets/json/optmk.json
+4 -4
View File
@@ -1,17 +1,17 @@
{
"name_fi": "Opintotoimikunta",
"name_en": "",
"name_en": "Study Committee",
"roles": [
{
"name_fi": "Opintomestari",
"name_en": "",
"name_en": "Master of Studies",
"representatives": [
{ "name": "Simo Hakanummi" }
]
},
{
"name_fi": "Opintovastaava",
"name_en": "",
"name_en": "Study Coordinator",
"representatives": [
{ "name": "Miina-Maija Simonen" },
{ "name": "Tomi Valkonen" },
@@ -28,4 +28,4 @@
]
}
]
}
}
src/assets/json/otmk.json
+7 -4
View File
@@ -1,17 +1,17 @@
{
"name_fi": "Ohjelmatoimikunta",
"name_en": "",
"name_en": "Entertainment Committee",
"roles": [
{
"name_fi": "Hovimestari",
"name_en": "",
"name_en": "Master of Ceremonies",
"representatives": [
{ "name": "Eveliina Ahonen" }
]
},
{
"name_fi": "Hovineuvos",
"name_en": "",
"name_en": "Court Counsellor",
"representatives": [
{ "name": "Melisa Dönmez" }
]
@@ -44,7 +44,10 @@
{ "name": "Jami Hyytiäinen" },
{ "name": "Tuomas Pajunpää" },
{ "name": "Samuel Laine" },
{ "name": "Toni Miilunpalo" }
{ "name": "Toni Miilunpalo" },
{ "name": "Ville Kaakinen"},
{ "name": "Eero Torpo"},
{ "name": "Sauli Norja"}
]
},
{
src/assets/json/sstmk.json
+1 -1
View File
@@ -20,7 +20,7 @@
"name_fi": "Markkinointivastaava",
"name_en": "",
"representatives": [
{ "name": "Sasu Salasti" }
{ "name": "Sasu Saalasti" }
]
},
{
src/assets/json/utmk.json
+7 -7
View File
@@ -1,33 +1,33 @@
{
"name_fi": "Ulkotoimikunta",
"name_en": "",
"name_en": "External Affairs Committeee",
"roles": [
{
"name_fi": "Ulkomestari",
"name_en": "",
"name_en": "Master of External Affairs",
"representatives": [
{ "name": "Oliver Hiekkamies" }
]
},
{
"name_fi": "Kv-ISOvastaava",
"name_en": "",
"name_en": "International Tutor Coordinator",
"representatives": [
{ "name": "Elias Hirvonen" }
]
},
{
"name_fi": "International Helper",
"name_en": "",
"name_en": "International Helper",
"representatives": [
{ "name": "Ville-Pekka Laakkonen" }
]
},
{
"name_fi": "Ulkosuhdevastaava",
"name_en": "",
"name_en": "Apprentice of External Affairs",
"representatives": [
{ "name": "Leo Muller" },
{ "name": "Leo Müller" },
{ "name": "Eino Tyrvänen" },
{ "name": "Pekka Aho" }
]
@@ -40,4 +40,4 @@
]
}
]
}
}
src/assets/json/ytmk.json
+5 -5
View File
@@ -1,24 +1,24 @@
{
"name_fi": "Yrityssuhdetoimikunta",
"name_en": "",
"name_en": "Corporate Relations Committee",
"roles": [
{
"name_fi": "Yrityssuhdemestari",
"name_en": "",
"name_en": "Master of Corporate Relations",
"representatives": [
{ "name": "Otto Julkunen" }
]
},
{
"name_fi": "Excursiopäävastaava",
"name_en": "",
"name_en": "Head of Excursions",
"representatives": [
{ "name": "Henry Gustafsson" }
]
},
{
"name_fi": "Yrityssuhdevastaava",
"name_en": "",
"name_en": "Apprentice of Corporate Relations",
"representatives": [
{ "name": "Iikka Huttu" },
{ "name": "Arkadii Kolchin" },
@@ -30,4 +30,4 @@
]
}
]
}
}
src/pages/kilta/fOpas_20.pdf
BIN
View File
Binary file not shown.
src/theme/breakpoints.ts
+1 -3
View File
@@ -7,8 +7,6 @@ const breakpointsNumber: Record<Keys, number> = {
xlarge: 2560,
};
const breakpoints = Object.fromEntries(
Object.entries(breakpointsNumber).map(([k, v]) => [k, `${v}px`]),
);
const breakpoints = Object.entries(breakpointsNumber).map(([k, v]) => [k, `${v}px`]).reduce((a, [k, v]) => ({ ...a, [k]: v }), {});
export default breakpoints as Record<Keys, string>;
src/views/FreshmenPage/FreshmenPageHero.tsx
+1 -1
View File
@@ -18,7 +18,7 @@ const FreshmenPageHero: React.FC = () => (
/>
<HeroAsideItem
header="Kohti lakkia"
link="fOpas_20.pdf"
link="https://static.sahkoinsinoorikilta.fi/FTMK/fopas_compressed.pdf"
linkText="Lue fuksiopas"
/>
<HeroAsideItem
tsconfig.json
+1 -1
View File
@@ -14,7 +14,7 @@
"resolveJsonModule": true,
"isolatedModules": true,
"module": "commonjs",
"target": "es5",
"target": "esnext",
"jsx": "preserve",
"lib": ["dom", "DOM.Iterable", "ESNext"],
"typeRoots": [