aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/components/About.svelte4
-rw-r--r--src/components/LocationsMap.svelte71
-rw-r--r--src/components/Qr.svelte8
-rw-r--r--src/lib/utils.js3
-rw-r--r--src/routes/+layout.server.js4
-rw-r--r--src/routes/+page.svelte4
-rw-r--r--src/routes/launch/+page.svelte4
-rw-r--r--src/routes/scan/+page.svelte5
-rw-r--r--src/routes/send/bitcoin/[address]/+page.svelte2
-rw-r--r--src/routes/send/lightning/[payreq]/+page.server.js3
-rw-r--r--src/routes/send/lightning/[payreq]/+page.svelte2
11 files changed, 65 insertions, 45 deletions
diff --git a/src/components/About.svelte b/src/components/About.svelte
index 86c5bd03..d4da81fe 100644
--- a/src/components/About.svelte
+++ b/src/components/About.svelte
@@ -1,5 +1,5 @@
<script>
-export let locations
+ export let locations;
import { Image, Icon, LocationsMap } from '$comp';
import { t } from '$lib/translations';
@@ -104,5 +104,5 @@ export let locations
<p class="text-secondary text-xl w-full md:w-10/12 lg:w-2/3 2xl:w-[800px] mx-auto mb-10">
{@html $t('about.locations.description')}
</p>
- <LocationsMap locations={locations} />
+ <LocationsMap {locations} />
</div>
diff --git a/src/components/LocationsMap.svelte b/src/components/LocationsMap.svelte
index 520788cd..34821745 100644
--- a/src/components/LocationsMap.svelte
+++ b/src/components/LocationsMap.svelte
@@ -1,5 +1,5 @@
<script>
-export let locations
+ export let locations;
import { onMount, onDestroy } from 'svelte';
import { browser } from '$app/environment';
@@ -36,9 +36,12 @@ export let locations
html: `<span style="${markerHtmlStyles}" />`
});
-locations = locations.filter(location => location['osm_json'].tags && location['osm_json'].tags['payment:coinos'] === 'yes')
+ locations = locations.filter(
+ (location) =>
+ location['osm_json'].tags && location['osm_json'].tags['payment:coinos'] === 'yes'
+ );
- /* const locations = [
+ /* const locations = [
{
lat: 49.27034,
lng: -123.141373,
@@ -77,23 +80,27 @@ locations = locations.filter(location => location['osm_json'].tags && location['
subdomains: ['a', 'b', 'c', 'd']
}).addTo(map);
-const checkAddress = (location) => {
- if (location['addr:housenumber'] && location['addr:street'] && location['addr:city']) {
- return `${
- location['addr:housenumber'] + ' ' + location['addr:street'] + ', ' + location['addr:city']
- }`;
- } else if (location['addr:street'] && location['addr:city']) {
- return `${location['addr:street'] + ', ' + location['addr:city']}`;
- } else if (location['addr:city']) {
- return `${location['addr:city']}`;
- } else {
- return '';
- }
-};
+ const checkAddress = (location) => {
+ if (location['addr:housenumber'] && location['addr:street'] && location['addr:city']) {
+ return `${
+ location['addr:housenumber'] +
+ ' ' +
+ location['addr:street'] +
+ ', ' +
+ location['addr:city']
+ }`;
+ } else if (location['addr:street'] && location['addr:city']) {
+ return `${location['addr:street'] + ', ' + location['addr:city']}`;
+ } else if (location['addr:city']) {
+ return `${location['addr:city']}`;
+ } else {
+ return '';
+ }
+ };
let markers = new MarkerClusterGroup();
locations.forEach((location) => {
- if (location['deleted_at']) {
+ if (location['deleted_at']) {
return;
}
@@ -102,14 +109,12 @@ const checkAddress = (location) => {
let marker = L.marker([location.lat, location.lon]);
marker.bindPopup(`${
- location.tags && location.tags.name
- ? `<span class='block'>${location.tags.name}</span>`
- : ''
- }
+ location.tags && location.tags.name
+ ? `<span class='block'>${location.tags.name}</span>`
+ : ''
+ }
- <span class='block'>${
- location.tags && checkAddress(location.tags)
- }</span>
+ <span class='block'>${location.tags && checkAddress(location.tags)}</span>
${
@@ -130,7 +135,9 @@ const checkAddress = (location) => {
location.tags['contact:twitter'].startsWith('http')
? location.tags['contact:twitter']
: `https://twitter.com/${location.tags['contact:twitter']}`
- } target="_blank" rel="noreferrer" class='block'>TWT: ${location.tags['contact:twitter']}</a>`
+ } target="_blank" rel="noreferrer" class='block'>TWT: ${
+ location.tags['contact:twitter']
+ }</a>`
: ''
}
@@ -140,7 +147,9 @@ const checkAddress = (location) => {
location.tags['contact:instagram'].startsWith('http')
? location.tags['contact:instagram']
: `https://instagram.com/${location.tags['contact:instagram']}`
- } target="_blank" rel="noreferrer" class='block'>IG: ${location.tags['contact:instagram']}</a>`
+ } target="_blank" rel="noreferrer" class='block'>IG: ${
+ location.tags['contact:instagram']
+ }</a>`
: ''
}
@@ -150,7 +159,9 @@ const checkAddress = (location) => {
location.tags['contact:facebook'].startsWith('http')
? location.tags['contact:facebook']
: `https://facebook.com/${location.tags['contact:facebook']}`
- } target="_blank" rel="noreferrer" class='block'>FB: ${location.tags['contact:facebook']}</a>`
+ } target="_blank" rel="noreferrer" class='block'>FB: ${
+ location.tags['contact:facebook']
+ }</a>`
: ''
}
@@ -160,7 +171,9 @@ const checkAddress = (location) => {
location.tags['contact:linkedin'].startsWith('http')
? location.tags['contact:linkedin']
: `https://linkedin.com/${location.tags['contact:linkedin']}`
- } target="_blank" rel="noreferrer" class='block'>LI: ${location.tags['contact:linkedin']}</a>`
+ } target="_blank" rel="noreferrer" class='block'>LI: ${
+ location.tags['contact:linkedin']
+ }</a>`
: ''
}
@@ -168,7 +181,7 @@ const checkAddress = (location) => {
markers.addLayer(marker);
});
- map.fitBounds(locations.map(({ osm_json: {lat, lon} }) => [lat, lon]));
+ map.fitBounds(locations.map(({ osm_json: { lat, lon } }) => [lat, lon]));
map.addLayer(markers);
}
});
diff --git a/src/components/Qr.svelte b/src/components/Qr.svelte
index 3870abe0..d9bf63ba 100644
--- a/src/components/Qr.svelte
+++ b/src/components/Qr.svelte
@@ -57,7 +57,13 @@
{#if mask}
<div class="absolute bg-white w-[300px] h-[300px] t-0 l-0 z-10" out:fade />
{/if}
-<div bind:this={qr} on:click={toggle} on:keydown={toggle} class:hidden={full} class="relative overflow-visible" />
+<div
+ bind:this={qr}
+ on:click={toggle}
+ on:keydown={toggle}
+ class:hidden={full}
+ class="relative overflow-visible"
+/>
<div bind:this={fullQr} on:click={toggle} on:keydown={toggle} class:hidden={!full} />
<style>
diff --git a/src/lib/utils.js b/src/lib/utils.js
index 7eeab648..38999a91 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -42,8 +42,7 @@ export const post = (url, body, headers) => {
throw new Error(body);
}
-
- if (body.error) throw body.error;
+ if (body.error) throw body.error;
if (body instanceof Error) throw body;
if (body.name === 'Error') throw new Error(body.message);
diff --git a/src/routes/+layout.server.js b/src/routes/+layout.server.js
index be81e19f..324632d4 100644
--- a/src/routes/+layout.server.js
+++ b/src/routes/+layout.server.js
@@ -35,8 +35,7 @@ export async function load({ cookies, locals, request, url, params }) {
let rate = await get('/rate');
rates = await get('/rates');
-
-let locations = await fetch('https://api.btcmap.org/v2/elements?updated_since=2022-09-19')
+ let locations = await fetch('https://api.btcmap.org/v2/elements?updated_since=2022-09-19')
.then((r) => r.text())
.then((body) => {
try {
@@ -46,6 +45,5 @@ let locations = await fetch('https://api.btcmap.org/v2/elements?updated_since=20
}
});
-
return { subject, user, token, rate, rates, locations };
}
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 98e3778f..7d9758fa 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -14,7 +14,7 @@
export let data;
let { user } = data;
-let { locations } = data
+ let { locations } = data;
let howItWorks;
let faq;
@@ -84,7 +84,7 @@ let { locations } = data
</div>
<div>
- <About locations={locations} />
+ <About {locations} />
</div>
</main>
diff --git a/src/routes/launch/+page.svelte b/src/routes/launch/+page.svelte
index 6faf492d..3469f0bc 100644
--- a/src/routes/launch/+page.svelte
+++ b/src/routes/launch/+page.svelte
@@ -84,8 +84,8 @@
<p>
The Loft will be accepting Lightning payments at the event and going forward into the
- future as well! We're charging $6 for for an NFT ticket that gets you entry, appies, and the
- chance to win some swag and sats.
+ future as well! We're charging $6 for for an NFT ticket that gets you entry, appies, and
+ the chance to win some swag and sats.
</p>
<div class="flex w-full my-8">
diff --git a/src/routes/scan/+page.svelte b/src/routes/scan/+page.svelte
index dc6e291d..a204e212 100644
--- a/src/routes/scan/+page.svelte
+++ b/src/routes/scan/+page.svelte
@@ -7,7 +7,10 @@
let scanner, vid;
onMount(() => {
- scanner = new QrScanner(vid, (text) => goto(`/send/${text}`), { highlightScanRegion: true, highlightCodeOutline: true });
+ scanner = new QrScanner(vid, (text) => goto(`/send/${text}`), {
+ highlightScanRegion: true,
+ highlightCodeOutline: true
+ });
scanner.start();
});
diff --git a/src/routes/send/bitcoin/[address]/+page.svelte b/src/routes/send/bitcoin/[address]/+page.svelte
index c9023180..744bfe9d 100644
--- a/src/routes/send/bitcoin/[address]/+page.svelte
+++ b/src/routes/send/bitcoin/[address]/+page.svelte
@@ -16,7 +16,7 @@
$: update(form);
let update = () => {
if (form?.message.includes('pin')) $pin = undefined;
- loading = false;
+ loading = false;
};
</script>
diff --git a/src/routes/send/lightning/[payreq]/+page.server.js b/src/routes/send/lightning/[payreq]/+page.server.js
index 49ebac1c..8d60628b 100644
--- a/src/routes/send/lightning/[payreq]/+page.server.js
+++ b/src/routes/send/lightning/[payreq]/+page.server.js
@@ -17,7 +17,8 @@ export const actions = {
await post('/lightning/send', body, auth(cookies));
} catch (e) {
- if (e.message.includes("unusable")) e.message = "Failed to route payment, try sending a lower amount"
+ if (e.message.includes('unusable'))
+ e.message = 'Failed to route payment, try sending a lower amount';
return invalid(400, { message: e.message });
}
diff --git a/src/routes/send/lightning/[payreq]/+page.svelte b/src/routes/send/lightning/[payreq]/+page.svelte
index bda10038..e738c9a3 100644
--- a/src/routes/send/lightning/[payreq]/+page.svelte
+++ b/src/routes/send/lightning/[payreq]/+page.svelte
@@ -19,7 +19,7 @@
$: update(form);
let update = () => {
if (form?.message.includes('pin')) $pin = undefined;
- loading = false;
+ loading = false;
};
</script>
generated by cgit v1.2.3 (git 2.51.0) at 2026-10-15 04:42:52 +0000