From f098b90a10283b31694b037670cb6cbbc6613c85 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 15 Sep 2022 15:43:48 -0700 Subject: map styles --- src/app.html | 4 ++++ src/components/LocationsMap.svelte | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/src/app.html b/src/app.html index ade9fa4b..4e3b66bd 100644 --- a/src/app.html +++ b/src/app.html @@ -8,6 +8,10 @@ coinos %sveltekit.head% + +

%sveltekit.body%

diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte index 2cff3449..063b4681 100644 --- a/src/components/LocationsMap.svelte +++ b/src/components/LocationsMap.svelte @@ -9,28 +9,54 @@ if (browser) { const leaflet = await import('leaflet'); - // this sets the inital view of the map on page load map = leaflet.map(mapElement).setView([49.267265, -123.1491965], 13); + const myCustomColour = 'orange'; + + const markerHtmlStyles = ` + background-color: ${myCustomColour}; + width: 3rem; + height: 3rem; + display: block; + left: -1.5rem; + top: -1.5rem; + position: relative; + border-radius: 3rem 3rem 0; + transform: rotate(45deg); + border: 1px solid #FFFFFF`; + + const icon = L.divIcon({ + className: 'my-custom-pin', + iconAnchor: [0, 24], + labelAnchor: [-6, 0], + popupAnchor: [0, -36], + html: `` + }); + leaflet - .tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { + .tileLayer('http://{s}tile.stamen.com/toner/{z}/{x}/{y}.png', { + // leaflet.tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { maxZoom: 19, - attribution: '© OpenStreetMap' + subdomains: ['', 'a.', 'b.', 'c.', 'd.'], }) .addTo(map); - // business locations + // 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"); leaflet .marker([49.26419, -123.15702]) .addTo(map) - .bindPopup('Tacos Jorge
2287 W Broadway, Vancouver'); + .bindPopup('Tacos Jorge
2287 W Broadway, Vancouver')._icon.classList.add("huechange"); } }); -- cgit v1.2.3 From 58a40fdc8d8bf2ddd0f88ff4b974e0fe9fcef245 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 15 Sep 2022 16:37:31 -0700 Subject: transaction pagination --- src/routes/[username]/transactions/+page.svelte | 57 ---------------- .../transactions/[...page]/+page.server.js | 14 ++++ .../[username]/transactions/[...page]/+page.svelte | 78 ++++++++++++++++++++++ 3 files changed, 92 insertions(+), 57 deletions(-) delete mode 100644 src/routes/[username]/transactions/+page.svelte create mode 100644 src/routes/[username]/transactions/[...page]/+page.server.js create mode 100644 src/routes/[username]/transactions/[...page]/+page.svelte diff --git a/src/routes/[username]/transactions/+page.svelte b/src/routes/[username]/transactions/+page.svelte deleted file mode 100644 index 5a132394..00000000 --- a/src/routes/[username]/transactions/+page.svelte +++ /dev/null @@ -1,57 +0,0 @@ - - - - -

- {$t('user.transactions.header')} -

- -

{$t('user.transactions.AMOUNT')}

{$t('user.transactions.TYPE')}

{$t('user.transactions.TIME')}

- -

- {#if transactions.length} - {#each transactions as tx} -

- {tx.amount > 0 ? '+' : ''}{f(tx.amount * (tx.rate / 100000000), tx.currency)} - - - {tx.amount > 0 ? '+' : ''}{s(tx.amount)} - SAT - -

- -

- {$t('user.transactions.' + (tx.amount < 0 ? 'sent' : 'received'))} -

- -

- {new Date(tx.createdAt).toLocaleDateString(undefined, { dateStyle: 'medium' })} -

- {/each} - {:else} -

{$t('user.transactions.empty')}

- {/if} -

diff --git a/src/routes/[username]/transactions/[...page]/+page.server.js b/src/routes/[username]/transactions/[...page]/+page.server.js new file mode 100644 index 00000000..d84c895a --- /dev/null +++ b/src/routes/[username]/transactions/[...page]/+page.server.js @@ -0,0 +1,14 @@ +import { get, auth } from '$lib/utils'; + +let offset = 25; + +export async function load({ params, request }) { + let page = parseInt(params.page || 1); + let transactions = await get('/payments', auth(request)); + let total = transactions.length; + let pages = new Array(Math.ceil(total / offset)); + let i = (page - 1) * offset; + transactions = transactions.slice(i, i + offset); + + return { total, transactions, page, pages }; +} diff --git a/src/routes/[username]/transactions/[...page]/+page.svelte b/src/routes/[username]/transactions/[...page]/+page.svelte new file mode 100644 index 00000000..a5209ed8 --- /dev/null +++ b/src/routes/[username]/transactions/[...page]/+page.svelte @@ -0,0 +1,78 @@ + + + + +

+ {$t('user.transactions.header')} +

+ +

+ {#if pages.length > 1} + {#each pages as _, i} + +

+ {i + 1} +

+ + {/each} + {/if} +

+ +

{$t('user.transactions.AMOUNT')}

{$t('user.transactions.TYPE')}

{$t('user.transactions.TIME')}

+ +

+ {#if transactions.length} + {#each transactions as tx} +

+ {tx.amount > 0 ? '+' : ''}{f(tx.amount * (tx.rate / 100000000), tx.currency)} + + + {tx.amount > 0 ? '+' : ''}{s(tx.amount)} + SAT + +

+ +

+ {$t('user.transactions.' + (tx.amount < 0 ? 'sent' : 'received'))} +

+ +

+ {new Date(tx.createdAt).toLocaleDateString(undefined, { dateStyle: 'medium' })} +

+ {/each} + {:else} +

{$t('user.transactions.empty')}

+ {/if} +

+ + -- cgit v1.2.3 From 870df929c781649438948e546f19cb0402523ec2 Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Thu, 15 Sep 2022 17:04:36 -0700 Subject: hide notification settings --- src/routes/[username]/settings/_account.svelte | 39 +++++++++++++------------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/src/routes/[username]/settings/_account.svelte b/src/routes/[username]/settings/_account.svelte index 78d9d511..5057ef5c 100644 --- a/src/routes/[username]/settings/_account.svelte +++ b/src/routes/[username]/settings/_account.svelte @@ -97,25 +97,26 @@ -

- {$t('user.settings.emailNotifications')} - -

- {$t('user.settings.emailNotificationsDescription')} -

- -

- {$t('user.settings.smsNotifications')} - -

- {$t('user.settings.smsNotificationsDescription')} -

+ + + + + + + + + + + + + + + + + + + +

{$t('user.settings.profileImage')} -- cgit v1.2.3