From d8d4da7674aca1e073b567f61701799177f29794 Mon Sep 17 00:00:00 2001 From: phoebus-84 Date: Tue, 10 Sep 2024 10:57:36 +0200 Subject: [PATCH 1/3] fix: deployments node version --- .github/workflows/build_alpha_release.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_alpha_release.yml b/.github/workflows/build_alpha_release.yml index 0b85709..aa71a8b 100644 --- a/.github/workflows/build_alpha_release.yml +++ b/.github/workflows/build_alpha_release.yml @@ -15,7 +15,7 @@ jobs: - name: Install Node.js uses: actions/setup-node@v4 with: - node-version: 20.8.1 + node-version: 20 - uses: pnpm/action-setup@v2 name: Install pnpm with: @@ -75,7 +75,7 @@ jobs: - name: Setup Node.js 18 uses: actions/setup-node@v4 with: - node-version: 20.8.1 + node-version: 20 - uses: pnpm/action-setup@v2 name: Install pnpm with: From 6b07c361e4f4e2787c67441c0b61ddb0f3ca7ccd Mon Sep 17 00:00:00 2001 From: phoebus-84 Date: Tue, 10 Sep 2024 10:58:45 +0200 Subject: [PATCH 2/3] chores: update to last didroom components --- src/routes/+layout.svelte | 4 ++-- .../(protected)/(tabs)/profile/+page.svelte | 24 +++++++++++-------- .../(protected)/languages/+page.svelte | 16 +++++++------ 3 files changed, 25 insertions(+), 19 deletions(-) diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 4825c1c..467ff67 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -56,11 +56,11 @@ /> diff --git a/src/routes/[[lang]]/(protected)/(tabs)/profile/+page.svelte b/src/routes/[[lang]]/(protected)/(tabs)/profile/+page.svelte index 04f4f7f..a916ae7 100644 --- a/src/routes/[[lang]]/(protected)/(tabs)/profile/+page.svelte +++ b/src/routes/[[lang]]/(protected)/(tabs)/profile/+page.svelte @@ -19,6 +19,7 @@ const gotoLanguageSettings = () => goto('/languages'); const gotoAccountSettings = () => goto('/user-settings'); + @@ -40,19 +41,22 @@
goto('/user-settings')} + on:languageSettingsClick={() => { + console.log("pppp") + goto('/languages') + }} + on:appSettingsClick={() => openAppSettings()} + on:logoutClick={() => goto('/logout')} />
diff --git a/src/routes/[[lang]]/(protected)/languages/+page.svelte b/src/routes/[[lang]]/(protected)/languages/+page.svelte index dcde6fa..9d1461d 100644 --- a/src/routes/[[lang]]/(protected)/languages/+page.svelte +++ b/src/routes/[[lang]]/(protected)/languages/+page.svelte @@ -4,6 +4,7 @@ import { setLanguagePreference } from '$lib/preferences/lang'; import { availableLanguageTags } from '$paraglide/runtime'; + const back = () => goto('/profile'); const recordLanguages = { en: 'English', es: 'EspaƱol', @@ -12,10 +13,15 @@ it: 'Italiano' }; $: activeLanguage = i18n.getLanguageFromUrl($page.url); - const back = () => goto('/profile') + function handleLanguageChange(language: 'en' | 'it') { + setLanguagePreference(language).then(() => { + activeLanguage = language; + window.location.replace(`/${language}/languages`); + }); + } - + {m.Languages()} @@ -33,11 +39,7 @@ {:else}