From 5b037a05e27fe464473aa97c8fc8ea247b1c8004 Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Sat, 14 Sep 2019 17:23:59 +0430
Subject: [PATCH] Form loader

---
 public/mix-manifest.json                      |  10 +-
 .../FormLoader/Elements/wm-form.vue           |   7 +-
 .../FormLoader/Elements/wm-number_input.vue   |   6 +
 .../FormLoader/Elements/wm-switch.vue         |   6 +
 .../FormLoader/Elements/wm-text_input.vue     |  11 +-
 .../FormLoader/Elements/wm-textarea.vue       |   8 +-
 .../components/FormLoader/FactoryPattern.vue  |   7 +-
 .../Global/components/FormLoader/Wrapper.vue  | 181 +++++++++++++++---
 resources/js/Global/mixins/global.js          |   3 +-
 .../js/Global/plugins/globalComponent.js      |  26 +--
 resources/js/Global/services/api.services.js  |   9 +-
 resources/js/Home/views/Home.vue              |   6 +-
 12 files changed, 217 insertions(+), 63 deletions(-)

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 @@
         <div style="padding:150px;">
         <h3>{{element.label}}</h3>
         <template v-if="element.children">
-            <element-factory v-for="(elm, key) in element.children" :element="elm" :key="key"></element-factory>
+            <element-factory v-for="(elm, key) in element.children" :values="values['input_'+element.id]" :element="elm" :key="key"></element-factory>
         </template>
         </div>
     </div>
@@ -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]"
 		></v-text-field>
     </div>
 </template>
@@ -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]"
         ></v-switch>
     </div>
 </template>
@@ -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]"
 		></v-text-field>
     </div>
 </template>
@@ -16,14 +17,12 @@ export default {
     props:{
         element:{
             type: Object
+        },
+        values: {
+            required: false,
+            default: {}
         }
     },
-    watch:{
-        element(){
-            console.log(this.element);
-            
-        }
-    }
 
 }
 </script>
\ 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]"
 		></v-textarea>
     </div>
 </template>
@@ -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 @@
 <template>
     <div>
-        <component v-bind:is="element.type" :element="element" ></component>
+        <component v-bind:is="element.type" :values="values" :element="element" ></component>
     </div>
 </template>
 <script>
@@ -20,6 +20,11 @@ export default {
         element:{
             type: Object,
             required: true
+        },
+        values: {
+            required: false,
+            type: Object,
+            default: {}
         }
     },
 }
diff --git a/resources/js/Global/components/FormLoader/Wrapper.vue b/resources/js/Global/components/FormLoader/Wrapper.vue
index f54aa53..897d3c7 100644
--- a/resources/js/Global/components/FormLoader/Wrapper.vue
+++ b/resources/js/Global/components/FormLoader/Wrapper.vue
@@ -1,34 +1,159 @@
 <template>
-    <div>
-        <element-factory v-for="(element, key) in elements" :element="element" :key="key"></element-factory>
-    </div>
+	<div>
+		<element-factory
+			v-for="(element, key) in elements"
+			:element="element"
+			:values="values"
+			:key="element.id"
+		></element-factory>
+		<button @click="register">click me</button>
+	</div>
 </template>
 <script>
-import Factory from './FactoryPattern'
+import Factory from "./FactoryPattern";
 export default {
-    components:{
-        'element-factory' : Factory
+	components: {
+		"element-factory": Factory
+	},
+	data: () => ({
+		elements: [
+			{
+				id: 1,
+				type: "wm-text_input",
+				width: "pa-2",
+				label: "Hi",
+				placeholder: "placeholder",
+				hint: "Hello",
+				color: "red"
+			},
+			{
+				id: 2,
+				type: "wm-form",
+				width: "pa-2",
+				label: "salam",
+				placeholder: "placeholder",
+				hint: "hint",
+				color: "red",
+				children: [
+					{
+						id: 3,
+						type: "wm-number_input",
+						width: "pa-2",
+						label: "salam",
+						placeholder: "placeholder",
+						hint: "hint",
+						color: "red"
+					},
+					{
+						id: 4,
+						type: "wm-form",
+						width: "pa-2",
+						label: "Form",
+						placeholder: "placeholder",
+						hint: "hint",
+						color: "red",
+						children: [
+							{
+								id: 5,
+								type: "wm-switch",
+								width: "pa-2",
+								label: "switch",
+								placeholder: "placeholder",
+								hint: "hint",
+								color: "red"
+							},
+							{
+								id: 6,
+								type: "wm-text_input",
+								width: "pa-2",
+								label: "salam",
+								placeholder: "placeholder",
+								hint: "hint",
+								color: "red"
+							}
+						]
+					},
+					{
+						id: 7,
+						type: "wm-text_input",
+						width: "pa-2",
+						label: "salam",
+						placeholder: "placeholder",
+						hint: "hint",
+						color: "red"
+					}
+				]
+			},
+			{
+				id: 8,
+				type: "wm-textarea",
+				width: "pa-2",
+				label: "salam",
+				placeholder: "placeholder",
+				hint: "hint",
+				color: "red"
+			},
+			{
+				id: 9,
+				type: "wm-text_input",
+				width: "pa-2",
+				label: "salam",
+				placeholder: "placeholder",
+				hint: "hint",
+				color: "red"
+			}
+		],
+		// values: {},
+		values:{
+		    'input_1': 'saeid',
+		    'input_2': {
+		        'input_3' : 5,
+		        'input_4' : {
+		            'input_5': 'true',
+		            'input_6': 'khobi'
+		        },
+		        'input_7': 'na',
+		    },
+		    'input_8': 'shoma khobi \n man khobam',
+		    'input_9': 'hossein',
+		}
+	}),
+	props: {
+		// elements: {
+		//     type: Array,
+		//     required: true
+		// },
+		// values:{
+		//     required: false
+		// }
+	},
+	methods: {
+		setDefaultValue(elements, values = {}) {
+			for (const key in elements) {
+				if (elements.hasOwnProperty(key)) {
+					if (elements[key].type == "wm-form") {
+                        values["input_" + elements[key].id] = this.setDefaultValue(elements[key].children);
+					} else {
+						values["input_" + elements[key].id] = "";
+					}
+				}
+            }
+            return values;
+		},
+		register(){
+			console.log(this.values);
+			
+		}
     },
-    data: () => ({
-        elements:[
-            {type:"wm-input", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red" },
-            {type: "wm-form", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red", children: [
-                {type:"wm-input", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red" },
-                {type:"wm-form", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red", children: [
-                    {type: "wm-input", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red"},
-                    {type: "wm-input", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red"},
-                ]},
-                {type:"wm-input", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red" },
-            ]},
-            {type:"wm-input", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red"},
-            {type:"wm-input", width: "pa-2", label:"salam", placeholder: "placeholder", hint:"hint", color:"red" },
-        ]
-    }),
-    props:{
-        // elements: {
-        //     type: Array,
-        //     required: true
-        // }
-    }
-}
+    created() {
+        // this.values = this.setDefaultValue(this.elements);
+    },
+	// watch: {
+	// 	values() {
+	// 		if (!this.values || this.values.length == 0) {
+    //             this.values = this.setDefaultValue(this.elements);
+	// 		}
+	// 	}
+	// }
+};
 </script>
\ 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 @@
                 <v-icon dark>fas fa-plus</v-icon>
             </v-btn>
         </router-link>
-        <!-- <wm-wrapper></wm-wrapper> -->
+        <wm-wrapper></wm-wrapper>
     </v-container>
 </template>
 
@@ -31,13 +31,13 @@
 
 <script>
 import Tile from "@Global/components/Tiles/Tile";
-// import Wrapper from "@Global/components/FormLoader/Wrapper";
+import Wrapper from "@Global/components/FormLoader/Wrapper";
 import { mapGetters, mapActions } from "vuex";
 export default {
     data: () => ({}),
     components: {
         "wm-tile": Tile,
-        // "wm-wrapper": Wrapper,
+        "wm-wrapper": Wrapper,
     },
     computed: {
         ...mapGetters("role_permission", ["getModules"])