From 5e3d4133760962db28c4f3a595f0566bd59391ff Mon Sep 17 00:00:00 2001 From: Adam Soltys Date: Mon, 17 Oct 2022 15:31:08 -0700 Subject: thanks page --- src/components/AppHeader.svelte | 2 +- src/components/Avatar.svelte | 2 +- src/lib/socket.js | 4 +++- src/lib/store.js | 1 + src/lib/upload.js | 1 + src/routes/+layout.svelte | 14 +++++++---- src/routes/launch/+page.svelte | 2 +- src/routes/launch/purchase/+page.server.js | 5 ++-- src/routes/launch/purchase/+page.svelte | 3 ++- src/routes/launch/thanks/[asset]/+page.svelte | 34 +++++++++++++++++++++++++++ 10 files changed, 56 insertions(+), 12 deletions(-) create mode 100644 src/routes/launch/thanks/[asset]/+page.svelte (limited to 'src') diff --git a/src/components/AppHeader.svelte b/src/components/AppHeader.svelte index f9413efb..4e631971 100644 --- a/src/components/AppHeader.svelte +++ b/src/components/AppHeader.svelte @@ -35,7 +35,7 @@ $tempProfileFiles && $tempProfileFiles.banner ? `url(${$tempProfileFiles.banner})` : subject?.banner - ? `url(/api/public/${subject.username}-banner.png)` + ? `url(/api/public/${subject.username}-banner.webp)` : undefined; diff --git a/src/components/Avatar.svelte b/src/components/Avatar.svelte index ed1a499a..d0a4e0f2 100644 --- a/src/components/Avatar.svelte +++ b/src/components/Avatar.svelte @@ -14,7 +14,7 @@ {user.username} diff --git a/src/lib/socket.js b/src/lib/socket.js index 02d73a48..7cce0071 100644 --- a/src/lib/socket.js +++ b/src/lib/socket.js @@ -4,6 +4,7 @@ import { success } from '$lib/utils'; import { env } from '$env/dynamic/public'; const socketUrl = env.PUBLIC_SOCKET; +const btc = env.PUBLIC_BTC; let interval, socket, token; @@ -20,7 +21,8 @@ export const messages = (data) => ({ payment() { let { amount, invoice } = data; - console.log('INVOICE', invoice); + if (get(user).account_id !== data.account_id ) return; + if (invoice) { invoices.set({ ...get(invoices), [invoice.uuid]: invoice }); } diff --git a/src/lib/store.js b/src/lib/store.js index c64ad39f..765e14cf 100644 --- a/src/lib/store.js +++ b/src/lib/store.js @@ -29,6 +29,7 @@ const persistLocal = (key, defaultValue) => { export const redirect = writable(); export const rate = writable(); +export const user = writable(); export const selectedRate = writable(); export const token = persistSession('token'); export const invoices = writable({}); diff --git a/src/lib/upload.js b/src/lib/upload.js index 099e2f30..6354b7f4 100644 --- a/src/lib/upload.js +++ b/src/lib/upload.js @@ -1,4 +1,5 @@ export const upload = async (file, type, progress, token) => { + console.log("FILE", file) let url = `/api/upload/${type}`; let formData = new FormData(); formData.append('file', file); diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 42d249f4..0064cce0 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -3,7 +3,7 @@ import '../app.css'; import { onMount } from 'svelte'; import { connect } from '$lib/socket'; - import { selectedRate, rate } from '$lib/store'; + import { selectedRate, rate, user } from '$lib/store'; import { page } from '$app/stores'; import { browser } from '$app/environment'; import { goto } from '$app/navigation'; @@ -14,12 +14,16 @@ const localeLocalStorageKey = 'sveltekit-i18n-locale'; export let data; - let { user, rate: r, token, rates } = data; + let r, u, token, rates; + $: update(data); - let update = () => ({ user, rate: r, token, rates } = data); - $rate = r; + let update = () => { + ({ user: u, rate: r, token, rates } = data); + $rate = r; + $user = u; + }; - $: $selectedRate = user && $rate * (rates[user.currency] / rates.USD); + $: $selectedRate = u && r * (rates[u.currency] / rates.USD); onMount(() => { let localStorageLocale = localStorage.getItem(localeLocalStorageKey); diff --git a/src/routes/launch/+page.svelte b/src/routes/launch/+page.svelte index da1c779c..74638257 100644 --- a/src/routes/launch/+page.svelte +++ b/src/routes/launch/+page.svelte @@ -29,7 +29,7 @@

- Come join us at our launch party celebrating our new design and 10 years since our first commit! + Come join us at our launch party celebrating our new design and 10 years since our first commit!

When

diff --git a/src/routes/launch/purchase/+page.server.js b/src/routes/launch/purchase/+page.server.js index 03da1e35..b9b20f28 100644 --- a/src/routes/launch/purchase/+page.server.js +++ b/src/routes/launch/purchase/+page.server.js @@ -1,5 +1,6 @@ import { auth, get, post } from '$lib/utils'; import tickets from '$lib/tickets'; +import { redirect } from "@sveltejs/kit"; export const load = async ({ parent }) => { let p = await parent(); @@ -11,7 +12,7 @@ export const actions = { internal: async ({ cookies, request, parent }) => { let { ticket } = Object.fromEntries(await request.formData()); - let r = await post( + let { asset } = await post( '/assets', { name: `Launch Party Ticket ${ticket}`, @@ -25,7 +26,7 @@ export const actions = { auth(cookies) ); - console.log(r); + throw redirect(307, `/launch/thanks/${asset}`); }, lightning: async ({ cookies, request }) => { diff --git a/src/routes/launch/purchase/+page.svelte b/src/routes/launch/purchase/+page.svelte index 68c19076..a7a2b51c 100644 --- a/src/routes/launch/purchase/+page.svelte +++ b/src/routes/launch/purchase/+page.svelte @@ -5,6 +5,7 @@ import { goto } from '$app/navigation'; export let data; + export let form; let amount = 25000; let { @@ -37,7 +38,7 @@

- Confirm Purchase + Confirm Purchase

+ import { page } from '$app/stores'; + + export let data; + let { user } = data; + let { asset } = $page.params; + + +
+
+

+ Thanks! +

+ +

We look forward to seeing you!

+ +

+ We've minted your ticket as an NFT on the Liquid Blockchain as a proof of purchase and commemorative token. It may confer some special benefits in the future. +

+
+ +
+ + + +
+
-- cgit v1.2.3