mirrors/recipes
1
0
Fork 0
mirror of https://github.com/TandoorRecipes/recipes.git synced 2026-01-01 04:10:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into draggable_pill_update

Browse Source
This commit is contained in:
vabene1111
2021-10-01 07:53:35 +00:00
committed by GitHub
parent 09140454a2 4c3cea3189
commit 64b2e21747
39 changed files with 999 additions and 358 deletions
Download Patch File Download Diff File Expand all files Collapse all files

205
vue/package-lock.json generated
View File

@@ -10,21 +10,24 @@
"@babel/eslint-parser": "^7.13.14",
"@kangc/v-md-editor": "^1.7.7",
"@kevinfaguiar/vue-twemoji-picker": "^5.7.4",
"@popperjs/core": "^2.10.1",
"@riophae/vue-treeselect": "^0.4.0",
"axios": "^0.21.1",
"axios": "^0.21.4",
"bootstrap-vue": "^2.21.2",
"core-js": "^3.14.0",
"core-js": "^3.18.1",
"lodash": "^4.17.21",
"moment": "^2.29.1",
"prismjs": "^1.24.1",
"prismjs": "^1.25.0",
"vue": "^2.6.14",
"vue-class-component": "^7.2.3",
"vue-click-outside": "^1.1.0",
"vue-clickaway": "^2.2.2",
"vue-cookies": "^1.7.4",
"vue-i18n": "^8.24.4",
"vue-infinite-loading": "^2.4.5",
"vue-multiselect": "^2.1.6",
"vue-property-decorator": "^9.1.2",
"vue-simple-calendar": "^5.0.1",
"vue-template-compiler": "^2.6.14",
"vue2-touch-events": "^3.2.2",
"vuedraggable": "^2.24.3",
@@ -34,7 +37,7 @@
"devDependencies": {
"@kazupon/vue-i18n-loader": "^0.5.0",
"@typescript-eslint/eslint-plugin": "^4.26.1",
"@typescript-eslint/parser": "^4.31.0",
"@typescript-eslint/parser": "^4.32.0",
"@vue/cli-plugin-babel": "~4.5.13",
"@vue/cli-plugin-eslint": "~4.5.13",
"@vue/cli-plugin-pwa": "~4.5.13",
@@ -48,7 +51,7 @@
"typescript": "~4.4.3",
"vue-cli-plugin-i18n": "^2.1.1",
"webpack-bundle-tracker": "1.3.0",
"workbox-expiration": "^6.0.2",
"workbox-expiration": "^6.3.0",
"workbox-navigation-preload": "^6.0.2",
"workbox-precaching": "^6.3.0",
"workbox-routing": "^6.3.0",
@@ -1453,8 +1456,9 @@
}
},
"node_modules/@popperjs/core": {
"version": "2.9.2",
"license": "MIT",
"version": "2.10.2",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz",
"integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ==",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/popperjs"
@@ -1992,14 +1996,14 @@
}
},
"node_modules/@typescript-eslint/parser": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz",
"integrity": "sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.32.0.tgz",
"integrity": "sha512-lhtYqQ2iEPV5JqV7K+uOVlPePjClj4dOw7K4/Z1F2yvjIUvyr13yJnDzkK6uon4BjHYuHy3EG0c2Z9jEhFk56w==",
"dev": true,
"dependencies": {
"@typescript-eslint/scope-manager": "4.31.0",
"@typescript-eslint/types": "4.31.0",
"@typescript-eslint/typescript-estree": "4.31.0",
"@typescript-eslint/scope-manager": "4.32.0",
"@typescript-eslint/types": "4.32.0",
"@typescript-eslint/typescript-estree": "4.32.0",
"debug": "^4.3.1"
},
"engines": {
@@ -2019,13 +2023,13 @@
}
},
"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/scope-manager": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz",
"integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz",
"integrity": "sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "4.31.0",
"@typescript-eslint/visitor-keys": "4.31.0"
"@typescript-eslint/types": "4.32.0",
"@typescript-eslint/visitor-keys": "4.32.0"
},
"engines": {
"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -2036,9 +2040,9 @@
}
},
"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/types": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz",
"integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz",
"integrity": "sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==",
"dev": true,
"engines": {
"node": "^8.10.0 || ^10.13.0 || >=11.10.1"
@@ -2049,13 +2053,13 @@
}
},
"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/typescript-estree": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz",
"integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz",
"integrity": "sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "4.31.0",
"@typescript-eslint/visitor-keys": "4.31.0",
"@typescript-eslint/types": "4.32.0",
"@typescript-eslint/visitor-keys": "4.32.0",
"debug": "^4.3.1",
"globby": "^11.0.3",
"is-glob": "^4.0.1",
@@ -2076,12 +2080,12 @@
}
},
"node_modules/@typescript-eslint/parser/node_modules/@typescript-eslint/visitor-keys": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz",
"integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz",
"integrity": "sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==",
"dev": true,
"dependencies": {
"@typescript-eslint/types": "4.31.0",
"@typescript-eslint/types": "4.32.0",
"eslint-visitor-keys": "^2.0.0"
},
"engines": {
@@ -4048,10 +4052,11 @@
"license": "MIT"
},
"node_modules/axios": {
"version": "0.21.1",
"license": "MIT",
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
"dependencies": {
"follow-redirects": "^1.10.0"
"follow-redirects": "^1.14.0"
}
},
"node_modules/babel-code-frame": {
@@ -5690,9 +5695,10 @@
}
},
"node_modules/core-js": {
"version": "3.14.0",
"version": "3.18.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.1.tgz",
"integrity": "sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA==",
"hasInstallScript": true,
"license": "MIT",
"funding": {
"type": "opencollective",
"url": "https://opencollective.com/core-js"
@@ -8957,6 +8963,11 @@
"node": ">= 6"
}
},
"node_modules/idb": {
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/idb/-/idb-6.1.4.tgz",
"integrity": "sha512-DshI5yxIB3NYc47cPpfipYX8MSIgQPqVR+WoaGI9EDq6cnLGgGYR1fp6z8/Bq9vMS8Jq1bS3eWUgXpFO5+ypSA=="
},
"node_modules/ieee754": {
"version": "1.2.1",
"funding": [
@@ -12047,9 +12058,9 @@
}
},
"node_modules/prismjs": {
"version": "1.24.1",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.24.1.tgz",
"integrity": "sha512-mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow=="
"version": "1.25.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz",
"integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg=="
},
"node_modules/process": {
"version": "0.11.10",
@@ -14751,6 +14762,11 @@
"url": "https://github.com/sponsors/isaacs"
}
},
"node_modules/vue-click-outside": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/vue-click-outside/-/vue-click-outside-1.1.0.tgz",
"integrity": "sha512-pNyvAA9mRXJwPHlHJyjMb4IONSc7khS5lxGcMyE2EIKgNMAO279PWM9Hyq0d5J4FkiSRdmFLwnbjDd5UtPizHQ=="
},
"node_modules/vue-clickaway": {
"version": "2.2.2",
"license": "MIT",
@@ -14946,6 +14962,16 @@
"vue-class-component": "*"
}
},
"node_modules/vue-simple-calendar": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/vue-simple-calendar/-/vue-simple-calendar-5.0.1.tgz",
"integrity": "sha512-JRsN3cSyS7q38OSa8IJMars5Uq1BYq8jfBrtmmyCQXw1wXcEPyfjRSnrScobwFNE2XhSSkbkbDKYJlUAJudvpQ==",
"dependencies": {
"core-js": "^3.7.0",
"vue": "^2.6.12",
"webpack": "^4.45.0"
}
},
"node_modules/vue-style-loader": {
"version": "4.1.3",
"dev": true,
@@ -15782,10 +15808,12 @@
"integrity": "sha512-SufToEV3SOLwwz3j+P4pgkfpzLRUlR17sX3p/LrMHP/brYKvJQqjTwtSvaCkkAX0RPHX2TFHmN8xhPP1bpmomg=="
},
"node_modules/workbox-expiration": {
"version": "6.1.5",
"license": "MIT",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.3.0.tgz",
"integrity": "sha512-teYuYfM3HFbwAD/nlZDw/dCMOrCKjsAiMRhz0uOy9IkfBb7vBynO3xf118lY62X6BfqjZdeahiHh10N0/aYICg==",
"dependencies": {
"workbox-core": "^6.1.5"
"idb": "^6.0.0",
"workbox-core": "6.3.0"
}
},
"node_modules/workbox-google-analytics": {
@@ -17139,7 +17167,9 @@
}
},
"@popperjs/core": {
"version": "2.9.2"
"version": "2.10.2",
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.10.2.tgz",
"integrity": "sha512-IXf3XA7+XyN7CP9gGh/XB0UxVMlvARGEgGXLubFICsUMGz6Q+DU+i4gGlpOxTjKvXjkJDJC8YdqdKkDj9qZHEQ=="
},
"@riophae/vue-treeselect": {
"version": "0.4.0",
@@ -17527,41 +17557,41 @@
}
},
"@typescript-eslint/parser": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.0.tgz",
"integrity": "sha512-oWbzvPh5amMuTmKaf1wp0ySxPt2ZXHnFQBN2Szu1O//7LmOvgaKTCIDNLK2NvzpmVd5A2M/1j/rujBqO37hj3w==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.32.0.tgz",
"integrity": "sha512-lhtYqQ2iEPV5JqV7K+uOVlPePjClj4dOw7K4/Z1F2yvjIUvyr13yJnDzkK6uon4BjHYuHy3EG0c2Z9jEhFk56w==",
"dev": true,
"requires": {
"@typescript-eslint/scope-manager": "4.31.0",
"@typescript-eslint/types": "4.31.0",
"@typescript-eslint/typescript-estree": "4.31.0",
"@typescript-eslint/scope-manager": "4.32.0",
"@typescript-eslint/types": "4.32.0",
"@typescript-eslint/typescript-estree": "4.32.0",
"debug": "^4.3.1"
},
"dependencies": {
"@typescript-eslint/scope-manager": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.0.tgz",
"integrity": "sha512-LJ+xtl34W76JMRLjbaQorhR0hfRAlp3Lscdiz9NeI/8i+q0hdBZ7BsiYieLoYWqy+AnRigaD3hUwPFugSzdocg==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.32.0.tgz",
"integrity": "sha512-DK+fMSHdM216C0OM/KR1lHXjP1CNtVIhJ54kQxfOE6x8UGFAjha8cXgDMBEIYS2XCYjjCtvTkjQYwL3uvGOo0w==",
"dev": true,
"requires": {
"@typescript-eslint/types": "4.31.0",
"@typescript-eslint/visitor-keys": "4.31.0"
"@typescript-eslint/types": "4.32.0",
"@typescript-eslint/visitor-keys": "4.32.0"
}
},
"@typescript-eslint/types": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.0.tgz",
"integrity": "sha512-9XR5q9mk7DCXgXLS7REIVs+BaAswfdHhx91XqlJklmqWpTALGjygWVIb/UnLh4NWhfwhR5wNe1yTyCInxVhLqQ==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.32.0.tgz",
"integrity": "sha512-LE7Z7BAv0E2UvqzogssGf1x7GPpUalgG07nGCBYb1oK4mFsOiFC/VrSMKbZQzFJdN2JL5XYmsx7C7FX9p9ns0w==",
"dev": true
},
"@typescript-eslint/typescript-estree": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.0.tgz",
"integrity": "sha512-QHl2014t3ptg+xpmOSSPn5hm4mY8D4s97ftzyk9BZ8RxYQ3j73XcwuijnJ9cMa6DO4aLXeo8XS3z1omT9LA/Eg==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.32.0.tgz",
"integrity": "sha512-tRYCgJ3g1UjMw1cGG8Yn1KzOzNlQ6u1h9AmEtPhb5V5a1TmiHWcRyF/Ic+91M4f43QeChyYlVTcf3DvDTZR9vw==",
"dev": true,
"requires": {
"@typescript-eslint/types": "4.31.0",
"@typescript-eslint/visitor-keys": "4.31.0",
"@typescript-eslint/types": "4.32.0",
"@typescript-eslint/visitor-keys": "4.32.0",
"debug": "^4.3.1",
"globby": "^11.0.3",
"is-glob": "^4.0.1",
@@ -17570,12 +17600,12 @@
}
},
"@typescript-eslint/visitor-keys": {
"version": "4.31.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.0.tgz",
"integrity": "sha512-HUcRp2a9I+P21+O21yu3ezv3GEPGjyGiXoEUQwZXjR8UxRApGeLyWH4ZIIUSalE28aG4YsV6GjtaAVB3QKOu0w==",
"version": "4.32.0",
"resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.32.0.tgz",
"integrity": "sha512-e7NE0qz8W+atzv3Cy9qaQ7BTLwWsm084Z0c4nIO2l3Bp6u9WIgdqCgyPyV5oSPDMIW3b20H59OOCmVk3jw3Ptw==",
"dev": true,
"requires": {
"@typescript-eslint/types": "4.31.0",
"@typescript-eslint/types": "4.32.0",
"eslint-visitor-keys": "^2.0.0"
}
},
@@ -17898,6 +17928,7 @@
"version": "4.5.13",
"dev": true,
"requires": {
"@babel/core": "^7.11.0",
"@babel/helper-compilation-targets": "^7.9.6",
"@babel/helper-module-imports": "^7.8.3",
"@babel/plugin-proposal-class-properties": "^7.8.3",
@@ -17910,6 +17941,7 @@
"@vue/babel-plugin-jsx": "^1.0.3",
"@vue/babel-preset-jsx": "^1.2.4",
"babel-plugin-dynamic-import-node": "^2.3.3",
"core-js": "^3.6.5",
"core-js-compat": "^3.6.5",
"semver": "^6.1.0"
}
@@ -18939,9 +18971,11 @@
"dev": true
},
"axios": {
"version": "0.21.1",
"version": "0.21.4",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz",
"integrity": "sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==",
"requires": {
"follow-redirects": "^1.10.0"
"follow-redirects": "^1.14.0"
}
},
"babel-code-frame": {
@@ -20097,7 +20131,9 @@
}
},
"core-js": {
"version": "3.14.0"
"version": "3.18.1",
"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.18.1.tgz",
"integrity": "sha512-vJlUi/7YdlCZeL6fXvWNaLUPh/id12WXj3MbkMw5uOyF0PfWPBNOCNbs53YqgrvtujLNlt9JQpruyIKkUZ+PKA=="
},
"core-js-compat": {
"version": "3.14.0",
@@ -22376,6 +22412,11 @@
"postcss": "^7.0.14"
}
},
"idb": {
"version": "6.1.4",
"resolved": "https://registry.npmjs.org/idb/-/idb-6.1.4.tgz",
"integrity": "sha512-DshI5yxIB3NYc47cPpfipYX8MSIgQPqVR+WoaGI9EDq6cnLGgGYR1fp6z8/Bq9vMS8Jq1bS3eWUgXpFO5+ypSA=="
},
"ieee754": {
"version": "1.2.1"
},
@@ -24417,9 +24458,9 @@
}
},
"prismjs": {
"version": "1.24.1",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.24.1.tgz",
"integrity": "sha512-mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow=="
"version": "1.25.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz",
"integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg=="
},
"process": {
"version": "0.11.10"
@@ -26283,6 +26324,11 @@
}
}
},
"vue-click-outside": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/vue-click-outside/-/vue-click-outside-1.1.0.tgz",
"integrity": "sha512-pNyvAA9mRXJwPHlHJyjMb4IONSc7khS5lxGcMyE2EIKgNMAO279PWM9Hyq0d5J4FkiSRdmFLwnbjDd5UtPizHQ=="
},
"vue-clickaway": {
"version": "2.2.2",
"requires": {
@@ -26410,6 +26456,16 @@
"version": "9.1.2",
"requires": {}
},
"vue-simple-calendar": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/vue-simple-calendar/-/vue-simple-calendar-5.0.1.tgz",
"integrity": "sha512-JRsN3cSyS7q38OSa8IJMars5Uq1BYq8jfBrtmmyCQXw1wXcEPyfjRSnrScobwFNE2XhSSkbkbDKYJlUAJudvpQ==",
"requires": {
"core-js": "^3.7.0",
"vue": "^2.6.12",
"webpack": "^4.45.0"
}
},
"vue-style-loader": {
"version": "4.1.3",
"dev": true,
@@ -27009,9 +27065,12 @@
"integrity": "sha512-SufToEV3SOLwwz3j+P4pgkfpzLRUlR17sX3p/LrMHP/brYKvJQqjTwtSvaCkkAX0RPHX2TFHmN8xhPP1bpmomg=="
},
"workbox-expiration": {
"version": "6.1.5",
"version": "6.3.0",
"resolved": "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.3.0.tgz",
"integrity": "sha512-teYuYfM3HFbwAD/nlZDw/dCMOrCKjsAiMRhz0uOy9IkfBb7vBynO3xf118lY62X6BfqjZdeahiHh10N0/aYICg==",
"requires": {
"workbox-core": "^6.1.5"
"idb": "^6.0.0",
"workbox-core": "6.3.0"
}
},
"workbox-google-analytics": {

10
vue/package.json
View File

@@ -13,12 +13,12 @@
"@kevinfaguiar/vue-twemoji-picker": "^5.7.4",
"@popperjs/core": "^2.10.1",
"@riophae/vue-treeselect": "^0.4.0",
"axios": "^0.21.1",
"axios": "^0.21.4",
"bootstrap-vue": "^2.21.2",
"core-js": "^3.14.0",
"core-js": "^3.18.1",
"lodash": "^4.17.21",
"moment": "^2.29.1",
"prismjs": "^1.24.1",
"prismjs": "^1.25.0",
"vue": "^2.6.14",
"vue-class-component": "^7.2.3",
"vue-click-outside": "^1.1.0",
@@ -38,7 +38,7 @@
"devDependencies": {
"@kazupon/vue-i18n-loader": "^0.5.0",
"@typescript-eslint/eslint-plugin": "^4.26.1",
"@typescript-eslint/parser": "^4.31.0",
"@typescript-eslint/parser": "^4.32.0",
"@vue/cli-plugin-babel": "~4.5.13",
"@vue/cli-plugin-eslint": "~4.5.13",
"@vue/cli-plugin-pwa": "~4.5.13",
@@ -52,7 +52,7 @@
"typescript": "~4.4.3",
"vue-cli-plugin-i18n": "^2.1.1",
"webpack-bundle-tracker": "1.3.0",
"workbox-expiration": "^6.0.2",
"workbox-expiration": "^6.3.0",
"workbox-navigation-preload": "^6.0.2",
"workbox-precaching": "^6.3.0",
"workbox-routing": "^6.3.0",

161
vue/src/apps/MealPlanView/MealPlanView.vue
View File

@@ -1,73 +1,81 @@
<template>
<div>
<div class="row">
<div class="col-12 calender-parent">
<calendar-view
:show-date="showDate" :enable-date-selection="true" class="theme-default"
@date-selection-finish="createEntryRange" :items="plan_items"
:display-period-uom="settings.displayPeriodUom"
:period-changed-callback="refreshData" :enable-drag-drop="true" :item-content-height="item_height"
@click-date="createEntryClick" @drop-on-date="moveEntry"
:display-period-count="settings.displayPeriodCount"
:starting-day-of-week="settings.startingDayOfWeek"
:display-week-numbers="settings.displayWeekNumbers">
<template #item="{ value, weekStartDate, top }">
<meal-plan-card :value="value" :week-start-date="weekStartDate" :top="top" :detailed="detailed_items"
:item_height="item_height" @dragstart="dragged_item = value" @click-item="entryClick"/>
</template>
<b-tabs content-class="mt-3">
<b-tab :title="$t('Planner')" active>
<div class="row">
<div class="col-12 calender-parent">
<calendar-view
:show-date="showDate" :enable-date-selection="true" class="theme-default"
@date-selection-finish="createEntryRange" :items="plan_items"
:display-period-uom="settings.displayPeriodUom"
:period-changed-callback="periodChangedCallback" :enable-drag-drop="true"
:item-content-height="item_height"
@click-date="createEntryClick" @drop-on-date="moveEntry"
:display-period-count="settings.displayPeriodCount"
:starting-day-of-week="settings.startingDayOfWeek"
:display-week-numbers="settings.displayWeekNumbers">
<template #item="{ value, weekStartDate, top }">
<meal-plan-card :value="value" :week-start-date="weekStartDate" :top="top" :detailed="detailed_items"
:item_height="item_height" @dragstart="dragged_item = value" @click-item="entryClick"
@open-context-menu="openContextMenu"/>
</template>
<template #header="{ headerProps }">
<meal-plan-calender-header
:header-props="headerProps"
@input="setShowDate" @delete-dragged="deleteEntry(dragged_item)"/>
</template>
</calendar-view>
</div>
</div>
</b-tab>
<b-tab :title="$t('Settings')">
<div class="row mt-3">
<div class="col-3 calender-options">
<h5>{{ $t('CalenderSettings') }}</h5>
<b-form>
<b-form-group id="UomInput"
:label="$t('Period')"
:description="$t('PeriodToShow')"
label-for="UomInput">
<b-form-select
id="UomInput"
v-model="settings.displayPeriodUom"
:options="options.displayPeriodUom"
></b-form-select>
</b-form-group>
<b-form-group id="PeriodInput"
:label="$t('PeriodCount')"
:description="$t('ShowHowManyPeriods')"
label-for="PeriodInput">
<b-form-select
id="PeriodInput"
v-model="settings.displayPeriodCount"
:options="options.displayPeriodCount"
></b-form-select>
</b-form-group>
<b-form-group id="DaysInput"
:label="$t('StartingDay')"
:description="$t('StartingDay')"
label-for="DaysInput">
<b-form-select
id="DaysInput"
v-model="settings.startingDayOfWeek"
:options="dayNames"
></b-form-select>
</b-form-group>
</b-form>
</div>
<div class="col-6">
<h5>{{ $t('MealTypes') }}</h5>
<b-form>
<template #header="{ headerProps }">
<calendar-view-header
:header-props="headerProps"
@input="setShowDate"/>
</template>
</calendar-view>
</div>
</div>
<div class="row mt-3">
<div class="col-3 calender-options">
<h5>{{ $t('CalenderSettings') }}</h5>
<b-form>
<b-form-group id="UomInput"
:label="$t('Period')"
:description="$t('PeriodToShow')"
label-for="UomInput">
<b-form-select
id="UomInput"
v-model="settings.displayPeriodUom"
:options="options.displayPeriodUom"
></b-form-select>
</b-form-group>
<b-form-group id="PeriodInput"
:label="$t('PeriodCount')"
:description="$t('ShowHowManyPeriods')"
label-for="PeriodInput">
<b-form-select
id="PeriodInput"
v-model="settings.displayPeriodCount"
:options="options.displayPeriodCount"
></b-form-select>
</b-form-group>
<b-form-group id="DaysInput"
:label="$t('StartingDay')"
:description="$t('StartingDay')"
label-for="DaysInput">
<b-form-select
id="DaysInput"
v-model="settings.startingDayOfWeek"
:options="dayNames"
></b-form-select>
</b-form-group>
</b-form>
</div>
<div class="col-6">
<h5>{{ $t('MealTypes') }}</h5>
<b-form>
</b-form>
<recipe-card :recipe="recipe_viewed" v-if="false"></recipe-card>
</div>
</div>
</b-tab>
</b-tabs>
</b-form>
<recipe-card :recipe="recipe_viewed" v-if="false"></recipe-card>
</div>
</div>
<ContextMenu ref="menu">
<template #menu="{ contextData }">
<ContextMenuItem @click="$refs.menu.close();openEntryEdit(contextData.originalItem.entry)">
@@ -100,7 +108,7 @@
import ContextMenu from "@/components/ContextMenu/ContextMenu";
import ContextMenuItem from "@/components/ContextMenu/ContextMenuItem";
import "vue-simple-calendar/static/css/default.css"
import {CalendarView, CalendarViewHeader, CalendarMathMixin} from "vue-simple-calendar/src/components/bundle";
import {CalendarView, CalendarMathMixin} from "vue-simple-calendar/src/components/bundle";
import Vue from "vue";
import {BootstrapVue} from "bootstrap-vue";
import {ApiApiFactory} from "@/utils/openapi/api";
@@ -110,6 +118,7 @@ import moment from 'moment'
import {ApiMixin, StandardToasts} from "@/utils/utils";
import MealPlanEditModal from "../../components/MealPlanEditModal";
import VueCookies from "vue-cookies";
import MealPlanCalenderHeader from "@/components/MealPlanCalenderHeader";
Vue.prototype.moment = moment
Vue.use(BootstrapVue)
@@ -124,9 +133,9 @@ export default {
MealPlanCard,
RecipeCard,
CalendarView,
CalendarViewHeader,
ContextMenu,
ContextMenuItem
ContextMenuItem,
MealPlanCalenderHeader
},
mixins: [CalendarMathMixin, ApiMixin],
data: function () {
@@ -253,7 +262,6 @@ export default {
createEntryClick(data) {
this.entryEditing = this.options.entryEditing
this.entryEditing.date = moment(data).format('YYYY-MM-DD')
console.log(this.entryEditing)
this.$bvModal.show(`edit-modal`)
},
findEntry(id) {
@@ -278,7 +286,6 @@ export default {
})
},
moveEntryRight(data) {
console.log(data)
this.plan_entries.forEach((entry) => {
if (entry.id === data.id) {
entry.date = moment(entry.date).add(1, 'd')
@@ -303,6 +310,9 @@ export default {
let entry = this.findEntry(data.id)
this.openEntryEdit(entry)
},
openContextMenu($event, value) {
this.$refs.menu.open($event, value)
},
openEntryEdit(entry) {
this.$bvModal.show(`edit-modal`)
this.entryEditing = entry
@@ -311,10 +321,15 @@ export default {
this.entryEditing.title_placeholder = this.entryEditing.recipe.name
}
},
refreshData() {
periodChangedCallback(date) {
let apiClient = new ApiApiFactory()
apiClient.listMealPlans().then(result => {
apiClient.listMealPlans({
query: {
from_date: moment(date.periodStart).format('YYYY-MM-DD'),
to_date: moment(date.periodEnd).format('YYYY-MM-DD')
}
}).then(result => {
this.plan_entries = result.data
})
apiClient.listMealTypes().then(result => {

40
vue/src/components/GenericMultiselect.vue
View File

@@ -38,12 +38,24 @@ export default {
},
props: {
placeholder: {type: String, default: undefined},
model: {type: Object, default () {return {}}},
model: {
type: Object, default() {
return {}
}
},
label: {type: String, default: 'name'},
parent_variable: {type: String, default: undefined},
limit: {type: Number, default: 10,},
sticky_options: {type:Array, default(){return []}},
initial_selection: {type:Array, default(){return []}},
sticky_options: {
type: Array, default() {
return []
}
},
initial_selection: {
type: Array, default() {
return []
}
},
multiple: {type: Boolean, default: true},
allow_create: {type: Boolean, default: false}, // TODO: this will create option to add new drop-downs
create_placeholder: {type: String, default: 'You Forgot to Add a Tag Placeholder'},
@@ -72,17 +84,33 @@ export default {
}
this.genericAPI(this.model, this.Actions.LIST, options).then((result) => {
this.objects = this.sticky_options.concat(result.data?.results ?? result.data)
if (this.selected_objects.length === 0 && this.initial_selection.length === 0 && this.objects.length > 0) {
this.objects.forEach((item) => {
if ("default" in item) {
if (item.default) {
if(this.multiple) {
this.selected_objects = [item]
} else {
this.selected_objects = item
}
this.selectionChanged()
}
}
})
}
})
},
selectionChanged: function () {
this.$emit('change', {var: this.parent_variable, val: this.selected_objects})
},
addNew(e) {
this.$emit('new', e)
// could refactor as Promise - seems unecessary
setTimeout(() => { this.search(''); }, 750);
setTimeout(() => {
this.search('');
}, 750);
}
}
}

143
vue/src/components/MealPlanCalenderHeader.vue Normal file
View File

@@ -0,0 +1,143 @@
<template>
<div class="cv-header">
<div class="cv-header-nav">
<button
:disabled="!headerProps.previousYear"
class="previousYear"
aria-label="Previous Year"
@click.prevent="onInput(headerProps.previousYear)"
>
{{ previousYearLabel }}
</button>
<button
:disabled="!headerProps.previousPeriod"
class="previousPeriod"
aria-label="Previous Period"
@click.prevent="onInput(headerProps.previousPeriod)"
v-html="previousPeriodLabel"
/>
<button
class="currentPeriod"
aria-label="Current Period"
@click.prevent="onInput(headerProps.currentPeriod)"
>
{{ headerProps.currentPeriodLabel }}
</button>
<button
:disabled="!headerProps.nextPeriod"
class="nextPeriod"
aria-label="Next Period"
@click.prevent="onInput(headerProps.nextPeriod)"
>
{{ nextPeriodLabel }}
</button>
<button
:disabled="!headerProps.nextYear"
class="nextYear"
aria-label="Next Year"
@click.prevent="onInput(headerProps.nextYear)">
{{ nextYearLabel }}
</button>
</div>
<div class="periodLabel">
<slot name="label">{{ headerProps.periodLabel }}</slot>
</div>
<div class="actionArea d-none d-sm-flex">
<span class="delete-area text-danger p-1 mr-2" @drop.prevent="onDeleteDrop($event)"
@dragenter.prevent="onDeleteDragEnter($event)" @dragleave.prevent="onDeleteDragLeave($event)" @dragover.prevent="onDeleteDragEnter"><i
class="fas fa-trash"></i> {{ $t('DragHereToDelete') }}</span>
</div>
</div>
</template>
<script>
export default {
name: "MealPlanCalenderHeader",
props: {
headerProps: {
type: Object,
required: true,
},
previousYearLabel: {type: String, default: "<<"},
previousPeriodLabel: {type: String, default: "<"},
nextPeriodLabel: {type: String, default: ">"},
nextYearLabel: {type: String, default: ">>"},
},
methods: {
onInput(d) {
this.$emit("input", d)
},
onDeleteDragEnter(e) {
e.currentTarget.classList.add("draghover")
},
onDeleteDragLeave(e) {
e.currentTarget.classList.remove("draghover")
},
onDeleteDrop(e) {
e.currentTarget.classList.remove("draghover")
this.$emit("delete-dragged")
},
},
}
</script>
<style>
.cv-header {
display: flex;
flex: 0 1 auto;
flex-flow: row nowrap;
align-items: center;
min-height: 2.5em;
border-width: 1px 1px 0 1px;
}
.cv-header .periodLabel {
display: flex;
flex: 1 1 auto;
flex-flow: row nowrap;
min-height: 1.5em;
line-height: 1;
font-size: 1.5em;
}
.cv-header .actionArea {
display: flex;
flex: 1 1 auto;
flex-flow: row nowrap;
min-height: 1.5em;
line-height: 1;
font-size: 1.5em;
}
.delete-area {
border-style: dotted;
margin-left: auto;
order: 2;
user-select: none
}
.delete-area.draghover {
box-shadow: inset 0 0 0.1em 0.1em #A7240E !important;
}
.cv-header,
.cv-header button {
border-style: solid;
border-color: #ddd;
}
.cv-header-nav,
.cv-header .periodLabel {
margin: 0.1em 0.6em;
}
.cv-header-nav button,
.cv-header .periodLabel {
padding: 0.4em 0.6em;
}
.cv-header button {
box-sizing: border-box;
line-height: 1em;
font-size: 1em;
border-width: 1px;
}
</style>

8
vue/src/components/MealPlanCard.vue
View File

@@ -5,7 +5,7 @@
@click="onClickItem(value, $event)"
:aria-grabbed="value == currentDragItem"
:class="value.classes" :title="title"
@contextmenu.prevent="$parent.$parent.$refs.menu.open($event, value)">
@contextmenu.prevent="$emit('open-context-menu', $event, value)">
<div class="card-header p-1 text-center text-primary border-bottom-0" v-if="detailed"
:style="`background-color: ${background_color}`">
<span class="font-light text-center" v-if="entry.entry.meal_type.icon != null">{{
@@ -20,7 +20,7 @@
<div class="dropdown b-dropdown position-static btn-group">
<button aria-haspopup="true" aria-expanded="false" type="button"
class="btn dropdown-toggle btn-link text-decoration-none text-body pr-1 dropdown-toggle-no-caret"
@click.stop="$parent.$parent.$refs.menu.open($event, value)"><i class="fas fa-ellipsis-v fa-lg"></i>
@click.stop="$emit('open-context-menu', $event, value)"><i class="fas fa-ellipsis-v fa-lg"></i>
</button>
</div>
</div>
@@ -31,6 +31,7 @@
<span class="font-light">{{ title }}</span>
</div>
<b-img fluid class="card-img-bottom" :src="entry.entry.recipe.image" v-if="hasRecipe && detailed"></b-img>
<b-img fluid class="card-img-bottom" :src="image_placeholder" v-if="detailed && ((!hasRecipe && entry.entry.note === '') || (hasRecipe && entry.entry.recipe.image === null))"></b-img>
<div class="card-body p-1" v-if="detailed && entry.entry.recipe == null"
:style="`background-color: ${background_color}`">
<p>{{ entry.entry.note }}</p>
@@ -63,7 +64,8 @@ export default {
data: function () {
return {
dateSelectionOrigin: null,
currentDragItem: null
currentDragItem: null,
image_placeholder: window.IMAGE_PLACEHOLDER
}
},
computed: {

162
vue/src/locales/pl.json Normal file
View File

@@ -0,0 +1,162 @@
{
"warning_feature_beta": "",
"err_fetching_resource": "",
"err_creating_resource": "",
"err_updating_resource": "",
"err_deleting_resource": "",
"success_fetching_resource": "",
"success_creating_resource": "",
"success_updating_resource": "",
"success_deleting_resource": "",
"step_time_minutes": "",
"confirm_delete": "",
"import_running": "",
"all_fields_optional": "",
"convert_internal": "",
"show_only_internal": "",
"show_split_screen": "",
"Log_Recipe_Cooking": "",
"External_Recipe_Image": "",
"Add_to_Shopping": "",
"Add_to_Plan": "",
"Step_start_time": "",
"Sort_by_new": "",
"Recipes_per_page": "",
"Show_as_header": "",
"Hide_as_header": "",
"Copy_template_reference": "",
"Save_and_View": "",
"Manage_Books": "",
"Meal_Plan": "",
"Select_Book": "",
"Recipe_Image": "",
"Import_finished": "",
"View_Recipes": "",
"Log_Cooking": "",
"New_Recipe": "",
"Url_Import": "",
"Reset_Search": "",
"Recently_Viewed": "",
"Load_More": "",
"New_Keyword": "",
"Delete_Keyword": "",
"Edit_Keyword": "",
"Edit_Recipe": "",
"Move_Keyword": "",
"Merge_Keyword": "",
"Hide_Keywords": "",
"Hide_Recipes": "",
"Move_Up": "",
"Move_Down": "",
"Step_Name": "",
"Step_Type": "",
"Make_Header": "",
"Make_Ingredient": "",
"Enable_Amount": "",
"Disable_Amount": "",
"Add_Step": "",
"Keywords": "",
"Books": "",
"Proteins": "",
"Fats": "",
"Carbohydrates": "",
"Calories": "",
"Nutrition": "",
"Date": "",
"Share": "",
"Automation": "",
"Parameter": "",
"Export": "",
"Copy": "",
"Rating": "",
"Close": "",
"Cancel": "",
"Link": "",
"Add": "",
"New": "",
"Note": "",
"Success": "",
"Failure": "",
"Ingredients": "",
"Supermarket": "",
"Categories": "",
"Category": "",
"Selected": "",
"min": "",
"Servings": "",
"Waiting": "",
"Preparation": "",
"External": "",
"Size": "",
"Files": "",
"File": "",
"Edit": "",
"Delete": "",
"Open": "",
"Ok": "",
"Save": "",
"Step": "",
"Search": "",
"Import": "",
"Print": "",
"Settings": "",
"or": "",
"and": "",
"Information": "",
"Download": "",
"Create": "",
"Advanced Search Settings": "",
"View": "",
"Recipes": "",
"Move": "",
"Merge": "",
"Parent": "",
"delete_confirmation": "",
"move_confirmation": "",
"merge_confirmation": "",
"create_rule": "",
"move_selection": "",
"merge_selection": "",
"Root": "",
"Ignore_Shopping": "",
"Shopping_Category": "",
"Edit_Food": "",
"Move_Food": "",
"New_Food": "",
"Hide_Food": "",
"Food_Alias": "",
"Unit_Alias": "",
"Keyword_Alias": "",
"Delete_Food": "",
"No_ID": "",
"Meal_Plan_Days": "",
"merge_title": "",
"move_title": "",
"Food": "",
"Recipe_Book": "",
"del_confirmation_tree": "",
"delete_title": "",
"create_title": "",
"edit_title": "",
"Name": "",
"Type": "",
"Description": "",
"Recipe": "",
"tree_root": "",
"Icon": "",
"Unit": "",
"No_Results": "",
"New_Unit": "",
"Create_New_Shopping Category": "",
"Create_New_Food": "",
"Create_New_Keyword": "",
"Create_New_Unit": "",
"and_up": "",
"Instructions": "",
"Unrated": "",
"Automate": "",
"Key_Ctrl": "",
"Key_Shift": "",
"Time": "",
"Text": ""
}

40
vue/webpack-stats.json
View File

@@ -3,7 +3,7 @@
"assets": {
"../../templates/sw.js": {
"name": "../../templates/sw.js",
"path": "../../templates/sw.js"
"path": "..\\..\\templates\\sw.js"
},
"js/checklist_view.js": {
"name": "js/checklist_view.js",
@@ -11,79 +11,79 @@
},
"js/chunk-2d0da313.js": {
"name": "js/chunk-2d0da313.js",
"path": "js/chunk-2d0da313.js"
"path": "js\\chunk-2d0da313.js"
},
"css/chunk-vendors.css": {
"name": "css/chunk-vendors.css",
"path": "css/chunk-vendors.css"
"path": "css\\chunk-vendors.css"
},
"js/chunk-vendors.js": {
"name": "js/chunk-vendors.js",
"path": "js/chunk-vendors.js"
"path": "js\\chunk-vendors.js"
},
"css/cookbook_view.css": {
"name": "css/cookbook_view.css",
"path": "css/cookbook_view.css"
"path": "css\\cookbook_view.css"
},
"js/cookbook_view.js": {
"name": "js/cookbook_view.js",
"path": "js/cookbook_view.js"
"path": "js\\cookbook_view.js"
},
"css/edit_internal_recipe.css": {
"name": "css/edit_internal_recipe.css",
"path": "css/edit_internal_recipe.css"
"path": "css\\edit_internal_recipe.css"
},
"js/edit_internal_recipe.js": {
"name": "js/edit_internal_recipe.js",
"path": "js/edit_internal_recipe.js"
"path": "js\\edit_internal_recipe.js"
},
"js/import_response_view.js": {
"name": "js/import_response_view.js",
"path": "js/import_response_view.js"
"path": "js\\import_response_view.js"
},
"css/meal_plan_view.css": {
"name": "css/meal_plan_view.css",
"path": "css/meal_plan_view.css"
"path": "css\\meal_plan_view.css"
},
"js/meal_plan_view.js": {
"name": "js/meal_plan_view.js",
"path": "js/meal_plan_view.js"
"path": "js\\meal_plan_view.js"
},
"css/model_list_view.css": {
"name": "css/model_list_view.css",
"path": "css/model_list_view.css"
"path": "css\\model_list_view.css"
},
"js/model_list_view.js": {
"name": "js/model_list_view.js",
"path": "js/model_list_view.js"
"path": "js\\model_list_view.js"
},
"js/offline_view.js": {
"name": "js/offline_view.js",
"path": "js/offline_view.js"
"path": "js\\offline_view.js"
},
"css/recipe_search_view.css": {
"name": "css/recipe_search_view.css",
"path": "css/recipe_search_view.css"
"path": "css\\recipe_search_view.css"
},
"js/recipe_search_view.js": {
"name": "js/recipe_search_view.js",
"path": "js/recipe_search_view.js"
"path": "js\\recipe_search_view.js"
},
"css/recipe_view.css": {
"name": "css/recipe_view.css",
"path": "css/recipe_view.css"
"path": "css\\recipe_view.css"
},
"js/recipe_view.js": {
"name": "js/recipe_view.js",
"path": "js/recipe_view.js"
"path": "js\\recipe_view.js"
},
"js/supermarket_view.js": {
"name": "js/supermarket_view.js",
"path": "js/supermarket_view.js"
"path": "js\\supermarket_view.js"
},
"js/user_file_view.js": {
"name": "js/user_file_view.js",
"path": "js/user_file_view.js"
"path": "js\\user_file_view.js"
},
"recipe_search_view.html": {
"name": "recipe_search_view.html",