diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 8068333..b533be1 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,7 +1,7 @@
{
- "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=6c45b94df33523eac4ae",
- "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=70fadcb63bc6b91314e4",
- "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=5707b0c70e7e00d7f7aa",
- "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=d8b99f78c445a5dcfabd",
- "/js/vue/User/app.js": "/js/vue/User/app.js?id=e0438d523387e91845cb"
+ "/js/vue/Authentication/app.js": "/js/vue/Authentication/app.js?id=7bcc6b07d73a7435f929",
+ "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=2235a5a60b590f61e506",
+ "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=15ec1fe3113b14cf8538",
+ "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=dd8734e05a3ffd1bd1e1",
+ "/js/vue/User/app.js": "/js/vue/User/app.js?id=70815b03dc8d415b66b9"
}
diff --git a/resources/js/Global/components/FormLoader/Elements/wm-form.vue b/resources/js/Global/components/FormLoader/Elements/wm-form.vue
index 400b202..ae7b6aa 100644
--- a/resources/js/Global/components/FormLoader/Elements/wm-form.vue
+++ b/resources/js/Global/components/FormLoader/Elements/wm-form.vue
@@ -3,7 +3,7 @@
{{element.label}}
-
+
@@ -18,6 +18,11 @@ export default {
element: {
type: Object,
required: true
+ },
+ values: {
+ type: Object,
+ required: false,
+ default: {}
}
}
};
diff --git a/resources/js/Global/components/FormLoader/Elements/wm-number_input.vue b/resources/js/Global/components/FormLoader/Elements/wm-number_input.vue
index d56e5e7..a9a534d 100644
--- a/resources/js/Global/components/FormLoader/Elements/wm-number_input.vue
+++ b/resources/js/Global/components/FormLoader/Elements/wm-number_input.vue
@@ -9,6 +9,7 @@
:append-icon="element.append_icon"
:prepend-icon="element.prepend_icon"
:class="element.width"
+ v-model="values['input_'+element.id]"
>
@@ -17,6 +18,11 @@ export default {
props:{
element:{
type: Object
+ },
+ values: {
+ required: false,
+ default: {},
+ type: Object,
}
},
watch:{
diff --git a/resources/js/Global/components/FormLoader/Elements/wm-switch.vue b/resources/js/Global/components/FormLoader/Elements/wm-switch.vue
index 39fa8e4..4b038be 100644
--- a/resources/js/Global/components/FormLoader/Elements/wm-switch.vue
+++ b/resources/js/Global/components/FormLoader/Elements/wm-switch.vue
@@ -7,6 +7,7 @@
:color="element.color"
:append-icon="element.append_icon"
:prepend-icon="element.prepend_icon"
+ v-model="values['input_'+element.id]"
>
@@ -15,6 +16,11 @@ export default {
props:{
element:{
type: Object
+ },
+ values: {
+ required: false,
+ type: Object,
+ default: {}
}
}
}
diff --git a/resources/js/Global/components/FormLoader/Elements/wm-text_input.vue b/resources/js/Global/components/FormLoader/Elements/wm-text_input.vue
index 7922436..83621ec 100644
--- a/resources/js/Global/components/FormLoader/Elements/wm-text_input.vue
+++ b/resources/js/Global/components/FormLoader/Elements/wm-text_input.vue
@@ -8,6 +8,7 @@
:append-icon="element.append_icon"
:prepend-icon="element.prepend_icon"
:class="element.width"
+ v-model="values['input_' + element.id]"
>
@@ -16,14 +17,12 @@ export default {
props:{
element:{
type: Object
+ },
+ values: {
+ required: false,
+ default: {}
}
},
- watch:{
- element(){
- console.log(this.element);
-
- }
- }
}
\ No newline at end of file
diff --git a/resources/js/Global/components/FormLoader/Elements/wm-textarea.vue b/resources/js/Global/components/FormLoader/Elements/wm-textarea.vue
index 2bd0a2c..ecd8372 100644
--- a/resources/js/Global/components/FormLoader/Elements/wm-textarea.vue
+++ b/resources/js/Global/components/FormLoader/Elements/wm-textarea.vue
@@ -8,6 +8,7 @@
:append-icon="element.append_icon"
:prepend-icon="element.prepend_icon"
:class="element.width"
+ v-model="values['input_'+element.id]"
>
@@ -15,7 +16,12 @@
export default {
props:{
element:{
- type: Object
+ type: Object,
+ },
+ values: {
+ type: Object,
+ required: false,
+ default: {}
}
}
}
diff --git a/resources/js/Global/components/FormLoader/FactoryPattern.vue b/resources/js/Global/components/FormLoader/FactoryPattern.vue
index 1efd97c..c61a549 100644
--- a/resources/js/Global/components/FormLoader/FactoryPattern.vue
+++ b/resources/js/Global/components/FormLoader/FactoryPattern.vue
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/resources/js/Global/mixins/global.js b/resources/js/Global/mixins/global.js
index 867432e..ff8c943 100644
--- a/resources/js/Global/mixins/global.js
+++ b/resources/js/Global/mixins/global.js
@@ -6,7 +6,8 @@ import { UserService } from "@Global/services/storage.services";
const global = {
methods: {
$_getPath(subPath) {
- return "/" + subPath;
+ const path = process.env.MIX_PUSHER_APP_PUBLIC_PATH ? process.env.MIX_PUSHER_APP_PUBLIC_PATH : '/';
+ return path + subPath;
},
//Modal
diff --git a/resources/js/Global/plugins/globalComponent.js b/resources/js/Global/plugins/globalComponent.js
index 19351ac..022ba4f 100644
--- a/resources/js/Global/plugins/globalComponent.js
+++ b/resources/js/Global/plugins/globalComponent.js
@@ -1,15 +1,15 @@
import Vue from 'vue';
-import VueScrollReveal from "vue-scroll-reveal";
+// import VueScrollReveal from "vue-scroll-reveal";
import Vuetify from '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 "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 "@Global/assets/Font-Icons/css/fontello.css";
import "@Global/scss/style.scss";
@@ -22,13 +22,13 @@ import InfoBlock from "@Global/components/Misc/InfoBlock.vue";
import Breadcrumbs from "@Global/components/Misc/Breadcrumbs";
-Vue.use(VueScrollReveal, {
- class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
- duration: 800,
- scale: 1,
- distance: '10px',
- mobile: false
-});
+// Vue.use(VueScrollReveal, {
+// class: 'v-scroll-reveal', // A CSS class applied to elements with the v-scroll-reveal directive; useful for animation overrides.
+// duration: 800,
+// scale: 1,
+// distance: '10px',
+// mobile: false
+// });
Vue.use(Vuetify, {
iconfont: "fa",
diff --git a/resources/js/Global/services/api.services.js b/resources/js/Global/services/api.services.js
index d53ecdc..2375528 100644
--- a/resources/js/Global/services/api.services.js
+++ b/resources/js/Global/services/api.services.js
@@ -4,10 +4,11 @@ import commonState from '@Global/store/modules/common/state';
const ApiService = {
init(baseURL = null) {
- axios.defaults.baseURL = "https://www.willaengine.ir";
- // if (baseURL) {
- // axios.defaults.baseURL = baseURL;
- // }
+ if (baseURL) {
+ axios.defaults.baseURL = baseURL;
+ } else if (process.env.MIX_PUSHER_APP_API) {
+ axios.defaults.baseURL = process.env.MIX_PUSHER_APP_API;
+ }
axios.interceptors.request.use((config) => {
config.headers = this.setModuleHeader(config.headers);
diff --git a/resources/js/Home/views/Home.vue b/resources/js/Home/views/Home.vue
index be73c78..64eb068 100644
--- a/resources/js/Home/views/Home.vue
+++ b/resources/js/Home/views/Home.vue
@@ -23,7 +23,7 @@
fas fa-plus
-
+
@@ -31,13 +31,13 @@