user_roles_updated

pull/1/head
alireza hassani 5 years ago
parent 8641806a6b
commit 5afc5ddcce

@ -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"
}
]
}

107
composer.lock generated

@ -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,

@ -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"
}

@ -19,9 +19,14 @@
</wm-tile>
</router-link>
<a href="/CRM/Home" class="flex lg12 xs12">
<wm-tile TileClass="Inline LTR Padd10" TileHeight="180" TitleEn="CRM" TitleFa=" مدیریت ارتباط با مشتری " Desc=" کالاها، خدمات، تخفیفات، فروش وِیژه و ... "
GradientBegin="d6e7de" GradientEnd="d8d8e1" ImageURL="Members.png" Quantity="1250" >
<a href="/Reservation/Home" class="flex lg4 xs12">
<wm-tile TileClass="Padd10" TitleEn="Reservations" TitleFa=" سیستم رزرو وقت " Desc=" کالاها، خدمات، تخفیفات، فروش وِیژه و ... "
GradientBegin="cecece" GradientEnd="f7f7f7" ImageURL="Clock.png" ImageHeight="150px" Quantity="1250" >
</wm-tile>
</a>
<a href="/CRM/Home" class="flex lg8 xs12">
<wm-tile TileClass="Inline LTR Padd10" TitleEn="CRM" TitleFa=" مدیریت ارتباط با مشتری " Desc=" کالاها، خدمات، تخفیفات، فروش وِیژه و ... "
GradientBegin="d6e7de" GradientEnd="d8d8e1" ImageURL="Members.png" ImageHeight="220px" Quantity="1250" >
</wm-tile>
</a>
</v-layout>

@ -0,0 +1,90 @@
<template>
<v-dialog v-model="$store.state.AddRole" width="70%" transition="slide-x-transition">
<v-card class="RTL">
<v-card-title class=" grey lighten-3" primary-title>
<WM-PartTitle class="WM-Margin-T-20" TitleFa=" ایجاد نقش جدید " TitleEn=" Define a new Role " color="cyan"></WM-PartTitle>
</v-card-title>
<v-card-text>
<v-layout row wrap class="WM-Section" style="border-right-color: #32c5d2;">
<v-flex class="lg3 RTL text-lg-right">
<div class="Step En" style="color:#32c5d2;"> 01 </div>
<div class="Title">
<div class="FA"> کاربران </div>
<div class="EN"> Users </div>
</div>
<!-- <v-tooltip top color="black">
<v-btn small slot="activator" fab color="cyan" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
<span> افزودن نقش جدید </span>
</v-tooltip> -->
<!-- <v-switch style="float:left; margin-left:10px;" color="cyan" v-model="UserSwitch"></v-switch> -->
</v-flex>
<v-flex class="lg9">
<v-layout row wrap class="WM-Margin-0">
<v-flex class="lg6 WM-Flex RoleFlex">
<v-card-text>
<v-text-field label=" نام نقش به فارسی " color="cyan" prepend-icon="fas fa-tag" ></v-text-field>
</v-card-text>
</v-flex>
<v-flex class="lg6 WM-Flex RoleFlex">
<v-card-text>
<v-text-field label=" Role Name - English " class="LTR" color="cyan" prepend-icon="fas fa-tag" ></v-text-field>
</v-card-text>
</v-flex>
</v-layout>
<v-layout row wrap class="WM-Margin-0">
<v-flex class="lg4 WM-Flex RoleFlex">
<v-switch color="cyan" v-model="UserAdd" label=" افزودن کاربر "></v-switch>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<v-switch color="cyan" v-model="UserEdit" label=" ویرایش کاربر "></v-switch>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<v-switch color="cyan" v-model="UserRemove" label=" حذف کاربر "></v-switch>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<v-switch color="cyan" v-model="EditRoles" label=" ویرایش دسترسی ها "></v-switch>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<v-switch color="cyan" v-model="Contact" label=" ارسال پیام کوتاه یا ایمیل "></v-switch>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<v-switch color="cyan" v-model="DoTask" label=" قابلیت انجام وظیفه "></v-switch>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<v-switch color="cyan" v-model="DefineTask" label=" قابلیت انجام وظیفه "></v-switch>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
</v-card-text>
<v-divider></v-divider>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="cyan" depressed dark @click="$store.state.AddRole = false">
<v-icon dark right>fas fa-plus</v-icon> افزودن نقش
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</template>
<script>
export default {
props: {
},
data () {
return {
status: [
{ name: ' بسته شده ', id: 1 },
{ name: ' ویزیت اولیه ', id: 2 },
{ name: ' انصراف داده ', id: 3 },
],
UserSwitch: true,
}
}
};
</script>

@ -0,0 +1,170 @@
<template>
<v-dialog v-model="$store.state.UserRoles" width="70%" transition="slide-x-transition">
<v-card class="RTL">
<v-card-title class=" grey lighten-3" primary-title>
<WM-PartTitle class="WM-Margin-T-20" TitleFa=" دسترسی های کاربر " TitleEn=" User's Access " color="black"></WM-PartTitle>
</v-card-title>
<v-card-text>
<v-layout row wrap class="WM-Section" style="border-right-color: #32c5d2;">
<v-flex class="lg3 RTL text-lg-right">
<div class="Step En" style="color:#32c5d2;"> 01 </div>
<div class="Title">
<div class="FA"> کاربران </div>
<div class="EN"> Users </div>
</div>
<v-tooltip top color="black">
<v-btn small slot="activator" @click.native="$store.state.AddRole = true" fab color="cyan" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
<span> افزودن نقش جدید در بخش مدیریت کاربران سیستم</span>
</v-tooltip>
<!-- <v-switch style="float:left; margin-left:10px;" color="cyan" v-model="UserSwitch"></v-switch> -->
</v-flex>
<v-flex class="lg9">
<v-layout row wrap class="WM-Margin-0">
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر سطح 1 " ItemID="UserAdminL1"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر سطح 2 " ItemID="UserAdminL2"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
<v-layout row wrap class="WM-Section" style="border-right-color: #ee3552;">
<v-flex class="lg3 RTL text-lg-right">
<div class="Step En" style="color:#ee3552;"> 02 </div>
<div class="Title">
<div class="FA"> مدیریت ارتباط با مشتری </div>
<div class="EN"> CRM </div>
</div>
<v-tooltip top color="black">
<v-btn small @click.native="$store.state.AddRole = true" slot="activator" fab color="red" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
<span> افزودن نقش جدید در بخش مدیریت ارتباط با مشتری</span>
</v-tooltip>
<!-- <v-switch style="float:left; margin-left:10px;" color="red" v-model="UserSwitch"></v-switch> -->
</v-flex>
<v-flex class="lg9">
<v-layout row wrap class="WM-Margin-0">
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر وظایف " ItemID="CRMTasksAdmin"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر مشتریان " ItemID="CRMClientsAdmin"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر رویدادها " ItemID="CRMClientsAdmin"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر تراکنش ها " ItemID="CRMClientsAdmin"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
<v-layout row wrap class="WM-Section" style="border-right-color: #FF6B57;">
<v-flex class="lg3 RTL text-lg-right">
<div class="Step En" style="color:#FF6B57;"> 03 </div>
<div class="Title">
<div class="FA"> فروشگاه </div>
<div class="EN"> Store </div>
</div>
<v-tooltip top color="black">
<v-btn small slot="activator" fab color="orange" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
<span> افزودن نقش جدید در بخش فروشگاه </span>
</v-tooltip>
<!-- <v-switch style="float:left; margin-left:10px;" color="orange" v-model="UserSwitch"></v-switch> -->
</v-flex>
<v-flex class="lg9">
<v-layout row wrap class="WM-Margin-0">
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر محصولات " ItemID="StoreProducts"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر تخفیف ها " ItemID="StoreProducts"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر سفارشات " ItemID="StoreProducts"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
<v-flex class="lg4 WM-Flex RoleFlex">
<WM-Checkbox ItemText=" مدیر فروش های ویژه " ItemID="StoreProducts"></WM-Checkbox>
<v-tooltip bottom color="black">
<v-btn class="XS" style="margin:-7px 10px 0px 0px;" @click.native="$store.state.AddRole = true" slot="activator" outline fab color="black" dark><v-icon dark>fas fa-pencil-alt</v-icon></v-btn>
<span> ویرایش نقش </span>
</v-tooltip>
</v-flex>
</v-layout>
</v-flex>
</v-layout>
</v-card-text>
<v-divider></v-divider>
<v-card-actions>
<v-spacer></v-spacer>
<v-btn color="black" depressed dark @click="$store.state.UserRoles = false">
<v-icon dark right>fas fa-check</v-icon> تایید دسترسی ها
</v-btn>
</v-card-actions>
</v-card>
</v-dialog>
</template>
<script>
export default {
props: {
},
data () {
return {
status: [
{ name: ' بسته شده ', id: 1 },
{ name: ' ویزیت اولیه ', id: 2 },
{ name: ' انصراف داده ', id: 3 },
],
UserSwitch: true,
}
}
};
</script>
<style lang="scss" scoped>
.RoleFlex {
height: 45px;
align-items: center;
}
</style>

@ -13,7 +13,11 @@
<div class="FA"> کاربران </div>
<div class="EN"> Users </div>
</div>
<v-switch style="float:left; margin-left:10px;" color="cyan" v-model="UserSwitch"></v-switch>
<v-tooltip top color="black">
<v-btn small slot="activator" fab color="cyan" dark style="float:left; margin-left:10px;"><v-icon dark>fas fa-plus</v-icon></v-btn>
<span> افزودن نقش جدید </span>
</v-tooltip>
<!-- <v-switch style="float:left; margin-left:10px;" color="cyan" v-model="UserSwitch"></v-switch> -->
</v-flex>
<v-flex class="lg2">
<WM-Checkbox ItemText=" افزودن کاربر " ItemID="UserAdd"></WM-Checkbox>

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

@ -7,6 +7,7 @@ export default new Vuex.Store({
state: {
UserDetails: false,
UserRoles: false,
AddRole: false,
ConfigUserDepartments: false,
ConfigUserDepartmentAdd: false,
TaskAdd: false,

@ -20,6 +20,7 @@
<div class="text-xs-center">
<wm-user-details></wm-user-details>
<wm-user-roles></wm-user-roles>
<wm-add-role></wm-add-role>
<wm-task-add></wm-task-add>
<wm-task-timeline></wm-task-timeline>
<wm-send-email></wm-send-email>
@ -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,

6
webpack.mix.js vendored

@ -23,12 +23,12 @@ 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')
@ -41,4 +41,6 @@ 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();
Loading…
Cancel
Save