diff --git a/composer.json b/composer.json index c0522fb..f49811e 100755 --- a/composer.json +++ b/composer.json @@ -16,7 +16,8 @@ "nuwave/lighthouse": "dev-master", "nwidart/laravel-modules": "^4.0", "wm/common": "dev-master", - "wm/crm": "dev-master" + "wm/crm": "dev-master", + "wm/reservation": "dev-master" }, "require-dev": { "beyondcode/laravel-dump-server": "^1.0", @@ -76,6 +77,10 @@ { "type": "path", "url": "./modules/wm-core" + }, + { + "type": "path", + "url": "./modules/wm-reservation" } ] } \ No newline at end of file diff --git a/composer.lock b/composer.lock index 3789157..5dd05a5 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": "7be4bbf498f057b03ee42474822b258b", + "content-hash": "a319d83cf66f3c26da4ced1110b6909a", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -222,16 +222,16 @@ }, { "name": "egulias/email-validator", - "version": "2.1.9", + "version": "2.1.10", "source": { "type": "git", "url": "https://github.com/egulias/EmailValidator.git", - "reference": "128cc721d771ec2c46ce59698f4ca42b73f71b25" + "reference": "a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/128cc721d771ec2c46ce59698f4ca42b73f71b25", - "reference": "128cc721d771ec2c46ce59698f4ca42b73f71b25", + "url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec", + "reference": "a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec", "shasum": "" }, "require": { @@ -241,7 +241,8 @@ "require-dev": { "dominicsayers/isemail": "dev-master", "phpunit/phpunit": "^4.8.35||^5.7||^6.0", - "satooshi/php-coveralls": "^1.0.1" + "satooshi/php-coveralls": "^1.0.1", + "symfony/phpunit-bridge": "^4.4@dev" }, "suggest": { "ext-intl": "PHP Internationalization Libraries are required to use the SpoofChecking validation" @@ -275,7 +276,7 @@ "validation", "validator" ], - "time": "2019-06-23T10:14:27+00:00" + "time": "2019-07-19T20:52:08+00:00" }, { "name": "erusev/parsedown", @@ -950,16 +951,16 @@ }, { "name": "nesbot/carbon", - "version": "2.21.2", + "version": "2.21.3", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "a8bfb6631e3bc982427406d13ad817fc45d47b61" + "reference": "58bdbbfab17ccd2ec7347b99e997f18232def4dc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/a8bfb6631e3bc982427406d13ad817fc45d47b61", - "reference": "a8bfb6631e3bc982427406d13ad817fc45d47b61", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/58bdbbfab17ccd2ec7347b99e997f18232def4dc", + "reference": "58bdbbfab17ccd2ec7347b99e997f18232def4dc", "shasum": "" }, "require": { @@ -1013,7 +1014,7 @@ "datetime", "time" ], - "time": "2019-07-17T07:49:05+00:00" + "time": "2019-07-18T18:47:28+00:00" }, { "name": "nikic/php-parser", @@ -1072,21 +1073,12 @@ "source": { "type": "git", "url": "https://github.com/nuwave/lighthouse.git", -<<<<<<< HEAD - "reference": "724b36194a547bb29835481b1604c320afc59cb9" + "reference": "cb0122ead365ef80798265f55ee939aa2b78faa8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/724b36194a547bb29835481b1604c320afc59cb9", - "reference": "724b36194a547bb29835481b1604c320afc59cb9", -======= - "reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/d1263bfa64457df82e05f309e3920313ec8ac6e1", - "reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1", ->>>>>>> c0f6a79f244f309e9e6390d4550862645db4a1e0 + "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/cb0122ead365ef80798265f55ee939aa2b78faa8", + "reference": "cb0122ead365ef80798265f55ee939aa2b78faa8", "shasum": "" }, "require": { @@ -1157,11 +1149,7 @@ "laravel", "laravel-graphql" ], -<<<<<<< HEAD - "time": "2019-07-19T09:52:35+00:00" -======= - "time": "2019-07-16T17:36:18+00:00" ->>>>>>> c0f6a79f244f309e9e6390d4550862645db4a1e0 + "time": "2019-07-25T06:20:37+00:00" }, { "name": "nwidart/laravel-modules", @@ -3218,7 +3206,7 @@ "dist": { "type": "path", "url": "./modules/wm-common", - "reference": "f60647112b700f6324e6258c30904ed256ee4f9d" + "reference": "25e30f1d9049b0e8c00b5e07e24be112bab4d311" }, "require": { "illuminate/support": "5.8.*", @@ -3258,7 +3246,7 @@ "dist": { "type": "path", "url": "./modules/wm-core", - "reference": "43af1d5c7ba2fef8e1309eef8108b34e3648d2e0" + "reference": "8d3867609fb0604b914b0784fcb661fd99ff49c2" }, "require": { "illuminate/support": "^5.4", @@ -3302,7 +3290,7 @@ "dist": { "type": "path", "url": "./modules/wm-crm", - "reference": "ae6610b427393e40e0627c1bdf51823e1e393236" + "reference": "1262817eea6fe1a4a4054418648ddcda69d181c1" }, "require": { "illuminate/support": "5.8.*", @@ -3336,6 +3324,46 @@ "MIT" ], "description": "client relationship management" + }, + { + "name": "wm/reservation", + "version": "dev-master", + "dist": { + "type": "path", + "url": "./modules/wm-reservation", + "reference": "6c20fbfc002d3b5a89f00b369519e3a472839b52" + }, + "require": { + "illuminate/support": "5.8.*", + "php": "^7.1.3", + "wm/common": "dev-master" + }, + "require-dev": { + "orchestra/testbench": "~3.6.0", + "phpunit/phpunit": "^7.0" + }, + "type": "library", + "extra": { + "laravel": { + "providers": [ + "WM\\Reservation\\ReservationServiceProvider" + ] + } + }, + "autoload": { + "psr-4": { + "WM\\Reservation\\": "src/" + } + }, + "autoload-dev": { + "psr-4": { + "WM\\Reservation\\Tests\\": "tests/" + } + }, + "license": [ + "MIT" + ], + "description": "add reservation system to willamall" } ], "packages-dev": [ @@ -4314,16 +4342,16 @@ }, { "name": "phpunit/php-token-stream", - "version": "3.0.2", + "version": "3.1.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c" + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", - "reference": "c4a66b97f040e3e20b3aa2a243230a1c3a9f7c8c", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a", + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a", "shasum": "" }, "require": { @@ -4336,7 +4364,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -4359,7 +4387,7 @@ "keywords": [ "tokenizer" ], - "time": "2019-07-08T05:24:54+00:00" + "time": "2019-07-25T05:29:42+00:00" }, { "name": "phpunit/phpunit", @@ -5108,7 +5136,8 @@ "stability-flags": { "nuwave/lighthouse": 20, "wm/common": 20, - "wm/crm": 20 + "wm/crm": 20, + "wm/reservation": 20 }, "prefer-stable": true, "prefer-lowest": false, diff --git a/public/mix-manifest.json b/public/mix-manifest.json index b6cf71e..ca48bfe 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,13 +1,7 @@ { -<<<<<<< HEAD - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=2eae82d3fa71f897e604", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=e0ff24444a4741972c82", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=40d15556cfb075cca358", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=47c003e1714e1da1fa59" -======= - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=126dc6f3c173336b3c08", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=bf18112bfd001430c068", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=59b1f7ca2c06f4958f2e", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=5ec6720cc9a709374d5e" ->>>>>>> c0f6a79f244f309e9e6390d4550862645db4a1e0 + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=dd71ece093627ceeb8e0", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=ed85fe3b61f308dc2e8c", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=c021095f6e5e00a81073", + "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=5f408f2fd973ffba7cae", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=442c17b05e9f1943a1ed" } diff --git a/resources/js/Home/views/Home.vue b/resources/js/Home/views/Home.vue index 89e15d4..f8335e4 100644 --- a/resources/js/Home/views/Home.vue +++ b/resources/js/Home/views/Home.vue @@ -19,9 +19,14 @@ - - + + + + + + diff --git a/resources/js/User/components/Role/Add.vue b/resources/js/User/components/Role/Add.vue new file mode 100644 index 0000000..433543c --- /dev/null +++ b/resources/js/User/components/Role/Add.vue @@ -0,0 +1,90 @@ + + + diff --git a/resources/js/User/components/Role/List.vue b/resources/js/User/components/Role/List.vue new file mode 100644 index 0000000..29df24d --- /dev/null +++ b/resources/js/User/components/Role/List.vue @@ -0,0 +1,170 @@ + + + + + diff --git a/resources/js/User/components/Roles.vue b/resources/js/User/components/Roles.vue index 4262bca..1475800 100644 --- a/resources/js/User/components/Roles.vue +++ b/resources/js/User/components/Roles.vue @@ -13,7 +13,11 @@
کاربران
Users
- + + fas fa-plus + افزودن نقش جدید + + diff --git a/resources/js/User/router/paths.js b/resources/js/User/router/paths.js index c8f8ffb..5eac953 100644 --- a/resources/js/User/router/paths.js +++ b/resources/js/User/router/paths.js @@ -1,12 +1,11 @@ -export default [ - { - path: '/User/List', - name: 'UserList', - view: 'UserList' - }, - { - path: '/User/Add', - name: 'AddUser', - view: 'AddUser' - }, - ]; +export default [{ + path: '/User/List', + name: 'UserList', + view: 'List' + }, + { + path: '/User/Add', + name: 'AddUser', + view: 'Add' + }, +]; \ No newline at end of file diff --git a/resources/js/User/store.js b/resources/js/User/store.js index f5d1fb6..6939812 100644 --- a/resources/js/User/store.js +++ b/resources/js/User/store.js @@ -7,6 +7,7 @@ export default new Vuex.Store({ state: { UserDetails: false, UserRoles: false, + AddRole: false, ConfigUserDepartments: false, ConfigUserDepartmentAdd: false, TaskAdd: false, @@ -14,4 +15,4 @@ export default new Vuex.Store({ SendEmail: false, SendSMS: false } -}) +}) \ No newline at end of file diff --git a/resources/js/User/views/List.vue b/resources/js/User/views/List.vue index 7f838a7..094ecf5 100644 --- a/resources/js/User/views/List.vue +++ b/resources/js/User/views/List.vue @@ -20,6 +20,7 @@
+ @@ -40,7 +41,8 @@ import UserItems from '@User/components/Items'; import UserFilters from '@User/components/Filters'; import UserDetails from "@User/components/Details.vue"; -import UserRoles from "@User/components/Roles.vue"; +import UserRoles from "@User/components/Role/List.vue"; +import AddRole from "@User/components/Role/Add.vue"; import TaskAdd from "@Common/components/Task/Add.vue"; import TaskTimeline from "@Common/components/Task/Timeline/Modal-Layout.vue"; @@ -55,6 +57,7 @@ export default { 'wm-user-filter' : UserFilters, 'wm-user-details' : UserDetails, 'wm-user-roles' : UserRoles, + 'wm-add-role' : AddRole, 'wm-task-add' : TaskAdd, 'wm-task-timeline' : TaskTimeline, 'wm-send-email' : SendEmailModal, diff --git a/webpack.mix.js b/webpack.mix.js index 046ae95..152c548 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -23,22 +23,24 @@ mix.webpackConfig({ }, output: { chunkFilename: 'js/vue/chunks/[name].[chunkhash].js', - }, + }, }); // mix.js('resources/js/Modules/Website/app.js', 'public/Modules/Website/js') // .js('resources/js/Home/app.js', 'public/Home/js'); - // .js('resources/js/Authentication/app.js', 'public/Authentication/js'); +// .js('resources/js/Authentication/app.js', 'public/Authentication/js'); mix.js('resources/js/Authentication/app.js', 'public/js/vue/Authentication') .js('resources/js/Home/app.js', 'public/js/vue/Home') .js('resources/js/User/app.js', 'public/js/vue/User'); - + // require('./modules/wm-core/webpack.mix'); require('./modules/wm-common/webpack.mix'); require('./modules/wm-crm/webpack.mix'); // require('./modules/wm-store/webpack.mix'); +require('./modules/wm-reservation/webpack.mix'); + mix.version(); \ No newline at end of file