From b22669fc6356fe8c61b9b1e1c7e2e43f8f091d4f Mon Sep 17 00:00:00 2001 From: vishnuraghavb Date: Thu, 1 Apr 2021 16:25:35 +0530 Subject: [PATCH] ns update --- .update_backup/package-lock.json | 1413 +++++++++-------- .update_backup/package.json | 35 +- app/app.scss | 1050 +++++------- app/components/App.vue | 495 ------ app/components/EditRecipe.vue | 449 +++--- app/components/EnRecipes.vue | 1285 +++++++++------ app/components/GroceryList.vue | 33 +- app/components/MealPlanner.vue | 364 +++-- app/components/Settings.vue | 69 +- app/components/Settings/About.vue | 91 +- app/components/Settings/BackupInfo.vue | 15 + app/components/Settings/Database.vue | 113 +- app/components/Settings/Help.vue | 69 +- app/components/Settings/Interface.vue | 117 +- app/components/Settings/Options.vue | 81 +- app/components/Settings/Reset.vue | 74 +- app/components/ViewRecipe.vue | 964 +++++------ app/components/modal/ActionDialog.vue | 97 +- .../modal/ActionDialogWithSearch.vue | 112 +- app/components/modal/ConfirmDialog.vue | 59 +- app/components/modal/Filters.vue | 272 ++++ app/components/modal/ListPicker.vue | 31 +- app/components/modal/PromptDialog.vue | 72 +- app/components/modal/ShareChooser.vue | 89 -- app/i18n/en-GB.default.json | 11 +- app/main.js | 35 +- .../src/main/res/drawable-hdpi/cam.png | Bin 687 -> 0 bytes .../src/main/res/drawable-hdpi/plus.png | Bin 304 -> 0 bytes .../src/main/res/drawable-hdpi/share.png | Bin 676 -> 0 bytes .../src/main/res/drawable-ldpi/cam.png | Bin 381 -> 0 bytes .../src/main/res/drawable-ldpi/plus.png | Bin 183 -> 0 bytes .../src/main/res/drawable-ldpi/share.png | Bin 379 -> 0 bytes .../src/main/res/drawable-mdpi/cam.png | Bin 359 -> 0 bytes .../src/main/res/drawable-mdpi/plus.png | Bin 186 -> 0 bytes .../src/main/res/drawable-mdpi/share.png | Bin 353 -> 0 bytes .../src/main/res/drawable-xhdpi/cam.png | Bin 744 -> 0 bytes .../src/main/res/drawable-xhdpi/plus.png | Bin 275 -> 0 bytes .../src/main/res/drawable-xhdpi/share.png | Bin 718 -> 0 bytes .../src/main/res/drawable-xxhdpi/cam.png | Bin 1381 -> 0 bytes .../src/main/res/drawable-xxhdpi/plus.png | Bin 440 -> 0 bytes .../src/main/res/drawable-xxhdpi/share.png | Bin 1368 -> 0 bytes .../src/main/res/drawable-xxxhdpi/cam.png | Bin 1576 -> 0 bytes .../src/main/res/drawable-xxxhdpi/plus.png | Bin 502 -> 0 bytes .../src/main/res/drawable-xxxhdpi/share.png | Bin 1534 -> 0 bytes .../src/main/res/values-ca-rAD/strings.xml | 4 + .../src/main/res/values-ca/strings.xml | 4 + .../src/main/res/values-da/strings.xml | 4 + .../src/main/res/values-de/strings.xml | 4 + .../src/main/res/values-es/strings.xml | 4 + .../src/main/res/values-fr-rBE/strings.xml | 4 + .../src/main/res/values-fr-rCA/strings.xml | 4 + .../src/main/res/values-fr-rCH/strings.xml | 4 + .../src/main/res/values-fr/strings.xml | 4 + .../src/main/res/values-hi/strings.xml | 4 + .../src/main/res/values-id/strings.xml | 4 + .../src/main/res/values-it/strings.xml | 4 + .../src/main/res/values-kn/strings.xml | 4 + .../src/main/res/values-ml/strings.xml | 4 + .../src/main/res/values-nb-rNO/strings.xml | 4 + .../src/main/res/values-nl/strings.xml | 4 + .../src/main/res/values-pt-rBR/strings.xml | 4 + .../src/main/res/values-pt/strings.xml | 4 + .../src/main/res/values-ru/strings.xml | 4 + .../src/main/res/values-ta/strings.xml | 4 + .../src/main/res/values-te/strings.xml | 4 + .../src/main/res/values-v21/styles.xml | 23 - .../src/main/res/values-v29/styles.xml | 6 - .../Android/src/main/res/values/strings.xml | 10 +- .../Android/src/main/res/values/styles.xml | 53 +- app/shared/mixins.js | 20 + app/shared/utils.js | 16 +- app/store.js | 67 +- .../metadata/android/en-US/changelogs/7.txt | 10 +- package-lock.json | 516 ++---- package.json | 36 +- 75 files changed, 3872 insertions(+), 4464 deletions(-) delete mode 100644 app/components/App.vue create mode 100644 app/components/Settings/BackupInfo.vue create mode 100644 app/components/modal/Filters.vue delete mode 100644 app/components/modal/ShareChooser.vue delete mode 100644 app/resources/Android/src/main/res/drawable-hdpi/cam.png delete mode 100644 app/resources/Android/src/main/res/drawable-hdpi/plus.png delete mode 100644 app/resources/Android/src/main/res/drawable-hdpi/share.png delete mode 100644 app/resources/Android/src/main/res/drawable-ldpi/cam.png delete mode 100644 app/resources/Android/src/main/res/drawable-ldpi/plus.png delete mode 100644 app/resources/Android/src/main/res/drawable-ldpi/share.png delete mode 100644 app/resources/Android/src/main/res/drawable-mdpi/cam.png delete mode 100644 app/resources/Android/src/main/res/drawable-mdpi/plus.png delete mode 100644 app/resources/Android/src/main/res/drawable-mdpi/share.png delete mode 100644 app/resources/Android/src/main/res/drawable-xhdpi/cam.png delete mode 100644 app/resources/Android/src/main/res/drawable-xhdpi/plus.png delete mode 100644 app/resources/Android/src/main/res/drawable-xhdpi/share.png delete mode 100644 app/resources/Android/src/main/res/drawable-xxhdpi/cam.png delete mode 100644 app/resources/Android/src/main/res/drawable-xxhdpi/plus.png delete mode 100644 app/resources/Android/src/main/res/drawable-xxhdpi/share.png delete mode 100644 app/resources/Android/src/main/res/drawable-xxxhdpi/cam.png delete mode 100644 app/resources/Android/src/main/res/drawable-xxxhdpi/plus.png delete mode 100644 app/resources/Android/src/main/res/drawable-xxxhdpi/share.png create mode 100644 app/shared/mixins.js diff --git a/.update_backup/package-lock.json b/.update_backup/package-lock.json index 39a2b0b6..bb59b9f5 100644 --- a/.update_backup/package-lock.json +++ b/.update_backup/package-lock.json @@ -9,29 +9,18 @@ "version": "1.0.0", "license": "GPL", "dependencies": { - "@nativescript-community/gesturehandler": "^0.1.39", "@nativescript-community/perms": "^2.1.5", "@nativescript-community/ui-collectionview": "^4.0.29", - "@nativescript-community/ui-drawer": "^0.0.24", - "@nativescript-community/ui-material-activityindicator": "^5.2.10", - "@nativescript-community/ui-material-button": "^5.2.10", - "@nativescript-community/ui-material-floatingactionbutton": "^5.2.10", - "@nativescript-community/ui-material-progress": "^5.2.10", - "@nativescript-community/ui-material-snackbar": "^5.2.10", "@nativescript/core": "7.3.0", "@nativescript/localize": "^5.0.4", "@nativescript/social-share": "^2.0.4", - "@nativescript/theme": "^3.0.1", "@nativescript/zip": "^5.0.0", - "@nstudio/nativescript-checkbox": "^2.0.4", "@triniwiz/nativescript-accelerometer": "^4.0.3", "@triniwiz/nativescript-couchbase": "^1.2.2", - "nativescript-feedback": "^2.0.0", "nativescript-imagecropper": "^4.0.1", "nativescript-intl": "^4.0.2", "nativescript-plugin-filepicker": "^1.0.0", "nativescript-toast": "^2.0.0", - "nativescript-vibrate": "^4.0.1", "nativescript-vue": "^2.8.4", "vuex": "^3.6.2" }, @@ -39,7 +28,7 @@ "@babel/core": "^7.12.10", "@babel/preset-env": "^7.12.11", "@nativescript/android": "7.0.1", - "@nativescript/webpack": "^3.0.8", + "@nativescript/webpack": "4.1.0", "@types/node": "^14.14.20", "babel-loader": "^8.2.2", "nativescript-vue-template-compiler": "^2.8.3", @@ -1296,92 +1285,16 @@ "to-fast-properties": "^2.0.0" } }, - "node_modules/@nativescript-community/gesturehandler": { - "version": "0.1.39", - "resolved": "https://registry.npmjs.org/@nativescript-community/gesturehandler/-/gesturehandler-0.1.39.tgz", - "integrity": "sha512-QVI9fOQvrjSnHGTZxj362bGsLwblloeJAs5ITX6UvjOW7A4IoaBl7++RBL5E9z0WkEHFX8A3Vvj4CoNBnhgH0g==", - "dependencies": { - "@nativescript-community/observable": "^2.0.8" - } - }, - "node_modules/@nativescript-community/observable": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@nativescript-community/observable/-/observable-2.0.9.tgz", - "integrity": "sha512-JsNztvBEdUH7I3+ECnIOOJ39J2sEdeaBSFk4JIkrsFeVGOx1E21SSJNkkQNN9H2BUsF9JgDoQ6rGKl3hmJkXTw==" - }, "node_modules/@nativescript-community/perms": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nativescript-community/perms/-/perms-2.1.5.tgz", "integrity": "sha512-YHYgzeOvYkb6Nj2JAgor8D5YLxYvj0sxr2JfnVrkb7c/Z41lTr0PaoHvhElvK6iERobbGQ1w3HmV9eCHrDgv9g==" }, - "node_modules/@nativescript-community/text": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@nativescript-community/text/-/text-1.4.9.tgz", - "integrity": "sha512-U90qiuD513AY38rtNqyy67+7g2foup95kpnxkCiaJuBSkBf8nbdLpuLur9oOuCqndAw0X/N1gklE+tq2/BF0DA==" - }, "node_modules/@nativescript-community/ui-collectionview": { "version": "4.0.29", "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.29.tgz", "integrity": "sha512-u+HR3XNbws8ORus4lcKzMr5TWUR/w43OszscJIfv1orGI7ZnqrUHvPyiVz2Ff5+W78s1VPTQdMg0tyGjSX/qEg==" }, - "node_modules/@nativescript-community/ui-drawer": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-drawer/-/ui-drawer-0.0.24.tgz", - "integrity": "sha512-Vv+ix4PMks88VFypWPRv/1OkKFyehRIbuJRi5/EjDVMMA5SOiDEmkBwxzKzglBEx2mq+VNT7/QGZ11WVxHD04g==", - "dependencies": { - "@nativescript-community/gesturehandler": "^0.1.35" - } - }, - "node_modules/@nativescript-community/ui-material-activityindicator": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-activityindicator/-/ui-material-activityindicator-5.2.10.tgz", - "integrity": "sha512-1SWwnMj/QTr0FjjY32P+nigT4qzIMBFiPEfN8/eswJSkPWswJ4ZbJxYewP1jjgShEBOuap98x4KfWVSQ611DIw==", - "dependencies": { - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, - "node_modules/@nativescript-community/ui-material-button": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-button/-/ui-material-button-5.2.10.tgz", - "integrity": "sha512-Mv53d54L6mMt5IftylMJ/PAkjpOH34hXgEqJhmvcyr9oWzgckqYusp4LmIfvALc1uf7RQwS0NqSJuLF6N4Fl9Q==", - "dependencies": { - "@nativescript-community/text": "^1.3.10", - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, - "node_modules/@nativescript-community/ui-material-core": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-core/-/ui-material-core-5.2.10.tgz", - "integrity": "sha512-iaMZCc1lTCwCbAvfZcNEKQKZD6no3Zs6GJAq0Z9DQyo9A4JHTyl9bvW+M8I6h8q5ozjwnklhtMVHLnwa2dGPHg==", - "hasInstallScript": true, - "dependencies": { - "@nativescript/hook": "~2.0.0" - } - }, - "node_modules/@nativescript-community/ui-material-floatingactionbutton": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-floatingactionbutton/-/ui-material-floatingactionbutton-5.2.10.tgz", - "integrity": "sha512-x3aQNS9k1oYs763jXgMchQOnOIg87k2KQA/96VX0kemUl0Oco9p21uQexsbab5BQkk1wCVSgPesMwMrGpi21BA==", - "dependencies": { - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, - "node_modules/@nativescript-community/ui-material-progress": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-progress/-/ui-material-progress-5.2.10.tgz", - "integrity": "sha512-+eRODG/Ti0bsFbZbWxCnx39sjzzRmChVlsmJsvB8jSTSeUBJ2+1Putv3supGoh/hFpc5eRZoi84ZnpYioV04YQ==", - "dependencies": { - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, - "node_modules/@nativescript-community/ui-material-snackbar": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-snackbar/-/ui-material-snackbar-5.2.10.tgz", - "integrity": "sha512-VK6H8rnc7zHFoKxHvEQyR51+OM/J32RHgryd7A4JVAbIbCpD3d5+Hre7z24ZH6PM4MHzD0tmHhW3ZqdyXcGYMA==", - "dependencies": { - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, "node_modules/@nativescript/android": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/@nativescript/android/-/android-7.0.1.tgz", @@ -1426,22 +1339,17 @@ "resolved": "https://registry.npmjs.org/@nativescript/social-share/-/social-share-2.0.4.tgz", "integrity": "sha512-fP/lK/wMmHDmWo4Uq8gG/mpsgUjT+/y7Qc+IdCgiqQkgWQtgXTM7H1ecemMYD9dCZo+gZ5UyOXE/E23ZN0DBAg==" }, - "node_modules/@nativescript/theme": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@nativescript/theme/-/theme-3.0.1.tgz", - "integrity": "sha512-5rduFdEjjGyUgK+jaJ/2EHxi+qAgTZuK9XgfxHw0KJAIIWP9HNL8JV8IVUBeIodRPHhSJZJVQT7t+8peH/4dVQ==" - }, "node_modules/@nativescript/webpack": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-3.0.9.tgz", - "integrity": "sha512-PK1aJCgW4niMl6pkDeadqRqx8nZmtfDhMnVmj5FGzY7pt99YcX+m1ixciidUjYXzcsxj9huPOq4moodX2m3JhQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-4.1.0.tgz", + "integrity": "sha512-/GU4+dCPBlhnA+4k0IM6RasRYF+lI5DDpPDQPIU6lweZt6e+RnQlgpf+iwzj20iGWvSlSoDljyOT8fR1NMhqUw==", "dev": true, "hasInstallScript": true, "dependencies": { "@angular-devkit/core": "~10.0.0", "@nativescript/hook": "~2.0.0", "clean-webpack-plugin": "~3.0.0", - "copy-webpack-plugin": "~6.0.2", + "copy-webpack-plugin": "4.6.0", "css": "~3.0.0", "css-loader": "~4.2.0", "escape-string-regexp": "~4.0.0", @@ -1515,41 +1423,6 @@ "resolved": "https://registry.npmjs.org/@nativescript/zip/-/zip-5.0.0.tgz", "integrity": "sha512-iM1ln1KPRqNEKebvXkZGe3899+Esbp9DMF+hwTwC7Gd+oqhc4Wh8Tas97ormzMHR6iPasiOXs6wKuu625TYdIQ==" }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "2.0.4", - "run-parallel": "^1.1.9" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", - "dev": true, - "dependencies": { - "@nodelib/fs.scandir": "2.1.4", - "fastq": "^1.6.0" - }, - "engines": { - "node": ">= 8" - } - }, "node_modules/@npmcli/move-file": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", @@ -1578,11 +1451,6 @@ "url": "https://github.com/sponsors/isaacs" } }, - "node_modules/@nstudio/nativescript-checkbox": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nstudio/nativescript-checkbox/-/nativescript-checkbox-2.0.4.tgz", - "integrity": "sha512-ypIGAHxDE/2o3CzYohSdypdhiw4GjMcZ3H/qtF4z97HMcMqj+g5bYPDC9cRH97qgAez8jf/z3UX5OzOtnrNxug==" - }, "node_modules/@triniwiz/nativescript-accelerometer": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-accelerometer/-/nativescript-accelerometer-4.0.3.tgz", @@ -2798,107 +2666,38 @@ } }, "node_modules/cacache": { - "version": "15.0.6", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz", - "integrity": "sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "dependencies": { - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", + "bluebird": "^3.5.1", + "chownr": "^1.0.1", + "glob": "^7.1.2", + "graceful-fs": "^4.1.11", + "lru-cache": "^4.1.1", + "mississippi": "^2.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" - }, - "engines": { - "node": ">= 10" + "rimraf": "^2.6.2", + "ssri": "^5.2.4", + "unique-filename": "^1.1.0", + "y18n": "^4.0.0" } }, - "node_modules/cacache/node_modules/chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true, - "engines": { - "node": ">=10" - } - }, - "node_modules/cacache/node_modules/lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "node_modules/cacache/node_modules/mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "dependencies": { - "yallist": "^4.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/cacache/node_modules/p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "dependencies": { - "aggregate-error": "^3.0.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/cacache/node_modules/rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "dependencies": { - "glob": "^7.1.3" + "minimist": "^1.2.5" }, "bin": { - "rimraf": "bin.js" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" + "mkdirp": "bin/cmd.js" } }, - "node_modules/cacache/node_modules/tar": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", - "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", - "dev": true, - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - }, - "engines": { - "node": ">= 10" - } - }, - "node_modules/cacache/node_modules/yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true - }, "node_modules/cache-base": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", @@ -3463,32 +3262,141 @@ } }, "node_modules/copy-webpack-plugin": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.4.tgz", - "integrity": "sha512-zCazfdYAh3q/O4VzZFiadWGpDA2zTs6FC6D7YTHD6H1J40pzo0H4z22h1NYMCl4ArQP4CK8y/KWqPrJ4rVkZ5A==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz", + "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==", "dev": true, "dependencies": { - "cacache": "^15.0.5", - "fast-glob": "^3.2.4", - "find-cache-dir": "^3.3.1", - "glob-parent": "^5.1.1", - "globby": "^11.0.1", - "loader-utils": "^2.0.0", - "normalize-path": "^3.0.0", - "p-limit": "^3.0.2", - "schema-utils": "^2.7.0", - "serialize-javascript": "^4.0.0", - "webpack-sources": "^1.4.3" + "cacache": "^10.0.4", + "find-cache-dir": "^1.0.0", + "globby": "^7.1.1", + "is-glob": "^4.0.0", + "loader-utils": "^1.1.0", + "minimatch": "^3.0.4", + "p-limit": "^1.0.0", + "serialize-javascript": "^1.4.0" }, "engines": { - "node": ">= 10.13.0" + "node": ">= 4" + } + }, + "node_modules/copy-webpack-plugin/node_modules/find-cache-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "dev": true, + "dependencies": { + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" + "engines": { + "node": ">=4" + } + }, + "node_modules/copy-webpack-plugin/node_modules/find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "dependencies": { + "locate-path": "^2.0.0" }, - "peerDependencies": { - "webpack": "^4.37.0 || ^5.0.0" + "engines": { + "node": ">=4" + } + }, + "node_modules/copy-webpack-plugin/node_modules/json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "dependencies": { + "minimist": "^1.2.0" + }, + "bin": { + "json5": "lib/cli.js" + } + }, + "node_modules/copy-webpack-plugin/node_modules/loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "dev": true, + "dependencies": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + }, + "engines": { + "node": ">=4.0.0" + } + }, + "node_modules/copy-webpack-plugin/node_modules/locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "dependencies": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/copy-webpack-plugin/node_modules/make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "dev": true, + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/copy-webpack-plugin/node_modules/p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "dependencies": { + "p-limit": "^1.1.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/copy-webpack-plugin/node_modules/path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/copy-webpack-plugin/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true, + "engines": { + "node": ">=4" + } + }, + "node_modules/copy-webpack-plugin/node_modules/pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "dependencies": { + "find-up": "^2.1.0" + }, + "engines": { + "node": ">=4" } }, "node_modules/core-js-compat": { @@ -3969,15 +3877,36 @@ "dev": true }, "node_modules/dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", + "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", "dev": true, "dependencies": { - "path-type": "^4.0.0" + "path-type": "^3.0.0" }, "engines": { - "node": ">=8" + "node": ">=4" + } + }, + "node_modules/dir-glob/node_modules/path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "dependencies": { + "pify": "^3.0.0" + }, + "engines": { + "node": ">=4" + } + }, + "node_modules/dir-glob/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true, + "engines": { + "node": ">=4" } }, "node_modules/domain-browser": { @@ -4583,38 +4512,12 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, - "node_modules/fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", - "dev": true, - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", - "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, - "node_modules/fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", - "dev": true, - "dependencies": { - "reusify": "^1.0.4" - } - }, "node_modules/figgy-pudding": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", @@ -5291,6 +5194,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "optional": true, "dependencies": { "is-glob": "^4.0.1" }, @@ -5340,32 +5244,29 @@ } }, "node_modules/globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", + "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, "dependencies": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=4" } }, - "node_modules/globby/node_modules/array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "node_modules/globby/node_modules/pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true, "engines": { - "node": ">=8" + "node": ">=4" } }, "node_modules/globule": { @@ -5743,13 +5644,10 @@ "dev": true }, "node_modules/ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", - "dev": true, - "engines": { - "node": ">= 4" - } + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", + "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", + "dev": true }, "node_modules/import-fresh": { "version": "3.3.0", @@ -6619,15 +6517,6 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true, - "engines": { - "node": ">= 8" - } - }, "node_modules/methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -6804,6 +6693,27 @@ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true }, + "node_modules/mississippi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", + "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", + "dev": true, + "dependencies": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^2.0.1", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + }, + "engines": { + "node": ">=4.0.0" + } + }, "node_modules/mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -6888,16 +6798,10 @@ "node": ">=0.10.0" } }, - "node_modules/nativescript-feedback": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/nativescript-feedback/-/nativescript-feedback-2.0.0.tgz", - "integrity": "sha512-6ZE/g+s1xxez3pMRJa/r0f144VuyapgDjbo8D37nMC4F0WDQLKk8dC0405czhQxD2djVq3GEMfM/n0cuMbY53A==" - }, "node_modules/nativescript-imagecropper": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nativescript-imagecropper/-/nativescript-imagecropper-4.0.1.tgz", "integrity": "sha512-OePKRagrsvj/w7NUIepVZZYuH5gMvmbbnLyDSuEY3wyTzgpYbP2AI89+URsso0DWj8VRiZlGUuKYPZnClTHOGg==", - "license": "MIT", "dependencies": { "ts-node": "^9.0.0" } @@ -6928,11 +6832,6 @@ "tns-core-modules": ">=2.x|| >= 3.x || >=4.x || >=5.x" } }, - "node_modules/nativescript-vibrate": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nativescript-vibrate/-/nativescript-vibrate-4.0.1.tgz", - "integrity": "sha512-T9VspAu+pgYM/AWLradA4HPv/tdfx8jrhIOD02PZs09KhJyjQE3BoubnHcmg0neeQAhgxHiuXGdit8QOAyKaBA==" - }, "node_modules/nativescript-vue": { "version": "2.8.4", "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.8.4.tgz", @@ -7200,6 +7099,7 @@ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "dev": true, + "optional": true, "engines": { "node": ">=0.10.0" } @@ -7443,18 +7343,15 @@ } }, "node_modules/p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "dependencies": { - "yocto-queue": "^0.1.0" + "p-try": "^1.0.0" }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": ">=4" } }, "node_modules/p-locate": { @@ -7502,6 +7399,15 @@ "node": ">=6" } }, + "node_modules/p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true, + "engines": { + "node": ">=4" + } + }, "node_modules/pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", @@ -8048,26 +7954,6 @@ "node": ">=0.4.x" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ] - }, "node_modules/randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -8689,16 +8575,6 @@ "node": ">=0.12" } }, - "node_modules/reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true, - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" - } - }, "node_modules/rework": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz", @@ -8777,29 +8653,6 @@ "inherits": "^2.0.1" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "dependencies": { - "queue-microtask": "^1.2.2" - } - }, "node_modules/run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -9050,13 +8903,10 @@ "dev": true }, "node_modules/serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", - "dev": true, - "dependencies": { - "randombytes": "^2.1.0" - } + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", + "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==", + "dev": true }, "node_modules/serve-static": { "version": "1.14.1", @@ -9203,12 +9053,12 @@ } }, "node_modules/slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", "dev": true, "engines": { - "node": ">=8" + "node": ">=0.10.0" } }, "node_modules/snapdragon": { @@ -9541,15 +9391,12 @@ } }, "node_modules/ssri": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", - "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", + "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", "dev": true, "dependencies": { - "minipass": "^3.1.1" - }, - "engines": { - "node": ">= 8" + "safe-buffer": "^5.1.1" } }, "node_modules/static-extend": { @@ -9851,6 +9698,109 @@ "webpack": "^4.0.0 || ^5.0.0" } }, + "node_modules/terser-webpack-plugin/node_modules/cacache": { + "version": "15.0.6", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz", + "integrity": "sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==", + "dev": true, + "dependencies": { + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" + }, + "engines": { + "node": ">= 10" + } + }, + "node_modules/terser-webpack-plugin/node_modules/chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser-webpack-plugin/node_modules/lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "dependencies": { + "yallist": "^4.0.0" + }, + "engines": { + "node": ">=10" + } + }, + "node_modules/terser-webpack-plugin/node_modules/p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "dependencies": { + "yocto-queue": "^0.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/terser-webpack-plugin/node_modules/p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "dependencies": { + "aggregate-error": "^3.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/terser-webpack-plugin/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "dependencies": { + "glob": "^7.1.3" + }, + "bin": { + "rimraf": "bin.js" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/terser-webpack-plugin/node_modules/serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, "node_modules/terser-webpack-plugin/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -9860,6 +9810,35 @@ "node": ">=0.10.0" } }, + "node_modules/terser-webpack-plugin/node_modules/ssri": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "dev": true, + "dependencies": { + "minipass": "^3.1.1" + }, + "engines": { + "node": ">= 8" + } + }, + "node_modules/terser-webpack-plugin/node_modules/tar": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", + "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", + "dev": true, + "dependencies": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + }, + "engines": { + "node": ">= 10" + } + }, "node_modules/terser-webpack-plugin/node_modules/terser": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", @@ -9877,6 +9856,12 @@ "node": ">=6.0.0" } }, + "node_modules/terser-webpack-plugin/node_modules/yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true + }, "node_modules/terser/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -11481,6 +11466,15 @@ "semver": "bin/semver" } }, + "node_modules/webpack/node_modules/serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "dependencies": { + "randombytes": "^2.1.0" + } + }, "node_modules/webpack/node_modules/source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", @@ -12921,91 +12915,16 @@ "to-fast-properties": "^2.0.0" } }, - "@nativescript-community/gesturehandler": { - "version": "0.1.39", - "resolved": "https://registry.npmjs.org/@nativescript-community/gesturehandler/-/gesturehandler-0.1.39.tgz", - "integrity": "sha512-QVI9fOQvrjSnHGTZxj362bGsLwblloeJAs5ITX6UvjOW7A4IoaBl7++RBL5E9z0WkEHFX8A3Vvj4CoNBnhgH0g==", - "requires": { - "@nativescript-community/observable": "^2.0.8" - } - }, - "@nativescript-community/observable": { - "version": "2.0.9", - "resolved": "https://registry.npmjs.org/@nativescript-community/observable/-/observable-2.0.9.tgz", - "integrity": "sha512-JsNztvBEdUH7I3+ECnIOOJ39J2sEdeaBSFk4JIkrsFeVGOx1E21SSJNkkQNN9H2BUsF9JgDoQ6rGKl3hmJkXTw==" - }, "@nativescript-community/perms": { "version": "2.1.5", "resolved": "https://registry.npmjs.org/@nativescript-community/perms/-/perms-2.1.5.tgz", "integrity": "sha512-YHYgzeOvYkb6Nj2JAgor8D5YLxYvj0sxr2JfnVrkb7c/Z41lTr0PaoHvhElvK6iERobbGQ1w3HmV9eCHrDgv9g==" }, - "@nativescript-community/text": { - "version": "1.4.9", - "resolved": "https://registry.npmjs.org/@nativescript-community/text/-/text-1.4.9.tgz", - "integrity": "sha512-U90qiuD513AY38rtNqyy67+7g2foup95kpnxkCiaJuBSkBf8nbdLpuLur9oOuCqndAw0X/N1gklE+tq2/BF0DA==" - }, "@nativescript-community/ui-collectionview": { "version": "4.0.29", "resolved": "https://registry.npmjs.org/@nativescript-community/ui-collectionview/-/ui-collectionview-4.0.29.tgz", "integrity": "sha512-u+HR3XNbws8ORus4lcKzMr5TWUR/w43OszscJIfv1orGI7ZnqrUHvPyiVz2Ff5+W78s1VPTQdMg0tyGjSX/qEg==" }, - "@nativescript-community/ui-drawer": { - "version": "0.0.24", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-drawer/-/ui-drawer-0.0.24.tgz", - "integrity": "sha512-Vv+ix4PMks88VFypWPRv/1OkKFyehRIbuJRi5/EjDVMMA5SOiDEmkBwxzKzglBEx2mq+VNT7/QGZ11WVxHD04g==", - "requires": { - "@nativescript-community/gesturehandler": "^0.1.35" - } - }, - "@nativescript-community/ui-material-activityindicator": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-activityindicator/-/ui-material-activityindicator-5.2.10.tgz", - "integrity": "sha512-1SWwnMj/QTr0FjjY32P+nigT4qzIMBFiPEfN8/eswJSkPWswJ4ZbJxYewP1jjgShEBOuap98x4KfWVSQ611DIw==", - "requires": { - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, - "@nativescript-community/ui-material-button": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-button/-/ui-material-button-5.2.10.tgz", - "integrity": "sha512-Mv53d54L6mMt5IftylMJ/PAkjpOH34hXgEqJhmvcyr9oWzgckqYusp4LmIfvALc1uf7RQwS0NqSJuLF6N4Fl9Q==", - "requires": { - "@nativescript-community/text": "^1.3.10", - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, - "@nativescript-community/ui-material-core": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-core/-/ui-material-core-5.2.10.tgz", - "integrity": "sha512-iaMZCc1lTCwCbAvfZcNEKQKZD6no3Zs6GJAq0Z9DQyo9A4JHTyl9bvW+M8I6h8q5ozjwnklhtMVHLnwa2dGPHg==", - "requires": { - "@nativescript/hook": "~2.0.0" - } - }, - "@nativescript-community/ui-material-floatingactionbutton": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-floatingactionbutton/-/ui-material-floatingactionbutton-5.2.10.tgz", - "integrity": "sha512-x3aQNS9k1oYs763jXgMchQOnOIg87k2KQA/96VX0kemUl0Oco9p21uQexsbab5BQkk1wCVSgPesMwMrGpi21BA==", - "requires": { - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, - "@nativescript-community/ui-material-progress": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-progress/-/ui-material-progress-5.2.10.tgz", - "integrity": "sha512-+eRODG/Ti0bsFbZbWxCnx39sjzzRmChVlsmJsvB8jSTSeUBJ2+1Putv3supGoh/hFpc5eRZoi84ZnpYioV04YQ==", - "requires": { - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, - "@nativescript-community/ui-material-snackbar": { - "version": "5.2.10", - "resolved": "https://registry.npmjs.org/@nativescript-community/ui-material-snackbar/-/ui-material-snackbar-5.2.10.tgz", - "integrity": "sha512-VK6H8rnc7zHFoKxHvEQyR51+OM/J32RHgryd7A4JVAbIbCpD3d5+Hre7z24ZH6PM4MHzD0tmHhW3ZqdyXcGYMA==", - "requires": { - "@nativescript-community/ui-material-core": "^5.2.10" - } - }, "@nativescript/android": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/@nativescript/android/-/android-7.0.1.tgz", @@ -13048,21 +12967,16 @@ "resolved": "https://registry.npmjs.org/@nativescript/social-share/-/social-share-2.0.4.tgz", "integrity": "sha512-fP/lK/wMmHDmWo4Uq8gG/mpsgUjT+/y7Qc+IdCgiqQkgWQtgXTM7H1ecemMYD9dCZo+gZ5UyOXE/E23ZN0DBAg==" }, - "@nativescript/theme": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@nativescript/theme/-/theme-3.0.1.tgz", - "integrity": "sha512-5rduFdEjjGyUgK+jaJ/2EHxi+qAgTZuK9XgfxHw0KJAIIWP9HNL8JV8IVUBeIodRPHhSJZJVQT7t+8peH/4dVQ==" - }, "@nativescript/webpack": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-3.0.9.tgz", - "integrity": "sha512-PK1aJCgW4niMl6pkDeadqRqx8nZmtfDhMnVmj5FGzY7pt99YcX+m1ixciidUjYXzcsxj9huPOq4moodX2m3JhQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/@nativescript/webpack/-/webpack-4.1.0.tgz", + "integrity": "sha512-/GU4+dCPBlhnA+4k0IM6RasRYF+lI5DDpPDQPIU6lweZt6e+RnQlgpf+iwzj20iGWvSlSoDljyOT8fR1NMhqUw==", "dev": true, "requires": { "@angular-devkit/core": "~10.0.0", "@nativescript/hook": "~2.0.0", "clean-webpack-plugin": "~3.0.0", - "copy-webpack-plugin": "~6.0.2", + "copy-webpack-plugin": "4.6.0", "css": "~3.0.0", "css-loader": "~4.2.0", "escape-string-regexp": "~4.0.0", @@ -13121,32 +13035,6 @@ "resolved": "https://registry.npmjs.org/@nativescript/zip/-/zip-5.0.0.tgz", "integrity": "sha512-iM1ln1KPRqNEKebvXkZGe3899+Esbp9DMF+hwTwC7Gd+oqhc4Wh8Tas97ormzMHR6iPasiOXs6wKuu625TYdIQ==" }, - "@nodelib/fs.scandir": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", - "integrity": "sha512-33g3pMJk3bg5nXbL/+CY6I2eJDzZAni49PfJnL5fghPTggPvBd/pFNSgJsdAgWptuFu7qq/ERvOYFlhvsLTCKA==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "2.0.4", - "run-parallel": "^1.1.9" - } - }, - "@nodelib/fs.stat": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.4.tgz", - "integrity": "sha512-IYlHJA0clt2+Vg7bccq+TzRdJvv19c2INqBSsoOLp1je7xjtr7J26+WXR72MCdvU9q1qTzIWDfhMf+DRvQJK4Q==", - "dev": true - }, - "@nodelib/fs.walk": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz", - "integrity": "sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==", - "dev": true, - "requires": { - "@nodelib/fs.scandir": "2.1.4", - "fastq": "^1.6.0" - } - }, "@npmcli/move-file": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", @@ -13168,11 +13056,6 @@ } } }, - "@nstudio/nativescript-checkbox": { - "version": "2.0.4", - "resolved": "https://registry.npmjs.org/@nstudio/nativescript-checkbox/-/nativescript-checkbox-2.0.4.tgz", - "integrity": "sha512-ypIGAHxDE/2o3CzYohSdypdhiw4GjMcZ3H/qtF4z97HMcMqj+g5bYPDC9cRH97qgAez8jf/z3UX5OzOtnrNxug==" - }, "@triniwiz/nativescript-accelerometer": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/@triniwiz/nativescript-accelerometer/-/nativescript-accelerometer-4.0.3.tgz", @@ -14212,82 +14095,34 @@ "dev": true }, "cacache": { - "version": "15.0.6", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz", - "integrity": "sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==", + "version": "10.0.4", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-10.0.4.tgz", + "integrity": "sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==", "dev": true, "requires": { - "@npmcli/move-file": "^1.0.1", - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "glob": "^7.1.4", - "infer-owner": "^1.0.4", - "lru-cache": "^6.0.0", - "minipass": "^3.1.1", - "minipass-collect": "^1.0.2", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.2", - "mkdirp": "^1.0.3", - "p-map": "^4.0.0", + "bluebird": "^3.5.1", + "chownr": "^1.0.1", + "glob": "^7.1.2", + "graceful-fs": "^4.1.11", + "lru-cache": "^4.1.1", + "mississippi": "^2.0.0", + "mkdirp": "^0.5.1", + "move-concurrently": "^1.0.1", "promise-inflight": "^1.0.1", - "rimraf": "^3.0.2", - "ssri": "^8.0.1", - "tar": "^6.0.2", - "unique-filename": "^1.1.1" + "rimraf": "^2.6.2", + "ssri": "^5.2.4", + "unique-filename": "^1.1.0", + "y18n": "^4.0.0" }, "dependencies": { - "chownr": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "dev": true - }, - "lru-cache": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", - "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "mkdirp": { + "version": "0.5.5", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", + "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", "dev": true, "requires": { - "yallist": "^4.0.0" + "minimist": "^1.2.5" } - }, - "p-map": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", - "dev": true, - "requires": { - "aggregate-error": "^3.0.0" - } - }, - "rimraf": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "dev": true, - "requires": { - "glob": "^7.1.3" - } - }, - "tar": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", - "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", - "dev": true, - "requires": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", - "minipass": "^3.0.0", - "minizlib": "^2.1.1", - "mkdirp": "^1.0.3", - "yallist": "^4.0.0" - } - }, - "yallist": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", - "dev": true } } }, @@ -14761,22 +14596,110 @@ "dev": true }, "copy-webpack-plugin": { - "version": "6.0.4", - "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.0.4.tgz", - "integrity": "sha512-zCazfdYAh3q/O4VzZFiadWGpDA2zTs6FC6D7YTHD6H1J40pzo0H4z22h1NYMCl4ArQP4CK8y/KWqPrJ4rVkZ5A==", + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz", + "integrity": "sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==", "dev": true, "requires": { - "cacache": "^15.0.5", - "fast-glob": "^3.2.4", - "find-cache-dir": "^3.3.1", - "glob-parent": "^5.1.1", - "globby": "^11.0.1", - "loader-utils": "^2.0.0", - "normalize-path": "^3.0.0", - "p-limit": "^3.0.2", - "schema-utils": "^2.7.0", - "serialize-javascript": "^4.0.0", - "webpack-sources": "^1.4.3" + "cacache": "^10.0.4", + "find-cache-dir": "^1.0.0", + "globby": "^7.1.1", + "is-glob": "^4.0.0", + "loader-utils": "^1.1.0", + "minimatch": "^3.0.4", + "p-limit": "^1.0.0", + "serialize-javascript": "^1.4.0" + }, + "dependencies": { + "find-cache-dir": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz", + "integrity": "sha1-kojj6ePMN0hxfTnq3hfPcfww7m8=", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz", + "integrity": "sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "make-dir": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-1.3.0.tgz", + "integrity": "sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==", + "dev": true, + "requires": { + "pify": "^3.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + } + } } }, "core-js-compat": { @@ -15176,12 +15099,29 @@ } }, "dir-glob": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", - "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "version": "2.2.2", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.2.2.tgz", + "integrity": "sha512-f9LBi5QWzIW3I6e//uxZoLBlUt9kcp66qo0sSCxL6YZKc75R1c4MFCoe/LaZiBGmgujvQdxc5Bn3QhfyvK5Hsw==", "dev": true, "requires": { - "path-type": "^4.0.0" + "path-type": "^3.0.0" + }, + "dependencies": { + "path-type": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz", + "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==", + "dev": true, + "requires": { + "pify": "^3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", + "dev": true + } } }, "domain-browser": { @@ -15696,35 +15636,12 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "dev": true }, - "fast-glob": { - "version": "3.2.5", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.5.tgz", - "integrity": "sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==", - "dev": true, - "requires": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.0", - "merge2": "^1.3.0", - "micromatch": "^4.0.2", - "picomatch": "^2.2.1" - } - }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "dev": true }, - "fastq": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.11.0.tgz", - "integrity": "sha512-7Eczs8gIPDrVzT+EksYBcupqMyxSHXXrHOLRRxU2/DicV8789MRBRR8+Hc2uWzUupOs4YS4JzBmBxjjCVBxD/g==", - "dev": true, - "requires": { - "reusify": "^1.0.4" - } - }, "figgy-pudding": { "version": "3.5.2", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz", @@ -16265,6 +16182,7 @@ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "dev": true, + "optional": true, "requires": { "is-glob": "^4.0.1" } @@ -16302,23 +16220,23 @@ "dev": true }, "globby": { - "version": "11.0.3", - "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.3.tgz", - "integrity": "sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz", + "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=", "dev": true, "requires": { - "array-union": "^2.1.0", - "dir-glob": "^3.0.1", - "fast-glob": "^3.1.1", - "ignore": "^5.1.4", - "merge2": "^1.3.0", - "slash": "^3.0.0" + "array-union": "^1.0.1", + "dir-glob": "^2.0.0", + "glob": "^7.1.2", + "ignore": "^3.3.5", + "pify": "^3.0.0", + "slash": "^1.0.0" }, "dependencies": { - "array-union": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "pify": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", + "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=", "dev": true } } @@ -16607,9 +16525,9 @@ "dev": true }, "ignore": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", - "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "version": "3.3.10", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", + "integrity": "sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==", "dev": true }, "import-fresh": { @@ -17294,12 +17212,6 @@ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", "dev": true }, - "merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "dev": true - }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -17443,6 +17355,24 @@ } } }, + "mississippi": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mississippi/-/mississippi-2.0.0.tgz", + "integrity": "sha512-zHo8v+otD1J10j/tC+VNoGK9keCuByhKovAvdn74dmxJl9+mWHnx6EMsDN4lgRoMI/eYo2nchAxniIbUPb5onw==", + "dev": true, + "requires": { + "concat-stream": "^1.5.0", + "duplexify": "^3.4.2", + "end-of-stream": "^1.1.0", + "flush-write-stream": "^1.0.0", + "from2": "^2.1.0", + "parallel-transform": "^1.1.0", + "pump": "^2.0.1", + "pumpify": "^1.3.3", + "stream-each": "^1.1.0", + "through2": "^2.0.0" + } + }, "mixin-deep": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", @@ -17514,11 +17444,6 @@ "to-regex": "^3.0.1" } }, - "nativescript-feedback": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/nativescript-feedback/-/nativescript-feedback-2.0.0.tgz", - "integrity": "sha512-6ZE/g+s1xxez3pMRJa/r0f144VuyapgDjbo8D37nMC4F0WDQLKk8dC0405czhQxD2djVq3GEMfM/n0cuMbY53A==" - }, "nativescript-imagecropper": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nativescript-imagecropper/-/nativescript-imagecropper-4.0.1.tgz", @@ -17550,11 +17475,6 @@ "resolved": "https://registry.npmjs.org/nativescript-toast/-/nativescript-toast-2.0.0.tgz", "integrity": "sha512-xqyNfFS894oGfrEVO7CjpioAQLiLNNcd77Euq9XIUTf1U3W0PsIgAJbLP7+kkVGIJxdLtlBkbcQ4wDmf2DCi1w==" }, - "nativescript-vibrate": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/nativescript-vibrate/-/nativescript-vibrate-4.0.1.tgz", - "integrity": "sha512-T9VspAu+pgYM/AWLradA4HPv/tdfx8jrhIOD02PZs09KhJyjQE3BoubnHcmg0neeQAhgxHiuXGdit8QOAyKaBA==" - }, "nativescript-vue": { "version": "2.8.4", "resolved": "https://registry.npmjs.org/nativescript-vue/-/nativescript-vue-2.8.4.tgz", @@ -17786,7 +17706,8 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "dev": true, + "optional": true }, "npmlog": { "version": "4.1.2", @@ -17974,12 +17895,12 @@ } }, "p-limit": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", "dev": true, "requires": { - "yocto-queue": "^0.1.0" + "p-try": "^1.0.0" } }, "p-locate": { @@ -18014,6 +17935,12 @@ "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==", "dev": true }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, "pako": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz", @@ -18456,12 +18383,6 @@ "integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=", "dev": true }, - "queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "dev": true - }, "randombytes": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", @@ -18965,12 +18886,6 @@ "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==", "dev": true }, - "reusify": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", - "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", - "dev": true - }, "rework": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/rework/-/rework-1.0.1.tgz", @@ -19045,15 +18960,6 @@ "inherits": "^2.0.1" } }, - "run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "dev": true, - "requires": { - "queue-microtask": "^1.2.2" - } - }, "run-queue": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz", @@ -19257,13 +19163,10 @@ } }, "serialize-javascript": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", - "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", - "dev": true, - "requires": { - "randombytes": "^2.1.0" - } + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-1.9.1.tgz", + "integrity": "sha512-0Vb/54WJ6k5v8sSWN09S0ora+Hnr+cX40r9F170nT+mSkaxltoE/7R3OrIdBSUv1OoiobH1QoWQbCnAO+e8J1A==", + "dev": true }, "serve-static": { "version": "1.14.1", @@ -19382,9 +19285,9 @@ } }, "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz", + "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=", "dev": true }, "snapdragon": { @@ -19670,12 +19573,12 @@ } }, "ssri": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", - "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-5.3.0.tgz", + "integrity": "sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==", "dev": true, "requires": { - "minipass": "^3.1.1" + "safe-buffer": "^5.1.1" } }, "static-extend": { @@ -19924,12 +19827,111 @@ "webpack-sources": "^1.4.3" }, "dependencies": { + "cacache": { + "version": "15.0.6", + "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.0.6.tgz", + "integrity": "sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==", + "dev": true, + "requires": { + "@npmcli/move-file": "^1.0.1", + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "glob": "^7.1.4", + "infer-owner": "^1.0.4", + "lru-cache": "^6.0.0", + "minipass": "^3.1.1", + "minipass-collect": "^1.0.2", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.2", + "mkdirp": "^1.0.3", + "p-map": "^4.0.0", + "promise-inflight": "^1.0.1", + "rimraf": "^3.0.2", + "ssri": "^8.0.1", + "tar": "^6.0.2", + "unique-filename": "^1.1.1" + } + }, + "chownr": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", + "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", + "dev": true + }, + "lru-cache": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz", + "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==", + "dev": true, + "requires": { + "yallist": "^4.0.0" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-map": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", + "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", + "dev": true, + "requires": { + "aggregate-error": "^3.0.0" + } + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "dev": true }, + "ssri": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz", + "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==", + "dev": true, + "requires": { + "minipass": "^3.1.1" + } + }, + "tar": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/tar/-/tar-6.1.0.tgz", + "integrity": "sha512-DUCttfhsnLCjwoDoFcI+B2iJgYa93vBnDUATYEeRx6sntCTdN01VnqsIuTlALXla/LWooNg0yEGeB+Y8WdFxGA==", + "dev": true, + "requires": { + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^3.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" + } + }, "terser": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz", @@ -19940,6 +19942,12 @@ "source-map": "~0.6.1", "source-map-support": "~0.5.12" } + }, + "yallist": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", + "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", + "dev": true } } }, @@ -21103,6 +21111,15 @@ "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", "dev": true }, + "serialize-javascript": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-4.0.0.tgz", + "integrity": "sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, "source-map": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", diff --git a/.update_backup/package.json b/.update_backup/package.json index 54488990..c4c4783b 100644 --- a/.update_backup/package.json +++ b/.update_backup/package.json @@ -2,32 +2,30 @@ "name": "enrecipes", "version": "1.0.0", "description": "A native application built with NativeScript-Vue", - "author": "Vishnu Raghav ", + "homepage": "https://enrecipes.vercel.app/", + "bugs": { + "url": "https://github.com/vishnuraghavb/EnRecipes/issues" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/vishnuraghavb/EnRecipes.git" + }, "license": "GPL", + "author": "Vishnu Raghav ", + "main": "main", "dependencies": { - "@nativescript-community/gesturehandler": "^0.1.39", "@nativescript-community/perms": "^2.1.5", "@nativescript-community/ui-collectionview": "^4.0.29", - "@nativescript-community/ui-drawer": "^0.0.24", - "@nativescript-community/ui-material-activityindicator": "^5.2.10", - "@nativescript-community/ui-material-button": "^5.2.10", - "@nativescript-community/ui-material-floatingactionbutton": "^5.2.10", - "@nativescript-community/ui-material-progress": "^5.2.10", - "@nativescript-community/ui-material-snackbar": "^5.2.10", "@nativescript/core": "7.3.0", "@nativescript/localize": "^5.0.4", "@nativescript/social-share": "^2.0.4", - "@nativescript/theme": "^3.0.1", "@nativescript/zip": "^5.0.0", - "@nstudio/nativescript-checkbox": "^2.0.4", "@triniwiz/nativescript-accelerometer": "^4.0.3", "@triniwiz/nativescript-couchbase": "^1.2.2", - "nativescript-feedback": "^2.0.0", "nativescript-imagecropper": "^4.0.1", "nativescript-intl": "^4.0.2", "nativescript-plugin-filepicker": "^1.0.0", "nativescript-toast": "^2.0.0", - "nativescript-vibrate": "^4.0.1", "nativescript-vue": "^2.8.4", "vuex": "^3.6.2" }, @@ -35,20 +33,11 @@ "@babel/core": "^7.12.10", "@babel/preset-env": "^7.12.11", "@nativescript/android": "7.0.1", - "@nativescript/webpack": "^3.0.8", + "@nativescript/webpack": "4.1.0", "@types/node": "^14.14.20", "babel-loader": "^8.2.2", "nativescript-vue-template-compiler": "^2.8.3", "node-sass": "^4.14.1", "vue-loader": "^15.9.6" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/vishnuraghavb/EnRecipes.git" - }, - "bugs": { - "url": "https://github.com/vishnuraghavb/EnRecipes/issues" - }, - "homepage": "https://enrecipes.vercel.app/", - "main": "main" + } } diff --git a/app/app.scss b/app/app.scss index 74f2a227..927e684e 100644 --- a/app/app.scss +++ b/app/app.scss @@ -1,232 +1,196 @@ -// NativeScript core theme -// @see https://docs.nativescript.org/ui/theme -@import "~@nativescript/theme/core"; // Override variables here -$gray0: #fff; -$gray1: #f0f0f0; -$gray2: #e0e0e0; -$gray3: #d1d1d1; -$gray4: #c2c2c2; -$gray5: #858585; -$gray6: #575757; -$gray7: #393939; -$gray8: #292929; -$gray9: #1a1a1a; -$gray10: #000; +$gray0: #f8f9fa; +$gray1: #f1f3f5; +$gray2: #e9ecef; +$gray3: #dee2e6; +$gray4: #ced4da; +$gray5: #adb5bd; +$gray6: #868e96; +$gray7: #495057; +$gray8: #343a40; +$gray9: #212529; +$gray10: #000000; $orange: #ff5200; -$fabRipple: #ffa94d; -$red: #c92a2a; -$breakfast: #ffa94d; -$lunch: #69db7c; -$dinner: #4dabf7; -$snacks: #9775fa; // Global SCSS styling -// @see https://docs.nativescript.org/ui/styling -.ns-modal, + Page { font-family: "Inter-Medium"; + font-size: 14; } .tb { font-family: "Inter-Bold"; } -.er { +.ico { font-family: "enrecipes"; font-size: 24; vertical-alignment: center; - &.small { - padding: 0; + &.sm { font-size: 16; } } -.today { - color: $orange; +.tac { + text-align: center; } -.ns-modal { - TextField, - TextView, - TimePickerField { - border-color: $gray2; - &.ns-dark { - border-color: $gray8; - } - } +.tw { + text-wrap: true; } -.ns-light { - .count, - ActionBar, - ListPicker, +.pageTitle { + @extend .tb; + @extend .tw; + font-size: 25; + padding: 16; +} +.Light { + color: $gray9; + background: $gray1; Page, - TabStripItem, - Tabs { - color: $gray9; + .filters { background: $gray1; } TextField, - TextView, - TimePickerField { + TextView { + border-color: $gray3; + placeholder-color: $gray5; + } + .modalInput { border-color: $gray2; } - .hr { - border-color: $gray2; - } - .sd { - background: $gray1; - } - .combination, - .hasPlans, - .overviewItem, - // .recipeItem, - .titleContainer { + .appbar, + .modal, + .topPlate { background: $gray0; } - .note, - .tag { - background: $gray2; - } - .combinationToken, .fieldLabel, .dayName, - .group-info, - .option .info { + .sub { color: $gray6; } - .done .count { - color: $gray0; - } - .imageHolder { + .imgHolder { color: $gray3; background: $gray2; } - .activeDay { + .snackBar { color: $gray1; background: $gray9; } - .dayContainer, - .instruction { - border-color: $gray9; - } - MDProgress { + Progress { progress-background-color: $gray4; } - .fab { - color: $gray0; - } - .emptyState .icon { - color: $gray4; + .fab, + .hlMsg { + color: $gray1; } } -.ns-dark { - .count, - ActionBar, - ListPicker, +.Dark { + color: $gray1; + background: $gray9; Page, - TabStripItem, - Tabs { - color: $gray2; + .filters { background: $gray9; } TextField, - TextView, - TimePickerField { + TextView { border-color: $gray8; + placeholder-color: $gray6; } - .hr { - border-color: $gray8; + .modalInput { + border-color: $gray7; } - .sd { - background: $gray9; - } - .combination, - .hasPlans, - .overviewItem, - // .recipeItem, - .titleContainer { + .appbar, + .modal, + .topPlate { + color: $gray0; background: $gray8; } - .note, - .tag { - background: $gray10; - } - .combinationToken, + .fieldLabel, .dayName, - .group-info, - .option .info, - .fieldLabel { + .sub { color: $gray5; } - .done .count { - color: $gray10; - } - .imageHolder { + .imgHolder { color: $gray9; background: $gray10; } - .activeDay { + .snackBar { color: $gray9; - background: $gray2; + background: $gray1; } - .dayContainer, - .instruction { - border-color: $gray2; - } - MDProgress { + Progress { progress-background-color: $gray5; } - .fab { + .fab, + .hlMsg { color: $gray9; } - .emptyState .icon { +} +.Black { + color: $gray2; + background: $gray10; + Page { + background: $gray10; + } + TextField, + TextView { + border-color: $gray9; + placeholder-color: $gray7; + } + .modalInput { + border-color: $gray8; + } + .appbar, + .modal, + .topPlate { + color: $gray1; + background: $gray9; + } + .fieldLabel, + .dayName, + .sub { color: $gray6; } + .imgHolder { + color: $gray10; + background: $gray9; + } + .snackBar { + color: $gray10; + background: $gray2; + } + Progress { + progress-background-color: $gray5; + } + .fab, + .hlMsg { + color: $gray10; + } +} +TextField.combField, +#searchBar { + border-color: transparent; } // ----------------------------- // Elements TextField, -TextView, -TimePickerField { +TextView { width: 100%; - font-size: 14; - padding: 12 8; - margin: 0 0 4; + padding: 14 8; border-bottom-width: 1; - // border-bottom-color: $gray5; - placeholder-color: $gray5; } TextView { - line-height: 12; + line-height: 4; } -ListPicker { - width: 25%; -} -TextField.searchBar { +#searchBar { + padding-left: 0; margin: 0; - border-color: transparent; -} -TabView { - tab-text-color: $gray5; } .inputField { - margin-bottom: 16; - TextField { - horizontal-alignment: left; - } + margin-bottom: 24; } .fieldLabel { font-size: 12; - // margin-left: 8; - padding: 0; } .progressContainer { width: 100%; } -.hr { - padding: 0; -} -// .category, -// .group-header, -.text-btn, -MDActivityIndicator { - color: $orange; -} -MDProgress { +Progress { progress-color: $orange; } Switch { @@ -235,663 +199,433 @@ Switch { } // ----------------------------- // Side Drawer -.sd { - padding: 8 0; -} -.sd-item { +.segment { border-radius: 8; - margin: 0 8; - height: 48; - vertical-alignment: center; - .er { - font-size: 24; - margin: 0 24 0 0; - } - &.selected .er { - color: $orange; - } - &.selected { - color: $orange; - background: rgba($orange, 0.1); - .mdr { - ripple-color: transparent; - } - } - Label { - padding: 0 16 0 0; - font-size: 14; + margin: 0 4 0 0; + padding: 0 12; + .value { + padding-left: 8; vertical-alignment: center; - &.er { - padding: 0 0 0 16; - } } - .mdr { - padding: 0 16; - } - MDButton.er { - margin: 0; - } - .recipeCount { - padding: 4; - font-size: 14; - margin: 0 8 0 0; - vertical-alignment: center; + &.select { + color: $orange; + @extend .hl; } } -.sd-group-header { - width: 100%; - padding: 8 8 8 16; - MDButton.er { +Button { + background-color: transparent; + z-index: 0; + padding: 8; + border-radius: 8; + min-width: 0; + min-height: 0; + &:active { + @extend .fade; + } + &.ico { + padding: 0; margin: 0; + width: 48; + height: 48; + } + &.text { + @extend .tb; + horizontal-alignment: left; + color: $orange; + } + &.big { + margin-top: 8; + padding: 16 0; + } + &.sm { + font-size: 12; + padding: 12; + } + &.min { + width: 40; + height: 40; + } + &.x { width: 32; height: 32; min-width: 0; + margin: 0 0 0 8; + vertical-alignment: center; } - .filterPath { - line-height: 0; + &.rate { + margin: 0 4 0 0; + width: 32; + height: 32; } } -.noTags { - font-size: 14; - text-align: center; - margin: 8; -} -.mdr { - border-radius: 8; -} -MDButton { - padding: 8; - min-width: 0; - min-height: 0; - &.er { - padding: 0; - width: 48; - height: 48; - margin: 0 8 0 0; - border-radius: 99; - } -} -MDButton, -.mdr { - ripple-color: rgba($gray5, 0.2); -} // ----------------------------- // HOME -.emptyStateContainer { - width: 100%; - height: 100%; -} .emptyState { - line-height: 8; - padding: 0 32; - text-align: center; - font-size: 14; - horizontal-alignment: center; - .icon { - font-size: 64; - text-align: center; - margin-bottom: 16; - } - .logo { - width: 64; - margin-bottom: 16; + padding: 16 16 8; + Label { + @extend .tw; } .title { - font-size: 18; - text-align: center; - padding: 0; - horizontal-alignment: center; - .er { - font-size: 24; - vertical-alignment: center; - } - } - .searchAll { - font-size: 14; - width: auto; - height: auto; - min-width: 0; - padding: 12; - border-radius: 8; - letter-spacing: 0; - // text-transform: none; - margin: 16; - color: $orange; - horizontal-alignment: center; + @extend .tb; + font-size: 17; } } // ----------------------------- // Recipe Items -CollectionView { - font-size: 14; -} -.recipeContainer { - padding: 0; -} -.layout1 { - padding: 0; - margin: 8 16; - border-radius: 8; - .imageHolder { - &.card { - border-radius: 8; - Image { - border-radius: 8; - } - } - } +.recipeItem { + padding: 8 16; .recipeInfo { - vertical-align: top; - margin: 0; - padding: 8; - .attr, - .category { + vertical-alignment: top; + padding: 4 0 4 8; + } + .title { + padding: 0 0 4; + } + .attributes { + padding-top: 2; + .attr { font-size: 10; - padding: 0; - margin: 0; - } - .title { - margin: 0; - padding: 0; - } - .attrContainer { - padding: 2 0 0; - .attr { - padding: 0 8 0 2; - } - } - .tagsContainer { - margin-top: 4; + padding: 0 6 1 2; } } } -.layout2 { - .recipeInfo { - vertical-alignment: stretch; - padding: 8; - .tagsContainer { - margin-top: 2; - } - } +.simple .recipeInfo { + padding: 8 0; } -.layout3 { +.minimal .title { padding: 0; - margin: 8; - border-radius: 8; - .imageHolder { - vertical-alignment: center; - &.card { - border-radius: 8; - Image { - border-radius: 8; - } - } - } - .recipeInfo { - margin: 0; - padding: 8; - .attr, - .category { - font-size: 10; - padding: 0; - margin: 0; - } - .title { - margin: 0; - padding: 0; - } - } - .tagsContainer { - padding: 4 0 0; - } } -.firstItem { - padding: 8 0 0; + +.grid { + padding: 8; + .recipeInfo { + padding: 8 8 0; + } + &.odd { + padding: 8 8 8 16; + } + &.even { + padding: 8 16 8 8; + } } .lastItem { - padding-top: 0; - padding-right: 0; - padding-left: 0; - padding-bottom: 84; -} -.odd { - padding-left: 8; -} -.even { - padding-right: 8; + margin-bottom: 128; } .selected { - background: rgba($orange, 0.1); + @extend .hl; } -.tagsContainer { - padding: 2 0 0; - .tag { - font-size: 10; - padding: 1 6 2; - margin: 0 4 0 0; - line-height: 0; - border-radius: 8; - } +.unselected { + background-color: transparent; } -.imageHolder { - vertical-alignment: center; - &.card { - border-radius: 8; - Image { - border-radius: 8; - } - } +.imgHolder { + border-radius: 8; } // ----------------------------- // SETTINGS -.group-header { - // text-transform: uppercase; - padding: 8; -} .group-info { - padding: 16 16 16 64; - line-height: 6; + padding: 16 16 16 72; + line-height: 4; } - -.main-container { - padding: 8 8 88; +.options-list { .option { - padding: 14 0; - font-size: 14; - .er { + padding: 14 8; + margin: 0 16; + .ico { padding: 0; margin: 0 24 0 16; } - .info { + .info, + .sub { + @extend .tw; + } + .sub { font-size: 12; - padding-top: 0; - line-height: 4; - } - Label { - padding: 0; - } - StackLayout { - margin: 0; - padding: 0; - // margin: 9 24 9 0; } } + .listSpace { + height: 72; + } } + // ----------------------------- // ABOUT -.app-info-container { - .app-icon { - margin-top: 16; +.app-info { + .icon { + margin: 16; background: $orange; border-radius: 99; horizontal-alignment: center; } - .app-name { - font-size: 20; - padding: 0; - margin-top: 16; - horizontal-alignment: center; + .name { + font-size: 17; } - .app-version { - font-size: 14; - horizontal-alignment: center; - } - .app-info { - text-align: center; + .info { padding: 8 16 24; - line-height: 6; + line-height: 4; } } // ----------------------------- // VIEW RECIPE -.viewRecipe { - .attr, - .category, - .ingredient, - .tag, - .tagsTitle { - font-size: 14; - } - .attr, - .category { - margin: 0 12; - } - .small { - font-size: 10; - } +.photo { + border-radius: 8; + margin: 24 16 0 0; + vertical-align: top; +} +.attribute { + margin: 8 16; .title { - font-size: 18; - line-height: 6; - padding: 0 12; + margin-right: 8; + font-size: 12; + color: $gray6; } - .ratingContainer { - margin: 16 8 8; + .value { + @extend .tb; + @extend .tw; } - .rate, - .rated { - padding: 0 8 0 0; - } - .rate { - color: $gray5; - } - .rated { + .clickable { color: $orange; } - .tagsContainer { - padding: 0; - margin: 12 12 0; - .tag { - padding: 0 6 2; - margin: 2 8 8 0; - } - } - .overviewContainer { - margin: 8 8 12; - .overviewItem { - border-radius: 8; - margin: 4; - // elevation: 1; - .er { - padding: 16 0 0 16; - horizontal-alignment: left; - } - .itemCount { - font-size: 14; - padding: 8 16 16; - } - } +} +.ingredient { + padding: 0 16; + .value { + @extend .tw; + vertical-align: center; + padding: 14 0 14 16; + line-height: 4; } +} +.instruction { + padding: 0 16; .count { - width: 24; - height: 24; - margin: 0 0 0 8; - text-align: center; - vertical-alignment: top; - horizontal-alignment: center; - border-radius: 99; - border-width: 2; - border-color: $gray5; - line-height: 0; + @extend .tb; + font-size: 17; } - .instruction { - font-size: 14; - line-height: 6; - padding: 2 0 24 35; - margin: 0 0 0 19; - border-width: 0 0 0 2; - border-color: $gray5; + .value { + @extend .tw; + padding: 14 0 14 16; + line-height: 4; } - .instruction.noBorder { - border-color: transparent; - } - .done .count { - background: $orange; - border-color: $orange; - } - .done .instruction { - opacity: 0.4; +} +.done { + opacity: 0.5; + // @extend .fade; + .value { text-decoration: line-through; } - .combination { - margin: 0 16 8; - border-radius: 8; - font-size: 14; - .combinationTitle { - padding: 14 16; - margin: 0; - line-height: 6; - } - } - .note { - font-size: 14; - line-height: 6; - padding: 14 16; - margin: 0 0 8; - border-radius: 8; - } +} +.combination { + @extend .tw; + text-align: left; + padding: 16; + line-height: 4; +} +.note { + @extend .tw; + line-height: 4; + padding: 16 0; } // ----------------------------- // APPBAR .appbar { z-index: 99; - height: 56; + min-height: 56; margin: 8; - padding: 0; - border-radius: 99; - background: $gray0; + padding: 4; + border-radius: 10; elevation: 16; - android-elevation: 16; - GridLayout { - padding: 0; - margin: 0; - } - .er { - padding: 0; - margin: 4 4 4 0; - &.menu { - margin: 4; - } - } - .fab { - width: 56; - height: 56; - margin: 0; + &.hlMsg { background: $orange; - ripple-color: $fabRipple; } .title { @extend .tb; - padding: 0 0 0 8; - text-align: left; + @extend .tw; vertical-align: center; - font-size: 18; + line-height: 4; } + .msg { + padding: 14 16; + } + .fab { + margin-left: 4; + } +} +.toolbar { + z-index: 98; + padding: 4; + margin-bottom: 0; + horizontal-alignment: left; + .tool { + padding: 0 12; + Label { + vertical-alignment: center; + } + .ico { + padding-right: 8; + } + } +} +.fab { + width: 48; + height: 48; + margin: 0 4 0 0; + border-radius: 8; + background: $orange; } // ----------------------------- // EDIT RECIPE .sectionTitle { @extend .tb; - font-size: 18; + @extend .tw; + font-size: 21; + padding: 0; + margin: 32 0 16; } -.text-btn { - font-size: 14; - horizontal-alignment: left; - padding: 12; - margin: 8 0 0; - min-width: 0; -} -MDButton.x { - margin: 0 0 5; - width: 32; - height: 32; - min-width: 0; - vertical-alignment: center; +.countdown { + background-color: transparent; + width: 48; + height: 48; + z-index: 0; + font-size: 17; + color: $orange; } // ----------------------------- // MEAL PLANNER .calendar { padding: 0 8; .navBtn { - horizontal-alignment: center; margin: 0; } .monthName { text-align: center; vertical-alignment: center; - font-size: 18; - padding: 24 0; + font-size: 17; } .dayName { - padding: 8 4; + margin: 8 0; font-size: 12; text-align: center; } .day { - font-size: 14; - margin: 4; - width: 32; - height: 32; - // horizontal-alignment: center; - border-radius: 99; - text-align: center; + border-radius: 8; + } + .hasPlans { + color: $orange; + } + .activeDay { + background-color: rgba($orange, 0.2); } } .dayPlan { - padding: 0 8 88; + padding: 16 16 80; width: 100%; - .plansContainer { - margin: 16 0 0 8; - padding: 0; - border-left-width: 8; - &.breakfast { - border-left-color: $breakfast; - } - &.lunch { - border-left-color: $lunch; - } - &.dinner { - border-left-color: $dinner; - } - &.snacks { - border-left-color: $snacks; - } - .periodLabel { - text-transform: capitalize; - vertical-alignment: center; - font-size: 14; - padding: 0 0 0 16; - } - .recipe { - margin: 0 8; - .titleContainer { - border-radius: 8; - margin: 0 0 8 8; - } - .recipeTitle { - font-size: 14; - padding: 14 16; - line-height: 6; - } - } - .x { - margin: 8 0 16 8; - vertical-alignment: center; - } + .periodLabel { + font-size: 17; + text-transform: capitalize; + vertical-align: center; + } + .recipeTitle { + @extend .tw; + text-align: left; + padding: 16 0; + line-height: 4; } } // ----------------------------- // DIALOGS -.dialogContainer { - max-width: 480; +.modal { + max-width: 320; width: 100%; - color: $gray9; - background: $gray1; - border-radius: 8; - font-size: 14; - margin: 64 0; - &.dark { - color: $gray2; - background: $gray9; - } - .dialogHeader { - padding: 24; - } - .dialogIcon { - font-size: 24; - vertical-alignment: center; - } - .dialogTitle { + border-radius: 10; + margin: 72 0; + .title { @extend .tb; - line-height: 6; - padding: 0 0 0 18; - font-size: 18; - vertical-alignment: center; + @extend .tw; + padding: 16; + font-size: 21; } - .dialogInput { - padding: 0 24 16; + .input { + padding: 0 16 8; } - .dialogDescription { - line-height: 6; - padding: 0 24 8; + .description { + line-height: 4; + padding: 0 16 8; } - .actionItem { + ListPicker { + width: 25%; + height: 160; + } + .listItem { + @extend .tw; width: 100%; letter-spacing: 0; text-transform: none; - line-height: 1; - padding: 13 24; + line-height: 4; + padding: 13 16; margin: 0; - border-radius: 1; background: transparent; - // background: red; - } - .actionToggle { - background: $orange; - } - .actionsContainer { - padding: 8; } .shareItem { border-radius: 8; margin: 0 8 8; - // elevation: 1; text-align: center; - .er { + .ico { padding: 16 0 0; } .item { + @extend .tw; padding: 8 16 16; } } - .action { - font-size: 12; - padding: 12; - min-width: 0; - color: $orange; + .actions { + padding: 4; } - MDButton.actionIcon { - font-size: 14; - width: auto; - height: auto; - min-width: 0; - padding: 16 24; - border-radius: 8; - letter-spacing: 0; - text-transform: none; - margin: 0 16 16; + .filters { + padding: 8; + margin: 0 0 8; } } +.noResInfo { + @extend .tac; + @extend .tw; + padding: 16; + line-height: 4; +} // ----------------------------- -MDActivityIndicator { +ActivityIndicator { width: 24; height: 24; - margin: 16 12; + margin: 12; + color: $orange; } // ----------------------------- // Transitions -.bounce-enter-active { - animation-name: bounce-in; - animation-duration: 1s; +.hl { + animation-name: hl; + animation-duration: 0.2s; animation-fill-mode: forwards; - animation-timing-function: ease-in-out; + animation-timing-function: ease-out; } -.bounce-leave-active { - transform: scale(0); - opacity: 0; -} -@keyframes bounce-in { +@keyframes hl { 0% { - transform: scale(0); - opacity: 0; + opacity: 0.5; + background-color: transparent; } - 25% { - transform: scale(1); + 100% { opacity: 1; - } - 55% { - transform: scale(0.8); - } - 80% { - transform: scale(1); + background-color: rgba($orange, 0.2); + } +} +.fade { + animation-name: fade; + animation-duration: 0.2s; + animation-fill-mode: forwards; + animation-timing-function: ease-out; +} +@keyframes fade { + 0% { + } + 100% { + opacity: 0.5; } } diff --git a/app/components/App.vue b/app/components/App.vue deleted file mode 100644 index a88ad9e0..00000000 --- a/app/components/App.vue +++ /dev/null @@ -1,495 +0,0 @@ - - - diff --git a/app/components/EditRecipe.vue b/app/components/EditRecipe.vue index 62572ebf..a7a439fa 100644 --- a/app/components/EditRecipe.vue +++ b/app/components/EditRecipe.vue @@ -1,63 +1,34 @@ @@ -332,22 +305,18 @@ import * as Toast from "nativescript-toast"; import * as Filepicker from "nativescript-plugin-filepicker"; import { ImageCropper } from "nativescript-imagecropper"; import { localize } from "@nativescript/localize"; -import { SnackBar } from "@nativescript-community/ui-material-snackbar"; -const snackbar = new SnackBar(); import { mapState, mapActions } from "vuex"; -import ViewRecipe from "./ViewRecipe.vue"; import ActionDialog from "./modal/ActionDialog.vue"; import ActionDialogWithSearch from "./modal/ActionDialogWithSearch.vue"; import ConfirmDialog from "./modal/ConfirmDialog.vue"; import PromptDialog from "./modal/PromptDialog.vue"; import ListPicker from "./modal/ListPicker.vue"; +import ViewRecipe from "./ViewRecipe"; import * as utils from "~/shared/utils"; +let undoTimer; export default { props: [ "recipeID", - "selectedCuisine", - "selectedCategory", - "selectedTag", "filterFavourites", "filterTrylater", "navigationFromView", @@ -390,6 +359,12 @@ export default { cacheImagePath: null, unSyncCombinations: [], difficultyLevels: ["Easy", "Moderate", "Challenging"], + appbar: null, + scrollPos: 1, + countdown: 5, + snackMsg: null, + showUndo: false, + undo: false, }; }, computed: { @@ -401,6 +376,9 @@ export default { "cuisines", "categories", "currentComponent", + "selectedCuisine", + "selectedCategory", + "selectedTag", ]), screenWidth() { return Screen.mainScreen.widthDIPs; @@ -417,7 +395,7 @@ export default { }, methods: { ...mapActions([ - "setCurrentComponentAction", + "setComponent", "addRecipeAction", "overwriteRecipeAction", "addListItemAction", @@ -430,7 +408,32 @@ export default { }, onPageUnload() { this.releaseBackEvent(); - snackbar.dismiss(); + }, + onAppBarLoad({ object }) { + this.appbar = object; + }, + onScroll(args) { + let scrollUp; + let y = args.scrollY; + if (y) { + scrollUp = y < this.scrollPos; + this.scrollPos = Math.abs(y); + let ab = this.appbar.translateY; + if (!scrollUp && ab == 0) { + this.animateInOut( + 250, + false, + (val) => (this.appbar.translateY = val * 64) + ); + } else if (scrollUp && ab == 64) { + Utils.ad.dismissSoftInput(); + this.animateInOut( + 250, + true, + (val) => (this.appbar.translateY = val * 64) + ); + } + } }, timeRequired(time) { let t = this.recipeContent[time].split(":"); @@ -514,6 +517,11 @@ export default { } }); }, + getTitleCount(title, type) { + let count = this.recipeContent[type].length; + let text = count ? ` (${count})` : ""; + return localize(title) + text; + }, // DATA LIST showCuisine(focus) { this.modalOpen = true; @@ -522,9 +530,7 @@ export default { props: { title: "cui", list: this.cuisines, - stretch: true, action: "aNBtn", - helpIcon: "cuisine", }, }).then((action) => { if (action == "aNBtn") { @@ -532,7 +538,6 @@ export default { props: { title: "newCui", action: "aBtn", - helpIcon: "cuisine", }, }).then((item) => { this.hijackBackEvent(); @@ -566,9 +571,7 @@ export default { props: { title: "cat", list: this.categories, - stretch: true, action: "aNBtn", - helpIcon: "category", }, }).then((action) => { if (action == "aNBtn") { @@ -576,7 +579,6 @@ export default { props: { title: "nwCat", action: "aBtn", - helpIcon: "category", }, }).then((item) => { this.hijackBackEvent(); @@ -610,9 +612,7 @@ export default { props: { title: "yieldU", list: this.yieldUnits, - stretch: true, action: "aNBtn", - helpIcon: "yield", }, }).then((action) => { if (action == "aNBtn") { @@ -620,7 +620,6 @@ export default { props: { title: "nwYiU", action: "aBtn", - helpIcon: "yield", }, }).then((item) => { this.hijackBackEvent(); @@ -654,9 +653,6 @@ export default { props: { title: "Difficulty level", list: this.difficultyLevels, - stretch: false, - helpIcon: "diff", - count: 3, }, }).then((action) => { if (action) { @@ -679,9 +675,7 @@ export default { props: { title: "Unit", list: this.units, - stretch: true, action: "aNBtn", - helpIcon: "unit", }, }).then((action) => { if (action == "aNBtn") { @@ -689,7 +683,6 @@ export default { props: { title: "newUnit", action: "aBtn", - helpIcon: "unit", }, }).then((item) => { this.hijackBackEvent(); @@ -728,17 +721,6 @@ export default { }, 100); }, // NAVIGATION HANDLERS - navigateBackController() { - if (this.navigationFromView) { - this.$navigateTo(ViewRecipe, { - props: { - filterTrylater: this.filterTrylater, - recipeID: this.recipeID, - }, - backstackVisible: false, - }); - } else this.$navigateBack(); - }, navigateBack() { if (this.hasChanges) { this.blockModal = true; @@ -748,18 +730,16 @@ export default { description: localize("disc"), cancelButtonText: "disBtn", okButtonText: "kEdit", - helpIcon: "alert", - iconColor: "#c92a2a", }, }).then((action) => { this.blockModal = false; if (action != null && !action) { - this.navigateBackController(); + this.$navigateBack(); this.releaseBackEvent(); } }); } else { - this.navigateBackController(); + this.$navigateBack(); this.releaseBackEvent(); } }, @@ -783,24 +763,25 @@ export default { }, // DATA HANDLERS imageHandler() { - this.clearEmptyFields(); + this.clearEmptyFields(true); if (this.recipeContent.imageSrc) { this.blockModal = true; this.$showModal(ConfirmDialog, { props: { title: "recPic", - cancelButtonText: "rBtn", + secondButtonText: "rBtn", + cancelButtonText: "cBtn", okButtonText: "repBtn", - helpIcon: "img", - iconColor: "#1a1a1a", }, }).then((action) => { this.blockModal = false; - if (action) { + if (action > 0) { this.permissionCheck(this.permissionConfirmation, this.imagePicker); - } else if (action != null) { + } else if (action < 0) { this.recipeContent.imageSrc = null; this.releaseBackEvent(); + } else if (action != null) { + this.releaseBackEvent(); } }); } else { @@ -814,8 +795,6 @@ export default { description: localize("reqAcc"), cancelButtonText: "nNBtn", okButtonText: "conBtn", - helpIcon: "folder", - iconColor: "#ff5200", }, }); }, @@ -877,9 +856,9 @@ export default { toolbarTitle: localize("cPic"), statusBarColor: "#ff5200", toolbarTextColor: - this.appTheme == "light" ? "#1A1A1A" : "#e0e0e0", + this.appTheme == "light" ? "#1A1A1A" : "#e9ecef", toolbarColor: - this.appTheme == "light" ? "#e0e0e0" : "#1A1A1A", + this.appTheme == "light" ? "#e9ecef" : "#1A1A1A", cropFrameColor: "#ff5200", } ) @@ -892,9 +871,10 @@ export default { }, // INPUT FIELD HANDLERS splitTags() { + let tags = []; let string; if (this.tags) { - let tags = this.tags + tags = this.tags .split(" ") .map((e) => { string = e.replace(/^[^\w\s]+/, ""); @@ -903,22 +883,38 @@ export default { } }) .filter((e) => e); - this.recipeContent.tags = tags; } + this.recipeContent.tags = tags; }, joinTags() { this.tags = this.recipeContent.tags.join(" "); }, - undoDeletion(message) { - return snackbar.action({ - message, - textColor: this.appTheme == "light" ? "#fff" : "#292929", - actionTextColor: "#ff5200", - backgroundColor: this.appTheme == "light" ? "#292929" : "#fff", - actionText: localize("undo"), - hideDelay: 5000, + showUndoBar(message) { + return new Promise((resolve, reject) => { + this.showUndo = true; + this.appbar.translateY = 0; + this.snackMsg = message; + this.countdown = 5; + let a = 5; + clearTimeout(undoTimer); + undoTimer = setInterval(() => { + if (this.undo) { + this.showUndo = this.undo = false; + clearTimeout(undoTimer); + resolve(true); + } + this.countdown = Math.round((a -= 0.1)); + if (this.countdown < 1) { + this.showUndo = false; + clearTimeout(undoTimer); + reject(true); + } + }, 100); }); }, + undoDel() { + this.undo = true; + }, addIngredient() { let ingredients = this.recipeContent.ingredients; let unit = ingredients.length @@ -935,10 +931,9 @@ export default { if (this.recipeContent.ingredients[index].item.length) { let item = this.recipeContent.ingredients[index]; this.recipeContent.ingredients.splice(index, 1); - this.undoDeletion(`${this.$options.filters.L("rmIng")}`).then((res) => { - if (res.command === "action") - this.recipeContent.ingredients.splice(index, 0, item); - }); + this.showUndoBar("rmIng").then( + (res) => res && this.recipeContent.ingredients.splice(index, 0, item) + ); } else { this.recipeContent.ingredients.splice(index, 1); } @@ -951,11 +946,9 @@ export default { if (this.recipeContent.instructions[index].length) { let item = this.recipeContent.instructions[index]; this.recipeContent.instructions.splice(index, 1); - this.undoDeletion(`${this.$options.filters.L("rmIns")}`).then((res) => { - if (res.command === "action") { - this.recipeContent.instructions.splice(index, 0, item); - } - }); + this.showUndoBar("rmIns").then( + (res) => res && this.recipeContent.instructions.splice(index, 0, item) + ); } else this.recipeContent.instructions.splice(index, 1); }, addNote() { @@ -965,17 +958,16 @@ export default { if (this.recipeContent.notes[index].length) { let item = this.recipeContent.notes[index]; this.recipeContent.notes.splice(index, 1); - this.undoDeletion(`${this.$options.filters.L("rmN")}`).then((res) => { - if (res.command === "action") { - this.recipeContent.notes.splice(index, 0, item); - } - }); + this.showUndoBar("rmN").then((res) => + this.recipeContent.notes.splice(index, 0, item) + ); } else this.recipeContent.notes.splice(index, 1); }, getCombinationTitle(id) { return this.recipes.filter((e) => e.id === id)[0].title; }, showCombinations() { + Utils.ad.dismissSoftInput(); this.modalOpen = true; this.releaseBackEvent(); let existingCombinations = [ @@ -989,7 +981,6 @@ export default { props: { title: "selRec", recipes: filteredRecipes, - helpIcon: "comb", }, }).then((res) => { this.hijackBackEvent(); @@ -1002,15 +993,13 @@ export default { let index = this.recipeContent.combinations.indexOf(id); this.recipeContent.combinations.splice(index, 1); this.unSyncCombinations.push(id); - this.undoDeletion(`${this.$options.filters.L("rmCmb")}`).then((res) => { - if (res.command === "action") { - this.recipeContent.combinations.splice(index, 0, id); - } - }); + this.showUndoBar("rmCmb").then((res) => + this.recipeContent.combinations.splice(index, 0, id) + ); }, // SAVE OPERATION - clearEmptyFields() { - if (!this.recipeContent.title) + clearEmptyFields(bool) { + if (!this.recipeContent.title && !bool) this.recipeContent.title = localize("untRec"); if (!this.recipeContent.yield.quantity) this.recipeContent.yield.quantity = 1; @@ -1084,12 +1073,12 @@ export default { setTimeout(() => { this.saving = false; }, 100); - this.navigateBackController(); + this.$navigateBack(); }, }, created() { setTimeout((e) => { - this.setCurrentComponentAction("EditRecipe"); + this.setComponent("EditRecipe"); }, 500); this.title = this.recipeID ? "editRec" : "newRec"; if (this.recipeID) { diff --git a/app/components/EnRecipes.vue b/app/components/EnRecipes.vue index 957a7d73..45939e86 100644 --- a/app/components/EnRecipes.vue +++ b/app/components/EnRecipes.vue @@ -1,417 +1,470 @@ + diff --git a/app/components/GroceryList.vue b/app/components/GroceryList.vue index fc34f379..1ca66b4e 100644 --- a/app/components/GroceryList.vue +++ b/app/components/GroceryList.vue @@ -2,22 +2,9 @@ - +