From 06fd36078d3fd95481ca5000a70449dc794f8379 Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 6 Jan 2024 04:25:56 +0200 Subject: [PATCH 01/21] feat: created homepage --- src/routes/homepage/+page.svelte | 43 ++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) create mode 100644 src/routes/homepage/+page.svelte diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte new file mode 100644 index 00000000..2a3fc881 --- /dev/null +++ b/src/routes/homepage/+page.svelte @@ -0,0 +1,43 @@ + + +
+
+ +
+ + + + Welcome to Dval.in! + + +

+ Your best Genshin Impact companion! Dval.in helps you plan what to farm with an + ascension calculator, and it also tracks your progress with a todo list and a wish + counter. +

+ + + +
+ +
+ + + + Changelog: + + +

+ {@html changeLog} +

+ + + +
+
+
From 770c1bd64ca37b3324d01ae41c382bef7ff3ffd2 Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 6 Jan 2024 11:40:55 +0200 Subject: [PATCH 02/21] refactor: moved buttons to card footer --- src/lib/components/navigator/Sidebar.svelte | 4 +- src/routes/+layout.svelte | 2 +- src/routes/homepage/+page.svelte | 21 +-- src/routes/settings/+page.svelte | 139 ++++++++++---------- tailwind.config.js | 2 +- vite.config.js | 2 +- 6 files changed, 87 insertions(+), 83 deletions(-) diff --git a/src/lib/components/navigator/Sidebar.svelte b/src/lib/components/navigator/Sidebar.svelte index 9fa2e0fe..bd476903 100644 --- a/src/lib/components/navigator/Sidebar.svelte +++ b/src/lib/components/navigator/Sidebar.svelte @@ -62,8 +62,8 @@
{#if !isMobile} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 9f907924..53748683 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -24,4 +24,4 @@
- \ No newline at end of file + diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index 2a3fc881..4bf8774a 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -2,7 +2,8 @@ import * as Card from '$lib/components/ui/card'; import { Button } from '$lib/components/ui/button'; - let changeLog = "Version 4.3:
New characters: Navia, Cehevreuse"; + let changeLog = `Version 4.3: +〓 Update Details 〓`;
@@ -14,29 +15,31 @@ Welcome to Dval.in! - +

Your best Genshin Impact companion! Dval.in helps you plan what to farm with an ascension calculator, and it also tracks your progress with a todo list and a wish counter.

- + + +
- + Changelog: - -

- {@html changeLog} -

- + +

{changeLog}

 + + +
diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 4aea5c53..278f0432 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -4,7 +4,7 @@ import { settings } from '$lib/store/global_state'; import { get } from 'svelte/store'; import { type Settings, Convert as SettingsConvertor } from '$lib/structs/settings'; - let category_on: string + let categoryOn: string; enum SettingFileMode { Import, @@ -54,76 +54,77 @@ n.global.theme = themeNumber; return n; }); - location.reload() + location.reload(); } -{#key category_on} -
-
- - - - - User Settings - - -
- themeChange(0)} - bind:group={category_on} - /> - -
- themeChange(1)} - bind:group={category_on} - /> - -
+{#key categoryOn} +
+
+ + + + + User Settings + + +
+ themeChange(0)} + bind:group={categoryOn} + /> + +
- themeChange(2)} - /> - -
- - - - - - - Global Settings - - -
- - -
- - + themeChange(1)} + bind:group={categoryOn} + /> + +
+ + themeChange(2)} + /> + +
+ + + + + + + Global Settings + + +
+ + +
+ + +
-
-{/key} \ No newline at end of file +{/key} diff --git a/tailwind.config.js b/tailwind.config.js index d2e4c5d0..c59ab1c8 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -18,7 +18,7 @@ const config = { } }, extend: { - backgroundColor: "#000000", + backgroundColor: '#000000', colors: {}, borderRadius: { lg: 'var(--radius)', diff --git a/vite.config.js b/vite.config.js index 842631bd..bbf8c7da 100644 --- a/vite.config.js +++ b/vite.config.js @@ -3,4 +3,4 @@ import { defineConfig } from 'vite'; export default defineConfig({ plugins: [sveltekit()] -}); \ No newline at end of file +}); From 1fcc092300dd7dacc01c448dd2b166c3a158faba Mon Sep 17 00:00:00 2001 From: XenosG Date: Sun, 7 Jan 2024 17:29:23 +0200 Subject: [PATCH 03/21] feat: added more cards --- src/routes/homepage/+page.svelte | 70 ++++++++++++++++++++++++++++---- 1 file changed, 61 insertions(+), 9 deletions(-) diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index 4bf8774a..7c30e946 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -3,44 +3,96 @@ import { Button } from '$lib/components/ui/button'; let changeLog = `Version 4.3: -〓 Update Details 〓`; + +New Characters +- 5-Star Character "Helm of the Radiant Rose" Navia (Geo) + - Vision: Geo + - Weapon: Claymore + - Elemental Skill: Ceremonial Crystalshot + - Elemental Burst: As the Sunlit Sky's Singing Salute + +- 4-Star Character "Executor of Justice" Chevreuse (Pyro) + - Vision: Pyro + - Weapon: Polearm + - Elemental Skill: Short-Range Rapid Interdiction Fire + - Elemental Burst: Ring of Bursting Grenades + +`;
-
+
-
- +
+ Welcome to Dval.in! - +

Your best Genshin Impact companion! Dval.in helps you plan what to farm with an ascension calculator, and it also tracks your progress with a todo list and a wish counter.

- +
-
- +
+ Changelog: - +

{changeLog}

 +
+ +
+ + + + Reminder + + +

+ + +
+ +
+ + + + Current Events + + +

+ + +
+ +
+ + + + To-do List + + +

+ + +
+
From 64fd0313a72ce0bc90e77eefecb66b82b76cfb13 Mon Sep 17 00:00:00 2001 From: XenosG Date: Mon, 8 Jan 2024 02:54:14 +0200 Subject: [PATCH 04/21] feat: setup masonry layout for cards --- src/routes/+page.svelte | 2 +- src/routes/homepage/+page.svelte | 161 ++++++++++++++++++------------- 2 files changed, 93 insertions(+), 70 deletions(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index aa209b47..df5f1617 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1 +1 @@ -src/routes/homepage/+page.svelte \ No newline at end of file +src/routes/homepage/+page.svelte diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index 7c30e946..f70dedbc 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -20,79 +20,102 @@ New Characters `; -
-
+
+
+

Home

+ +
+
-
- - - - Welcome to Dval.in! - - -

- Your best Genshin Impact companion! Dval.in helps you plan what to farm with an - ascension calculator, and it also tracks your progress with a todo list and a wish - counter. -

- - - - - -
+ + + + Welcome to Dval.in! + + +

+ Your best Genshin Impact companion! Dval.in helps you plan what to farm with an ascension + calculator, and it also tracks your progress with a todo list and a wish counter. +

+ + + + + -
- - - - Changelog: - - -

{changeLog}

- - - - - - -
+ + + + Changelog: + + +

{changeLog}

+ + + + + -
- - - - Reminder - - -

- - -
+ + + + Reminder + + +

+ + -
- - - - Current Events - - -

- - -
+ + + + Current Events + + +

+ + -
- - - - To-do List - - -

- - -
+ + + + To-do List + + +

+ + + + + + + Achievements + + +

+ + + + + + + Pity + + +

+ + + + + + + Display + + +

+ +
-
From 63098bd8318d76376415caed07572e64f49676d5 Mon Sep 17 00:00:00 2001 From: XenosG Date: Mon, 8 Jan 2024 03:49:46 +0200 Subject: [PATCH 05/21] fix: fixed masonry layout (for now) --- src/lib/components/navigator/Sidebar.svelte | 2 +- src/lib/components/ui/button/index.ts | 10 ++--- src/lib/components/ui/card/card.svelte | 2 +- src/routes/homepage/+page.svelte | 41 +++++++++++++++++---- src/routes/settings/+page.svelte | 2 +- tailwind.config.js | 8 ++-- 6 files changed, 45 insertions(+), 20 deletions(-) diff --git a/src/lib/components/navigator/Sidebar.svelte b/src/lib/components/navigator/Sidebar.svelte index 4e9abbc7..085deeed 100644 --- a/src/lib/components/navigator/Sidebar.svelte +++ b/src/lib/components/navigator/Sidebar.svelte @@ -231,4 +231,4 @@ -
\ No newline at end of file +
diff --git a/src/lib/components/ui/button/index.ts b/src/lib/components/ui/button/index.ts index 4a42d1e6..17f86bc2 100644 --- a/src/lib/components/ui/button/index.ts +++ b/src/lib/components/ui/button/index.ts @@ -7,10 +7,8 @@ const buttonVariants = tv({ variants: { variant: { default: 'justify-center bg-primary text-primary-foreground hover:bg-fill/20', - destructive: - 'justify-center bg-destructive text-destructive-foreground hover:bg-fill/20', - outline: - 'justify-center border border-input bg-background hover:bg-accent hover:bg-fill/20', + destructive: 'justify-center bg-destructive text-destructive-foreground hover:bg-fill/20', + outline: 'justify-center border border-input bg-background hover:bg-accent hover:bg-fill/20', secondary: 'justify-center bg-secondary text-secondary-foreground hover:bg-fill/20', ghost: 'justify-center hover:bg-accent hover:text-accent-foreground', link: 'justify-center text-primary underline-offset-4 hover:bg-fill/20', @@ -26,7 +24,7 @@ const buttonVariants = tv({ default: 'h-10 px-4 py-2', sm: 'h-9 rounded-md px-3', lg: 'h-11 rounded-md px-8', - icon: 'h-10 w-10', + icon: 'h-10 w-10' } }, defaultVariants: { @@ -54,4 +52,4 @@ export { type Props as ButtonProps, type Events as ButtonEvents, buttonVariants -}; \ No newline at end of file +}; diff --git a/src/lib/components/ui/card/card.svelte b/src/lib/components/ui/card/card.svelte index e301a4fb..9f78522b 100644 --- a/src/lib/components/ui/card/card.svelte +++ b/src/lib/components/ui/card/card.svelte @@ -10,4 +10,4 @@
-
\ No newline at end of file +
diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index f70dedbc..1b49f22c 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -20,13 +20,13 @@ New Characters `; -
+

Home

@@ -64,7 +64,16 @@ New Characters Reminder -

+

Daily + daily quest + something else + 3day + farm nobushi + farm hilichurls + weekly + parametric + crystalfly +

@@ -84,7 +93,15 @@ New Characters To-do List -

+

Farmable today: + thing + thing + thing + thing + summary: + some more + even more thing +

@@ -94,7 +111,11 @@ New Characters Achievements -

+

Latest achievement: + name of achievement + overall progress + progress bar with percantages +

@@ -104,7 +125,10 @@ New Characters Pity -

+

Character Pity gold color 5* and purple for 4* + weapon Pity gold color 5* and purple for 4* + standart pity gold color 5* and purple for 4* +

@@ -114,7 +138,10 @@ New Characters Display -

+

char or weapon icon + name + info +

diff --git a/src/routes/settings/+page.svelte b/src/routes/settings/+page.svelte index 7edd085e..6a65c1e2 100644 --- a/src/routes/settings/+page.svelte +++ b/src/routes/settings/+page.svelte @@ -131,4 +131,4 @@
-
\ No newline at end of file +
diff --git a/tailwind.config.js b/tailwind.config.js index 0cb710f0..a3741a9a 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -3,7 +3,7 @@ import { createThemes } from 'tw-colors'; /* eslint-disable @typescript-eslint/naming-convention */ /** @type {import('tailwindcss').Config} */ const config = { - darkMode: ['class'], + darkMode: ['class'], content: ['./src/**/*.{html,js,svelte,ts}'], corePlugins: { preflight: true @@ -27,8 +27,8 @@ const config = { }, fontFamily: { sans: [...fontFamily.sans] - } - }, + } + } }, plugins: [ createThemes( @@ -70,4 +70,4 @@ const config = { ] }; -export default config; \ No newline at end of file +export default config; From d739f11f2c75e066519ef8f6fc04aedb69a6da2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6nig?= Date: Tue, 16 Jan 2024 23:52:08 +0100 Subject: [PATCH 06/21] fix: Run prettier format --- src/routes/homepage/+page.svelte | 35 ++++++++------------------------ 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index 1b49f22c..a57f1410 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -64,14 +64,8 @@ New Characters Reminder -

Daily - daily quest - something else - 3day - farm nobushi - farm hilichurls - weekly - parametric +

+ Daily daily quest something else 3day farm nobushi farm hilichurls weekly parametric crystalfly

@@ -93,14 +87,8 @@ New Characters To-do List -

Farmable today: - thing - thing - thing - thing - summary: - some more - even more thing +

+ Farmable today: thing thing thing thing summary: some more even more thing

@@ -111,10 +99,8 @@ New Characters Achievements -

Latest achievement: - name of achievement - overall progress - progress bar with percantages +

+ Latest achievement: name of achievement overall progress progress bar with percantages

@@ -125,8 +111,8 @@ New Characters Pity -

Character Pity gold color 5* and purple for 4* - weapon Pity gold color 5* and purple for 4* +

+ Character Pity gold color 5* and purple for 4* weapon Pity gold color 5* and purple for 4* standart pity gold color 5* and purple for 4*

@@ -138,10 +124,7 @@ New Characters Display -

char or weapon icon - name - info -

+

char or weapon icon name info
From 49247d82be8eb20e71ecfda1854de2b15a0aaa6f Mon Sep 17 00:00:00 2001 From: XenosG Date: Wed, 17 Jan 2024 21:59:08 +0200 Subject: [PATCH 07/21] fix: fixed temp info in cards fix: added temp link to homepage in root --- src/routes/+page.svelte | 2 +- src/routes/homepage/+page.svelte | 30 +++++++++++++++++++++++++----- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index df5f1617..c50c837c 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1 +1 @@ -src/routes/homepage/+page.svelte +Homepage \ No newline at end of file diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index a57f1410..566a33b7 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -65,7 +65,14 @@ New Characters

- Daily daily quest something else 3day farm nobushi farm hilichurls weekly parametric + Daily + daily quest + something else + 3day + farm nobushi + farm hilichurls + weekly + parametric crystalfly

@@ -88,7 +95,15 @@ New Characters

- Farmable today: thing thing thing thing summary: some more even more thing + Farmable today: + thing + thing + thing + thing + summary: + some more + even more + thing

@@ -100,7 +115,9 @@ New Characters

- Latest achievement: name of achievement overall progress progress bar with percantages + Latest achievement: name of achievement + overall progress + progress bar with percantages

@@ -112,7 +129,8 @@ New Characters

- Character Pity gold color 5* and purple for 4* weapon Pity gold color 5* and purple for 4* + Character Pity gold color 5* and purple for 4* + weapon Pity gold color 5* and purple for 4* standart pity gold color 5* and purple for 4*

@@ -124,7 +142,9 @@ New Characters Display -

char or weapon icon name info

+

char or weapon icon + name + info
From dcde963e85949b6e409c1627c47f0693d7e0a6be Mon Sep 17 00:00:00 2001 From: XenosG Date: Fri, 19 Jan 2024 20:52:16 +0200 Subject: [PATCH 08/21] fix: fixed formatting --- src/routes/+page.svelte | 2 +- src/routes/homepage/+page.svelte | 30 +++++------------------------- 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index c50c837c..7faa03f1 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -1 +1 @@ -Homepage \ No newline at end of file +Homepage diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index 566a33b7..a57f1410 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -65,14 +65,7 @@ New Characters

- Daily - daily quest - something else - 3day - farm nobushi - farm hilichurls - weekly - parametric + Daily daily quest something else 3day farm nobushi farm hilichurls weekly parametric crystalfly

@@ -95,15 +88,7 @@ New Characters

- Farmable today: - thing - thing - thing - thing - summary: - some more - even more - thing + Farmable today: thing thing thing thing summary: some more even more thing

@@ -115,9 +100,7 @@ New Characters

- Latest achievement: name of achievement - overall progress - progress bar with percantages + Latest achievement: name of achievement overall progress progress bar with percantages

@@ -129,8 +112,7 @@ New Characters

- Character Pity gold color 5* and purple for 4* - weapon Pity gold color 5* and purple for 4* + Character Pity gold color 5* and purple for 4* weapon Pity gold color 5* and purple for 4* standart pity gold color 5* and purple for 4*

@@ -142,9 +124,7 @@ New Characters Display -

char or weapon icon - name - info

+

char or weapon icon name info

 From 8d292e99f89b8075be4d151cc9fc2b2256de546a Mon Sep 17 00:00:00 2001 From: XenosG Date: Fri, 19 Jan 2024 23:27:58 +0200 Subject: [PATCH 09/21] refactor: Changed all text to use Text component --- src/routes/homepage/+page.svelte | 59 ++++++++++++++++++++------------ 1 file changed, 38 insertions(+), 21 deletions(-) diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index a57f1410..ae5e6e65 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -1,6 +1,7 @@
@@ -55,11 +95,11 @@ New Characters Changelog: - + {changeLog} - + @@ -72,8 +112,7 @@ New Characters - Daily daily quest something else 3day farm nobushi farm hilichurls weekly parametric - crystalfly + Daily teapot currency/friendship, dailies/encounters, [enemies], welkin 2day local specialties, iron, electro crystals 3day crystal chunks, teapot farm, fish weekly parametric crystalfly [weekly bosses] reputation @@ -113,7 +152,10 @@ New Characters - Latest achievement: name of achievement overall progress progress bar with percantages + Latest achievement: {mockAchievement.name} + + + overall progress progress bar with percantages @@ -126,11 +168,61 @@ New Characters - - Character Pity gold color 5* and purple for 4* weapon Pity gold color 5* and purple for 4* - standart pity gold color 5* and purple for 4* - +
+ + Character Banner + +
+
+ + {characterPity[0]} + +
+
+ + {characterPity[1]} + +
+
+
+
+ + Weapon Banner + +
+
+ + {weaponPity[0]} + +
+
+ + {weaponPity[1]} + +
+
+
+
+ + Standart Banner + +
+
+ + {standartPity[0]} + +
+
+ + {standartPity[1]} + +
+
+
+ + + From ee0a3f79e6575f867d421f240854d49578161f8d Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 20 Jan 2024 02:12:25 +0200 Subject: [PATCH 11/21] fix: fixed formatting, commented unused code --- src/routes/homepage/+page.svelte | 90 +++++++++++++++++--------------- 1 file changed, 48 insertions(+), 42 deletions(-) diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index 31deed6e..ff61ee7d 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -29,32 +29,32 @@ New Characters order: number; }; - type AchievementCategory = { - _id: number; - id: string; - name: string; - order: number; - achievements: Achievement[]; - }; + // type AchievementCategory = { + // idN: number; + // id: string; + // name: string; + // order: number; + // achievements: Achievement[]; + // }; const mockAchievement: Achievement = { id: 0, - name: 'testAchievement', + name: 'Test Achievement', desc: 'lorem ipsum', reward: 1, hidden: false, order: 0 }; - const mockAchievementCategory: AchievementCategory = { - _id: 0, - id: '0', - name: 'testCategory', - order: 0, - achievements: [mockAchievement] - }; + // const mockAchievementCategory: AchievementCategory = { + // idN: 0, + // id: 'testCategory', + // name: 'Test Category', + // order: 0, + // achievements: [mockAchievement] + // }; - let achievementProgress = 87.23; + // let achievementProgress = 87.23; let characterPity = [76, 8]; let weaponPity = [23, 2]; @@ -112,7 +112,9 @@ New Characters - Daily teapot currency/friendship, dailies/encounters, [enemies], welkin 2day local specialties, iron, electro crystals 3day crystal chunks, teapot farm, fish weekly parametric crystalfly [weekly bosses] reputation + Daily teapot currency/friendship, dailies/encounters, [enemies], welkin 2day local + specialties, iron, electro crystals 3day crystal chunks, teapot farm, fish weekly + parametric crystalfly [weekly bosses] reputation @@ -152,11 +154,9 @@ New Characters - Latest achievement: {mockAchievement.name} - - - overall progress progress bar with percantages + Latest achievement: {mockAchievement.name} + overall progress progress bar with percantages @@ -169,51 +169,57 @@ New Characters
- - Character Banner - + Character Banner
-
- +
+ {characterPity[0]}
-
- +
+ {characterPity[1]}
- - Weapon Banner - + Weapon Banner
-
- +
+ {weaponPity[0]}
-
- +
+ {weaponPity[1]}
- - Standart Banner - + Standart Banner
-
- +
+ {standartPity[0]}
-
- +
+ {standartPity[1]}
From 4f883f4154cffee189417136984643b3d063571f Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 20 Jan 2024 02:54:07 +0200 Subject: [PATCH 12/21] feat: added progress component (shadcn) fix: fixed colors in progress component feat: Achievement widget (almost complete) --- src/lib/components/ui/progress/index.ts | 7 ++++ .../components/ui/progress/progress.svelte | 26 +++++++++++++ src/routes/homepage/+page.svelte | 38 ++++++++++++++++--- 3 files changed, 66 insertions(+), 5 deletions(-) create mode 100644 src/lib/components/ui/progress/index.ts create mode 100644 src/lib/components/ui/progress/progress.svelte diff --git a/src/lib/components/ui/progress/index.ts b/src/lib/components/ui/progress/index.ts new file mode 100644 index 00000000..45dd0045 --- /dev/null +++ b/src/lib/components/ui/progress/index.ts @@ -0,0 +1,7 @@ +import Root from "./progress.svelte"; + +export { + Root, + // + Root as Progress +}; diff --git a/src/lib/components/ui/progress/progress.svelte b/src/lib/components/ui/progress/progress.svelte new file mode 100644 index 00000000..2f9d29e9 --- /dev/null +++ b/src/lib/components/ui/progress/progress.svelte @@ -0,0 +1,26 @@ + + + +
+ diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index ff61ee7d..3dead22c 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -2,6 +2,7 @@ import * as Card from '$lib/components/ui/card'; import { Button } from '$lib/components/ui/button'; import Text from '$lib/components/typography/Text.svelte'; + import { Progress } from '$lib/components/ui/progress'; let changeLog = `Version 4.3: @@ -54,7 +55,8 @@ New Characters // achievements: [mockAchievement] // }; - // let achievementProgress = 87.23; + let achievementsDone = 998; + let achievementsTotal = 1143; let characterPity = [76, 8]; let weaponPity = [23, 2]; @@ -144,21 +146,47 @@ New Characters - + - Achievements + Domain Rotation - Latest achievement: {mockAchievement.name} + talent materials, weapon materials + corresponding chars/weaps - overall progress progress bar with percantages + + + + + + Achievements + + + +
+ Latest achievement: +
+ {mockAchievement.name} +
+
+
+ Overall progress: +
+ {achievementsDone}/{achievementsTotal} +
+
+ + + + + + From c9a316e69a4c19a82e408ea3e9f0960b7d59bf98 Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 20 Jan 2024 02:55:02 +0200 Subject: [PATCH 13/21] fix: Run Prettier formatter --- src/lib/components/ui/progress/index.ts | 2 +- .../components/ui/progress/progress.svelte | 19 +++++++------------ src/routes/homepage/+page.svelte | 4 +--- 3 files changed, 9 insertions(+), 16 deletions(-) diff --git a/src/lib/components/ui/progress/index.ts b/src/lib/components/ui/progress/index.ts index 45dd0045..97f57fcd 100644 --- a/src/lib/components/ui/progress/index.ts +++ b/src/lib/components/ui/progress/index.ts @@ -1,4 +1,4 @@ -import Root from "./progress.svelte"; +import Root from './progress.svelte'; export { Root, diff --git a/src/lib/components/ui/progress/progress.svelte b/src/lib/components/ui/progress/progress.svelte index 2f9d29e9..de5fcac7 100644 --- a/src/lib/components/ui/progress/progress.svelte +++ b/src/lib/components/ui/progress/progress.svelte @@ -1,26 +1,21 @@
diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index 3dead22c..b3326872 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -155,9 +155,7 @@ New Characters - - talent materials, weapon materials + corresponding chars/weaps - + talent materials, weapon materials + corresponding chars/weaps From 2ebe36a032cc31774dab82060eed654bcff0aa84 Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 20 Jan 2024 19:01:30 +0200 Subject: [PATCH 14/21] fix: Text component now doesnt have margin by default, has margin property instead --- src/lib/components/typography/Blockquote.svelte | 2 +- src/lib/components/typography/H2.svelte | 4 +--- src/lib/components/typography/P.svelte | 2 +- src/lib/components/typography/Text.svelte | 10 +++++++--- src/routes/homepage/+page.svelte | 8 ++------ 5 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/lib/components/typography/Blockquote.svelte b/src/lib/components/typography/Blockquote.svelte index 8d86e8a8..0db3841e 100644 --- a/src/lib/components/typography/Blockquote.svelte +++ b/src/lib/components/typography/Blockquote.svelte @@ -1,3 +1,3 @@ -
+
diff --git a/src/lib/components/typography/H2.svelte b/src/lib/components/typography/H2.svelte index 41316b56..c6d2053b 100644 --- a/src/lib/components/typography/H2.svelte +++ b/src/lib/components/typography/H2.svelte @@ -1,5 +1,3 @@ -

+

diff --git a/src/lib/components/typography/P.svelte b/src/lib/components/typography/P.svelte index c494e861..46eddc5a 100644 --- a/src/lib/components/typography/P.svelte +++ b/src/lib/components/typography/P.svelte @@ -1,3 +1,3 @@ -

+

diff --git a/src/lib/components/typography/Text.svelte b/src/lib/components/typography/Text.svelte index 5f3dea93..8cb876b8 100644 --- a/src/lib/components/typography/Text.svelte +++ b/src/lib/components/typography/Text.svelte @@ -24,8 +24,12 @@ }; export let type: keyof typeof textMapping; + + export let margin: boolean = false; - - - +
+ + + +
diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index b3326872..454204e5 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -169,15 +169,11 @@ New Characters
Latest achievement: -
- {mockAchievement.name} -
+ {mockAchievement.name}
Overall progress: -
- {achievementsDone}/{achievementsTotal} -
+ {achievementsDone}/{achievementsTotal}
From 7116474aac359d9bd586e45a0647008079fad9fb Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 20 Jan 2024 19:36:10 +0200 Subject: [PATCH 15/21] fix: Run formatter --- src/lib/components/typography/H2.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/lib/components/typography/H2.svelte b/src/lib/components/typography/H2.svelte index 21a3b3cc..08d74227 100644 --- a/src/lib/components/typography/H2.svelte +++ b/src/lib/components/typography/H2.svelte @@ -1,3 +1,5 @@ -

+

From 139d6308e290fbd322a882508af6038066760913 Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 20 Jan 2024 19:46:08 +0200 Subject: [PATCH 16/21] fix: fixed achievement widget fix: fixed progress component colors to work with new color system --- .../components/ui/progress/progress.svelte | 4 +- src/routes/homepage/+page.svelte | 82 +++++++++---------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/lib/components/ui/progress/progress.svelte b/src/lib/components/ui/progress/progress.svelte index de5fcac7..e3555c90 100644 --- a/src/lib/components/ui/progress/progress.svelte +++ b/src/lib/components/ui/progress/progress.svelte @@ -11,11 +11,11 @@
diff --git a/src/routes/homepage/+page.svelte b/src/routes/homepage/+page.svelte index 454204e5..67dde2b9 100644 --- a/src/routes/homepage/+page.svelte +++ b/src/routes/homepage/+page.svelte @@ -168,11 +168,11 @@ New Characters
- Latest achievement: + Latest achievement: {mockAchievement.name}
- Overall progress: + Overall progress: {achievementsDone}/{achievementsTotal}
@@ -191,60 +191,60 @@ New Characters
- Character Banner + Character Banner
-
- + +
{characterPity[0]} - -
-
- +
+ + +
{characterPity[1]} - -
+
+
- Weapon Banner + Weapon Banner
-
- + +
{weaponPity[0]} - -
-
- +
+ + +
{weaponPity[1]} - -
+
+
- Standart Banner + Standart Banner
-
- + +
{standartPity[0]} - -
-
- +
+ + +
{standartPity[1]} - -
+
+
From 182816b2bd9b898aea64fac869790f444bd49169 Mon Sep 17 00:00:00 2001 From: XenosG Date: Sat, 20 Jan 2024 21:05:09 +0200 Subject: [PATCH 17/21] feat: added a bunch of components for future development --- package.json | 1 + pnpm-lock.yaml | 11 +++ .../ui/accordion/accordion-content.svelte | 25 ++++++ .../ui/accordion/accordion-item.svelte | 14 ++++ .../ui/accordion/accordion-trigger.svelte | 26 ++++++ src/lib/components/ui/accordion/index.ts | 17 ++++ .../components/ui/checkbox/checkbox.svelte | 34 ++++++++ src/lib/components/ui/checkbox/index.ts | 6 ++ .../ui/dialog/dialog-content.svelte | 36 ++++++++ .../ui/dialog/dialog-description.svelte | 16 ++++ .../components/ui/dialog/dialog-footer.svelte | 16 ++++ .../components/ui/dialog/dialog-header.svelte | 13 +++ .../ui/dialog/dialog-overlay.svelte | 21 +++++ .../components/ui/dialog/dialog-portal.svelte | 8 ++ .../components/ui/dialog/dialog-title.svelte | 16 ++++ src/lib/components/ui/dialog/index.ts | 34 ++++++++ src/lib/components/ui/form/form-button.svelte | 9 ++ .../components/ui/form/form-checkbox.svelte | 26 ++++++ .../ui/form/form-description.svelte | 13 +++ src/lib/components/ui/form/form-input.svelte | 28 +++++++ src/lib/components/ui/form/form-item.svelte | 12 +++ src/lib/components/ui/form/form-label.svelte | 17 ++++ .../ui/form/form-native-select.svelte | 26 ++++++ .../ui/form/form-radio-group.svelte | 22 +++++ .../ui/form/form-select-trigger.svelte | 17 ++++ src/lib/components/ui/form/form-select.svelte | 20 +++++ src/lib/components/ui/form/form-switch.svelte | 24 ++++++ .../components/ui/form/form-textarea.svelte | 29 +++++++ .../components/ui/form/form-validation.svelte | 14 ++++ src/lib/components/ui/form/index.ts | 82 +++++++++++++++++++ .../ui/hover-card/hover-card-content.svelte | 27 ++++++ src/lib/components/ui/hover-card/index.ts | 14 ++++ src/lib/components/ui/input/index.ts | 25 ++++++ src/lib/components/ui/input/input.svelte | 33 ++++++++ src/lib/components/ui/label/index.ts | 7 ++ src/lib/components/ui/label/label.svelte | 21 +++++ src/lib/components/ui/popover/index.ts | 14 ++++ .../ui/popover/popover-content.svelte | 22 +++++ src/lib/components/ui/select/index.ts | 34 ++++++++ .../ui/select/select-content.svelte | 39 +++++++++ .../components/ui/select/select-item.svelte | 38 +++++++++ .../components/ui/select/select-label.svelte | 16 ++++ .../ui/select/select-separator.svelte | 11 +++ .../ui/select/select-trigger.svelte | 27 ++++++ src/lib/components/ui/separator/index.ts | 7 ++ .../components/ui/separator/separator.svelte | 22 +++++ src/lib/components/ui/skeleton/index.ts | 7 ++ .../components/ui/skeleton/skeleton.svelte | 11 +++ src/lib/components/ui/sonner/index.ts | 1 + src/lib/components/ui/sonner/sonner.svelte | 21 +++++ src/lib/components/ui/switch/index.ts | 7 ++ src/lib/components/ui/switch/switch.svelte | 25 ++++++ src/lib/components/ui/table/index.ts | 28 +++++++ src/lib/components/ui/table/table-body.svelte | 13 +++ .../components/ui/table/table-caption.svelte | 13 +++ src/lib/components/ui/table/table-cell.svelte | 18 ++++ .../components/ui/table/table-footer.svelte | 13 +++ src/lib/components/ui/table/table-head.svelte | 19 +++++ .../components/ui/table/table-header.svelte | 14 ++++ src/lib/components/ui/table/table-row.svelte | 23 ++++++ src/lib/components/ui/table/table.svelte | 15 ++++ src/lib/components/ui/tabs/index.ts | 18 ++++ .../components/ui/tabs/tabs-content.svelte | 21 +++++ src/lib/components/ui/tabs/tabs-list.svelte | 19 +++++ .../components/ui/tabs/tabs-trigger.svelte | 23 ++++++ src/lib/components/ui/textarea/index.ts | 28 +++++++ .../components/ui/textarea/textarea.svelte | 31 +++++++ src/lib/components/ui/toggle-group/index.ts | 23 ++++++ .../ui/toggle-group/toggle-group-item.svelte | 31 +++++++ .../ui/toggle-group/toggle-group.svelte | 30 +++++++ src/lib/components/ui/toggle/index.ts | 30 +++++++ src/lib/components/ui/toggle/toggle.svelte | 26 ++++++ src/lib/components/ui/tooltip/index.ts | 15 ++++ .../ui/tooltip/tooltip-content.svelte | 28 +++++++ 74 files changed, 1541 insertions(+) create mode 100644 src/lib/components/ui/accordion/accordion-content.svelte create mode 100644 src/lib/components/ui/accordion/accordion-item.svelte create mode 100644 src/lib/components/ui/accordion/accordion-trigger.svelte create mode 100644 src/lib/components/ui/accordion/index.ts create mode 100644 src/lib/components/ui/checkbox/checkbox.svelte create mode 100644 src/lib/components/ui/checkbox/index.ts create mode 100644 src/lib/components/ui/dialog/dialog-content.svelte create mode 100644 src/lib/components/ui/dialog/dialog-description.svelte create mode 100644 src/lib/components/ui/dialog/dialog-footer.svelte create mode 100644 src/lib/components/ui/dialog/dialog-header.svelte create mode 100644 src/lib/components/ui/dialog/dialog-overlay.svelte create mode 100644 src/lib/components/ui/dialog/dialog-portal.svelte create mode 100644 src/lib/components/ui/dialog/dialog-title.svelte create mode 100644 src/lib/components/ui/dialog/index.ts create mode 100644 src/lib/components/ui/form/form-button.svelte create mode 100644 src/lib/components/ui/form/form-checkbox.svelte create mode 100644 src/lib/components/ui/form/form-description.svelte create mode 100644 src/lib/components/ui/form/form-input.svelte create mode 100644 src/lib/components/ui/form/form-item.svelte create mode 100644 src/lib/components/ui/form/form-label.svelte create mode 100644 src/lib/components/ui/form/form-native-select.svelte create mode 100644 src/lib/components/ui/form/form-radio-group.svelte create mode 100644 src/lib/components/ui/form/form-select-trigger.svelte create mode 100644 src/lib/components/ui/form/form-select.svelte create mode 100644 src/lib/components/ui/form/form-switch.svelte create mode 100644 src/lib/components/ui/form/form-textarea.svelte create mode 100644 src/lib/components/ui/form/form-validation.svelte create mode 100644 src/lib/components/ui/form/index.ts create mode 100644 src/lib/components/ui/hover-card/hover-card-content.svelte create mode 100644 src/lib/components/ui/hover-card/index.ts create mode 100644 src/lib/components/ui/input/index.ts create mode 100644 src/lib/components/ui/input/input.svelte create mode 100644 src/lib/components/ui/label/index.ts create mode 100644 src/lib/components/ui/label/label.svelte create mode 100644 src/lib/components/ui/popover/index.ts create mode 100644 src/lib/components/ui/popover/popover-content.svelte create mode 100644 src/lib/components/ui/select/index.ts create mode 100644 src/lib/components/ui/select/select-content.svelte create mode 100644 src/lib/components/ui/select/select-item.svelte create mode 100644 src/lib/components/ui/select/select-label.svelte create mode 100644 src/lib/components/ui/select/select-separator.svelte create mode 100644 src/lib/components/ui/select/select-trigger.svelte create mode 100644 src/lib/components/ui/separator/index.ts create mode 100644 src/lib/components/ui/separator/separator.svelte create mode 100644 src/lib/components/ui/skeleton/index.ts create mode 100644 src/lib/components/ui/skeleton/skeleton.svelte create mode 100644 src/lib/components/ui/sonner/index.ts create mode 100644 src/lib/components/ui/sonner/sonner.svelte create mode 100644 src/lib/components/ui/switch/index.ts create mode 100644 src/lib/components/ui/switch/switch.svelte create mode 100644 src/lib/components/ui/table/index.ts create mode 100644 src/lib/components/ui/table/table-body.svelte create mode 100644 src/lib/components/ui/table/table-caption.svelte create mode 100644 src/lib/components/ui/table/table-cell.svelte create mode 100644 src/lib/components/ui/table/table-footer.svelte create mode 100644 src/lib/components/ui/table/table-head.svelte create mode 100644 src/lib/components/ui/table/table-header.svelte create mode 100644 src/lib/components/ui/table/table-row.svelte create mode 100644 src/lib/components/ui/table/table.svelte create mode 100644 src/lib/components/ui/tabs/index.ts create mode 100644 src/lib/components/ui/tabs/tabs-content.svelte create mode 100644 src/lib/components/ui/tabs/tabs-list.svelte create mode 100644 src/lib/components/ui/tabs/tabs-trigger.svelte create mode 100644 src/lib/components/ui/textarea/index.ts create mode 100644 src/lib/components/ui/textarea/textarea.svelte create mode 100644 src/lib/components/ui/toggle-group/index.ts create mode 100644 src/lib/components/ui/toggle-group/toggle-group-item.svelte create mode 100644 src/lib/components/ui/toggle-group/toggle-group.svelte create mode 100644 src/lib/components/ui/toggle/index.ts create mode 100644 src/lib/components/ui/toggle/toggle.svelte create mode 100644 src/lib/components/ui/tooltip/index.ts create mode 100644 src/lib/components/ui/tooltip/tooltip-content.svelte diff --git a/package.json b/package.json index 45734511..def88b5c 100644 --- a/package.json +++ b/package.json @@ -47,6 +47,7 @@ "clsx": "^2.1.0", "i18next": "^23.7.12", "lucide-svelte": "^0.303.0", + "svelte-dragdroplist": "^1.1.1", "svelte-i18next": "^2.2.2", "svelte-persisted-store": "^0.8.0", "tailwind-merge": "^2.2.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e6dbc835..d2fb0af7 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -20,6 +20,9 @@ dependencies: lucide-svelte: specifier: ^0.303.0 version: 0.303.0(svelte@4.2.8) + svelte-dragdroplist: + specifier: ^1.1.1 + version: 1.1.1(svelte@4.2.8) svelte-i18next: specifier: ^2.2.2 version: 2.2.2(i18next@23.7.12)(svelte@4.2.8) @@ -3606,6 +3609,14 @@ packages: - sugarss dev: true + /svelte-dragdroplist@1.1.1(svelte@4.2.8): + resolution: {integrity: sha512-63jrgGeBG3J+ZjHhfnzhRdikj/lAdAbGDoryiGw2lrGr5/et3Tp8Y0Vmgf6t4lSkhq/DMmjxbwaVmWNj4nGiUg==} + peerDependencies: + svelte: ^3.0.0 + dependencies: + svelte: 4.2.8 + dev: false + /svelte-eslint-parser@0.33.1(svelte@4.2.8): resolution: {integrity: sha512-vo7xPGTlKBGdLH8T5L64FipvTrqv3OQRx9d2z5X05KKZDlF4rQk8KViZO4flKERY+5BiVdOh7zZ7JGJWo5P0uA==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} diff --git a/src/lib/components/ui/accordion/accordion-content.svelte b/src/lib/components/ui/accordion/accordion-content.svelte new file mode 100644 index 00000000..237db780 --- /dev/null +++ b/src/lib/components/ui/accordion/accordion-content.svelte @@ -0,0 +1,25 @@ + + + +
+ +
+ diff --git a/src/lib/components/ui/accordion/accordion-item.svelte b/src/lib/components/ui/accordion/accordion-item.svelte new file mode 100644 index 00000000..02063285 --- /dev/null +++ b/src/lib/components/ui/accordion/accordion-item.svelte @@ -0,0 +1,14 @@ + + + + + diff --git a/src/lib/components/ui/accordion/accordion-trigger.svelte b/src/lib/components/ui/accordion/accordion-trigger.svelte new file mode 100644 index 00000000..f6069a90 --- /dev/null +++ b/src/lib/components/ui/accordion/accordion-trigger.svelte @@ -0,0 +1,26 @@ + + + + svg]:rotate-180', + className + )} + {...$$restProps} + on:click + > + + + + diff --git a/src/lib/components/ui/accordion/index.ts b/src/lib/components/ui/accordion/index.ts new file mode 100644 index 00000000..0734d4e3 --- /dev/null +++ b/src/lib/components/ui/accordion/index.ts @@ -0,0 +1,17 @@ +import { Accordion as AccordionPrimitive } from 'bits-ui'; +import Content from './accordion-content.svelte'; +import Item from './accordion-item.svelte'; +import Trigger from './accordion-trigger.svelte'; +const Root = AccordionPrimitive.Root; + +export { + Root, + Content, + Item, + Trigger, + // + Root as Accordion, + Content as AccordionContent, + Item as AccordionItem, + Trigger as AccordionTrigger +}; diff --git a/src/lib/components/ui/checkbox/checkbox.svelte b/src/lib/components/ui/checkbox/checkbox.svelte new file mode 100644 index 00000000..55aa1ff7 --- /dev/null +++ b/src/lib/components/ui/checkbox/checkbox.svelte @@ -0,0 +1,34 @@ + + + + + {#if isChecked} + + {:else if isIndeterminate} + + {/if} + + diff --git a/src/lib/components/ui/checkbox/index.ts b/src/lib/components/ui/checkbox/index.ts new file mode 100644 index 00000000..5c276719 --- /dev/null +++ b/src/lib/components/ui/checkbox/index.ts @@ -0,0 +1,6 @@ +import Root from './checkbox.svelte'; +export { + Root, + // + Root as Checkbox +}; diff --git a/src/lib/components/ui/dialog/dialog-content.svelte b/src/lib/components/ui/dialog/dialog-content.svelte new file mode 100644 index 00000000..c718142a --- /dev/null +++ b/src/lib/components/ui/dialog/dialog-content.svelte @@ -0,0 +1,36 @@ + + + + + + + + + Close + + + diff --git a/src/lib/components/ui/dialog/dialog-description.svelte b/src/lib/components/ui/dialog/dialog-description.svelte new file mode 100644 index 00000000..84d4e5f1 --- /dev/null +++ b/src/lib/components/ui/dialog/dialog-description.svelte @@ -0,0 +1,16 @@ + + + + + diff --git a/src/lib/components/ui/dialog/dialog-footer.svelte b/src/lib/components/ui/dialog/dialog-footer.svelte new file mode 100644 index 00000000..da4f517e --- /dev/null +++ b/src/lib/components/ui/dialog/dialog-footer.svelte @@ -0,0 +1,16 @@ + + +
+ +
diff --git a/src/lib/components/ui/dialog/dialog-header.svelte b/src/lib/components/ui/dialog/dialog-header.svelte new file mode 100644 index 00000000..e4b36085 --- /dev/null +++ b/src/lib/components/ui/dialog/dialog-header.svelte @@ -0,0 +1,13 @@ + + +
+ +
diff --git a/src/lib/components/ui/dialog/dialog-overlay.svelte b/src/lib/components/ui/dialog/dialog-overlay.svelte new file mode 100644 index 00000000..671373b9 --- /dev/null +++ b/src/lib/components/ui/dialog/dialog-overlay.svelte @@ -0,0 +1,21 @@ + + + diff --git a/src/lib/components/ui/dialog/dialog-portal.svelte b/src/lib/components/ui/dialog/dialog-portal.svelte new file mode 100644 index 00000000..00774dd4 --- /dev/null +++ b/src/lib/components/ui/dialog/dialog-portal.svelte @@ -0,0 +1,8 @@ + + + + + diff --git a/src/lib/components/ui/dialog/dialog-title.svelte b/src/lib/components/ui/dialog/dialog-title.svelte new file mode 100644 index 00000000..c133166b --- /dev/null +++ b/src/lib/components/ui/dialog/dialog-title.svelte @@ -0,0 +1,16 @@ + + + + + diff --git a/src/lib/components/ui/dialog/index.ts b/src/lib/components/ui/dialog/index.ts new file mode 100644 index 00000000..2a1a048e --- /dev/null +++ b/src/lib/components/ui/dialog/index.ts @@ -0,0 +1,34 @@ +import { Dialog as DialogPrimitive } from 'bits-ui'; + +const Root = DialogPrimitive.Root; +const Trigger = DialogPrimitive.Trigger; + +import Title from './dialog-title.svelte'; +import Portal from './dialog-portal.svelte'; +import Footer from './dialog-footer.svelte'; +import Header from './dialog-header.svelte'; +import Overlay from './dialog-overlay.svelte'; +import Content from './dialog-content.svelte'; +import Description from './dialog-description.svelte'; + +export { + Root, + Title, + Portal, + Footer, + Header, + Trigger, + Overlay, + Content, + Description, + // + Root as Dialog, + Title as DialogTitle, + Portal as DialogPortal, + Footer as DialogFooter, + Header as DialogHeader, + Trigger as DialogTrigger, + Overlay as DialogOverlay, + Content as DialogContent, + Description as DialogDescription +}; diff --git a/src/lib/components/ui/form/form-button.svelte b/src/lib/components/ui/form/form-button.svelte new file mode 100644 index 00000000..45596fc7 --- /dev/null +++ b/src/lib/components/ui/form/form-button.svelte @@ -0,0 +1,9 @@ + + + + + diff --git a/src/lib/components/ui/form/form-checkbox.svelte b/src/lib/components/ui/form/form-checkbox.svelte new file mode 100644 index 00000000..fa12c1e3 --- /dev/null +++ b/src/lib/components/ui/form/form-checkbox.svelte @@ -0,0 +1,26 @@ + + + { + onCheckedChange?.(v); + setValue(v); + }} + {...$$restProps} + on:click + on:keydown +/> + diff --git a/src/lib/components/ui/form/form-description.svelte b/src/lib/components/ui/form/form-description.svelte new file mode 100644 index 00000000..0e851ec7 --- /dev/null +++ b/src/lib/components/ui/form/form-description.svelte @@ -0,0 +1,13 @@ + + + + + diff --git a/src/lib/components/ui/form/form-input.svelte b/src/lib/components/ui/form/form-input.svelte new file mode 100644 index 00000000..a2d22f1a --- /dev/null +++ b/src/lib/components/ui/form/form-input.svelte @@ -0,0 +1,28 @@ + + + diff --git a/src/lib/components/ui/form/form-item.svelte b/src/lib/components/ui/form/form-item.svelte new file mode 100644 index 00000000..11b90794 --- /dev/null +++ b/src/lib/components/ui/form/form-item.svelte @@ -0,0 +1,12 @@ + + +
+ +
diff --git a/src/lib/components/ui/form/form-label.svelte b/src/lib/components/ui/form/form-label.svelte new file mode 100644 index 00000000..118900c5 --- /dev/null +++ b/src/lib/components/ui/form/form-label.svelte @@ -0,0 +1,17 @@ + + + diff --git a/src/lib/components/ui/form/form-native-select.svelte b/src/lib/components/ui/form/form-native-select.svelte new file mode 100644 index 00000000..08733651 --- /dev/null +++ b/src/lib/components/ui/form/form-native-select.svelte @@ -0,0 +1,26 @@ + + +
+ + + + +
diff --git a/src/lib/components/ui/form/form-radio-group.svelte b/src/lib/components/ui/form/form-radio-group.svelte new file mode 100644 index 00000000..0f6c3f5e --- /dev/null +++ b/src/lib/components/ui/form/form-radio-group.svelte @@ -0,0 +1,22 @@ + + + { + onValueChange?.(v); + setValue(v); + }} + {...$$restProps} +> + + + diff --git a/src/lib/components/ui/form/form-select-trigger.svelte b/src/lib/components/ui/form/form-select-trigger.svelte new file mode 100644 index 00000000..50873db4 --- /dev/null +++ b/src/lib/components/ui/form/form-select-trigger.svelte @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/lib/components/ui/form/form-select.svelte b/src/lib/components/ui/form/form-select.svelte new file mode 100644 index 00000000..bbefeeec --- /dev/null +++ b/src/lib/components/ui/form/form-select.svelte @@ -0,0 +1,20 @@ + + + { + onSelectedChange?.(v); + setValue(v ? v.value : undefined); + }} + {...$$restProps} +> + + + diff --git a/src/lib/components/ui/form/form-switch.svelte b/src/lib/components/ui/form/form-switch.svelte new file mode 100644 index 00000000..3ca8565c --- /dev/null +++ b/src/lib/components/ui/form/form-switch.svelte @@ -0,0 +1,24 @@ + + + { + onCheckedChange?.(v); + setValue(v); + }} + {...$$restProps} + on:click + on:keydown +/> + diff --git a/src/lib/components/ui/form/form-textarea.svelte b/src/lib/components/ui/form/form-textarea.svelte new file mode 100644 index 00000000..7cb3d405 --- /dev/null +++ b/src/lib/components/ui/form/form-textarea.svelte @@ -0,0 +1,29 @@ + + +