+
{name}
diff --git a/src/lib/components/achievement/AchievementList.svelte b/src/lib/components/achievement/AchievementList.svelte
index e586c4fa..5524a972 100644
--- a/src/lib/components/achievement/AchievementList.svelte
+++ b/src/lib/components/achievement/AchievementList.svelte
@@ -138,7 +138,7 @@
{achievement.desc}
{#if achievement.hidden === 'Yes'}
- Hidden {achievement.hidden}
+ Hidden
{/if}
{#if achievement.type}
{achievement.type}
diff --git a/src/lib/components/tables/character-tab-table/StatTable.svelte b/src/lib/components/tables/character-tab-table/StatTable.svelte
index b0cfd8e4..85ecce91 100644
--- a/src/lib/components/tables/character-tab-table/StatTable.svelte
+++ b/src/lib/components/tables/character-tab-table/StatTable.svelte
@@ -1,6 +1,6 @@
diff --git a/src/lib/components/tables/weapon-tab-table/StatTable.svelte b/src/lib/components/tables/weapon-tab-table/StatTable.svelte
new file mode 100644
index 00000000..1754be12
--- /dev/null
+++ b/src/lib/components/tables/weapon-tab-table/StatTable.svelte
@@ -0,0 +1,63 @@
+
+
+
+
+
+ Asc
+ Level
+ {#each Object.values(stats) as value}
+ {#if typeof value === 'string'}
+
+ {value.replace('Base ', '')}
+
+ {/if}
+ {/each}
+
+
+
+ {#each ascensions as ascension, j}
+
+
+
+
+
+
+
+
+
+
+ {/each}
+
+
diff --git a/src/lib/components/tables/weapon-tab-table/index.ts b/src/lib/components/tables/weapon-tab-table/index.ts
new file mode 100644
index 00000000..cf211b59
--- /dev/null
+++ b/src/lib/components/tables/weapon-tab-table/index.ts
@@ -0,0 +1,28 @@
+import Root from './table.svelte';
+import Body from '../../ui/table/table-body.svelte';
+import Caption from '../../ui/table/table-caption.svelte';
+import Cell from '../../ui/table/table-cell.svelte';
+import Footer from '../../ui/table/table-footer.svelte';
+import Head from '../../ui/table/table-head.svelte';
+import Header from '../../ui/table/table-header.svelte';
+import Row from '../../ui/table/table-row.svelte';
+
+export {
+ Root,
+ Body,
+ Caption,
+ Cell,
+ Footer,
+ Head,
+ Header,
+ Row,
+ //
+ Root as Table,
+ Body as TableBody,
+ Caption as TableCaption,
+ Cell as TableCell,
+ Footer as TableFooter,
+ Head as TableHead,
+ Header as TableHeader,
+ Row as TableRow
+};
diff --git a/src/lib/components/tables/weapon-tab-table/table.svelte b/src/lib/components/tables/weapon-tab-table/table.svelte
new file mode 100644
index 00000000..57b16d91
--- /dev/null
+++ b/src/lib/components/tables/weapon-tab-table/table.svelte
@@ -0,0 +1,15 @@
+
+
+
+
+ + {ascension.ascension} +
+
+
+ + {ascension.level} +
+
+
+ + {stats.levels[j * 2].primary} +
++ {stats.levels[j * 2 + 1].primary} +
+
+
+ + {stats.levels[j * 2].secondary} +
++ {stats.levels[j * 2 + 1].secondary} +
+
+
+
+
diff --git a/src/lib/components/ui/card/CardLevel.svelte b/src/lib/components/ui/card/CardLevel.svelte
deleted file mode 100644
index 419e7a05..00000000
--- a/src/lib/components/ui/card/CardLevel.svelte
+++ /dev/null
@@ -1,4 +0,0 @@
-
diff --git a/src/lib/components/ui/card/CharCard.svelte b/src/lib/components/ui/card/CharCard.svelte
index 1e4c752a..e17c0deb 100644
--- a/src/lib/components/ui/card/CharCard.svelte
+++ b/src/lib/components/ui/card/CharCard.svelte
@@ -15,7 +15,7 @@
+ import Text from '$lib/components/typography/Text.svelte';
+ import S3Service from '$lib/services/s3';
+
+ export let name: string;
+ export let img: string;
+ export let type: string;
+ export let level: number;
+ export let ascencion: number;
+ export let refinement: number;
+ export let rarity: number;
+ export let location: string;
+
+
+
+
+ {$i18n.t('weapons.detailed.tab.stats.title')}
+
+ {$i18n.t('weapons.detailed.tab.refinement.title')}
+
+
+
+
+
+
+
+
+ {#each weaponData.refinements as refinement}
+
+ {weaponData.passive}. {refinement.refinement}
+ {refinement.desc}
+
+ {/each}
+
+
diff --git a/src/lib/components/ui/progress/progress.svelte b/src/lib/components/ui/progress/progress.svelte
index 7440dcd6..be9de3d8 100644
--- a/src/lib/components/ui/progress/progress.svelte
+++ b/src/lib/components/ui/progress/progress.svelte
@@ -7,7 +7,8 @@
export let max: $$Props['max'] = 100;
export let value: $$Props['value'] = undefined;
export { className as class };
- const percent = Math.round(((value ?? 0) / (max ?? 1)) * 100);
+ const percent = Math.round(((Number(value) ?? 0) / (Number(max) ?? 1)) * 100);
+ console.log(percent);
+
+ {#if location !== ''}
+
diff --git a/src/lib/components/ui/card/WeapCard.svelte b/src/lib/components/ui/card/WeapCard.svelte
new file mode 100644
index 00000000..dcc2fd23
--- /dev/null
+++ b/src/lib/components/ui/card/WeapCard.svelte
@@ -0,0 +1,31 @@
+
+
+
+
+ .icon})
+
+ {/if}
+
+
+
+
+ + {refinement} +
+
+ 
+
+
+
+
+ Lv. {level}
+
+
+
+
+
+ {name}
+
+
+{type} {level} {ascencion} {refinement}
+
+
+ {count}
+
+
+
+ {name}
+
+
+
+
diff --git a/src/lib/components/ui/character-tabs/character-tabs.svelte b/src/lib/components/ui/character-tabs/character-tabs.svelte
index 918d4447..447e5845 100644
--- a/src/lib/components/ui/character-tabs/character-tabs.svelte
+++ b/src/lib/components/ui/character-tabs/character-tabs.svelte
@@ -1,6 +1,6 @@
+
+{type}
+ - {value}/{max} ({percent}%) + {value}/{max} + {`(${percent}%)`}
diff --git a/src/lib/locales/EN.json b/src/lib/locales/EN.json index 2119328e..50e11e60 100644 --- a/src/lib/locales/EN.json +++ b/src/lib/locales/EN.json @@ -175,10 +175,16 @@ "action.reset_filters": "Reset Filters", "filter.element": "Element", "filter.weapon": "Weapon", - "filter.rarity": "Rarity", - "filter.owned": "Owned", + "sort.rarity": "Rarity", "sort.name": "Name", + "sort.count": "Count", + "sort.owned": "Owned", "sort.date": "Date", + "weapons.overview.title": "Weapons", + "weapons.detailed.tab.refinement.title": "Refinement", + "weapons.detailed.tab.stats.title": "Stats", + "weapons.detailed.tab.materials.title": "Materials", + "weapons.title.inventory": "In your inventory", "sort.constellation": "Constellation", "achievement.title": "Achievements", "achievement.filter.all": "No filter", @@ -187,6 +193,7 @@ "achievement.filter.hidden": "Hidden", "achievement.more_info": "More info", "achievement.unachieved": "Show unachieved first", + "rarity": "Rarity", "language.DE": "Deutsch", "language.EN": "English", "language.ES": "Español", diff --git a/src/lib/services/backend/data.ts b/src/lib/services/backend/data.ts index 69634902..0217259e 100644 --- a/src/lib/services/backend/data.ts +++ b/src/lib/services/backend/data.ts @@ -7,7 +7,7 @@ import { backendFetch } from '$lib/services/backend/index'; import type { CharacterIndex } from '$lib/types/index/character'; import type { WeaponIndex } from '$lib/types/index/weapon'; import type { Character } from '$lib/types/data/Character'; -import type { Weapon } from '$lib/types/data/Weapon'; +import type { Weapon } from 'dvalin-data'; import type { mergedAchievements } from '$lib/types/achievement'; type FetchCharacterDataIndexResponse = CharacterIndex; diff --git a/src/lib/types/index/weapon.ts b/src/lib/types/index/weapon.ts index c60454f3..4ef3f553 100644 --- a/src/lib/types/index/weapon.ts +++ b/src/lib/types/index/weapon.ts @@ -4,5 +4,6 @@ export type WeaponIndex = { [key in WeaponKey]: { name: string; rarity: number; + type: string; }; }; diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 81a5bf1c..28ca651b 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -17,7 +17,7 @@ import { Input } from '$lib/components/ui/input'; import { mdiPencil, mdiImport, mdiAccount, mdiSwordCross, mdiTrashCanOutline } from '@mdi/js'; - import CharCard from '$lib/components/ui/card/CharCard.svelte'; + import CharCard from '$lib/components/ui/card/WeapCard.svelte'; import type { Elements } from '$lib/types/elements'; import type { WeaponTypes } from '$lib/types/weapon'; import { onMount } from 'svelte'; diff --git a/src/routes/achievement/+page.svelte b/src/routes/achievement/+page.svelte index 697bdf64..360fc7c1 100644 --- a/src/routes/achievement/+page.svelte +++ b/src/routes/achievement/+page.svelte @@ -20,6 +20,7 @@ import Icon from '$lib/components/ui/icon/icon.svelte'; import * as Tabs from '$lib/components/ui/tabs'; import Badge from '$lib/components/ui/badge/badge.svelte'; + import Progress from '$lib/components/ui/progress/progress.svelte'; const lang = $i18n.language; const backend = BackendService.getInstance(); @@ -38,10 +39,34 @@ let selectedCategory: string | null = null; $userProfile.achievements; + const customSortAchievements = (achievements: { + [category: string]: + | (mergedAchievements & { + image?: string; + }) + | undefined; + }) => { + const priorityItems = ['WondersOfTheWorld', 'MemoriesOfTheHeart']; + + return Object.entries(achievements).sort(([categoryA], [categoryB]) => { + const indexA = priorityItems.indexOf(categoryA); + const indexB = priorityItems.indexOf(categoryB); + + if (indexA !== -1 && indexB !== -1) { + return indexA - indexB; + } else if (indexA !== -1) { + return -1; + } else if (indexB !== -1) { + return 1; + } else { + return categoryA.localeCompare(categoryB); + } + }); + }; + async function fetchAchievementsAndImages() { if ($categoriesQuery.isSuccess && $categoriesQuery.data) { - const sortedCategories = ['WondersOfTheWorld', 'MemoriesOfTheHeart']; - sortedCategories.push(...$categoriesQuery.data.sort((a, b) => a.localeCompare(b))); + const sortedCategories = $categoriesQuery.data.sort((a, b) => a.localeCompare(b)); const categoryPromises = sortedCategories.map(async (category) => { const query = backend.data.fetchAchievements(lang, category); $achievementsQueries[category] = query; @@ -82,6 +107,7 @@ }); await Promise.all(categoryPromises); + $achievements = Object.fromEntries(customSortAchievements($achievements)); isLoading = false; } } @@ -117,7 +143,6 @@ function handleFilterChange(filterType: string, value: any) { selectedFilters[filterType as 'hidden' | 'type' | 'version'] = value; - console.log(selectedFilters); } $: filteredAchievements = @@ -195,9 +220,20 @@ }, [] as string[]) .sort((a, b) => parseInt(a) - parseInt(b)); } + + $: totalAchievements = Object.values($achievements).reduce( + (acc, category) => (category ? acc + category.achievements.length : acc), + 0 + ); + $: totalAchieved = Object.values($achievements).reduce( + (acc, category) => + category ? acc + category.achievements.filter((a) => a.achieved).length : acc, + 0 + );
{#if selectedCategory}
diff --git a/src/routes/characters/+page.svelte b/src/routes/characters/+page.svelte
index 80089586..e44b501f 100644
--- a/src/routes/characters/+page.svelte
+++ b/src/routes/characters/+page.svelte
@@ -257,7 +257,8 @@
class="flex hover:bg-tertiary gap-2"
on:click={() => setSortStore('Rarity')}
>
- setSortStore('Name')}
>
- setSortStore('Date')}
>
-
setSortStore('Rarity')}
>
-
setSortStore('Constellation')}
>
-
@@ -609,7 +614,7 @@
-
+
{#each $sortedCharacterStore as character}
{
const data = { ...user, config };
- console.log(data);
await $createProfileMutation.mutateAsync(data, {
onError: (error) => {
toast.error($i18n.t('profile.create.error', { error: error.message }));
diff --git a/src/routes/weapons/+page.svelte b/src/routes/weapons/+page.svelte
new file mode 100644
index 00000000..014e3c71
--- /dev/null
+++ b/src/routes/weapons/+page.svelte
@@ -0,0 +1,559 @@
+
+
+
+
+
+
+
+
+
+ {$i18n.t('action.sort_by', {
+ sortFN: $i18n.t(`sort.${$sortStore.sortFn.toLowerCase()}`)
+ })}
+
+
+
+ setSortStore('Name')}
+ >
+
+ setSortStore('Count')}
+ >
+
+ setSortStore('Rarity')}
+ >
+
+
+
+ setSortStore('Name')}
+ >
+
+ setSortStore('Count')}
+ >
+
+ setSortStore('Rarity')}
+ >
+
+
+
+
+
+
+
+ {$i18n.t('action.filter_by')}
+
+
+
+ resetFilters()}
+ >
+ {$i18n.t('action.reset_filters')}
+
+
+
+ {$i18n.t('filter.weapon')}
+
+
+ {#each weapons as { name, icon }}
+ {
+ setFilterStore('weapon', name);
+ toggleChecked(name);
+ }}
+ >
+
+
+
+ {/each}
+
+
+
+ {$i18n.t('filter.rarity')}
+
+
+ {
+ setFilterStore('rarity', 5);
+ toggleChecked('rarity5');
+ }}
+ >
+
+
+
+ {
+ setFilterStore('rarity', 4);
+ toggleChecked('rarity4');
+ }}
+ >
+
+
+
+ {
+ setFilterStore('rarity', 3);
+ toggleChecked('rarity3');
+ }}
+ >
+
+
+
+
+
+
+ Ownership
+
+
+ {
+ setFilterStore('owned', true);
+ toggleChecked('owned');
+ }}
+ class="gap-2"
+ >
+
+
+
+ {
+ setFilterStore('owned', false);
+ toggleChecked('notowned');
+ }}
+ class="gap-2"
+ >
+
+
+
+
+
+
+
+
+
+
diff --git a/src/routes/weapons/[slug]/+page.svelte b/src/routes/weapons/[slug]/+page.svelte
new file mode 100644
index 00000000..6ac3b345
--- /dev/null
+++ b/src/routes/weapons/[slug]/+page.svelte
@@ -0,0 +1,104 @@
+
+
+
+ {#if $fetchWeaponData.status === 'success'}
+
+
+ 
+
+
+
+ {$i18n.t('weapons.title.inventory')}
+
diff --git a/src/routes/weapons/[slug]/+page.ts b/src/routes/weapons/[slug]/+page.ts
new file mode 100644
index 00000000..6fd944bb
--- /dev/null
+++ b/src/routes/weapons/[slug]/+page.ts
@@ -0,0 +1,14 @@
+import type { PageLoadEvent } from '../../weapons/[slug]/$types';
+
+/** @type {import('./$types').PageLoad} */
+export async function load({ params, parent, fetch }: PageLoadEvent) {
+ const { queryClient, backend } = await parent();
+ const key = params.slug;
+
+ await queryClient.prefetchQuery({
+ queryKey: ['fetchWeaponData', key],
+ queryFn: async () => (await fetch(backend.data.getWeaponDataUrl(key))).json()
+ });
+
+ return { weaponKey: key };
+}
diff --git a/vite.config.js b/vite.config.js
index 833e3cca..4496a614 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -1,12 +1,27 @@
import { sveltekit } from '@sveltejs/kit/vite';
import { defineConfig } from 'vite';
import { SvelteKitPWA } from '@vite-pwa/sveltekit';
+import { resolve } from 'path';
export default defineConfig({
preview: {
host: true,
port: 8080
},
+ optimizeDeps: {
+ exclude: ['dvalin-data']
+ },
+ build: {
+ commonjsOptions: {
+ include: [/node_modules/]
+ }
+ },
+ resolve: {
+ alias: {
+ 'dvalin-data': resolve(__dirname, 'node_modules/dvalin-data/dist/types')
+ }
+ },
+
plugins: [
sveltekit(),
SvelteKitPWA({
+ resetFilters()}
+ >
+ Reset Filters
+
+
+
+
+
+
+
+
+
+ Element
+
+
+
+
+
+
+ Weapon
+
+
+ {#each weapons as { name, icon }}
+
+ {/each}
+
+
+
+
+
+
+ Rarity
+
+
+
+
+
+
+
+
+ Ownership
+
+
+
+
+
+
+ {#each $sortedWeaponStore as weapon}
+
+
+
+ {$fetchWeaponData.data.name}
+
+
+
+ {#each { length: $fetchWeaponData.data.rarity } as _}
+
+
+
+ {$fetchWeaponData.data.type}
+
+
+
+ {$fetchWeaponData.data.description}
+
+
+
+ {#each ownedWeapon as weapon}
+
+
+ {/if}
+