From ccf06386c6b153fe3c420e9200f481dc085e064a Mon Sep 17 00:00:00 2001
From: ivarlovlie <git@ivarlovlie.no>
Date: Thu, 2 Jun 2022 23:02:47 +0200
Subject: refactor: Rename accounts to portal

---
 apps/frontpage/package.json                     | 47 +++++++++++++------------
 apps/projects/src/app/pages/ui-workbench.svelte |  5 ++-
 apps/projects/src/package.json                  |  2 +-
 apps/web-shared/package.json                    |  2 +-
 apps/web-shared/src/components/stopwatch.svelte | 30 +++++++++++++---
 apps/web-shared/src/lib/helpers.ts              | 16 ---------
 6 files changed, 54 insertions(+), 48 deletions(-)

(limited to 'apps')

diff --git a/apps/frontpage/package.json b/apps/frontpage/package.json
index 11f90ae..69ccf89 100644
--- a/apps/frontpage/package.json
+++ b/apps/frontpage/package.json
@@ -1,25 +1,26 @@
 {
-	"name": "frontpage",
-	"version": "0.0.1",
-	"scripts": {
-		"dev": "svelte-kit dev",
-		"build": "svelte-kit build",
-		"package": "svelte-kit package",
-		"preview": "svelte-kit preview",
-		"prepare": "svelte-kit sync",
-		"test": "playwright test",
-		"check": "svelte-check --tsconfig ./tsconfig.json",
-		"check:watch": "svelte-check --tsconfig ./tsconfig.json --watch"
-	},
-	"devDependencies": {
-		"@playwright/test": "^1.21.0",
-		"@sveltejs/adapter-static": "1.0.0-next.34",
-		"@sveltejs/kit": "next",
-		"svelte": "^3.44.0",
-		"svelte-check": "^2.2.6",
-		"svelte-preprocess": "^4.10.1",
-		"tslib": "^2.3.1",
-		"typescript": "~4.6.2"
-	},
-	"type": "module"
+  "name": "greatoffice-frontpage",
+  "version": "0.0.1",
+  "private": true,
+  "scripts": {
+    "dev": "svelte-kit dev",
+    "build": "svelte-kit build",
+    "package": "svelte-kit package",
+    "preview": "svelte-kit preview",
+    "prepare": "svelte-kit sync",
+    "test": "playwright test",
+    "check": "svelte-check --tsconfig ./tsconfig.json",
+    "check:watch": "svelte-check --tsconfig ./tsconfig.json --watch"
+  },
+  "devDependencies": {
+    "@playwright/test": "^1.21.0",
+    "@sveltejs/adapter-static": "1.0.0-next.34",
+    "@sveltejs/kit": "next",
+    "svelte": "^3.44.0",
+    "svelte-check": "^2.2.6",
+    "svelte-preprocess": "^4.10.1",
+    "tslib": "^2.3.1",
+    "typescript": "~4.6.2"
+  },
+  "type": "module"
 }
diff --git a/apps/projects/src/app/pages/ui-workbench.svelte b/apps/projects/src/app/pages/ui-workbench.svelte
index 5e92c9d..af1bf4e 100644
--- a/apps/projects/src/app/pages/ui-workbench.svelte
+++ b/apps/projects/src/app/pages/ui-workbench.svelte
@@ -1,7 +1,6 @@
 <script>
 	import Dropdown from "$shared/components/dropdown.svelte";
 	import {generate_random_hex_color} from "$shared/lib/colors";
-	import {uuid_v4} from "$shared/lib/helpers";
 
 	let entries = [];
 
@@ -9,7 +8,7 @@
 
 	for (let i = 1; i < 20; i++) {
 		entries.push({
-			id: uuid_v4(),
+			id: crypto.randomUUID(),
 			name: "Option " + i,
 			selected: false,
 			color: generate_random_hex_color(true)
@@ -18,7 +17,7 @@
 
 	function on_create({detail}) {
 		const copy = entries;
-		const entry = {id: uuid_v4(), name: detail.name};
+		const entry = {id: crypto.randomUUID(), name: detail.name};
 		copy.push(entry);
 		entries = copy;
 		console.log("Created", entry);
diff --git a/apps/projects/src/package.json b/apps/projects/src/package.json
index 8ff516d..b3fee26 100644
--- a/apps/projects/src/package.json
+++ b/apps/projects/src/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "time-tracker-public",
+  "name": "greatoffice-projects",
   "version": "0.0.1",
   "private": "true",
   "scripts": {
diff --git a/apps/web-shared/package.json b/apps/web-shared/package.json
index b7b83d5..e30d0ba 100644
--- a/apps/web-shared/package.json
+++ b/apps/web-shared/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "time-tracker-shared",
+  "name": "greatoffice-web-shared",
   "version": "0.0.1",
   "private": "true",
   "devDependencies": {
diff --git a/apps/web-shared/src/components/stopwatch.svelte b/apps/web-shared/src/components/stopwatch.svelte
index 8287e31..3ed0d0e 100644
--- a/apps/web-shared/src/components/stopwatch.svelte
+++ b/apps/web-shared/src/components/stopwatch.svelte
@@ -1,8 +1,8 @@
 <script lang="ts">
-    import {writable_persistent} from "$shared/lib/persistent-store";
     import Button from "$shared/components/button.svelte";
     import {Textarea} from "$shared/components/form";
     import {StorageKeys} from "$shared/lib/configuration";
+    import {StoreType, writable_persistent} from "$shared/lib/persistent-store";
     import {Temporal} from "@js-temporal/polyfill";
     import {createEventDispatcher, onMount} from "svelte";
 
@@ -11,11 +11,15 @@
             hours: 0,
             minutes: 0,
             seconds: 0,
-            startTime: null as Temporal.PlainTime,
+            startTime: null as Temporal.PlainDateTime,
+            lastStep: null as Temporal.PlainDateTime,
             isRunning: false,
             intervalId: 0,
             note: "",
         },
+        options: {
+            store: StoreType.LOCAL
+        },
         name: StorageKeys.stopwatch,
     });
 
@@ -30,10 +34,27 @@
     }
 
     onMount(() => {
+        start_if_running();
+    });
+
+    function start_if_running() {
         if ($state.isRunning) {
+            if (Temporal.PlainDateTime.compare($state.lastStep, Temporal.Now.plainDateTimeISO()) == -1) {
+                const duration = Temporal.Now.plainDateTimeISO().since($state.lastStep, {smallestUnit: "second"});
+                console.log("lastStep",$state.lastStep.toString());
+                console.log("duration", duration.toString());
+                console.log(duration.seconds);
+                // for (let i = 0; i < steps; i++) {
+                //     step();
+                // }
+            }
             clearInterval($state.intervalId);
             $state.intervalId = setInterval(step, 1000);
         }
+    }
+
+    window.addEventListener("focus", () => {
+        start_if_running();
     });
 
     const dispatch = createEventDispatcher();
@@ -52,7 +73,8 @@
             $state.seconds = 0;
         }
 
-        if (!$state.startTime) $state.startTime = Temporal.Now.plainTimeISO();
+        if (!$state.startTime) $state.startTime = Temporal.Now.plainDateTimeISO();
+        $state.lastStep = Temporal.Now.plainDateTimeISO();
     }
 
     function reset() {
@@ -108,7 +130,7 @@
 
     function on_create_entry() {
         if (!$state.startTime) return;
-        const plainStartTime = Temporal.PlainTime.from($state.startTime);
+        const plainStartTime = Temporal.PlainDateTime.from($state.startTime);
         dispatch("create", {
             from: plainStartTime,
             to: plainStartTime.add({hours: $state.hours, minutes: $state.minutes, seconds: $state.seconds}),
diff --git a/apps/web-shared/src/lib/helpers.ts b/apps/web-shared/src/lib/helpers.ts
index 650bccf..ed526af 100644
--- a/apps/web-shared/src/lib/helpers.ts
+++ b/apps/web-shared/src/lib/helpers.ts
@@ -207,11 +207,6 @@ export function get_selected_options(domElement: HTMLSelectElement): Array<strin
     return ret;
 }
 
-export function uuid_v4(): string {
-    // @ts-ignore
-    return ([1e7] + -1e3 + -4e3 + -8e3 + -1e11).replace(/[018]/g, c => (c ^ crypto.getRandomValues(new Uint8Array(1))[0] & 15 >> c / 4).toString(16));
-}
-
 export function random_string(length: number): string {
     if (!length) {
         throw new Error("length is undefined");
@@ -343,12 +338,6 @@ export function get_style_string(rules: CSSRuleList) {
     return styleString;
 }
 
-export function get_local_time_zone_date(date: Date): Date {
-    const timeOffsetInMS = new Date().getTimezoneOffset() * 60000;
-    date.setTime(date.getTime() - timeOffsetInMS);
-    return date;
-}
-
 export function parse_iso_local(s: string) {
     const b = s.split(/\D/);
     //@ts-ignore
@@ -410,11 +399,6 @@ export function resolve_references(json: any) {
     return json;
 }
 
-export function to_readable_date_string(date: Date, locale = "nb-NO"): string {
-    date.setMinutes(date.getMinutes() - date.getTimezoneOffset());
-    return date.toLocaleString(locale);
-}
-
 export function get_random_int(min: number, max: number): number {
     min = Math.ceil(min);
     max = Math.floor(max);
-- 
cgit v1.3