cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-23 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/change-email-address-ui' into change-email-address-ui

Browse Source 
# Conflicts:
#	resources/views/pages/settings.blade.php
This commit is contained in:
Haziq Danial
2021-09-08 05:50:31 +08:00
parent da35d80fbe 53fb271bf7
commit 28bdccca9a
3 changed files with 58 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/settings/elements/UserProfileComponent.vue
+5 -1
View File
@@ -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>
resources/assets/vue/components/settings/forms/EditEmailFormComponent.vue
+51
View File
@@ -0,0 +1,51 @@
<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 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">
<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.user.update', $store.getters.getUserId), 'put', section, true, true)">Update</div>
</div>
</div>
</div>
</div>
</div>
</div>
</template>
<script>
import updateProfileFormValidation from '../../../general/mixins/accounts/validation/updateProfileFormValidation';
export default {
data(){
return {
error: '',
parameters: {
name: ''
}
}
},
mixins: [updateProfileFormValidation]
}
</script>
resources/views/pages/settings.blade.php
+2 -2
View File
@@ -515,7 +515,7 @@
<div class="col-4 p-r-0">
<div class="row">
<div class="col">
<div class="row tabsContainer" v-if="$store.getters.isAdmin">
<div class="row tabsContainer">
<div class="col">
<div class="row m-l-0 m-r-0 d-none d-md-flex">
<div class="col" v-if="$store.getters.isAdmin">
@@ -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 hide" 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">