client/package-lock.json

@@ -23,7 +23,6 @@
         "rollup-plugin-svelte": "^7.0.0",
         "rollup-plugin-terser": "^7.0.0",
         "svelte": "^3.0.0",
-        "svelte-keydown": "^0.4.0",
         "svelte-preprocess": "^4.9.8"
       }
     },
@@ -1948,12 +1947,6 @@
         "node": ">= 8"
       }
     },
-    "node_modules/svelte-keydown": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/svelte-keydown/-/svelte-keydown-0.4.0.tgz",
-      "integrity": "sha512-a0S5m+u78FE1jgpuSCZPtgh/KhwNAO9t8kkcBkK1sK9ZiVC+Iu5XOCqIu1F+PEyenRTIxGaA4yr6KAsYFB6kkQ==",
-      "dev": true
-    },
     "node_modules/svelte-preprocess": {
       "version": "4.9.8",
       "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.9.8.tgz",
@@ -3707,12 +3700,6 @@
       "integrity": "sha512-4DrCEJoBvdR689efHNSxIQn2pnFwB7E7j2yLEJtHE/P8hxwZWIphCtJ8are7bjl/iVMlcEf5uh5pJ68IwR09vQ==",
       "dev": true
     },
-    "svelte-keydown": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/svelte-keydown/-/svelte-keydown-0.4.0.tgz",
-      "integrity": "sha512-a0S5m+u78FE1jgpuSCZPtgh/KhwNAO9t8kkcBkK1sK9ZiVC+Iu5XOCqIu1F+PEyenRTIxGaA4yr6KAsYFB6kkQ==",
-      "dev": true
-    },
     "svelte-preprocess": {
       "version": "4.9.8",
       "resolved": "https://registry.npmjs.org/svelte-preprocess/-/svelte-preprocess-4.9.8.tgz",

client/package.json

@@ -17,7 +17,6 @@
     "rollup-plugin-svelte": "^7.0.0",
     "rollup-plugin-terser": "^7.0.0",
     "svelte": "^3.0.0",
-    "svelte-keydown": "^0.4.0",
     "svelte-preprocess": "^4.9.8"
   },
   "dependencies": {

client/src/AccountCard.svelte

@@ -21,7 +21,7 @@
     export let balance="5425";
     export let iban="RONFOX62188921";
     export let isExpanded=false;
-    export let transactions=[];
+    let transactions=[];
     export let accountId;
 
     let copied = false;
@@ -55,6 +55,14 @@
         });
     }
 
+    onMount( () => {
+        gettransactions($token, accountId).then( result => {
+            if(result.status == "success") {
+                transactions = result.transactions;
+                transactions.sort((e1, e2) => new Date(e2.datetime) - new Date(e1.datetime));
+            }
+        });
+    })
 </script>
 
  
@@ -74,7 +82,7 @@
 
             <div>
                 <DetailField class="p-1  flex-shrink">
-                    <h2 class='font-sans mt-3 mb-2 pl-2 text-4xl text-gray-50'>Balance: <span style="color: #264D59">{amountToString(balance)}</span>{currency}</h2>
+                    <h2 class='font-sans mt-3 mb-2 pl-2 text-4xl text-gray-50'>Balance: <span style="color: #264D59">{balance}</span>{currency}</h2>
                 </DetailField>
             </div>
 

client/src/App.svelte

@@ -42,11 +42,9 @@
 	})
 
 	setContext("user", user);
-	const refreshAccounts = writable(null);
-	setContext("refreshAccounts", refreshAccounts);
 
 	const accounts = readable(null, set => {
-		function getAccounts(token){
+		const unsubscribe = userToken.subscribe(token => {
 			if(token == null) {
 				set(null);
 			}else{
@@ -55,26 +53,10 @@
 						set(result);
 					})
 			}
-		}
-
-		let token = null;
-
-		refreshAccounts.set( () => {
-			getAccounts(token);
-		});
-
-		const unsubscribe = userToken.subscribe(newToken => {
-			token = newToken;
-			getAccounts(token);
 		})
 
-		const intervalId = setInterval(() => {
-			getAccounts(token);
-		}, 10000);
-
 		return () => {
 			unsubscribe();
-			clearInterval(intervalId);
 		}
 	})
 

client/src/CheckNotifications.svelte

@@ -39,7 +39,6 @@
             <div class="w-full max-w-md self-start border-solid border mb-3"></div> 
 
             <div class="flex flex-col flex-grow pl-8 pr-10 relative scroller overflow-auto overflow-x-hidden max-h-full min-h-0">
-                {#if notifications.length > 0}
                 {#each notifications as notification,i (i)}
                     <div on:click={() => onNotificationClick(notification.id)} in:slide={{delay:100*i}} out:slide={{delay:50*(notifications.length-i)}}>
                 
@@ -69,14 +68,6 @@
                         </DetailField> 
                     </div>
                 {/each}
-                {:else}
-                        <DetailField class="relative my-3 py-1 flex-shrink min-w-transaction max-w-4xl">
-                            <div class='font-sans text-gray-50 text-2xl mt-2 mx-4 border-b-1'>
-                                No notifications.
-                            </div>
-                        </DetailField>
-                {/if}
-                
             </div>
             
             <div class="m-2"></div>

client/src/CreateAccount.svelte

@@ -12,7 +12,6 @@
     import { getContext } from "svelte";
 
     const token = getContext("token");
-    const refreshAccounts = getContext("refreshAccounts");
     
     const dispatch = createEventDispatcher();
 
@@ -33,9 +32,6 @@
             const result = await createaccount($token, name, currency, type);
             if(result.status == "success") {
                 dispatch("createPopup",{type:"create_acc_success"});
-                if($refreshAccounts){
-                    $refreshAccounts();
-                }
             }else{
                 dispatch("createPopup",{type:"create_acc_failed", reason:"Failed to create account. Error:"+result.status});
             }

client/src/InputField.svelte

@@ -9,7 +9,7 @@
 </script>
 
 <main>
-	<input on:keydown type={isPassword ? "password" : "text"} placeholder={placeholder} value={value} on:input={handleInput} class="placeholder-gray-300 p-3 text-gray-50 w-full text-3xl">
+	<input type={isPassword ? "password" : "text"} placeholder={placeholder} value={value} on:input={handleInput} class="placeholder-gray-300 p-3 text-gray-50 w-full text-3xl">
 </main>
 
 <style>

client/src/Login.svelte

@@ -24,19 +24,6 @@
         
     }
 
-    async function enter(event) {
-        if (event.key === 'Enter') {
-            const result = await login(username, code);
-            if(result.status == "success") {
-                dispatch("loginSuccess",{
-                    token: result.token,
-                });
-            }else{
-                alert(result.code);
-            }
-        }
-    }
-
 </script>
 
 <main class="h-full">
@@ -48,7 +35,7 @@
             </div>
             
             <div class="m-3 flex-shrink">
-                <InputField on:keydown={enter} placeholder="Code" isPassword={true} bind:value={code}></InputField>
+                <InputField placeholder="Code" isPassword={true} bind:value={code}></InputField>
             </div>
 
             <div class="m-3 flex-shrink"> 

client/src/MainPage.svelte

@@ -6,7 +6,7 @@
     import GreenButton from './GreenButton.svelte';
     import { fade, fly, slide } from 'svelte/transition';
 	import { flip } from 'svelte/animate';
-    import { logout, whoami, getaccountlist, getnotificationlist, getForex } from './api';
+    import { logout, whoami, getaccountlist, getnotificationlist } from './api';
 import { amountToString } from './utils';
 
     const token = getContext("token");
@@ -20,7 +20,7 @@
     $: username = $user.user.username;
     $: email = $user.user.email;
     $: notifications = $notificationsStore ? $notificationsStore.notifications : [];
-    let totalbalance = "0.00";
+    let totalbalance = "2455.22";
     let maincurrency = "RON";
     let expandedAccount = null;
     let showAllAccounts = true;
@@ -30,21 +30,12 @@
         return {
             name: account.customName ? account.customName : `${account.accountType} Account`,
             currency: account.currency,
-            balance: account.balance,
+            balance: amountToString(account.balance),
             iban: account.iban.replace(/(.{4})/g, "$1 "),
             id: account.id,
-            transactions: account.transactions,
         }
     }) : [];
 
-    $: {
-        Promise.all(accounts.map(account => {
-            return getForex(account.currency, maincurrency, account.balance);
-        })).then( balances => {
-            const sum = balances.reduce((acc, current) => acc+current, 0);
-            totalbalance = amountToString(Math.round(sum));
-        })
-    }
 
     function dispatchLogout(){
         if (confirm("Log out?")) {
@@ -101,7 +92,7 @@
         {/if}
 
         <div class="self-center m-0">
-            {#if showAllAccounts && (accounts.length < 3) }
+            {#if showAllAccounts}
                 <div in:slide={{delay:500*accounts.length, duration:250*accounts.length}}>
                     <GreenButton on:click={createAccount}><Icon icon="akar-icons:plus" color="rgba(249, 250, 251, 1)" width="26" height="26" /></GreenButton>
                 </div>

client/src/SendMoney.svelte

@@ -20,7 +20,6 @@
     let amount=0.00;
     let description="";
     const token = getContext("token");
-    const refreshAccounts = getContext("refreshAccounts");
 
 
     async function create(){
@@ -37,9 +36,6 @@
             await createtransaction($token,  receiveriban, Math.round(amount*100), account.id, description).then( result => {
                 if(result.status == "success") {
                     dispatch("createPopup",{type:"send_money_success"});
-                    if($refreshAccounts){
-                        $refreshAccounts();
-                    }
                 }
             });
             

client/src/api.js

@@ -67,18 +67,7 @@ export async function getaccountlist(token) {
             },
         });
 
-        const data = await result.json();
+        return (await result.json());
-
-        if(data.status == "success"){
-            for(let i=0; i < data.accounts.length; i++){
-                const transactionsreq = await gettransactions(token, data.accounts[i].id);
-                if (transactionsreq.status == "success") {
-                    data.accounts[i].transactions = transactionsreq.transactions;
-                }
-            }
-        }
-
-        return data;
     } catch (error) {
         return {
             status: "error",
@@ -157,12 +146,7 @@ export async function getnotificationlist(token) {
             },
         });
 
-        const data = await result.json();
+        return (await result.json());
-        if(data.status == "success") {
-            data.notifications.sort((e1, e2) => new Date(e2.datetime) - new Date(e1.datetime));
-        }
-
-        return data;
     } catch (error) {
         return {
             status: "error",
@@ -249,12 +233,7 @@ export async function gettransactions(token, id) {
             },
         });
 
-        const data = await result.json();
+        return (await result.json());
-        if(data.status == "success") {
-            data.transactions.sort((e1, e2) => new Date(e2.datetime) - new Date(e1.datetime));
-        }
-
-        return data;
     } catch (error) {
         return {
             status: "error",
@@ -262,26 +241,3 @@ export async function gettransactions(token, id) {
         }
     }
 }
-
-
-    
-export async function getForex(from, to, amount) {
-    try {
-        const result = await fetch(new URL("/forex/"+from+"/"+to, baseURL), {
-            method: "GET",
-            headers: {
-                "Content-Type": "application/json",
-            },
-        });
-
-        const data = await result.json();
-        if(data.status == "success") {
-            const exchanged = amount * data.rate;
-            return exchanged;
-        }
-
-        return null;
-    } catch (error) {
-        return null;
-    }
-}