fix login issue

6 files changed, 33 insertions, 28 deletions

diff --git a/src/lib/utils.js b/src/lib/utils.js
index 3441556f..52494c88 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -126,7 +126,7 @@ export let info = (m) => {
 	});
 };
 
-export let login = async (user, cookies) => {
+export let login = async (user, cookies, ip) => {
 	let maxAge = 380 * 24 * 60 * 60;
 
 	let res = await fetch(base + '/login', {
diff --git a/src/routes/(app)/+layout.svelte b/src/routes/(app)/+layout.svelte
index cd8919e4..7c67e964 100644
--- a/src/routes/(app)/+layout.svelte
+++ b/src/routes/(app)/+layout.svelte
@@ -34,19 +34,21 @@
 			checkSocket();
 			expirePin();
 
-			try {
-				$ndef = new NDEFReader();
-				await $ndef.scan();
+			if (window.NDEFReader) {
+				try {
+					$ndef = new NDEFReader();
+					await $ndef.scan();
 
-				$ndef.addEventListener('readingerror', (e) => {
-					console.log('nfc error', e);
-				});
+					$ndef.addEventListener('readingerror', (e) => {
+						console.log('nfc error', e);
+					});
 
-				$ndef.addEventListener('reading', ({ message, serialNumber }) => {
-          goto(`/${user.username}/card/${serialNumber.replace(/:/g, '-')}`);
-				});
-			} catch (error) {
-				log('Argh! ' + error);
+					$ndef.addEventListener('reading', ({ message, serialNumber }) => {
+						goto(`/${user.username}/card/${serialNumber.replace(/:/g, '-')}`);
+					});
+				} catch (error) {
+					log('Argh! ' + error);
+				}
 			}
 		}
 	});
diff --git a/src/routes/(app)/[username]/(profile)/+page.svelte b/src/routes/(app)/[username]/(profile)/+page.svelte
index 6e8318f7..f228defc 100644
--- a/src/routes/(app)/[username]/(profile)/+page.svelte
+++ b/src/routes/(app)/[username]/(profile)/+page.svelte
@@ -86,7 +86,7 @@
 			</div>
 
 			{#if !user.balance}
-				<div>
+				<div class="mb-8">
 					<p class="text-secondary text-lg">
           {$t("user.welcome")}
 					</p>
diff --git a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
index 1a1191a1..bf30db99 100644
--- a/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
+++ b/src/routes/(app)/[username]/invoice/[hash]/+page.svelte
@@ -58,7 +58,7 @@
 
 		tipPercent = (tip / amount) * 100;
 
-		if (browser) {
+		if (browser && window.NDEFReader) {
 			try {
 				ndef = new NDEFReader();
 				await ndef.scan();
diff --git a/src/routes/(app)/register/+page.server.js b/src/routes/(app)/register/+page.server.js
index 8a8ca81c..79aed8bc 100644
--- a/src/routes/(app)/register/+page.server.js
+++ b/src/routes/(app)/register/+page.server.js
@@ -8,6 +8,8 @@ export const load = async ({ parent }) => {
 
 export const actions = {
 	default: async ({ cookies, request }) => {
+		let ip = request.headers.get('cf-connecting-ip');
+
 		let form = await fd(request);
 		let { username, password, cipher, salt, pubkey, loginRedirect } = form;
 		let user = { username, password, cipher, salt, pubkey };
@@ -16,13 +18,13 @@ export const actions = {
 		if (loginRedirect === 'undefined') loginRedirect = undefined;
 
 		try {
-        await post('/register', { user }, { "cf-connecting-ip": request.headers.get('cf-connecting-ip') });
+			await post('/register', { user }, { 'cf-connecting-ip': ip });
 		} catch (e) {
 			if (e.message.includes('taken')) error = e.message;
 		}
 
 		try {
-			await login(user, cookies);
+			await login(user, cookies, ip);
 			error = null;
 		} catch (e) {
 			error ||= e.message;
diff --git a/src/routes/(app)/send/invoice/[id]/+page.svelte b/src/routes/(app)/send/invoice/[id]/+page.svelte
index 3efe898a..81ae0e97 100644
--- a/src/routes/(app)/send/invoice/[id]/+page.svelte
+++ b/src/routes/(app)/send/invoice/[id]/+page.svelte
@@ -36,20 +36,21 @@
 	};
 
 	onMount(async () => {
-    console.log("SKOOK")
-		try {
-			let ndef = new NDEFReader();
-			await ndef.scan();
+		if (browser && window.NDEFReader) {
+			try {
+				let ndef = new NDEFReader();
+				await ndef.scan();
 
-			ndef.addEventListener('readingerror', (e) => {
-				console.log('nfc error', e);
-			});
+				ndef.addEventListener('readingerror', (e) => {
+					console.log('nfc error', e);
+				});
 
-			ndef.addEventListener('reading', ({ message, serialNumber }) => {
-				console.log('HI');
-			});
-		} catch (error) {
-			log('Argh! ' + error);
+				ndef.addEventListener('reading', ({ message, serialNumber }) => {
+					console.log(message, serialNumber);
+				});
+			} catch (e) {
+				console.log('NFC error', e);
+			}
 		}
 	});
 </script>