diff options
Diffstat (limited to 'src')
24 files changed, 278 insertions, 256 deletions
diff --git a/src/components/404.svelte b/src/components/404.svelte index fbc05048..4d5be76e 100644 --- a/src/components/404.svelte +++ b/src/components/404.svelte @@ -1,6 +1,6 @@ <script> import { Icon } from '$comp'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; </script> <div class="flex justify-center items-center mt-20"> diff --git a/src/components/About.svelte b/src/components/About.svelte index 2b64bbf4..7ec0800c 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -1,6 +1,6 @@ <script> import { Image, Icon } from '$comp'; - import { _, json } from 'svelte-i18n'; + import { _, json } from 'svelte-i18n'; </script> <h3 class="text-5xl font-medium mb-10 text-center">{$_('about.header')}</h3> @@ -8,29 +8,35 @@ class="md:px-10 lg:px-0 block lg:flex justify-center text-secondary text-xl lg:space-x-20 mx-auto max-w-7xl relative" > <p class="w-full lg:w-5/12"> - {@html $_('about.p1')} + {@html $_('about.p1')} <br /><br /> - {@html $_('about.p2')} + {@html $_('about.p2')} <br /><br /> </p> <p class="w-full lg:w-5/12"> - {@html $_('about.p3')} + {@html $_('about.p3')} <br /><br /> - {@html $_('about.p4')} + {@html $_('about.p4')} </p> <Image image="swoosh" style="w-32 absolute -bottom-20 lg:bottom-0 right-0 md:right-10" /> </div> <div class="px-5 block lg:flex justify-center lg:space-x-32 items-center mt-40 lg:mt-20"> <div class="space-y-5 mb-5 lg:mb-0"> - <h3 class="text-5xl font-medium mb-10 text-center lg:text-right">{$_('about.founder.header')}</h3> + <h3 class="text-5xl font-medium mb-10 text-center lg:text-right"> + {$_('about.founder.header')} + </h3> <Image image="adam" style="rounded-full mx-auto lg:mx-0 lg:ml-auto w-40" /> <div class="space-y-2"> - <span class="text-2xl text-center font-semibold block lg:text-right">{$_('about.founder.name')}</span> + <span class="text-2xl text-center font-semibold block lg:text-right" + >{$_('about.founder.name')}</span + > <span class="text-xl text-center text-secondary block lg:text-right" - >{$_('about.founder.position')}</div> + >{$_('about.founder.position')}</span + > + </div> <div class="flex justify-center lg:justify-end items-center space-x-5"> <a @@ -51,8 +57,8 @@ <ul class="w-full mx-auto md:w-[700px] lg:w-[500px] xl:w-auto text-secondary px-1 md:px-10 text-xl list-disc space-y-5" > - {#each $json('about.founder.qualifications') as qualification} - <li>{qualification}</li> - {/each} - </ul> + {#each $json('about.founder.qualifications') as qualification} + <li>{qualification}</li> + {/each} + </ul> </div> diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index 761ce2a8..1d24cb1d 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -5,7 +5,7 @@ import { user, newPayment, colorTheme } from '$lib/store'; import { goto } from '$app/navigation'; import { Icon } from '$comp'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; export let avatarPosition = 'left-[calc(50vw-48px)]'; @@ -85,7 +85,9 @@ </div> {:else} <a href="/login"> - <button class="bg-white px-5 py-2 rounded-xl font-semibold text-sm">{$_('nav.signIn')}</button> + <button class="bg-white px-5 py-2 rounded-xl font-semibold text-sm" + >{$_('nav.signIn')}</button + > </a> {/if} </nav> diff --git a/src/components/FaqCard.svelte b/src/components/FaqCard.svelte index 3e855e42..0d3a9fa7 100644 --- a/src/components/FaqCard.svelte +++ b/src/components/FaqCard.svelte @@ -1,10 +1,10 @@ <script> - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; - // this ID will be used to get the strings from the locale - // question is at faq.[questionID].question - // answer is at faq.[questionID].answer - export let questionID; + // this ID will be used to get the strings from the locale + // question is at faq.[questionID].question + // answer is at faq.[questionID].answer + export let questionID; </script> <div class="mx-auto w-full md:w-2/3 lg:w-[700px] space-y-5"> diff --git a/src/components/Footer.svelte b/src/components/Footer.svelte index 8d846f04..e2acd993 100644 --- a/src/components/Footer.svelte +++ b/src/components/Footer.svelte @@ -1,6 +1,6 @@ <script> import { Icon } from '$comp'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; const followLinks = [ { url: 'https://twitter.com/coinoswallet', titleID: 'twitter' }, @@ -21,7 +21,9 @@ <p class="font-semibold">{$_('footer.followUs')}</p> <ul class="mt-5 text-secondary space-y-3 font-medium"> {#each followLinks as link} - <li><a href={link.url} target="_blank" rel="noreferrer">{$_('footer.' + link.titleID)}</a></li> + <li> + <a href={link.url} target="_blank" rel="noreferrer">{$_('footer.' + link.titleID)}</a> + </li> {/each} </ul> </div> diff --git a/src/components/HowItWorksCard.svelte b/src/components/HowItWorksCard.svelte index b0ef2aad..6f82c360 100644 --- a/src/components/HowItWorksCard.svelte +++ b/src/components/HowItWorksCard.svelte @@ -1,6 +1,6 @@ <script> import Icon from './Icon.svelte'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; export let image; export let stepID; </script> diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte index 3e53a613..acc83001 100644 --- a/src/components/LandingHeader.svelte +++ b/src/components/LandingHeader.svelte @@ -98,7 +98,7 @@ class="bg-black text-white border rounded-full px-6 py-2 font-bold block" on:click={() => goto('/logout')} > - {$_('nav.signOut')} + {$_('nav.signOut')} </button> {/if} <LocaleSelector style="py-1" /> diff --git a/src/components/LandingHero.svelte b/src/components/LandingHero.svelte index 7c044a4d..6553d271 100644 --- a/src/components/LandingHero.svelte +++ b/src/components/LandingHero.svelte @@ -2,7 +2,7 @@ import { goto } from '$app/navigation'; import { Icon, Image } from '$comp'; import { user } from '$lib/store'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; </script> <div class="mt-[96.88px] md:mt-0"> @@ -10,15 +10,17 @@ <h1 class="text-5xl md:text-6xl lg:text-7xl 2xl:text-8xl font-medium text-center w-full md:w-3/4 lg:w-1/2 max-w-7xl mx-auto leading-tight" > - {$_('landing.header_before_icon')} <span class="relative"> + {$_('landing.header_before_icon')} + <span class="relative"> {$_('landing.header_with_icon')} <Icon icon="rays" style="absolute -top-16 left-5 md:left-8 lg:left-14 2xl:left-24" /> - </span> {$_('landing.header_after_icon')} + </span> + {$_('landing.header_after_icon')} </h1> <h2 class="text-center text-secondary w-full md:w-3/5 lg:w-2/5 max-w-3xl mx-auto text-xl leading-normal font-medium" > - {$_('landing.subheader')} + {$_('landing.subheader')} </h2> {#if !$user} <div class="flex justify-center"> diff --git a/src/locales/en.json b/src/locales/en.json index 72a458c6..851deb0e 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -1,36 +1,36 @@ { "langname": "English", - "404": { - "404": "404", - "pageNotFound": "Page not found." - }, - "about": { - "header": "About", - "p1": "<strong>CoinOS</strong> is an <strong>open source</strong> bitcoin web wallet, point of sale, ecommerce marketplace and exchange platform. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.", - "p2": "The feature set has grown over the years to accomodate a wide variety of use cases with the goal of making it as easy as possible for anyone to get started using bitcoin quickly, cheaply, and securely.", - "p3": "Anyone can download the source code and host their own instance of the platform backed by their own bitcoin, liquid or lightning nodes, or reach out and we'll gladly set this up for you.", - "p4": "Intra-account transfers between custodial wallets of different users on our server are completely free, instant, and unlimited.", - "founder": { - "header": "The Founder", - "name": "Adam Soltys", - "position": "Chief Technical Officer", - "qualifications": [ - "Running bitcoin since 2011", - "20+ years web development experience in government and industry", - "Early bitcoin Vancouver meetup organizer", - "Founder of The bitcoin Co-op and early supporter of Decentral Vancouver", - "Yogi, permaculturist, anarchist, decentralist", - "Husband, father, brother, son" - ] - } - }, - "error": { - "header": "Error", - "message": "Please try again or contact support.", - "signIn": "Please sign in to continue." - }, - "faq": { - "header": "FAQ", + "404": { + "404": "404", + "pageNotFound": "Page not found." + }, + "about": { + "header": "About", + "p1": "<strong>CoinOS</strong> is an <strong>open source</strong> bitcoin web wallet, point of sale, ecommerce marketplace and exchange platform. Development started in Vancouver in September 2012 as a way to provide local merchants with a convenient way to accept bitcoin payments.", + "p2": "The feature set has grown over the years to accomodate a wide variety of use cases with the goal of making it as easy as possible for anyone to get started using bitcoin quickly, cheaply, and securely.", + "p3": "Anyone can download the source code and host their own instance of the platform backed by their own bitcoin, liquid or lightning nodes, or reach out and we'll gladly set this up for you.", + "p4": "Intra-account transfers between custodial wallets of different users on our server are completely free, instant, and unlimited.", + "founder": { + "header": "The Founder", + "name": "Adam Soltys", + "position": "Chief Technical Officer", + "qualifications": [ + "Running bitcoin since 2011", + "20+ years web development experience in government and industry", + "Early bitcoin Vancouver meetup organizer", + "Founder of The bitcoin Co-op and early supporter of Decentral Vancouver", + "Yogi, permaculturist, anarchist, decentralist", + "Husband, father, brother, son" + ] + } + }, + "error": { + "header": "Error", + "message": "Please try again or contact support.", + "signIn": "Please sign in to continue." + }, + "faq": { + "header": "FAQ", "cost": { "question": "What does it cost?", "answer": "CoinOS is free to use. You only pay a 1% fee if/when you withdraw your funds. Compare this to 3% typically charged by a credit card processor." @@ -43,147 +43,147 @@ "question": "Are my funds safe?", "answer": "Your funds are stored on our secure server, however we recommend that you withdraw them to your own cold storage for long-term savings." } - }, - "footer": { - "followUs": "Follow Us", - "twitter": "Twitter", - "github": "GitHub", - "company": "Company", - "telegram": "Telegram", - "support": "Support", - "jobs": "Jobs" - }, - "howItWorks": { - "header": "How It Works", - "step1": { + }, + "footer": { + "followUs": "Follow Us", + "twitter": "Twitter", + "github": "GitHub", + "company": "Company", + "telegram": "Telegram", + "support": "Support", + "jobs": "Jobs" + }, + "howItWorks": { + "header": "How It Works", + "step1": { "header": "1. Create your account", "description": "A username & password is all you need to get started." - }, - "step2": { + }, + "step2": { "header": "2. Ask for payments", "description": "The same as you normally would, but with bitcoin." - }, - "step3": { + }, + "step3": { "header": "3. That's all!", "description": "You can convert to local currency at any point." - } - }, - "invoice": { - "addTip": "Add a tip", - "addTipq": "Add a tip?", - "done": "Done", - "paymentSuccessful": "Payment Successful!" - }, - "jobs": { - "header": "Jobs", - "subheader": "Current Openings", - "pitch1": "CoinOS is actively looking for developers to join our growing team (full-time or part-time, remote working OK).", - "pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on", - "github": "GitHub", - "pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to" - }, - "landing": { - "header_before_icon": "The", - "header_with_icon": "easiest", - "header_after_icon": "way to accept bitcoin in your store.", - "subheader": "Grow your customer base and revenue by accepting bitcoin with an easy-to-use and managed Point of Sale. No software or hardware required.", - "info1": { - "title": "Instant payments via Lightning", - "description": "The moment your customer sends a payment, it’s there. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees." - }, - "info2": { - "title": "Simple to use, custodial by default", - "description1": "Just enter an amount, share QR code and you’re done.", - "description2": "CoinOS is custodial by default, which eliminates the need to understand how bitcoin/lightning works. We do all the heavy lifting so you can focus on your business.", - "description3": "You always have the option of <span class=\"underline underline-offset-4\">taking custody</span> of your own keys." - }, - "info3": { - "title": "Brand it your way!", - "description": "Customize your point of sale look and feel, or keep it on default - totally up to you." - } - }, - "login": { - "username": "Username", - "password": "Password", - "passwordRecommendation": "We recommend a long, random password generated with a password manager.", - "forgotPassword": "Forgot Password?", - "haveAccount": "Already have an account?", - "noAccount": "Don't have an account?", - "register": "Register", - "signIn": "Sign In", - "failed": "Login failed" - }, + } + }, + "invoice": { + "addTip": "Add a tip", + "addTipq": "Add a tip?", + "done": "Done", + "paymentSuccessful": "Payment Successful!" + }, + "jobs": { + "header": "Jobs", + "subheader": "Current Openings", + "pitch1": "CoinOS is actively looking for developers to join our growing team (full-time or part-time, remote working OK).", + "pitch2": "Excited about working on open source bitcoin? Then take a look at our repositories on", + "github": "GitHub", + "pitch3": "If you think you can make an impact, we'd love to hear from you. Send us your resume to" + }, + "landing": { + "header_before_icon": "The", + "header_with_icon": "easiest", + "header_after_icon": "way to accept bitcoin in your store.", + "subheader": "Grow your customer base and revenue by accepting bitcoin with an easy-to-use and managed Point of Sale. No software or hardware required.", + "info1": { + "title": "Instant payments via Lightning", + "description": "The moment your customer sends a payment, it’s there. No waiting for bank settlements or worrying about chargebacks. Instant settlement, in seconds. Say goodbye to 3% credit card processing fees." + }, + "info2": { + "title": "Simple to use, custodial by default", + "description1": "Just enter an amount, share QR code and you’re done.", + "description2": "CoinOS is custodial by default, which eliminates the need to understand how bitcoin/lightning works. We do all the heavy lifting so you can focus on your business.", + "description3": "You always have the option of <span class=\"underline underline-offset-4\">taking custody</span> of your own keys." + }, + "info3": { + "title": "Brand it your way!", + "description": "Customize your point of sale look and feel, or keep it on default - totally up to you." + } + }, + "login": { + "username": "Username", + "password": "Password", + "passwordRecommendation": "We recommend a long, random password generated with a password manager.", + "forgotPassword": "Forgot Password?", + "haveAccount": "Already have an account?", + "noAccount": "Don't have an account?", + "register": "Register", + "signIn": "Sign In", + "failed": "Login failed" + }, "nav": { "startInSeconds": "Start in Seconds", - "account": "Account", + "account": "Account", "signIn": "Sign In", - "signOut": "Sign Out", - "dashboard": "Dashboard", - "settings": "Settings", - "support": "Support" + "signOut": "Sign Out", + "dashboard": "Dashboard", + "settings": "Settings", + "support": "Support" }, - "user": { - "addressGoesHere": "Address goes here", - "follow": "Follow", - "remove": "Remove", - "scanToPayBTC": "Scan to pay with bitcoin", - "dashboard": { - "ACCOUNT_BALANCE": "ACCOUNT BALANCE", - "bitcoinPrice": "Bitcoin Price:", - "conversionFeeWarning": "You will be charged a 1% conversion fee if you withdraw more of a certain type of Bitcoin than you deposit.", - "dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.", - "fetchingRate": "fetching rate...", - "optionalNote": "Note (Optional)", - "send": "Send", - "withdraw": "Withdraw" - }, - "receive": { - "lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.", - "showQR": "Show QR" - }, - "settings": { - "header": "Settings", - "ACCOUNT": "ACCOUNT", - "POINT_OF_SALE": "POINT OF SALE", - "SECURITY": "SECURITY", - "locale": "Language", - "username": "Username", - "newPassword": "New Password", - "businessAddress": "Business Address", - "emailNotifications": "Email Notifications", - "emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.", - "smsNotifications": "SMS Notifications", - "smsNotificationsDescription": "CoinOS will send you text notifications when this is enabled.", - "theme": "Color Theme", - "themeDescription": "Select from the default color themes.", - "localCurrency": "Local Currency", - "btcUnit": "Display bitcoin in:", - "bitcoin": "Bitcoin", - "satoshis": "Satoshis", - "securityPIN": "Security PIN", - "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.", - "setPIN": "Set PIN", - "autoLock": "Auto-Lock Timer", - "autoLockDescription": "Your account will go into a secure mode automatically after a specified time:", - "twofa": "2-Factor Authentication", - "twofaDescription": "Add an extra level of security to your device by enableing 2-factor authentication.", - "twofaSetup": "Set up 2FA" - }, - "support": { - "header": "Support", - "email": "Email", - "accountName": "Account Name", - "message": "Message", - "send": "Send" - }, - "transactions": { - "header": "Transaction History", - "AMOUNT": "AMOUNT", - "TYPE": "TYPE", - "TIME": "TIME", - "sent": "Sent", - "received": "Received", - "empty": "No transactions yet." - } - } + "user": { + "addressGoesHere": "Address goes here", + "follow": "Follow", + "remove": "Remove", + "scanToPayBTC": "Scan to pay with bitcoin", + "dashboard": { + "ACCOUNT_BALANCE": "ACCOUNT BALANCE", + "bitcoinPrice": "Bitcoin Price:", + "conversionFeeWarning": "You will be charged a 1% conversion fee if you withdraw more of a certain type of Bitcoin than you deposit.", + "dataFromBinance": "Data from <span class=\"text-black\">Binance</span>.", + "fetchingRate": "fetching rate...", + "optionalNote": "Note (Optional)", + "send": "Send", + "withdraw": "Withdraw" + }, + "receive": { + "lessThan1BTCWarning": "Please enter an amount less than 1 bitcoin.", + "showQR": "Show QR" + }, + "settings": { + "header": "Settings", + "ACCOUNT": "ACCOUNT", + "POINT_OF_SALE": "POINT OF SALE", + "SECURITY": "SECURITY", + "locale": "Language", + "username": "Username", + "newPassword": "New Password", + "businessAddress": "Business Address", + "emailNotifications": "Email Notifications", + "emailNotificationsDescription": "Get notified via email when a change occurs on your account or when people send you payments.", + "smsNotifications": "SMS Notifications", + "smsNotificationsDescription": "CoinOS will send you text notifications when this is enabled.", + "theme": "Color Theme", + "themeDescription": "Select from the default color themes.", + "localCurrency": "Local Currency", + "btcUnit": "Display bitcoin in:", + "bitcoin": "Bitcoin", + "satoshis": "Satoshis", + "securityPIN": "Security PIN", + "securityPINDescription": "Set a security pin that will be used to unlock your settings and to send outgoing payments.", + "setPIN": "Set PIN", + "autoLock": "Auto-Lock Timer", + "autoLockDescription": "Your account will go into a secure mode automatically after a specified time:", + "twofa": "2-Factor Authentication", + "twofaDescription": "Add an extra level of security to your device by enableing 2-factor authentication.", + "twofaSetup": "Set up 2FA" + }, + "support": { + "header": "Support", + "email": "Email", + "accountName": "Account Name", + "message": "Message", + "send": "Send" + }, + "transactions": { + "header": "Transaction History", + "AMOUNT": "AMOUNT", + "TYPE": "TYPE", + "TIME": "TIME", + "sent": "Sent", + "received": "Received", + "empty": "No transactions yet." + } + } } diff --git a/src/locales/fr.json b/src/locales/fr.json index 44320607..acc0eda7 100644 --- a/src/locales/fr.json +++ b/src/locales/fr.json @@ -1,14 +1,14 @@ { "langname": "Français", - "about": { - "header": "À Propos" - }, - "faq": { - "header": "FAQ" - }, - "howItWorks": { - "header": "Comment Elle Fonctionne" - }, + "about": { + "header": "À Propos" + }, + "faq": { + "header": "FAQ" + }, + "howItWorks": { + "header": "Comment Elle Fonctionne" + }, "nav": { "startInSeconds": "Commence en Secondes", "signIn": "Connexion" diff --git a/src/routes/+error.svelte b/src/routes/+error.svelte index 2a8846c3..2bacc8a6 100644 --- a/src/routes/+error.svelte +++ b/src/routes/+error.svelte @@ -1,7 +1,7 @@ <script> - import { page } from '$app/stores'; + import { page } from '$app/stores'; import { Icon, PageNotFound } from '$comp'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; </script> {#if $page.error.message.includes('not found') || $page.status === 404} @@ -15,9 +15,9 @@ <Icon icon="error" style="mx-auto w-56" /> - <h1 class="font-bold text-5xl">{$_('error.header'), { default: "Error" }}</h1> + <h1 class="font-bold text-5xl">{($_('error.header'), { default: 'Error' })}</h1> <p class="px-1 w-full md:w-96 break-all font-bold">{$page.error.message.toUpperCase()}</p> - <p>{$_('error.message'), { default: "Please try again or contact support." }}</p> + <p>{($_('error.message'), { default: 'Please try again or contact support.' })}</p> </div> </div> {/if} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index f2624613..12db17c3 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -11,11 +11,11 @@ import { goto } from '$app/navigation'; import { LoadingSplash } from '$comp'; import { warning, protectedRoutes } from '$lib/utils'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; - $: $token = data.token + $: $token = data.token; - export let data; + export let data; let ready = false; @@ -28,7 +28,7 @@ }); if (protectedRoutes.find((p) => $page.url.pathname.match(p))) { - console.log("TOKEN", $token) + console.log('TOKEN', $token); if (!$token) { goto('/login'); warning($_('error.signIn')); diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte index 6bdd9699..bb5df050 100644 --- a/src/routes/+page.svelte +++ b/src/routes/+page.svelte @@ -10,7 +10,7 @@ Footer } from '$comp'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; let howItWorks; let faq; @@ -22,7 +22,7 @@ { image: 'smile', stepID: 'step3' } ]; - const faqIDs = ["cost", "compatibility", "safety"]; + const faqIDs = ['cost', 'compatibility', 'safety']; </script> <LandingHeader {howItWorks} {faq} {about} /> @@ -34,28 +34,24 @@ <!-- landing info 1 --> <LandingInfoCard image="lightning-qr" - title={$_('landing.info1.title')} - description={$_('landing.info1.description')} + title={$_('landing.info1.title')} + description={$_('landing.info1.description')} /> <!-- landing info 2 --> - <LandingInfoCard - image="phone-checkout" - title={$_('landing.info2.title')} - order="reverse" - > - {$_('landing.info2.description1')} + <LandingInfoCard image="phone-checkout" title={$_('landing.info2.title')} order="reverse"> + {$_('landing.info2.description1')} <br /><br /> - {$_('landing.info2.description2')} + {$_('landing.info2.description2')} <br /><br /> - {@html $_('landing.info2.description3')} + {@html $_('landing.info2.description3')} </LandingInfoCard> <!-- landing info 3 --> <div> <LandingInfoCard image="customize" - title={$_('landing.info3.title')} + title={$_('landing.info3.title')} description={$_('landing.info3.description')} /> <div bind:this={howItWorks} /> @@ -79,7 +75,7 @@ <div class="space-y-10"> <h3 class="text-5xl font-medium text-center">{$_('faq.header')}</h3> {#each faqIDs as faqID} - <FaqCard questionID={faqID} /> + <FaqCard questionID={faqID} /> {/each} </div> <div bind:this={about} /> diff --git a/src/routes/[username]/+page.server.js b/src/routes/[username]/+page.server.js index e31a28c0..458b1db0 100644 --- a/src/routes/[username]/+page.server.js +++ b/src/routes/[username]/+page.server.js @@ -10,7 +10,7 @@ export async function load({ params }) { body = {}; } - console.log("BODY", body) + console.log('BODY', body); return body; } diff --git a/src/routes/[username]/+page.svelte b/src/routes/[username]/+page.svelte index 6d93ba23..ed428d46 100644 --- a/src/routes/[username]/+page.svelte +++ b/src/routes/[username]/+page.svelte @@ -4,7 +4,7 @@ import { AppHeader, Icon, PageNotFound } from '$comp'; import { user } from '$lib/store'; import { copy } from '$lib/utils'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; export let data; let lightningAddress = `${data?.username}@coinos.io`; diff --git a/src/routes/[username]/dashboard/+page.svelte b/src/routes/[username]/dashboard/+page.svelte index 3553661a..9e09aa16 100644 --- a/src/routes/[username]/dashboard/+page.svelte +++ b/src/routes/[username]/dashboard/+page.svelte @@ -3,7 +3,7 @@ import { tick } from 'svelte'; import { AppHeader, Icon } from '$comp'; import { rate, user, preferredCurrency } from '$lib/store'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; let payreq = '', payreqField, @@ -63,14 +63,12 @@ </h1> {#if !withdrawing} <span class="text-secondary mx-auto text-lg font-bold" - >{$_('user.dashboard.bitcoinPrice')} - <span class="text-black">{$rate ? btcPrice : $_('user.dashboard.fetchingRate')}</span> + >{$_('user.dashboard.bitcoinPrice')} + <span class="text-black">{$rate ? btcPrice : $_('user.dashboard.fetchingRate')}</span> {$preferredCurrency} </span> - <span class="text-secondary block mt-1" - >{@html $_('user.dashboard.dataFromBinance')} - </span> + <span class="text-secondary block mt-1">{@html $_('user.dashboard.dataFromBinance')} </span> <h3 class="text-secondary font-bold border-b pb-1 mt-10 mb-6 w-full md:w-[500px]"> {$_('user.dashboard.ACCOUNT_BALANCE')} @@ -83,7 +81,7 @@ <span class="text-secondary text-xl block">{accountBalanceSats} SAT</span> <button class="rounded-full border py-2 font-bold w-28 mt-4" on:click={toggle} - >{$_('user.dashboard.withdraw')}</button + >{$_('user.dashboard.withdraw')}</button > <p class="text-secondary my-2">{$_('user.dashboard.conversionFeeWarning')}</p> {:else} @@ -105,7 +103,9 @@ </div> <div> - <label for="note" class="font-bold mb-1 block">{$_('user.dashboard.optionalNote')}</label> + <label for="note" class="font-bold mb-1 block" + >{$_('user.dashboard.optionalNote')}</label + > <textarea name="note" rows={2} class="block rounded-2xl p-3 w-full bg-primary" /> </div> diff --git a/src/routes/[username]/receive/+page.svelte b/src/routes/[username]/receive/+page.svelte index 783ae0a3..6d750d1b 100644 --- a/src/routes/[username]/receive/+page.svelte +++ b/src/routes/[username]/receive/+page.svelte @@ -5,7 +5,7 @@ import { invoiceAmount, invoiceAmountFiat, rate, user } from '$lib/store'; import { post, warning } from '$lib/utils'; import { page } from '$app/stores'; - import { _, number } from 'svelte-i18n'; + import { _, number } from 'svelte-i18n'; let useFiat = true; let amountFiat = 0; @@ -157,7 +157,8 @@ ? 'opacity-50' : 'opacity-100'}" on:click={submit} - disabled={$invoiceAmount === 0}><Icon icon="qr" style="mr-2" /> {$_('user.receive.showQR')}</button + disabled={$invoiceAmount === 0} + ><Icon icon="qr" style="mr-2" /> {$_('user.receive.showQR')}</button > <!-- <button diff --git a/src/routes/[username]/settings/+page.svelte b/src/routes/[username]/settings/+page.svelte index ac7804a0..9644c3ac 100644 --- a/src/routes/[username]/settings/+page.svelte +++ b/src/routes/[username]/settings/+page.svelte @@ -1,7 +1,7 @@ <script> import { AppHeader, Icon, Toggle, LocaleSelector } from '$comp'; import { user, colorTheme } from '$lib/store'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; let setting = 'account'; let password; @@ -28,7 +28,9 @@ <AppHeader /> <div class="my-20 px-3 md:px-0 w-full md:w-[400px] mx-auto space-y-8"> - <h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">{$_('user.settings.header')}</h1> + <h1 class="text-center text-3xl md:text-4xl font-semibold mb-10"> + {$_('user.settings.header')} + </h1> <div class="font-bold flex justify-between items-center border-b pb-3 text-secondary"> <button class:selected={setting === 'account'} on:click={() => (setting = 'account')} @@ -62,7 +64,9 @@ </div> <div class="relative"> - <label for="password" class="block font-bold block mb-1">{$_('user.settings.newPassword')}</label> + <label for="password" class="block font-bold block mb-1" + >{$_('user.settings.newPassword')}</label + > {#if revealPassword} <input type="text" class="block border rounded-xl p-3 w-full" bind:value={password} /> {:else} @@ -78,7 +82,9 @@ </div> <div> - <label for="address" class="font-bold mb-1 block">{$_('user.settings.businessAddress')}</label> + <label for="address" class="font-bold mb-1 block" + >{$_('user.settings.businessAddress')}</label + > <input type="text" name="address" class="block border rounded-xl p-3 w-full" /> </div> @@ -88,7 +94,7 @@ <Toggle id="email-notify" /> </div> <p class="text-secondary mt-1 w-9/12"> - {$_('user.settings.emailNotificationsDescription')} + {$_('user.settings.emailNotificationsDescription')} </p> </div> @@ -117,7 +123,9 @@ </div> {:else if setting === 'pos'} <div> - <label for="currency" class="font-bold block mb-1">{$_('user.settings.localCurrency')}</label> + <label for="currency" class="font-bold block mb-1" + >{$_('user.settings.localCurrency')}</label + > <select name="currency" class="block py-3 w-full"> <option value="USD">USD</option> </select> diff --git a/src/routes/[username]/support/+page.svelte b/src/routes/[username]/support/+page.svelte index bb1392b3..6bbb5fb2 100644 --- a/src/routes/[username]/support/+page.svelte +++ b/src/routes/[username]/support/+page.svelte @@ -2,7 +2,7 @@ // this needs to be hooked up to the backend import { AppHeader } from '$comp'; import { user } from '$lib/store'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; let email; let message; </script> @@ -11,7 +11,9 @@ <AppHeader /> <div class="my-20"> - <h1 class="text-center text-3xl md:text-4xl font-semibold mb-10">{$_('user.support.header')}</h1> + <h1 class="text-center text-3xl md:text-4xl font-semibold mb-10"> + {$_('user.support.header')} + </h1> <form class="space-y-5 mx-auto w-11/12 md:w-[350px]"> <div> diff --git a/src/routes/[username]/transactions/+page.svelte b/src/routes/[username]/transactions/+page.svelte index de93997d..1cc2611a 100644 --- a/src/routes/[username]/transactions/+page.svelte +++ b/src/routes/[username]/transactions/+page.svelte @@ -1,7 +1,7 @@ <script> import { AppHeader } from '$comp'; import { user, newPayment } from '$lib/store'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; $newPayment = false; @@ -44,7 +44,9 @@ </div> <div class="text-center"> - <span class="text-secondary">{$_('user.transactions.' + (tx.amount < 0 ? 'sent' : 'received'))}</span> + <span class="text-secondary" + >{$_('user.transactions.' + (tx.amount < 0 ? 'sent' : 'received'))}</span + > </div> <div class="text-secondary text-right"> diff --git a/src/routes/invoice/[id]/+page.svelte b/src/routes/invoice/[id]/+page.svelte index 6c79b693..47f405a2 100644 --- a/src/routes/invoice/[id]/+page.svelte +++ b/src/routes/invoice/[id]/+page.svelte @@ -6,10 +6,10 @@ import { goto } from '$app/navigation'; import { onMount } from 'svelte'; import { copy } from '$lib/utils'; - import { _, number } from 'svelte-i18n'; + import { _, number } from 'svelte-i18n'; - export let data; - $: ({ amount, id, rate, status, text, username } = data); + export let data; + $: ({ amount, id, rate, status, text, username } = data); $invoices[id] = { amount, id, rate, status, text, username }; @@ -245,7 +245,8 @@ stroke-linecap="round" stroke-linejoin="round" /> - </svg> {$_('invoice.addTip')} + </svg> + {$_('invoice.addTip')} </button> <span class="text-secondary block" diff --git a/src/routes/jobs/+page.svelte b/src/routes/jobs/+page.svelte index 724c5b91..db637b39 100644 --- a/src/routes/jobs/+page.svelte +++ b/src/routes/jobs/+page.svelte @@ -1,7 +1,7 @@ <script> import { Icon } from '$comp'; import { goto } from '$app/navigation'; - import { _ } from 'svelte-i18n'; + import { _ } from 'svelte-i18n'; </script> <a href="/"> @@ -16,9 +16,9 @@ <h2 class="text-2xl font-medium">{$_('jobs.subheader')}</h2> <p class="text-justify text-xl text-secondary"> - {$_('jobs.pitch1')} + {$_('jobs.pitch1')} <br /><br /> - {$_('jobs.pitch2')} + {$_('jobs.pitch2')} <a href="https://github.com/coinos" target="_blank" @@ -26,7 +26,7 @@ class="underline underline-offset-4">{$_('jobs.github')}</a >. <br /><br /> - {$_('jobs.pitch3')} + {$_('jobs.pitch3')} <a href="mailto:[email protected]" class="underline underline-offset-4">[email protected]</a>. </p> </div> diff --git a/src/routes/login/+page.server.js b/src/routes/login/+page.server.js index b788af07..e2018ba4 100644 --- a/src/routes/login/+page.server.js +++ b/src/routes/login/+page.server.js @@ -2,7 +2,7 @@ import { login, post } from '$lib/utils'; export async function POST({ setHeaders, request }) { let user = Object.fromEntries(await request.formData()); - await login(user, setHeaders); + await login(user, setHeaders); return { location: `/${data.username}/dashboard` }; } diff --git a/src/routes/register/+page.server.js b/src/routes/register/+page.server.js index dc7dda33..0c7efafd 100644 --- a/src/routes/register/+page.server.js +++ b/src/routes/register/+page.server.js @@ -6,7 +6,7 @@ let maxAge = 30 * 24 * 60 * 60; export async function POST({ request, setHeaders }) { let user = Object.fromEntries(await request.formData()); await post('/register', { user }); - await login(user, setHeaders); - + await login(user, setHeaders); + return { location: `/${user.username}/dashboard` }; } |