From 79e4555218bb6adac1c23bc5fc7276799cc6ac08 Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Sun, 22 Aug 2021 16:16:21 +0800
Subject: [PATCH 1/3] change email address ui

---
 .../elements/UserProfileComponent.vue         |  6 ++-
 .../settings/forms/EditEmailFormComponent.vue | 44 +++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
 create mode 100644 resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue

diff --git a/resources/assets/vue/components/settings/elements/UserProfileComponent.vue b/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
index d2610144..05dff8bd 100644
--- a/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
+++ b/resources/assets/vue/components/settings/elements/UserProfileComponent.vue
@@ -37,7 +37,7 @@
                 <div class="font-heading fs-11 muted" v-text="$store.getters.getUserEmail"></div>
             </div>
             <div class="col-auto p-r-0">
-                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15">
+                <div class="btn btn-xs btn-default bg-master-lighter btn-rounded p-r-20 p-l-15 requestModal" data-type="editEmail">
                     <i class="fa fa-envelope-open-o m-r-10"></i>Request Email Change
                 </div>
             </div>
@@ -50,6 +50,10 @@
         <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="resetPassword">
             <reset-user-password-form-component :data="{email: $store.getters.getUserEmail}"  section="resetPassword"></reset-user-password-form-component>
         </modal-component>
+
+        <modal-component class="animate__animated animate__fast animate__fadeIn" styleType="fill-in" type="editEmail">
+            <edit-email-form-component :data="{email: $store.getters.getUserEmail}" section="editEmail"></edit-email-form-component>
+        </modal-component>
     </div>
 </template>
 
diff --git a/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue b/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
new file mode 100644
index 00000000..13143db0
--- /dev/null
+++ b/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
@@ -0,0 +1,44 @@
+<template>
+    <div class="row">
+        <div class="col">
+            <div class="row">
+                <div class="col">
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <h3 class="all-caps m-b-5 bold no-margin">Edit Email</h3>
+                            <p>An edit email link will send to your email account</p>
+                        </div>
+                    </div>
+                    <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
+                        <div class="col">
+                            <small class="bold fs-10 text-danger">{{error}}</small>
+                        </div>
+                    </div>
+                    <div class="row">
+                        <div class="col p-r-5">
+                            <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
+                        </div>
+                        <div class="col p-l-5">
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.authentication.password.forget', '1'), 'post', section, true, true)">Confirm</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+<script>
+    import resetPasswordFormValidation from '../../../general/mixins/accounts/validation/resetPasswordFormValidation';
+    export default {
+        data(){
+            return {
+                error: '',
+                parameters: {
+                    email: ''
+                }
+            }
+        },
+        mixins: [resetPasswordFormValidation]
+
+    }
+</script>
\ No newline at end of file

From 508e71aeb4a0374ed14423238c0ca62cea31840c Mon Sep 17 00:00:00 2001
From: omair saleh <uldvstar@gmail.com>
Date: Tue, 24 Aug 2021 13:03:05 +0800
Subject: [PATCH 2/3] hide announcement from user profile

---
 resources/views/pages/settings.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/pages/settings.blade.php b/resources/views/pages/settings.blade.php
index 8fb76ae2..9157dbc5 100644
--- a/resources/views/pages/settings.blade.php
+++ b/resources/views/pages/settings.blade.php
@@ -570,7 +570,7 @@
                                         <div class="row tabsContainer tabContent" tab-name="customer-list" v-if="$store.getters.isAdmin">
                                             <company-quick-view-section-component></company-quick-view-section-component>
                                         </div>
-                                        <div class="row tabsContainer tabContent" v-bind:class="{ hide: $store.getters.isAdmin }" v-else tab-name="announcement-list">
+                                        <div class="row tabsContainer tabContent hide" v-else tab-name="announcement-list">
                                             <announcement-quick-view-section-component></announcement-quick-view-section-component>
                                         </div>
                                         <div class="row tabsContainer hide tabContent" tab-name="PO">

From ca1936d4ebcd5ed684cdffaf96b50acc3053245f Mon Sep 17 00:00:00 2001
From: edmondlang <edmond_wuiming@hotmail.com>
Date: Tue, 24 Aug 2021 13:05:55 +0800
Subject: [PATCH 3/3] change email address ui, add input column for email

---
 .../settings/forms/EditEmailFormComponent.vue | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue b/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
index 13143db0..68ef720a 100644
--- a/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
+++ b/resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
@@ -5,8 +5,15 @@
                 <div class="col">
                     <div class="row m-b-10">
                         <div class="col">
-                            <h3 class="all-caps m-b-5 bold no-margin">Edit Email</h3>
-                            <p>An edit email link will send to your email account</p>
+                            <h3 class="all-caps m-b-5 bold no-margin">Edit Email Address</h3>
+                        </div>
+                    </div>
+                    <div class="row m-b-10">
+                        <div class="col">
+                            <div class="fs-12">Email Address</div>
+                            <validation-wrapper-component :validator="$v.parameters.name">
+                                <input type="text" class="form-control" v-model="parameters.name">
+                            </validation-wrapper-component>
                         </div>
                     </div>
                     <div class="row m-b-5 animate__animated animate__fadeInUpBig animate__fast" v-if="error">
@@ -19,7 +26,7 @@
                             <div class="btn btn-sm btn-default bg-master-lightest btn-block b-rad-none" data-dismiss="modal">Cancel</div>
                         </div>
                         <div class="col p-l-5">
-                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.authentication.password.forget', '1'), 'post', section, true, true)">Confirm</div>
+                            <div class="btn btn-sm btn-success btn-block b-rad-none" @click="submit(route('api.account.user.update', $store.getters.getUserId), 'put', section, true, true)">Update</div>
                         </div>
                     </div>
                 </div>
@@ -28,17 +35,17 @@
     </div>
 </template>
 <script>
-    import resetPasswordFormValidation from '../../../general/mixins/accounts/validation/resetPasswordFormValidation';
+    import updateProfileFormValidation from '../../../general/mixins/accounts/validation/updateProfileFormValidation';
     export default {
         data(){
             return {
                 error: '',
                 parameters: {
-                    email: ''
+                    name: ''
                 }
             }
         },
-        mixins: [resetPasswordFormValidation]
+        mixins: [updateProfileFormValidation]
 
     }
 </script>
\ No newline at end of file