From 14b874a0fdf1836761136b50d5ded46f4f84f705 Mon Sep 17 00:00:00 2001 From: Yohan Boujon Date: Mon, 31 Mar 2025 22:19:35 +0200 Subject: [PATCH] Added json for a more generic approach regarding static text. Removed some typos. --- src/lib/components/footer.svelte | 7 +++---- src/lib/components/footer/page1.svelte | 7 ++++--- src/lib/components/footer/page2.svelte | 10 ++++------ src/lib/components/footer/page3.svelte | 3 ++- src/lib/components/navbar.svelte | 9 +++++---- src/lib/css/cover-img.css | 2 +- src/lib/json/hub.json | 4 ++++ src/lib/json/main.json | 27 ++++++++++++++++++++++++++ src/routes/+page.svelte | 5 +++-- 9 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 src/lib/json/hub.json create mode 100644 src/lib/json/main.json diff --git a/src/lib/components/footer.svelte b/src/lib/components/footer.svelte index 5daf9fb..c49f5ac 100644 --- a/src/lib/components/footer.svelte +++ b/src/lib/components/footer.svelte @@ -7,6 +7,7 @@ import Page3 from "$lib/components/footer/page3.svelte"; import ButtonSlider from "$lib/components/button-slider.svelte"; import anime from "animejs"; + import mainjson from "$lib/json/main.json"; let active = 0; let page = [Page1, Page2, Page3]; @@ -50,12 +51,10 @@
- {new Date().getFullYear()} • Tous droits réservés • Yohan Boujon + {new Date().getFullYear()}{mainjson.footer.copyright}
diff --git a/src/lib/components/footer/page1.svelte b/src/lib/components/footer/page1.svelte index b4e03ef..23373d8 100644 --- a/src/lib/components/footer/page1.svelte +++ b/src/lib/components/footer/page1.svelte @@ -3,12 +3,13 @@ import SvgIcon from "@jamescoyle/svelte-icon"; import { mdiFormatQuoteClose, mdiFormatQuoteOpen } from "@mdi/js"; + import mainjson from "$lib/json/main.json";
github Code source{mainjson.footer.about.source}
@@ -17,11 +18,11 @@ src="https://cdn.simpleicons.org/raspberrypi/F8F1F1" /> Hébergé sur Raspberry Pi{mainjson.footer.about.hosted}
- Keep the web free + {mainjson.footer.about.motto}
diff --git a/src/lib/components/footer/page2.svelte b/src/lib/components/footer/page2.svelte index e3b5185..0a9936b 100644 --- a/src/lib/components/footer/page2.svelte +++ b/src/lib/components/footer/page2.svelte @@ -4,17 +4,15 @@ import SvgIcon from "@jamescoyle/svelte-icon"; import { mdiEye } from "@mdi/js"; + import mainjson from "$lib/json/main.json";
-

Notre Vision

+

{mainjson.footer.vision.name}

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lectus - ante, porttitor eget massa sit amet, volutpat cursus mauris. Proin et - massa dui. Vestibulum eu tempus nisl, vitae bibendum urna. Sed tincidunt - est non nulla scelerisque. + + {mainjson.footer.vision.description}
diff --git a/src/lib/components/footer/page3.svelte b/src/lib/components/footer/page3.svelte index c8c8d48..b9af6ba 100644 --- a/src/lib/components/footer/page3.svelte +++ b/src/lib/components/footer/page3.svelte @@ -4,9 +4,10 @@ import SvgIcon from "@jamescoyle/svelte-icon"; import { mdiEmailFast, mdiHelp } from "@mdi/js"; + import mainjson from "$lib/json/main.json";
- Envoyez nous un mail + {mainjson.footer.contact.mail}
diff --git a/src/lib/components/navbar.svelte b/src/lib/components/navbar.svelte index 3f8df4b..4f32f0f 100644 --- a/src/lib/components/navbar.svelte +++ b/src/lib/components/navbar.svelte @@ -4,6 +4,7 @@ import "$lib/css/navbar.css"; import { page } from "$app/stores"; import anime from "animejs"; + import mainjson from "$lib/json/main.json" import Search from "$lib/components/search.svelte"; @@ -95,16 +96,16 @@ >
- Hub + {mainjson.tab.hub}
- Projets + {mainjson.tab.projects}
- Blog + {mainjson.tab.blog}
- Labo + {mainjson.tab.lab}
diff --git a/src/lib/css/cover-img.css b/src/lib/css/cover-img.css index 2ee0f71..28eb6d5 100644 --- a/src/lib/css/cover-img.css +++ b/src/lib/css/cover-img.css @@ -52,7 +52,7 @@ .cover-img-darken { grid-area: overlay; - background-color: rgb(0, 0, 0, 0.25); + background-color: rgb(0, 0, 0, 0.35); z-index: 0; } diff --git a/src/lib/json/hub.json b/src/lib/json/hub.json new file mode 100644 index 0000000..e71dcd5 --- /dev/null +++ b/src/lib/json/hub.json @@ -0,0 +1,4 @@ +{ + "welcomeTitle": "Bienvenue sur Etheryo", + "welcomeSubtitle": "'Etheryo' provient du mot 'Éther'/'Æther' dans la mythologie grec ainsi que de mon propre prénom. Le but de ce site web est de montrer mes créations. Qu'elles soient artistiques, philosophiques ou scientifiques, elles reflettent tout ce que je veux apporter au monde." +} \ No newline at end of file diff --git a/src/lib/json/main.json b/src/lib/json/main.json new file mode 100644 index 0000000..eac47b8 --- /dev/null +++ b/src/lib/json/main.json @@ -0,0 +1,27 @@ +{ + "tab": + { + "hub": "Hub", + "projects": "Projets", + "blog": "Blog", + "lab": "Labo" + }, + "footer": + { + "copyright": " • Tous droits réservés • Yohan Boujon", + "about":{ + "name": "À propos", + "source": "Code Source", + "hosted": "Hébérgé sur un Raspberry Pi", + "motto": "Keep the web free" + }, + "vision":{ + "name": "Notre Vision", + "description": "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Cras lectus ante, porttitor eget massa sit amet, volutpat cursus mauris. Proin et massa dui. Vestibulum eu tempus nisl, vitae bibendum urna. Sed tincidunt est non nulla scelerisque." + }, + "contact":{ + "name": "Contacter", + "mail": "Envoyez nous un mail" + } + } +} \ No newline at end of file diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 91c8a8d..73ed7e5 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -3,6 +3,7 @@ import "$lib/css/main.css"; import CoverImg from "$lib/components/cover-img.svelte"; + import hubjson from "$lib/json/hub.json"; let hub_cover = "https://share.etheryo.fr/rando/2024.07.28/IMG20240728141949_min.jpg"; @@ -12,7 +13,7 @@