Skip to content

Commit 5f45392

Browse files
committed
A few small updates, populating links, minor style tweaks, fixing a typo here or there.
1 parent 132e9dd commit 5f45392

File tree

4 files changed

+102
-36
lines changed

4 files changed

+102
-36
lines changed

hooks/translations.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@
8989
"sv": "Trakasserianmälan\t"
9090
},
9191
"homepage:heroSectionText": {
92-
"fi": "Ystävia, tapahtumia ja koti kampissa",
92+
"fi": "Ystäviä, tapahtumia ja koti kampissa",
9393
"en": "Friends, events and a home in Kamppi",
9494
"sv": "Vänner, evengemang och hem i kampen"
9595
},
@@ -189,7 +189,7 @@
189189
},
190190
"nav:home": { "fi": "Etusivu", "en": "Home", "sv": "Framsida" },
191191
"nav:karhunkierros": {
192-
"fi": "Karhunkierros Lehti",
192+
"fi": "Osakuntalehti Karhunkierros",
193193
"en": "Karhunkierros Magazine",
194194
"sv": "Karhunkierros Tidningen"
195195
},

pages/nation-info.tsx

+6-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { Button } from "@mui/material";
77
import { GetStaticProps } from "next";
88
import Head from "next/head";
99
import Image from "next/image";
10-
import arrowWhite from "../public/arrow_forward_white.svg";
10+
import Link from "next/link";
1111
import Placeholder from "../public/Placeholder_1.png";
1212

1313
export const getStaticProps: GetStaticProps<NationInfoPageProps> = async () => {
@@ -55,10 +55,11 @@ export default function NationInfo({ navBar }: NationInfoPageProps) {
5555
<h2 className={styles.h2}>{t("nationInfo:whatWeDoTitle")}</h2>
5656
<p>{t("nationInfo:whatWeDoDescription")}</p>
5757
<br />
58-
<Button variant="contained" className="button darkBlue">
59-
Tapahtumakalenteri
60-
<Image src={arrowWhite} alt="arrow forward" />
61-
</Button>
58+
<Link href="/calendar">
59+
<Button variant="contained" className="button darkBlue">
60+
Tapahtumakalenteri
61+
</Button>
62+
</Link>
6263
</span>
6364
<div className={styles.imageContainer}>
6465
<Image

pages/official-documents.tsx

+93-28
Original file line numberDiff line numberDiff line change
@@ -58,98 +58,163 @@ export default function OfficialDocuments({
5858
{t("officialDocuments:rules")}
5959
</ListSubheader>
6060
<ListItem>
61-
<a href="" className={styles.documentLink}>
61+
<Link
62+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/saannot-2011.pdf"
63+
target="_blank"
64+
rel="noopener noreferrer"
65+
className={styles.documentLink}
66+
>
6267
{t("officialDocuments:rules")}2011
63-
</a>
68+
</Link>
6469
</ListItem>
6570
<ListSubheader className={styles.listSubheading}>
6671
{t("officialDocuments:oldRules")}
6772
</ListSubheader>
6873
<ListItem>
69-
<a href="" className={styles.documentLink}>
74+
<Link
75+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/saannot-2007.pdf"
76+
target="_blank"
77+
rel="noopener noreferrer"
78+
className={styles.documentLink}
79+
>
7080
{t("officialDocuments:rules")} 2007
71-
</a>
81+
</Link>
7282
</ListItem>
7383
<ListItem>
74-
<a href="" className={styles.documentLink}>
84+
<Link
85+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/saannot-2004.pdf"
86+
target="_blank"
87+
rel="noopener noreferrer"
88+
className={styles.documentLink}
89+
>
7590
{t("officialDocuments:rules")} 2004
76-
</a>
91+
</Link>
7792
</ListItem>
7893
<ListItem>
79-
<a href="" className={styles.documentLink}>
94+
<Link
95+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/osakuntatalon-aikaiset-saannot.pdf"
96+
target="_blank"
97+
rel="noopener noreferrer"
98+
className={styles.documentLink}
99+
>
80100
{t("officialDocuments:foundingRules")}
81-
</a>
101+
</Link>
82102
</ListItem>
83103
</List>
84104
<List className={styles.documentList}>
85105
<ListSubheader className={styles.listSubheading}>
86106
{t("officialDocuments:regulations")}
87107
</ListSubheader>
88108
<ListItem>
89-
<a href="" className={styles.documentLink}>
109+
<Link
110+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2020.pdf"
111+
target="_blank"
112+
rel="noopener noreferrer"
113+
className={styles.documentLink}
114+
>
90115
{t("officialDocuments:regulations")} 2020
91-
</a>
116+
</Link>
92117
</ListItem>
93118
<ListSubheader className={styles.listSubheading}>
94119
{t("officialDocuments:oldRegulations")}
95120
</ListSubheader>
96121
<ListItem>
97-
<a href="" className={styles.documentLink}>
122+
<Link
123+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2019.pdf"
124+
target="_blank"
125+
rel="noopener noreferrer"
126+
className={styles.documentLink}
127+
>
98128
{t("officialDocuments:regulations")} 2019
99-
</a>
129+
</Link>
100130
</ListItem>
101131
<ListItem>
102-
<a href="" className={styles.documentLink}>
132+
<Link
133+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2017.pdf"
134+
target="_blank"
135+
rel="noopener noreferrer"
136+
className={styles.documentLink}
137+
>
103138
{t("officialDocuments:regulations")} 2017
104-
</a>
139+
</Link>
105140
</ListItem>
106141
<ListItem>
107-
<a href="" className={styles.documentLink}>
142+
<Link
143+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2016.pdf"
144+
target="_blank"
145+
rel="noopener noreferrer"
146+
className={styles.documentLink}
147+
>
108148
{t("officialDocuments:regulations")} 2016
109-
</a>
149+
</Link>
110150
</ListItem>
111151
<ListItem>
112-
<a href="" className={styles.documentLink}>
152+
<Link
153+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2011.pdf"
154+
target="_blank"
155+
rel="noopener noreferrer"
156+
className={styles.documentLink}
157+
>
113158
{t("officialDocuments:regulations")} 2011
114-
</a>
159+
</Link>
115160
</ListItem>
116161
</List>
117162
<List className={styles.documentList}>
118163
<ListSubheader className={styles.listSubheading}>
119164
{t("officialDocuments:otherDocuments")}
120165
</ListSubheader>
121166
<ListItem>
122-
<a href="" className={styles.documentLink}>
167+
<Link
168+
href="https://docs.google.com/document/d/1D94Hq5XUv9kuaMXqhn_thZ9vZ7pAF-pdJbfBQY-1MU4/view"
169+
target="_blank"
170+
rel="noopener noreferrer"
171+
className={styles.documentLink}
172+
>
123173
{t("officialDocuments:equalityPlan")}
124-
</a>
174+
</Link>
125175
</ListItem>
126176
<ListItem>
127-
<a href="" className={styles.documentLink}>
177+
<Link
178+
href="https://drive.google.com/file/d/1v5dg71ixbbA42C_50K9QkhX_6uJrEuKb/view"
179+
target="_blank"
180+
rel="noopener noreferrer"
181+
className={styles.documentLink}
182+
>
128183
{t("officialDocuments:safeSpace")}
129-
</a>
184+
</Link>
130185
</ListItem>
131186
<ListItem>
132-
<a href="" className={styles.documentLink}>
187+
<Link
188+
href="https://drive.google.com/file/d/1rFmPPeN6MXN4wLsD9hNqloqrIrybk7FE/view"
189+
target="_blank"
190+
rel="noopener noreferrer"
191+
className={styles.documentLink}
192+
>
133193
{t("officialDocuments:environment")}
134-
</a>
194+
</Link>
135195
</ListItem>
136196
<ListSubheader className={styles.listSubheading}>
137197
{t("officialDocuments:dormitoryTitle")}
138198
</ListSubheader>
139199
<ListItem>
140-
<a href="" className={styles.documentLink}>
200+
<Link
201+
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/saatio/asuntoloiden-ohjesaanto.pdf"
202+
target="_blank"
203+
rel="noopener noreferrer"
204+
className={styles.documentLink}
205+
>
141206
{t("officialDocuments:dormitoryText")}
142-
</a>
207+
</Link>
143208
</ListItem>
144209
</List>
145210
</section>
146211
<section className={styles.externalRef}>
147212
<p className={styles.archiveRedirect}>
148213
Looking for the Satakunta series or Maila Talvio&apos;s collected
149-
works? You can now find them on the
214+
works? You can now find them on the{" "}
150215
<Link href="/archive" className={styles.documentLink}>
151216
Archive
152-
</Link>
217+
</Link>{" "}
153218
page!
154219
</p>
155220
</section>

styles/official-documents.module.css

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
.documentLink {
2525
text-decoration: none;
2626
font-size: 1.2rem;
27-
width: 11rem;
27+
width: 12rem;
2828
text-wrap: wrap;
2929
font-family: "Raleway", sans-serif;
3030
}

0 commit comments

Comments
 (0)