refs #5966 Upgrade to node 20.x and more changes

Dockerfile

@@ -8,7 +8,7 @@ RUN apt-get update \
         ca-certificates \
         gnupg2 \
         libfontconfig \
-    && curl -sL https://deb.nodesource.com/setup_14.x | bash - \
+    && curl -sL https://deb.nodesource.com/setup_20.x | bash - \
     && apt-get install -y --no-install-recommends \
         nodejs \
     && apt-get purge -y --auto-remove \

clockIn.html

@@ -43,24 +43,6 @@ and open the template in the editor.
             <div class="out">Fin jornada</div>
         </div> 
 
-        <p></p>
-    
-        <div class="loading">
-            <div class="loadingcontent">
-                <div class="sk-cube-grid">
-                    <div class="sk-cube sk-cube1"></div>
-                    <div class="sk-cube sk-cube2"></div>
-                    <div class="sk-cube sk-cube3"></div>
-                    <div class="sk-cube sk-cube4"></div>
-                    <div class="sk-cube sk-cube5"></div>
-                    <div class="sk-cube sk-cube6"></div>
-                    <div class="sk-cube sk-cube7"></div>
-                    <div class="sk-cube sk-cube8"></div>
-                    <div class="sk-cube sk-cube9"></div>
-                </div>
-            </div>
-        </div>
-
         <div class="confirm">
             <div class="contConfirm">
                 <h4 class="txtConfirm"></h4>

css/style.css

@@ -21,6 +21,7 @@ h1 {
     font-size: 1em;
     font-weight: 400;
     color: white;
+    opacity: 50%;
 }
 span {
     color: #ED4947;
@@ -29,7 +30,7 @@ span {
     float: right;
     font-weight: bold;
     font-size: 1.4em;
-    margin-top: -40px;
+    margin-top: -45px;
     color: white;
 }
 ul {
@@ -69,6 +70,7 @@ ul {
 #logo {
     width: 30%;
     padding-bottom: 20px;
+    pointer-events: none;
 }
 .btnPin {
     display: flex;
@@ -93,7 +95,7 @@ ul {
     justify-content: center;
 }
 .btnPinNum:active {
-	background: #333;;
+	background: #333;
 }
 .btnCancel {
     width: 100%;
@@ -102,7 +104,7 @@ ul {
     align-items: center;
     justify-content: center;
     background: rgba(237,73,71,.90);
-    color: #fff;
+    color: white;
 	border-radius: 50%;
 }
 .btnCancel:active {
@@ -115,11 +117,12 @@ ul {
     align-items: center;
     justify-content: center;
     background: rgba(163,171,38,.90);
-    color: #fff;
+    color: white;
 	border-radius: 50%;
 }
 #invertColor {
     filter: invert(100%);
+    pointer-events: none;
 }
 .btnOk:active {
 	background: rgb(130, 136, 31);
@@ -128,7 +131,7 @@ ul {
     padding-top: 0px;
     padding-left: 10px;
     float: left;
-    color: #fff;
+    color: white;
     text-align: right;
     font-size: 1.8em;
     font-weight: bold;
@@ -189,7 +192,7 @@ h3 {
     border-radius: 50px;
 }
 .in:active {
-    background: rgb(69, 171, 38,);
+    background: rgb(53, 131, 29);
 }
 .out {
     margin-left: 30px;
@@ -281,13 +284,13 @@ header {
 .listHorario .time {
     float: left;
     width: calc(100% / 7);
-    padding: 5px 0;
     font-size: 1.2em;
     overflow: hidden;
     color: white;
 }
 .listHorario .time div {
     display: inline-block;
+    heig
 }
 .listHorario .time img {
     width: 20px;
@@ -295,6 +298,7 @@ header {
     margin-right: 5px;
     margin-top: 8.5px;
     filter: invert(100%);
+    pointer-events: none;
 }
 .listHorario .time p {
     float: left;
@@ -349,91 +353,7 @@ header {
     color: #fff;
     margin: 15px;
 }
-.loading {
-    display: none;
-    top: 0;
-    left: 0;
-    position: fixed;
-    z-index: 999;
-    width: 100%;
-    height: 100%;
-    background: linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%);
-    background: -moz-linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%);
-    background: -webkit-gradient(left bottom, right top, color-stop(0%, rgba(255, 255, 255, .5)), color-stop(100%, rgb(0, 0, 0, .5)));
-    background: -webkit-linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%);
-    background: -o-linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%);
-    background: -ms-linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%);
-    background: linear-gradient(45deg, rgba(255, 255, 255, .5) 0%, rgb(0, 0, 0, .5) 100%);
-    filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#199aa6', endColorstr='#27d88b', GradientType=1 );
-}
-.loadingcontent {
-    position: fixed;
-    height: 50px;
-    width: 100%;
-    margin: auto;
-    top: 0;
-    bottom: 0;
-    left: 0;
-}
-.sk-cube-grid {
-    width: 40px;
-    height: 40px;
-    margin:  auto;
-}
-.sk-cube-grid .sk-cube {
-    width: 33%;
-    height: 33%;
-    background-color: #fff;
-    float: left;
-    -webkit-animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out;
-    animation: sk-cubeGridScaleDelay 1.3s infinite ease-in-out; 
-}
-.sk-cube-grid .sk-cube1 {
-    -webkit-animation-delay: 0.2s;
-    animation-delay: 0.2s; }
-.sk-cube-grid .sk-cube2 {
-    -webkit-animation-delay: 0.3s;
-    animation-delay: 0.3s; }
-.sk-cube-grid .sk-cube3 {
-    -webkit-animation-delay: 0.4s;
-    animation-delay: 0.4s; }
-.sk-cube-grid .sk-cube4 {
-    -webkit-animation-delay: 0.1s;
-    animation-delay: 0.1s; }
-.sk-cube-grid .sk-cube5 {
-    -webkit-animation-delay: 0.2s;
-    animation-delay: 0.2s; }
-.sk-cube-grid .sk-cube6 {
-    -webkit-animation-delay: 0.3s;
-    animation-delay: 0.3s; }
-.sk-cube-grid .sk-cube7 {
-    -webkit-animation-delay: 0s;
-    animation-delay: 0s; }
-.sk-cube-grid .sk-cube8 {
-    -webkit-animation-delay: 0.1s;
-    animation-delay: 0.1s; }
-.sk-cube-grid .sk-cube9 {
-    -webkit-animation-delay: 0.2s;
-    animation-delay: 0.2s; }
 
-@-webkit-keyframes sk-cubeGridScaleDelay {
-    0%, 70%, 100% {
-        -webkit-transform: scale3D(1, 1, 1);
-        transform: scale3D(1, 1, 1);
-    } 35% {
-        -webkit-transform: scale3D(0, 0, 1);
-        transform: scale3D(0, 0, 1); 
-    }
-}
-@keyframes sk-cubeGridScaleDelay {
-    0%, 70%, 100% {
-        -webkit-transform: scale3D(1, 1, 1);
-        transform: scale3D(1, 1, 1);
-    } 35% {
-        -webkit-transform: scale3D(0, 0, 1);
-        transform: scale3D(0, 0, 1);
-    } 
-}
 @keyframes slideIn {
     0% { transform: translateY(-100%); opacity: 0; }
     100% { transform: translateY(0); opacity: 1; }

img/close.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="m250.923-218.924-31.999-31.999L448.001-480 218.924-709.077l31.999-31.999L480-511.999l229.077-229.077 31.999 31.999L511.999-480l229.077 229.077-31.999 31.999L480-448.001 250.923-218.924Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M480-432.261 272.87-225.13q-10.196 10.195-23.87 10.195-13.674 0-23.87-10.195-10.195-10.196-10.195-23.87 0-13.674 10.195-23.87L432.261-480 225.13-687.13q-10.195-10.196-10.195-23.87 0-13.674 10.195-23.87 10.196-10.195 23.87-10.195 13.674 0 23.87 10.195L480-527.739 687.13-734.87q10.196-10.195 23.87-10.195 13.674 0 23.87 10.195 10.195 10.196 10.195 23.87 0 13.674-10.195 23.87L527.739-480 734.87-272.87q10.195 10.196 10.195 23.87 0 13.674-10.195 23.87-10.196 10.195-23.87 10.195-13.674 0-23.87-10.195L480-432.261Z"/></svg>

img/done.svg

@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M379.154-258.309 168.616-468.846l32.615-32.23 177.923 177.923 379-379.384 32.614 32.614-411.614 411.614Z"/></svg>
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M378-338.218 737.891-697.87q10.294-10.195 24.419-10.195t24.32 10.248q10.196 10.248 10.196 24.441t-10.196 24.485L402.109-264.37q-10.283 10.196-24.152 10.196-13.87 0-24.066-10.196L172.37-445.891q-10.196-10.358-9.816-24.571.381-14.212 10.629-24.408 10.248-10.195 24.441-10.195t24.485 10.195L378-338.218Z"/></svg>

img/in.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M676.195-445.935H188.087q-14.674 0-24.37-9.695-9.695-9.696-9.695-24.37 0-14.674 9.695-24.37 9.696-9.695 24.37-9.695h488.108L456.13-734.13q-10.195-10.196-10.334-24.031-.139-13.835 10.076-24.091 10.215-10.292 24.085-10.172 13.869.12 24.152 10.315l278 278q5.456 5.518 7.945 11.482 2.49 5.963 2.49 12.654 0 6.69-2.49 12.635-2.489 5.945-7.945 11.447l-278.239 278q-10.555 10.435-24.169 10.435t-23.81-10.491q-10.195-10.213-10.195-23.85 0-13.638 10.195-23.833l220.304-220.305Z"/></svg>

img/middle.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M188.087-445.935q-14.424 0-24.245-9.871-9.82-9.871-9.82-24.369 0-14.499 9.82-24.195 9.821-9.695 24.245-9.695h583.826q14.424 0 24.364 9.871 9.941 9.871 9.941 24.369 0 14.499-9.941 24.195-9.94 9.695-24.364 9.695H188.087Z"/></svg>

img/out.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="48" viewBox="0 -960 960 960" width="48"><path d="M283.805-445.935 503.87-225.87q10.195 10.218 10.315 24 .119 13.783-10.076 24.083-10.196 10.331-24.066 10.211-13.869-.12-24.152-10.315l-278-278q-5.456-5.518-7.945-11.482-2.49-5.963-2.49-12.654 0-6.69 2.49-12.635 2.489-5.945 7.945-11.447L456.13-782.348q10.555-10.196 24.169-10.196t23.81 10.196q10.195 10.435 10.195 24.093t-10.195 23.885L283.805-514.065h488.108q14.644 0 24.474 9.695 9.831 9.696 9.831 24.37 0 14.674-9.831 24.37-9.83 9.695-24.474 9.695H283.805Z"/></svg>

index.html

@@ -83,22 +83,6 @@ and open the template in the editor.
             developed with <span>&hearts;</span> by Verdnatura
         </h1>
         
-        <div class="loading">
-            <div class="loadingcontent">
-                <div class="sk-cube-grid">
-                    <div class="sk-cube sk-cube1"></div>
-                    <div class="sk-cube sk-cube2"></div>
-                    <div class="sk-cube sk-cube3"></div>
-                    <div class="sk-cube sk-cube4"></div>
-                    <div class="sk-cube sk-cube5"></div>
-                    <div class="sk-cube sk-cube6"></div>
-                    <div class="sk-cube sk-cube7"></div>
-                    <div class="sk-cube sk-cube8"></div>
-                    <div class="sk-cube sk-cube9"></div>
-                </div>
-            </div>
-        </div>
-        
         <div class="confirm">
             <div class="contConfirm">
                 <h4 class="txtConfirm"></h4>

js/clockIn.js

@@ -221,9 +221,9 @@ function ifIsEmpty(value) {
 
 function ifIsEmptyImage(value) {
     if (value.trim().length === 0) {
-        return "img/in.png";
+        return "img/in.svg";
     } else {
-        return "img/" + value + ".png";
+        return "img/" + value + ".svg";
     }
 }