From bac6fd1da259e407cfe14dd6867c6e99b608ad79 Mon Sep 17 00:00:00 2001 From: Yohan Boujon Date: Sun, 4 Feb 2024 22:12:15 +0100 Subject: [PATCH] Frontend: Added json files for language specific titles. --- frontend/src/lib/components/sidebar.svelte | 5 ++- frontend/src/lib/lang/en.json | 16 ++++++++ frontend/src/lib/lang/fr.json | 16 ++++++++ frontend/src/routes/lang=[lang]/+page.js | 41 ++++++++++++++++---- frontend/src/routes/lang=[lang]/+page.svelte | 25 ++++++------ 5 files changed, 82 insertions(+), 21 deletions(-) create mode 100644 frontend/src/lib/lang/en.json create mode 100644 frontend/src/lib/lang/fr.json diff --git a/frontend/src/lib/components/sidebar.svelte b/frontend/src/lib/components/sidebar.svelte index ba15345..55045e8 100644 --- a/frontend/src/lib/components/sidebar.svelte +++ b/frontend/src/lib/components/sidebar.svelte @@ -16,6 +16,7 @@ import "$lib/css/sidebar.css"; export let info; + export let text; export let footer = null; export let containerCv = null; export let sidebarContainer; @@ -98,14 +99,14 @@ {#if info.interests != null} {/if} {#if info.interests != null} {/if} diff --git a/frontend/src/lib/lang/en.json b/frontend/src/lib/lang/en.json new file mode 100644 index 0000000..385624e --- /dev/null +++ b/frontend/src/lib/lang/en.json @@ -0,0 +1,16 @@ +{ + "education": "Education", + "experience": "Experience", + "projects": "Projects", + "skills": "Skills", + "programming_languages": "Programming Languages", + "software": "Software", + "languages": "Languages", + + "interests": "Interests", + "softskills": "Soft-Skills", + + "madewith": "Made with", + "usingsvelte": "using Svelte", + "copyright": "All rights reserved, Yohan Boujon" + } \ No newline at end of file diff --git a/frontend/src/lib/lang/fr.json b/frontend/src/lib/lang/fr.json new file mode 100644 index 0000000..a59ec7b --- /dev/null +++ b/frontend/src/lib/lang/fr.json @@ -0,0 +1,16 @@ +{ + "education": "Éducation", + "experience": "Expérience", + "projects": "Projets", + "skills": "Compétences", + "programming_languages": "Langages de programmation", + "software": "Logiciels", + "languages": "Langues", + + "interests": "Centres d'intérêt", + "softskills": "Qualités personnelles", + + "madewith": "Fait avec", + "usingsvelte": ", à l'aide de Svelte", + "copyright": "Tous droits réservés, Yohan Boujon" + } \ No newline at end of file diff --git a/frontend/src/routes/lang=[lang]/+page.js b/frontend/src/routes/lang=[lang]/+page.js index 098c504..d747e2e 100644 --- a/frontend/src/routes/lang=[lang]/+page.js +++ b/frontend/src/routes/lang=[lang]/+page.js @@ -1,3 +1,5 @@ +import {json} from '@sveltejs/kit'; + export async function load(context) { async function fetchData(data) { try { @@ -17,15 +19,39 @@ export async function load(context) { } } + async function fetchJSON(lang) { + try { + const resTemp = await context.fetch(`src/lib/lang/${lang}.json`); + if (resTemp.ok == false) { + return { + status: resTemp.status, + } + } + return { + status: 0, data: await resTemp.json(), + } + } catch (error) { + return { + status: 500, + } + } + } + // Gathering the language const lang = context.params.lang; const lang_id = (await fetchData(`get_lang_id/${lang}`)).data.id; + // Gathering texts for languages + const text = (await fetchJSON(lang)).data; + + // Gathering data from databse const infos = []; const project_software = []; const project_programming = []; - const dataToGather = - [`info/${lang_id}`, `education/${lang_id}`, `experience/${lang_id}`, `project/${lang_id}`, 'hard_skills', 'tags']; + const dataToGather = [ + `info/${lang_id}`, `education/${lang_id}`, `experience/${lang_id}`, + `project/${lang_id}`, 'hard_skills', 'tags' + ]; for (const url of dataToGather) { const res = await fetchData(url); if (res.status == 0) { @@ -41,8 +67,7 @@ export async function load(context) { // infos[4] = hardskills // infos[4][1] = Softwares for (let i = 0; i < infos[4][1].length; i++) { - const res = - await fetchData(`getproject_software/${i + 1}/${lang_id}`); + const res = await fetchData(`getproject_software/${i + 1}/${lang_id}`); if (res.status == 0) { project_software.push(res.data); } else { @@ -53,12 +78,10 @@ export async function load(context) { } // infos[4][0] = Programming Languages for (let i = 0; i < infos[4][0].length; i++) { - const res = - await fetchData(`getproject_programming/${i + 1}/${lang_id}`); + const res = await fetchData(`getproject_programming/${i + 1}/${lang_id}`); if (res.status == 0) { project_programming.push(res.data); - } - else { + } else { return { status: res.status } @@ -67,6 +90,7 @@ export async function load(context) { return { status: 0, + lang: lang, info: infos[0], education: infos[1], experience: infos[2], @@ -79,5 +103,6 @@ export async function load(context) { tags: infos[5], project_programming: project_programming, project_software: project_software, + text: text, }; } diff --git a/frontend/src/routes/lang=[lang]/+page.svelte b/frontend/src/routes/lang=[lang]/+page.svelte index 64c7f07..6047918 100644 --- a/frontend/src/routes/lang=[lang]/+page.svelte +++ b/frontend/src/routes/lang=[lang]/+page.svelte @@ -29,7 +29,10 @@ import { onMount } from "svelte"; export let data; + // Database const cv = data.status == 0 ? processData(data) : undefined; + // Language specifications + const text = data.text; // Sidebar let containerCv; @@ -81,12 +84,12 @@ {#if innerWidth < 1200 && sidebarLoaded} - + {/if}
{#if innerWidth >= 1200 && sidebarLoaded} - + {/if} {#if innerWidth < 1000} @@ -106,24 +109,24 @@

{cv.info.full_name}

{/if}

Apprentice Engineer Automatic/Electronic

-
+
-
+
-
+
-
- +
+
{#if sidebarLoaded} {#each cv.skills.programming_languages as pilldata, index (index)} @@ -138,7 +141,7 @@ {/each} {/if}
- +
{#if sidebarLoaded} {#each cv.skills.softwares as pilldata, index (index)} @@ -153,7 +156,7 @@ {/each} {/if}
- +
{#each cv.skills.languages as langdata}

- Made with using Svelte + {text.madewith} {text.usingsvelte}

-

All rights reserved, Yohan Boujon • {new Date().getFullYear()}

+

{text.copyright} • {new Date().getFullYear()}

{:else}

Oops, could not load database :/