diff --git a/.babelrc b/.babelrc index a9b68d1..14769a6 100644 --- a/.babelrc +++ b/.babelrc @@ -1,3 +1,4 @@ { - "plugins": ["@babel/plugin-syntax-dynamic-import"] + "plugins": ["@babel/plugin-syntax-dynamic-import"], + "presets": ["@babel/preset-env"] } diff --git a/composer.lock b/composer.lock index acd9a80..7414c5d 100644 --- a/composer.lock +++ b/composer.lock @@ -973,31 +973,31 @@ }, { "name": "laravel/passport", - "version": "v7.4.0", + "version": "v7.4.1", "source": { "type": "git", "url": "https://github.com/laravel/passport.git", - "reference": "4460bd1fb5d913d75e547caf02a5a19c6d77794d" + "reference": "cc39dc6a36ebf5926906eb5ad3c62dba50c9bbd0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/passport/zipball/4460bd1fb5d913d75e547caf02a5a19c6d77794d", - "reference": "4460bd1fb5d913d75e547caf02a5a19c6d77794d", + "url": "https://api.github.com/repos/laravel/passport/zipball/cc39dc6a36ebf5926906eb5ad3c62dba50c9bbd0", + "reference": "cc39dc6a36ebf5926906eb5ad3c62dba50c9bbd0", "shasum": "" }, "require": { "ext-json": "*", "firebase/php-jwt": "~3.0|~4.0|~5.0", "guzzlehttp/guzzle": "~6.0", - "illuminate/auth": "~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/console": "~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/container": "~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/contracts": "~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/cookie": "~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/database": "~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/encryption": "~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/http": "~5.6.0|~5.7.0|~5.8.0|^6.0", - "illuminate/support": "~5.6.0|~5.7.0|~5.8.0|^6.0", + "illuminate/auth": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/console": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/container": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/contracts": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/cookie": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/database": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/encryption": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/http": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", + "illuminate/support": "~5.6.0|~5.7.0|~5.8.0|^6.0|^7.0", "league/oauth2-server": "^7.0", "php": ">=7.1", "phpseclib/phpseclib": "^2.0", @@ -1005,8 +1005,8 @@ "zendframework/zend-diactoros": "~1.0|~2.0" }, "require-dev": { - "mockery/mockery": "~1.0", - "phpunit/phpunit": "~7.4" + "mockery/mockery": "^1.0", + "phpunit/phpunit": "^7.4|^8.0" }, "type": "library", "extra": { @@ -1040,7 +1040,7 @@ "oauth", "passport" ], - "time": "2019-08-20T18:10:43+00:00" + "time": "2019-09-10T19:55:34+00:00" }, { "name": "laravel/tinker", @@ -1725,16 +1725,16 @@ }, { "name": "phpseclib/phpseclib", - "version": "2.0.21", + "version": "2.0.23", "source": { "type": "git", "url": "https://github.com/phpseclib/phpseclib.git", - "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d" + "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/9f1287e68b3f283339a9f98f67515dd619e5bf9d", - "reference": "9f1287e68b3f283339a9f98f67515dd619e5bf9d", + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c78eb5058d5bb1a183133c36d4ba5b6675dfa099", + "reference": "c78eb5058d5bb1a183133c36d4ba5b6675dfa099", "shasum": "" }, "require": { @@ -1768,28 +1768,28 @@ "authors": [ { "name": "Jim Wigginton", - "role": "Lead Developer", - "email": "terrafrost@php.net" + "email": "terrafrost@php.net", + "role": "Lead Developer" }, { "name": "Patrick Monnerat", - "role": "Developer", - "email": "pm@datasphere.ch" + "email": "pm@datasphere.ch", + "role": "Developer" }, { "name": "Andreas Fischer", - "role": "Developer", - "email": "bantu@phpbb.com" + "email": "bantu@phpbb.com", + "role": "Developer" }, { "name": "Hans-Jürgen Petrich", - "role": "Developer", - "email": "petrich@tronic-media.com" + "email": "petrich@tronic-media.com", + "role": "Developer" }, { "name": "Graham Campbell", - "role": "Developer", - "email": "graham@alt-three.com" + "email": "graham@alt-three.com", + "role": "Developer" } ], "description": "PHP Secure Communications Library - Pure-PHP implementations of RSA, AES, SSH2, SFTP, X.509 etc.", @@ -1813,7 +1813,7 @@ "x.509", "x509" ], - "time": "2019-07-12T12:53:49+00:00" + "time": "2019-09-17T03:41:22+00:00" }, { "name": "psr/container", @@ -3743,16 +3743,16 @@ }, { "name": "vlucas/phpdotenv", - "version": "v3.5.0", + "version": "v3.6.0", "source": { "type": "git", "url": "https://github.com/vlucas/phpdotenv.git", - "reference": "95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222" + "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222", - "reference": "95cb0fa6c025f7f0db7fc60f81e9fb231eb2d222", + "url": "https://api.github.com/repos/vlucas/phpdotenv/zipball/1bdf24f065975594f6a117f0f1f6cabf1333b156", + "reference": "1bdf24f065975594f6a117f0f1f6cabf1333b156", "shasum": "" }, "require": { @@ -3761,12 +3761,12 @@ "symfony/polyfill-ctype": "^1.9" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0" + "phpunit/phpunit": "^4.8.35 || ^5.0 || ^6.0 || ^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.5-dev" + "dev-master": "3.6-dev" } }, "autoload": { @@ -3796,7 +3796,7 @@ "env", "environment" ], - "time": "2019-08-27T17:00:38+00:00" + "time": "2019-09-10T21:37:39+00:00" }, { "name": "wm/common", @@ -3804,8 +3804,7 @@ "dist": { "type": "path", "url": "./modules/wm-common", - "reference": "02182c4005bfb0a1ddfe505b61b20cc40983ca0c", - "shasum": null + "reference": "79233f721a53ba13494cd78d6a7ad9f1821f30b2" }, "require": { "illuminate/support": "5.8.*", @@ -3827,11 +3826,7 @@ "autoload": { "psr-4": { "WM\\Common\\": "src/" - }, - "classmap": [ - "database/seeds", - "database/factories" - ] + } }, "autoload-dev": { "psr-4": { @@ -3849,8 +3844,7 @@ "dist": { "type": "path", "url": "./modules/wm-core", - "reference": "7dde2817a09c7ee79527bde3eb2e64f833cf9535", - "shasum": null + "reference": "43fb6a6e0f3a098201adb6185bbd30d8277c9d97" }, "require": { "illuminate/support": "^5.4", @@ -3894,8 +3888,7 @@ "dist": { "type": "path", "url": "./modules/wm-crm", - "reference": "997e15bf31c75652bd783eb13ebed07d3be7abea", - "shasum": null + "reference": "f94fedd42b70591e33b4dfb40dc60c34fa450731" }, "require": { "illuminate/support": "5.8.*", @@ -3918,11 +3911,7 @@ "autoload": { "psr-4": { "WM\\CRM\\": "src/" - }, - "classmap": [ - "database/seeds", - "database/factories" - ] + } }, "autoload-dev": { "psr-4": { @@ -3940,8 +3929,7 @@ "dist": { "type": "path", "url": "./modules/wm-reservation", - "reference": "032d8c064ee8038661df316a995f908dccbe9ede", - "shasum": null + "reference": "032d8c064ee8038661df316a995f908dccbe9ede" }, "require": { "illuminate/support": "5.8.*", @@ -4600,35 +4588,33 @@ }, { "name": "phpdocumentor/reflection-common", - "version": "1.0.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6" + "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", - "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/63a995caa1ca9e5590304cd845c15ad6d482a62a", + "reference": "63a995caa1ca9e5590304cd845c15ad6d482a62a", "shasum": "" }, "require": { - "php": ">=5.5" + "php": ">=7.1" }, "require-dev": { - "phpunit/phpunit": "^4.6" + "phpunit/phpunit": "~6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] + "phpDocumentor\\Reflection\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -4650,30 +4636,30 @@ "reflection", "static analysis" ], - "time": "2017-09-11T18:02:19+00:00" + "time": "2018-08-07T13:53:10+00:00" }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.1", + "version": "4.3.2", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c" + "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", - "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/b83ff7cfcfee7827e1e78b637a5904fe6a96698e", + "reference": "b83ff7cfcfee7827e1e78b637a5904fe6a96698e", "shasum": "" }, "require": { "php": "^7.0", - "phpdocumentor/reflection-common": "^1.0.0", - "phpdocumentor/type-resolver": "^0.4.0", + "phpdocumentor/reflection-common": "^1.0.0 || ^2.0.0", + "phpdocumentor/type-resolver": "~0.4 || ^1.0.0", "webmozart/assert": "^1.0" }, "require-dev": { - "doctrine/instantiator": "~1.0.5", + "doctrine/instantiator": "^1.0.5", "mockery/mockery": "^1.0", "phpunit/phpunit": "^6.4" }, @@ -4701,41 +4687,40 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2019-04-30T17:48:53+00:00" + "time": "2019-09-12T14:27:41+00:00" }, { "name": "phpdocumentor/type-resolver", - "version": "0.4.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7" + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7", - "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", + "reference": "2e32a6d48972b2c1976ed5d8967145b6cec4a4a9", "shasum": "" }, "require": { - "php": "^5.5 || ^7.0", - "phpdocumentor/reflection-common": "^1.0" + "php": "^7.1", + "phpdocumentor/reflection-common": "^2.0" }, "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" + "ext-tokenizer": "^7.1", + "mockery/mockery": "~1", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.x-dev" } }, "autoload": { "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] + "phpDocumentor\\Reflection\\": "src" } }, "notification-url": "https://packagist.org/downloads/", @@ -4748,7 +4733,8 @@ "email": "me@mikevanriel.com" } ], - "time": "2017-07-14T14:27:02+00:00" + "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "time": "2019-08-22T18:11:29+00:00" }, { "name": "phpspec/prophecy", @@ -5018,16 +5004,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.1.0", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a" + "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a", - "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff", + "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff", "shasum": "" }, "require": { @@ -5063,20 +5049,20 @@ "keywords": [ "tokenizer" ], - "time": "2019-07-25T05:29:42+00:00" + "time": "2019-09-17T06:23:10+00:00" }, { "name": "phpunit/phpunit", - "version": "7.5.15", + "version": "7.5.16", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "d79c053d972856b8b941bb233e39dc521a5093f0" + "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/d79c053d972856b8b941bb233e39dc521a5093f0", - "reference": "d79c053d972856b8b941bb233e39dc521a5093f0", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/316afa6888d2562e04aeb67ea7f2017a0eb41661", + "reference": "316afa6888d2562e04aeb67ea7f2017a0eb41661", "shasum": "" }, "require": { @@ -5136,8 +5122,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "role": "lead", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], "description": "The PHP Unit Testing framework.", @@ -5147,7 +5133,7 @@ "testing", "xunit" ], - "time": "2019-08-21T07:05:16+00:00" + "time": "2019-09-14T09:08:39+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -5369,16 +5355,16 @@ }, { "name": "sebastian/exporter", - "version": "3.1.1", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "06a9a5947f47b3029d76118eb5c22802e5869687" + "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/06a9a5947f47b3029d76118eb5c22802e5869687", - "reference": "06a9a5947f47b3029d76118eb5c22802e5869687", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e", + "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e", "shasum": "" }, "require": { @@ -5432,7 +5418,7 @@ "export", "exporter" ], - "time": "2019-08-11T12:43:14+00:00" + "time": "2019-09-14T09:02:43+00:00" }, { "name": "sebastian/global-state", diff --git a/package-lock.json b/package-lock.json index 140225a..2166c40 100644 --- a/package-lock.json +++ b/package-lock.json @@ -882,9 +882,9 @@ "integrity": "sha512-s5PLdI9NYgjBvfrv6rhirPHlAHWx+Sfo/IjsAeiXYfmemC/GSjwsyz1wLnGPazbLPXWfk62ks980o9AmsxYUEQ==" }, "@mdi/font": { - "version": "3.3.92", - "resolved": "https://registry.npmjs.org/@mdi/font/-/font-3.3.92.tgz", - "integrity": "sha512-Ux6iPfRjT9gHtejfss7aHBjgedLx8OrnX7Q+DuqgGYVkr9Amhi7cWFd745znrj7Y74pnjrs+uAbpohPK3ue5Ew==", + "version": "3.9.97", + "resolved": "https://registry.npmjs.org/@mdi/font/-/font-3.9.97.tgz", + "integrity": "sha512-yADBl2mzqIssrhLaRvJ2gZPyEQK+fN9uYh/1/cwwuq2lKDx+ITWsOrh1vlHMfw1IICMx9cwBjSoiCf3B8Br8nw==", "dev": true }, "@mrmlnc/readdir-enhanced": { @@ -1440,12 +1440,34 @@ } }, "apollo-link-context": { - "version": "1.0.18", - "resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.18.tgz", - "integrity": "sha512-aG5cbUp1zqOHHQjAJXG7n/izeMQ6LApd/whEF5z6qZp5ATvcyfSNkCfy3KRJMMZZ3iNfVTs6jF+IUA8Zvf+zeg==", + "version": "1.0.19", + "resolved": "https://registry.npmjs.org/apollo-link-context/-/apollo-link-context-1.0.19.tgz", + "integrity": "sha512-TUi5TyufU84hEiGkpt+5gdH5HkB3Gx46npNfoxR4of3DKBCMuItGERt36RCaryGcU/C3u2zsICU3tJ+Z9LjFoQ==", "requires": { - "apollo-link": "^1.2.12", + "apollo-link": "^1.2.13", "tslib": "^1.9.3" + }, + "dependencies": { + "apollo-link": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/apollo-link/-/apollo-link-1.2.13.tgz", + "integrity": "sha512-+iBMcYeevMm1JpYgwDEIDt/y0BB7VWyvlm/7x+TIPNLHCTCMgcEgDuW5kH86iQZWo0I7mNwQiTOz+/3ShPFmBw==", + "requires": { + "apollo-utilities": "^1.3.0", + "ts-invariant": "^0.4.0", + "tslib": "^1.9.3", + "zen-observable-ts": "^0.8.20" + } + }, + "zen-observable-ts": { + "version": "0.8.20", + "resolved": "https://registry.npmjs.org/zen-observable-ts/-/zen-observable-ts-0.8.20.tgz", + "integrity": "sha512-2rkjiPALhOtRaDX6pWyNqK1fnP5KkJJybYebopNSn6wDG1lxBoFs2+nwwXKoA6glHIrtwrfBBy6da0stkKtTAA==", + "requires": { + "tslib": "^1.9.3", + "zen-observable": "^0.8.0" + } + } } }, "apollo-link-error": { @@ -1774,6 +1796,14 @@ "@babel/core": "^7.0.0-beta.49", "deepmerge": "^2.1.0", "object.omit": "^3.0.0" + }, + "dependencies": { + "deepmerge": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", + "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==", + "dev": true + } } }, "babel-runtime": { @@ -2576,15 +2606,14 @@ } }, "clone-deep": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-2.0.2.tgz", - "integrity": "sha512-SZegPTKjCgpQH63E+eN6mVEEPdQBOUzjyJm5Pora4lrwWRFS8I0QAxV/KD6vV/i0WuijHZWQC1fMsPEdxfdVCQ==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", "dev": true, "requires": { - "for-own": "^1.0.0", "is-plain-object": "^2.0.4", - "kind-of": "^6.0.0", - "shallow-clone": "^1.0.0" + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" } }, "clone-response": { @@ -3313,9 +3342,9 @@ "dev": true }, "deepmerge": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", - "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.0.0.tgz", + "integrity": "sha512-YZ1rOP5+kHor4hMAH+HRQnBQHg+wvS1un1hAOuIcxcBy0hzcUf6Jg2a1w65kpoOUnurOfZbERwjI1TfZxNjcww==", "dev": true }, "default-gateway": { @@ -3462,6 +3491,12 @@ "integrity": "sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=", "dev": true }, + "detect-libc": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz", + "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=", + "dev": true + }, "detect-node": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.0.4.tgz", @@ -4106,6 +4141,15 @@ "websocket-driver": ">=0.5.1" } }, + "fibers": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/fibers/-/fibers-4.0.1.tgz", + "integrity": "sha512-H79EJn7DMWXk48ygmC82bMP8KNcFBZF1CPfwBpYF6cO85hGWoIrlu7eyX9ayxfjP9Nsl0JXxdI6fpYU4DWVw2w==", + "dev": true, + "requires": { + "detect-libc": "^1.0.3" + } + }, "figgy-pudding": { "version": "3.5.1", "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz", @@ -4271,15 +4315,6 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "for-own": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/for-own/-/for-own-1.0.0.tgz", - "integrity": "sha1-xjMy9BXO3EsE2/5wz4NklMU8tEs=", - "dev": true, - "requires": { - "for-in": "^1.0.1" - } - }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -6533,12 +6568,6 @@ "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", "integrity": "sha1-brGa5aHuHdnfC5aeZs4Lf6MLXmA=" }, - "lodash.tail": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.tail/-/lodash.tail-4.1.1.tgz", - "integrity": "sha1-0jM6NtnncXyK0vfKyv7HwytERmQ=", - "dev": true - }, "lodash.throttle": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", @@ -6908,30 +6937,6 @@ "is-extendable": "^1.0.1" } }, - "mixin-object": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/mixin-object/-/mixin-object-2.0.1.tgz", - "integrity": "sha1-T7lJRB2rGCVA8f4DW6YOGUel5X4=", - "dev": true, - "requires": { - "for-in": "^0.1.3", - "is-extendable": "^0.1.1" - }, - "dependencies": { - "for-in": { - "version": "0.1.8", - "resolved": "https://registry.npmjs.org/for-in/-/for-in-0.1.8.tgz", - "integrity": "sha1-2Hc5COMSVhCZUrH9ubP6hn0ndeE=", - "dev": true - }, - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - } - } - }, "mkdirp": { "version": "0.5.1", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", @@ -9203,12 +9208,12 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, "sass": { - "version": "1.15.3", - "resolved": "https://registry.npmjs.org/sass/-/sass-1.15.3.tgz", - "integrity": "sha512-9e6zdkLEjMAX/zXUWKs9GreDLFYozFOEu4gMZBZpkp+AiQgaofimqGZm9qMhS5V+4V2OWBapnM5xoJn2Rw9pQg==", + "version": "1.22.10", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.22.10.tgz", + "integrity": "sha512-DUpS1tVMGCH6gr/N9cXCoemrjoNdOLhAHfQ37fJw2A5ZM4gSI9ej/8Xi95Xwus03RqZ2zdSnKZGULL7oS+jfMA==", "dev": true, "requires": { - "chokidar": "^2.0.0" + "chokidar": ">=2.0.0 <4.0.0" } }, "sass-graph": { @@ -9329,17 +9334,24 @@ } }, "sass-loader": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.1.0.tgz", - "integrity": "sha512-+G+BKGglmZM2GUSfT9TLuEp6tzehHPjAMoRRItOojWIqIGPloVCMhNIQuG639eJ+y033PaGTSjLaTHts8Kw79w==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-7.2.0.tgz", + "integrity": "sha512-h8yUWaWtsbuIiOCgR9fd9c2lRXZ2uG+h8Dzg/AGNj+Hg/3TO8+BBAW9mEP+mh8ei+qBKqSJ0F1FLlYjNBc61OA==", "dev": true, "requires": { - "clone-deep": "^2.0.1", + "clone-deep": "^4.0.1", "loader-utils": "^1.0.1", - "lodash.tail": "^4.1.1", "neo-async": "^2.5.0", - "pify": "^3.0.0", + "pify": "^4.0.1", "semver": "^5.5.0" + }, + "dependencies": { + "pify": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz", + "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==", + "dev": true + } } }, "sax": { @@ -9544,28 +9556,12 @@ } }, "shallow-clone": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-1.0.0.tgz", - "integrity": "sha512-oeXreoKR/SyNJtRJMAKPDSvd28OqEwG4eR/xc856cRGBII7gX9lvAqDxusPm0846z/w/hWYjI1NpKwJ00NHzRA==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", "dev": true, "requires": { - "is-extendable": "^0.1.1", - "kind-of": "^5.0.0", - "mixin-object": "^2.0.1" - }, - "dependencies": { - "is-extendable": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", - "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=", - "dev": true - }, - "kind-of": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", - "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==", - "dev": true - } + "kind-of": "^6.0.2" } }, "shebang-command": { @@ -11079,9 +11075,9 @@ } }, "vuetify": { - "version": "1.5.14", - "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-1.5.14.tgz", - "integrity": "sha512-7iM+TfghR/wu/Gl+k37lKr0N8Ddr6SxzqHtoK1dIyHgCH6SJRkpaXPw2MC5/FsAg9aUDJbYNWrzSeu5eHw+Q/w==" + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/vuetify/-/vuetify-2.0.7.tgz", + "integrity": "sha512-dnW6VowHOXaq6cxYjn6RXcTWVCJnWh3ajh4e4pP84grb4Smebka6yUQSG8rSalPyFzkPeNGuXrXWVsbTAIqv7w==" }, "vuex": { "version": "3.0.1", diff --git a/package.json b/package.json index c2eb888..ef314a8 100644 --- a/package.json +++ b/package.json @@ -39,22 +39,24 @@ "vue-router": "^3.0.2", "vue-scroll-reveal": "^1.0.11", "vue-tinymce-editor": "^1.6.2", - "vuetify": "^1.5.14" + "vuetify": "^2.0.7" }, "devDependencies": { "@babel/plugin-syntax-dynamic-import": "^7.2.0", - "popper.js": "^2.0.0-next.4", - "@mdi/font": "^3.3.92", + "@mdi/font": "^3.9.97", "cross-env": "^5.1", + "deepmerge": "^4.0.0", + "fibers": "^4.0.1", "jquery": "^3.4.1", "laravel-mix": "^4.0.15", "material-design-icons-iconfont": "^4.0.3", "node-sass": "^4.12.0", + "popper.js": "^2.0.0-next.4", "pug": "^2.0.3", "pug-loader": "^2.4.0", "pug-plain-loader": "^1.0.0", - "sass": "^1.15.2", - "sass-loader": "^7.1.0", + "sass": "^1.22.10", + "sass-loader": "^7.2.0", "vue": "^2.6.10", "vue-meta": "^1.5.2", "vue-resource": "^1.5.1", diff --git a/public/fonts/vendor/@mdi/materialdesignicons-webfont.eot b/public/fonts/vendor/@mdi/materialdesignicons-webfont.eot index b9798ea..237edb7 100644 Binary files a/public/fonts/vendor/@mdi/materialdesignicons-webfont.eot and b/public/fonts/vendor/@mdi/materialdesignicons-webfont.eot differ diff --git a/public/fonts/vendor/@mdi/materialdesignicons-webfont.ttf b/public/fonts/vendor/@mdi/materialdesignicons-webfont.ttf index 75cde78..c1c0035 100644 Binary files a/public/fonts/vendor/@mdi/materialdesignicons-webfont.ttf and b/public/fonts/vendor/@mdi/materialdesignicons-webfont.ttf differ diff --git a/public/fonts/vendor/@mdi/materialdesignicons-webfont.woff b/public/fonts/vendor/@mdi/materialdesignicons-webfont.woff index 8adbd27..a61af4b 100644 Binary files a/public/fonts/vendor/@mdi/materialdesignicons-webfont.woff and b/public/fonts/vendor/@mdi/materialdesignicons-webfont.woff differ diff --git a/public/fonts/vendor/@mdi/materialdesignicons-webfont.woff2 b/public/fonts/vendor/@mdi/materialdesignicons-webfont.woff2 index bc58886..12076f0 100644 Binary files a/public/fonts/vendor/@mdi/materialdesignicons-webfont.woff2 and b/public/fonts/vendor/@mdi/materialdesignicons-webfont.woff2 differ diff --git a/resources/js/Global/plugins/globalComponent.js b/resources/js/Global/plugins/globalComponent.js index b36a547..57f322c 100644 --- a/resources/js/Global/plugins/globalComponent.js +++ b/resources/js/Global/plugins/globalComponent.js @@ -2,15 +2,13 @@ import Vue from 'vue'; import VueScrollReveal from "vue-scroll-reveal"; -import Vuetify from 'vuetify' - import "popper.js"; import "bootstrap-v4-rtl"; import "bootstrap-v4-rtl/scss/bootstrap-rtl.scss"; import "bootstrap-select"; import "bootstrap-select/dist/css/bootstrap-select.css"; -import "vuetify/dist/vuetify.min.css"; // Ensure you are using css-loader +// import "vuetify/dist/vuetify.min.css"; // Ensure you are using css-loader import "@Global/assets/Font-Icons/css/fontello.css"; import "@Global/scss/style.scss"; @@ -36,10 +34,10 @@ Vue.use(VueScrollReveal, { mobile: false }); -Vue.use(Vuetify, { - iconfont: "fa", - rtl: true -}); +// Vue.use(Vuetify, { +// iconfont: "fa", +// rtl: true +// }); Vue.component("WM-PartTitle", PartTitle); Vue.component("WM-PageTitle", PageTitle); diff --git a/resources/js/Global/plugins/vuetify.js b/resources/js/Global/plugins/vuetify.js new file mode 100644 index 0000000..bc4be0a --- /dev/null +++ b/resources/js/Global/plugins/vuetify.js @@ -0,0 +1,11 @@ +import Vue from 'vue' +import Vuetify from 'vuetify' +import 'vuetify/dist/vuetify.min.css' +Vue.use(Vuetify) + +export default new Vuetify({ + icons: { + iconfont: 'fa', // 'mdi' || 'mdiSvg' || 'md' || 'fa' || 'fa4' + }, + rtl: true, +}) \ No newline at end of file diff --git a/resources/js/Global/scss/Misc.scss b/resources/js/Global/scss/Misc.scss index fcfe849..a69f9da 100644 --- a/resources/js/Global/scss/Misc.scss +++ b/resources/js/Global/scss/Misc.scss @@ -38,6 +38,7 @@ border-radius: 5px; margin: 3px 0px 10px 0px; } + .Context { font-family: BYekan-Edited, Montserrat-Regular !important; } @@ -60,6 +61,7 @@ /* -------------------------------------------------------- Price :: Begin -------------------------------------------------------- */ + .Price { text-align: left; direction: ltr; @@ -77,20 +79,23 @@ text-decoration-color: #ee3552; color: #ee3552; margin-top: -5px; - } + /* -------------------------------------------------------- Others :: Begin -------------------------------------------------------- */ + .zIndex99 { z-index: 99; } + .has-blur { -webkit-filter: blur(5px); transition: 0.5s -webkit-filter linear; } + /* -------------------------------------------------------- Navigation :: Begin -------------------------------------------------------- */ @@ -103,7 +108,6 @@ margin: 0 1em; position: fixed; top: 1em; - .WM-Nav { padding: 0.8em 1em; list-style: none; @@ -133,6 +137,7 @@ vertical-align: middle; } + /* -------------------------------------------------------- Blocks :: Begin -------------------------------------------------------- */ @@ -145,7 +150,6 @@ color: $Gray; } - .WM-Section { padding: 10px 10px; margin: 10px 0px; @@ -168,6 +172,7 @@ .WM-Section .Title .FA { font-size: 22px; + line-height: 1.5; } .WM-Section .Title .EN { @@ -181,19 +186,17 @@ position: relative; } - - .hasConfig .v-autocomplete { - width:calc(100% - 40px); - float:right; + width: calc(100% - 40px); + float: right; } + .hasConfig .v-btn { float: right; margin-top: 20px; margin-right: 5px; } - .WM-Pointer { cursor: pointer; -} +} \ No newline at end of file diff --git a/resources/js/Global/scss/Modify.scss b/resources/js/Global/scss/Modify.scss index 19d6dd7..c4ef6e5 100644 --- a/resources/js/Global/scss/Modify.scss +++ b/resources/js/Global/scss/Modify.scss @@ -2,6 +2,16 @@ padding: 0em 0; } +.v-application { + font-family: "BYekan", "Montserrat-Regular" !important; + font-weight: 100; +} + +.container { + width: 100%; + max-width: 100%; +} + // a { // color:#000 !important; // } @@ -155,9 +165,10 @@ table.v-table tbody td { .v-btn { margin: 6px 2px; + transition: 0.4s } -.v-btn--floating.v-btn--small .v-icon { +.v-btn--fab.v-btn--small .v-icon { font-size: 16px; } @@ -170,6 +181,24 @@ table.v-table tbody td { font-size: 14px; } +.v-btn.S { + width: 40px; + height: 40px; +} + +.v-btn.S .v-icon { + font-size: 20px; +} + +.v-btn.M { + width: 50px; + height: 50px; +} + +.v-btn.M .v-icon { + font-size: 25px; +} + .v-tooltip .v-btn--outline:hover .v-icon, .v-tooltip .v-btn--outline:focus .v-icon { color: #fff; @@ -196,11 +225,11 @@ table.v-table tbody td { @each $Color, $Value in $colors { - .#{$Color} { + .v-application .#{$Color} { background-color: $Value !important; border-color: $Value !important; } - .#{$Color}--text { + .v-application .#{$Color}--text { color: $Value !important; caret-color: $Value !important; } @@ -208,7 +237,7 @@ $Value in $colors { @each $Shadow, $Value in $Shadows { - .v-btn.v-btn--floating.#{$Shadow} { + .v-application .v-btn.v-btn--fab.#{$Shadow} { box-shadow: 0 10px 30px 0px $Value; -moz-box-shadow: 0 10px 30px 0px $Value; -webkit-box-shadow: 0 10px 30px 0px $Value; @@ -217,13 +246,46 @@ $Value in $Shadows { } } -.v-btn--floating.v-btn--active, -.v-btn--floating.v-btn:focus, -.v-btn--floating.v-btn:hover { +.v-application .v-btn--fab:not(.v-btn--outlined).v-btn--active, +.v-application .v-btn--fab:not(.v-btn--outlined).v-btn:focus, +.v-application .v-btn--fab:not(.v-btn--outlined).v-btn:hover { background-color: #000 !important; + color: #fff !important; box-shadow: 0 10px 30px 0px $BlackShadow; -moz-box-shadow: 0 10px 30px 0px $BlackShadow; -webkit-box-shadow: 0 10px 30px 0px $BlackShadow; -o-box-shadow: 0 10px 30px 0px $BlackShadow; -ms-box-shadow: 0 10px 30px 0px $BlackShadow; +} + +.v-btn--fab.v-size--small .v-icon { + font-size: 16px; +} + +.v-application--is-rtl .v-chip--pill .v-avatar--left { + margin-right: -24px; +} + +.v-list { + text-align: right; +} + +.v-application .primary--text { + color: #525252 !important; +} + +.v-btn { + letter-spacing: 0; +} + +.v-application a { + color: #000; +} + +.theme--light.v-card>.v-card__text { + color: rgba(0, 0, 0, .7); +} + +.v-snack { + font-size: 16px; } \ No newline at end of file diff --git a/resources/js/Home/app.js b/resources/js/Home/app.js index 17fe196..fb70346 100644 --- a/resources/js/Home/app.js +++ b/resources/js/Home/app.js @@ -3,7 +3,6 @@ import App from './App.vue' import router from './router' import store from './store' - //components import '@Global/plugins/globalComponent.js' @@ -21,9 +20,11 @@ window.Vue = require('vue'); import { global } from "@Global/mixins/global"; import { commingSoon } from "@Global/mixins/commingSoon"; Vue.mixin({ - methods: { ...global["methods"], ...commingSoon["methods"] } + methods: {...global["methods"], ...commingSoon["methods"] } }); +//vuetify +import vuetify from '@Global/plugins/vuetify' //auth import '@Global/plugins/auth' @@ -32,5 +33,6 @@ import '@Global/plugins/auth' const app = new Vue({ router, store, + vuetify, render: h => h(App), }).$mount('#app'); \ No newline at end of file diff --git a/resources/js/SharedRoutes/index.js b/resources/js/SharedRoutes/index.js deleted file mode 100644 index e1e87d7..0000000 --- a/resources/js/SharedRoutes/index.js +++ /dev/null @@ -1,8 +0,0 @@ -import sharedPath from './path'; - - -// let paths = []; - -// paths = paths.concat(sharedPath); - -export default sharedPath; diff --git a/resources/js/SharedRoutes/path.js b/resources/js/SharedRoutes/path.js deleted file mode 100644 index 5e5b837..0000000 --- a/resources/js/SharedRoutes/path.js +++ /dev/null @@ -1,7 +0,0 @@ -export default [ - // { - // path: '/CRM/MyTasks', - // name: 'MyTasks', - // view: 'Common/views/Tasks' - // } -]; diff --git a/resources/js/services/acl/role.js b/resources/js/services/acl/role.js deleted file mode 100644 index a521c4c..0000000 --- a/resources/js/services/acl/role.js +++ /dev/null @@ -1,17 +0,0 @@ -import { TokenService } from '@/services' - -const $hasRole = function(roles) { - if (TokenService.getToken()) { - roles = roles.split('|'); - for (const role of roles) { - if(TokenService.getInfo().roles && Array.isArray(TokenService.getInfo().roles) && TokenService.getInfo().roles.includes(role)) { - return true; - } - } - } - return false; -}; - -export { - $hasRole -} \ No newline at end of file diff --git a/resources/js/services/global/errorHandler.service.js b/resources/js/services/global/errorHandler.service.js deleted file mode 100644 index 1f7d37b..0000000 --- a/resources/js/services/global/errorHandler.service.js +++ /dev/null @@ -1,49 +0,0 @@ -import axios from "axios"; -import toast from "./toast.service"; -// import {TokenService, ApiService} from '@/services'; -// import store from "@/store" -// import router from '@/router' -function errorResponseHandler(error) { - - // check for errorHandle config - if ( - error.config.hasOwnProperty("errorHandle") && - error.config.errorHandle === false - ) { - return Promise.reject(error); - } - - // if has response show the error - if (error.response) { - if(typeof error.response.data.errors !== 'undefined') { - for (const key in error.response.data.errors) { - if (error.response.data.errors.hasOwnProperty(key)) { - let title = (error.response.data.title) ? error.response.data.title : undefined; - toast.error(error.response.data.errors[key], title); - } - } - } - if(error.response.status == 401) { - // TokenService.removeToken(); - // TokenService.removeRefreshToken(); - // TokenService.removeInfo(); - // ApiService.removeAuthHeader(); - // store.commit('auth/logoutSuccess', {}, {root: true}) - // router.push({ name: `Dashboard` }); - } - - } -} -function successHandler(response) { - if(response.status == 200) { - if(typeof response.data.message !== 'undefined') { - toast.success(response.data.message, response.data.title); - } - } - return response; -} - -// apply interceptor on response -axios.interceptors.response.use(successHandler, errorResponseHandler); - -export default errorResponseHandler; diff --git a/resources/js/services/global/toast.service.js b/resources/js/services/global/toast.service.js deleted file mode 100644 index 79150f2..0000000 --- a/resources/js/services/global/toast.service.js +++ /dev/null @@ -1,21 +0,0 @@ -import "izitoast/dist/css/iziToast.min.css"; -import iZtoast from "izitoast"; - -const toast = { - error: (message, title = "Error") => { - return iZtoast.error({ - title: title, - message: message, - position: "bottomCenter" - }); - }, - success: (message, title = "Success") => { - return iZtoast.success({ - title: title, - message: message, - position: "bottomCenter" - }); - } -}; - -export default toast; diff --git a/resources/js/services/mixin/hasRole.js b/resources/js/services/mixin/hasRole.js deleted file mode 100644 index bd1fc48..0000000 --- a/resources/js/services/mixin/hasRole.js +++ /dev/null @@ -1,6 +0,0 @@ -import {$hasRole} from '../acl/role'; -export default { - methods: { - $hasRole - }, -} \ No newline at end of file diff --git a/webpack.config.js b/webpack.config.js index 1dba780..3e2bc2e 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -28,4 +28,3 @@ let WebpackConfig = require('./node_modules/laravel-mix/src/builder/WebpackConfi module.exports = new WebpackConfig().build(); - diff --git a/webpack.mix.js b/webpack.mix.js index b276fd4..40d5245 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -1,5 +1,4 @@ const mix = require('laravel-mix'); - /* |-------------------------------------------------------------------------- | Mix Asset Management @@ -35,4 +34,4 @@ require('./modules/wm-crm/webpack.mix'); require('./modules/wm-reservation/webpack.mix'); -mix.version(); \ No newline at end of file +mix.version();