new commit

composer.lock

@@ -1072,12 +1072,21 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/nuwave/lighthouse.git",
+<<<<<<< HEAD
                 "reference": "724b36194a547bb29835481b1604c320afc59cb9"
             },
             "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
                 "shasum": ""
             },
             "require": {
@@ -1148,7 +1157,11 @@
                 "laravel",
                 "laravel-graphql"
             ],
+<<<<<<< HEAD
             "time": "2019-07-19T09:52:35+00:00"
+=======
+            "time": "2019-07-16T17:36:18+00:00"
+>>>>>>> c0f6a79f244f309e9e6390d4550862645db4a1e0
         },
         {
             "name": "nwidart/laravel-modules",

graphql/schema.graphql

@@ -20,6 +20,10 @@ type User {
     cell_number: String
 }
 
+input CreateUserRelationInput {
+    connect: ID!
+}
+
 input DateRange {
     from: Date!
     to: Date!
@@ -27,4 +31,5 @@ input DateRange {
 
 #import ../modules/wm-crm/graphql/CRM.graphql
 #import ../modules/wm-core/graphql/Core.graphql
+#import ../modules/wm-common/graphql/Common.graphql
 

public/mix-manifest.json

@@ -1,6 +1,13 @@
 {
+<<<<<<< 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
 }

resources/js/Global/components/Misc/Breadcrumbs.vue

@@ -4,7 +4,7 @@
             <v-icon>fas fa-chevron-left</v-icon>
         </template>
         <template v-slot:item="props">
-            <router-link :to="props.item.href" class="WM-Link WM-Margin-T-5" :class="[LinkClass, props.item.disabled && 'disabled']"><v-icon>fas fa-{{ props.item.icon }}</v-icon> {{ props.item.text.toUpperCase() }}</router-link>
+            <router-link :to="{name: props.item.routeName}" class="WM-Link WM-Margin-T-5" :class="[LinkClass, props.item.disabled && 'disabled']"><v-icon>fas fa-{{ props.item.icon }}</v-icon> {{ props.item.text.toUpperCase() }}</router-link>
         </template>
     </v-breadcrumbs>
 </template>

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'
+    // }
 ];

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'
         },
     ];

resources/js/User/views/Add.vue

@@ -4,7 +4,7 @@
             <wm-breadcrumbs LinkClass="WM-Link-Cyan" :items="breadcrumbItems"></wm-breadcrumbs>
         </div>
         <div class="Tile Shadowed">
-            <WM-PartTitle class="WM-Margin-T-20" TitleFa=" افزودن کاربر جدید " TitleEn=" Add a new User " color="cyan"></WM-PartTitle>
+            <WM-PartTitle class="WM-Margin-T-20" TitleFa=" افزودن کاربر جدید " TitleEn=" Add a new User " Color="cyan"></WM-PartTitle>
             <v-layout row wrap class="WM-Section" style="border-right-color: #32c5d2;">
                 <v-flex class="lg12 RTL text-lg-right">
                     <div class="Step En" style="color:#32c5d2;"> 01 </div>
@@ -194,12 +194,12 @@ export default {
             {
                 text: ' کاربران من ',
                 disabled: false,
-                href: '/User/List'
+                routeName: 'UserList'
             },
             {
                 text: ' افزودن کاربر جدید ',
                 disabled: true,
-                href: '/User/Add'
+                routeName: 'AddUser'
             }
         ]
 

resources/js/User/views/List.vue

@@ -8,7 +8,7 @@
             <WM-PartTitle class="WM-Margin-T-20" TitleFa=" کاربران مجموعه ی من " TitleEn=" My Users " color="cyan"></WM-PartTitle>
             <wm-user-filter></wm-user-filter>
             <wm-user-items></wm-user-items>
-            <router-link to="/User/Add">
+            <router-link :to="{name: 'AddUser'}">
                 <v-btn large fab color="cyan" fixed bottom left dark style="left:5%"><v-icon dark>fas fa-plus</v-icon></v-btn>
             </router-link>
 
@@ -72,7 +72,7 @@ export default {
                 {
                     text: ' کاربران من ',
                     disabled: true,
-                    href: '/User/List'
+                    routeName: 'UserList'
                 },
             ]
         }