Merge pull request #31 from Jalle19/tweaks

Power factor formatting, fix navigating directly to /configuration
Jalle19 · Oct 21, 2023 · a3cfecb · a3cfecb
2 parents 212ad95 + 5d7a84c
commit a3cfecb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/http/server.ts b/src/http/server.ts
@@ -4,6 +4,7 @@ import { IncomingMessage, RequestListener, ServerResponse } from 'http'
 import { promises as fsPromisified } from 'fs'
 
 const basePath = __dirname + '/../../webif/build'
+const webRoutes = ['/', '/configuration']
 
 const mimeTypes = new Map<string, string>([
   ['.html', 'text/html'],
@@ -36,9 +37,9 @@ const resolveFilePath = (reqUrl: string | undefined): string => {
     reqUrl = reqUrl?.substring(0, reqUrl?.indexOf('?'))
   }
 
-  // "Convert" to file path
+  // "Convert" routes to file path
   let filePath
-  if (!reqUrl || reqUrl === '/') {
+  if (!reqUrl || webRoutes.includes(reqUrl)) {
     filePath = '/index.html'
   } else {
     filePath = reqUrl

diff --git a/webif/src/routes/MainsPower.svelte b/webif/src/routes/MainsPower.svelte
@@ -1,5 +1,6 @@
 <script>
   import { mainSensorDataStore} from '../lib/stores'
+  import { formatPf } from '../lib/format'
 </script>
 
 <div class="mains-power-cards">
@@ -11,7 +12,7 @@
         <span>{data.apparentPower}VA</span>
       {/if}
       {#if data.powerFactor }
-        <span>pf {data.powerFactor}</span>
+        <span>pf {formatPf(data.powerFactor)}</span>
       {/if}
     </div>
   {/each}