fix: timetable proper day used

MesseBasseProduction · Jul 14, 2024 · f265e05 · f265e05
1 parent c00e4d7
commit f265e05
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 1,129 deletions.
diff --git a/assets/dist/MonDourdannais.bundle.js b/assets/dist/MonDourdannais.bundle.js
diff --git a/web/src/js/MonDourdannais.js b/web/src/js/MonDourdannais.js
@@ -98,7 +98,7 @@ class MonDourdannais {
       const promises = [];
       for (let i = 0; i < Utils.CCDH_CITIES.length; ++i) {
         promises.push(new Promise(resolveLocal => {
-          fetch(`./assets/json/citybounds/${Utils.CCDH_CITIES[i]}.json`).then(data => {
+          fetch(`/assets/json/citybounds/${Utils.CCDH_CITIES[i]}.json`).then(data => {
             data.json().then(jsonData => {
               this._cityBounds[Utils.CCDH_CITIES[i]] = jsonData;
               resolveLocal();
@@ -133,7 +133,7 @@ class MonDourdannais {
       const promises = [];
       for (let i = 0; i < Utils.CCDH_CITIES.length; ++i) {
         promises.push(new Promise(resolveLocal => {
-          fetch(`./assets/json/citymarkers/${Utils.CCDH_CITIES[i]}.json`).then(data => {
+          fetch(`/assets/json/citymarkers/${Utils.CCDH_CITIES[i]}.json`).then(data => {
             data.json().then(jsonData => {
               this._cityMarkers[Utils.CCDH_CITIES[i]] = jsonData.markers;
               resolveLocal();
@@ -178,7 +178,7 @@ class MonDourdannais {
 
   _fetchTransportationLines() {
     return new Promise(resolve => {
-      fetch(`./assets/json/transportation/transportation.json`).then(data => {
+      fetch(`/assets/json/transportation/transportation.json`).then(data => {
         data.json().then(jsonData => {
           this._transportationLines = jsonData;
           resolve();

diff --git a/web/src/js/Server.js b/web/src/js/Server.js
@@ -7,22 +7,22 @@ const version = '0.0.1';
 const port = 8020;
 const app = express();
 // Log
-console.log(`${(new Date()).toISOString()} | HomeMap v${version} | Starting server and proxy`);
+console.log(`${(new Date()).toISOString()} | MonDourdannais v${version} | Starting server and proxy`);
 // Ensure responses are compressed through this midleware
 app.use(compression({
   level: zlib.constants.Z_BEST_COMPRESSION,
 }));
 // url definitions
-app.use('/assets', express.static(path.join(__dirname, '../../assets'), { // Serve static files
+app.use('/assets', express.static(path.join(__dirname, '../../../assets'), { // Serve static files
   maxAge: '864000000' // 10 days caching for app assets
 }));
 // Serve main html at /
 app.get('/', (req, res) => {
-  console.log(`${(new Date()).toISOString()} | HomeMap v${version} | index.html page requested`);
-  res.sendFile(path.join(__dirname, '../../index.html'));  
+  console.log(`${(new Date()).toISOString()} | MonDourdannais v${version} | index.html page requested`);
+  res.sendFile(path.join(__dirname, '../../../index.html'));  
 });
 
 // Start server console
 app.listen(port, () => {
-  console.log(`${(new Date()).toISOString()} | HomeMap v${version} | Server started and listening on port ${port}`);
+  console.log(`${(new Date()).toISOString()} | MonDourdannais v${version} | Server started and listening on port ${port}`);
 });
diff --git a/web/src/js/map/MapFactory.js b/web/src/js/map/MapFactory.js
@@ -170,7 +170,7 @@ class MapFactory {
       minutes = `0${minutes}`;
     }
 
-    const dayOfWeek = now.getDay() - 1;
+    const dayOfWeek = (now.getDay() - 1 + 7) % 7;
     const openingTime = parseInt(`${timetable[dayOfWeek].open.h}${timetable[dayOfWeek].open.m}`);
     const closingTime = parseInt(`${timetable[dayOfWeek].close.h}${timetable[dayOfWeek].close.m}`);
     const currentTime = parseInt(`${hour}${minutes}`);
@@ -248,7 +248,7 @@ class MapFactory {
       dom.querySelector('#mark-state').appendChild(this.markerOpenedState(opts.timetable));
       // Now update day by day
       const now = new Date();
-      const dayOfWeek = now.getDay() - 1;
+      const dayOfWeek = (now.getDay() - 1 + 7) % 7;
       for (let i = 0; i < opts.timetable.length; ++i) {
         const dayDom = dom.querySelector('#timetable').children[i];
         if (opts.timetable[i].isOpen === true) {

diff --git a/web/src/js/utils/Utils.js b/web/src/js/utils/Utils.js
@@ -73,7 +73,7 @@ const precisionRound = (value, precision) => {
 
 const fetchModal = (url) => {
   return new Promise(resolve => {
-    fetch(`./assets/html/${url}.html`).then(data => {
+    fetch(`/assets/html/${url}.html`).then(data => {
       data.text().then(html => {
         resolve(document.createRange().createContextualFragment(html));
       });

diff --git a/windows/.gitignore b/windows/.gitignore
diff --git a/windows/CMakeLists.txt b/windows/CMakeLists.txt
diff --git a/windows/flutter/CMakeLists.txt b/windows/flutter/CMakeLists.txt
diff --git a/windows/flutter/generated_plugin_registrant.cc b/windows/flutter/generated_plugin_registrant.cc
diff --git a/windows/flutter/generated_plugin_registrant.h b/windows/flutter/generated_plugin_registrant.h
diff --git a/windows/flutter/generated_plugins.cmake b/windows/flutter/generated_plugins.cmake