From d99a3524fd2649f1a9ce3623333de56a99e06971 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 2 Aug 2022 13:23:59 -0600
Subject: lots of updates, implementing design, refactoring, bug fixes and more

---
 src/routes/invoice/[id].svelte | 318 ++++++++++++++++++++---------------------
 1 file changed, 159 insertions(+), 159 deletions(-)

(limited to 'src/routes/invoice')

diff --git a/src/routes/invoice/[id].svelte b/src/routes/invoice/[id].svelte
index 17c7de1f..126a474e 100644
--- a/src/routes/invoice/[id].svelte
+++ b/src/routes/invoice/[id].svelte
@@ -1,5 +1,4 @@
 <script>
-	import { toast } from '@zerodevx/svelte-toast';
 	import { get, post, reverseFormat } from '$lib/utils';
 	import { browser } from '$app/env';
 	import { invoices, user, preferredCurrency } from '$lib/store';
@@ -83,7 +82,6 @@
 
 	$: generate(text);
 	let generate = async (ready) => {
-		console.log('GENERATE', text);
 		if (!ready) return;
 		let { default: QRCodeStyling } = await import('qr-code-styling');
 
@@ -122,15 +120,6 @@
 
 	let customInput;
 
-	const handleCopy = () => {
-		copy(text);
-		toast.push('Copied!', {
-			theme: {
-				'--toastBarBackground': '#2F855A'
-			}
-		});
-	};
-
 	const handleDoneClick = () => {
 		if ($user) {
 			goto(`/${$user.username}/receive`);
@@ -140,174 +129,185 @@
 	};
 </script>
 
-{#if $invoices[id]?.status !== 'paid'}
-	<div class:full-shadow={showMobileTip}>
-		<button
-			class="ml-5 md:ml-20 mt-5 md:mt-10"
-			class:invisible={!$user}
-			on:click={handleBackButton}
-		>
-			<Icon icon="arrow-left" style="w-10" />
-		</button>
-
-		<div class="flex justify-center items-center mb-20 md:mt-[20px] px-3">
-			<div
-				class="block lg:flex justify-center items-center space-y-10 lg:space-y-0 space-x-0 lg:space-x-24"
+{#if $user}
+	{#if $invoices[id]?.status !== 'paid'}
+		<div class:full-shadow={showMobileTip}>
+			<button
+				class="ml-5 md:ml-20 mt-5 md:mt-10"
+				class:invisible={!$user}
+				on:click={handleBackButton}
 			>
-				<!-- tipping section  -->
+				<Icon icon="arrow-left" style="w-10" />
+			</button>
+
+			<div class="flex justify-center items-center mb-20 md:mt-[20px] px-3">
 				<div
-					class="w-[100%] md:w-auto absolute {showMobileTip
-						? 'bottom-0'
-						: '-bottom-full'} bg-white p-6 md:p-0 rounded-t-3xl md:rounded-none transition-all md:transition-none ease-in-out duration-500 left-0 md:static text-center space-y-5"
+					class="block lg:flex justify-center items-center space-y-10 lg:space-y-0 space-x-0 lg:space-x-24"
 				>
-					<h1 class="hidden md:block text-4xl font-semibold">Add a tip?</h1>
-
-					<div>
-						<span class="font-semibold mr-1">{tipAmountFormatted}</span><span
-							class="text-secondary font-semibold text-sm">{`(${tipAmountSats} SATS)`}</span
-						>
-						<span class="block text-secondary text-sm">{tipPercent}%</span>
-					</div>
-
-					<input
-						id="slider"
-						type="range"
-						min="0"
-						max="100"
-						value={tipPercent}
-						class="px-2"
-						on:input={(e) => {
-							customTipAmount = '';
-							customInput.value = '';
-							tipPercent = e.target.value;
-						}}
-					/>
+					<!-- tipping section  -->
+					<div
+						class="w-[100%] md:w-auto absolute {showMobileTip
+							? 'bottom-0'
+							: '-top-full'} bg-white p-6 md:p-0 rounded-t-3xl md:rounded-none transition-all md:transition-none ease-in-out duration-500 left-0 md:static text-center space-y-5"
+					>
+						<h1 class="hidden md:block text-4xl font-semibold">Add a tip?</h1>
 
-					<div>
-						{#each tipAmounts as amount}
-							<button
-								class="bg-primary w-16 md:w-20 py-3 m-1 rounded-2xl font-semibold {customTipAmount
-									? ''
-									: tipPercent === amount.slice(0, 2) ||
-									  ((tipPercent === 0 || tipPercent === '0') && amount === 'None')
-									? '!bg-black text-white'
-									: ''}"
-								on:click={() => handleTipButtonClick(amount)}>{amount}</button
+						<div>
+							<span class="font-semibold mr-1">{tipAmountFormatted}</span><span
+								class="text-secondary font-semibold text-sm">{`(${tipAmountSats} SATS)`}</span
 							>
-						{/each}
+							<span class="block text-secondary text-sm">{tipPercent}%</span>
+						</div>
 
-						<div class="relative">
-							<span
-								class="absolute top-[20px] left-5 font-semibold {!customTipAmount
-									? 'opacity-50'
-									: 'opacity-100'}">$</span
-							>
-							<input
-								bind:this={customInput}
-								type="number"
-								min="0"
-								on:input={(e) => handleCustomTipAmount(e)}
-								class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto"
-								placeholder="Other"
-							/>
-							<button
-								class="w-full md:w-auto mt-2 md:mt-0 bg-black text-white font-semibold py-3 px-7 rounded-2xl {showMobileTip
-									? !customTipAmount && !tipAmount
+						<input
+							id="slider"
+							type="range"
+							min="0"
+							max="100"
+							value={tipPercent}
+							class="px-2"
+							on:input={(e) => {
+								customTipAmount = '';
+								customInput.value = '';
+								tipPercent = e.target.value;
+							}}
+						/>
+
+						<div>
+							{#each tipAmounts as amount}
+								<button
+									class="bg-primary w-16 md:w-20 py-3 m-1 rounded-2xl font-semibold {customTipAmount
+										? ''
+										: tipPercent === amount.slice(0, 2) ||
+										  ((tipPercent === 0 || tipPercent === '0') && amount === 'None')
+										? '!bg-black text-white'
+										: ''}"
+									on:click={() => handleTipButtonClick(amount)}>{amount}</button
+								>
+							{/each}
+
+							<div class="relative">
+								<span
+									class="absolute top-[20px] left-5 font-semibold {!customTipAmount
 										? 'opacity-50'
-										: 'opacity-100'
-									: !customTipAmount
-									? 'opacity-50'
-									: 'opacity-100'}"
-								disabled={showMobileTip ? !customTipAmount && !tipAmount : !customTipAmount}
-								on:click={() => (showMobileTip = false)}>Done</button
-							>
+										: 'opacity-100'}">$</span
+								>
+								<input
+									bind:this={customInput}
+									type="number"
+									min="0"
+									on:input={(e) => handleCustomTipAmount(e)}
+									class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto"
+									placeholder="Other"
+								/>
+								<button
+									class="w-full md:w-auto mt-2 md:mt-0 bg-black text-white font-semibold py-3 px-7 rounded-2xl {showMobileTip
+										? !customTipAmount && !tipAmount
+											? 'opacity-50'
+											: 'opacity-100'
+										: !customTipAmount
+										? 'opacity-50'
+										: 'opacity-100'}"
+									disabled={showMobileTip ? !customTipAmount && !tipAmount : !customTipAmount}
+									on:click={() => (showMobileTip = false)}>Done</button
+								>
+							</div>
 						</div>
 					</div>
-				</div>
-
-				<div
-					class="hidden md:block h-[1px] lg:h-[600px] w-full lg:w-[1px] bg-lightgrey rounded-xl"
-					id="section-divider"
-				/>
-
-				<!-- invoice section -->
-				<div class="text-center space-y-5">
-					<button
-						class="block md:hidden bg-black {showMobileTip
-							? 'text-white/50'
-							: 'text-white'} rounded-xl px-6 py-3 block text-sm font-semibold mx-auto flex justify-center items-center"
-						on:click={() => (showMobileTip = true)}
-						disabled={showMobileTip}
-					>
-						<svg
-							width="24"
-							height="24"
-							class="mr-1"
-							viewBox="0 0 24 24"
-							fill="none"
-							xmlns="http://www.w3.org/2000/svg"
-						>
-							<path
-								d="M4.31802 6.31802C2.56066 8.07538 2.56066 10.9246 4.31802 12.682L12.0001 20.364L19.682 12.682C21.4393 10.9246 21.4393 8.07538 19.682 6.31802C17.9246 4.56066 15.0754 4.56066 13.318 6.31802L12.0001 7.63609L10.682 6.31802C8.92462 4.56066 6.07538 4.56066 4.31802 6.31802Z"
-								stroke="currentColor"
-								stroke-width="2"
-								stroke-linecap="round"
-								stroke-linejoin="round"
-							/>
-						</svg> Add a tip
-					</button>
-
-					<span class="text-secondary block"
-						>Scan to pay <span class="text-black font-semibold">{username}</span></span
-					>
 
 					<div
-						bind:this={qr}
-						on:click={handleCopy}
-						class="border {showMobileTip
-							? 'border-gray-400'
-							: 'border-lightgrey'} rounded-3xl block md:flex justify-center items-center cursor-pointer"
+						class="hidden md:block h-[1px] lg:h-[600px] w-full lg:w-[1px] bg-lightgrey rounded-xl"
+						id="section-divider"
 					/>
 
-					<div class="px-5 space-y-3">
-						<div class="flex justify-between">
-							<span class="font-semibold text-sm">Invoice</span>
-							<span class="font-semibold text-sm"
-								>{invoiceAmountFiatFormatted}
-								<span class="text-secondary font-normal">{`(${amountFormatted} SATS)`}</span></span
-							>
-						</div>
-
-						<div class="flex justify-between">
-							<span class="font-semibold text-sm">Tip</span>
-							<span class="font-semibold text-sm"
-								>{tipAmountFormatted}
-								<span class="text-secondary font-normal">{`(${tipAmountSats} SATS)`}</span></span
+					<!-- invoice section -->
+					<div class="text-center space-y-5">
+						<button
+							class="block md:hidden bg-black {showMobileTip
+								? 'text-white/50'
+								: 'text-white'} rounded-xl px-6 py-3 block text-sm font-semibold mx-auto flex justify-center items-center"
+							on:click={() => (showMobileTip = true)}
+							disabled={showMobileTip}
+						>
+							<svg
+								width="24"
+								height="24"
+								class="mr-1"
+								viewBox="0 0 24 24"
+								fill="none"
+								xmlns="http://www.w3.org/2000/svg"
 							>
-						</div>
+								<path
+									d="M4.31802 6.31802C2.56066 8.07538 2.56066 10.9246 4.31802 12.682L12.0001 20.364L19.682 12.682C21.4393 10.9246 21.4393 8.07538 19.682 6.31802C17.9246 4.56066 15.0754 4.56066 13.318 6.31802L12.0001 7.63609L10.682 6.31802C8.92462 4.56066 6.07538 4.56066 4.31802 6.31802Z"
+									stroke="currentColor"
+									stroke-width="2"
+									stroke-linecap="round"
+									stroke-linejoin="round"
+								/>
+							</svg> Add a tip
+						</button>
+
+						<span class="text-secondary block"
+							>Scan to pay <a href="/{username}" class="text-black font-semibold">{username}</a
+							></span
+						>
 
-						<div class="flex justify-between">
-							<span class="font-bold">Total</span>
-							<span class="font-bold"
-								>{totalAmountFormatted}
-								<span class="text-secondary font-normal">{`(${totalAmountSats} SATS)`}</span></span
-							>
+						<div
+							bind:this={qr}
+							on:click={() => copy(text)}
+							class="border {showMobileTip
+								? 'border-gray-400'
+								: 'border-lightgrey'} px-5 md:px-0 w-[292px] h-[302px] md:w-[300px] md:h-[300px] rounded-3xl block md:flex justify-center items-center cursor-pointer"
+						/>
+
+						<div class="px-5 space-y-3">
+							<div class="flex justify-between">
+								<span class="font-semibold text-sm">Invoice</span>
+								<span class="font-semibold text-sm"
+									>{invoiceAmountFiatFormatted}
+									<span class="text-secondary font-normal">{`(${amountFormatted} SATS)`}</span
+									></span
+								>
+							</div>
+
+							<div class="flex justify-between">
+								<span class="font-semibold text-sm">Tip</span>
+								<span class="font-semibold text-sm"
+									>{tipAmountFormatted}
+									<span class="text-secondary font-normal">{`(${tipAmountSats} SATS)`}</span></span
+								>
+							</div>
+
+							<div class="flex justify-between">
+								<span class="font-bold">Total</span>
+								<span class="font-bold"
+									>{totalAmountFormatted}
+									<span class="text-secondary font-normal">{`(${totalAmountSats} SATS)`}</span
+									></span
+								>
+							</div>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>
-	</div>
-{:else}
-	<div class="text-center mt-20 md:mt-0">
-		<Image image="success" style="w-full md:w-3/4 xl:w-1/2 mx-auto max-w-3xl" />
-		<h1 class="text-3xl md:text-4xl font-bold mb-6">Payment Successful!</h1>
-		<h2 class="text-2xl md:text-3xl font-semibold">{totalAmountFormatted} {$preferredCurrency}</h2>
-		<h3 class="text-secondary md:text-lg mb-6 mt-1">({totalAmountSats} SATS)</h3>
-		<button class="bg-black text-white rounded-2xl w-20 py-3 font-bold" on:click={handleDoneClick}>
-			Done
-		</button>
-	</div>
+	{:else}
+		<div class="text-center mt-20 md:mt-0">
+			<Image image="success" style="w-full md:w-3/4 xl:w-1/2 mx-auto max-w-3xl" />
+			<h1 class="text-3xl md:text-4xl font-bold mb-6">Payment Successful!</h1>
+			<h2 class="text-2xl md:text-3xl font-semibold">
+				{totalAmountFormatted}
+				{$preferredCurrency}
+			</h2>
+			<h3 class="text-secondary md:text-lg mb-6 mt-1">({totalAmountSats} SATS)</h3>
+			<button
+				class="bg-black text-white rounded-2xl w-20 py-3 font-bold"
+				on:click={handleDoneClick}
+			>
+				Done
+			</button>
+		</div>
+	{/if}
 {/if}
 
 <style>
-- 
cgit v1.2.3


From e195d2fe45e4e006df0404929ffef4f739caa8c7 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Tue, 2 Aug 2022 12:42:28 -0700
Subject: remove user check from invoice page

---
 src/routes/invoice/[id].svelte | 310 ++++++++++++++++++++---------------------
 1 file changed, 151 insertions(+), 159 deletions(-)

(limited to 'src/routes/invoice')

diff --git a/src/routes/invoice/[id].svelte b/src/routes/invoice/[id].svelte
index 126a474e..2e3d257c 100644
--- a/src/routes/invoice/[id].svelte
+++ b/src/routes/invoice/[id].svelte
@@ -129,185 +129,177 @@
 	};
 </script>
 
-{#if $user}
-	{#if $invoices[id]?.status !== 'paid'}
-		<div class:full-shadow={showMobileTip}>
-			<button
-				class="ml-5 md:ml-20 mt-5 md:mt-10"
-				class:invisible={!$user}
-				on:click={handleBackButton}
+{#if $invoices[id]?.status !== 'paid'}
+	<div class:full-shadow={showMobileTip}>
+		<button
+			class="ml-5 md:ml-20 mt-5 md:mt-10"
+			class:invisible={!$user}
+			on:click={handleBackButton}
+		>
+			<Icon icon="arrow-left" style="w-10" />
+		</button>
+
+		<div class="flex justify-center items-center mb-20 md:mt-[20px] px-3">
+			<div
+				class="block lg:flex justify-center items-center space-y-10 lg:space-y-0 space-x-0 lg:space-x-24"
 			>
-				<Icon icon="arrow-left" style="w-10" />
-			</button>
-
-			<div class="flex justify-center items-center mb-20 md:mt-[20px] px-3">
+				<!-- tipping section  -->
 				<div
-					class="block lg:flex justify-center items-center space-y-10 lg:space-y-0 space-x-0 lg:space-x-24"
+					class="w-[100%] md:w-auto absolute {showMobileTip
+						? 'bottom-0'
+						: '-top-full'} bg-white p-6 md:p-0 rounded-t-3xl md:rounded-none transition-all md:transition-none ease-in-out duration-500 left-0 md:static text-center space-y-5"
 				>
-					<!-- tipping section  -->
-					<div
-						class="w-[100%] md:w-auto absolute {showMobileTip
-							? 'bottom-0'
-							: '-top-full'} bg-white p-6 md:p-0 rounded-t-3xl md:rounded-none transition-all md:transition-none ease-in-out duration-500 left-0 md:static text-center space-y-5"
-					>
-						<h1 class="hidden md:block text-4xl font-semibold">Add a tip?</h1>
+					<h1 class="hidden md:block text-4xl font-semibold">Add a tip?</h1>
+
+					<div>
+						<span class="font-semibold mr-1">{tipAmountFormatted}</span><span
+							class="text-secondary font-semibold text-sm">{`(${tipAmountSats} SATS)`}</span
+						>
+						<span class="block text-secondary text-sm">{tipPercent}%</span>
+					</div>
+
+					<input
+						id="slider"
+						type="range"
+						min="0"
+						max="100"
+						value={tipPercent}
+						class="px-2"
+						on:input={(e) => {
+							customTipAmount = '';
+							customInput.value = '';
+							tipPercent = e.target.value;
+						}}
+					/>
 
-						<div>
-							<span class="font-semibold mr-1">{tipAmountFormatted}</span><span
-								class="text-secondary font-semibold text-sm">{`(${tipAmountSats} SATS)`}</span
+					<div>
+						{#each tipAmounts as amount}
+							<button
+								class="bg-primary w-16 md:w-20 py-3 m-1 rounded-2xl font-semibold {customTipAmount
+									? ''
+									: tipPercent === amount.slice(0, 2) ||
+									  ((tipPercent === 0 || tipPercent === '0') && amount === 'None')
+									? '!bg-black text-white'
+									: ''}"
+								on:click={() => handleTipButtonClick(amount)}>{amount}</button
 							>
-							<span class="block text-secondary text-sm">{tipPercent}%</span>
-						</div>
+						{/each}
 
-						<input
-							id="slider"
-							type="range"
-							min="0"
-							max="100"
-							value={tipPercent}
-							class="px-2"
-							on:input={(e) => {
-								customTipAmount = '';
-								customInput.value = '';
-								tipPercent = e.target.value;
-							}}
-						/>
-
-						<div>
-							{#each tipAmounts as amount}
-								<button
-									class="bg-primary w-16 md:w-20 py-3 m-1 rounded-2xl font-semibold {customTipAmount
-										? ''
-										: tipPercent === amount.slice(0, 2) ||
-										  ((tipPercent === 0 || tipPercent === '0') && amount === 'None')
-										? '!bg-black text-white'
-										: ''}"
-									on:click={() => handleTipButtonClick(amount)}>{amount}</button
-								>
-							{/each}
-
-							<div class="relative">
-								<span
-									class="absolute top-[20px] left-5 font-semibold {!customTipAmount
-										? 'opacity-50'
-										: 'opacity-100'}">$</span
-								>
-								<input
-									bind:this={customInput}
-									type="number"
-									min="0"
-									on:input={(e) => handleCustomTipAmount(e)}
-									class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto"
-									placeholder="Other"
-								/>
-								<button
-									class="w-full md:w-auto mt-2 md:mt-0 bg-black text-white font-semibold py-3 px-7 rounded-2xl {showMobileTip
-										? !customTipAmount && !tipAmount
-											? 'opacity-50'
-											: 'opacity-100'
-										: !customTipAmount
+						<div class="relative">
+							<span
+								class="absolute top-[20px] left-5 font-semibold {!customTipAmount
+									? 'opacity-50'
+									: 'opacity-100'}">$</span
+							>
+							<input
+								bind:this={customInput}
+								type="number"
+								min="0"
+								on:input={(e) => handleCustomTipAmount(e)}
+								class="bg-primary rounded-2xl py-3 px-10 font-semibold mt-2 mr-1 w-full md:w-auto"
+								placeholder="Other"
+							/>
+							<button
+								class="w-full md:w-auto mt-2 md:mt-0 bg-black text-white font-semibold py-3 px-7 rounded-2xl {showMobileTip
+									? !customTipAmount && !tipAmount
 										? 'opacity-50'
-										: 'opacity-100'}"
-									disabled={showMobileTip ? !customTipAmount && !tipAmount : !customTipAmount}
-									on:click={() => (showMobileTip = false)}>Done</button
-								>
-							</div>
+										: 'opacity-100'
+									: !customTipAmount
+									? 'opacity-50'
+									: 'opacity-100'}"
+								disabled={showMobileTip ? !customTipAmount && !tipAmount : !customTipAmount}
+								on:click={() => (showMobileTip = false)}>Done</button
+							>
 						</div>
 					</div>
+				</div>
+
+				<div
+					class="hidden md:block h-[1px] lg:h-[600px] w-full lg:w-[1px] bg-lightgrey rounded-xl"
+					id="section-divider"
+				/>
+
+				<!-- invoice section -->
+				<div class="text-center space-y-5">
+					<button
+						class="block md:hidden bg-black {showMobileTip
+							? 'text-white/50'
+							: 'text-white'} rounded-xl px-6 py-3 block text-sm font-semibold mx-auto flex justify-center items-center"
+						on:click={() => (showMobileTip = true)}
+						disabled={showMobileTip}
+					>
+						<svg
+							width="24"
+							height="24"
+							class="mr-1"
+							viewBox="0 0 24 24"
+							fill="none"
+							xmlns="http://www.w3.org/2000/svg"
+						>
+							<path
+								d="M4.31802 6.31802C2.56066 8.07538 2.56066 10.9246 4.31802 12.682L12.0001 20.364L19.682 12.682C21.4393 10.9246 21.4393 8.07538 19.682 6.31802C17.9246 4.56066 15.0754 4.56066 13.318 6.31802L12.0001 7.63609L10.682 6.31802C8.92462 4.56066 6.07538 4.56066 4.31802 6.31802Z"
+								stroke="currentColor"
+								stroke-width="2"
+								stroke-linecap="round"
+								stroke-linejoin="round"
+							/>
+						</svg> Add a tip
+					</button>
+
+					<span class="text-secondary block"
+						>Scan to pay <a href="/{username}" class="text-black font-semibold">{username}</a></span
+					>
 
 					<div
-						class="hidden md:block h-[1px] lg:h-[600px] w-full lg:w-[1px] bg-lightgrey rounded-xl"
-						id="section-divider"
+						bind:this={qr}
+						on:click={() => copy(text)}
+						class="border {showMobileTip
+							? 'border-gray-400'
+							: 'border-lightgrey'} px-5 md:px-0 w-[292px] h-[302px] md:w-[300px] md:h-[300px] rounded-3xl block md:flex justify-center items-center cursor-pointer"
 					/>
 
-					<!-- invoice section -->
-					<div class="text-center space-y-5">
-						<button
-							class="block md:hidden bg-black {showMobileTip
-								? 'text-white/50'
-								: 'text-white'} rounded-xl px-6 py-3 block text-sm font-semibold mx-auto flex justify-center items-center"
-							on:click={() => (showMobileTip = true)}
-							disabled={showMobileTip}
-						>
-							<svg
-								width="24"
-								height="24"
-								class="mr-1"
-								viewBox="0 0 24 24"
-								fill="none"
-								xmlns="http://www.w3.org/2000/svg"
+					<div class="px-5 space-y-3">
+						<div class="flex justify-between">
+							<span class="font-semibold text-sm">Invoice</span>
+							<span class="font-semibold text-sm"
+								>{invoiceAmountFiatFormatted}
+								<span class="text-secondary font-normal">{`(${amountFormatted} SATS)`}</span></span
 							>
-								<path
-									d="M4.31802 6.31802C2.56066 8.07538 2.56066 10.9246 4.31802 12.682L12.0001 20.364L19.682 12.682C21.4393 10.9246 21.4393 8.07538 19.682 6.31802C17.9246 4.56066 15.0754 4.56066 13.318 6.31802L12.0001 7.63609L10.682 6.31802C8.92462 4.56066 6.07538 4.56066 4.31802 6.31802Z"
-									stroke="currentColor"
-									stroke-width="2"
-									stroke-linecap="round"
-									stroke-linejoin="round"
-								/>
-							</svg> Add a tip
-						</button>
-
-						<span class="text-secondary block"
-							>Scan to pay <a href="/{username}" class="text-black font-semibold">{username}</a
-							></span
-						>
+						</div>
 
-						<div
-							bind:this={qr}
-							on:click={() => copy(text)}
-							class="border {showMobileTip
-								? 'border-gray-400'
-								: 'border-lightgrey'} px-5 md:px-0 w-[292px] h-[302px] md:w-[300px] md:h-[300px] rounded-3xl block md:flex justify-center items-center cursor-pointer"
-						/>
-
-						<div class="px-5 space-y-3">
-							<div class="flex justify-between">
-								<span class="font-semibold text-sm">Invoice</span>
-								<span class="font-semibold text-sm"
-									>{invoiceAmountFiatFormatted}
-									<span class="text-secondary font-normal">{`(${amountFormatted} SATS)`}</span
-									></span
-								>
-							</div>
-
-							<div class="flex justify-between">
-								<span class="font-semibold text-sm">Tip</span>
-								<span class="font-semibold text-sm"
-									>{tipAmountFormatted}
-									<span class="text-secondary font-normal">{`(${tipAmountSats} SATS)`}</span></span
-								>
-							</div>
-
-							<div class="flex justify-between">
-								<span class="font-bold">Total</span>
-								<span class="font-bold"
-									>{totalAmountFormatted}
-									<span class="text-secondary font-normal">{`(${totalAmountSats} SATS)`}</span
-									></span
-								>
-							</div>
+						<div class="flex justify-between">
+							<span class="font-semibold text-sm">Tip</span>
+							<span class="font-semibold text-sm"
+								>{tipAmountFormatted}
+								<span class="text-secondary font-normal">{`(${tipAmountSats} SATS)`}</span></span
+							>
+						</div>
+
+						<div class="flex justify-between">
+							<span class="font-bold">Total</span>
+							<span class="font-bold"
+								>{totalAmountFormatted}
+								<span class="text-secondary font-normal">{`(${totalAmountSats} SATS)`}</span></span
+							>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>
-	{:else}
-		<div class="text-center mt-20 md:mt-0">
-			<Image image="success" style="w-full md:w-3/4 xl:w-1/2 mx-auto max-w-3xl" />
-			<h1 class="text-3xl md:text-4xl font-bold mb-6">Payment Successful!</h1>
-			<h2 class="text-2xl md:text-3xl font-semibold">
-				{totalAmountFormatted}
-				{$preferredCurrency}
-			</h2>
-			<h3 class="text-secondary md:text-lg mb-6 mt-1">({totalAmountSats} SATS)</h3>
-			<button
-				class="bg-black text-white rounded-2xl w-20 py-3 font-bold"
-				on:click={handleDoneClick}
-			>
-				Done
-			</button>
-		</div>
-	{/if}
+	</div>
+{:else}
+	<div class="text-center mt-20 md:mt-0">
+		<Image image="success" style="w-full md:w-3/4 xl:w-1/2 mx-auto max-w-3xl" />
+		<h1 class="text-3xl md:text-4xl font-bold mb-6">Payment Successful!</h1>
+		<h2 class="text-2xl md:text-3xl font-semibold">
+			{totalAmountFormatted}
+			{$preferredCurrency}
+		</h2>
+		<h3 class="text-secondary md:text-lg mb-6 mt-1">({totalAmountSats} SATS)</h3>
+		<button class="bg-black text-white rounded-2xl w-20 py-3 font-bold" on:click={handleDoneClick}>
+			Done
+		</button>
+	</div>
 {/if}
 
 <style>
-- 
cgit v1.2.3


From 4d0d80ab159733a16be329b0f77b80c1f1475185 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 2 Aug 2022 17:14:47 -0600
Subject: fix tip mobile menu bug

---
 src/app.css                    | 1 +
 src/routes/invoice/[id].svelte | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/routes/invoice')

diff --git a/src/app.css b/src/app.css
index 91fcc5c1..7f585187 100644
--- a/src/app.css
+++ b/src/app.css
@@ -9,6 +9,7 @@
 
 html {
 	font-family: PublicSans, sans-serif;
+	overflow: hidden;
 }
 
 ::selection {
diff --git a/src/routes/invoice/[id].svelte b/src/routes/invoice/[id].svelte
index 2e3d257c..92ffb61a 100644
--- a/src/routes/invoice/[id].svelte
+++ b/src/routes/invoice/[id].svelte
@@ -147,7 +147,7 @@
 				<div
 					class="w-[100%] md:w-auto absolute {showMobileTip
 						? 'bottom-0'
-						: '-top-full'} bg-white p-6 md:p-0 rounded-t-3xl md:rounded-none transition-all md:transition-none ease-in-out duration-500 left-0 md:static text-center space-y-5"
+						: '-bottom-full'} bg-white p-6 md:p-0 rounded-t-3xl md:rounded-none left-0 md:static text-center space-y-5"
 				>
 					<h1 class="hidden md:block text-4xl font-semibold">Add a tip?</h1>
 
-- 
cgit v1.2.3


From fe130806aea8ba9e0b16a9f8c2ec4adcfe12a821 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 2 Aug 2022 17:27:06 -0600
Subject: update toast color fix another bug

---
 src/app.css                    | 1 -
 src/routes/__layout.svelte     | 1 +
 src/routes/invoice/[id].svelte | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/routes/invoice')

diff --git a/src/app.css b/src/app.css
index 7f585187..91fcc5c1 100644
--- a/src/app.css
+++ b/src/app.css
@@ -9,7 +9,6 @@
 
 html {
 	font-family: PublicSans, sans-serif;
-	overflow: hidden;
 }
 
 ::selection {
diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 167fba93..9b842cc2 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -42,5 +42,6 @@
 		--toastContainerRight: auto;
 		--toastContainerBottom: 8rem;
 		--toastContainerLeft: calc(50vw - 8rem);
+    --toastBackground: #292929;
 	}
 </style>
diff --git a/src/routes/invoice/[id].svelte b/src/routes/invoice/[id].svelte
index 92ffb61a..3170feba 100644
--- a/src/routes/invoice/[id].svelte
+++ b/src/routes/invoice/[id].svelte
@@ -147,7 +147,7 @@
 				<div
 					class="w-[100%] md:w-auto absolute {showMobileTip
 						? 'bottom-0'
-						: '-bottom-full'} bg-white p-6 md:p-0 rounded-t-3xl md:rounded-none left-0 md:static text-center space-y-5"
+						: '-top-full'} bg-white p-6 md:p-0 rounded-t-3xl md:rounded-none left-0 md:static text-center space-y-5"
 				>
 					<h1 class="hidden md:block text-4xl font-semibold">Add a tip?</h1>
 
-- 
cgit v1.2.3


From bf70817d4a3440b5ea105e62648d7c5c67047fd9 Mon Sep 17 00:00:00 2001
From: secondl1ght <85003930+secondl1ght@users.noreply.github.com>
Date: Tue, 2 Aug 2022 20:37:31 -0600
Subject: minor adjustments and additions

---
 src/components/LandingHeader.svelte | 4 +---
 src/routes/invoice/[id].svelte      | 8 ++++----
 src/routes/jobs.svelte              | 4 ++++
 3 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/routes/invoice')

diff --git a/src/components/LandingHeader.svelte b/src/components/LandingHeader.svelte
index 65ea607c..a8abfaba 100644
--- a/src/components/LandingHeader.svelte
+++ b/src/components/LandingHeader.svelte
@@ -15,9 +15,7 @@
 	};
 </script>
 
-<header
-	class="w-full lg:w-5/6 py-5 xl:pb-0 xl:pt-10 mx-auto fixed md:sticky z-10 top-0 bg-white/90"
->
+<header class="w-full lg:w-5/6 py-5 mx-auto fixed md:sticky z-10 top-0 bg-white/90">
 	<nav class="block xl:flex flex-wrap justify-between items-center">
 		<a href="/" class="hidden md:block">
 			<Icon icon="logo" style="mx-auto mb-5 xl:mb-0" />
diff --git a/src/routes/invoice/[id].svelte b/src/routes/invoice/[id].svelte
index 3170feba..9ef25251 100644
--- a/src/routes/invoice/[id].svelte
+++ b/src/routes/invoice/[id].svelte
@@ -220,7 +220,7 @@
 				/>
 
 				<!-- invoice section -->
-				<div class="text-center space-y-5">
+				<div class="w-[325px] text-center space-y-5">
 					<button
 						class="block md:hidden bg-black {showMobileTip
 							? 'text-white/50'
@@ -255,7 +255,7 @@
 						on:click={() => copy(text)}
 						class="border {showMobileTip
 							? 'border-gray-400'
-							: 'border-lightgrey'} px-5 md:px-0 w-[292px] h-[302px] md:w-[300px] md:h-[300px] rounded-3xl block md:flex justify-center items-center cursor-pointer"
+							: 'border-lightgrey'} px-5 md:px-0 w-[292px] h-[302px] md:w-[300px] md:h-[300px] rounded-3xl block md:flex justify-center items-center cursor-pointer mx-auto"
 					/>
 
 					<div class="px-5 space-y-3">
@@ -275,8 +275,8 @@
 							>
 						</div>
 
-						<div class="flex justify-between">
-							<span class="font-bold">Total</span>
+						<div class="flex flex-wrap justify-between">
+							<span class="font-bold mr-1">Total</span>
 							<span class="font-bold"
 								>{totalAmountFormatted}
 								<span class="text-secondary font-normal">{`(${totalAmountSats} SATS)`}</span></span
diff --git a/src/routes/jobs.svelte b/src/routes/jobs.svelte
index e4a97386..d864cf88 100644
--- a/src/routes/jobs.svelte
+++ b/src/routes/jobs.svelte
@@ -1,11 +1,15 @@
 <script>
 	import { Icon } from '$comp';
+	import { goto } from '$app/navigation';
 </script>
 
 <a href="/">
 	<Icon icon="logo" style="mx-auto mt-10" />
 </a>
 <div class="w-11/12 md:w-3/4 lg:w-1/2 2xl:w-1/3 max-w-3xl mx-auto my-20 space-y-5">
+	<button on:click={() => goto('/')}>
+		<Icon icon="arrow-left" style="w-8" />
+	</button>
 	<h1 class="text-5xl font-medium">Jobs</h1>
 
 	<h2 class="text-2xl font-medium">Current Openings</h2>
-- 
cgit v1.2.3