change to vuetify 2

pull/1/head
alireza hassani 5 years ago
parent fc18ee49db
commit 2e22e3c555

@ -1,3 +1,4 @@
{
"plugins": ["@babel/plugin-syntax-dynamic-import"]
"plugins": ["@babel/plugin-syntax-dynamic-import"],
"presets": ["@babel/preset-env"]
}

141
composer.lock generated

@ -287,16 +287,16 @@
},
{
"name": "egulias/email-validator",
"version": "2.1.10",
"version": "2.1.11",
"source": {
"type": "git",
"url": "https://github.com/egulias/EmailValidator.git",
"reference": "a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec"
"reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec",
"reference": "a6c8d7101b19a451c1707b1b79bbbc56e4bdb7ec",
"url": "https://api.github.com/repos/egulias/EmailValidator/zipball/92dd169c32f6f55ba570c309d83f5209cefb5e23",
"reference": "92dd169c32f6f55ba570c309d83f5209cefb5e23",
"shasum": ""
},
"require": {
@ -315,7 +315,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.0.x-dev"
"dev-master": "2.1.x-dev"
}
},
"autoload": {
@ -341,7 +341,7 @@
"validation",
"validator"
],
"time": "2019-07-19T20:52:08+00:00"
"time": "2019-08-13T17:33:27+00:00"
},
{
"name": "erusev/parsedown",
@ -825,16 +825,16 @@
},
{
"name": "laravel/framework",
"version": "v5.8.31",
"version": "v5.8.32",
"source": {
"type": "git",
"url": "https://github.com/laravel/framework.git",
"reference": "24cc1786bd55876fa52380306354772355345efd"
"reference": "ee16d719516dfd77ed6c9538000bca49ded284e2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/framework/zipball/24cc1786bd55876fa52380306354772355345efd",
"reference": "24cc1786bd55876fa52380306354772355345efd",
"url": "https://api.github.com/repos/laravel/framework/zipball/ee16d719516dfd77ed6c9538000bca49ded284e2",
"reference": "ee16d719516dfd77ed6c9538000bca49ded284e2",
"shasum": ""
},
"require": {
@ -968,7 +968,7 @@
"framework",
"laravel"
],
"time": "2019-08-06T15:09:02+00:00"
"time": "2019-08-13T14:11:52+00:00"
},
{
"name": "laravel/passport",
@ -1042,16 +1042,16 @@
},
{
"name": "laravel/tinker",
"version": "v1.0.9",
"version": "v1.0.10",
"source": {
"type": "git",
"url": "https://github.com/laravel/tinker.git",
"reference": "eb0075527fdeeb1cc1d68bd4ca7d50256b30a827"
"reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/laravel/tinker/zipball/eb0075527fdeeb1cc1d68bd4ca7d50256b30a827",
"reference": "eb0075527fdeeb1cc1d68bd4ca7d50256b30a827",
"url": "https://api.github.com/repos/laravel/tinker/zipball/ad571aacbac1539c30d480908f9d0c9614eaf1a7",
"reference": "ad571aacbac1539c30d480908f9d0c9614eaf1a7",
"shasum": ""
},
"require": {
@ -1101,7 +1101,7 @@
"laravel",
"psysh"
],
"time": "2019-07-29T18:09:25+00:00"
"time": "2019-08-07T15:10:45+00:00"
},
{
"name": "lcobucci/jwt",
@ -1501,16 +1501,16 @@
},
{
"name": "nesbot/carbon",
"version": "2.22.3",
"version": "2.23.0",
"source": {
"type": "git",
"url": "https://github.com/briannesbitt/Carbon.git",
"reference": "738fbd8d80b2c5e158fda76c29c2de432fcc6f7e"
"reference": "97a08830a22ce0b69549a4966773c0eae900468d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/738fbd8d80b2c5e158fda76c29c2de432fcc6f7e",
"reference": "738fbd8d80b2c5e158fda76c29c2de432fcc6f7e",
"url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/97a08830a22ce0b69549a4966773c0eae900468d",
"reference": "97a08830a22ce0b69549a4966773c0eae900468d",
"shasum": ""
},
"require": {
@ -1557,27 +1557,27 @@
"homepage": "http://github.com/kylekatarnls"
}
],
"description": "A simple API extension for DateTime.",
"description": "A API extension for DateTime that supports 281 different languages.",
"homepage": "http://carbon.nesbot.com",
"keywords": [
"date",
"datetime",
"time"
],
"time": "2019-08-07T12:36:44+00:00"
"time": "2019-08-12T17:19:41+00:00"
},
{
"name": "nikic/php-parser",
"version": "v4.2.2",
"version": "v4.2.3",
"source": {
"type": "git",
"url": "https://github.com/nikic/PHP-Parser.git",
"reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420"
"reference": "e612609022e935f3d0337c1295176505b41188c8"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
"reference": "1bd73cc04c3843ad8d6b0bfc0956026a151fc420",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/e612609022e935f3d0337c1295176505b41188c8",
"reference": "e612609022e935f3d0337c1295176505b41188c8",
"shasum": ""
},
"require": {
@ -1585,7 +1585,7 @@
"php": ">=7.0"
},
"require-dev": {
"phpunit/phpunit": "^6.5 || ^7.0"
"phpunit/phpunit": "^6.5 || ^7.0 || ^8.0"
},
"bin": [
"bin/php-parse"
@ -1615,7 +1615,7 @@
"parser",
"php"
],
"time": "2019-05-25T20:07:01+00:00"
"time": "2019-08-12T20:17:41+00:00"
},
{
"name": "nuwave/lighthouse",
@ -1623,21 +1623,12 @@
"source": {
"type": "git",
"url": "https://github.com/nuwave/lighthouse.git",
<<<<<<< HEAD
"reference": "e0ec15573f9907a3d67321a87100448d91059631"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nuwave/lighthouse/zipball/e0ec15573f9907a3d67321a87100448d91059631",
"reference": "e0ec15573f9907a3d67321a87100448d91059631",
=======
"reference": "f7dde6641d5ba69db9d6ce239db7163ad288e4b2"
"reference": "9c1f357ef7e61253444503216e72e90632933877"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nuwave/lighthouse/zipball/f7dde6641d5ba69db9d6ce239db7163ad288e4b2",
"reference": "f7dde6641d5ba69db9d6ce239db7163ad288e4b2",
>>>>>>> dab2c0b5711e2d9fae5f7440da1580b4ea72b4a7
"url": "https://api.github.com/repos/nuwave/lighthouse/zipball/9c1f357ef7e61253444503216e72e90632933877",
"reference": "9c1f357ef7e61253444503216e72e90632933877",
"shasum": ""
},
"require": {
@ -1708,11 +1699,7 @@
"laravel",
"laravel-graphql"
],
<<<<<<< HEAD
"time": "2019-08-07T12:17:50+00:00"
=======
"time": "2019-08-08T15:18:05+00:00"
>>>>>>> dab2c0b5711e2d9fae5f7440da1580b4ea72b4a7
"time": "2019-08-15T11:26:55+00:00"
},
{
"name": "nwidart/laravel-modules",
@ -4068,7 +4055,7 @@
"dist": {
"type": "path",
"url": "./modules/wm-common",
"reference": "fa8225030b6ba1b6cb94bd959eb0ccdb224b726b"
"reference": "900acb33c83f1ace99e1a3f0317fdfdc76207de7"
},
"require": {
"illuminate/support": "5.8.*",
@ -4108,7 +4095,7 @@
"dist": {
"type": "path",
"url": "./modules/wm-core",
"reference": "eb939430ebb1bc7f2322b4d70383ebe8f7432e0c"
"reference": "4ea87c7a156cf3da039cc9128afce783deba2c5e"
},
"require": {
"illuminate/support": "^5.4",
@ -4152,7 +4139,7 @@
"dist": {
"type": "path",
"url": "./modules/wm-crm",
"reference": "a2324a5ec62209ba4f6680b1036a1ed989634ab2"
"reference": "f79d8cc14ea24a2b98fd3159bbd7a027d22402a1"
},
"require": {
"illuminate/support": "5.8.*",
@ -4193,7 +4180,7 @@
"dist": {
"type": "path",
"url": "./modules/wm-reservation",
"reference": "efc73be821c7a1027caa8095c21121325182627a"
"reference": "032d8c064ee8038661df316a995f908dccbe9ede"
},
"require": {
"illuminate/support": "5.8.*",
@ -4297,22 +4284,22 @@
"packages-dev": [
{
"name": "beyondcode/laravel-dump-server",
"version": "1.2.2",
"version": "1.3.0",
"source": {
"type": "git",
"url": "https://github.com/beyondcode/laravel-dump-server.git",
"reference": "8864b9efcb48e0a79e83014dd7f0a5481f5c808f"
"reference": "fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/8864b9efcb48e0a79e83014dd7f0a5481f5c808f",
"reference": "8864b9efcb48e0a79e83014dd7f0a5481f5c808f",
"url": "https://api.github.com/repos/beyondcode/laravel-dump-server/zipball/fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a",
"reference": "fcc88fa66895f8c1ff83f6145a5eff5fa2a0739a",
"shasum": ""
},
"require": {
"illuminate/console": "5.6.*|5.7.*|5.8.*",
"illuminate/http": "5.6.*|5.7.*|5.8.*",
"illuminate/support": "5.6.*|5.7.*|5.8.*",
"illuminate/console": "5.6.*|5.7.*|5.8.*|^6.0",
"illuminate/http": "5.6.*|5.7.*|5.8.*|^6.0",
"illuminate/support": "5.6.*|5.7.*|5.8.*|^6.0",
"php": "^7.1",
"symfony/var-dumper": "^4.1.1"
},
@ -4343,9 +4330,9 @@
"authors": [
{
"name": "Marcel Pociot",
"role": "Developer",
"email": "marcel@beyondco.de",
"homepage": "https://beyondcode.de",
"role": "Developer"
"homepage": "https://beyondco.de"
}
],
"description": "Symfony Var-Dump Server for Laravel",
@ -4354,7 +4341,7 @@
"beyondcode",
"laravel-dump-server"
],
"time": "2018-10-04T07:22:24+00:00"
"time": "2019-08-11T13:17:40+00:00"
},
{
"name": "doctrine/instantiator",
@ -4638,16 +4625,16 @@
},
{
"name": "myclabs/deep-copy",
"version": "1.9.1",
"version": "1.9.3",
"source": {
"type": "git",
"url": "https://github.com/myclabs/DeepCopy.git",
"reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72"
"reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
"reference": "e6828efaba2c9b79f4499dae1d66ef8bfa7b2b72",
"url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/007c053ae6f31bba39dfa19a7726f56e9763bbea",
"reference": "007c053ae6f31bba39dfa19a7726f56e9763bbea",
"shasum": ""
},
"require": {
@ -4682,7 +4669,7 @@
"object",
"object graph"
],
"time": "2019-04-07T13:18:21+00:00"
"time": "2019-08-09T12:45:53+00:00"
},
{
"name": "nunomaduro/collision",
@ -5621,16 +5608,16 @@
},
{
"name": "sebastian/exporter",
"version": "3.1.0",
"version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/exporter.git",
"reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
"reference": "06a9a5947f47b3029d76118eb5c22802e5869687"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
"reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
"url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/06a9a5947f47b3029d76118eb5c22802e5869687",
"reference": "06a9a5947f47b3029d76118eb5c22802e5869687",
"shasum": ""
},
"require": {
@ -5657,6 +5644,10 @@
"BSD-3-Clause"
],
"authors": [
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
"name": "Jeff Welch",
"email": "whatthejeff@gmail.com"
@ -5665,17 +5656,13 @@
"name": "Volker Dusch",
"email": "github@wallbash.com"
},
{
"name": "Bernhard Schussek",
"email": "bschussek@2bepublished.at"
},
{
"name": "Sebastian Bergmann",
"email": "sebastian@phpunit.de"
},
{
"name": "Adam Harvey",
"email": "aharvey@php.net"
},
{
"name": "Bernhard Schussek",
"email": "bschussek@gmail.com"
}
],
"description": "Provides the functionality to export PHP variables for visualization",
@ -5684,7 +5671,7 @@
"export",
"exporter"
],
"time": "2017-04-03T13:19:02+00:00"
"time": "2019-08-11T12:43:14+00:00"
},
{
"name": "sebastian/global-state",

4207
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -36,22 +36,24 @@
"vue-router": "^3.0.2",
"vue-scroll-reveal": "^1.0.11",
"vue-tinymce-editor": "^1.6.2",
"vuetify": "^1.5.14"
"vuetify": "^2.0.7"
},
"devDependencies": {
"@babel/plugin-syntax-dynamic-import": "^7.2.0",
"popper.js": "^2.0.0-next.4",
"@mdi/font": "^3.3.92",
"@mdi/font": "^3.9.97",
"cross-env": "^5.1",
"deepmerge": "^4.0.0",
"fibers": "^4.0.1",
"jquery": "^3.4.1",
"laravel-mix": "^4.0.15",
"material-design-icons-iconfont": "^4.0.3",
"node-sass": "^4.12.0",
"popper.js": "^2.0.0-next.4",
"pug": "^2.0.3",
"pug-loader": "^2.4.0",
"pug-plain-loader": "^1.0.0",
"sass": "^1.15.2",
"sass-loader": "^7.1.0",
"sass": "^1.22.10",
"sass-loader": "^7.2.0",
"vue": "^2.6.10",
"vue-meta": "^1.5.2",
"vue-resource": "^1.5.1",

@ -1,7 +1,7 @@
{
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=f01c1b5058842989bda8",
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=2a67932b9f1c2c43df90",
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=cbbc762df1ddb670242b",
"/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=262f8b64cafdb30a40eb",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=9a0599de25555c864f98"
"/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=33001392201ae0f42372",
"/js/vue/Home/app.js": "/js/vue/Home/app.js?id=c3ccac4b15730dccc8e3",
"/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=cdac25dd2b200b7ae427",
"/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=f38c71149907de6610e7",
"/js/vue/User/app.js": "/js/vue/User/app.js?id=27f0766e350de4b93f65"
}

@ -13,7 +13,7 @@
</v-container>
<v-navigation-drawer v-model="drawer" app temporary right>
<v-list class="pa-1">
<!-- <v-list class="pa-1">
<v-list-tile avatar>
<v-list-tile-avatar>
<img src="https://randomuser.me/api/portraits/men/85.jpg">
@ -30,7 +30,7 @@
</a>
</v-list-tile-content>
</v-list-tile>
</v-list>
</v-list> -->
<v-list class="pt-0" dense>
<v-divider class="Divider"></v-divider>

@ -38,6 +38,7 @@
border-radius: 5px;
margin: 3px 0px 10px 0px;
}
.Context {
font-family: BYekan-Edited, Montserrat-Regular !important;
}
@ -60,6 +61,7 @@
/* --------------------------------------------------------
Price :: Begin
-------------------------------------------------------- */
.Price {
text-align: left;
direction: ltr;
@ -77,20 +79,23 @@
text-decoration-color: #ee3552;
color: #ee3552;
margin-top: -5px;
}
/* --------------------------------------------------------
Others :: Begin
-------------------------------------------------------- */
.zIndex99 {
z-index: 99;
}
.has-blur {
-webkit-filter: blur(5px);
transition: 0.5s -webkit-filter linear;
}
/* --------------------------------------------------------
Navigation :: Begin
-------------------------------------------------------- */
@ -103,7 +108,6 @@
margin: 0 1em;
position: fixed;
top: 1em;
.WM-Nav {
padding: 0.8em 1em;
list-style: none;
@ -133,6 +137,7 @@
vertical-align: middle;
}
/* --------------------------------------------------------
Blocks :: Begin
-------------------------------------------------------- */
@ -145,7 +150,6 @@
color: $Gray;
}
.WM-Section {
padding: 10px 10px;
margin: 10px 0px;
@ -168,6 +172,7 @@
.WM-Section .Title .FA {
font-size: 22px;
line-height: 1.5;
}
.WM-Section .Title .EN {
@ -181,19 +186,17 @@
position: relative;
}
.hasConfig .v-autocomplete {
width:calc(100% - 40px);
float:right;
width: calc(100% - 40px);
float: right;
}
.hasConfig .v-btn {
float: right;
margin-top: 20px;
margin-right: 5px;
}
.WM-Pointer {
cursor: pointer;
}
}

@ -2,6 +2,16 @@
padding: 0em 0;
}
.v-application {
font-family: "BYekan", "Montserrat-Regular" !important;
font-weight: 100;
}
.container {
width: 100%;
max-width: 100%;
}
// a {
// color:#000 !important;
// }
@ -155,9 +165,10 @@ table.v-table tbody td {
.v-btn {
margin: 6px 2px;
transition: 0.4s
}
.v-btn--floating.v-btn--small .v-icon {
.v-btn--fab.v-btn--small .v-icon {
font-size: 16px;
}
@ -170,6 +181,24 @@ table.v-table tbody td {
font-size: 14px;
}
.v-btn.S {
width: 40px;
height: 40px;
}
.v-btn.S .v-icon {
font-size: 20px;
}
.v-btn.M {
width: 50px;
height: 50px;
}
.v-btn.M .v-icon {
font-size: 25px;
}
.v-tooltip .v-btn--outline:hover .v-icon,
.v-tooltip .v-btn--outline:focus .v-icon {
color: #fff;
@ -196,11 +225,11 @@ table.v-table tbody td {
@each $Color,
$Value in $colors {
.#{$Color} {
.v-application .#{$Color} {
background-color: $Value !important;
border-color: $Value !important;
}
.#{$Color}--text {
.v-application .#{$Color}--text {
color: $Value !important;
caret-color: $Value !important;
}
@ -208,7 +237,7 @@ $Value in $colors {
@each $Shadow,
$Value in $Shadows {
.v-btn.v-btn--floating.#{$Shadow} {
.v-application .v-btn.v-btn--fab.#{$Shadow} {
box-shadow: 0 10px 30px 0px $Value;
-moz-box-shadow: 0 10px 30px 0px $Value;
-webkit-box-shadow: 0 10px 30px 0px $Value;
@ -217,13 +246,46 @@ $Value in $Shadows {
}
}
.v-btn--floating.v-btn--active,
.v-btn--floating.v-btn:focus,
.v-btn--floating.v-btn:hover {
.v-application .v-btn--fab:not(.v-btn--outlined).v-btn--active,
.v-application .v-btn--fab:not(.v-btn--outlined).v-btn:focus,
.v-application .v-btn--fab:not(.v-btn--outlined).v-btn:hover {
background-color: #000 !important;
color: #fff !important;
box-shadow: 0 10px 30px 0px $BlackShadow;
-moz-box-shadow: 0 10px 30px 0px $BlackShadow;
-webkit-box-shadow: 0 10px 30px 0px $BlackShadow;
-o-box-shadow: 0 10px 30px 0px $BlackShadow;
-ms-box-shadow: 0 10px 30px 0px $BlackShadow;
}
.v-btn--fab.v-size--small .v-icon {
font-size: 16px;
}
.v-application--is-rtl .v-chip--pill .v-avatar--left {
margin-right: -24px;
}
.v-list {
text-align: right;
}
.v-application .primary--text {
color: #525252 !important;
}
.v-btn {
letter-spacing: 0;
}
.v-application a {
color: #000;
}
.theme--light.v-card>.v-card__text {
color: rgba(0, 0, 0, .7);
}
.v-snack {
font-size: 16px;
}

@ -3,15 +3,17 @@ import App from './App.vue'
import router from './router'
import store from './store'
import VueScrollReveal from 'vue-scroll-reveal'
import Vuetify from 'vuetify'
// import Vuetify from 'vuetify'
import { global } from '../Global/mixins/global';
// import Vuetify from 'vuetify/lib'
import vuetify from '@JS/Plugin/vuetify'
import 'popper.js'
import 'bootstrap-v4-rtl'
import 'bootstrap-v4-rtl/scss/bootstrap-rtl.scss'
import 'bootstrap-select'
import 'bootstrap-select/dist/css/bootstrap-select.css'
import 'vuetify/dist/vuetify.min.css' // Ensure you are using css-loader
// import 'vuetify/dist/vuetify.min.css' // Ensure you are using css-loader
import '@Global/assets/Font-Icons/css/fontello.css'
import "@Global/scss/style.scss"
@ -63,10 +65,10 @@ window.Vue = require('vue');
*/
Vue.use(Vuetify, {
iconfont: 'fa',
rtl: true,
});
// Vue.use(Vuetify, {
// iconfont: 'fa',
// rtl: true,
// });
// Vue.config.productionTip = false;
Vue.use(VueScrollReveal, {
@ -90,5 +92,6 @@ if (TokenService.getToken()) {
const app = new Vue({
router,
store,
vuetify,
render: h => h(App),
}).$mount('#app');
}).$mount('#app');

@ -0,0 +1,11 @@
import Vue from 'vue'
import Vuetify from 'vuetify'
import 'vuetify/dist/vuetify.min.css'
Vue.use(Vuetify)
export default new Vuetify({
icons: {
iconfont: 'fa', // 'mdi' || 'mdiSvg' || 'md' || 'fa' || 'fa4'
},
rtl: true,
})

1
webpack.config.js vendored

@ -28,4 +28,3 @@ let WebpackConfig = require('./node_modules/laravel-mix/src/builder/WebpackConfi
module.exports = new WebpackConfig().build();

3
webpack.mix.js vendored

@ -1,5 +1,4 @@
const mix = require('laravel-mix');
/*
|--------------------------------------------------------------------------
| Mix Asset Management
@ -34,4 +33,4 @@ require('./modules/wm-crm/webpack.mix');
require('./modules/wm-reservation/webpack.mix');
mix.version();
mix.version();

Loading…
Cancel
Save