From 216a600224fde22ce76b367557a02094ec693886 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Fri, 1 Dec 2023 20:04:13 -0800 Subject: prettier --- .prettierrc | 6 +- doc/i18n-technical.md | 10 +- docker-compose.yml | 16 +- postcss.config.cjs | 8 +- src/app.css | 33 +- src/app.html | 27 +- src/components/404.svelte | 20 +- src/components/About.svelte | 131 +- src/components/AppHeader.svelte | 276 +- src/components/Avatar.svelte | 44 +- src/components/Balance.svelte | 48 +- src/components/Calendar.svelte | 22 +- src/components/Card.svelte | 22 +- src/components/Check.svelte | 18 +- src/components/Code.svelte | 42 +- src/components/Event.svelte | 147 +- src/components/FaqCard.svelte | 18 +- src/components/Feed.svelte | 124 +- src/components/Footer.svelte | 121 +- src/components/Heart.svelte | 26 +- src/components/HowItWorksCard.svelte | 18 +- src/components/Icon.svelte | 4 +- src/components/Image.svelte | 4 +- src/components/Invoice.svelte | 61 +- src/components/LandingHeader.svelte | 230 +- src/components/LandingHero.svelte | 63 +- src/components/LandingInfoCard.svelte | 46 +- src/components/Left.svelte | 26 +- src/components/Lnurlp.svelte | 104 +- src/components/Lnurlw.svelte | 103 +- src/components/LoadingSplash.svelte | 4 +- src/components/LocaleSelector.svelte | 20 +- src/components/LocationsMap.svelte | 546 ++-- src/components/Lock.svelte | 22 +- src/components/Numpad.svelte | 445 ++-- src/components/Password.svelte | 144 +- src/components/Pin.svelte | 112 +- src/components/Pinpad.svelte | 144 +- src/components/Popup.svelte | 66 +- src/components/Qr.svelte | 16 +- src/components/Quote.svelte | 18 +- src/components/RegisterOrLogin.svelte | 322 +-- src/components/Request.svelte | 56 +- src/components/Slider.svelte | 90 +- src/components/Spinner.svelte | 27 +- src/components/Toggle.svelte | 18 +- src/components/index.js | 80 +- src/lib/english.js | 2 +- src/lib/invoice.js | 67 +- src/lib/nostr.js | 230 +- src/lib/punks.js | 128 +- src/lib/samples.js | 26 +- src/lib/socket.js | 122 +- src/lib/store.js | 66 +- src/lib/ticket.js | 50 +- src/lib/tickets.js | 100 +- src/lib/translations/index.js | 111 +- src/lib/translations/lang.json | 16 +- src/lib/upload.js | 32 +- src/lib/utils.js | 418 +-- src/locales/de.json | 594 ++--- src/locales/el.json | 590 ++--- src/locales/en.json | 542 ++-- src/locales/es.json | 494 ++-- src/locales/fa.json | 560 ++-- src/locales/fr.json | 620 ++--- src/locales/pt.json | 530 ++-- src/locales/zh.json | 576 ++--- src/params/uuid.js | 2 +- src/routes/(app)/+error.svelte | 58 +- src/routes/(app)/+layout.server.js | 86 +- src/routes/(app)/+layout.svelte | 297 +-- .../(app)/[username]/(profile)/+layout.server.js | 36 +- .../(app)/[username]/(profile)/+layout.svelte | 466 ++-- .../(app)/[username]/(profile)/+page.server.js | 52 +- src/routes/(app)/[username]/(profile)/+page.svelte | 462 ++-- .../(profile)/event/[id]/+page.server.js | 18 +- .../[username]/(profile)/event/[id]/+page.svelte | 6 +- .../[username]/(profile)/followers/+page.svelte | 81 +- .../[username]/(profile)/follows/+page.svelte | 78 +- .../[username]/(profile)/request/+page.server.js | 22 +- .../[username]/(profile)/request/+page.svelte | 50 +- .../[username]/(profile)/request/sent/+page.svelte | 21 +- src/routes/(app)/[username]/+layout.server.js | 18 +- src/routes/(app)/[username]/+layout.svelte | 96 +- .../(app)/[username]/address/+page.server.js | 14 +- .../(app)/[username]/card/[serial]/+page.server.js | 22 +- .../(app)/[username]/card/[serial]/+page.svelte | 60 +- src/routes/(app)/[username]/funds/+page.svelte | 83 +- src/routes/(app)/[username]/generate/+page.svelte | 110 +- src/routes/(app)/[username]/generate/+server.js | 16 +- src/routes/(app)/[username]/invoice/+server.js | 8 +- .../[username]/invoice/[id]/+layout.server.js | 52 +- .../(app)/[username]/invoice/[id]/+page.server.js | 4 +- .../(app)/[username]/invoice/[id]/+page.svelte | 442 ++-- .../[username]/invoice/[id]/paid/+page.svelte | 108 +- .../[username]/invoice/[id]/tip/+page.server.js | 11 +- .../(app)/[username]/invoice/[id]/tip/+page.svelte | 386 +-- .../(app)/[username]/invoice/sent/+page.svelte | 8 +- src/routes/(app)/[username]/map/+page.server.js | 12 +- src/routes/(app)/[username]/map/+page.svelte | 6 +- .../(app)/[username]/messages/+page.server.js | 31 +- src/routes/(app)/[username]/messages/+page.svelte | 335 +-- .../[username]/payments/[...page]/+page.server.js | 30 +- .../[username]/payments/[...page]/+page.svelte | 514 ++-- .../(app)/[username]/payments/[...page]/+server.js | 22 +- .../[username]/receive/[...param]/+page.server.js | 14 +- .../[username]/receive/[...param]/+page.svelte | 82 +- .../(app)/[username]/request/[id]/+page.server.js | 35 +- .../(app)/[username]/request/[id]/+page.svelte | 85 +- src/routes/(app)/[username]/reset/+server.js | 14 +- .../[username]/settings/[...tab]/+page.server.js | 31 +- .../[username]/settings/[...tab]/+page.svelte | 400 +-- .../[username]/settings/[...tab]/_account.svelte | 342 +-- .../(app)/[username]/settings/[...tab]/_pos.svelte | 84 +- .../[username]/settings/[...tab]/_security.svelte | 561 ++-- .../[username]/settings/[...tab]/_shopify.svelte | 129 +- src/routes/(app)/[username]/shopify.js/+server.js | 14 +- src/routes/(app)/admin/+layout.server.js | 14 +- src/routes/(app)/admin/+layout.svelte | 8 +- src/routes/(app)/admin/+page.server.js | 14 +- src/routes/(app)/admin/+page.svelte | 34 +- src/routes/(app)/buy/+page.server.js | 43 +- src/routes/(app)/buy/+page.svelte | 230 +- src/routes/(app)/disable2fa/+server.js | 18 +- src/routes/(app)/enable2fa/+server.js | 8 +- src/routes/(app)/events/+server.js | 6 +- src/routes/(app)/fund/[id]/+page.server.js | 28 +- src/routes/(app)/fund/[id]/+page.svelte | 256 +- src/routes/(app)/fund/[id]/sweep/+page.server.js | 17 +- src/routes/(app)/fund/[id]/sweep/+page.svelte | 54 +- .../(app)/fund/[id]/withdraw/+page.server.js | 26 +- src/routes/(app)/fund/[id]/withdraw/+page.svelte | 94 +- src/routes/(app)/fund/[id]/withdraw/+server.js | 6 +- src/routes/(app)/launch/+page.server.js | 6 +- src/routes/(app)/launch/+page.svelte | 187 +- src/routes/(app)/launch/purchase/+page.server.js | 68 +- src/routes/(app)/launch/purchase/+page.svelte | 114 +- .../(app)/launch/purchase/card/+page.server.js | 88 +- src/routes/(app)/launch/purchase/card/+page.svelte | 134 +- .../(app)/launch/thanks/[asset]/+page.svelte | 40 +- src/routes/(app)/launch/ticket/+page.server.js | 14 +- src/routes/(app)/launch/ticket/+page.svelte | 56 +- src/routes/(app)/ln/[lnurl]/+page.server.js | 118 +- src/routes/(app)/ln/[lnurl]/+page.svelte | 14 +- src/routes/(app)/ln/withdrawal/sent/+page.svelte | 31 +- src/routes/(app)/locations/+server.js | 20 +- src/routes/(app)/login/+page.server.js | 36 +- src/routes/(app)/login/+page.svelte | 20 +- src/routes/(app)/logout/+page.server.js | 12 +- src/routes/(app)/otpsecret/+server.js | 26 +- src/routes/(app)/password/+server.js | 8 +- src/routes/(app)/payment/[id]/+page.server.js | 6 +- src/routes/(app)/payment/[id]/+page.svelte | 289 ++- .../(app)/payment/[id]/plain/+page.server.js | 6 +- src/routes/(app)/payment/[id]/plain/+page.svelte | 132 +- src/routes/(app)/payment/[id]/print/+server.js | 8 +- src/routes/(app)/pin/+server.js | 8 +- src/routes/(app)/qr/[text]/+page.server.js | 8 +- src/routes/(app)/qr/[text]/+page.svelte | 18 +- .../(app)/redeem/[redeemcode]/+page.server.js | 24 +- src/routes/(app)/redeem/[redeemcode]/+page.svelte | 4 +- src/routes/(app)/register/+page.server.js | 67 +- src/routes/(app)/register/+page.svelte | 582 +++-- src/routes/(app)/scan/+page.svelte | 63 +- src/routes/(app)/send/+layout.svelte | 14 +- src/routes/(app)/send/[...text]/+page.server.js | 182 +- src/routes/(app)/send/[...text]/+page.svelte | 212 +- .../bitcoin/[address]/[...amount]/+page.server.js | 45 +- .../bitcoin/[address]/[...amount]/+page.svelte | 279 +- .../send/fund/[name]/[...amount]/+page.server.js | 24 +- .../send/fund/[name]/[...amount]/+page.svelte | 94 +- src/routes/(app)/send/invoice/[id]/+page.server.js | 65 +- src/routes/(app)/send/invoice/[id]/+page.svelte | 300 +-- .../(app)/send/lightning/[payreq]/+page.server.js | 30 +- .../(app)/send/lightning/[payreq]/+page.svelte | 181 +- .../user/[username]/[...amount]/+page.server.js | 81 +- .../send/user/[username]/[...amount]/+page.svelte | 166 +- src/routes/(app)/sent/+page.server.js | 6 +- src/routes/(app)/sent/+page.svelte | 73 +- src/routes/(app)/support/+page.svelte | 214 +- src/routes/(app)/support/+server.js | 8 +- src/routes/(app)/withdraw/+server.js | 11 +- src/routes/(static)/+layout.server.js | 22 +- src/routes/(static)/+layout.svelte | 10 +- src/routes/(static)/bounties/+page.svelte | 174 +- src/routes/(static)/docs/+page.server.js | 4 +- src/routes/(static)/docs/+page.svelte | 241 +- src/routes/+layout.server.js | 26 +- src/routes/+layout.svelte | 57 +- src/routes/+page.server.js | 2 +- src/routes/+page.svelte | 216 +- src/routes/about/+server.js | 4 +- src/routes/map/+page.server.js | 12 +- src/routes/map/+page.svelte | 22 +- static/lottie/success.json | 2660 +++++++++---------- static/manifest.webmanifest | 72 +- static/qr.js | 2698 ++++++++++---------- static/shopify.html | 267 +- svelte.config.js | 35 +- tailwind.config.cjs | 28 +- vite.config.js | 32 +- 202 files changed, 14108 insertions(+), 13258 deletions(-) diff --git a/.prettierrc b/.prettierrc index 4d33dfc8..98ddc618 100644 --- a/.prettierrc +++ b/.prettierrc @@ -1,7 +1,3 @@ { - "useTabs": true, - "singleQuote": true, - "trailingComma": "none", - "printWidth": 100, - "plugins": ["./node_modules/prettier-plugin-svelte"] + "plugins": ["./node_modules/prettier-plugin-svelte"] } diff --git a/doc/i18n-technical.md b/doc/i18n-technical.md index 3f6a09d5..6aed2068 100644 --- a/doc/i18n-technical.md +++ b/doc/i18n-technical.md @@ -23,11 +23,11 @@ Each locale in `coinos-ui-v2` is defined by a JSON file in `src/locales`. Its na ```json { - "howItWorks": "How it works", - "faq": "FAQ", - "about": "About", - "startInSeconds": "Start in Seconds", - "signIn": "Sign In" + "howItWorks": "How it works", + "faq": "FAQ", + "about": "About", + "startInSeconds": "Start in Seconds", + "signIn": "Sign In" } ``` diff --git a/docker-compose.yml b/docker-compose.yml index 7e6e4e61..e40cf483 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,4 +1,4 @@ -version: '3.6' +version: "3.6" services: v2: container_name: v2 @@ -6,18 +6,18 @@ services: context: . dockerfile: Dockerfile.dev args: - URL: '${PUBLIC_COINOS_URL}' - BTC: '${PUBLIC_BTC}' - SOCKET: '${PUBLIC_SOCKET}' + URL: "${PUBLIC_COINOS_URL}" + BTC: "${PUBLIC_BTC}" + SOCKET: "${PUBLIC_SOCKET}" restart: always ports: - - '3121:3121' + - "3121:3121" environment: NODE_ENV: production - ORIGIN: '${ORIGIN}' + ORIGIN: "${ORIGIN}" PORT: 3121 - STRIPE: '${STRIPE}' - LAUNCH: '${LAUNCH}' + STRIPE: "${STRIPE}" + LAUNCH: "${LAUNCH}" extra_hosts: - host.docker.internal:host-gateway networks: diff --git a/postcss.config.cjs b/postcss.config.cjs index 054c147c..12a703d9 100644 --- a/postcss.config.cjs +++ b/postcss.config.cjs @@ -1,6 +1,6 @@ module.exports = { - plugins: { - tailwindcss: {}, - autoprefixer: {} - } + plugins: { + tailwindcss: {}, + autoprefixer: {}, + }, }; diff --git a/src/app.css b/src/app.css index 3a722fb1..ba1db128 100644 --- a/src/app.css +++ b/src/app.css @@ -3,39 +3,40 @@ @tailwind utilities; @font-face { - font-family: 'PublicSans'; - src: url('/fonts/Public_Sans/static/PublicSans-Regular.ttf') format('truetype'); + font-family: "PublicSans"; + src: url("/fonts/Public_Sans/static/PublicSans-Regular.ttf") + format("truetype"); } html { - font-family: PublicSans, sans-serif; + font-family: PublicSans, sans-serif; } ::selection { - color: black; - background: #eaf2ff; + color: black; + background: #eaf2ff; } :fullscreen { - background-color: white; + background-color: white; } input, textarea { - @apply block border rounded-2xl px-5 py-4 w-full; + @apply block border rounded-2xl px-5 py-4 w-full; } button.primary { - @apply rounded-full border py-2 font-bold my-4 flex px-4 bg-white mx-auto hover:opacity-80; + @apply rounded-full border py-2 font-bold my-4 flex px-4 bg-white mx-auto hover:opacity-80; } .select-styles { - @apply border rounded-2xl py-4 px-5; - cursor: pointer; - -webkit-appearance: none; - -moz-appearance: none; - background: transparent; - background-repeat: no-repeat; - background-position-x: 95%; - background-position-y: 1em; + @apply border rounded-2xl py-4 px-5; + cursor: pointer; + -webkit-appearance: none; + -moz-appearance: none; + background: transparent; + background-repeat: no-repeat; + background-position-x: 95%; + background-position-y: 1em; } diff --git a/src/app.html b/src/app.html index c0b7b4c1..28f07d06 100644 --- a/src/app.html +++ b/src/app.html @@ -1,15 +1,18 @@ - - - - - - - - %sveltekit.head% - - -
%sveltekit.body%
- + + + + + + + + %sveltekit.head% + + +
%sveltekit.body%
+ diff --git a/src/components/404.svelte b/src/components/404.svelte index 08323d40..d831a40a 100644 --- a/src/components/404.svelte +++ b/src/components/404.svelte @@ -1,17 +1,17 @@
-
- - - +
+ + + - + -

{$t('404.404')}

-

{$t('404.pageNotFound')}

-
+

{$t("404.404")}

+

{$t("404.pageNotFound")}

+
diff --git a/src/components/About.svelte b/src/components/About.svelte index 1dbd8038..6e0cdcb5 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -1,7 +1,7 @@
-
-

- {$t('about.team.header')} -

-
- {#each team as member} -
-
-
- +
+

+ {$t("about.team.header")} +

+
+ {#each team as member} +
+
+
+ -
- {$t(`about.team.${member.name}.name`)} - {$t(`about.team.${member.name}.position`)} -
+
+ {$t(`about.team.${member.name}.name`)} + {$t(`about.team.${member.name}.position`)} +
-
- {#each member.socials as social} - - {/each} -
-
-
- {$t(`about.team.${member.name}.bio`)} -
-
-
- {/each} -
-
+
+ {#each member.socials as social} + + {/each} +
+
+
+ {$t(`about.team.${member.name}.bio`)} +
+
+
+ {/each} +
+
{#if locations?.length} -
-

{$t('about.locations.header')}

-

- {@html $t('about.locations.description')} -

- -
+
+

+ {$t("about.locations.header")} +

+

+ {@html $t("about.locations.description")} +

+ +
{/if} diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 53b31de4..2f088eec 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -1,149 +1,159 @@ {#if !$loading} -
- +
+ +
+
{/if} diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte index b258a0e8..3955a42f 100644 --- a/src/components/Avatar.svelte +++ b/src/components/Avatar.svelte @@ -1,29 +1,31 @@ -
- {user.username} -
+
+ {user.username} +
diff --git a/src/components/Balance.svelte b/src/components/Balance.svelte index 0e4f2ec2..92714f98 100644 --- a/src/components/Balance.svelte +++ b/src/components/Balance.svelte @@ -1,34 +1,34 @@ {#if show && user.haspin && $pin?.length !== 6} - (show = false)} /> + (show = false)} /> {/if}
- {#if user.haspin && !$pin} - - {:else} -
- {#if isNaN($animatedRate)} -
—
- {:else} - {f((user.balance * $animatedRate) / sats, user.currency)} - {/if} -
+ {#if user.haspin && !$pin} + + {:else} +
+ {#if isNaN($animatedRate)} +
—
+ {:else} + {f((user.balance * $animatedRate) / sats, user.currency)} + {/if} +
-
- ⚡️{s(user.balance)} -
- {/if} +
+ ⚡️{s(user.balance)} +
+ {/if}
diff --git a/src/components/Calendar.svelte b/src/components/Calendar.svelte index 7504f48e..b07c136c 100644 --- a/src/components/Calendar.svelte +++ b/src/components/Calendar.svelte @@ -1,14 +1,14 @@ - + diff --git a/src/components/Card.svelte b/src/components/Card.svelte index 44ab635f..864465c0 100644 --- a/src/components/Card.svelte +++ b/src/components/Card.svelte @@ -1,14 +1,14 @@ - + diff --git a/src/components/Check.svelte b/src/components/Check.svelte index 4c9f504b..222c4dea 100644 --- a/src/components/Check.svelte +++ b/src/components/Check.svelte @@ -1,11 +1,11 @@ diff --git a/src/components/Code.svelte b/src/components/Code.svelte index ffca98a4..6c1048cf 100644 --- a/src/components/Code.svelte +++ b/src/components/Code.svelte @@ -1,27 +1,31 @@ -
-
-
{samples[sample]}
-
- +
+
+
{samples[sample]}
+
+
diff --git a/src/components/Event.svelte b/src/components/Event.svelte index 68f44589..2312f44e 100644 --- a/src/components/Event.svelte +++ b/src/components/Event.svelte @@ -1,84 +1,87 @@ -
- -
-
- -
- -
- +
+ +
+
+ +
+ +
+ -
-
-
- {user.display_name || ''} - @{user.username} -
-
 {distance(seen)}
-
-
- {content} -
+
+
+
+ {user.display_name || ""} + @{user.username} +
+
 {distance(seen)}
+
+
+ {content} +
-
-
- -
444
-
-
- -
1072
-
-
- -
26
-
-
- -
4
-
-
-
+
+
+ +
444
+
+
+ +
1072
+
+
+ +
26
+
+
+ +
4
+
+
+
diff --git a/src/components/FaqCard.svelte b/src/components/FaqCard.svelte index 918e03d6..ae1ad077 100644 --- a/src/components/FaqCard.svelte +++ b/src/components/FaqCard.svelte @@ -1,15 +1,15 @@
-

{$t('faq.' + questionID + '.question')}

-

- {$t('faq.' + questionID + '.answer')} -

+

{$t("faq." + questionID + ".question")}

+

+ {$t("faq." + questionID + ".answer")} +

diff --git a/src/components/Feed.svelte b/src/components/Feed.svelte index 7de087a7..0c9c96d1 100644 --- a/src/components/Feed.svelte +++ b/src/components/Feed.svelte @@ -1,72 +1,84 @@ {#if user} -
-
- -
- -
+
+
+ +
+ +
{/if} {#if browser} - {#if sorted.length} - - - - - - {:else} -
-
{$t('user.noNotes')}
-
- {/if} + {#if sorted.length} + + + + + + {:else} +
+
{$t("user.noNotes")}
+
+ {/if} {/if} diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index eda26526..c1ac79cf 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -1,65 +1,74 @@ -