From c49062b9393f0885a8817da5b7b2ac62e1177af9 Mon Sep 17 00:00:00 2001
From: saeid_01 <saeidkhakbazan@gmail.com>
Date: Sat, 14 Sep 2019 17:27:42 +0430
Subject: [PATCH] validation

---
 public/mix-manifest.json                      | 10 ++---
 .../Global/components/Body/Header/NavItem.vue |  4 +-
 .../Global/components/Dividers/PartTitle.vue  |  6 +--
 .../js/Global/components/Inputs/Checkbox.vue  |  2 +-
 .../js/Global/components/Misc/Dialog.vue      | 43 +++++++++++++------
 .../components/Misc/TabDropdownItem.vue       |  4 +-
 .../js/Global/components/Misc/TabItem.vue     |  4 +-
 .../js/Global/components/Orders/Items.vue     |  4 +-
 resources/js/Global/plugins/veeValidate.js    |  2 +-
 resources/js/Global/services/api.services.js  |  2 +-
 .../js/Global/utils/vee-validate/locale/fa.js |  4 ++
 .../js/Global/utils/vee-validate/newRules.js  | 14 ++++--
 resources/js/Home/views/AddModule.vue         |  2 +-
 13 files changed, 63 insertions(+), 38 deletions(-)

diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 8068333..8c3931a 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=f3046ccee6deb672cb42",
+    "/js/vue/Home/app.js": "/js/vue/Home/app.js?id=60c658b3e0d3bf77cf19",
+    "/js/vue/Modules/CRM/app.js": "/js/vue/Modules/CRM/app.js?id=d7b53e717be729233749",
+    "/js/vue/Modules/Reservation/app.js": "/js/vue/Modules/Reservation/app.js?id=03c06477f0ef6f223599",
+    "/js/vue/User/app.js": "/js/vue/User/app.js?id=a0f854cd48d4c6d1e185"
 }
diff --git a/resources/js/Global/components/Body/Header/NavItem.vue b/resources/js/Global/components/Body/Header/NavItem.vue
index 7f2b7f7..6b0e5e4 100644
--- a/resources/js/Global/components/Body/Header/NavItem.vue
+++ b/resources/js/Global/components/Body/Header/NavItem.vue
@@ -21,11 +21,11 @@ export default {
     //
     // data() {
     //     return {
-    //         Color,HoverClass
+    //         color,HoverClass
     //     }
     // },
     // created : function ( ) {
-    //     this.Color = 'WM-BG-' + this.ThemeColor;
+    //     this.color = 'WM-BG-' + this.ThemeColor;
     //     this.HoverClass = 'WM-Link-' + this.ThemeColor;
     // }
 };
diff --git a/resources/js/Global/components/Dividers/PartTitle.vue b/resources/js/Global/components/Dividers/PartTitle.vue
index fa0bc03..118f8ba 100644
--- a/resources/js/Global/components/Dividers/PartTitle.vue
+++ b/resources/js/Global/components/Dividers/PartTitle.vue
@@ -2,9 +2,9 @@
     <div class="SectionTitle WM-Width-100">
         <h4 class="TitleFa WM-Align-R" :class="TextFaColor" v-text="TitleFa"></h4>
         <div class="TitleEn WM-Flex">
-            <span :class="[Color,TextColor]" v-text="TitleEn"></span>
+            <span :class="[color,TextColor]" v-text="TitleEn"></span>
             <div class="Line">
-                <div class="inner" :class="Color"></div>
+                <div class="inner" :class="color"></div>
             </div>
         </div>
     </div>
@@ -16,7 +16,7 @@ export default {
     props: {
         TitleFa: { default: "عنوان بخش" },
         TitleEn: { default: "Part Title" },
-        Color: { default: "black" },
+        color: { default: "black" },
         TextColor: { default: "white--text" },
         TextFaColor: { default: "black--text" }
     },
diff --git a/resources/js/Global/components/Inputs/Checkbox.vue b/resources/js/Global/components/Inputs/Checkbox.vue
index 2839930..2cf8ea1 100644
--- a/resources/js/Global/components/Inputs/Checkbox.vue
+++ b/resources/js/Global/components/Inputs/Checkbox.vue
@@ -22,7 +22,7 @@ export default {
     props: {
         ItemID: { default: "Checkbox" },
         ItemText: { default: " مقدار پیش فرض " },
-        Color: { default: "Red" },
+        color: { default: "Red" },
         value: {type: Array}
     },
     data: function() {
diff --git a/resources/js/Global/components/Misc/Dialog.vue b/resources/js/Global/components/Misc/Dialog.vue
index ac4bb81..019033a 100644
--- a/resources/js/Global/components/Misc/Dialog.vue
+++ b/resources/js/Global/components/Misc/Dialog.vue
@@ -6,21 +6,33 @@
                     class="WM-Margin-T-20"
                     :TitleFa="getDialogProperties.title || defaultMessage[type].title"
                     :TitleEn="getDialogProperties.titleEn || defaultMessage[type].titleEn"
-                    :Color="getDialogProperties.color || defaultMessage[type].color"
+                    :color="getDialogProperties.color || defaultMessage[type].color"
                 ></WM-PartTitle>
             </v-card-title>
             <v-card-text>
-                <div class="WM-Align-R WM-Margin-T-10">{{ getDialogProperties.message || defaultMessage[type].message }}</div>
+                <div
+                    class="WM-Align-R WM-Margin-T-10"
+                >{{ getDialogProperties.message || defaultMessage[type].message }}</div>
             </v-card-text>
 
             <v-divider></v-divider>
             <v-card-actions>
                 <v-spacer></v-spacer>
-                <v-btn :color="getDialogProperties.cancelButtonColor || defaultMessage[type].cancelButtonColor" @click="cancel" depressed dark>
+                <v-btn
+                    :color="getDialogProperties.cancelButtonColor || defaultMessage[type].cancelButtonColor"
+                    @click="cancel"
+                    depressed
+                    dark
+                >
                     <v-icon dark right>fas fa-times</v-icon>
                     {{getDialogProperties.cancelButtonText || defaultMessage[type].cancelButtonText}}
                 </v-btn>
-                <v-btn :color="getDialogProperties.confirmButtonColor || defaultMessage[type].confirmButtonColor" depressed dark @click="confirm">
+                <v-btn
+                    :color="getDialogProperties.confirmButtonColor || defaultMessage[type].confirmButtonColor"
+                    depressed
+                    dark
+                    @click="confirm"
+                >
                     <v-icon dark right>fas fa-trash-alt</v-icon>
                     {{getDialogProperties.confirmButtonText || defaultMessage[type].confirmButtonText}}
                 </v-btn>
@@ -30,7 +42,7 @@
 </template>
 
 <script>
-import { mapActions, mapGetters } from 'vuex';
+import { mapActions, mapGetters } from "vuex";
 export default {
     data: () => ({
         defaultMessage: {
@@ -50,9 +62,9 @@ export default {
                 confirmButtonText: "حذف",
                 cancelButtonColor: "cyan",
                 confirmButtonColor: "red"
-            },
+            }
         },
-        type: 'delete'
+        type: "delete"
     }),
     watch: {
         getDialogType(type) {
@@ -63,8 +75,12 @@ export default {
             }
         }
     },
-    computed:{
-        ...mapGetters('modal', ['getDialogType', 'getDialogProperties', 'isModal']),
+    computed: {
+        ...mapGetters("modal", [
+            "getDialogType",
+            "getDialogProperties",
+            "isModal"
+        ]),
         modal: {
             get() {
                 return this.isModal("modal/dialog");
@@ -80,17 +96,16 @@ export default {
     },
     methods: {
         async confirm() {
-            
-            if(typeof this.getDialogProperties.success == 'function') {
+            if (typeof this.getDialogProperties.success == "function") {
                 await this.getDialogProperties.success();
             }
-            this.$_closeModal('modal/dialog');
+            this.$_closeModal("modal/dialog");
         },
         async cancel() {
-            if(typeof this.getDialogProperties.close == 'function') {
+            if (typeof this.getDialogProperties.close == "function") {
                 await this.getDialogProperties.close();
             }
-            this.$_closeModal('modal/dialog');
+            this.$_closeModal("modal/dialog");
         }
     }
 };
diff --git a/resources/js/Global/components/Misc/TabDropdownItem.vue b/resources/js/Global/components/Misc/TabDropdownItem.vue
index 0971696..1987596 100644
--- a/resources/js/Global/components/Misc/TabDropdownItem.vue
+++ b/resources/js/Global/components/Misc/TabDropdownItem.vue
@@ -16,14 +16,14 @@ export default {
     props: {
         TitleFa:   { default: "دسترسی سریع" },
         TitleEn:   { default: "Title" },
-        Color:     { default: "Black" },
+        color:     { default: "Black" },
         SubItems:   { type: Object, default: function () { return {} } },
         TabContent:   { default: '' },
         Status:   { default: '' },
     },
     data: function ()  {
         return {
-            aClass: 'WM-' + this.Color,
+            aClass: 'WM-' + this.color,
             TabHref: '#' + this.TabContent,
             SubItemsCount : Object.keys(this.SubItems).length,
         }
diff --git a/resources/js/Global/components/Misc/TabItem.vue b/resources/js/Global/components/Misc/TabItem.vue
index ec80857..aad04a0 100644
--- a/resources/js/Global/components/Misc/TabItem.vue
+++ b/resources/js/Global/components/Misc/TabItem.vue
@@ -15,14 +15,14 @@ export default {
     props: {
         TitleFa:   { default: "دسترسی سریع" },
         TitleEn:   { default: "Title" },
-        Color:     { default: "Black" },
+        color:     { default: "Black" },
         TabContent:   { default: '' },
         Status:   { default: '' },
         Quantity:   { default: 0 },
     },
     data: function ()  {
         return {
-            aClass: 'WM-' + this.Color,
+            aClass: 'WM-' + this.color,
             TabHref: '#' + this.TabContent,
         }
     },
diff --git a/resources/js/Global/components/Orders/Items.vue b/resources/js/Global/components/Orders/Items.vue
index 1af836c..fca5220 100644
--- a/resources/js/Global/components/Orders/Items.vue
+++ b/resources/js/Global/components/Orders/Items.vue
@@ -61,8 +61,8 @@ export default {
                 { ID: 'WM457', UserName: ' علیرضا حسنی ', Quantity: 12, Value: 350000, UpdatedAt:' سه شنبه، 27 آذر <br> 22:33', Status: 'inProgress'},
             ],
             Status: {
-                'inProgress': { TitleFa: ' در حال آماده سازی ', Color:''},
-                'ReadyToDeliver': { TitleFa: ' آماده ی تحویل ', Color:''},
+                'inProgress': { TitleFa: ' در حال آماده سازی ', color:''},
+                'ReadyToDeliver': { TitleFa: ' آماده ی تحویل ', color:''},
             }
         }
     },
diff --git a/resources/js/Global/plugins/veeValidate.js b/resources/js/Global/plugins/veeValidate.js
index 538cea8..4c0f9cf 100644
--- a/resources/js/Global/plugins/veeValidate.js
+++ b/resources/js/Global/plugins/veeValidate.js
@@ -5,4 +5,4 @@ import fa from "@Global/utils/vee-validate/locale/fa";
 import "@Global/utils/vee-validate/newRules";
 Vue.use(VeeValidate);
 
-Validator.localize("fa", fa);
\ No newline at end of file
+Validator.localize("fa", fa);
diff --git a/resources/js/Global/services/api.services.js b/resources/js/Global/services/api.services.js
index d53ecdc..aa37d08 100644
--- a/resources/js/Global/services/api.services.js
+++ b/resources/js/Global/services/api.services.js
@@ -4,7 +4,7 @@ import commonState from '@Global/store/modules/common/state';
 const ApiService = {
 
     init(baseURL = null) {
-        axios.defaults.baseURL = "https://www.willaengine.ir";
+        // axios.defaults.baseURL = "https://www.willaengine.ir";
         // if (baseURL) {
         //     axios.defaults.baseURL = baseURL;
         // }
diff --git a/resources/js/Global/utils/vee-validate/locale/fa.js b/resources/js/Global/utils/vee-validate/locale/fa.js
index 81bd335..41ae668 100644
--- a/resources/js/Global/utils/vee-validate/locale/fa.js
+++ b/resources/js/Global/utils/vee-validate/locale/fa.js
@@ -33,6 +33,9 @@
             alpha_dash: function(n) {
                 return n + " فقط می تواند از حروف، اعداد، خط فاصله و زیرخط تشکیل شود"
             },
+            alpha_en_dash: function(n) {
+                return n + " فقط می تواند از حروف انگلیسی، اعداد، خط فاصله و زیرخط تشکیل شود"
+            },
             alpha_num: function(n) {
                 return n + " فقط میتواند از حروف و اعداد تشکیل شود"
             },
@@ -125,6 +128,7 @@
             },
         },
         attributes: {
+            name_en: "نام انگلیسی",
             email: "ایمیل",
             name: "نام",
             phone: "شماره ی تلفن",
diff --git a/resources/js/Global/utils/vee-validate/newRules.js b/resources/js/Global/utils/vee-validate/newRules.js
index 9809e10..53c9ab1 100644
--- a/resources/js/Global/utils/vee-validate/newRules.js
+++ b/resources/js/Global/utils/vee-validate/newRules.js
@@ -1,12 +1,18 @@
 import { Validator } from "vee-validate";
 
 const isBetween = (value, { min, max } = {}) => {
-	return Number(min) <= value.length && Number(max) >= value.length;
+    return Number(min) <= value.length && Number(max) >= value.length;
 };
 
 // The first param is called 'min', and the second is called 'max'.
-const paramNames = ['min', 'max'];
+const paramNames = ["min", "max"];
 
-Validator.extend('digits_between', isBetween, {
-paramNames //  pass it in the extend options.
+Validator.extend("digits_between", isBetween, {
+    paramNames //  pass it in the extend options.
+});
+
+Validator.extend("alpha_en_dash", {
+    validate(value) {
+        return /^[0-9A-Za-z\-\_]+$/.test(value);
+    }
 });
diff --git a/resources/js/Home/views/AddModule.vue b/resources/js/Home/views/AddModule.vue
index 6993010..14e62f9 100644
--- a/resources/js/Home/views/AddModule.vue
+++ b/resources/js/Home/views/AddModule.vue
@@ -96,7 +96,7 @@
             'wm-trial-confirmation'    :       TrialConfirmation,
         },
         props: {
-            Color:     { default: 'grey darken-4' },
+            color:     { default: 'grey darken-4' },
         },
         data() {
             return {