refactoring

4 files changed, 11 insertions, 60 deletions

diff --git a/src/lib/parse.js b/src/lib/parse.js
index 95d0a8b6..e69de29b 100644
--- a/src/lib/parse.js
+++ b/src/lib/parse.js
@@ -1,37 +0,0 @@
-// import bolt11 from 'bolt11';
-import validate from 'bitcoin-address-validation';
-import bip21 from 'bip21';
-import { get } from '$lib/utils';
-import { goto } from '$app/navigation';
-
-let debounce;
-export default async (t) => {
-	if (!t) return;
-	console.log('parsing');
-
-	// lightning
-	if (t.startsWith('ln')) {
-		goto(`/send/lightning/${t}`);
-	}
-
-	// bitcoin
-	if (validate(t)) {
-		console.log('bitcoin');
-		goto(`/send/bitcoin/${t}`);
-	}
-
-	// ln address
-	if (t.includes('@') && t.includes('.')) {
-		console.log('ln address');
-		let [name, domain] = t.split('@');
-		try {
-			clearTimeout(debounce);
-			await new Promise((r) => (debounce = setTimeout(r, 1500)));
-			let lnurl = await get(`/encode?domain=${domain}&name=${name}`);
-			console.log('lnurl', lnurl);
-		} catch (e) {}
-	}
-
-	// user
-	console.log('username');
-};
diff --git a/src/lib/socket.js b/src/lib/socket.js
index ed3fa02e..dac2935e 100644
--- a/src/lib/socket.js
+++ b/src/lib/socket.js
@@ -1,16 +1,13 @@
 import { get } from 'svelte/store';
-import { rate, user, token, invoices, newPayment } from '$lib/store';
+import { invoices, newPayment, rate } from '$lib/store';
 import { success } from '$lib/utils';
 import { env } from '$env/dynamic/public';
 
 const socketUrl = env.PUBLIC_SOCKET;
 
-let interval, socket;
+let interval, socket, token;
 
-export const auth = () => {
-	let t = get(token);
-	if (t) send('login', t);
-};
+export const auth = () => token && send('login', token);
 
 export const send = (type, data) => {
 	socket?.readyState === 1 && socket.send(JSON.stringify({ type, data }));
@@ -31,11 +28,7 @@ export const messages = (data) => ({
 		}
 	},
 
-	connected: auth,
-
-	login() {
-		user.set(data);
-	}
+	connected: auth
 });
 
 const initialReconnectDelay = 1000;
@@ -43,7 +36,9 @@ const maxReconnectDelay = 16000;
 
 let currentReconnectDelay = initialReconnectDelay;
 
-export function connect() {
+export function connect(t) {
+	token = t;
+
 	clearInterval(interval);
 
 	if (socket) return auth();
diff --git a/src/lib/store.js b/src/lib/store.js
index e7228158..c64ad39f 100644
--- a/src/lib/store.js
+++ b/src/lib/store.js
@@ -27,14 +27,9 @@ const persistLocal = (key, defaultValue) => {
 	return s;
 };
 
-export const rate = writable();
 export const redirect = writable();
-export const rates = writable();
+export const rate = writable();
 export const selectedRate = writable();
-export const user = writable();
-export const subject = writable();
-export const invoiceAmount = writable();
-export const invoiceAmountFiat = writable();
 export const token = persistSession('token');
 export const invoices = writable({});
 export const newPayment = persistLocal('newPayment');
diff --git a/src/lib/utils.js b/src/lib/utils.js
index a7d0adaa..a4c77d58 100644
--- a/src/lib/utils.js
+++ b/src/lib/utils.js
@@ -109,11 +109,14 @@ export const info = (m) => {
 export const login = async (user, cookies) => {
 	let maxAge = 30 * 24 * 60 * 60;
 	let { token } = await post('/login', user);
+	console.log('logged in', token);
 
 	let expires = new Date();
 	expires.setSeconds(expires.getSeconds() + maxAge);
 
+	console.log('cs');
 	cookies.set('token', token, { path: '/' });
+	console.log('bs');
 };
 
 export const auth = (cookies) => ({ authorization: `Bearer ${cookies.get('token')}` });
@@ -128,11 +131,6 @@ export const f = (s, currency) =>
 
 export const s = (s) => new Intl.NumberFormat('en-US', { maximumFractionDigits: 0 }).format(s);
 
-export const toggleFullscreen = (el) =>
-	document.fullscreenElement
-		? document.exitFullscreen()
-		: el.requestFullscreen().catch(console.log);
-
 export const sats = 100000000;
 
 export const back = () => {