From 87abfa73b24a7d56b3aeedf977d7a49049cd583d Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Sat, 12 Nov 2022 16:26:38 -0800
Subject: fix voucher qr codes

---
 src/app.css                                     | 2 +-
 src/routes/(app)/send/[...text]/+page.svelte    | 9 ++++-----
 src/routes/(app)/support/+page.svelte           | 6 +++---
 src/routes/(app)/voucher/[code]/+page.server.js | 2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/app.css b/src/app.css
index e13bec19..1689e207 100644
--- a/src/app.css
+++ b/src/app.css
@@ -20,7 +20,7 @@ html {
 	background-color: white;
 }
 
-input {
+input, textarea {
 	@apply block border rounded-2xl px-5 py-4 w-full;
 }
 
diff --git a/src/routes/(app)/send/[...text]/+page.svelte b/src/routes/(app)/send/[...text]/+page.svelte
index 09b9cb21..a6c38d63 100644
--- a/src/routes/(app)/send/[...text]/+page.svelte
+++ b/src/routes/(app)/send/[...text]/+page.svelte
@@ -5,14 +5,16 @@
 	import { tick } from 'svelte';
 	import { browser } from '$app/environment';
 	import { t } from '$lib/translations';
-	import { Avatar, Icon, Spinner } from '$comp';
+	import { AppHeader, Avatar, Icon, Spinner } from '$comp';
 	import { back, failure } from '$lib/utils';
 	import { format, parseISO } from 'date-fns';
 
 	export let data;
 	export let form;
+  data.subject = data.user;
 
 	let { contacts } = data;
+  console.log("C", contacts)
 	let w;
 
 	let el, textarea, text;
@@ -28,10 +30,7 @@
 
 <svelte:window bind:innerWidth={w} />
 
-<button class="ml-5 md:ml-20 mt-5 md:mt-10 hover:opacity-80" on:click={back}>
-	<Icon icon="arrow-left" style="w-10" />
-</button>
-
+<AppHeader {data} />
 <div class="container px-4 max-w-lg mx-auto space-y-5 mt-10">
 	<h1 class="px-3 md:px-0 text-center text-3xl md:text-4xl font-semibold">Send</h1>
 
diff --git a/src/routes/(app)/support/+page.svelte b/src/routes/(app)/support/+page.svelte
index 64353f4d..996788b7 100644
--- a/src/routes/(app)/support/+page.svelte
+++ b/src/routes/(app)/support/+page.svelte
@@ -51,7 +51,7 @@
 			<div class="mb-4">
 				<label for="account" class="font-semibold">{$t('user.support.accountName')}</label>
 				<input
-					class="block border rounded-xl p-2 w-full"
+					class="bg-primary"
 					type="text"
 					name="account"
 					required
@@ -62,7 +62,7 @@
 			<div class="mb-4">
 				<label for="email" class="font-semibold">{$t('user.support.email')}</label>
 				<input
-					class="block border rounded-xl p-2 w-full"
+					class="bg-primary"
 					type="email"
 					name="email"
 					bind:value={email}
@@ -74,7 +74,7 @@
 				<label for="message" class="font-semibold">{$t('user.support.message')}</label>
 				<textarea
 					rows={5}
-					class="block border rounded-xl p-2 w-full"
+					class="bg-primary"
 					type="text"
 					name="message"
 					bind:value={message}
diff --git a/src/routes/(app)/voucher/[code]/+page.server.js b/src/routes/(app)/voucher/[code]/+page.server.js
index 89ce69ac..b389c7ca 100644
--- a/src/routes/(app)/voucher/[code]/+page.server.js
+++ b/src/routes/(app)/voucher/[code]/+page.server.js
@@ -3,6 +3,6 @@ import Qr from 'qrcode-base64';
 export let load = async ({ params: { code }, url }) => {
 	let payment = await get(`/payment/${code}`);
 
-	let src = Qr.drawImg(url.hostname, { size: 300 });
+	let src = Qr.drawImg(`${url.hostname}/voucher/${code}`, { size: 300 });
 	return { payment, src };
 };
-- 
cgit v1.2.3