Merge pull request #200 from sh4rkman/dev

Dev
sh4rkman · Sep 23, 2024 · 3c4136e · 3c4136e
2 parents 744aff2 + a86cbeb
commit 3c4136e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,14 @@
+# <img src="https://img.shields.io/badge/-minor%20release-cd6f68?style=for-the-badge">  **31.0.1** *(2024-09-23)*
+
+<img src="https://img.shields.io/badge/-%fix%20-orange"> Fixed faulty 'pointer' cursor when hovering settings row without any text
+
+<img src="https://img.shields.io/badge/-%fix%20-orange"> Fixed Skorpo basemap
+
+<img src="https://img.shields.io/badge/-%dev%20-orange"> Fixed environnement variables not correctly loaded
+
+</br></br><!-- CHANGELOG SPLIT MARKER -->
+
+
 # <img src="https://img.shields.io/badge/-major%20release-b22222?style=for-the-badge">  **31.0.0** *(2024-09-23)*
 
 <img src="https://img.shields.io/badge/-new-green"> Single Image Maps : maps are now displayed with a single image file, instead of hundreds of tiles. Add a smoother usage once fully loaded at the cost of higher bandwidth/initial loading
@@ -15,6 +26,7 @@
 <img src="https://img.shields.io/badge/-%20dev%20-orange"> Removed service worker caching for now to see if it fixes caching problems
 
 
+</br></br><!-- CHANGELOG SPLIT MARKER -->
 
 # <img src="https://img.shields.io/badge/-major%20release-b22222?style=for-the-badge">  **30.0.0** *(2024-09-13)*
 
@@ -33,6 +45,8 @@
 
 </br></br><!-- CHANGELOG SPLIT MARKER -->
 
+
+
 # <img src="https://img.shields.io/badge/-minor%20release-cd6f68?style=for-the-badge">  **29.0.3** *(2024-09-06)*
 
 <img src="https://img.shields.io/badge/-%20improv%20-orange"> API calls now send current squadcalc version

diff --git a/config/webpack.config.js b/config/webpack.config.js
@@ -12,6 +12,8 @@ const workbox = require("workbox-webpack-plugin");
 
 module.exports = (env) => {
 
+  require('dotenv').config();
+
   // If you want webpack to add a robot.txt indexing, create a .env file with INDEX=TRUE
   const isIndexed = process.env.INDEX && process.env.INDEX.toLowerCase() === 'true';
   const robotstxtPolicy = isIndexed 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "squadcalc",
-  "version": "31.0.0",
+  "version": "31.0.1",
   "description": "A Complete Mortar Calculator for Squad",
   "author": "Maxime 'sharkman' Boussard",
   "license": "MIT",

diff --git a/public/maps/skorpo/basemap.webp b/public/maps/skorpo/basemap.webp
diff --git a/src/index.html b/src/index.html
@@ -31,7 +31,7 @@
         if (navigator.appName.indexOf("Internet Explorer") != -1 || navigator.userAgent.match(/Trident.*rv[ :]*11\./)) {
             window.location = "https://choosebrowser.com/";
         }
-        
+
         if ("serviceWorker" in navigator) {
             // Unregister the service worker
             navigator.serviceWorker.getRegistrations().then((registrations) => {
@@ -184,7 +184,7 @@ <h2 data-i18n="settings:SettingsTitle">Settings</h2>
                             </span>
                           </label>
                     </td>
-                    <td data-i18n="settings:showGrid" class="toggleCheckbox"></td>
+                    <td><span data-i18n="settings:showGrid" class="toggleCheckbox"></span></td>
                 </tr>
 
                 <tr id="keypadUnderCursorSettingRow">
@@ -217,7 +217,7 @@ <h2 data-i18n="settings:SettingsTitle">Settings</h2>
                             </span>
                           </label>
                     </td>
-                    <td data-i18n="settings:showMaxRange" class="toggleCheckbox"></td>
+                    <td><span data-i18n="settings:showMaxRange" class="toggleCheckbox"></span></td>
                 </tr>
 
                 <tr class="cursorChoiceSettings">
@@ -231,7 +231,7 @@ <h2 data-i18n="settings:SettingsTitle">Settings</h2>
                             </span>
                           </label>
                     </td>
-                    <td data-i18n="settings:useClassicCursor" class="toggleCheckbox"></td>
+                    <td><span data-i18n="settings:useClassicCursor" class="toggleCheckbox"></span></td>
                 </tr>
 
                 <tr class="mapAnimationSettings">
@@ -308,7 +308,7 @@ <h2 data-i18n="settings:SettingsTitle">Settings</h2>
                             </span>
                           </label>
                     </td>
-                    <td data-i18n="settings:showBearing" class="toggleCheckbox"></td>
+                    <td><span data-i18n="settings:showBearing" class="toggleCheckbox"></span></td>
                 </tr>
 
                 <tr>
@@ -322,7 +322,7 @@ <h2 data-i18n="settings:SettingsTitle">Settings</h2>
                             </span>
                           </label>
                     </td>
-                    <td data-i18n="settings:showDistance" class="toggleCheckbox"></td>
+                    <td><span data-i18n="settings:showDistance" class="toggleCheckbox"></span></td>
                 </tr>
 
                 <tr>
@@ -336,8 +336,9 @@ <h2 data-i18n="settings:SettingsTitle">Settings</h2>
                             </span>
                           </label>
                     </td>
-                    <td data-i18n="settings:showTimeOfFlight" class="toggleCheckbox"></td>
+                    <td><span data-i18n="settings:showTimeOfFlight" class="toggleCheckbox"></span></td>
                 </tr>
+
                 <tr>
                     <td>
                         <label class="mcui-checkbox">
@@ -349,7 +350,7 @@ <h2 data-i18n="settings:SettingsTitle">Settings</h2>
                             </span>
                           </label>
                     </td>
-                    <td data-i18n="settings:showHeightDiff" class="toggleCheckbox"></td>
+                    <td><span data-i18n="settings:showHeightDiff" class="toggleCheckbox"></span></td>
                 </tr>
             </tbody>
         </table>