From 318f77a886eee89b7fdfa1d8e17f023934f20ed3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Veikko=20Lintuj=C3=A4rvi?= Date: Thu, 16 May 2024 19:06:58 +0300 Subject: [PATCH] Update for the year 2024 --- pages/archive.tsx | 69 ++++++++++ pages/components/Collaboration.tsx | 7 +- pages/components/Lead.tsx | 10 +- pages/index.tsx | 21 ++- pages/program.tsx | 205 ++++------------------------- styles/Lead.module.scss | 5 +- styles/Program.module.scss | 5 +- 7 files changed, 115 insertions(+), 207 deletions(-) diff --git a/pages/archive.tsx b/pages/archive.tsx index cf4012b..51b7993 100644 --- a/pages/archive.tsx +++ b/pages/archive.tsx @@ -5,6 +5,7 @@ import shared from '../styles/Shared.module.scss'; import styles from '../styles/Archive.module.scss'; import PerformersData2021 from '../data/performers/2021'; import PerformersData2022 from '../data/performers/2022'; +import PerformersData2023 from '../data/performers/2023'; import Performer from '../types/Performer'; import { BiChevronDown, BiChevronLeft } from 'react-icons/bi'; @@ -16,6 +17,7 @@ interface PerformerCard extends Performer { const Archive = () => { const [performers2021, setPerformers2021] = useState([]); const [performers2022, setPerformers2022] = useState([]); + const [performers2023, setPerformers2023] = useState([]); useEffect(() => { let cards: PerformerCard[] = []; @@ -39,6 +41,17 @@ const Archive = () => { setPerformers2022(cards); }, []); + useEffect(() => { + let cards: PerformerCard[] = []; + + PerformersData2023.map((p, index) => { + let newCard = { ...p, id: index, showDesc: false }; + cards.push(newCard); + }); + + setPerformers2023(cards); + }, []); + const togglePerformerDesc2021 = (id: number) => { let updated: PerformerCard[]; updated = performers2021.map((p) => { @@ -63,9 +76,65 @@ const Archive = () => { setPerformers2022(updated); }; + const togglePerformerDesc2023 = (id: number) => { + let updated: PerformerCard[]; + updated = performers2023.map((p) => { + if (p.id === id) { + p.showDesc = !p.showDesc; + } + return p; + }); + + setPerformers2023(updated); + }; + return (

Arkisto

+

2023

+ {performers2023.map((p) => ( +
+ {p.name +
+
togglePerformerDesc2023(p.id)} + > +

{p.name}

+ +
+ + {p.showDesc ? ( +
+ {p.paragraphs.map((parag, index) => ( +

{parag.toString()}

+ ))} +
+ ) : ( + + )} + +
+
+
+ ))}

2022

{performers2022.map((p) => (
diff --git a/pages/components/Collaboration.tsx b/pages/components/Collaboration.tsx index 51ea6d0..a988ff6 100644 --- a/pages/components/Collaboration.tsx +++ b/pages/components/Collaboration.tsx @@ -6,7 +6,7 @@ const Collaboration = () => { <>

Yhteistyössä

- Naantalin kaupunki + Runoviikko Ry
{ alt='kirjan talo logo' />
- Pro Sinervo ry Velkuan saaristolaisyhdistys ry - Aviador Kustannus - Enostone Kustannus Cafe Laituri Saaristohotelli Vaihela + Aviador Kustannus + Enostone Kustannus
); diff --git a/pages/components/Lead.tsx b/pages/components/Lead.tsx index e85b349..565d247 100644 --- a/pages/components/Lead.tsx +++ b/pages/components/Lead.tsx @@ -6,14 +6,14 @@ const Lead = () => {

- 20.-22.7. Naantalin Saaristo + 13.—15.6. Naantalin Saaristo - Eksymisretki omaan luontoosi, metsänpeiton suojaan! + Vuonna 2024 saarifestivaali tuo runoutta ja musiikkia kahteen kesäkuun perjantaihin

-

+ {/*

Runosaari on poikkitaiteellinen runofestivaali Livonsaaren, Palvan ja Velkuanmaan saarissa. Festivaali järjestetään kolmatta kertaa - 20.-22.7.2023. + 13.—15.6.2024.

Tapahtuma kutsuu Naantalin saaristoon joukon valovoimaisia ja @@ -25,7 +25,7 @@ const Lead = () => { meidänkin rantojamme. Peurojen kurittaman monimuotoisuuden keskelle nousee Runosaari ihmettelemään ihmisen ja muun luonnon olemista taiteen ja ilmaisun keinoin. -

+

*/}
); }; diff --git a/pages/index.tsx b/pages/index.tsx index c33fbee..905a49c 100644 --- a/pages/index.tsx +++ b/pages/index.tsx @@ -6,23 +6,20 @@ import styles from '../styles/Index.module.scss'; import Lead from './components/Lead'; import Collaboration from './components/Collaboration'; import Workshops from './workshops'; +import Archive from './archive'; // import Workshops from './workshops'; const Home: NextPage = () => { return (
-

Runosaari kiittää!

-

- Tervetuloa seuraavaan Runosaareen 13.—15.6.2024 -

- {/* Pages hidden until next year - - - - - - - */} +

Runosaari

+ + + {/* + */} + + + {/* */}
); }; diff --git a/pages/program.tsx b/pages/program.tsx index 41eda3b..ce5513e 100644 --- a/pages/program.tsx +++ b/pages/program.tsx @@ -13,74 +13,14 @@ interface DayToggles { } const Program = () => { - const [dayToggles, setDayToggles] = useState({ - wed: false, - thu: false, - fri: false, - sat: false, - }); - - const toggleDayDesc = (day: keyof DayToggles) => { - let updated = { ...dayToggles }; - - updated[day] = !updated[day]; - - setDayToggles(updated); - }; - return (

Ohjelma

- {/* Torstai */} + {/* Vaihela */}

- 20.7. + 7.6. - Laituri - - - to -

- - Café Laituri, Voiponlahdentie 37, Palva - -

17:00 - 19:00

- - - - {dayToggles.thu ? ( -
    -
  • Rauhatäti
    • -
  • Otso Helasvuo
    • -
  • Katariina Vuorinen
    • -
  • Rosanna Fellman
    • -
- ) : ( - - )} - -
- - {/* Perjantai */} -

- 21.7. - Vaihela @@ -89,136 +29,35 @@ const Program = () => { Saaristohotelli Vaihela, Velkuanmaantie 168, Velkuanmaa -

18:00 - 21:00

+ 18:00 - 21:00 - - - - {dayToggles.fri ? ( -
    -
  • Ilmi Lupiini
    • -
  • Kasper Salonen
    • -
  • Juha Kulmala + Positroninen runo-orkesteri
    • -
- ) : ( - - )} - +
    +
  • Äyräs
    • +
  • Hanna Storm
    • +
  • Juha Rautio
    • +
  • Katariina Vuorinen
    & Ilkka Turta
    • +
- {/* Lauantai */} + {/* Laituri */}

- 22.7. - - Sinervo + 17.6. + + Laituri - la + pe

- - Sinervon talo, Sauniementie 5, Teersalo + + Café Laituri, Voiponlahdentie 37, Palva -

14:00 - 20:00

+ 18:00 - 21:00 - - - - {dayToggles.sat ? ( -
    -
  • - 14:00 - Kinnunen&Kinnunen -
    • -
  • - 14:30 - Katja Meriluoto -
    • -
  • - 14:50 - Marianna Kurtto -
    • -
  • - 15:10 - - Esa Hirvonen & Masi Hukari - -
    • -
  • Tauko
    • -
  • - 16:00 - Veera Sylvius -
    • -
  • - 16:20 - Suvi Valli -
    • -
  • - 16:40 - - Sergio Augusto Sánchez - -
    • -
  • - 17:00 - Blues Ones -
    • -
  • Tauko
    • -
  • - 18:00 - Sirpa Kyyrönen -
    • -
  • - 18:20 - Tomi Kontio -
    • -
  • - 18:40 - - Katariina Vuorinen & Kaisa Mäensivu - -
    • -
  • Tauko
    • -
  • - 19:30 - Signe -
    • -
- ) : ( - - )} - +
    +
  • Juha Kulmala + Positroninen runo-orkesteri
    • +
  • Terhi Forssén
    • +
  • Katariina Vuorinen & Björn
    • +
); diff --git a/styles/Lead.module.scss b/styles/Lead.module.scss index d2c9b51..0c919b8 100644 --- a/styles/Lead.module.scss +++ b/styles/Lead.module.scss @@ -9,6 +9,7 @@ display: flex; flex-direction: column; align-items: center; + font-size: 2rem; } .leadText { @@ -17,9 +18,9 @@ } .dateAndPlace { - margin-bottom: 1em; + margin-bottom: 1.1em; } .leadNextYear { font-size: 3em; -} +} \ No newline at end of file diff --git a/styles/Program.module.scss b/styles/Program.module.scss index ddb4164..cc7d187 100644 --- a/styles/Program.module.scss +++ b/styles/Program.module.scss @@ -49,6 +49,8 @@ .timeSpan { margin-top: 0; margin-bottom: 1rem; + font-size: 2em; + font-weight: bold; } .performerList { @@ -115,9 +117,10 @@ .programPerformersTitle { font-size: 2rem; padding-left: 1rem; + font-weight: bold; } .programHr { border: 0.1rem solid #d5caf29d; width: 43%; -} +} \ No newline at end of file