diff --git a/.tmp/.gitkeep b/.tmp/.gitkeep deleted file mode 100644 index e69de29..0000000 diff --git a/dev.bat b/dev.bat deleted file mode 100644 index d30dcc3..0000000 --- a/dev.bat +++ /dev/null @@ -1,3 +0,0 @@ -start yarn serve -timeout 60 -yarn start \ No newline at end of file diff --git a/dev.sh b/dev.sh deleted file mode 100644 index 0a82f67..0000000 --- a/dev.sh +++ /dev/null @@ -1,3 +0,0 @@ -start yarn serve -sleep 60 -yarn start \ No newline at end of file diff --git a/electron/package.json b/electron/package.json index 91e4a5f..bd4d408 100644 --- a/electron/package.json +++ b/electron/package.json @@ -1,6 +1,6 @@ { "name": "ec-verwaltungs-app", - "version": "0.1.4", + "version": "0.1.5", "description": "EC-Verwaltungs Application", "keywords": [], "homepage": "https://ec-nordbund.de", diff --git a/electron/src/main/main.js b/electron/src/main/main.js index a37b98d..f8a3875 100644 --- a/electron/src/main/main.js +++ b/electron/src/main/main.js @@ -1,11 +1,20 @@ // Import Electron -const { app, BrowserWindow } = require('electron') +const { app, BrowserWindow, Tray } = require('electron') // On Install do Stuff if (require('electron-squirrel-startup')) { app.quit() } +//Single Instance +const isSecondInstance = app.makeSingleInstance(() => { + BrowserWindow.getAllWindows()[0].show() +}) + +if (isSecondInstance) { + app.quit() +} + //================================================================================================================================================= //Get URL's @@ -19,12 +28,18 @@ const loadingURL = ? 'http://localhost:8080/loading.html' : `file://${__dirname}/../renderer/loading.html` +const logoURL = + process.env.NODE_ENV === 'development' + ? `${__dirname}/../../../public/ec-logo-128.png` + : `${__dirname}/../renderer/ec-logo-128.png` + //Get Settings const mainWindowOptions = { height: 563, useContentSize: true, width: 1000, - show: false + show: false, + icon: logoURL } const loadingWindowOptions = { @@ -34,7 +49,8 @@ const loadingWindowOptions = { width: 470, show: false, closable: false, - resizable: false + resizable: false, + icon: logoURL } //================================================================================================================================================= @@ -64,6 +80,17 @@ function createLoadingWindow() { createWindow() }, 2000) }) + setupTray() +} + +let tray + +function setupTray() { + tray = new Tray(logoURL) + tray.setToolTip('EC-Verwaltungs-Application') + tray.on('click', () => { + BrowserWindow.getAllWindows()[0].show() + }) } //================================================================================================================================================= @@ -74,6 +101,7 @@ app.once('ready', createLoadingWindow) // Wenn alle Fenster zu dann quit (außer macOS) app.on('window-all-closed', () => { if (process.platform !== 'darwin') { + tray.destroy() app.quit() } }) diff --git a/electron/yarn.lock b/electron/yarn.lock index e1783fc..9f1677d 100644 --- a/electron/yarn.lock +++ b/electron/yarn.lock @@ -6,21 +6,22 @@ version "0.0.6" resolved "https://registry.yarnpkg.com/7zip/-/7zip-0.0.6.tgz#9cafb171af82329490353b4816f03347aa150a30" -"@electron-forge/async-ora@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/async-ora/-/async-ora-6.0.0-beta.18.tgz#0f6c09cb2061d51b4918427e5214f3889348f2c5" +"@electron-forge/async-ora@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/async-ora/-/async-ora-6.0.0-beta.20.tgz#9cd06517e95cbdf18cb23f922048016758a1e0e3" dependencies: colors "^1.2.0" debug "^3.0.0" log-symbols "^2.0.0" ora "^2.0.0" + pretty-ms "^3.2.0" "@electron-forge/cli@^6.0.0-beta.17": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/cli/-/cli-6.0.0-beta.18.tgz#75496bfea33afe34f66c6872bc9e51f2818779d6" + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/cli/-/cli-6.0.0-beta.20.tgz#3a04871e56a7ec377d55d56ea02a545e34a4c971" dependencies: - "@electron-forge/async-ora" "6.0.0-beta.18" - "@electron-forge/core" "6.0.0-beta.18" + "@electron-forge/async-ora" "6.0.0-beta.20" + "@electron-forge/core" "6.0.0-beta.20" colors "^1.2.0" commander "^2.9.0" debug "^3.0.0" @@ -28,21 +29,21 @@ inquirer "^5.0.0" semver "^5.3.0" -"@electron-forge/core@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/core/-/core-6.0.0-beta.18.tgz#06069560d4414095ef0f5419a1c8e6496ee8b3cd" - dependencies: - "@electron-forge/async-ora" "6.0.0-beta.18" - "@electron-forge/installer-base" "6.0.0-beta.18" - "@electron-forge/installer-deb" "6.0.0-beta.18" - "@electron-forge/installer-dmg" "6.0.0-beta.18" - "@electron-forge/installer-exe" "6.0.0-beta.18" - "@electron-forge/installer-rpm" "6.0.0-beta.18" - "@electron-forge/installer-zip" "6.0.0-beta.18" - "@electron-forge/maker-base" "6.0.0-beta.18" - "@electron-forge/plugin-base" "6.0.0-beta.18" - "@electron-forge/publisher-base" "6.0.0-beta.18" - "@electron-forge/shared-types" "6.0.0-beta.18" +"@electron-forge/core@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/core/-/core-6.0.0-beta.20.tgz#4d1e88e6e86fce8670592dbecb2bcb712f8fb739" + dependencies: + "@electron-forge/async-ora" "6.0.0-beta.20" + "@electron-forge/installer-base" "6.0.0-beta.20" + "@electron-forge/installer-deb" "6.0.0-beta.20" + "@electron-forge/installer-dmg" "6.0.0-beta.20" + "@electron-forge/installer-exe" "6.0.0-beta.20" + "@electron-forge/installer-rpm" "6.0.0-beta.20" + "@electron-forge/installer-zip" "6.0.0-beta.20" + "@electron-forge/maker-base" "6.0.0-beta.20" + "@electron-forge/plugin-base" "6.0.0-beta.20" + "@electron-forge/publisher-base" "6.0.0-beta.20" + "@electron-forge/shared-types" "6.0.0-beta.20" colors "^1.2.0" cross-spawn-promise "^0.10.1" debug "^3.0.0" @@ -62,136 +63,136 @@ username "^3.0.0" yarn-or-npm "^2.0.2" -"@electron-forge/installer-base@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/installer-base/-/installer-base-6.0.0-beta.18.tgz#4e32d4c7342be2ad9938912bc35e6296d804bad8" +"@electron-forge/installer-base@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/installer-base/-/installer-base-6.0.0-beta.20.tgz#d27257b3991d9498fe7a7e18242afbcece5cd46d" dependencies: - "@electron-forge/async-ora" "6.0.0-beta.18" + "@electron-forge/async-ora" "6.0.0-beta.20" -"@electron-forge/installer-darwin@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.18.tgz#4c918ef83e485c882add88771831d4c7985148b1" +"@electron-forge/installer-darwin@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/installer-darwin/-/installer-darwin-6.0.0-beta.20.tgz#44d7ac5dbbaef037d50cffe6deebe7c71ab763e5" dependencies: - "@electron-forge/async-ora" "6.0.0-beta.18" - "@electron-forge/installer-base" "6.0.0-beta.18" + "@electron-forge/async-ora" "6.0.0-beta.20" + "@electron-forge/installer-base" "6.0.0-beta.20" fs-extra "^5.0.0" pify "^3.0.0" sudo-prompt "^8.0.0" -"@electron-forge/installer-deb@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.18.tgz#1ea9e7ab86eea3a5b3d6db55c4c8b2016064bd71" +"@electron-forge/installer-deb@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/installer-deb/-/installer-deb-6.0.0-beta.20.tgz#22ef16a9fba0fd9c3a0fa186f44e34975d43484d" dependencies: - "@electron-forge/installer-linux" "6.0.0-beta.18" + "@electron-forge/installer-linux" "6.0.0-beta.20" -"@electron-forge/installer-dmg@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.18.tgz#c0f813c593dd7880454f69be728765478a37507a" +"@electron-forge/installer-dmg@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/installer-dmg/-/installer-dmg-6.0.0-beta.20.tgz#f3d4907985b1148bd1a7e6956db4b46781c35dfd" dependencies: - "@electron-forge/installer-darwin" "6.0.0-beta.18" + "@electron-forge/installer-darwin" "6.0.0-beta.20" cross-spawn-promise "^0.10.1" debug "^3.0.0" fs-extra "^5.0.0" -"@electron-forge/installer-exe@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.18.tgz#935b9e463d54a8925e1699443db886dabbe3401d" +"@electron-forge/installer-exe@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/installer-exe/-/installer-exe-6.0.0-beta.20.tgz#2c864b79ef14b0f25ec4368fafa54e235aef5f69" dependencies: - "@electron-forge/installer-base" "6.0.0-beta.18" + "@electron-forge/installer-base" "6.0.0-beta.20" opn "^5.0.0" -"@electron-forge/installer-linux@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.18.tgz#5a36e5e381f84a359342b6020e83d2132a9b98a7" +"@electron-forge/installer-linux@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/installer-linux/-/installer-linux-6.0.0-beta.20.tgz#2c58880e0434606e842d247de8a49dfa8dfab218" dependencies: - "@electron-forge/installer-base" "6.0.0-beta.18" + "@electron-forge/installer-base" "6.0.0-beta.20" pify "^3.0.0" sudo-prompt "^8.0.0" -"@electron-forge/installer-rpm@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.18.tgz#f08f5c0fea4edd0d3c8028f24b325050e6812fed" +"@electron-forge/installer-rpm@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/installer-rpm/-/installer-rpm-6.0.0-beta.20.tgz#d6ef2b82ee50b281a883bdd0f96041bd8b07f413" dependencies: - "@electron-forge/installer-linux" "6.0.0-beta.18" + "@electron-forge/installer-linux" "6.0.0-beta.20" -"@electron-forge/installer-zip@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.18.tgz#52ffacb1cbcdce38a13be575a42e919a576fb929" +"@electron-forge/installer-zip@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/installer-zip/-/installer-zip-6.0.0-beta.20.tgz#523ec910cd9d4c4ac19fc505fac9708ff2add5a2" dependencies: - "@electron-forge/installer-darwin" "6.0.0-beta.18" + "@electron-forge/installer-darwin" "6.0.0-beta.20" cross-spawn-promise "^0.10.1" fs-extra "^5.0.0" -"@electron-forge/maker-base@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-base/-/maker-base-6.0.0-beta.18.tgz#6b39daa8886c09d599a89dfd4636382cf88ca089" +"@electron-forge/maker-base@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/maker-base/-/maker-base-6.0.0-beta.20.tgz#05acf67b580838207e0be91e0fbcb1927a6c17ca" dependencies: - "@electron-forge/shared-types" "6.0.0-beta.18" + "@electron-forge/shared-types" "6.0.0-beta.20" fs-extra "^5.0.0" "@electron-forge/maker-deb@^6.0.0-beta.17": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.18.tgz#94638299b9365a3e55e6ee05c2ff327fd6ef8c5b" + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/maker-deb/-/maker-deb-6.0.0-beta.20.tgz#e6da371dfcaecf292c007a212768c82b53799d7c" dependencies: - "@electron-forge/maker-base" "6.0.0-beta.18" - "@electron-forge/shared-types" "6.0.0-beta.18" + "@electron-forge/maker-base" "6.0.0-beta.20" + "@electron-forge/shared-types" "6.0.0-beta.20" optionalDependencies: electron-installer-debian "^0.8.0" "@electron-forge/maker-dmg@^6.0.0-beta.17": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-dmg/-/maker-dmg-6.0.0-beta.18.tgz#29467a90726f39a7f9276999d57095773ea68f1c" + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/maker-dmg/-/maker-dmg-6.0.0-beta.20.tgz#0cbd99502b57e38229f35df720e0565078ff8b99" dependencies: - "@electron-forge/maker-base" "6.0.0-beta.18" - "@electron-forge/shared-types" "6.0.0-beta.18" + "@electron-forge/maker-base" "6.0.0-beta.20" + "@electron-forge/shared-types" "6.0.0-beta.20" fs-extra "^5.0.0" pify "^3.0.0" optionalDependencies: electron-installer-dmg "^0.2.0" "@electron-forge/maker-squirrel@^6.0.0-beta.17": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.18.tgz#f2da351d11e727a75ffd0880d06826e2a992c6fe" + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/maker-squirrel/-/maker-squirrel-6.0.0-beta.20.tgz#06ce7bc0327b6f7ed56815aad38015a391c23a76" dependencies: - "@electron-forge/maker-base" "6.0.0-beta.18" - "@electron-forge/shared-types" "6.0.0-beta.18" + "@electron-forge/maker-base" "6.0.0-beta.20" + "@electron-forge/shared-types" "6.0.0-beta.20" fs-extra "^5.0.0" optionalDependencies: electron-winstaller "^2.5.0" -"@electron-forge/plugin-base@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.18.tgz#f8ed30f21669bf21a2775ac0ae35a80ca28ca424" +"@electron-forge/plugin-base@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/plugin-base/-/plugin-base-6.0.0-beta.20.tgz#f381e7ededceaedc00a180e3a872359f28f61012" dependencies: - "@electron-forge/shared-types" "6.0.0-beta.18" + "@electron-forge/shared-types" "6.0.0-beta.20" -"@electron-forge/publisher-base@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.18.tgz#2b8d876fceeea8840dbdb0d912c5988a33553b46" +"@electron-forge/publisher-base@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/publisher-base/-/publisher-base-6.0.0-beta.20.tgz#ae774fe0da9d86ee23b5da094c92777ac657fc8e" "@electron-forge/publisher-github@^6.0.0-beta.17": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/publisher-github/-/publisher-github-6.0.0-beta.18.tgz#aa6c05773a8beb141737580e74ca9c40f66fa00e" + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/publisher-github/-/publisher-github-6.0.0-beta.20.tgz#7a8356264eed80420448775af3be99968ea78267" dependencies: - "@electron-forge/async-ora" "6.0.0-beta.18" - "@electron-forge/publisher-base" "6.0.0-beta.18" - "@electron-forge/shared-types" "6.0.0-beta.18" + "@electron-forge/async-ora" "6.0.0-beta.20" + "@electron-forge/publisher-base" "6.0.0-beta.20" + "@electron-forge/shared-types" "6.0.0-beta.20" "@octokit/rest" "^15.2.6" fs-extra "^5.0.0" lodash.merge "^4.6.0" mime-types "^2.1.17" -"@electron-forge/shared-types@6.0.0-beta.18": - version "6.0.0-beta.18" - resolved "https://registry.yarnpkg.com/@electron-forge/shared-types/-/shared-types-6.0.0-beta.18.tgz#7c719293e3387137384a8a5b81a38b2d8c9c687a" +"@electron-forge/shared-types@6.0.0-beta.20": + version "6.0.0-beta.20" + resolved "https://registry.yarnpkg.com/@electron-forge/shared-types/-/shared-types-6.0.0-beta.20.tgz#f4836cdc93dcb85d60d0c09e83dcff395e988ae1" dependencies: "@types/electron-packager" "^10.1.0" electron-rebuild "^1.6.0" ora "^2.0.0" "@octokit/rest@^15.2.6": - version "15.9.1" - resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.9.1.tgz#d1abd3e8b9c1b4cf647d94b59dd476cc34bb3d9e" + version "15.9.4" + resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-15.9.4.tgz#c6cf0f483275d9c798b18419b7c9d417493bb70f" dependencies: before-after-hook "^1.1.0" btoa-lite "^1.0.0" @@ -209,8 +210,8 @@ "@types/node" "*" "@types/node@*": - version "10.3.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.4.tgz#c74e8aec19e555df44609b8057311052a2c84d9e" + version "10.5.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.1.tgz#d578446f4abff5c0b49ade9b4e5274f6badaadfc" "@types/node@^8.0.24": version "8.10.20" @@ -369,8 +370,8 @@ base64-js@1.2.0: resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.2.0.tgz#a39992d723584811982be5e290bb6a53d86700f1" bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" dependencies: tweetnacl "^0.14.3" @@ -554,8 +555,8 @@ combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: delayed-stream "~1.0.0" commander@^2.9.0: - version "2.15.1" - resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" + version "2.16.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50" compare-version@^0.1.2: version "0.1.2" @@ -1271,8 +1272,8 @@ homedir-polyfill@^1.0.1: parse-passwd "^1.0.0" hosted-git-info@^2.1.4: - version "2.6.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" + version "2.6.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.1.tgz#6e4cee78b01bb849dcf93527708c69fdbee410df" http-proxy-agent@^2.1.0: version "2.1.0" @@ -1921,6 +1922,10 @@ parse-json@^2.2.0: dependencies: error-ex "^1.2.0" +parse-ms@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parse-ms/-/parse-ms-1.0.1.tgz#56346d4749d78f23430ca0c713850aef91aa361d" + parse-passwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6" @@ -2010,6 +2015,12 @@ pretty-bytes@^1.0.2: get-stdin "^4.0.1" meow "^3.1.0" +pretty-ms@^3.2.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-3.2.0.tgz#87a8feaf27fc18414d75441467d411d6e6098a25" + dependencies: + parse-ms "^1.0.0" + process-nextick-args@~2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.0.tgz#a37d732f4271b4ab1ad070d35508e8290788ffaa" @@ -2567,8 +2578,8 @@ util-deprecate@~1.0.1: resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" uuid@^3.0.0, uuid@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" validate-npm-package-license@^3.0.1: version "3.0.3" @@ -2653,8 +2664,8 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" yargs-parser@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.0.0.tgz#c737c93de2567657750cb1f2c00be639fd19c994" + version "10.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" dependencies: camelcase "^4.1.0" diff --git a/package.json b/package.json index 6b429cb..9de5b4b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ec-verwaltungs-app", - "version": "0.1.4", + "version": "0.1.5", "description": "EC-Verwaltungs Application", "keywords": [], "homepage": "https://ec-nordbund.de", @@ -39,7 +39,8 @@ "docs:api": "graphql-markdown http://localhost:4000/graphql > ./docs/api/README.md", ":init": "yarn && cd electron && yarn && cd ..", "dev": "concurrently \"yarn serve\" \"yarn docs:dev\"", - "publish": "yarn build && cd electron && yarn run publish" + "publish": "yarn build && cd electron && yarn run publish", + "update": "node ./updateVersion.js" }, "main": "./electron/src/main/main.dev.js", "dependencies": { @@ -58,7 +59,7 @@ "vue-property-decorator": "^6.0.0", "vue-qriously": "^1.1.1", "vue-router": "^3.0.1", - "vuetify": "^1.1.0-rc.2", + "vuetify": "^1.1.1", "xlsx-template": "^0.3.1" }, "devDependencies": { diff --git a/public/ec-logo-128.png b/public/ec-logo-128.png new file mode 100644 index 0000000..8b69cf2 Binary files /dev/null and b/public/ec-logo-128.png differ diff --git a/public/ec-logo-16.png b/public/ec-logo-16.png new file mode 100644 index 0000000..4f1a943 Binary files /dev/null and b/public/ec-logo-16.png differ diff --git a/public/ec-logo-256.png b/public/ec-logo-256.png new file mode 100644 index 0000000..be84d14 Binary files /dev/null and b/public/ec-logo-256.png differ diff --git a/public/ec-logo-32.png b/public/ec-logo-32.png new file mode 100644 index 0000000..99361d3 Binary files /dev/null and b/public/ec-logo-32.png differ diff --git a/public/ec-logo-512.png b/public/ec-logo-512.png new file mode 100644 index 0000000..8c3b27f Binary files /dev/null and b/public/ec-logo-512.png differ diff --git a/public/ec-logo-64.png b/public/ec-logo-64.png new file mode 100644 index 0000000..7c871a3 Binary files /dev/null and b/public/ec-logo-64.png differ diff --git a/public/ec-logo-without-bg-128.png b/public/ec-logo-without-bg-128.png new file mode 100644 index 0000000..1d1a676 Binary files /dev/null and b/public/ec-logo-without-bg-128.png differ diff --git a/public/ec-logo-without-bg-16.png b/public/ec-logo-without-bg-16.png new file mode 100644 index 0000000..c39a28f Binary files /dev/null and b/public/ec-logo-without-bg-16.png differ diff --git a/public/ec-logo-without-bg-256.png b/public/ec-logo-without-bg-256.png new file mode 100644 index 0000000..22a4245 Binary files /dev/null and b/public/ec-logo-without-bg-256.png differ diff --git a/public/ec-logo-without-bg-32.png b/public/ec-logo-without-bg-32.png new file mode 100644 index 0000000..70e9225 Binary files /dev/null and b/public/ec-logo-without-bg-32.png differ diff --git a/public/ec-logo-without-bg-512.png b/public/ec-logo-without-bg-512.png new file mode 100644 index 0000000..0b2421c Binary files /dev/null and b/public/ec-logo-without-bg-512.png differ diff --git a/public/ec-logo-without-bg-64.png b/public/ec-logo-without-bg-64.png new file mode 100644 index 0000000..6e71557 Binary files /dev/null and b/public/ec-logo-without-bg-64.png differ diff --git a/public/losung.png b/public/losung.png new file mode 100644 index 0000000..f592325 Binary files /dev/null and b/public/losung.png differ diff --git a/src/App.vue b/src/App.vue index f07a7bb..7f1cab9 100644 --- a/src/App.vue +++ b/src/App.vue @@ -3,8 +3,8 @@ - - + + Nordbund – Verwaltung @@ -12,7 +12,7 @@ invert_colors - + - + @@ -57,7 +57,7 @@ keyboard_arrow_right EC-Nordbund keyboard_arrow_right - T. Krause + S. Krüger + T. Krause + S. Krüger{{$route.path}} @@ -67,8 +67,9 @@ Automatischer LogOut... - - Achtung! Du wirst automatisch in {{sec}} Sekunden abgemeldet...
Um das zu verhindern musst du nur irgendwoanders hnklicken. + + Achtung! Du wirst automatisch in {{sec}} Sekunden abgemeldet...
+ Um das zu verhindern musst du nur irgendwoanders hinklicken. @@ -78,10 +79,13 @@ \ No newline at end of file + diff --git a/src/Login.vue b/src/Login.vue index 10bca8d..a32bca7 100644 --- a/src/Login.vue +++ b/src/Login.vue @@ -1,11 +1,12 @@ diff --git a/src/assets/logo.png b/src/assets/logo.png deleted file mode 100644 index 8052877..0000000 Binary files a/src/assets/logo.png and /dev/null differ diff --git a/src/graphql/index.ts b/src/graphql/index.ts new file mode 100644 index 0000000..bb816c0 --- /dev/null +++ b/src/graphql/index.ts @@ -0,0 +1,531 @@ +import gql from 'graphql-tag' + +export const query = { + personen: { + liste: { + load: gql` + query($authToken: String!) { + personen(authToken: $authToken) { + personID + vorname + nachname + gebDat { + german + } + geschlecht + } + } + `, + addPerson: gql` + mutation( + $vorname: String! + $nachname: String! + $gebDat: String! + $geschlecht: String! + $authToken: String! + ) { + addPerson( + authToken: $authToken + vorname: $vorname + nachname: $nachname + gebDat: $gebDat + geschlecht: $geschlecht + ) + } + ` + }, + details: { + editStamm: gql` + mutation( + $personID: Int! + $vorname: String! + $nachname: String! + $gebDat: String! + $geschlecht: String! + $authToken: String! + ) { + editPersonStamm( + authToken: $authToken + personID: $personID + vorname: $vorname + nachname: $nachname + gebDat: $gebDat + geschlecht: $geschlecht + ) + } + `, + editTelefon: gql` + mutation( + $personID: Int! + $telefon: String! + $authToken: String! + $telefonID: Int! + ) { + editTelefon( + telefonID: $telefonID + personID: $personID + telefon: $telefon + authToken: $authToken + ) + } + `, + editAdresse: gql` + mutation( + $personID: Int! + $strasse: String! + $plz: String! + $ort: String! + $authToken: String! + $adressID: Int! + ) { + editAdresse( + adressID: $adressID + personID: $personID + strasse: $strasse + plz: $plz + ort: $ort + authToken: $authToken + ) + } + `, + addEmail: gql` + mutation( + $personID: Int! + $email: String! + $authToken: String! + ) { + addEmail( + personID: $personID + email: $email + authToken: $authToken + ) + } + `, + addTelefon: gql` + mutation( + $personID: Int! + $telefon: String! + $authToken: String! + ) { + addTelefon( + personID: $personID + telefon: $telefon + authToken: $authToken + ) + } + `, + addAdresse: gql` + mutation( + $personID: Int! + $strasse: String! + $plz: String! + $ort: String! + $authToken: String! + ) { + addAdresse( + personID: $personID + strasse: $strasse + plz: $plz + ort: $ort + authToken: $authToken + ) + } + `, + addAK: gql` + mutation( + $akID: Int! + $personID: Int! + $eintritt: String! + $leiter: Boolean! + $authToken: String! + ) { + addAKPerson( + authToken: $authToken + akID: $akID + personID: $personID + eintritt: $eintritt + leiter: $leiter + ) + } + `, + editAK: gql` + mutation( + $akID: Int! + $personAKID: Int! + $personID: Int! + $eintritt: String! + $austritt: String + $leiter: Boolean! + $authToken: String! + ) { + editAKPerson( + authToken: $authToken + akID: $akID + personAKID: $personAKID + personID: $personID + eintritt: $eintritt + austritt: $austritt + leiter: $leiter + ) + } + `, + deleteVerteiler: gql` + mutation( + $authToken: String! + $verteilerPersonID: Int! + ) { + deleteVerteilerPerson( + authToken: $authToken + verteilerPersonID: $verteilerPersonID + ) + } + `, + addVerteiler: gql` + mutation( + $authToken: String! + $bezeichnung: String! + ) { + addVerteiler( + authToken: $authToken + autoSql: "" + bezeichnung: $bezeichnung + ) + } + `, + editVerteiler: gql` + mutation( + $verteilerID: Int! + $authToken: String! + $personID: Int! + $type: Int! + $verteilerPersonID: Int! + ) { + editVerteilerPerson( + verteilerPersonID: $verteilerPersonID + personID: $personID + verteilerID: $verteilerID + type: $type + authToken: $authToken + ) + } + `, + load: gql` + query($authToken: String!, $personID: Int!) { + person( + authToken: $authToken + personID: $personID + ) { + personID + vorname + nachname + gebDat { + german + input + } + alter + geschlecht + juLeiCaNr + adressen { + adressID + strasse + plz + ort + } + emails { + emailID + email + } + telefone { + telefonID + telefon + } + anmeldungen { + anmeldeID + veranstaltung { + veranstaltungsID + bezeichnung + begin { + german + input + } + ende { + german + input + } + } + position + } + fzs { + fzID + gesehenAm { + german + input + } + gesehenVon { + personID + vorname + nachname + } + kommentar + } + aks { + personAKID + eintritt { + german + input + } + austritt { + german + input + } + leiter + ak { + akID + bezeichnung + } + } + verteiler { + verteilerPersonenID + type + verteiler { + verteilerID + bezeichnung + isAuto + } + } + } + } + `, + auskunft: gql` + query($authToken: String!, $personID: Int!) { + person( + authToken: $authToken + personID: $personID + ) { + vorname + nachname + gebDat { + german + } + alter + geschlecht + juLeiCaNr + adressen { + strasse + plz + ort + letzteAenderung { + german + } + erstellt { + german + } + } + emails { + email + letzteAenderung { + german + } + erstellt { + german + } + } + telefone { + telefon + letzteAenderung { + german + } + erstellt { + german + } + } + anmeldungen { + veranstaltung { + bezeichnung + begin { + german + } + ende { + german + } + } + position + #letzteAenderung { + # german + #} + #erstellt { + # german + #} + } + fzs { + gesehenAm { + german + } + gesehenVon { + vorname + nachname + } + kommentar + #letzteAenderung { + # german + #} + #erstellt { + # german + #} + } + aks { + eintritt { + german + } + austritt { + german + } + leiter + ak { + bezeichnung + } + letzteAenderung { + german + } + erstellt { + german + } + } + verteiler { + type + verteiler { + bezeichnung + isAuto + } + #letzteAenderung { + # german + #} + #erstellt { + # german + #} + } + } + } + `, + editEmail: gql` + mutation( + $personID: Int! + $email: String! + $authToken: String! + $emailID: Int! + ) { + editEmail( + emailID: $emailID + personID: $personID + email: $email + authToken: $authToken + ) + } + ` + } + }, + ak: { + liste: { + load: gql` + query($authToken: String!) { + aks(authToken: $authToken) { + akID + bezeichnung + } + } + `, + addAK: gql` + mutation( + $bezeichnung: String! + $authToken: String! + ) { + addAK( + authToken: $authToken + bezeichnung: $bezeichnung + ) + } + ` + }, + details: { + load: gql` + query($authToken: String!, $akID: Int!) { + ak(akID: $akID, authToken: $authToken) { + akID + bezeichnung + personen { + personAKID + eintritt { + german + input + } + austritt { + german + input + } + leiter + person { + personID + vorname + nachname + gebDat { + german + } + } + } + } + } + `, + editPerson: gql` + mutation( + $akID: Int! + $personAKID: Int! + $personID: Int! + $eintritt: String! + $austritt: String + $leiter: Boolean! + $authToken: String! + ) { + editAKPerson( + authToken: $authToken + akID: $akID + personAKID: $personAKID + personID: $personID + eintritt: $eintritt + austritt: $austritt + leiter: $leiter + ) + } + `, + addPerson: gql` + mutation( + $akID: Int! + $personID: Int! + $eintritt: String! + $leiter: Boolean! + $authToken: String! + ) { + addAKPerson( + authToken: $authToken + akID: $akID + personID: $personID + eintritt: $eintritt + leiter: $leiter + ) + } + `, + editStamm: gql` + mutation( + $akID: Int! + $bezeichnung: String! + $authToken: String! + ) { + editAKStamm( + authToken: $authToken + akID: $akID + bezeichnung: $bezeichnung + ) + } + ` + } + } +} diff --git a/src/plugins/formConfig/index.ts b/src/plugins/formConfig/index.ts new file mode 100644 index 0000000..b926612 --- /dev/null +++ b/src/plugins/formConfig/index.ts @@ -0,0 +1,165 @@ +import { + rule, + required, + maxLength, + inArray, + exactLength +} from '../rules/index' + +interface IConfig { + label?: string + name: string + required?: boolean + rules?: rule + componentName?: string + counter?: number + disabeled?: boolean +} + +// const required = true + +export const vornameConfig: IConfig = { + name: 'vorname', + label: 'Vorname', + required: true, + rules: [ + required('einen Vornamen'), + maxLength('einen Vorname', 'der', 50) + ], + counter: 50, + componentName: 'v-text-field' +} + +export const nachnameConfig: IConfig = { + name: 'nachname', + label: 'Nachname', + required: true, + rules: [ + required('einen Nachnamen'), + maxLength('einen Nachname', 'der', 50) + ], + counter: 50, + componentName: 'v-text-field' +} + +export const gebDatConfig = { + label: 'Geburtsdatum', + name: 'gebDat', + required: true, + rules: [required('ein Geburtsdatum')], + componentName: 'ec-form-datePicker' +} + +export const geschlechtConfig = { + label: 'Geschlecht', + name: 'geschlecht', + required: true, + rules: [ + required('ein Geschlecht'), + inArray('Das Geschlecht', 'm', 'w') + ], + componentName: 'ec-radio-geschlecht' +} + +export const strasseConfig: IConfig = { + name: 'strasse', + label: 'Straße', + required: true, + rules: [ + required('eine Straße'), + maxLength('eine Straße', 'die', 50) + ], + counter: 50, + componentName: 'v-text-field' +} + +export const plzConfig: IConfig = { + name: 'plz', + label: 'PLZ', + required: true, + rules: [ + required('eine PostLeitZahl'), + exactLength('eine PostLeitZahl', 'die', 5) + ], + counter: 5, + componentName: 'v-text-field' +} + +export const ortConfig: IConfig = { + name: 'ort', + label: 'Ort', + required: true, + rules: [ + required('einen Ort'), + maxLength('einen Ort', 'der', 50) + ], + counter: 50, + componentName: 'v-text-field' +} + +export const eMailConfig: IConfig = { + name: 'email', + label: 'E-Mail', + required: true, + rules: [ + required('eine E-Mail'), + maxLength('eine E-Mail', 'die', 50) + ], + counter: 50, + componentName: 'v-text-field' +} + +export const telefonConfig: IConfig = { + name: 'telefon', + label: 'Telefonnummer', + required: true, + rules: [ + required('eine Telefonnummer'), + maxLength('eine Telefonnummer', 'die', 20) + ], + counter: 20, + componentName: 'v-text-field' +} + +export const akConfig: IConfig = { + name: 'akID', + label: 'Wähle einen Arbeitskreis', + required: true, + rules: [required('einen Arbeitskreis')], + componentName: 'ec-select-ak' +} + +export const verteilerConfig: IConfig = { + name: 'verteilerID', + label: 'Wähle einen Verteiler', + required: true, + rules: [required('einen Verteiler')], + componentName: 'ec-select-verteiler' +} + +export const verteilerTypeConfig: IConfig = { + name: 'type', + required: true, + rules: [ + required('ein Verteilertyp'), + inArray('einen Verteilertyp', 'An', 'CC', 'BCC') + ] +} + +export const bezeichnungConfig: IConfig = { + name: 'bezeichnung', + label: 'Bezeichnung', + required: true, + rules: [ + required('eine Bezeichnung'), + maxLength('eine Bezeichnung', 'die', 50) + ] +} + +export const personConfig: IConfig = { + name: 'personID', + label: 'Person wählen', + required: true, + rules: [required('eine Person')], + componentName: 'ec-select-person' +} diff --git a/src/plugins/lib/design/list.ts b/src/plugins/lib/design/list.ts index da8d652..950a459 100644 --- a/src/plugins/lib/design/list.ts +++ b/src/plugins/lib/design/list.ts @@ -48,7 +48,7 @@ export default class Liste extends Vue { color: 'indigo' } }, - [mapItem.icon || this.icon] + [mapItem.map.icon || this.icon] ) ]) ] diff --git a/src/plugins/rules/index.ts b/src/plugins/rules/index.ts new file mode 100644 index 0000000..13977aa --- /dev/null +++ b/src/plugins/rules/index.ts @@ -0,0 +1,59 @@ +type siType = string | number | boolean + +export type rule = Array< + | rules + | rules + | rules + | rules +> + +type rulesFactory = (...args: Array) => rule + +type rules = (value: R) => true | string + +export const required = (name: string) => (value: siType) => + !value ? `Du musst ${name} eingeben!` : true + +export const minLength = ( + name: string, + artikel: string, + length: number +) => (value: string) => + value.length < length + ? `Du musst ${name} angeben, ${artikel} mindestens ${length} Zeichen lang ist!` + : true + +export const maxLength = ( + name: string, + artikel: string, + length: number +) => (value: string) => + value.length > length + ? `Du musst ${name} angeben, ${artikel} maximal ${length} Zeichen lang ist!` + : true + +export const exactLength = ( + name: string, + artikel: string, + length: number +) => (value: string) => + value.length !== length + ? `Du musst ${name} angeben, ${artikel} genau ${length} Zeichen lang ist!` + : true + +export const inArray = ( + name: string, + ...values: Array +) => (value: string) => + values.indexOf(value) === -1 + ? `${name} muss ein Element aus ${values.join( + ',' + )} sein!` + : true + +export const isType = (name: string, type: string) => ( + value: siType +) => + typeof value === type + ? true + : `${name} muss vom Typ ${type} sein!` diff --git a/src/plugins/widgets/widgetContainer.vue b/src/plugins/widgets/widgetContainer.vue index e9edd67..aeb03f0 100644 --- a/src/plugins/widgets/widgetContainer.vue +++ b/src/plugins/widgets/widgetContainer.vue @@ -46,13 +46,16 @@ export default class widgetContainer extends Vue { onShowDialofChange(val: boolean) {} } - diff --git a/src/plugins/widgets/widgets/losungen.vue b/src/plugins/widgets/widgets/losungen.vue index ee82cd9..3ab7c2c 100644 --- a/src/plugins/widgets/widgets/losungen.vue +++ b/src/plugins/widgets/widgets/losungen.vue @@ -5,6 +5,8 @@

Die Losungen

+ +
diff --git a/src/views/Admin.vue b/src/views/Admin.vue index 9bd85a5..58a165b 100644 --- a/src/views/Admin.vue +++ b/src/views/Admin.vue @@ -52,7 +52,7 @@ + \ No newline at end of file diff --git a/src/views/personen/liste.vue b/src/views/personen/liste.vue index 5d84c7c..c44d2ee 100644 --- a/src/views/personen/liste.vue +++ b/src/views/personen/liste.vue @@ -14,17 +14,25 @@ + \ No newline at end of file diff --git a/src/views/veranstaltungen/details.vue b/src/views/veranstaltungen/details.vue index a67af5b..cb34233 100644 --- a/src/views/veranstaltungen/details.vue +++ b/src/views/veranstaltungen/details.vue @@ -9,7 +9,7 @@ - + contacts @@ -27,18 +27,89 @@ - + + + Edit Infobrief + Edit Bestätigungsbrief + + diff --git a/tsconfig.json b/tsconfig.json index bb5a5cf..6846bf9 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "target": "es5", + "target": "es6", "module": "esnext", "strict": true, "jsx": "preserve", @@ -11,13 +11,9 @@ "allowSyntheticDefaultImports": true, "sourceMap": true, "baseUrl": ".", - "types": [ - "node" - ], + "types": ["node"], "paths": { - "@/*": [ - "src/*" - ] + "@/*": ["src/*"] }, "lib": [ "es2017", @@ -28,14 +24,6 @@ "scripthost" ] }, - "include": [ - "src/**/*.ts", - "src/**/*.tsx", - "src/**/*.vue", - "tests/**/*.ts", - "tests/**/*.tsx" - ], - "exclude": [ - "node_modules" - ] -} \ No newline at end of file + "include": ["src/**/*.ts", "src/**/*.vue"], + "exclude": ["node_modules"] +} diff --git a/updateVersion.js b/updateVersion.js new file mode 100644 index 0000000..c470c40 --- /dev/null +++ b/updateVersion.js @@ -0,0 +1,33 @@ +const readline = require('readline') + +const fs = require('fs') + +const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout +}) + +let mainPack = require('./package.json') +let elPack = require('./electron/package.json') + +rl.question( + `Aktuelle Version ist ${ + mainPack.version + }. Was soll die neue Version sein?\n\n`, + answer => { + mainPack.version = answer + elPack.version = answer + + fs.writeFileSync( + './package.json', + JSON.stringify(mainPack, null, 2) + '\n' + ) + + fs.writeFileSync( + './electron/package.json', + JSON.stringify(elPack, null, 2) + '\n' + ) + + rl.close() + } +) diff --git a/yarn.lock b/yarn.lock index a58bc55..57f93fe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -757,8 +757,8 @@ resolved "https://registry.yarnpkg.com/@types/koa-compose/-/koa-compose-3.2.2.tgz#dc106e000bbf92a3ac900f756df47344887ee847" "@types/koa-router@^7.0.27": - version "7.0.29" - resolved "https://registry.yarnpkg.com/@types/koa-router/-/koa-router-7.0.29.tgz#efdd3c39297944e8a55764f7909abcfd9bf51ca6" + version "7.0.30" + resolved "https://registry.yarnpkg.com/@types/koa-router/-/koa-router-7.0.30.tgz#636f399bff7c43f83c016b971b028c3f6316ea26" dependencies: "@types/koa" "*" @@ -785,8 +785,8 @@ "@types/node" "*" "@types/node@*": - version "10.3.4" - resolved "https://registry.yarnpkg.com/@types/node/-/node-10.3.4.tgz#c74e8aec19e555df44609b8057311052a2c84d9e" + version "10.5.1" + resolved "https://registry.yarnpkg.com/@types/node/-/node-10.5.1.tgz#d578446f4abff5c0b49ade9b4e5274f6badaadfc" "@types/node@10.1.2": version "10.1.2" @@ -1158,8 +1158,8 @@ ajv@^5.1.0: json-schema-traverse "^0.3.0" ajv@^6.0.1, ajv@^6.1.0: - version "6.5.1" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.1.tgz#88ebc1263c7133937d108b80c5572e64e1d9322d" + version "6.5.2" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.2.tgz#678495f9b82f7cca6be248dd92f59bff5e1f4360" dependencies: fast-deep-equal "^2.0.1" fast-json-stable-stringify "^2.0.0" @@ -1339,8 +1339,8 @@ apollo-utilities@^1.0.0, apollo-utilities@^1.0.15, apollo-utilities@^1.0.16: fast-json-stable-stringify "^2.0.0" app-root-path@^2.0.1: - version "2.0.1" - resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.0.1.tgz#cd62dcf8e4fd5a417efc664d2e5b10653c651b46" + version "2.1.0" + resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a" aproba@^1.0.3, aproba@^1.1.1: version "1.2.0" @@ -1512,14 +1512,14 @@ autoprefixer@^6.3.1: postcss-value-parser "^3.2.3" autoprefixer@^8.2.0, autoprefixer@^8.4.1: - version "8.6.3" - resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.3.tgz#1d38a129e6a4582a565b6570d16f2d7d3de9cbf9" + version "8.6.4" + resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-8.6.4.tgz#6bf501de426a3b95973f5d237dbcc9181e9904d2" dependencies: browserslist "^3.2.8" - caniuse-lite "^1.0.30000856" + caniuse-lite "^1.0.30000859" normalize-range "^0.1.2" num2fraction "^1.2.2" - postcss "^6.0.22" + postcss "^6.0.23" postcss-value-parser "^3.2.3" aws-sign2@~0.6.0: @@ -1611,8 +1611,8 @@ batch@0.6.1: resolved "https://registry.yarnpkg.com/batch/-/batch-0.6.1.tgz#dc34314f4e679318093fc760272525f94bf25c16" bcrypt-pbkdf@^1.0.0: - version "1.0.1" - resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz#63bc5dcb61331b92bc05fd528953c33462a06f8d" + version "1.0.2" + resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e" dependencies: tweetnacl "^0.14.3" @@ -1915,12 +1915,12 @@ caniuse-api@^1.5.2: lodash.uniq "^4.5.0" caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639: - version "1.0.30000856" - resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000856.tgz#fbebb99abe15a5654fc7747ebb5315bdfde3358f" + version "1.0.30000861" + resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000861.tgz#6f27840a130c10c0b1e00fab7729c1faf8f4ccd3" -caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000856: - version "1.0.30000856" - resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000856.tgz#ecc16978135a6f219b138991eb62009d25ee8daa" +caniuse-lite@^1.0.30000844, caniuse-lite@^1.0.30000859: + version "1.0.30000861" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000861.tgz#a32bb9607c34e4639b497ff37de746fc8a160410" capture-stack-trace@^1.0.0: version "1.0.0" @@ -2165,7 +2165,7 @@ combined-stream@1.0.6, combined-stream@^1.0.5, combined-stream@~1.0.5: dependencies: delayed-stream "~1.0.0" -commander@2.15.x, commander@^2.12.1, commander@^2.13.0, commander@^2.15.1, commander@^2.9.0, commander@~2.15.0: +commander@2.15.x, commander@~2.15.0: version "2.15.1" resolved "https://registry.yarnpkg.com/commander/-/commander-2.15.1.tgz#df46e867d0fc2aec66a34662b406a9ccafff5b0f" @@ -2173,6 +2173,10 @@ commander@2.6.0: version "2.6.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.6.0.tgz#9df7e52fb2a0cb0fb89058ee80c3104225f37e1d" +commander@^2.12.1, commander@^2.13.0, commander@^2.15.1, commander@^2.9.0: + version "2.16.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-2.16.0.tgz#f16390593996ceb4f3eeb020b31d78528f7f8a50" + commander@~2.13.0: version "2.13.0" resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c" @@ -2321,8 +2325,8 @@ copy-descriptor@^0.1.0: resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d" copy-webpack-plugin@^4.5.1: - version "4.5.1" - resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.1.tgz#fc4f68f4add837cc5e13d111b20715793225d29c" + version "4.5.2" + resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c" dependencies: cacache "^10.0.4" find-cache-dir "^1.0.0" @@ -2914,9 +2918,9 @@ end-of-stream@^1.0.0, end-of-stream@^1.1.0: dependencies: once "^1.4.0" -enhanced-resolve@^4.0.0: - version "4.0.0" - resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.0.0.tgz#e34a6eaa790f62fccd71d93959f56b2b432db10a" +enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f" dependencies: graceful-fs "^4.1.2" memory-fs "^0.4.0" @@ -3903,8 +3907,8 @@ home-path@^1.0.1: resolved "https://registry.yarnpkg.com/home-path/-/home-path-1.0.6.tgz#d549dc2465388a7f8667242c5b31588d29af29fc" hosted-git-info@^2.1.4: - version "2.6.0" - resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222" + version "2.6.1" + resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.6.1.tgz#6e4cee78b01bb849dcf93527708c69fdbee410df" hpack.js@^2.1.6: version "2.1.6" @@ -3924,8 +3928,8 @@ html-entities@^1.2.0: resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f" html-minifier@^3.2.3: - version "3.5.16" - resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.16.tgz#39f5aabaf78bdfc057fe67334226efd7f3851175" + version "3.5.17" + resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.17.tgz#fe9834c4288e4d5b4dfe18fbc7f3f811c108e5ea" dependencies: camel-case "3.0.x" clean-css "4.1.x" @@ -3933,7 +3937,7 @@ html-minifier@^3.2.3: he "1.1.x" param-case "2.1.x" relateurl "0.2.x" - uglify-js "3.3.x" + uglify-js "3.4.x" html-webpack-plugin@^3.2.0: version "3.2.0" @@ -4345,12 +4349,6 @@ is-obj@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f" -is-odd@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/is-odd/-/is-odd-2.0.0.tgz#7646624671fd7ea558ccd9a2795182f2958f1b24" - dependencies: - is-number "^4.0.0" - is-path-cwd@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d" @@ -5202,9 +5200,10 @@ min-document@^2.19.0: dom-walk "^0.1.0" mini-css-extract-plugin@^0.4.0: - version "0.4.0" - resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.0.tgz#ff3bf08bee96e618e177c16ca6131bfecef707f9" + version "0.4.1" + resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.4.1.tgz#d2bcf77bb2596b8e4bd9257e43d3f9164c2e86cb" dependencies: + "@webpack-contrib/schema-utils" "^1.0.0-beta.0" loader-utils "^1.1.0" webpack-sources "^1.1.0" @@ -5339,15 +5338,14 @@ nanobus@^4.3.1: remove-array-items "^1.0.0" nanomatch@^1.2.9: - version "1.2.9" - resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.9.tgz#879f7150cb2dab7a471259066c104eee6e0fa7c2" + version "1.2.13" + resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119" dependencies: arr-diff "^4.0.0" array-unique "^0.3.2" define-property "^2.0.2" extend-shallow "^3.0.2" fragment-cache "^0.2.1" - is-odd "^2.0.0" is-windows "^1.0.2" kind-of "^6.0.2" object.pick "^1.3.0" @@ -5471,8 +5469,8 @@ node-libs-browser@^2.0.0: vm-browserify "0.0.4" node-pre-gyp@^0.10.0: - version "0.10.0" - resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.0.tgz#6e4ef5bb5c5203c6552448828c852c40111aac46" + version "0.10.2" + resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.2.tgz#e8945c20ef6795a20aac2b44f036eb13cf5146e3" dependencies: detect-libc "^1.0.2" mkdirp "^0.5.1" @@ -5480,7 +5478,7 @@ node-pre-gyp@^0.10.0: nopt "^4.0.1" npm-packlist "^1.1.6" npmlog "^4.0.2" - rc "^1.1.7" + rc "^1.2.7" rimraf "^2.6.1" semver "^5.3.0" tar "^4" @@ -5716,8 +5714,8 @@ opn@^5.1.0, opn@^5.2.0: is-wsl "^1.1.0" optimize-css-assets-webpack-plugin@^4.0.0, optimize-css-assets-webpack-plugin@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-4.0.2.tgz#813d511d20fe5d9a605458441ed97074d79c1122" + version "4.0.3" + resolved "https://registry.yarnpkg.com/optimize-css-assets-webpack-plugin/-/optimize-css-assets-webpack-plugin-4.0.3.tgz#4f714e276b279700892c4a6202b7e22812d6f683" dependencies: cssnano "^3.10.0" last-call-webpack-plugin "^3.0.0" @@ -6265,7 +6263,7 @@ postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0 source-map "^0.5.6" supports-color "^3.2.3" -postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.22: +postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.20, postcss@^6.0.23: version "6.0.23" resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324" dependencies: @@ -6282,8 +6280,8 @@ preserve@^0.2.0: resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b" prettier@^1.13.0: - version "1.13.5" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.5.tgz#7ae2076998c8edce79d63834e9b7b09fead6bfd0" + version "1.13.7" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-1.13.7.tgz#850f3b8af784a49a6ea2d2eaa7ed1428a34b7281" pretty-bytes@^1.0.2: version "1.0.4" @@ -6476,7 +6474,7 @@ raw-body@2.3.2: iconv-lite "0.4.19" unpipe "1.0.0" -rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.1.7: +rc@^1.0.1, rc@^1.1.2, rc@^1.1.6, rc@^1.2.7: version "1.2.8" resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed" dependencies: @@ -7336,8 +7334,8 @@ statuses@~1.4.0: resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087" std-env@^1.1.0, std-env@^1.3.0: - version "1.3.0" - resolved "https://registry.yarnpkg.com/std-env/-/std-env-1.3.0.tgz#8ce754a401a61f1ac49c8eb55f2a8c0c63d54954" + version "1.3.1" + resolved "https://registry.yarnpkg.com/std-env/-/std-env-1.3.1.tgz#4e1758412439e9ece1d437b1b098551911aa44ee" dependencies: is-ci "^1.1.0" @@ -7700,8 +7698,8 @@ toposort@^1.0.0: resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029" tough-cookie@>=2.3.3: - version "2.4.2" - resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.2.tgz#aa9133154518b494efab98a58247bfc38818c00c" + version "2.4.3" + resolved "https://registry.yarnpkg.com/tough-cookie/-/tough-cookie-2.4.3.tgz#53f36da3f47783b0925afa06ff9f3b165280f781" dependencies: psl "^1.1.24" punycode "^1.4.1" @@ -7735,12 +7733,12 @@ trim-right@^1.0.1: glob "^6.0.4" tryer@^1.0.0: - version "1.0.0" - resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.0.tgz#027b69fa823225e551cace3ef03b11f6ab37c1d7" + version "1.0.1" + resolved "https://registry.yarnpkg.com/tryer/-/tryer-1.0.1.tgz#f2c85406800b9b0f74c9f7465b81eaad241252f8" ts-loader@^4.3.1: - version "4.4.1" - resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.4.1.tgz#c93a46eea430ebce1f790dfe438caefb8670d365" + version "4.4.2" + resolved "https://registry.yarnpkg.com/ts-loader/-/ts-loader-4.4.2.tgz#778d4464b24436873c78f7f9e914d88194c2a248" dependencies: chalk "^2.3.0" enhanced-resolve "^4.0.0" @@ -7749,8 +7747,8 @@ ts-loader@^4.3.1: semver "^5.0.1" tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0: - version "1.9.2" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.2.tgz#8be0cc9a1f6dc7727c38deb16c2ebd1a2892988e" + version "1.9.3" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.9.3.tgz#d7e4dd79245d85428c4d7e4822a79917954ca286" tslint@^5.10.0: version "5.10.0" @@ -7819,16 +7817,16 @@ uglify-es@^3.3.4: commander "~2.13.0" source-map "~0.6.1" -uglify-js@3.3.x: - version "3.3.28" - resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.3.28.tgz#0efb9a13850e11303361c1051f64d2ec68d9be06" +uglify-js@3.4.x: + version "3.4.2" + resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.2.tgz#70511a390eb62423675ba63c374ba1abf045116c" dependencies: commander "~2.15.0" source-map "~0.6.1" uglifyjs-webpack-plugin@^1.2.4, uglifyjs-webpack-plugin@^1.2.5: - version "1.2.6" - resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.6.tgz#f4bb44f02431e82b301d8d4624330a6a35729381" + version "1.2.7" + resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.2.7.tgz#57638dd99c853a1ebfe9d97b42160a8a507f9d00" dependencies: cacache "^10.0.4" find-cache-dir "^1.0.0" @@ -8023,8 +8021,8 @@ utils-merge@1.0.1: resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713" uuid@^3.0.0, uuid@^3.0.1, uuid@^3.1.0: - version "3.2.1" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.2.1.tgz#12c528bb9d58d0b9265d9a2f6f0fe8be17ff1f14" + version "3.3.2" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" v8-compile-cache@^2.0.0: version "2.0.0" @@ -8216,9 +8214,9 @@ vuepress@^0.10.0: webpackbar "^2.6.1" workbox-build "^3.1.0" -vuetify@^1.1.0-rc.2: - version "1.1.0-rc.2" - resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.1.0-rc.2.tgz#55081cc45b85f5e2ba86d6dfa45dd6abaf91726f" +vuetify@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/vuetify/-/vuetify-1.1.1.tgz#8d8f64306a45aaf862487addae8decf082dac0a3" watchpack@^1.5.0: version "1.6.0" @@ -8372,8 +8370,8 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0: source-map "~0.6.1" webpack@^4.8.1, webpack@^4.8.2: - version "4.12.0" - resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.12.0.tgz#14758e035ae69747f68dd0edf3c5a572a82bdee9" + version "4.14.0" + resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.14.0.tgz#bbcc40dbf9a34129491b431574189d3802972243" dependencies: "@webassemblyjs/ast" "1.5.12" "@webassemblyjs/helper-module-context" "1.5.12" @@ -8385,7 +8383,7 @@ webpack@^4.8.1, webpack@^4.8.2: ajv "^6.1.0" ajv-keywords "^3.1.0" chrome-trace-event "^1.0.0" - enhanced-resolve "^4.0.0" + enhanced-resolve "^4.1.0" eslint-scope "^3.7.1" json-parse-better-errors "^1.0.2" loader-runner "^2.3.0" @@ -8461,21 +8459,21 @@ widest-line@^2.0.0: dependencies: string-width "^2.1.1" -workbox-background-sync@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-3.3.0.tgz#87e212715391d2002274f526e77851cfab86ed8a" +workbox-background-sync@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-background-sync/-/workbox-background-sync-3.3.1.tgz#6778c174f3a31219f3de3e606b6974abd4ec30e7" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" -workbox-broadcast-cache-update@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-broadcast-cache-update/-/workbox-broadcast-cache-update-3.3.0.tgz#ce4fa56656de5024f567c06f6614e36961c30c0f" +workbox-broadcast-cache-update@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-broadcast-cache-update/-/workbox-broadcast-cache-update-3.3.1.tgz#d57099a29d0aea6d15dfc68e4f5b33628f39b43e" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" workbox-build@^3.1.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-3.3.0.tgz#7f3fa9de9714dab318122933b9615a38d94d643d" + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-build/-/workbox-build-3.3.1.tgz#de465a62b31e1caa2465b6f1b04b4e5756337b21" dependencies: babel-runtime "^6.26.0" common-tags "^1.4.0" @@ -8484,77 +8482,77 @@ workbox-build@^3.1.0: joi "^11.1.1" lodash.template "^4.4.0" pretty-bytes "^4.0.2" - workbox-background-sync "^3.3.0" - workbox-broadcast-cache-update "^3.3.0" - workbox-cache-expiration "^3.3.0" - workbox-cacheable-response "^3.3.0" - workbox-core "^3.3.0" - workbox-google-analytics "^3.3.0" - workbox-precaching "^3.3.0" - workbox-range-requests "^3.3.0" - workbox-routing "^3.3.0" - workbox-strategies "^3.3.0" - workbox-streams "^3.3.0" - workbox-sw "^3.3.0" - -workbox-cache-expiration@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-cache-expiration/-/workbox-cache-expiration-3.3.0.tgz#fe9cfde8e8168fa25ff778c6e2eda54181f58506" + workbox-background-sync "^3.3.1" + workbox-broadcast-cache-update "^3.3.1" + workbox-cache-expiration "^3.3.1" + workbox-cacheable-response "^3.3.1" + workbox-core "^3.3.1" + workbox-google-analytics "^3.3.1" + workbox-precaching "^3.3.1" + workbox-range-requests "^3.3.1" + workbox-routing "^3.3.1" + workbox-strategies "^3.3.1" + workbox-streams "^3.3.1" + workbox-sw "^3.3.1" + +workbox-cache-expiration@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-cache-expiration/-/workbox-cache-expiration-3.3.1.tgz#f16a34caa17572b8b9332f2208aed3feea62c038" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" -workbox-cacheable-response@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-3.3.0.tgz#b7d3904fa30baf7da271d73dd2f0da7518378acf" +workbox-cacheable-response@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-cacheable-response/-/workbox-cacheable-response-3.3.1.tgz#0a9564c4d765610c8ef0676ab0583c5949a26e4b" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" -workbox-core@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-3.3.0.tgz#3606223514a85a0935550ed15d973c12b12ff680" +workbox-core@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-core/-/workbox-core-3.3.1.tgz#4c7daeea08fe5646ea960b226572e899ddc7bc30" -workbox-google-analytics@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-3.3.0.tgz#380ecefc24040db9e191b2789bced19ad61c8ccb" +workbox-google-analytics@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-google-analytics/-/workbox-google-analytics-3.3.1.tgz#7a90b1e9193c32479e6d7acf07d547e95873887a" dependencies: - workbox-background-sync "^3.3.0" - workbox-core "^3.3.0" - workbox-routing "^3.3.0" - workbox-strategies "^3.3.0" + workbox-background-sync "^3.3.1" + workbox-core "^3.3.1" + workbox-routing "^3.3.1" + workbox-strategies "^3.3.1" -workbox-precaching@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-3.3.0.tgz#471bbc26bd3e92b24fd9d636842cf3f358302bd2" +workbox-precaching@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-precaching/-/workbox-precaching-3.3.1.tgz#2543caf903d46ef96159925bd5794bc5d58d0f3b" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" -workbox-range-requests@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-3.3.0.tgz#9703cb91e9ea9104ed09c545a87e25f41002ddce" +workbox-range-requests@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-range-requests/-/workbox-range-requests-3.3.1.tgz#ff51544f389e96c5c10938cd3a0117f2edfd5076" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" -workbox-routing@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-3.3.0.tgz#8184d0159c8c4e4c9dd7a0da08e28e579e372319" +workbox-routing@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-routing/-/workbox-routing-3.3.1.tgz#c11b9c64857096e2bc5225471a79d6b0aadd86a8" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" -workbox-strategies@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-3.3.0.tgz#0681df07ebf4628454aa91317aa87de2d1ded6c6" +workbox-strategies@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-strategies/-/workbox-strategies-3.3.1.tgz#2af87723661847269e14f2a0d8f1c6d9245d5e68" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" -workbox-streams@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-3.3.0.tgz#7591e37a08bf65b32d1db076b86900a8a4b7d02c" +workbox-streams@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-streams/-/workbox-streams-3.3.1.tgz#fdde3f0f2b9f52832999a4b4a223ff06c28d125f" dependencies: - workbox-core "^3.3.0" + workbox-core "^3.3.1" -workbox-sw@^3.3.0: - version "3.3.0" - resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-3.3.0.tgz#1a9fd728951c76b86225b472f9e37088913c9bc4" +workbox-sw@^3.3.1: + version "3.3.1" + resolved "https://registry.yarnpkg.com/workbox-sw/-/workbox-sw-3.3.1.tgz#c18fb6546948b9da562da5b33e36fdf3e3dbcac1" worker-farm@^1.5.2: version "1.6.0" @@ -8633,8 +8631,8 @@ yallist@^3.0.0, yallist@^3.0.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9" yargs-parser@^10.0.0: - version "10.0.0" - resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.0.0.tgz#c737c93de2567657750cb1f2c00be639fd19c994" + version "10.1.0" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8" dependencies: camelcase "^4.1.0"