alireza_hassani
/
willaengine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

conflit

Browse Source
pull/1/head
saeid_01 5 years ago
parent 327cd2b886 71a967996b
commit f691cf962e
12 changed files with 2204 additions and 2081 deletions
Show Stats Download Patch File Download Diff File

39
.env.example
Unescape View File

@ -1,39 +0,0 @@
APP_NAME=Laravel
APP_ENV=local
APP_KEY=
APP_DEBUG=true
APP_URL=http://localhost
LOG_CHANNEL=stack
DB_CONNECTION=mysql
DB_HOST=127.0.0.1
DB_PORT=3306
DB_DATABASE=homestead
DB_USERNAME=homestead
DB_PASSWORD=secret
BROADCAST_DRIVER=log
CACHE_DRIVER=file
QUEUE_CONNECTION=sync
SESSION_DRIVER=file
SESSION_LIFETIME=120
REDIS_HOST=127.0.0.1
REDIS_PASSWORD=null
REDIS_PORT=6379
MAIL_DRIVER=smtp
MAIL_HOST=smtp.mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
PUSHER_APP_ID=
PUSHER_APP_KEY=
PUSHER_APP_SECRET=
PUSHER_APP_CLUSTER=mt1
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"

10
composer.json
Unescape View File

@ -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",
@ -65,8 +66,7 @@
"@php artisan key:generate --ansi"
]
},
"repositories": [
{
"repositories": [{
"type": "path",
"url": "./modules/wm-crm"
},
@ -77,6 +77,10 @@
{
"type": "path",
"url": "./modules/wm-core"
},
{
"type": "path",
"url": "./modules/wm-reservation"
}
]
}

121
composer.lock generated
Unescape View File

@ -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",
@ -526,16 +527,16 @@
},
{
"name": "laravel/framework",
"version": "v5.8.28",
"version": "v5.8.29",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "341fb54bea9693cada2a5b8d398621a57f82862d"
"reference": "489ae2218c7eb138caac780de584d8df9fe8160b"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/341fb54bea9693cada2a5b8d398621a57f82862d",
"reference": "341fb54bea9693cada2a5b8d398621a57f82862d",
"url": "https://api.github.com/repos/laravel/framework/zipball/489ae2218c7eb138caac780de584d8df9fe8160b",
"reference": "489ae2218c7eb138caac780de584d8df9fe8160b",
"shasum": ""
},
"require": {
@ -669,7 +670,7 @@
"framework",
"laravel"
],
"time": "2019-07-09T14:00:02+00:00"
"time": "2019-07-16T14:05:28+00:00"
},
{
"name": "laravel/tinker",
@ -950,16 +951,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.20.0",
"version": "2.21.3",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "bc671b896c276795fad8426b0aa24e8ade0f2498"
"reference": "58bdbbfab17ccd2ec7347b99e997f18232def4dc"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bc671b896c276795fad8426b0aa24e8ade0f2498",
"reference": "bc671b896c276795fad8426b0aa24e8ade0f2498",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/58bdbbfab17ccd2ec7347b99e997f18232def4dc",
"reference": "58bdbbfab17ccd2ec7347b99e997f18232def4dc",
"shasum": ""
},
"require": {
@ -975,6 +976,9 @@
"phpunit/phpunit": "^7.5 || ^8.0",
"squizlabs/php_codesniffer": "^3.4"
},
"bin": [
"bin/carbon"
],
"type": "library",
"extra": {
"laravel": {
@ -997,6 +1001,10 @@
"name": "Brian Nesbitt",
"email": "brian@nesbot.com",
"homepage": "http://nesbot.com"
},
{
"name": "kylekatarnls",
"homepage": "http://github.com/kylekatarnls"
}
],
"description": "A simple API extension for DateTime.",
@ -1006,7 +1014,7 @@
"datetime",
"time"
],
"time": "2019-06-25T10:00:57+00:00"
"time": "2019-07-18T18:47:28+00:00"
},
{
"name": "nikic/php-parser",
@ -1065,12 +1073,12 @@
"source": {
"type": "git",
"url": "https://github.com/nuwave/lighthouse.git",
"reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1"
"reference": "cb0122ead365ef80798265f55ee939aa2b78faa8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nuwave/lighthouse/zipball/d1263bfa64457df82e05f309e3920313ec8ac6e1",
"reference": "d1263bfa64457df82e05f309e3920313ec8ac6e1",
"url": "https://api.github.com/repos/nuwave/lighthouse/zipball/cb0122ead365ef80798265f55ee939aa2b78faa8",
"reference": "cb0122ead365ef80798265f55ee939aa2b78faa8",
"shasum": ""
},
"require": {
@ -1141,7 +1149,7 @@
"laravel",
"laravel-graphql"
],
"time": "2019-07-16T17:36:18+00:00"
"time": "2019-07-25T06:20:37+00:00"
},
{
"name": "nwidart/laravel-modules",
@ -3198,7 +3206,7 @@
"dist": {
"type": "path",
"url": "./modules/wm-common",
"reference": "bcd54aff17bc080c519a7014940b16211d06e07a"
"reference": "25e30f1d9049b0e8c00b5e07e24be112bab4d311"
},
"require": {
"illuminate/support": "5.8.*",
@ -3238,7 +3246,7 @@
"dist": {
"type": "path",
"url": "./modules/wm-core",
"reference": "55dacbe8dde0afabc4c2101ba911974d2a6ea7bf"
"reference": "8d3867609fb0604b914b0784fcb661fd99ff49c2"
},
"require": {
"illuminate/support": "^5.4",
@ -3282,7 +3290,7 @@
"dist": {
"type": "path",
"url": "./modules/wm-crm",
"reference": "d6dec45abcc6eb24df0426e58ed071b1d789a9cb"
"reference": "1262817eea6fe1a4a4054418648ddcda69d181c1"
},
"require": {
"illuminate/support": "5.8.*",
@ -3316,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": [
@ -4294,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": {
@ -4316,7 +4364,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "3.0-dev"
"dev-master": "3.1-dev"
}
},
"autoload": {
@ -4339,20 +4387,20 @@
"keywords": [
"tokenizer"
],
"time": "2019-07-08T05:24:54+00:00"
"time": "2019-07-25T05:29:42+00:00"
},
{
"name": "phpunit/phpunit",
"version": "7.5.13",
"version": "7.5.14",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
"reference": "b9278591caa8630127f96c63b598712b699e671c"
"reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/b9278591caa8630127f96c63b598712b699e671c",
"reference": "b9278591caa8630127f96c63b598712b699e671c",
"url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/2834789aeb9ac182ad69bfdf9ae91856a59945ff",
"reference": "2834789aeb9ac182ad69bfdf9ae91856a59945ff",
"shasum": ""
},
"require": {
@ -4423,7 +4471,7 @@
"testing",
"xunit"
],
"time": "2019-06-19T12:01:51+00:00"
"time": "2019-07-15T06:24:08+00:00"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@ -5088,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,

4
config/lighthouse.php
Unescape View File

@ -98,7 +98,7 @@ return [
'interfaces' => 'App\\GraphQL\\Interfaces',
'unions' => 'App\\GraphQL\\Unions',
'scalars' => 'App\\GraphQL\\Scalars',
'directives' => ['WM\\Core\\GraphQL\\Directives'],
'directives' => ['WM\\Core\\GraphQL\\Directives', 'WM\\CRM\\GraphQL\\Directives'],
],
/*
@ -129,7 +129,7 @@ return [
|
*/
'paginate_max_count' => null,
'paginate_max_count' => 48,
/*
|--------------------------------------------------------------------------

4041
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

8
public/mix-manifest.json
Unescape View File

@ -1,6 +1,14 @@
{
<<<<<<< HEAD
"/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=c7a4038bfe7a736076b0",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=201a6bfbd9ddca9ca2a3"
=======
"/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"
>>>>>>> 71a967996bf3bf5250f295639720323318ca4fcc
}

11
resources/js/Home/views/Home.vue
Unescape View File

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

6
resources/js/User/components/Roles.vue
Unescape View File

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

9
resources/js/User/router/paths.js vendored
Unescape View File

@ -1,12 +1,11 @@
export default [
{
export default [{
path: '/User/List',
name: 'UserList',
view: 'UserList'
view: 'List'
},
{
path: '/User/Add',
name: 'AddUser',
view: 'AddUser'
view: 'Add'
},
];
];

1
resources/js/User/store.js vendored
Unescape View File

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

5
resources/js/User/views/List.vue
Unescape View File

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

4
webpack.mix.js vendored
Unescape View File

@ -28,7 +28,7 @@ mix.webpackConfig({
// 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();
Write Preview
Loading…
Cancel
Save