From 8f9476a130720c997f1ab07d981dab37e955af35 Mon Sep 17 00:00:00 2001
From: Daniel <danthevip@gmail.com>
Date: Wed, 25 Oct 2023 18:57:27 +0300
Subject: [PATCH] Popup hotfix

---
 .../dashboard/board/infolists/Content.svelte    |  6 +++---
 .../dashboard/board/infolists/Expenses.svelte   | 17 ++++++++++-------
 .../dashboard/board/infolists/Incomes.svelte    |  3 ++-
 .../dashboard/board/infolists/Popup.svelte      |  5 ++---
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Content.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Content.svelte
index 1e3c085..67a053f 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Content.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Content.svelte
@@ -2,12 +2,12 @@
     import { getContext } from 'svelte';
     import Popup from './Popup.svelte';
     const { open } = getContext('simple-modal');
-    const showSurprise = () => open(Popup, { message: "heh" });
+    const showSurprise = () => open(Popup, { message: "It's aff modal!" });
 </script>
 
 <div id="logout" role="button"
      tabindex="0"
-     on:click={showSurprise()}
+     on:click={showSurprise}
      on:keydown={() => console.log("keydown")}>
-    +
+    Log out
 </div>
\ No newline at end of file
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Expenses.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Expenses.svelte
index ff6d529..85bf9e5 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Expenses.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Expenses.svelte
@@ -2,7 +2,9 @@
     import { onMount, afterUpdate } from 'svelte';
     import axios from 'axios';
     import { getCookie } from "svelte-cookie";
+
     import Modal from 'svelte-simple-modal';
+    import Content from "./Content.svelte";
 
     let data = [];
     let parentHeight;
@@ -31,7 +33,11 @@
 </script>
 
 <div id="expenseInfo" style="max-height: {parentHeight}px;">
-    <h2 id="text">Expenses</h2>
+    <div id="options">
+        <h2>Incomes</h2>
+        <Modal><Content /></Modal>
+    </div>
+
     <div id="expenseList">
         <ul>
             {#each data as item}
@@ -46,10 +52,6 @@
 </div>
 
 <style>
-    #text {
-        padding: 0 0 10px;
-        margin: 0;
-    }
 
     #expenseInfo {
         flex: 1;
@@ -59,11 +61,12 @@
         max-height: 100%;
     }
 
-    h2 {
+    #options {
         position: sticky;
         top: 0;
         background-color: #f2f2f2;
-        padding: 10px;
+        padding: 0 0 10px;
+        margin: 0;
         border-radius: 10px 10px 0 0;
         z-index: 1;
     }
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Incomes.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Incomes.svelte
index 72c6edf..ea78a80 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Incomes.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Incomes.svelte
@@ -38,6 +38,7 @@
         <Modal><Content /></Modal>
     </div>
 
+
     <div id="incomeList">
         <ul>
             {#each data as item}
@@ -53,7 +54,7 @@
 
 <style>
     #incomeOptions {
-        position: sticky;
+
         top: 0;
         background-color: #f2f2f2;
         padding: 10px;
diff --git a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Popup.svelte b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Popup.svelte
index d672337..e13aeb4 100644
--- a/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Popup.svelte
+++ b/src/main/java/com/faf223/expensetrackerfaf/web/src/routes/dashboard/board/infolists/Popup.svelte
@@ -1,6 +1,5 @@
 <script>
+    export let message = 'Hi';
 </script>
 
-<div>
-    LOL
-</div>
\ No newline at end of file
+<p>🎉 {message} 🍾</p>
\ No newline at end of file