From 2d6dc3c090aabdf9c84d1c8fbed48849236fdc4a Mon Sep 17 00:00:00 2001
From: Saber Tabatabeee <s.tabatabai@willaspace.com>
Date: Tue, 11 Aug 2020 20:19:41 +0430
Subject: [PATCH 1/5] Modify Readme.md file

---
 readme.md | 47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 47 insertions(+)

diff --git a/readme.md b/readme.md
index 0bb9011..840c26c 100644
--- a/readme.md
+++ b/readme.md
@@ -1 +1,48 @@
 readme file
+
+## Prequirements:
+
+ 1. install editor like vscode
+ 1. install git
+ 1. install xampp
+ 1. Navicat
+ 1. install node.js LTS (last version)
+
+
+## Steps:
+
+ 1. login to git.willaspace.com
+ 1. clone willa into your root folder
+ 1. create new folder ```/modules in``` root project folder
+ 1. clone core, common, ... in this folder with `wm-` prefix
+ 1. run ```composer i```
+ 1. run ```npm i```
+ 1. restore database with your new .env file. **if had error refer to MySql Section**
+ 1. run: ```npm run dev```
+ 1. run php artisan migrate or Goto: Host Meshkee.local Section
+ 1. run ```php artisan key:generate```
+ 
+
+
+
+## MySql Section
+
+ 1. make sure install Navicat
+ 1. open and connect to mysql
+ 1. open xampp then in mysql admin configuration open mu.ini
+ 1. change max_allowed_packet into 16M 
+ 
+ ```
+ [mysqld]
+ max_allowed_packet=16M
+ ```
+
+ ## Host Meshkee.local Section
+
+ 1. create new virtual host 
+ 1. create new host in etc driver folder as local name service
+ by adding this line of configuration 
+ ```127.0.0.1       meshkee.local```
+ into C:\Windows\System32\drivers\etc\hosts
+
+ good luck
\ No newline at end of file

From 78c7917d148bf1874f01aaa78661ef95305576c9 Mon Sep 17 00:00:00 2001
From: farid saravi <f.saravi@yahoo.com>
Date: Sat, 15 Aug 2020 19:13:54 +0430
Subject: [PATCH 2/5] feat: core composer lock change

---
 composer.lock | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/composer.lock b/composer.lock
index 3f28f9a..c317a9b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4943,7 +4943,7 @@
             "dist": {
                 "type": "path",
                 "url": "./modules/wm-core",
-                "reference": "1389a3d91b3c597a4fe13770060130619969ebeb"
+                "reference": "6917a33cc028d0c0f3e90ef270ee6d9cd0acfdb1"
             },
             "require": {
                 "php": "^7.1.3"
@@ -4956,7 +4956,8 @@
             "extra": {
                 "laravel": {
                     "providers": [
-                        "WM\\Core\\CoreServiceProvider"
+                        "WM\\Core\\CoreServiceProvider",
+                        "WM\\Core\\DependencyProvider"
                     ]
                 }
             },

From 6f349811297fd581a953fefa6ea1dd86ca2df217 Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Sun, 16 Aug 2020 08:50:20 +0430
Subject: [PATCH 3/5] upload image

---
 .../Global/components/Inputs/UploadImage.vue  | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 resources/js/Global/components/Inputs/UploadImage.vue

diff --git a/resources/js/Global/components/Inputs/UploadImage.vue b/resources/js/Global/components/Inputs/UploadImage.vue
new file mode 100644
index 0000000..fbdb6d3
--- /dev/null
+++ b/resources/js/Global/components/Inputs/UploadImage.vue
@@ -0,0 +1,62 @@
+<template>
+    <div class="upload-example">
+        <img class="upload-example-cropper" width="220px" height="220px" :src="media"/>
+        <div class="button-wrapper">
+            <v-btn
+                large
+                :color="$_color('product_option')"
+                @click.native="$refs['image_'+uniqueId][0].click()"
+                light
+            >
+                <input
+                    type="file"
+                    :ref="'image_'+uniqueId"
+                    :name="'image_' + uniqueId"
+                    v-show="false"
+                    @change="uploadImage($event, val)"
+                    accept="image/*"
+                />
+                <v-icon dark>WMi-upload</v-icon>
+                آپلود عکس
+            </v-btn>
+        </div>
+    </div>
+</template>
+<script>
+    export default {
+        props: {
+            batch_id: {default: '', type: String},
+            media: {default: '', type: String},
+        },
+        data: () => ({
+            uniqueId: Math.floor(Math.random() * 10000),
+        }),
+        methods: {
+            uploadImage(event, value) {
+                // Reference to the DOM input element
+                var input = event.target;
+                // Ensure that you have a file before attempting to read it
+                if (input.files && input.files[0]) {
+                    this.$axios.post(this.$_url('file'), {file: input.files[0]}, {
+                        before: (xhr) => {
+                            this.$emit('before', true);
+                            //maybe do something else here
+                        },
+                    }).then((response) => {
+                        this.media = response.data.media;
+                        this.$emit('uploaded', response.data)
+                    });
+                }
+            }
+        }
+    }
+</script>
+<style lang="scss" scoped>
+    /*.upload-example-cropper {*/
+    /*    margin: 0 auto;*/
+    /*    border: solid 1px #d2d2d2;*/
+    /*    height: 220px;*/
+    /*    width: 220px;*/
+    /*    border-radius: 5px;*/
+    /*}*/
+</style>

From 511103de57624e9b68e8bc576a5b321198fecf75 Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Sun, 16 Aug 2020 15:15:54 +0430
Subject: [PATCH 4/5] feat: upload image before and after

---
 .../Global/components/Inputs/UploadImage.vue  | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/resources/js/Global/components/Inputs/UploadImage.vue b/resources/js/Global/components/Inputs/UploadImage.vue
index fbdb6d3..139053b 100644
--- a/resources/js/Global/components/Inputs/UploadImage.vue
+++ b/resources/js/Global/components/Inputs/UploadImage.vue
@@ -5,7 +5,7 @@
             <v-btn
                 large
                 :color="$_color('product_option')"
-                @click.native="$refs['image_'+uniqueId][0].click()"
+                @click.native="$refs['image_'+uniqueId].click()"
                 light
             >
                 <input
@@ -13,7 +13,7 @@
                     :ref="'image_'+uniqueId"
                     :name="'image_' + uniqueId"
                     v-show="false"
-                    @change="uploadImage($event, val)"
+                    @change="uploadImage($event)"
                     accept="image/*"
                 />
                 <v-icon dark>WMi-upload</v-icon>
@@ -23,28 +23,32 @@
     </div>
 </template>
 <script>
+    import {makeid} from '@Global/utils/common/math'
+
     export default {
         props: {
-            batch_id: {default: '', type: String},
+            batch_id: {default: null, type: String},
             media: {default: '', type: String},
         },
         data: () => ({
             uniqueId: Math.floor(Math.random() * 10000),
         }),
         methods: {
-            uploadImage(event, value) {
+            uploadImage(event) {
                 // Reference to the DOM input element
                 var input = event.target;
                 // Ensure that you have a file before attempting to read it
                 if (input.files && input.files[0]) {
-                    this.$axios.post(this.$_url('file'), {file: input.files[0]}, {
-                        before: (xhr) => {
-                            this.$emit('before', true);
-                            //maybe do something else here
-                        },
-                    }).then((response) => {
-                        this.media = response.data.media;
-                        this.$emit('uploaded', response.data)
+                    let formData = new FormData();
+                    formData.append('file', input.files[0]);
+                    formData.append('batch_id', this.batch_id  ? this.batch_id : makeid(50));
+                    this.$emit('before');
+                    this.$axios.post(this.$_url('storeFile'), formData).then((response) => {
+                        this.$emit('after');
+                        this.$emit('uploaded', response.data.data)
+                    }).catch( error => {
+                        this.$emit('after');
+                        this.$emit('error', error);
                     });
                 }
             }

From 61bdcb3b96ebc2ed1e46db9318d0537265874328 Mon Sep 17 00:00:00 2001
From: Saeid <saeidkhakbazan@gmail.com>
Date: Mon, 17 Aug 2020 15:08:07 +0430
Subject: [PATCH 5/5] fix: fix errorHandler

---
 .../js/Global/services/errorHandler.services.js   | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/resources/js/Global/services/errorHandler.services.js b/resources/js/Global/services/errorHandler.services.js
index eed4df6..0443352 100644
--- a/resources/js/Global/services/errorHandler.services.js
+++ b/resources/js/Global/services/errorHandler.services.js
@@ -6,9 +6,9 @@ import commonRoute from "@Global/utils/common/routes";
 
 
 import toast from "./toast.service";
+import Vue from "vue";
 
 function errorResponseHandler(error) {
-    
     // check for errorHandle config
     if (
         error.config.hasOwnProperty("errorHandle") &&
@@ -19,15 +19,15 @@ function errorResponseHandler(error) {
 
     // if has response show the error
     if (error.response) {
-        if(error.response.status == 401) {
+        if(error.response.status === 401) {
             TokenService.removeToken();
             ApiService.removeAuthHeader();
             store.commit('auth/logout', {}, {root: true});
-            if (commonRoute.login() != window.location.pathname) {
+            if (commonRoute.login() !== window.location.pathname) {
                 window.location.href = commonRoute.login();
             }
             toast.error('نام کاربری یا رمز عبور اشتباه است', 'خطا');
-        } else if(error.response.status == 422) {
+        } else if(error.response.status === 422) {
             if(typeof error.response.data.errors !== 'undefined') {
                 for (const key in error.response.data.errors) {
                     if (error.response.data.errors.hasOwnProperty(key)) {
@@ -35,13 +35,14 @@ function errorResponseHandler(error) {
                     }
                 }
             }
-        } else if(error.response.status == 500) {
+        } else if(error.response.status === 500) {
             toast.error('مشکل از سمت سرور', 'خطا');
         }
     }
+    return Promise.reject(error);
 }
 function successHandler(response) {
-    if(response.status == 200 || response.status == 201) {
+    if(response.status === 200 || response.status === 201) {
         if(typeof response.data.message !== 'undefined' && typeof response.data.message.content !== 'undefined') {
             toast.success(response.data.message.content, response.data.message.title || 'موفق');
         }
@@ -51,5 +52,5 @@ function successHandler(response) {
 
 // apply interceptor on response
 axios.interceptors.response.use(successHandler, errorResponseHandler);
+Vue.prototype.$axios =  axios;
 
-export default errorResponseHandler;
\ No newline at end of file