From ef8ab961fa384bad88907d16e681aa128e2577e2 Mon Sep 17 00:00:00 2001 From: JulienAuvo Date: Mon, 31 Mar 2025 13:05:36 +0300 Subject: [PATCH 1/2] feat: add Hero fragment --- infrastructure/eid-wallet/src/app.css | 12 +++--- .../lib/fragments/Header/Header.stories.ts | 39 ----------------- .../src/lib/fragments/Header/Header.svelte | 36 ---------------- .../src/lib/fragments/Hero/Hero.stories.ts | 31 +++++++++++++ .../src/lib/fragments/Hero/Hero.svelte | 43 +++++++++++++++++++ .../IdentityCard/IdentityCard.svelte | 2 +- .../eid-wallet/src/lib/fragments/index.ts | 2 +- .../src/routes/(auth)/e-passport/+page.svelte | 8 +++- .../src/routes/(auth)/onboarding/+page.svelte | 12 ++++-- .../src/routes/(auth)/register/+page.svelte | 15 +++++-- .../src/routes/(auth)/review/+page.svelte | 12 +++--- .../src/routes/(auth)/verify/+page.svelte | 11 ++--- 12 files changed, 121 insertions(+), 102 deletions(-) delete mode 100644 infrastructure/eid-wallet/src/lib/fragments/Header/Header.stories.ts delete mode 100644 infrastructure/eid-wallet/src/lib/fragments/Header/Header.svelte create mode 100644 infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.stories.ts create mode 100644 infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.svelte diff --git a/infrastructure/eid-wallet/src/app.css b/infrastructure/eid-wallet/src/app.css index 7a82f580..5333d875 100644 --- a/infrastructure/eid-wallet/src/app.css +++ b/infrastructure/eid-wallet/src/app.css @@ -11,27 +11,27 @@ @layer base { /* Typography */ h1 { - @apply text-[90px] text-black font-semibold; + @apply text-[90px]/[1.5] text-black font-semibold; } h2 { - @apply text-6xl text-black font-semibold; + @apply text-6xl/[1.5] text-black font-semibold; } h3 { - @apply text-3xl text-black font-semibold; + @apply text-3xl/[1.5] text-black font-semibold; } h4 { - @apply text-xl text-black font-semibold; + @apply text-xl/[1.5] text-black font-semibold; } p { - @apply text-base text-black font-normal; + @apply text-base/[1.5] text-black font-normal; } .small { - @apply text-xs text-black font-normal; + @apply text-xs/[1.5] text-black font-normal; } } diff --git a/infrastructure/eid-wallet/src/lib/fragments/Header/Header.stories.ts b/infrastructure/eid-wallet/src/lib/fragments/Header/Header.stories.ts deleted file mode 100644 index f41b19a6..00000000 --- a/infrastructure/eid-wallet/src/lib/fragments/Header/Header.stories.ts +++ /dev/null @@ -1,39 +0,0 @@ -import Header from "./Header.svelte"; - -export default { - title: "Fragments/Header", - component: Header, - tags: ["autodocs"], - render: (args: { - title: string; - isBackRequired: boolean; - isUserLoggedIn: boolean; - }) => ({ - Component: Header, - props: args, - }), -}; - -export const Primary = { - args: { - title: "Create PIN", - isBackRequired: false, - isUserLoggedIn: false, - }, -}; - -export const Secondary = { - args: { - title: "Create PIN", - isBackRequired: true, - isUserLoggedIn: false, - }, -}; - -export const Tertiary = { - args: { - title: "Create PIN", - isBackRequired: true, - isUserLoggedIn: true, - }, -}; diff --git a/infrastructure/eid-wallet/src/lib/fragments/Header/Header.svelte b/infrastructure/eid-wallet/src/lib/fragments/Header/Header.svelte deleted file mode 100644 index bf8bbc8b..00000000 --- a/infrastructure/eid-wallet/src/lib/fragments/Header/Header.svelte +++ /dev/null @@ -1,36 +0,0 @@ - - -
- {#if isBackRequired} - window.history.back()} /> - {:else} - - {/if} -

{title}

- {#if isUserLoggedIn} - - {:else} - - {/if} -
\ No newline at end of file diff --git a/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.stories.ts b/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.stories.ts new file mode 100644 index 00000000..6978b3f9 --- /dev/null +++ b/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.stories.ts @@ -0,0 +1,31 @@ +import type { ComponentProps } from "svelte"; +import Hero from "./Hero.svelte"; + +export default { + title: "Fragments/Hero", + component: Hero, + tags: ["autodocs"], + render: (args: { + Component: Hero; + props: ComponentProps; + }) => ({ + Component: Hero, + props: args, + }), +}; + +export const Basic = { + args: { + title: "Create PIN", + subtitle: "Create a PIN to protect your wallet", + }, +}; + +export const WithSettings = { + args: { + title: "Good morning!", + subtitle: "Don't forget to drink water.", + titleClasses: "-mb-2", + showSettings: true, + }, +}; diff --git a/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.svelte b/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.svelte new file mode 100644 index 00000000..48c7e9ff --- /dev/null +++ b/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.svelte @@ -0,0 +1,43 @@ + + +
+
+

+ {@render children?.()} + {title} +

+ {#if subtitle} +

{subtitle}

+ {/if} +
+ {#if showSettings} + + + + {:else} + + {/if} +
\ No newline at end of file diff --git a/infrastructure/eid-wallet/src/lib/fragments/IdentityCard/IdentityCard.svelte b/infrastructure/eid-wallet/src/lib/fragments/IdentityCard/IdentityCard.svelte index 7c056126..eb0811f2 100644 --- a/infrastructure/eid-wallet/src/lib/fragments/IdentityCard/IdentityCard.svelte +++ b/infrastructure/eid-wallet/src/lib/fragments/IdentityCard/IdentityCard.svelte @@ -41,7 +41,7 @@ $effect(() => { }); -
+
diff --git a/infrastructure/eid-wallet/src/lib/fragments/index.ts b/infrastructure/eid-wallet/src/lib/fragments/index.ts index 21e9aaf3..fa153456 100644 --- a/infrastructure/eid-wallet/src/lib/fragments/index.ts +++ b/infrastructure/eid-wallet/src/lib/fragments/index.ts @@ -1,3 +1,3 @@ -export { default as Header } from "./Header/Header.svelte"; +export { default as Hero } from "./Hero/Hero.svelte"; export { default as IdentityCard } from "./IdentityCard/IdentityCard.svelte"; export { default as SettingsNavigationBtn } from "./SettingsNavigationBtn/SettingsNavigationBtn.svelte"; diff --git a/infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte b/infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte index a77df0ea..a4d30cc3 100644 --- a/infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte +++ b/infrastructure/eid-wallet/src/routes/(auth)/e-passport/+page.svelte @@ -1,4 +1,5 @@
-

Verify your account

-

Get your passport ready. You’ll be directed to a site where you can verify your account in a swift and secure process

-
- passport -
+ + passport
goto("/verify/id")}>I'm ready
\ No newline at end of file From c24fcd48e054593c15f6ec73cdb85eb74453c7d5 Mon Sep 17 00:00:00 2001 From: JulienAuvo Date: Mon, 31 Mar 2025 13:11:42 +0300 Subject: [PATCH 2/2] chore: sort imports + add doc --- .../src/lib/fragments/Hero/Hero.svelte | 30 +++++++++++++++++-- 1 file changed, 28 insertions(+), 2 deletions(-) diff --git a/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.svelte b/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.svelte index 48c7e9ff..d84b2617 100644 --- a/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.svelte +++ b/infrastructure/eid-wallet/src/lib/fragments/Hero/Hero.svelte @@ -1,8 +1,9 @@