Merge pull request #19 from apop880/dev

Merge changes for 0.2.3
apop880 · Feb 28, 2023 · 7cc30fb · 7cc30fb
2 parents 51afb7a + ae82156
commit 7cc30fb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/rootfs/run.sh b/rootfs/run.sh
@@ -4,7 +4,6 @@ password=$(bashio::services "mysql" "password")
 port=$(bashio::services "mysql" "port")
 username=$(bashio::services "mysql" "username")
 export DATABASE_URL="mysql://${username}:${password}@${host}:${port}/photodash?schema=public"
-export SUPERVISOR_URL="http://supervisor/core"
 npx prisma db push
 cd build/client
 ln -s /share share

diff --git a/rootfs/src/routes/(app)/[name]/clock.svelte b/rootfs/src/routes/(app)/[name]/clock.svelte
@@ -14,12 +14,16 @@
             timer = setInterval(
                 () => {
                     let dateObj = new Date();
-                    hours = dateObj.getHours();
+                    const h = dateObj.getHours();
                     minutes = dateObj.getMinutes();
                     if ($page.data.configuration?.clockFormat === "US") {
-                        amPm = hours < 12 ? "am" : "pm";
-                        if (amPm === "pm" && hours > 12) hours -= 12;
-                        else if (hours === 0) hours = 12;
+                        amPm = h < 12 ? "am" : "pm";
+                        if (amPm === "pm" && h > 12) hours = h - 12;
+                        else if (h === 0) hours = 12;
+                        else hours = h;
+                    }
+                    else if ($page.data.configuration?.clockFormat === "INTL") {
+                        hours = h;
                     }
                     date = dateObj.toLocaleDateString([], { weekday: 'long', month: 'long', day: 'numeric' });
                 }, 1000);
@@ -33,7 +37,7 @@
 
 <div class="clock">
     {#if date}
-    {#if amPm}{hours}{:else}{hours?.toString().padStart(2, '0')}{/if}:{minutes}{#if amPm}<span class="am-pm">{amPm}</span>{:else}<br />{/if}<br />
+    {#if amPm}{hours}{:else}{hours?.toString().padStart(2, '0')}{/if}:{minutes?.toString().padStart(2, '0')}{#if amPm}<span class="am-pm">{amPm}</span>{:else}<br />{/if}<br />
     <span class="date">{date}</span>
     {/if}
 </div>