From b47096f0480e43f94e0a3d8faf9f6105aab272ae Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <se23m504@technikum-wien.at>
Date: Thu, 9 May 2024 10:54:00 +0200
Subject: [PATCH] Refactor

---
 prisma/schema.prisma                  | 10 ++++-----
 src/lib/components/NavBar.svelte      |  4 ++--
 src/lib/components/ThemePicker.svelte |  6 +-----
 src/lib/index.ts                      |  4 ++++
 src/routes/+layout.svelte             |  5 +----
 src/routes/timer/+page.svelte         | 31 ++++++++-------------------
 6 files changed, 22 insertions(+), 38 deletions(-)

diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 93949e7..3f5f598 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -1,18 +1,18 @@
 generator client {
-    provider      = "prisma-client-js"
+    provider = "prisma-client-js"
     binaryTargets = ["native", "rhel-openssl-1.0.x"]
 }
 
 datasource db {
   provider = "postgresql"
-  url      = env("DATABASE_URL")
+  url = env("DATABASE_URL")
 }
 
 model User {
-  id            Int @id @default(autoincrement())
+  id Int @id @default(autoincrement())
 
-  username      String @unique
-  passwordHash  String
+  username String @unique
+  passwordHash String
   userAuthToken String @unique
 
   createdAt DateTime @default(now())
diff --git a/src/lib/components/NavBar.svelte b/src/lib/components/NavBar.svelte
index e213761..be618a4 100644
--- a/src/lib/components/NavBar.svelte
+++ b/src/lib/components/NavBar.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
   import { enhance } from "$app/forms"
-  import type { User } from "$lib"
-  import ThemePicker, { type Theme } from "./ThemePicker.svelte"
+  import type { Theme, User } from "$lib"
+  import ThemePicker from "./ThemePicker.svelte"
 
   let { theme, user } = $props<{ theme: Theme; user: User }>()
 
diff --git a/src/lib/components/ThemePicker.svelte b/src/lib/components/ThemePicker.svelte
index 0aefcfb..2fd0d7c 100644
--- a/src/lib/components/ThemePicker.svelte
+++ b/src/lib/components/ThemePicker.svelte
@@ -1,10 +1,6 @@
-<script lang="ts" context="module">
-  export const themes = ["light", "dark"] as const
-  export type Theme = "light" | "dark"
-</script>
-
 <script lang="ts">
   import { browser } from "$app/environment"
+  import { themes, type Theme } from "$lib"
 
   let { theme } = $props<{ theme: Theme }>()
 
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 1ad9820..e9046a7 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -1,3 +1,7 @@
 export type User = {
   username: string
 }
+
+export const themes = ["light", "dark"] as const
+
+export type Theme = "light" | "dark"
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index f2055c1..2aec0db 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,11 +1,8 @@
 <script lang="ts">
   import NavBar from "$lib/components/NavBar.svelte"
-
+  import type { Theme, User } from "$lib"
   import "../app.css"
 
-  import type { Theme } from "$lib/components/ThemePicker.svelte"
-  import type { User } from "$lib"
-
   let { data } = $props()
 
   let user = $state(data.user as User)
diff --git a/src/routes/timer/+page.svelte b/src/routes/timer/+page.svelte
index 117d796..f6124e4 100644
--- a/src/routes/timer/+page.svelte
+++ b/src/routes/timer/+page.svelte
@@ -3,8 +3,8 @@
   import { writable } from "svelte/store"
   import type { Writable } from "svelte/store"
 
-  const MINI_BREAK_DURATION = 20 * 60 * 1000 // 20 minutes
-  const MINI_BREAK_INTERVAL = 20 * 1000 // 20 seconds
+  const BREAK_INTERVAL = 20 * 60 * 1000 // 20 minutes
+  const MINI_BREAK_DURATION = 20 * 1000 // 20 seconds
   const LONG_BREAK_DURATION = 5 * 60 * 1000 // 5 minutes
 
   let timer: number | null = null
@@ -35,7 +35,7 @@
 
   const state: Writable<string> = writable("Ready")
   const timeLeftDisplay: Writable<string> = writable("")
-  const timeLeft: Writable<number> = writable(MINI_BREAK_DURATION)
+  const timeLeft: Writable<number> = writable(BREAK_INTERVAL)
 
   const startTimer = () => {
     if (timer) clearInterval(timer)
@@ -47,10 +47,10 @@
           if ($state !== "Ready") {
             state.set("Ready")
             miniBreakCount++
-            timeLeftDisplay.set(formatTime(MINI_BREAK_DURATION))
+            timeLeftDisplay.set(formatTime(BREAK_INTERVAL))
             showNotification("Ready", { body: "Continue working!" })
             playSound()
-            return MINI_BREAK_DURATION
+            return BREAK_INTERVAL
           }
           if (miniBreakCount === 3) {
             state.set("Long Break")
@@ -63,12 +63,12 @@
             return LONG_BREAK_DURATION
           } else {
             state.set("Mini Break")
-            timeLeftDisplay.set(formatTime(MINI_BREAK_INTERVAL))
+            timeLeftDisplay.set(formatTime(MINI_BREAK_DURATION))
             showNotification("Mini Break", {
               body: "Take a 20-second break now!",
             })
             playSound()
-            return MINI_BREAK_INTERVAL
+            return MINI_BREAK_DURATION
           }
         }
         timeLeftDisplay.set(formatTime(newTimeLeft))
@@ -88,31 +88,18 @@
   })
 
   const skipBreak = () => {
-    // if (timer) clearInterval(timer);
     if ($state === "Ready") {
       return
     }
     state.set("Ready")
-    timeLeft.set(MINI_BREAK_DURATION)
-    timeLeftDisplay.set(formatTime(MINI_BREAK_DURATION))
-    // startTimer();
-  }
-
-  const postponeBreak = () => {
-    // if (timer) clearInterval(timer);
-    state.set("Ready")
-    // setTimeout(startTimer, 2 * MINI_BREAK_INTERVAL); // Postpone for 2 mini-break intervals
-    timeLeft.set(MINI_BREAK_DURATION) // Corrected line
-    timeLeftDisplay.set(formatTime(MINI_BREAK_DURATION)) // Use MINI_BREAK_INTERVAL directly
+    timeLeft.set(BREAK_INTERVAL)
+    timeLeftDisplay.set(formatTime(BREAK_INTERVAL))
   }
 
   function formatTime(milliseconds: number) {
     const totalSeconds = Math.floor(milliseconds / 1000)
     const minutes = Math.floor(totalSeconds / 60)
     const seconds = totalSeconds % 60
-    console.log(
-      `${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`
-    )
 
     return `${String(minutes).padStart(2, "0")}:${String(seconds).padStart(2, "0")}`
   }