Skip to content

Commit

Permalink
A few small updates, populating links, minor style tweaks, fixing a t…
Browse files Browse the repository at this point in the history
…ypo here or there.
  • Loading branch information
YB-BigSwan committed Sep 25, 2024
1 parent 132e9dd commit 5f45392
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 36 deletions.
4 changes: 2 additions & 2 deletions hooks/translations.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"sv": "Trakasserianmälan\t"
},
"homepage:heroSectionText": {
"fi": "Ystävia, tapahtumia ja koti kampissa",
"fi": "Ystäviä, tapahtumia ja koti kampissa",
"en": "Friends, events and a home in Kamppi",
"sv": "Vänner, evengemang och hem i kampen"
},
Expand Down Expand Up @@ -189,7 +189,7 @@
},
"nav:home": { "fi": "Etusivu", "en": "Home", "sv": "Framsida" },
"nav:karhunkierros": {
"fi": "Karhunkierros Lehti",
"fi": "Osakuntalehti Karhunkierros",
"en": "Karhunkierros Magazine",
"sv": "Karhunkierros Tidningen"
},
Expand Down
11 changes: 6 additions & 5 deletions pages/nation-info.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import { Button } from "@mui/material";
import { GetStaticProps } from "next";
import Head from "next/head";
import Image from "next/image";
import arrowWhite from "../public/arrow_forward_white.svg";
import Link from "next/link";
import Placeholder from "../public/Placeholder_1.png";

export const getStaticProps: GetStaticProps<NationInfoPageProps> = async () => {
Expand Down Expand Up @@ -55,10 +55,11 @@ export default function NationInfo({ navBar }: NationInfoPageProps) {
<h2 className={styles.h2}>{t("nationInfo:whatWeDoTitle")}</h2>
<p>{t("nationInfo:whatWeDoDescription")}</p>
<br />
<Button variant="contained" className="button darkBlue">
Tapahtumakalenteri
<Image src={arrowWhite} alt="arrow forward" />
</Button>
<Link href="/calendar">
<Button variant="contained" className="button darkBlue">
Tapahtumakalenteri
</Button>
</Link>
</span>
<div className={styles.imageContainer}>
<Image
Expand Down
121 changes: 93 additions & 28 deletions pages/official-documents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -58,98 +58,163 @@ export default function OfficialDocuments({
{t("officialDocuments:rules")}
</ListSubheader>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/saannot-2011.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:rules")}2011
</a>
</Link>
</ListItem>
<ListSubheader className={styles.listSubheading}>
{t("officialDocuments:oldRules")}
</ListSubheader>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/saannot-2007.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:rules")} 2007
</a>
</Link>
</ListItem>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/saannot-2004.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:rules")} 2004
</a>
</Link>
</ListItem>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/osakuntatalon-aikaiset-saannot.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:foundingRules")}
</a>
</Link>
</ListItem>
</List>
<List className={styles.documentList}>
<ListSubheader className={styles.listSubheading}>
{t("officialDocuments:regulations")}
</ListSubheader>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2020.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:regulations")} 2020
</a>
</Link>
</ListItem>
<ListSubheader className={styles.listSubheading}>
{t("officialDocuments:oldRegulations")}
</ListSubheader>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2019.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:regulations")} 2019
</a>
</Link>
</ListItem>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2017.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:regulations")} 2017
</a>
</Link>
</ListItem>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2016.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:regulations")} 2016
</a>
</Link>
</ListItem>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/osakunta/ohjesaannot-2011.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:regulations")} 2011
</a>
</Link>
</ListItem>
</List>
<List className={styles.documentList}>
<ListSubheader className={styles.listSubheading}>
{t("officialDocuments:otherDocuments")}
</ListSubheader>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://docs.google.com/document/d/1D94Hq5XUv9kuaMXqhn_thZ9vZ7pAF-pdJbfBQY-1MU4/view"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:equalityPlan")}
</a>
</Link>
</ListItem>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://drive.google.com/file/d/1v5dg71ixbbA42C_50K9QkhX_6uJrEuKb/view"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:safeSpace")}
</a>
</Link>
</ListItem>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://drive.google.com/file/d/1rFmPPeN6MXN4wLsD9hNqloqrIrybk7FE/view"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:environment")}
</a>
</Link>
</ListItem>
<ListSubheader className={styles.listSubheading}>
{t("officialDocuments:dormitoryTitle")}
</ListSubheader>
<ListItem>
<a href="" className={styles.documentLink}>
<Link
href="https://julkaisut.satakuntalainenosakunta.fi/saannot/saatio/asuntoloiden-ohjesaanto.pdf"
target="_blank"
rel="noopener noreferrer"
className={styles.documentLink}
>
{t("officialDocuments:dormitoryText")}
</a>
</Link>
</ListItem>
</List>
</section>
<section className={styles.externalRef}>
<p className={styles.archiveRedirect}>
Looking for the Satakunta series or Maila Talvio&apos;s collected
works? You can now find them on the
works? You can now find them on the{" "}
<Link href="/archive" className={styles.documentLink}>
Archive
</Link>
</Link>{" "}
page!
</p>
</section>
Expand Down
2 changes: 1 addition & 1 deletion styles/official-documents.module.css
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
.documentLink {
text-decoration: none;
font-size: 1.2rem;
width: 11rem;
width: 12rem;
text-wrap: wrap;
font-family: "Raleway", sans-serif;
}
Expand Down

0 comments on commit 5f45392

Please sign in to comment.