Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
@allurei
allurei committed Dec 29, 2024
1 parent 9549570 commit 8ea4d29
Show file tree
Hide file tree
Showing 19 changed files with 250 additions and 83 deletions.
Binary file removed src/lib/assets/vuju_logo.png
View file
Binary file not shown.
1 change: 1 addition & 0 deletions src/lib/assets/vujulogo.svg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 54 additions & 27 deletions src/lib/components/banner2.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import logo from "$lib/assets/vuju_logo.png";
import logo from "$lib/assets/vujulogo.svg";
export let lang = 'fi';
export let links = [
{ text: "Ohjelma", href: "#program" },
Expand Down Expand Up @@ -41,6 +41,11 @@
<div class="flowers right"></div>
<div class="corner right"></div>
<div class="wrap">
<div class="lang-link">
<a class="{lang === 'fi' ? 'bold' : ''}" href="/tesmi">FI</a>
|
<a class="{lang !== 'fi' ? 'bold' : ''}" href="/tesmi/en">EN</a>
</div>
<div class="banner">
<div class="logo">
<img src="{logo}" alt="Vuosijuhlaloho">
Expand All @@ -66,6 +71,11 @@
<div class="nav" class:menuOpen>
<nav class:menuOpen>
<ul>
<li>
<a class="{lang === 'fi' ? 'bold' : ''}" href="/tesmi">FI</a>
|
<a class="{lang !== 'fi' ? 'bold' : ''}" href="/tesmi/en">EN</a>
</li>
{#each links as link}
<li><a href={link.href}>{link.text}</a></li>
{/each}
Expand All @@ -79,8 +89,9 @@
@use '../../style/variables' as v;
#banner {
padding: 100px 0;
background: linear-gradient(0deg, v.$background-color, v.$background-color2 80%) no-repeat;
background: linear-gradient(0deg, v.$background-banner-yellow, v.$background-banner-green 80%) no-repeat;
height: 100vh;
max-height: 1000px;
position: relative;
overflow: hidden;
}
Expand All @@ -95,6 +106,7 @@
display: flex;
align-items: flex-end;
justify-content: center;
max-height: 750px;
}
.top {
Expand Down Expand Up @@ -145,6 +157,7 @@
}
.logo {
max-width: 500px;
img {
width: 100%;
}
Expand All @@ -158,10 +171,9 @@
.nav-links a {
font-family: "Meow Script", cursive;
font-size: v.$font-size-heading2;
color: white;
color: black;
font-weight: 400;
text-shadow: 2px 2px 1px black;
-webkit-text-stroke: 0.5px black;
text-shadow: 1px 1px 1px black;
letter-spacing: 3px;
position: absolute;
text-decoration: none;
Expand All @@ -174,14 +186,23 @@
/* Position links in a circle */
.nav-links a:nth-child(1) { top: 22%; left: 38%; }
.nav-links a:nth-child(2) { top: 22%; left: 62%; }
.nav-links a:nth-child(3) { top: 44%; left: 72%; }
.nav-links a:nth-child(3) { top: 44%; left: 73%; }
.nav-links a:nth-child(4) { top: 65%; left: 75%; }
.nav-links a:nth-child(5) { top: 86%; left: 69%; }
.nav-links a:nth-child(5) { top: 86%; left: 73%; }
.nav-links a:nth-child(6) { top: 100%; left: 50%; }
.nav-links a:nth-child(7) { top: 86%; left: 31%; }
.nav-links a:nth-child(8) { top: 65%; left: 23%; }
.nav-links a:nth-child(9) { top: 44%; left: 23%; }
.nav-links a:nth-child(7) { top: 86%; left: 27%; }
.nav-links a:nth-child(8) { top: 65%; left: 25%; }
.nav-links a:nth-child(9) { top: 44%; left: 27%; }
.lang-link {
position: absolute;
top: 27%;
right: 9%;
z-index: 10;
a {
text-decoration: none;
}
}
.mobile-nav {
.nav {
display: none;
Expand All @@ -199,7 +220,7 @@
right: 0;
height: 100vh;
z-index: 1000;
background: linear-gradient(-90deg, v.$background-color, v.$background-color2 200%) no-repeat;
background: linear-gradient(-90deg, v.$background-banner-yellow, v.$background-banner-green 200%) no-repeat;
ul {
padding-top: 70px;
display: flex;
Expand Down Expand Up @@ -261,32 +282,38 @@
}
}
@include v.xl {
.nav-links a:nth-child(1) { top: 22%; left: 35%; }
.nav-links a:nth-child(2) { top: 22%; left: 65%; }
@media (max-width: 1800px) {
.nav-links a:nth-child(3) { top: 44%; left: 80%; }
.nav-links a:nth-child(4) { top: 65%; left: 84%; }
.nav-links a:nth-child(5) { top: 86%; left: 75%; }
.nav-links a:nth-child(6) { top: 100%; left: 50%; }
.nav-links a:nth-child(7) { top: 86%; left: 25%; }
.nav-links a:nth-child(5) { top: 86%; left: 80%; }
.nav-links a:nth-child(7) { top: 86%; left: 20%; }
.nav-links a:nth-child(8) { top: 65%; left: 16%; }
.nav-links a:nth-child(9) { top: 44%; left: 16%; }
.nav-links a:nth-child(9) { top: 44%; left: 20%; }
}
@media (max-width: 1400px) {
.nav-links a:nth-child(3) { top: 44%; left: 83%; }
.nav-links a:nth-child(4) { top: 65%; left: 85%; }
.nav-links a:nth-child(5) { top: 86%; left: 83%; }
.nav-links a:nth-child(7) { top: 86%; left: 17%; }
.nav-links a:nth-child(8) { top: 65%; left: 15%; }
.nav-links a:nth-child(9) { top: 44%; left: 17%; }
.lang-link {
top: 25%;
right: 16%;
}
}
@include v.lg {
.nav-links a:nth-child(1) { top: 22%; left: 30%; }
.nav-links a:nth-child(2) { top: 22%; left: 65%; }
.nav-links a:nth-child(3) { top: 44%; left: 85%; }
.nav-links a:nth-child(3) { top: 44%; left: 92%; }
.nav-links a:nth-child(4) { top: 65%; left: 92%; }
.nav-links a:nth-child(5) { top: 86%; left: 80%; }
.nav-links a:nth-child(6) { top: 100%; left: 50%; }
.nav-links a:nth-child(7) { top: 86%; left: 20%; }
.nav-links a:nth-child(8) { top: 65%; left: 10%; }
.nav-links a:nth-child(9) { top: 44%; left: 10%; }
.nav-links a:nth-child(5) { top: 86%; left: 92%; }
.nav-links a:nth-child(7) { top: 86%; left: 8%; }
.nav-links a:nth-child(8) { top: 65%; left: 8%; }
.nav-links a:nth-child(9) { top: 44%; left: 8%; }
}
@include v.ml {
.nav-links {
.nav-links, .lang-link {
display: none;
}
Expand Down
4 changes: 2 additions & 2 deletions src/lib/components/footer.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<script>
export let lang = 'fi';
</script>
<div class="scroller">
<a href="/tesmi">></a>
<a href="{lang === 'fi' ? '/tesmi' : '/tesmi/en'}">></a>
</div>
<div class="footer wrap">
<div class="flex">
Expand Down
3 changes: 2 additions & 1 deletion src/lib/components/ilmo.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
export let id = 'ilmo';
export let form;
export let invited = false
export let lang = 'fi';
</script>

<Ilmoformi {invited} {id} {form} />
<Ilmoformi {invited} {id} {form} fi={lang === 'fi'} />
22 changes: 12 additions & 10 deletions src/lib/components/ilmoformi.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,21 @@
<script>
import { enhance } from '$app/forms';
import { page } from '$app/stores';
export let invited = false;
export let id = 'ilmo';
export let form;
let fi = true;
export let fi = true;
let is_greeting = 'yes';
</script>
<section id="{id}">
<div class="wrap">
<div class="flex-items bordered flower-bg">
<h2>Ilmoittautuminen</h2>
{#if form?.body}
{console.log(form?.body)}
{/if}
{#if form?.success !== true}
<form method="POST" use:enhance>
<div class="flex-item twelve row">
<a href=".">Etusivulle</a>
<a href="/tesmi/participants">Ilmoittautuneet</a>
<a href=".">{fi ? 'Etusivulle' : 'To frontpage'}</a>
<a href="{fi ? '/tesmi/participants' : '/tesmi/en/participants'}">{fi ? 'Ilmoittautuneet' : 'Registered'}</a>
</div>
<div class="flex-item six">
<label>
Expand All @@ -39,6 +35,12 @@
<input type="email" name="email" required>
</label>
</div>
<div class="flex-item six">
<label>
<span>{fi ? 'Opintojen aloitusvuosi' : 'Starting year of studies'}</span>
<input type="number" name="starting_year">
</label>
</div>
<div class="flex-item six">
<span>{fi ? 'Asteriskin jäsen' : 'Asteriski member'}*</span>
<div class="options">
Expand Down Expand Up @@ -179,10 +181,10 @@
<div class="flex-item six thanks">
<h3>{fi
? 'Kiitos ilmoittautumisesta!'
: 'Thanks!'}
: 'Thanks you for registration'}
</h3>
<a href="/tesmi/ilmo">{fi ? 'Tee toinen ilmoittautuminen' : 'Register again'}</a>
<a href="/tesmi/participants">{fi ? 'Katso ilmoittautuneet' : 'See registered'}</a>
<a href="{invited ? (fi ? '/tesmi/kutsuvieras-ilmo' : '/tesmi/en/kutsuvieras-ilmo') : (fi ? '/tesmi/ilmo' : '/tesmi/en/ilmo')}">{fi ? 'Tee toinen ilmoittautuminen' : 'Register again'}</a>
<a href="{fi ? '/tesmi/participants' : '/tesmi/en/participants'}">{fi ? 'Katso ilmoittautuneet' : 'See registered'}</a>
<a href=".">{fi ? 'Etusivulle' : 'To frontpage'}</a>
</div>

Expand Down
15 changes: 11 additions & 4 deletions src/lib/components/info.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,24 @@
{#if lang === 'fi'}
<h2>Tietoa</h2>
<p>
Asteriski ry:n 50-vuotisjuhlia juhlitaan juhlavasti lauantaina 1. lokakuuta 2022. Vuosijuhlat alkavat cocktail-tilaisuudella, joka järjestetään Turun yliopiston päärakennuksessa. Cocktail-tilaisuudesta siirrymme itse pääjuhlaan Turun VPK-talolle. Juhlien jatkoja vietetään salaisessa jatkopaikassa.
Asteriski ry:n 53-vuotisjuhlia juhlitaan juhlavasti perjantaina 7. maaliskuuta 2025. Vuosijuhlat alkavat cocktail-tilaisuudella, joka järjestetään Turun Akatemiatalolla. Vuosijuhlien pääjuhla järjestetään Turun Akatemiatalon juhlasalissa. Juhlien jatkoja vietetään salaisessa jatkopaikassa.

Silliaamiaista eli sillistä nautitaan juhlien seuraavana päivänä sunnuntaina 2. lokakuuta. Jatkojen tapaan myös sillis järjestetään salaisessa paikassa.
Silliaamiaista eli sillistä nautitaan juhlien seuraavana päivänä lauantaina 8. maaliskuuta. Jatkojen tapaan myös sillis järjestetään salaisessa paikassa.

Vuosijuhlat järjestetään esteettömissä tiloissa. Jatkoilla saatetaan käyttää vilkkuvia valoja.

Vuosijuhlien pukukoodina toimii juhlapuku tai tumma puku sekä akateemiset kunniamerkit. Lisätietoa vuosijuhlien etiketistä.
Vuosijuhlien pukukoodina toimii juhlapuku tai tumma puku sekä akateemiset kunniamerkit. <a href="#etiquette">Lisätietoa vuosijuhlien etiketistä</a>.
</p>
{:else}
<h2>Information</h2>
<p>
enklantua
Asteriski ry celebrates its 53rd anniversary with a grand annual ball on Friday 7th of March 2025. The annual ball begins with a cocktail party at the Old Academy Building. The cocktail party is followed by the main event at Old Academy Building and after that we will continue the celebration with the after party in a secret location.

On the following morning on Saturday 8th of March 2025 the herring breakfast will take place in a secret location.

The annual ball is organized in accessible premises. Afterparty may include flashing lights.

The dress code at the annual ball is a white tie or dark lounge suit for men and an evening gown for women as well as academic decorations.
</p>
{/if}
</div>
Expand Down
13 changes: 10 additions & 3 deletions src/lib/components/menu.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<h4>Alkuruoka</h4>
<p><b>Maa-artisokkakeitto</b> <br> yrttiöljyä, saaristolaisleipää, valkosipulilevite</p>
{:else}
<h4>Alkuruoka</h4>
<h4>Starter</h4>
<p><b>Maa-artisokkakeitto</b> <br> yrttiöljyä, saaristolaisleipää, valkosipulilevite</p>
{/if}
</div>
Expand All @@ -31,7 +31,14 @@
<h5>Vegaani</h5>
<p><b>Melanzane</b> <br> maalaisleipää, uunijuurekset, pikkelöidyt sinapinsiemenet, kasvissipsit</p>
{:else}
<h4>Alkuruoka</h4>
<h4>Main Course</h4>
<h5>Meat</h5>
<p><b>Maa-artisokkakeitto</b> <br> yrttiöljyä, saaristolaisleipää, valkosipulilevite</p>

<h5>Fish</h5>
<p><b>Maa-artisokkakeitto</b> <br> yrttiöljyä, saaristolaisleipää, valkosipulilevite</p>

<h5>Vegan</h5>
<p><b>Maa-artisokkakeitto</b> <br> yrttiöljyä, saaristolaisleipää, valkosipulilevite</p>
{/if}
</div>
Expand All @@ -42,7 +49,7 @@
<h4>Jälkiruoka</h4>
<p><b>Ananas-passionsuklaakakkua</b> <br> kahvi/tee</p>
{:else}
<h4>Alkuruoka</h4>
<h4>Dessert</h4>
<p><b>Maa-artisokkakeitto</b> <br> yrttiöljyä, saaristolaisleipää, valkosipulilevite</p>
{/if}
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/lib/components/posts.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
{new Date(post.date).toLocaleDateString()}
</div>
<div class="flex-item three">
<a href="{post.link}" target="_blank"> {lang === 'fi' ? 'Lue lisää' : 'Read more:'}</a>
<a href="{post.link}" target="_blank"> {lang === 'fi' ? 'Lue lisää' : 'Read more'}</a>
</div>
</div>

Expand Down
25 changes: 25 additions & 0 deletions src/routes/+layout.server.js
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
export const load = async ({fetch}) => {

let posts = [];
let participants = [];

const response = await fetch('https://www.asteriski.fi/wp-json/wp/v2/posts?tags=2200&_embed&per_page=4', {
method: 'GET'
});

if (response.ok) {
posts = await response.json();
}

const api = 'https://api.viiskyt.asteriski.fi/api/participants/'
const apiResponse = await fetch(api);

if (apiResponse.ok) {
participants = await apiResponse.json();
}

return {
posts,
participants
};
}
2 changes: 1 addition & 1 deletion src/routes/+layout.svelte
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script>
import '../style/app.scss'
import '../style/app.scss';
</script>
<svelte:head>
<title>Asteriski 53v</title>
Expand Down
17 changes: 0 additions & 17 deletions src/routes/tesmi/+page.server.js
View file

This file was deleted.

Loading

0 comments on commit 8ea4d29

Please sign in to comment.