-
-
WMi-{{ item.icon }}
+
+ WMi-{{ item[itemIcon] }}
-
{{ item.title_fa }}
-
{{ item.title_en }}
+
{{ item[itemText] }}
+
{{ item[itemTextEn] }}
-
+
@@ -22,13 +22,27 @@
props: {
items: {default: () => ([])},
value: {default: null},
+ itemValue: {default: 'id'},
+ itemTheme: {default: 'theme'},
+ itemColor: {default: 'color'},
+ itemText: {default: 'title_fa'},
+ itemIcon: {default: 'icon'},
+ itemTextEn: {default: 'title_en'},
+ itemSize: {default: 'size'},
+ itemIconClass: {default: 'customIconClass'},
+ itemDesc: {default: 'desc'},
multiple: {default: false},
name: {default: 'default_name'},
theme: String,
},
- data() {
- return {
- currentSelect: this.value,
+ computed: {
+ currentSelect: {
+ get() {
+ return this.value;
+ },
+ set(value) {
+ this.$emit('input', value);
+ }
}
},
methods: {
@@ -43,30 +57,28 @@
if (!Array.isArray(this.currentSelect)) {
this.currentSelect = [];
}
- if (this.currentSelect.includes(item.id)) {
- const index = this.currentSelect.findIndex(x => x === item.id);
+ if (this.currentSelect.includes(item[this.itemValue])) {
+ const index = this.currentSelect.findIndex(x => x === item[this.itemValue]);
this.currentSelect.splice(index, 1);
} else {
- this.currentSelect.push(item.id);
+ this.currentSelect.push(item[this.itemValue]);
}
let items = [];
for (let value of this.items.filter(x => this.currentSelect.includes(x.id))) {
items.push({'name': this.name, 'value': value.value});
}
this.$emit('changeState', items);
- this.$emit('input', this.currentSelect);
},
changeSelectedSingle(item) {
- this.currentSelect = item.id;
+ this.currentSelect = item[this.itemValue];
this.$emit('changeState', {'name':this.name,'value': item.value});
- this.$emit('input', this.currentSelect);
},
isActive(item) {
if (this.multiple) {
- return this.value && Array.isArray(this.value) ? this.value.includes(item.id) : (Array.isArray(this.currentSelect) ? this.currentSelect.includes(item.id) : false );
+ return this.value && Array.isArray(this.value) ? this.value.includes(item[this.itemValue]) : (Array.isArray(this.currentSelect) ? this.currentSelect.includes(item[this.itemValue]) : false );
} else {
- return this.value ? this.value === item.id : item.id === this.currentSelect
+ return this.value ? this.value === item[this.itemValue] : item[this.itemValue] === this.currentSelect
}
}
}
diff --git a/resources/js/Global/components/Modals/BasicModal.vue b/resources/js/Global/components/Modals/BasicModal.vue
new file mode 100644
index 0000000..76534f3
--- /dev/null
+++ b/resources/js/Global/components/Modals/BasicModal.vue
@@ -0,0 +1,38 @@
+
+
+
+
+
+
+
+
diff --git a/resources/js/Global/mixins/commingSoon.js b/resources/js/Global/mixins/commingSoon.js
index f037fe8..cd8eac2 100644
--- a/resources/js/Global/mixins/commingSoon.js
+++ b/resources/js/Global/mixins/commingSoon.js
@@ -8,6 +8,7 @@ var CommingSoonArray = [
"portfolio-statistics",
"blog-statistics",
"blog-post",
+ "client_export"
];
const commingSoon = {
methods: {
diff --git a/resources/js/Global/scss/Icons/css/fontello.css b/resources/js/Global/scss/Icons/css/fontello.css
index bdfd9ef..f86c89d 100644
--- a/resources/js/Global/scss/Icons/css/fontello.css
+++ b/resources/js/Global/scss/Icons/css/fontello.css
@@ -6,6 +6,7 @@
url('../font/fontello.woff?22850035') format('woff'),
url('../font/fontello.ttf?22850035') format('truetype'),
url('../font/fontello.svg?22850035#fontello') format('svg');
+
font-weight: normal;
font-style: normal;
}
@@ -15,46 +16,50 @@
@media screen and (-webkit-min-device-pixel-ratio:0) {
@font-face {
font-family: 'fontello';
+<<<<<<< HEAD
src: url('../font/fontello.svg?22850035#fontello') format('svg');
+=======
+ src: url('../font/fontello.svg?18248585#fontello') format('svg');
+>>>>>>> dev
}
}
*/
-
+
[class^="WMi-"]:before, [class*=" WMi-"]:before {
font-family: "fontello";
font-style: normal;
font-weight: normal;
speak: never;
-
+
display: inline-block;
text-decoration: inherit;
width: 1em;
margin-right: .2em;
text-align: center;
/* opacity: .8; */
-
+
/* For safety - reset parent styles, that can break glyph codes*/
font-variant: normal;
text-transform: none;
-
+
/* fix buttons height, for twitter bootstrap */
line-height: 1em;
-
+
/* Animation center compensation - margins should be symmetric */
/* remove if not needed */
margin-left: .2em;
-
+
/* you can be more comfortable with increased icons size */
/* font-size: 120%; */
-
+
/* Font smoothing. That was taken from TWBS */
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-
+
/* Uncomment for 3D effect */
/* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
}
-
+
.WMi-ok:before { content: '\e800'; } /* '' */
.WMi-picture:before { content: '\e801'; } /* '' */
.WMi-search:before { content: '\e802'; } /* '' */
@@ -544,6 +549,7 @@
.WMi-ladder:before { content: '\f5ea'; } /* '' */
.WMi-list-1:before { content: '\f5ec'; } /* '' */
.WMi-telegram-2:before { content: '\f5ed'; } /* '' */
+<<<<<<< HEAD
.WMi-willa-engine:before { content: '\f5ee'; } /* '' */
.WMi-en-letters:before { content: '\f5f0'; } /* '' */
.WMi-fa-letters:before { content: '\f5f1'; } /* '' */
@@ -556,6 +562,8 @@
.WMi-chat-1:before { content: '\f5fa'; } /* '' */
.WMi-chat-alt:before { content: '\f5fb'; } /* '' */
.WMi-send-message:before { content: '\f5fc'; } /* '' */
+=======
+>>>>>>> dev
.WMi-oil-can:before { content: '\f613'; } /* '' */
.WMi-account-settings-variant:before { content: '\f631'; } /* '' */
.WMi-truck-monster:before { content: '\f63b'; } /* '' */
@@ -594,4 +602,4 @@
.WMi-sort-alpha-up-alt:before { content: '\f882'; } /* '' */
.WMi-sort-amount-down-alt:before { content: '\f884'; } /* '' */
.WMi-sort-amount-up-alt:before { content: '\f885'; } /* '' */
-.WMi-mouse:before { content: '\f8cc'; } /* '' */
\ No newline at end of file
+.WMi-mouse:before { content: '\f8cc'; } /* '' */
diff --git a/resources/js/Global/scss/_vars.scss b/resources/js/Global/scss/_vars.scss
index 38c62d4..ec691b8 100644
--- a/resources/js/Global/scss/_vars.scss
+++ b/resources/js/Global/scss/_vars.scss
@@ -11,12 +11,12 @@ $OrangeBackground: #fff9f8;
//--------------------------------------------Yellow
$Yellow: #ffc107;
$YellowShadow:rgba(234, 223, 131, 0.5);
-$YellowBackground: #ffe5e9;
+$YellowBackground: #fff3de;
//--------------------------------------------Gold
$Gold: #ddcfbb;
$GoldShadow:rgba(234, 223, 131, 0.5);
-$GoldBackground: #ffe5e9;
+$GoldBackground: #fffaf4;
//--------------------------------------------Purple
$Purple:#ac3773;
diff --git a/resources/js/Global/utils/common/CreateFilterObject.js b/resources/js/Global/utils/common/CreateFilterObject.js
index d0cf7a0..1e0ede6 100644
--- a/resources/js/Global/utils/common/CreateFilterObject.js
+++ b/resources/js/Global/utils/common/CreateFilterObject.js
@@ -34,14 +34,14 @@ window['between'] = function (filter) {
window['greater'] = function (filter) {
var value = null;
if (filter.val) {
- value = `(ge)${filter.val1}`;
+ value = `(ge)${filter.val}`;
}
return value;
}
window['less'] = function (filter) {
var value = null;
if (filter.val) {
- value = `(le)${filter.val1}`;
+ value = `(le)${filter.val}`;
}
return value;
}