Merge pull request 'feat: time spent at the station' (#6) from time-spent into main

Reviewed-on: alekswilc/simrail-logs#6

src/http/api.ts

@@ -4,6 +4,7 @@ import { fileURLToPath } from 'node:url';
 import path from 'node:path';
 import dayjs from 'dayjs';
 import { PlayerUtil } from '../util/PlayerUtil.js';
+import { msToTime } from '../util/time.js';
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
@@ -22,7 +23,8 @@ export class ApiModule {
                 .limit(30)
             res.render('index.ejs', {
                 records,
-                dayjs
+                dayjs,
+                msToTime
             });
         })
 
@@ -62,7 +64,8 @@ export class ApiModule {
             res.render('search.ejs', {
                 records,
                 dayjs,
-                q: req.query.q
+                q: req.query.q,
+                msToTime
             });
         })
 
@@ -74,7 +77,8 @@ export class ApiModule {
             res.render('details.ejs', {
                 record,
                 dayjs,
-                player
+                player,
+                msToTime
             });
         })
 

src/http/views/details.ejs

@@ -5,10 +5,12 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>simrail.alekswilc.dev</title>
-    <meta name="description" content="<%= record.stationName %> | <%= record.userUsername %> | <%= dayjs(record.leftDate).format('hh:mm DD/MM/YYYY') %>">
+    <meta name="description"
+        content="<%= record.stationName %> | <%= record.userUsername %> | <%= dayjs(record.leftDate).format('hh:mm DD/MM/YYYY') %>">
     <meta property="og:title" content="Simrail Log">
     <meta property="og:url" content="https://simrail.alekswilc.dev/details/<%= record.id %>/">
-    <meta property="og:description" content="<%= record.stationName %> | <%= record.userUsername %> | <%= dayjs(record.leftDate).format('hh:mm DD/MM/YYYY') %>"">
+    <meta property="og:description"
+        content="<%= record.stationName %> | <%= record.userUsername %> | <%= dayjs(record.leftDate).format('hh:mm DD/MM/YYYY') %>"">
     <meta property=" og:type" content="website">
     <meta property="og:image" content="<%= record.userAvatar %>" />
     <meta name="twitter:card" content="summary_large_image">
@@ -57,12 +59,12 @@
         </p>
         <p>Serwer: <%= record.server.toUpperCase() %>
         </p>
-        <p>Data wejścia: <%= record.joinedDate ? dayjs(record.joinedDate).format('HH:mm DD/MM/YYYY') : '--:-- --/--/--' %> (<%=
+        <p>Data wejścia: <%= record.joinedDate ? dayjs(record.joinedDate).format('HH:mm DD/MM/YYYY') : '--:-- --/--/--'
-            record.joinedDate ? dayjs(record.joinedDate).fromNow() : '--' %>)</p>
+                %> (<%= record.joinedDate ? dayjs(record.joinedDate).fromNow() : '--' %>)</p>
         <p>Data wyjścia: <%= dayjs(record.leftDate).format('HH:mm DD/MM/YYYY') %> (<%= dayjs(record.leftDate).fromNow()
                     %>)</p>
-
+        <p>Spędzony czas: <%= record.joinedDate ? msToTime(record.leftDate - record.joinedDate) : '--' %>
-
+        </p>
 
         <br />
         <code class="clickable" style="white-space: pre-line" onclick="copydata()" id="data">;station: <%= record.stationName %>

src/http/views/index.ejs

@@ -51,10 +51,14 @@
                             <%= dayjs(record.leftDate).format('HH:mm DD/MM/YYYY') %>
                         </p>
                     </summary>
-                    <p>Data dołączenia: <%= record.joinedDate ? dayjs(record.joinedDate).format('HH:mm DD/MM/YYYY') : '--:-- --/--/--' %> (<%=
+                    <p>Data dołączenia: <%= record.joinedDate ? dayjs(record.joinedDate).format('HH:mm DD/MM/YYYY')
-                        record.joinedDate ? dayjs(record.joinedDate).fromNow() : '--' %>)</p>
+                            : '--:-- --/--/--' %> (<%= record.joinedDate ? dayjs(record.joinedDate).fromNow() : '--' %>)
+                    </p>
                     <p>Data wyjścia: <%= dayjs(record.leftDate).format('HH:mm DD/MM/YYYY') %> (<%=
                                 dayjs(record.leftDate).fromNow() %>)</p>
+                    <p>Spędzony czas: <%= record.joinedDate ? msToTime(record.leftDate - record.joinedDate) : '--' %>
+                    </p>
+
                     <a href="/details/<%= record.id %>">
                         <button>Więcej</button>
                     </a>

src/http/views/search.ejs

@@ -53,10 +53,14 @@
                             <%= dayjs(record.leftDate).format('HH:mm DD/MM/YYYY') %>
                         </p>
                     </summary>
-                    <p>Data dołączenia: <%= record.joinedDate ? dayjs(record.joinedDate).format('HH:mm DD/MM/YYYY') : '--:-- --/--/--' %> (<%=
+                    <p>Data dołączenia: <%= record.joinedDate ? dayjs(record.joinedDate).format('HH:mm DD/MM/YYYY')
-                        record.joinedDate ? dayjs(record.joinedDate).fromNow() : '--' %>)</p>
+                            : '--:-- --/--/--' %> (<%= record.joinedDate ? dayjs(record.joinedDate).fromNow() : '--' %>)
+                    </p>
                     <p>Data wyjścia: <%= dayjs(record.leftDate).format('HH:mm DD/MM/YYYY') %> (<%=
                                 dayjs(record.leftDate).fromNow() %>)</p>
+                    <p>Spędzony czas: <%= record.joinedDate ? msToTime(record.leftDate - record.joinedDate) : '--' %>
+                    </p>
+
                     <a href="/details/<%= record.id %>">
                         <button>Więcej</button>
                     </a>

src/index.ts

@@ -1,5 +1,5 @@
 import { createClient, RedisClientType } from 'redis';
-import './util/dayjs.js';
+import './util/time.js';
 import { SimrailClient, SimrailClientEvents } from './util/SimrailClient.js';
 import dayjs from 'dayjs';
 import { StationsModule } from './modules/stations.js';

src/util/dayjs.ts

@@ -1,6 +0,0 @@
-import dayjs from 'dayjs';
-import relativeTime from 'dayjs/plugin/relativeTime.js';
-import pl from 'dayjs/locale/pl.js';
-
-dayjs.extend(relativeTime);
-dayjs.locale(pl)