Parcourir la source

remove altitude

marek il y a 1 mois
Parent
commit
2139cee96c
3 fichiers modifiés avec 12 ajouts et 88 suppressions
  1. 6 24
      templates/en/index.eta
  2. 0 2
      templates/sk/history/index.eta
  3. 6 62
      templates/sk/index.eta

+ 6 - 24
templates/en/index.eta

@@ -20,24 +20,6 @@
     </svg>
 ` %>
 
-<% const tempIcon = `
-    <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 4v10.54a4 4 0 1 1-4 0V4a2 2 0 0 1 4 0" />
-    </svg>
-` %>
-
-<% const pressureIcon = `
-    <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 14l4-4M3.34 19a10 10 0 1 1 17.32 0" />
-    </svg>
-` %>
-
-<% const humidityIcon = `
-    <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 22a7 7 0 0 0 7-7c0-2-1-3.9-3-5.5s-3.5-4-4-6.5c-.5 2.5-2 4.9-4 6.5S5 13 5 15a7 7 0 0 0 7 7" />
-    </svg>
-` %>
-
 <div id="mainStats">
     <% /* <div class="message error">
         <p>High temperature was detcted!</p>
@@ -49,9 +31,9 @@
         <div class="wrapper">
             <h2>indoor</h2>
             <div class="values indoor">
-                <p><a role="button" href="/en/history/indoorTemp"><%~ tempIcon %></a> <span id="indoorTemp"><%= it.data?.[0]?.indoorTemp / 100 %></span> °C</p>
-                <p><a role="button" href="/en/history/indoorPressure"><%~ pressureIcon %></a> <span id="indoorPressure"><%= it.data?.[0]?.indoorPressure / 100 %></span> hPa</p>
-                <p><a role="button" href="/en/history/indoorHumidity"><%~ humidityIcon %></a> <span id="indoorHumidity"><%= it.data?.[0]?.indoorHumidity / 100 %></span> %</p>
+                <p><a role="button" href="/en/history/indoorTemp"><%~ it.lang.icons.tempIcon() %></a> <span id="indoorTemp"><%= it.data?.[0]?.indoorTemp / 100 %></span> °C</p>
+                <p><a role="button" href="/en/history/indoorPressure"><%~ it.lang.icons.pressureIcon() %></a> <span id="indoorPressure"><%= it.data?.[0]?.indoorPressure / 100 %></span> hPa</p>
+                <p><a role="button" href="/en/history/indoorHumidity"><%~ it.lang.icons.humidityIcon() %></a> <span id="indoorHumidity"><%= it.data?.[0]?.indoorHumidity / 100 %></span> %</p>
             </div>
         </div>
 
@@ -59,9 +41,9 @@
             <h2>outdoor</h2>
             <div class="values outdoor">
                 <p><a role="button" href="/en/history/outdoorConnected" id="outdoorConnectedIcon"><%~ it.data?.[0]?.outdoorConnected ? tickIcon : xIcon %></a> <span id="outdoorConnectedText"><%= it.data?.[0]?.outdoorConnected ? `connected` : `disconnected` %></span></p>
-                <p><a role="button" href="/en/history/outdoorTemp"><%~ tempIcon %></a> <span id="outdoorTemp"><%= it.data?.[0]?.outdoorTemp / 100 %></span> °C</p>
-                <p><a role="button" href="/en/history/outdoorPressure"><%~ pressureIcon %></a> <span id="outdoorPressure"><%= it.data?.[0]?.outdoorPressure / 100 %></span> hPa</p>
-                <p><a role="button" href="/en/history/outdoorHumidity"><%~ humidityIcon %></a> <span id="outdoorHumidity"><%= it.data?.[0]?.outdoorHumidity / 100 %></span> %</p>
+                <p><a role="button" href="/en/history/outdoorTemp"><%~ it.lang.icons.tempIcon() %></a> <span id="outdoorTemp"><%= it.data?.[0]?.outdoorTemp / 100 %></span> °C</p>
+                <p><a role="button" href="/en/history/outdoorPressure"><%~ it.lang.icons.pressureIcon() %></a> <span id="outdoorPressure"><%= it.data?.[0]?.outdoorPressure / 100 %></span> hPa</p>
+                <p><a role="button" href="/en/history/outdoorHumidity"><%~ it.lang.icons.humidityIcon() %></a> <span id="outdoorHumidity"><%= it.data?.[0]?.outdoorHumidity / 100 %></span> %</p>
             </div>
         </div>
     </div>

+ 0 - 2
templates/sk/history/index.eta

@@ -19,7 +19,6 @@
     <a role="button" href="/history/indoorTemp"><%~ it?.lang?.history.properties?.indoorTemp() %></a>
     <a role="button" href="/history/indoorPressure"><%~ it?.lang?.history.properties?.indoorPressure() %></a>
     <a role="button" href="/history/indoorHumidity"><%~ it?.lang?.history.properties?.indoorHumidity() %></a>
-    <a role="button" href="/history/indoorAltitude"><%~ it?.lang?.history.properties?.indoorAltitude() %></a>
 </div>
 
 <h3>vonkajšie</h3>
@@ -29,5 +28,4 @@
     <a role="button" href="/history/outdoorTemp"><%~ it?.lang?.history.properties?.outdoorTemp() %></a>
     <a role="button" href="/history/outdoorPressure"><%~ it?.lang?.history.properties?.outdoorPressure() %></a>
     <a role="button" href="/history/outdoorHumidity"><%~ it?.lang?.history.properties?.outdoorHumidity() %></a>
-    <a role="button" href="/history/outdoorAltitude"><%~ it?.lang?.history.properties?.outdoorAltitude() %></a>
 </div>

+ 6 - 62
templates/sk/index.eta

@@ -20,33 +20,6 @@
     </svg>
 ` %>
 
-<% const tempIcon = `
-    <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M14 4v10.54a4 4 0 1 1-4 0V4a2 2 0 0 1 4 0" />
-    </svg>
-` %>
-
-<% const pressureIcon = `
-    <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m12 14l4-4M3.34 19a10 10 0 1 1 17.32 0" />
-    </svg>
-` %>
-
-<% const humidityIcon = `
-    <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-        <path fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12 22a7 7 0 0 0 7-7c0-2-1-3.9-3-5.5s-3.5-4-4-6.5c-.5 2.5-2 4.9-4 6.5S5 13 5 15a7 7 0 0 0 7 7" />
-    </svg>
-` %>
-
-<% const altitudeIcon = `
-    <svg class="icon" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
-        <g fill="none" stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2">
-            <circle cx="12" cy="12" r="10" />
-            <path d="m16 12l-4-4l-4 4m4 4V8" />
-        </g>
-    </svg>
-` %>
-
 <div id="mainStats">
     <% /* <div class="message error">
         <p><%~ tempIcon %> Bola zistená vysoká vnútorná teplota!</p>
@@ -58,10 +31,9 @@
         <div class="wrapper">
             <h2>vnútorné</h2>
             <div class="values indoor">
-                <p><a role="button" href="/history/indoorTemp"><%~ tempIcon %></a> <span id="indoorTemp"><%= it.data?.[0]?.indoorTemp / 100 %></span> °C</p>
-                <p><a role="button" href="/history/indoorPressure"><%~ pressureIcon %></a> <span id="indoorPressure"><%= it.data?.[0]?.indoorPressure / 100 %></span> hPa</p>
-                <p><a role="button" href="/history/indoorHumidity"><%~ humidityIcon %></a> <span id="indoorHumidity"><%= it.data?.[0]?.indoorHumidity / 100 %></span> %</p>
-                <p><a role="button" href="/history/indoorAltitude"><%~ altitudeIcon %></a> <span id="indoorAltitude"><%= it.data?.[0]?.indoorAltitude / 100 %></span> m</p>
+                <p><a role="button" href="/history/indoorTemp"><%~ it.lang.icons.tempIcon() %></a> <span id="indoorTemp"><%= it.data?.[0]?.indoorTemp / 100 %></span> °C</p>
+                <p><a role="button" href="/history/indoorPressure"><%~ it.lang.icons.pressureIcon() %></a> <span id="indoorPressure"><%= it.data?.[0]?.indoorPressure / 100 %></span> hPa</p>
+                <p><a role="button" href="/history/indoorHumidity"><%~ it.lang.icons.humidityIcon() %></a> <span id="indoorHumidity"><%= it.data?.[0]?.indoorHumidity / 100 %></span> %</p>
             </div>
         </div>
 
@@ -69,10 +41,9 @@
             <h2>vonkajšie</h2>
             <div class="values outdoor">
                 <p><a role="button" href="/history/outdoorConnected" id="outdoorConnectedIcon"><%~ it.data?.[0]?.outdoorConnected ? tickIcon : xIcon %></a> <span id="outdoorConnectedText"><%= it.data?.[0]?.outdoorConnected ? `pripojené` : `odpojené` %></span></p>
-                <p><a role="button" href="/history/outdoorTemp"><%~ tempIcon %></a> <span id="outdoorTemp"><%= it.data?.[0]?.outdoorTemp / 100 %></span> °C</p>
-                <p><a role="button" href="/history/outdoorPressure"><%~ pressureIcon %></a> <span id="outdoorPressure"><%= it.data?.[0]?.outdoorPressure / 100 %></span> hPa</p>
-                <p><a role="button" href="/history/outdoorHumidity"><%~ humidityIcon %></a> <span id="outdoorHumidity"><%= it.data?.[0]?.outdoorHumidity / 100 %></span> %</p>
-                <p><a role="button" href="/history/outdoorAltitude"><%~ altitudeIcon %></a> <span id="outdoorAltitude"><%= it.data?.[0]?.outdoorAltitude / 100 %></span> m</p>
+                <p><a role="button" href="/history/outdoorTemp"><%~ it.lang.icons.tempIcon() %></a> <span id="outdoorTemp"><%= it.data?.[0]?.outdoorTemp / 100 %></span> °C</p>
+                <p><a role="button" href="/history/outdoorPressure"><%~ it.lang.icons.pressureIcon() %></a> <span id="outdoorPressure"><%= it.data?.[0]?.outdoorPressure / 100 %></span> hPa</p>
+                <p><a role="button" href="/history/outdoorHumidity"><%~ it.lang.icons.humidityIcon() %></a> <span id="outdoorHumidity"><%= it.data?.[0]?.outdoorHumidity / 100 %></span> %</p>
             </div>
         </div>
     </div>
@@ -86,7 +57,6 @@
         const indoorTemp = document.querySelector(`#indoorTemp`)
         const indoorPressure = document.querySelector(`#indoorPressure`)
         const indoorHumidity = document.querySelector(`#indoorHumidity`)
-        const indoorAltitude = document.querySelector(`#indoorAltitude`)
 
         const outdoorConnectedIcon = document.querySelector(`#outdoorConnectedIcon`)
         const outdoorConnectedText = document.querySelector(`#outdoorConnectedText`)
@@ -94,12 +64,10 @@
         const outdoorTemp = document.querySelector(`#outdoorTemp`)
         const outdoorPressure = document.querySelector(`#outdoorPressure`)
         const outdoorHumidity = document.querySelector(`#outdoorHumidity`)
-        const outdoorAltitude = document.querySelector(`#outdoorAltitude`)
 
         indoorTemp.textContent = data?.indoorTemp / 100
         indoorPressure.textContent = data?.indoorPressure / 100
         indoorHumidity.textContent = data?.indoorHumidity / 100
-        indoorAltitude.textContent = data?.indoorAltitude / 100
 
         const tickIcon = `<%~ tickIcon %>`
 
@@ -111,29 +79,5 @@
         outdoorTemp.textContent = data?.outdoorTemp / 100
         outdoorPressure.textContent = data?.outdoorPressure / 100
         outdoorHumidity.textContent = data?.outdoorHumidity / 100
-        outdoorAltitude.textContent = data?.outdoorAltitude / 100
     }, 10000)
 </script>
-
-<% /* <h3>dáta</h3>
-
-<% if (it.data?.length) { %>
-    <div>
-        <table>
-            <tr>
-                <th>čas</th>
-                <th>vnútorné</th>
-                <th>vonkajšie</th>
-            </tr>
-            <% for (const item of it.data) { %>
-                <tr>
-                    <td><%= item.timestamp %></td>
-                    <td><strong>teplota:</strong> <%= item.indoorTemp / 100 %> °C, <strong>tlak:</strong> <%= item.indoorPressure / 100 %> hPa, <strong>vlhkosť:</strong> <%= item.indoorHumidity / 100 %>%, <strong>nadmorská výška:</strong> <%= item.indoorAltitude / 100 %>m</td>
-                    <td><strong>pripojené:</strong> <%= item.outdoorConnected %>, <strong>teplota:</strong> <%= item.outdoorTemp / 100 %> °C, <strong>tlak:</strong> <%= item.outdoorPressure  / 100%>hPa, <strong>vlhkosť:</strong> <%= item.outdoorHumidity / 100 %>%, <strong>nadmorská výška:</strong> <%= item.outdoorAltitude / 100 %>m</td>
-                </tr>
-            <% } %>
-        </table>
-    </div>
-<% } else { %>
-    <p>zatiaľ žiadne dáta. :(</p>
-<% } %> */ %>