From b4f32a77e7e2bf949588494d944350f33403a3da Mon Sep 17 00:00:00 2001
From: coletteli <73262125+coletteli@users.noreply.github.com>
Date: Fri, 21 Apr 2023 23:27:57 -0400
Subject: [PATCH] idk

---
 src/SessionStore.ts                     | 29 +++++++++++---------
 src/routes/Homepage.svelte              | 36 +++++++++++++++++++++++++
 src/routes/ModalManager.svelte          | 19 +++++++++++++
 src/routes/components/AboutModal.svelte |  7 +++++
 4 files changed, 78 insertions(+), 13 deletions(-)
 create mode 100644 src/routes/components/AboutModal.svelte

diff --git a/src/SessionStore.ts b/src/SessionStore.ts
index 1799c3b..c2e54fd 100644
--- a/src/SessionStore.ts
+++ b/src/SessionStore.ts
@@ -1,20 +1,23 @@
 import { writable } from 'svelte/store';
 
 const SessionStore = writable<{
-    inSession: boolean,
-    sessionLength: number,
-    modalType: string,
-    counter: number,
-    sessionActivity: string
+  inSession: boolean,
+  sessionLength: number,
+  modalType: string | null,
+  counter: number,
+  sessionActivity: string
 }>({
-    inSession: false,
-    sessionLength: 0,
-    modalType: "",
-    counter: 0,
-    sessionActivity: ""
+  inSession: false,
+  sessionLength: 0,
+  modalType: null,
+  counter: 0,
+  sessionActivity: ""
 });
 
+const update = SessionStore.update;
+
 export default {
-    subscribe: SessionStore.subscribe,
-    set: SessionStore.set
-}
\ No newline at end of file
+  subscribe: SessionStore.subscribe,
+  set: SessionStore.set,
+  update
+};
diff --git a/src/routes/Homepage.svelte b/src/routes/Homepage.svelte
index 46ee6b8..c77892e 100644
--- a/src/routes/Homepage.svelte
+++ b/src/routes/Homepage.svelte
@@ -78,6 +78,30 @@
             }
         }
     }
+<<<<<<< Updated upstream
+=======
+
+    const aboutModal = () => {
+        SessionStore.set({
+            inSession: false,
+            sessionLength: 0,
+            modalType: "about",
+            counter: $SessionStore.counter+1,
+            sessionActivity: ""
+        });
+    };
+
+    const profileModal = () => {
+        SessionStore.set({
+            inSession: $SessionStore.inSession,
+            sessionLength: $SessionStore.sessionLength,
+            modalType: "profile",
+            counter: $SessionStore.counter+1,
+            sessionActivity: $SessionStore.sessionActivity
+        });
+    };
+
+>>>>>>> Stashed changes
 </script>
 
 <style>
@@ -165,11 +189,23 @@
         color: #DC83A4;
         padding-left: 3rem;
         font-size: 2rem;
+
     }
+    #aboutButton {
+    position: absolute;
+    top: 1rem;
+    left: 1rem;
+}
+
 </style>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
+<<<<<<< Updated upstream
 <img src="logout.png" alt="logout" class="logout_button" on:click={logout}>
+=======
+<img src="logout.png" alt="logout" class="logout_button" on:click={logout}> 
+<button id='aboutButton' on:click={aboutModal} class="button">About</button>
+>>>>>>> Stashed changes
 {#if $SessionStore.inSession}
     <InSession/>
 {:else}
diff --git a/src/routes/ModalManager.svelte b/src/routes/ModalManager.svelte
index 84a7632..7f5d2cc 100644
--- a/src/routes/ModalManager.svelte
+++ b/src/routes/ModalManager.svelte
@@ -6,6 +6,12 @@
     import CustomizationModal from './components/CustomizationModal.svelte';
     import { writable } from 'svelte/store';
     import Modal from 'svelte-simple-modal';
+<<<<<<< Updated upstream
+=======
+    import ProfileModal from './components/ProfileModal.svelte';
+    import AboutModal from './components/AboutModal.svelte';
+
+>>>>>>> Stashed changes
 
     const modal = writable(null);
     let currModal = "";
@@ -32,6 +38,19 @@
                 // @ts-ignore
                 modal.set(CustomizationModal);
             }
+<<<<<<< Updated upstream
+=======
+            if ($SessionStore.modalType == "profile") {
+                // @ts-ignore
+                modal.set(ProfileModal);
+            }
+
+            if ($SessionStore.modalType == "about") {
+                // @ts-ignore
+                modal.set(AboutModal);
+            }
+
+>>>>>>> Stashed changes
             currModal = $SessionStore.modalType;
             counter = $SessionStore.counter;
         }
diff --git a/src/routes/components/AboutModal.svelte b/src/routes/components/AboutModal.svelte
new file mode 100644
index 0000000..e648add
--- /dev/null
+++ b/src/routes/components/AboutModal.svelte
@@ -0,0 +1,7 @@
+<div class="modal-content">
+    <h1>About Us!</h1>
+    <p>StudyHouse is an application aimed to make its users more productive. Through reinforcing techniques, the goal is that as a user, you feel motivated to do your work and rewarded when you complete it. After starting a session, you will receive coins based on the amount of time you were productive for. Once you have chosen to end the timer, the coins earned can be used to unlock furniture and themes to customize your very own study house! The more coins you earn the more you can personalize your study house. 
+
+        Why not stay home and study today?</p>
+  </div>
+  
\ No newline at end of file