diff --git a/public/mix-manifest.json b/public/mix-manifest.json index fdd620c..ed4cf8f 100644 --- a/public/mix-manifest.json +++ b/public/mix-manifest.json @@ -1,9 +1,10 @@ { - "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=27d967e80fc80e1d9c8d", - "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=deb097579f7f0e5b6cab", - "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=5c7df197aef43b46db82", - "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=25005c8d71681e88190f", - "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=c172d60c19256f635f3f", - "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=ebdd5862381a31a60a0f", - "/js/vue/User/app.js": "/js/vue/User/app.js?id=19ab3ce48ff13c104ed9" + "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=bdb019075751400113d2", + "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=06f2fab586e56c93a083", + "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=0f2509ab2e6ee25fc143", + "/js/vue/Modules/Store/app.js": "/js/vue/Modules/Store/app.js?id=3d2c86d87800840b2999", + "/js/vue/Product/app.js": "/js/vue/Product/app.js?id=5febea49fd7f73ab9586", + "/js/vue/SMS/app.js": "/js/vue/SMS/app.js?id=2fe6a039549fc2425949", + "/js/vue/Service/app.js": "/js/vue/Service/app.js?id=28fb0a0bf9f0332144f1", + "/js/vue/User/app.js": "/js/vue/User/app.js?id=fa83f558736170b60e58" } diff --git a/resources/js/Global/components/Dividers/SectionTitle.vue b/resources/js/Global/components/Dividers/SectionTitle.vue new file mode 100644 index 0000000..a7bf05f --- /dev/null +++ b/resources/js/Global/components/Dividers/SectionTitle.vue @@ -0,0 +1,57 @@ + + + + + diff --git a/resources/js/Global/plugins/globalComponent.js b/resources/js/Global/plugins/globalComponent.js index 5c985a8..9bd5a3e 100644 --- a/resources/js/Global/plugins/globalComponent.js +++ b/resources/js/Global/plugins/globalComponent.js @@ -7,6 +7,7 @@ import "@Global/scss/style.scss"; // global Components import PartTitle from "@Global/components/Dividers/PartTitle.vue"; import PageTitle from "@Global/components/Dividers/PageTitle.vue"; +import SectionTitle from "@Global/components/Dividers/SectionTitle.vue"; import Checkbox from "@Global/components/Inputs/Checkbox.vue"; import InfoBlock from "@Global/components/Misc/InfoBlock.vue"; import Breadcrumbs from "@Global/components/Misc/Breadcrumbs"; @@ -16,6 +17,7 @@ import InfoMultiple from "@Global/components/Misc/InfoBlock-Multiple.vue"; Vue.component("WM-PartTitle", PartTitle); Vue.component("WM-PageTitle", PageTitle); +Vue.component("wm-section-title", SectionTitle); Vue.component("WM-Checkbox", Checkbox); Vue.component("wm-info-block", InfoBlock); Vue.component("wm-info-block-multiple", InfoMultiple); diff --git a/resources/js/Global/scss/Misc.scss b/resources/js/Global/scss/Misc.scss index e1f4080..7c3dc95 100644 --- a/resources/js/Global/scss/Misc.scss +++ b/resources/js/Global/scss/Misc.scss @@ -215,4 +215,26 @@ text-align: right; font-size: 22px; margin: 5px 0px; -} \ No newline at end of file +} + + +/* -------------------------------------------------------- + Float Buttons :: Begin +-------------------------------------------------------- */ + +.float-buttons-placeholder { + position: fixed; + left: 5%; + bottom: 5%; + z-index: 999; +} + +.float-buttons-placeholder .v-btn.XS { + margin-left: -15px; + margin-bottom: -25px; +} + + +/* -------------------------------------------------------- + Float Buttons :: End +-------------------------------------------------------- */ \ No newline at end of file diff --git a/resources/js/Global/scss/Modify.scss b/resources/js/Global/scss/Modify.scss index 56005d3..c6f6968 100644 --- a/resources/js/Global/scss/Modify.scss +++ b/resources/js/Global/scss/Modify.scss @@ -58,6 +58,10 @@ hr { transition: 0.2s; } +.v-chip { + margin-bottom: 2px; +} + .nav-tabs .nav-link:not(.active) .v-chip { background-color: #000 !important; border-color: #000 !important; @@ -100,6 +104,22 @@ $Value in $Colors { margin-left: 9px; } +.v-select--chips.v-autocomplete .v-label { + margin-top: 8px; +} + +.v-select--chips.v-autocomplete .v-input__prepend-outer { + margin-top: 10px; +} + +.v-select--chips.v-autocomplete .v-input__append-inner { + margin-top: 10px; +} + +.v-select--chips.v-autocomplete .v-label.v-label--active { + margin-top: 0px; +} + table.v-table thead th { font-size: 18px; text-align: right; diff --git a/resources/js/Home/views/AddModule.vue b/resources/js/Home/views/AddModule.vue index 23fba39..4c67476 100644 --- a/resources/js/Home/views/AddModule.vue +++ b/resources/js/Home/views/AddModule.vue @@ -36,7 +36,7 @@ fab :color="module.color_class" > - fas fa-history + WMi-history فعالسازی نسخه ی 15 روزه، آزمایشی @@ -51,7 +51,7 @@ dark v-on="on" > - fas fa-plus + WMi-plus خرید @@ -62,7 +62,7 @@ diff --git a/resources/js/Home/views/Home.vue b/resources/js/Home/views/Home.vue index 35e6f51..06f9234 100644 --- a/resources/js/Home/views/Home.vue +++ b/resources/js/Home/views/Home.vue @@ -20,7 +20,7 @@ - fas fa-plus + WMi-plus diff --git a/resources/views/Home.blade.php b/resources/views/Home.blade.php index 1eaeaed..9c24d61 100644 --- a/resources/views/Home.blade.php +++ b/resources/views/Home.blade.php @@ -5,7 +5,7 @@ {{-- --}} - Welcome 222 + Cliender IMS diff --git a/webpack.mix.js b/webpack.mix.js index de2b2a2..c20dd48 100644 --- a/webpack.mix.js +++ b/webpack.mix.js @@ -30,6 +30,7 @@ mix.js('resources/js/Home/app.js', 'public/js/vue/Home'); require('./modules/wm-core/webpack.mix'); require('./modules/wm-common/webpack.mix'); require('./modules/wm-crm/webpack.mix'); +require('./modules/wm-store/webpack.mix'); // require('./modules/wm-reservation/webpack.mix');