From c11a7bc2a42d0052ddd8599bc1b4b8a43e9133bf Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Fri, 19 Jul 2019 23:20:40 +0430 Subject: [PATCH 1/4] edit breadcrumbs with route name --- composer.json | 2 +- composer.lock | 18 +++++++++--------- public/mix-manifest.json | 6 +++--- .../js/Global/components/Misc/Breadcrumbs.vue | 2 +- resources/js/User/router/paths.js | 4 ++-- resources/js/User/views/Add.vue | 6 +++--- resources/js/User/views/List.vue | 4 ++-- 7 files changed, 21 insertions(+), 21 deletions(-) diff --git a/composer.json b/composer.json index 991983c..07b9bbf 100755 --- a/composer.json +++ b/composer.json @@ -13,7 +13,7 @@ "laravel/framework": "5.8.*", "laravel/tinker": "^1.0", "mll-lab/laravel-graphql-playground": "^1.1", - "nuwave/lighthouse": "^3.7", + "nuwave/lighthouse": "dev-master", "nwidart/laravel-modules": "^4.0", "wm/common": "dev-master", "wm/crm": "dev-master" diff --git a/composer.lock b/composer.lock index 31804ac..d1cd53b 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": "6a7ba539431e1b51bce6f14fc24b9510", + "content-hash": "7be4bbf498f057b03ee42474822b258b", "packages": [ { "name": "dnoegel/php-xdg-base-dir", @@ -1061,16 +1061,16 @@ }, { "name": "nuwave/lighthouse", - "version": "v3.7.0", + "version": "dev-master", "source": { "type": "git", "url": "https://github.com/nuwave/lighthouse.git", - "reference": "cb0627424cd7028ddd1c3bf09be22fb6e84b1af4" + "reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/cb0627424cd7028ddd1c3bf09be22fb6e84b1af4", - "reference": "cb0627424cd7028ddd1c3bf09be22fb6e84b1af4", + "url": "https://api.github.com/repos/nuwave/lighthouse/zipball/d1263bfa64457df82e05f309e3920313ec8ac6e1", + "reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1", "shasum": "" }, "require": { @@ -1081,9 +1081,8 @@ "illuminate/routing": "5.5.*|5.6.*|5.7.*|5.8.*", "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*", "illuminate/validation": "5.5.*|5.6.*|5.7.*|5.8.*", - "opis/closure": "^3.0", "php": ">= 7.1", - "webonyx/graphql-php": "^0.13" + "webonyx/graphql-php": "^0.13.2" }, "require-dev": { "bensampo/laravel-enum": "^1.19", @@ -1091,7 +1090,7 @@ "laravel/scout": "^4.0", "mll-lab/graphql-php-scalars": "^2.1", "mockery/mockery": "^1.0", - "orchestra/database": "3.5.*|3.6.*|3.7.*|3.8.x-dev", + "orchestra/database": "3.5.*|3.6.*|3.7.*|3.8.*", "orchestra/testbench": "3.5.*|3.6.*|3.7.*|3.8.*", "phpbench/phpbench": "@dev", "pusher/pusher-php-server": "^3.2" @@ -1142,7 +1141,7 @@ "laravel", "laravel-graphql" ], - "time": "2019-05-27T07:10:46+00:00" + "time": "2019-07-16T17:36:18+00:00" }, { "name": "nwidart/laravel-modules", @@ -5087,6 +5086,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "nuwave/lighthouse": 20, "wm/common": 20, "wm/crm": 20 }, diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 535896c..1043647 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=8ba03455bf554a3c355d", + "/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=6453bd026923226929e3", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=c4c5a6066b7f9a9d5730" + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=227ecbbee8def0bf74e2", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=5ec6720cc9a709374d5e" } diff --git a/resources/js/Global/components/Misc/Breadcrumbs.vue b/resources/js/Global/components/Misc/Breadcrumbs.vue index 317186b..b8edd9b 100644 --- a/resources/js/Global/components/Misc/Breadcrumbs.vue +++ b/resources/js/Global/components/Misc/Breadcrumbs.vue @@ -4,7 +4,7 @@ fas fa-chevron-left diff --git a/resources/js/User/router/paths.js b/resources/js/User/router/paths.js index b274755..c8f8ffb 100644 --- a/resources/js/User/router/paths.js +++ b/resources/js/User/router/paths.js @@ -2,11 +2,11 @@ export default [ { path: '/User/List', name: 'UserList', - view: 'List' + view: 'UserList' }, { path: '/User/Add', name: 'AddUser', - view: 'Add' + view: 'AddUser' }, ]; diff --git a/resources/js/User/views/Add.vue b/resources/js/User/views/Add.vue index f55e57f..bf3b399 100644 --- a/resources/js/User/views/Add.vue +++ b/resources/js/User/views/Add.vue @@ -4,7 +4,7 @@
- +
01
@@ -194,12 +194,12 @@ export default { { text: ' کاربران من ', disabled: false, - href: '/User/List' + routeName: 'UserList' }, { text: ' افزودن کاربر جدید ', disabled: true, - href: '/User/Add' + routeName: 'AddUser' } ] diff --git a/resources/js/User/views/List.vue b/resources/js/User/views/List.vue index 57c0939..7f838a7 100644 --- a/resources/js/User/views/List.vue +++ b/resources/js/User/views/List.vue @@ -8,7 +8,7 @@ - + fas fa-plus @@ -72,7 +72,7 @@ export default { { text: ' کاربران من ', disabled: true, - href: '/User/List' + routeName: 'UserList' }, ] } From 404b8d199a4ba9488890fb4f1bc7dc0565e0aac0 Mon Sep 17 00:00:00 2001 From: saeid_01 Date: Sat, 20 Jul 2019 17:41:18 +0430 Subject: [PATCH 2/4] share route --- public/mix-manifest.json | 2 +- resources/js/SharedRoutes/path.js | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 1043647..db6c9b9 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=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=227ecbbee8def0bf74e2", + "/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" } diff --git a/resources/js/SharedRoutes/path.js b/resources/js/SharedRoutes/path.js index 6786cf9..5e5b837 100644 --- a/resources/js/SharedRoutes/path.js +++ b/resources/js/SharedRoutes/path.js @@ -1,7 +1,7 @@ export default [ - { - path: '/CRM/MyTasks', - name: 'MyTasks', - view: 'Common/views/Tasks' - } + // { + // path: '/CRM/MyTasks', + // name: 'MyTasks', + // view: 'Common/views/Tasks' + // } ]; From 9b9f335e35b97ef666958419bf4efc00a6573921 Mon Sep 17 00:00:00 2001 From: farid saravi Date: Sat, 20 Jul 2019 22:46:42 +0430 Subject: [PATCH 3/4] change basic schema --- graphql/schema.graphql | 1 + 1 file changed, 1 insertion(+) diff --git a/graphql/schema.graphql b/graphql/schema.graphql index 69ffdd0..1b52f38 100644 --- a/graphql/schema.graphql +++ b/graphql/schema.graphql @@ -27,4 +27,5 @@ input DateRange { #import ../modules/wm-crm/graphql/CRM.graphql #import ../modules/wm-core/graphql/Core.graphql +#import ../modules/wm-common/graphql/Common.graphql From c0f6a79f244f309e9e6390d4550862645db4a1e0 Mon Sep 17 00:00:00 2001 From: farid saravi Date: Sun, 21 Jul 2019 22:54:28 +0430 Subject: [PATCH 4/4] add create user relation --- graphql/schema.graphql | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/graphql/schema.graphql b/graphql/schema.graphql index 1b52f38..633626a 100644 --- a/graphql/schema.graphql +++ b/graphql/schema.graphql @@ -20,6 +20,10 @@ type User { cell_number: String } +input CreateUserRelationInput { + connect: ID! +} + input DateRange { from: Date! to: Date!