From 24e4ff9653496d9406b13803719598bbea6539eb Mon Sep 17 00:00:00 2001 From: Alice Gaudon Date: Sat, 11 Jul 2020 12:08:11 +0200 Subject: [PATCH] Upgrade dependencies and improve progress bar look --- assets/js/fm.js | 1 - assets/sass/layout.scss | 1 + package.json | 5 +++++ yarn.lock | 42 +++++++++++++++++++++++++++++++++++++---- 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/assets/js/fm.js b/assets/js/fm.js index f332ad5..354424d 100644 --- a/assets/js/fm.js +++ b/assets/js/fm.js @@ -112,7 +112,6 @@ UploadForm.prototype.start = function () { const units = ['K', 'M', 'G', 'T']; UploadForm.prototype.updateSpeed = function (loaded) { - console.log(this.xferSpeed); const time = new Date().getTime(); if (this.lastTransferTime) { this.xferSpeed.push((loaded - this.lastLoaded) / (time - this.lastTransferTime)); diff --git a/assets/sass/layout.scss b/assets/sass/layout.scss index a651859..540c517 100644 --- a/assets/sass/layout.scss +++ b/assets/sass/layout.scss @@ -708,6 +708,7 @@ button, .button { top: 0; width: var(--progress); height: 100%; + transition: width ease-out 150ms; background: $secondary; } diff --git a/package.json b/package.json index 87e259a..062b7df 100644 --- a/package.json +++ b/package.json @@ -18,9 +18,14 @@ "@babel/preset-env": "^7.9.5", "@types/config": "^0.0.36", "@types/express": "^4.17.6", + "@types/express-session": "^1.17.0", "@types/formidable": "^1.0.31", "@types/jest": "^25.2.1", + "@types/mysql": "^2.15.14", "@types/node": "^13.13.2", + "@types/nodemailer": "^6.4.0", + "@types/nunjucks": "^3.1.3", + "@types/ws": "^7.2.6", "babel-loader": "^8.1.0", "concurrently": "^5.1.0", "css-loader": "^3.5.2", diff --git a/yarn.lock b/yarn.lock index 3b7c27d..8634a8a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1131,7 +1131,15 @@ "@types/qs" "*" "@types/range-parser" "*" -"@types/express@^4.17.6": +"@types/express-session@^1.17.0": + version "1.17.0" + resolved "https://registry.toot.party/@types%2fexpress-session/-/express-session-1.17.0.tgz#770daf81368f6278e3e40dd894e1e52abbdca0cd" + integrity sha512-OQEHeBFE1UhChVIBhRh9qElHUvTp4BzKKHxMDkGHT7WuYk5eL93hPG7D8YAIkoBSbhNEY0RjreF15zn+U0eLjA== + dependencies: + "@types/express" "*" + "@types/node" "*" + +"@types/express@*", "@types/express@^4.17.6": version "4.17.7" resolved "https://registry.toot.party/@types%2fexpress/-/express-4.17.7.tgz#42045be6475636d9801369cd4418ef65cdb0dd59" integrity sha512-dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ== @@ -1207,6 +1215,13 @@ resolved "https://registry.toot.party/@types%2fminimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d" integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA== +"@types/mysql@^2.15.14": + version "2.15.14" + resolved "https://registry.toot.party/@types%2fmysql/-/mysql-2.15.14.tgz#df60e7b5f531662a8758e74b7685bed2b0ef1835" + integrity sha512-YyNcxZZ4qlb9v41lu8Qfo+quX8eUqz4mr/6Nx7sclc2pUemOvjU7xrpuVave0/sR/VdtDPTXZOWQLC/kthxrHg== + dependencies: + "@types/node" "*" + "@types/node@*": version "14.0.22" resolved "https://registry.toot.party/@types%2fnode/-/node-14.0.22.tgz#23ea4d88189cec7d58f9e6b66f786b215eb61bdc" @@ -1217,11 +1232,23 @@ resolved "https://registry.toot.party/@types%2fnode/-/node-13.13.14.tgz#20cd7d2a98f0c3b08d379f4ea9e6b315d2019529" integrity sha512-Az3QsOt1U/K1pbCQ0TXGELTuTkPLOiFIQf3ILzbOyo0FqgV9SxRnxbxM5QlAveERZMHpZY+7u3Jz2tKyl+yg6g== +"@types/nodemailer@^6.4.0": + version "6.4.0" + resolved "https://registry.toot.party/@types%2fnodemailer/-/nodemailer-6.4.0.tgz#d8c039be3ed685c4719a026455555be82c124b74" + integrity sha512-KY7bFWB0MahRZvVW4CuW83qcCDny59pJJ0MQ5ifvfcjNwPlIT0vW4uARO4u1gtkYnWdhSvURegecY/tzcukJcA== + dependencies: + "@types/node" "*" + "@types/normalize-package-data@^2.4.0": version "2.4.0" resolved "https://registry.toot.party/@types%2fnormalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e" integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA== +"@types/nunjucks@^3.1.3": + version "3.1.3" + resolved "https://registry.toot.party/@types%2fnunjucks/-/nunjucks-3.1.3.tgz#55fa2bf6fd34641545a6686217324fde66d31164" + integrity sha512-42IiIIBdoB7ZDwCVhCWYT4fMCj+4TeacuVgh7xyT2du5EhkpA+OFeeDdYTFCUt1MrHb8Aw7ZqFvr8s1bwP9l8w== + "@types/prettier@^1.19.0": version "1.19.1" resolved "https://registry.toot.party/@types%2fprettier/-/prettier-1.19.1.tgz#33509849f8e679e4add158959fdb086440e9553f" @@ -1255,6 +1282,13 @@ resolved "https://registry.toot.party/@types%2fstack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== +"@types/ws@^7.2.6": + version "7.2.6" + resolved "https://registry.toot.party/@types%2fws/-/ws-7.2.6.tgz#516cbfb818310f87b43940460e065eb912a4178d" + integrity sha512-Q07IrQUSNpr+cXU4E4LtkSIBPie5GLZyyMC1QtQYRLWz701+XcoVygGUZgvLqElq1nU4ICldMYPnexlBsg3dqQ== + dependencies: + "@types/node" "*" + "@types/yargs-parser@*": version "15.0.0" resolved "https://registry.toot.party/@types%2fyargs-parser/-/yargs-parser-15.0.0.tgz#cb3f9f741869e20cce330ffbeb9271590483882d" @@ -9803,9 +9837,9 @@ widest-line@^3.1.0: string-width "^4.0.0" wms-core@^0: - version "0.13.0" - resolved "https://registry.toot.party/wms-core/-/wms-core-0.13.0.tgz#1b42aa084949f34c988b1cdb977f8f65ed478092" - integrity sha512-AVRfYdJenoB9z83rufXr0JHzJYU9wOjKrzBFEm4voy4+q/Gsd0ZkQd5DBMy5uVR8pFcBZH3/z0gID/YZAm0Ehw== + version "0.13.1" + resolved "https://registry.toot.party/wms-core/-/wms-core-0.13.1.tgz#73771a77cf0f3940f932418f932d77d0d6737cf5" + integrity sha512-DVRz+nLXsaa1CSzJJU310RJ8Qfdq1EIP/TwDfRs89Ko1IwaojP6by9np3nQHrRL3tQ3k9zg3YtHq3m24FOvpQw== dependencies: argon2 "^0.26.2" compression "^1.7.4"