diff --git a/composer.json b/composer.json index b2012e3..991983c 100755 --- a/composer.json +++ b/composer.json @@ -70,9 +70,13 @@ "type": "path", "url": "./modules/wm-crm" }, - { + { "type": "path", "url": "./modules/wm-common" + }, + { + "type": "path", + "url": "./modules/wm-core" } ] } diff --git a/composer.lock b/composer.lock index 95e0179..bc5cd12 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d86f9d77233258bb5257d1a5bdda9258", + "content-hash": "6a7ba539431e1b51bce6f14fc24b9510", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -467,16 +467,16 @@ }, { "name": "laravel/framework", - "version": "v5.8.27", + "version": "v5.8.28", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f1dccffb96f614895393e27e4667105a05407af5" + "reference": "341fb54bea9693cada2a5b8d398621a57f82862d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f1dccffb96f614895393e27e4667105a05407af5", - "reference": "f1dccffb96f614895393e27e4667105a05407af5", + "url": "https://api.github.com/repos/laravel/framework/zipball/341fb54bea9693cada2a5b8d398621a57f82862d", + "reference": "341fb54bea9693cada2a5b8d398621a57f82862d", "shasum": "" }, "require": { @@ -610,7 +610,7 @@ "framework", "laravel" ], - "time": "2019-07-02T13:43:47+00:00" + "time": "2019-07-09T14:00:02+00:00" }, { "name": "laravel/tinker", @@ -1157,16 +1157,16 @@ }, { "name": "opis/closure", - "version": "3.3.0", + "version": "3.3.1", "source": { "type": "git", "url": "https://github.com/opis/closure.git", - "reference": "f846725591203098246276b2e7b9e8b7814c4965" + "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/opis/closure/zipball/f846725591203098246276b2e7b9e8b7814c4965", - "reference": "f846725591203098246276b2e7b9e8b7814c4965", + "url": "https://api.github.com/repos/opis/closure/zipball/92927e26d7fc3f271efe1f55bdbb073fbb2f0722", + "reference": "92927e26d7fc3f271efe1f55bdbb073fbb2f0722", "shasum": "" }, "require": { @@ -1214,7 +1214,7 @@ "serialization", "serialize" ], - "time": "2019-05-31T20:04:32+00:00" + "time": "2019-07-09T21:58:11+00:00" }, { "name": "paragonie/random_compat", @@ -3140,11 +3140,12 @@ "dist": { "type": "path", "url": "./modules/wm-common", - "reference": "abe6be64f1e0a969b328b76416200cac8cdf2421" + "reference": "ac853fa32f3d4e42415e50cdeeb4f7b19ee70eb7" }, "require": { "illuminate/support": "5.8.*", - "php": "^7.1.3" + "php": "^7.1.3", + "wm/core": "dev-master" }, "require-dev": { "orchestra/testbench": "~3.6.0", @@ -3173,18 +3174,62 @@ ], "description": "manage common information in willamall" }, + { + "name": "wm/core", + "version": "dev-master", + "dist": { + "type": "path", + "url": "./modules/wm-core", + "reference": "db97f9d4f10f09184aa108ec97676f1ca0bb8d63" + }, + "require": { + "illuminate/support": "^5.4", + "php": "^7.1.3" + }, + "require-dev": { + "orchestra/testbench": "~3.6.0", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "WM\\Core\\CoreServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "WM\\Core\\": "src/" + }, + "classmap": [ + "database/seeds", + "database/factories" + ] + }, + "autoload-dev": { + "psr-4": { + "WM\\Core\\Tests\\": "tests/" + } + }, + "license": [ + "MIT" + ], + "description": "client relationship management" + }, { "name": "wm/crm", "version": "dev-master", "dist": { "type": "path", "url": "./modules/wm-crm", - "reference": "217fb2b641004848a0bb7a6ff39f0e5b5b6db550" + "reference": "bfdaf99b6c02dec5d7a6b1957ebc95b13902d43d" }, "require": { "illuminate/support": "5.8.*", "php": "^7.1.3", - "wm/common": "dev-master" + "wm/common": "dev-master", + "wm/core": "dev-master" }, "require-dev": { "orchestra/testbench": "~3.6.0", @@ -4190,16 +4235,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18" + "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c99e3be9d3e85f60646f152f9002d46ed7770d18", - "reference": "c99e3be9d3e85f60646f152f9002d46ed7770d18", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", + "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", "shasum": "" }, "require": { @@ -4235,7 +4280,7 @@ "keywords": [ "tokenizer" ], - "time": "2018-10-30T05:52:18+00:00" + "time": "2019-07-08T05:24:54+00:00" }, { "name": "phpunit/phpunit", diff --git a/public/mix-manifest.json b/public/mix-manifest.json index a26e248..ab22749 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,6 +1,6 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=ada36e14123738cce4a1", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=4389447314d810908e49", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=24bffeddf17eab24a833", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=32e40e7920eba25a4bb2" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=e11c94b631fa8e23411d", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=8a41fb4476589b3a6cff", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=311655cd117deb0ab373", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=4d34a4ac917830fbaa36" }