From c17cf8d8c7a8ed252aa6895f03dae15a3fcd0c12 Mon Sep 17 00:00:00 2001 From: secondl1ght <85003930+secondl1ght@users.noreply.github.com> Date: Thu, 15 Sep 2022 18:11:12 -0600 Subject: format --- src/app.html | 10 +-- src/components/About.svelte | 84 +++++++++++----------- src/components/LocaleSelector.svelte | 14 ++-- src/components/LocationsMap.svelte | 10 +-- src/components/RegisterOrLogin.svelte | 7 +- src/locales/en.json | 46 ++++++------ src/routes/[username]/dashboard/+page.svelte | 26 +++---- .../[username]/transactions/[...page]/+page.svelte | 35 +++++---- src/routes/invoice/[id]/+page.svelte | 4 +- 9 files changed, 123 insertions(+), 113 deletions(-) (limited to 'src') diff --git a/src/app.html b/src/app.html index 4e3b66bd..d8545747 100644 --- a/src/app.html +++ b/src/app.html @@ -8,10 +8,12 @@ coinos %sveltekit.head% - - + +
%sveltekit.body%
diff --git a/src/components/About.svelte b/src/components/About.svelte index 704e425a..7af1e896 100644 --- a/src/components/About.svelte +++ b/src/components/About.svelte @@ -10,10 +10,10 @@ { type: 'github', url: 'https://github.com/asoltys', color: 'bg-gray-800' } ] }, - { name: 'cole', socials: [] }, + { name: 'cole', socials: [] }, { name: 'john', - socials: [ ] + socials: [] }, { name: 'secondl1ght', @@ -26,11 +26,13 @@ name: 'shauna', socials: [ { type: 'twitter', url: 'https://twitter.com/ShaunaCollister', color: 'bg-[#1D9BF0]' }, - { type: 'linkedin', url: 'https://www.linkedin.com/in/shauna-collister-32905214', color: 'bg-[#0a66c2]' } + { + type: 'linkedin', + url: 'https://www.linkedin.com/in/shauna-collister-32905214', + color: 'bg-[#0a66c2]' + } ] - }, - - + } ]; @@ -52,45 +54,45 @@ -
-
-

- {$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} +
+ {#each member.socials as social} + + {/each} +
+
+
+ {$t(`about.team.${member.name}.bio`)} +
- + {/each}
-
- {$t(`about.team.${member.name}.bio`)} -
-
- {/each} -
-
+
diff --git a/src/components/LocaleSelector.svelte b/src/components/LocaleSelector.svelte index 9f4a1428..a4a139f2 100644 --- a/src/components/LocaleSelector.svelte +++ b/src/components/LocaleSelector.svelte @@ -10,10 +10,10 @@ + select { + -webkit-appearance: none; + -moz-appearance: none; + appearance: none; + border: none; + } + diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte index 063b4681..bf2e4339 100644 --- a/src/components/LocationsMap.svelte +++ b/src/components/LocationsMap.svelte @@ -37,26 +37,26 @@ .tileLayer('http://{s}tile.stamen.com/toner/{z}/{x}/{y}.png', { // leaflet.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom: 19, - subdomains: ['', 'a.', 'b.', 'c.', 'd.'], + subdomains: ['', 'a.', 'b.', 'c.', 'd.'] }) .addTo(map); // let tonerLayer = new L.StamenTileLayer("toner"); // map.addLayer(tonerLayer); - - leaflet .marker([49.27034, -123.141373]) .addTo(map) .bindPopup( 'Rolf Vancouver
1628 W 1st Ave #231, Vancouver
www.rolfbodywork.com' - )._icon.classList.add("huechange"); + ) + ._icon.classList.add('huechange'); leaflet .marker([49.26419, -123.15702]) .addTo(map) - .bindPopup('Tacos Jorge
2287 W Broadway, Vancouver')._icon.classList.add("huechange"); + .bindPopup('Tacos Jorge
2287 W Broadway, Vancouver') + ._icon.classList.add('huechange'); } }); diff --git a/src/components/RegisterOrLogin.svelte b/src/components/RegisterOrLogin.svelte index 5b1b9a95..6e19c7d5 100644 --- a/src/components/RegisterOrLogin.svelte +++ b/src/components/RegisterOrLogin.svelte @@ -86,7 +86,10 @@ {#if pageID === 'signIn'}
- + {:else} - + diff --git a/src/locales/en.json b/src/locales/en.json index 433a9668..875af05f 100644 --- a/src/locales/en.json +++ b/src/locales/en.json @@ -11,30 +11,30 @@ "p4": "Intra-account transfers between custodial wallets of different users on our server are completely free, instant, and unlimited.", "team": { "header": "The Team", - "adam": { - "name": "Adam Soltys", - "position": "Chief Technical Officer", - "bio": "Adam is a Web Developer and bitcoin enthusiast who believes sound money is a key tool to liberate humanity and increase global prosperity. He started working on a simple page for merchants to do price conversion and take bitcoin payments in 2012 and the rest is history! He lives in Vancouver with his wife Chelsea and two children." + "adam": { + "name": "Adam Soltys", + "position": "Chief Technical Officer", + "bio": "Adam is a Web Developer and bitcoin enthusiast who believes sound money is a key tool to liberate humanity and increase global prosperity. He started working on a simple page for merchants to do price conversion and take bitcoin payments in 2012 and the rest is history! He lives in Vancouver with his wife Chelsea and two children." }, - "secondl1ght": { - "name": "secondl1ght", - "position": "Web Developer", - "bio": "A self-taught Web Developer, secondl1ght dove head first down the bitcoin rabbit hole and left his fiat job to focus on bitcoin development full-time. He contributes to open source projects, is a privacy advocate, and freedom lover." + "secondl1ght": { + "name": "secondl1ght", + "position": "Web Developer", + "bio": "A self-taught Web Developer, secondl1ght dove head first down the bitcoin rabbit hole and left his fiat job to focus on bitcoin development full-time. He contributes to open source projects, is a privacy advocate, and freedom lover." }, - "shauna": { - "name": "Shauna", - "position": "Operations & Marketing", - "bio": "Strategic & Project Management. Jack of all Trades. Can always find time to meet for coffee." + "shauna": { + "name": "Shauna", + "position": "Operations & Marketing", + "bio": "Strategic & Project Management. Jack of all Trades. Can always find time to meet for coffee." }, - "cole": { - "name": "Cole Goodwin", - "position": "Bitcoin Professional", - "bio": "As a Certified Bitcoin Professional, Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. In summer 2021 he quit his 9-5 job due to the passive income from bitcoin & ASIC Mining. After discovering the lightning network, Cole met Adam. Now being a part of the coinos team, we want to introduce the lightning network to as many users as possible." + "cole": { + "name": "Cole Goodwin", + "position": "Bitcoin Professional", + "bio": "As a Certified Bitcoin Professional, Cole is a driven individual with a passion for freedom. He came across bitcoin in 2016 and studied it in depth. In summer 2021 he quit his 9-5 job due to the passive income from bitcoin & ASIC Mining. After discovering the lightning network, Cole met Adam. Now being a part of the coinos team, we want to introduce the lightning network to as many users as possible." }, - "john": { - "name": "John Barratt", - "position": "Full Stack Web Developer", - "bio": "When not coding you can find John out in the woods hiking all the great trails that BC has to offer." + "john": { + "name": "John Barratt", + "position": "Full Stack Web Developer", + "bio": "When not coding you can find John out in the woods hiking all the great trails that BC has to offer." } }, "locations": { @@ -70,7 +70,7 @@ "support": "Support", "telegram": "Telegram", "twitter": "Twitter", - "news": "News" + "news": "News" }, "howItWorks": { "header": "How It Works", @@ -122,7 +122,7 @@ } }, "login": { - "optional": "Optional", + "optional": "Optional", "token": "2FA Token", "username": "Username", "password": "Password", @@ -156,7 +156,7 @@ "fetchingRate": "fetching rate...", "optionalNote": "Note (Optional)", "send": "Send", - "receive": "Receive a Payment", + "receive": "Receive a Payment", "withdraw": "Withdraw" }, "receive": { diff --git a/src/routes/[username]/dashboard/+page.svelte b/src/routes/[username]/dashboard/+page.svelte index 9c9d8908..1605999a 100644 --- a/src/routes/[username]/dashboard/+page.svelte +++ b/src/routes/[username]/dashboard/+page.svelte @@ -55,25 +55,25 @@ - +

{$t('user.dashboard.ACCOUNT_BALANCE')}

- {accountBalanceSats} SAT - - {$selectedRate ? accountBalanceFiat : $t('user.dashboard.fetchingRate')} + {accountBalanceSats} SAT -
- {$selectedRate ? accountBalanceFiat : $t('user.dashboard.fetchingRate')} - -
+ +
+ + +
{:else}