diff --git a/Dockerfile b/Dockerfile index 9d8e082..e4ee307 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,7 @@ RUN apt-get update \ ca-certificates \ gnupg2 \ libfontconfig \ - && curl -sL https://deb.nodesource.com/setup_12.x | bash - \ + && curl -sL https://deb.nodesource.com/setup_14.x | bash - \ && apt-get install -y --no-install-recommends \ nodejs \ && apt-get purge -y --auto-remove \ diff --git a/css/style.css b/css/style.css index 0c25519..1fc1335 100644 --- a/css/style.css +++ b/css/style.css @@ -157,6 +157,7 @@ ul { overflow: hidden; box-shadow: 0 0 5px rgba(0,0,0,.2); border-radius: 8px; + animation: slideIn 0.5s ease-in-out; } h2 { font-size: 1.3em; @@ -433,6 +434,10 @@ header { transform: scale3D(0, 0, 1); } } +@keyframes slideIn { + 0% { transform: translateY(-100%); opacity: 0; } + 100% { transform: translateY(0); opacity: 1; } +} @font-face { font-family: 'Poppins'; diff --git a/js/clockIn.js b/js/clockIn.js index b674423..254172d 100644 --- a/js/clockIn.js +++ b/js/clockIn.js @@ -52,7 +52,7 @@ function fichar(direction) { printErrores(msg); setTimeout(function () { cerrar(); - }, 3000); + }, 2000); }else { $(".confirm").fadeIn(200); $(".txtConfirm").append('Fichada registrada correctamente'); @@ -202,7 +202,7 @@ function weekDays() { function printErrores(errores) { - var error =''; + var error = ''; for (var i = 0; i < errores.length; i++) { if (errores[i].error) { error += errores[i].error + "
"; diff --git a/js/main.js b/js/main.js index 33d9a8f..a5704d5 100644 --- a/js/main.js +++ b/js/main.js @@ -13,7 +13,7 @@ function printError(msg){ setTimeout(function() { $(".confirm").fadeOut(200); setTimeout(confirmReset, 200); - }, 1500); + }, 2300); } $.ajaxPrefilter(function(xhr) { diff --git a/package-lock.json b/package-lock.json index d594190..c9acfc1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,16 +1,20 @@ { - "name": "es.verdnatura.worker-time-control", + "name": "worker-time-control", "version": "1.0.2", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "es.verdnatura.worker-time-control", + "name": "worker-time-control", "version": "1.0.2", "license": "GPL-3.0", "dependencies": { "fastclick": "^1.0.6", - "jquery": "^3.6.0" + "jquery": "^3.7.0" + }, + "engines": { + "node": ">=14", + "npm": ">=8" } }, "node_modules/fastclick": { @@ -19,9 +23,9 @@ "integrity": "sha1-FhYlsnsaWAZAWTa9qaLBkm0Gvmo=" }, "node_modules/jquery": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.6.0.tgz", - "integrity": "sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==" + "version": "3.7.0", + "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.7.0.tgz", + "integrity": "sha512-umpJ0/k8X0MvD1ds0P9SfowREz2LenHsQaxSohMZ5OMNEU2r0tf8pdeEFTHMFxWVxKNyU9rTtK3CWzUCTKJUeQ==" } } } diff --git a/package.json b/package.json index b12bd76..65f6a57 100644 --- a/package.json +++ b/package.json @@ -1,20 +1,19 @@ { - "name": "es.verdnatura.worker-time-control", + "name": "worker-time-control", "version": "1.0.2", "author": "Verdnatura Levante SL", - "description": "Fichador", - "displayName": "Fichador", - "main": "index.js", + "description": "Verdnatura Time Control", "license": "GPL-3.0", "repository": { "type": "git", - "url": "https://gitea.verdnatura.es/verdnatura/vn-database" + "url": "https://gitea.verdnatura.es/verdnatura/worker-time-control" }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" + "engines": { + "node": ">=14", + "npm": ">=8" }, "dependencies": { "fastclick": "^1.0.6", - "jquery": "^3.6.0" + "jquery": "^3.7.0" } }