+
+
{#each elements as { name, icon, label }}
-
{
setFilterStore('element', name);
toggleChecked(name);
}}
+ on:keydown={(e) => {
+ if (e.key === 'Enter' || e.key === ' ') {
+ setFilterStore('element', name);
+ toggleChecked(name);
+ }
+ }}
>
-
+
-
+
{/each}
+
+
{#each weapons as { name, icon }}
-
{
setFilterStore('weapon', name);
toggleChecked(name);
}}
+ on:keydown={(e) => {
+ if (e.key === 'Enter' || e.key === ' ') {
+ setFilterStore('weapon', name);
+ toggleChecked(name);
+ }
+ }}
>
-
+
-
+
{/each}
-
+
-
+
+
-
+
-
+
+
-
-
-
-
- {$i18n.t('login.perk.cross_device_sync.title')}
-
- {$i18n.t('login.perk.cross_device_sync.description')}
-
-
-
-
-
- {$i18n.t('login.perk.server_access.title')}
-
- {$i18n.t('login.perk.server_access.description')}
-
-
-
-
- {$i18n.t('login.perk.personal_profile.title')}
-
- {$i18n.t('login.perk.personal_profile.description')}
-
+
-
+
-
+ {#each perks as perk}
+
+ {/each}
+
-
+
{$i18n.t(perk.title)}
+{$i18n.t(perk.description)}
+
-
+
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte
index b46927c6..3896e1f3 100644
--- a/src/routes/settings/+page.svelte
+++ b/src/routes/settings/+page.svelte
@@ -3,12 +3,47 @@
import Text from '$lib/components/typography/Text.svelte';
import { applicationState } from '$lib/store/application_state';
import IconButton from '$lib/components/ui/icon-button/IconButton.svelte';
- import { mdiExport, mdiImport } from '@mdi/js';
+ import { mdiDelete, mdiExport, mdiImport, mdiAlert, mdiMicrosoft } from '@mdi/js';
import type { Theme } from '$lib/types/theme';
import { Button } from '$lib/components/ui/button';
import DefaultLayout from '$lib/components/layout/DefaultLayout.svelte';
import i18n from '$lib/services/i18n';
- import { userProfile } from '$lib/store/user_profile';
+ import { defaultValues, userProfile } from '$lib/store/user_profile';
+ import BackendService from '$lib/services/backend';
+ import { siGoogle, siDiscord, siGithub, type SimpleIcon } from 'simple-icons';
+ import Icon from '$lib/components/ui/icon/icon.svelte';
+ import Card from '$lib/components/ui/card/card.svelte';
+ import { CardHeader, CardTitle, CardContent } from '$lib/components/ui/card';
+ import { Checkbox } from '$lib/components/ui/checkbox';
+ import { Label } from '$lib/components/ui/label';
+ import { goto } from '$app/navigation';
+ import {
+ Dialog,
+ DialogContent,
+ DialogFooter,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger
+ } from '$lib/components/ui/dialog';
+ import { nav } from '$lib/utils/nav_helper';
+ const backend = BackendService.getInstance();
+ const createConfigMutation = backend.user.updateConfig();
+ const deleteProfileMutation = backend.user.deleteUserProfile();
+
+ const loginOptions = [
+ { name: 'Google', icon: siGoogle, action: () => nav(backend.auth.login('google')) },
+ { name: 'Discord', icon: siDiscord, action: () => nav(backend.auth.login('discord')) },
+ {
+ name: 'Microsoft',
+ icon: mdiMicrosoft,
+ action: () => nav(backend.auth.login('microsoft'))
+ },
+ { name: 'Github', icon: siGithub, action: () => nav(backend.auth.login('github')) }
+ ];
+
+ const isSimpleIcon = (icon: string | SimpleIcon): icon is SimpleIcon => {
+ return typeof icon === 'object' && 'path' in icon;
+ };
const handleSettingsExport = () => {
let element = document.createElement('a');
@@ -23,7 +58,9 @@
element.click();
document.body.removeChild(element);
};
-
+ const userProfil = $userProfile;
+ const user = userProfil.account;
+ const settings = userProfil.config;
// Function to change theme to selected
function changeThemeTo(themeName: Theme) {
applicationState.update((state) => {
@@ -36,10 +73,131 @@
};
});
}
+
+ function handleSave() {
+ $createConfigMutation.mutate({
+ config: { ...get(userProfile).config }
+ });
+ }
+ // TODO : fix this once we have image on s3
+ const bgImageUrl = get(userProfile).account.namecard;
+
+ function handleDelete(): void {
+ $deleteProfileMutation.mutate();
+ applicationState.update((state) => {
+ return {
+ ...state,
+ isAuthenticated: false
+ };
+ });
+ userProfile.update(() => {
+ return defaultValues;
+ });
+ goto('/');
+ }
+
Local data will be overwritten once you log in
- Please backup your data before continuing
+ {$i18n.t('login.alert.title')}
+ {$i18n.t('login.alert.description')}
- nav(backend.auth.login('google'))}
- >
- Google
-
- nav(backend.auth.login('microsoft'))}
- >
- Microsoft
-
- nav(backend.auth.login('github'))}
- >
- Github
-
+ {#each loginOptions as option}
+
+ {/each}
+ {#if $applicationState.isAuthenticated}
+
{$i18n.t('settings.category.theming.title')}
+ {#if $applicationState.isAuthenticated}
+
+
+
+
+
+
+
+ {user.name}
+
+
+
+
+ UID: {user.uid}
++ Server: + {user.server} +
++ Adventure Rank: + {user.ar} +
++ World Level: + {user.wl} +
+"{user.signature}"
+
+
+ Profiles
+
+
+
+
+
+
+ {$i18n.t('settings.login_providers')}
+
+
+ {#each loginOptions as option}
+
+ {/each}
+
+
+
+
+ {/if}
+
+ {$i18n.t('settings.category.data.title')}
-
+ {#if $createProfileMutation.isIdle}
+
+ {$i18n.t('profile.create.pending.title')}
+ {$i18n.t('profile.create.pending.description')}
+
+ {/if}
+
+ {#if $createProfileMutation.isError}
+
+ {$i18n.t('profile.create.error.title')}
+ {error}
+
+ {/if}
+
diff --git a/src/routes/settings/import/+page.svelte b/src/routes/settings/import/+page.svelte
index 10cd97f2..13326f33 100644
--- a/src/routes/settings/import/+page.svelte
+++ b/src/routes/settings/import/+page.svelte
@@ -4,7 +4,6 @@
import IconButton from '$lib/components/ui/icon-button/IconButton.svelte';
import { mdiAlert, mdiFile, mdiImport } from '@mdi/js';
import { Tabs, TabsList, TabsTrigger } from '$lib/components/ui/tabs';
- import ImporterService, { type ImporterServices } from '$lib/services/importer';
import { Button } from '$lib/components/ui/button';
import {
AlertDialog,
@@ -19,11 +18,12 @@
import { goto } from '$app/navigation';
import Text from '$lib/components/typography/Text.svelte';
import i18n from '$lib/services/i18n';
+ import BackendService from '$lib/services/backend';
import { userProfile } from '$lib/store/user_profile';
- import { applicationState } from '$lib/store/application_state';
- let value: ImporterServices = 'dvalin';
- const importerService = new ImporterService();
+ let value: 'dvalin' | 'paimon' = 'dvalin';
+ const backend = BackendService.getInstance();
+ const syncUserProfile = backend.user.syncUserProfile();
let file: File | undefined = undefined;
let dialogOpen = false;
@@ -31,7 +31,7 @@
let element = document.createElement('input');
element.type = 'file';
element.style.display = 'none';
- element.onchange = (event) => {
+ element.onchange = (event: Event) => {
const target = event.target as HTMLInputElement;
if (target.files && target.files.length === 1) {
file = target.files[0];
@@ -47,36 +47,39 @@
dialogOpen = false;
if (file !== undefined) {
file.text().then((fileContent) => {
- try {
- let data = JSON.parse(fileContent);
- const importedUserProfile = importerService
- .getImporterService(value)
- .import(data);
-
- userProfile.set(importedUserProfile);
- toast.success('Imported successfully!', {
- description:
- 'Your data has been imported successfully and stored locally in your Browser'
- });
- goto('/settings');
- } catch (e) {
- toast.error('An error happened!', {
- description: e.message
- });
+ let data = JSON.parse(fileContent);
+ if (!$userProfile.wishes) {
+ throw new Error('No wishes found, please import from dvalin first');
}
+ Object.entries($userProfile.wishes).forEach(([key, array]) => {
+ if (!array || array.length === 0) {
+ throw new Error('No wishes found, please import from dvalin first' + key);
+ }
+ });
+ $syncUserProfile.mutateAsync(
+ {
+ file: data,
+ format: value
+ },
+ {
+ onError: (error) => {
+ console.error(error);
+ },
+ onSuccess: () => {
+ toast.success('Imported successfully!', {
+ description:
+ 'Your data has been send to the server and will be processed soon. You will be redirected to the settings page.'
+ });
+ goto('/settings');
+ }
+ }
+ );
});
}
};
-
-
- Imports are temporarily disabled while being logged in
-
-
+
Dval.in
diff --git a/src/routes/wish-statistics/import/+page.ts b/src/routes/wish-statistics/import/+page.ts
index a6448783..4cfd0009 100644
--- a/src/routes/wish-statistics/import/+page.ts
+++ b/src/routes/wish-statistics/import/+page.ts
@@ -7,7 +7,7 @@ export async function load({ parent, fetch }: PageLoadEvent) {
const { queryClient, backend } = await parent();
await queryClient.prefetchQuery({
- queryKey: ['fetchHoyoWishhistoryStatus', get(applicationState).isAuthenticated],
+ queryKey: ['fetchHoyoWishStatus', get(applicationState).isAuthenticated],
queryFn: async () =>
(
await fetch(backend.hoyo.getHoyoWishHistoryStatusUrl(), {
diff --git a/src/routes/wish-statistics/overview/+page.svelte b/src/routes/wish-statistics/overview/+page.svelte
index aadfb048..f3818e94 100644
--- a/src/routes/wish-statistics/overview/+page.svelte
+++ b/src/routes/wish-statistics/overview/+page.svelte
@@ -24,10 +24,11 @@
import i18n from '$lib/services/i18n';
import { userProfile } from '$lib/store/user_profile';
import { applicationState } from '$lib/store/application_state';
+ import { get } from 'svelte/store';
let wishData: IMappedWishes = {};
- const wishes: IWishes | undefined = $userProfile.wishes;
-
+ // TODO : to refactor
+ const wishes: IWishes | undefined = get(userProfile).wishes;
if (wishes !== undefined) {
Object.keys(wishes).forEach((key: string) => {
if (isWishBannerKey(key)) {
diff --git a/vite.config.js b/vite.config.js
index 236cc402..833e3cca 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -3,6 +3,10 @@ import { defineConfig } from 'vite';
import { SvelteKitPWA } from '@vite-pwa/sveltekit';
export default defineConfig({
+ preview: {
+ host: true,
+ port: 8080
+ },
plugins: [
sveltekit(),
SvelteKitPWA({
- {$i18n.t('settings.category.data.title')}
-
-
+ {/if}
diff --git a/src/routes/settings/firstlogin/+page.svelte b/src/routes/settings/firstlogin/+page.svelte
new file mode 100644
index 00000000..1ca94249
--- /dev/null
+++ b/src/routes/settings/firstlogin/+page.svelte
@@ -0,0 +1,72 @@
+
+
+
- {#if !$applicationState.isAuthenticated}
+
{$i18n.t('settings.category.data.import_data_button')}
- {/if}
-
- {$i18n.t('settings.category.data.export_data_button')}
-
+
+
+ {$i18n.t('settings.category.data.export_data_button')}
+
+
+
-
+
+ {/if}
+
+ {#if $createProfileMutation.isPending}
+
+
+ {$i18n.t('profile.complete.title')}
+{$i18n.t('profile.complete.description')}
+