Admin & User account frontend consolidation

This commit is contained in:
Peter Papp
2021-03-15 16:56:26 +01:00
parent ba902a30b3
commit 803cc089bd
57 changed files with 472 additions and 726 deletions

View File

@@ -8,12 +8,12 @@
<!--User thumbnail-->
<div class="user-thumbnail">
<div class="avatar">
<img :src="user.data.attributes.avatar" :alt="user.data.attributes.name">
<img :src="user.data.relationships.settings.data.attributes.avatar" :alt="user.data.relationships.settings.data.attributes.name">
<!--<img :src="user.data.attributes.avatar" :alt="user.data.attributes.name" class="blurred">-->
</div>
<div class="info">
<b class="name">
{{ user.data.attributes.name }}
{{ user.data.relationships.settings.data.attributes.name }}
<ColorLabel color="purple">
{{ user.data.attributes.role }}
</ColorLabel>
@@ -69,7 +69,7 @@
</div>
</router-link>
<router-link replace :to="{name: 'UserDelete'}" v-if="user.data.attributes.name !== admin.name"
<router-link replace :to="{name: 'UserDelete'}" v-if="user.data.relationships.settings.data.attributes.name !== admin.name"
class="menu-list-item link">
<div class="icon">
<trash2-icon size="17"></trash2-icon>
@@ -104,9 +104,9 @@
export default {
name: 'Profile',
components: {
StorageItemDetail,
CreditCardIcon,
HardDriveIcon,
StorageItemDetail,
SectionTitle,
FileTextIcon,
MobileHeader,
@@ -118,10 +118,10 @@
Spinner,
},
computed: {
...mapGetters(['config']),
admin() {
return this.$store.getters.user ? this.$store.getters.user.data.attributes : undefined
},
...mapGetters(['config']),
},
data() {
return {
@@ -131,7 +131,7 @@
},
methods: {
fetchUser() {
axios.get('/api/users/' + this.$route.params.id + '/detail')
axios.get('/api/admin/users/' + this.$route.params.id + '/detail')
.then(response => {
this.user = response.data
this.isLoading = false

View File

@@ -162,7 +162,7 @@
// Send request to get user token
axios
.post('/api/users/create', formData, {
.post('/api/admin/users/create', formData, {
headers: {
'Content-Type': 'multipart/form-data',
}

View File

@@ -6,8 +6,8 @@
<p>{{ $t('user_box_delete.description') }}</p>
</InfoBox>
<ValidationObserver ref="deleteUser" @submit.prevent="deleteUser" v-slot="{ invalid }" tag="form" class="form block-form">
<ValidationProvider tag="div" class="block-wrapper" v-slot="{ errors }" mode="passive" name="User name" :rules="'required|is:' + user.data.attributes.name">
<label>{{ $t('admin_page_user.label_delete_user', {user: user.data.attributes.name}) }}:</label>
<ValidationProvider tag="div" class="block-wrapper" v-slot="{ errors }" mode="passive" name="User name" :rules="'required|is:' + user.data.relationships.settings.data.attributes.name">
<label>{{ $t('admin_page_user.label_delete_user', {user: user.data.relationships.settings.data.attributes.name}) }}:</label>
<div class="single-line-form">
<input v-model="userName"
:placeholder="$t('admin_page_user.placeholder_delete_user')"
@@ -73,11 +73,9 @@
this.isSendingRequest = true
axios
.post(this.$store.getters.api + '/users/' + this.$route.params.id + '/delete',
.post(this.$store.getters.api + '/admin/users/' + this.$route.params.id + '/delete',
{
data: {
name: this.userName
},
name: this.userName,
_method: 'delete'
}
)

View File

@@ -48,7 +48,7 @@
<div class="block-wrapper">
<label>{{ $t('page_registration.label_name') }}</label>
<div class="input-wrapper">
<input :value="user.data.attributes.name"
<input :value="user.data.relationships.settings.data.attributes.name"
:placeholder="$t('page_registration.placeholder_name')"
type="text"
disabled
@@ -66,7 +66,7 @@
<div class="block-wrapper">
<label>{{ $t('user_settings.name') }}:</label>
<div class="input-wrapper">
<input :value="user.relationships.settings.data.attributes.billing_name"
<input :value="user.data.relationships.settings.data.attributes.name"
type="text"
disabled
/>
@@ -75,7 +75,7 @@
<div class="block-wrapper">
<label>{{ $t('user_settings.address') }}:</label>
<div class="input-wrapper">
<input :value="user.relationships.settings.data.attributes.billing_address"
<input :value="user.data.relationships.settings.data.attributes.address"
type="text"
disabled
/>
@@ -84,7 +84,7 @@
<div class="block-wrapper">
<label>{{ $t('user_settings.country') }}:</label>
<div class="input-wrapper">
<input :value="user.relationships.settings.data.attributes.billing_country"
<input :value="user.data.relationships.settings.data.attributes.country"
type="text"
disabled
/>
@@ -94,7 +94,7 @@
<div class="block-wrapper">
<label>{{ $t('user_settings.city') }}:</label>
<div class="input-wrapper">
<input :value="user.relationships.settings.data.attributes.billing_city"
<input :value="user.data.relationships.settings.data.attributes.city"
type="text"
disabled
/>
@@ -103,7 +103,7 @@
<div class="block-wrapper">
<label>{{ $t('user_settings.postal_code') }}:</label>
<div class="input-wrapper">
<input :value="user.relationships.settings.data.attributes.billing_postal_code"
<input :value="user.data.relationships.settings.data.attributes.postal_code"
type="text"
disabled
/>
@@ -113,7 +113,7 @@
<div class="block-wrapper">
<label>{{ $t('user_settings.state') }}:</label>
<div class="input-wrapper">
<input :value="user.relationships.settings.data.attributes.billing_state"
<input :value="user.data.relationships.settings.data.attributes.state"
type="text"
disabled
/>
@@ -122,7 +122,7 @@
<div class="block-wrapper">
<label>{{ $t('user_settings.phone_number') }}:</label>
<div class="input-wrapper">
<input :value="user.relationships.settings.data.attributes.billing_phone_number"
<input :value="user.data.relationships.settings.data.attributes.phone_number"
type="text"
disabled
/>
@@ -188,7 +188,7 @@
// Send request to get user reset link
axios
.post(this.$store.getters.api + '/users/' + this.$route.params.id + '/role', {
.post(this.$store.getters.api + '/admin/users/' + this.$route.params.id + '/role', {
attributes: {
role: this.userRole,
},

View File

@@ -3,7 +3,7 @@
<PageTabGroup>
<DatatableWrapper
@init="isLoading = false"
:api="'/api/users/' + this.$route.params.id + '/invoices'"
:api="'/api/admin/users/' + this.$route.params.id + '/invoices'"
:paginator="false"
:columns="columns"
class="table"

View File

@@ -52,7 +52,7 @@
this.isSendingRequest = true
axios
.post(this.$store.getters.api + '/users/' + this.$route.params.id + '/reset-password',
.post(this.$store.getters.api + '/admin/users/' + this.$route.params.id + '/reset-password',
{}
)
.then(() => {

View File

@@ -96,7 +96,7 @@
// Send request to get user reset link
axios
.post(this.$store.getters.api + '/users/' + this.$route.params.id + '/capacity', {
.post(this.$store.getters.api + '/admin/users/' + this.$route.params.id + '/capacity', {
attributes: {
storage_capacity: this.capacity
},
@@ -139,7 +139,7 @@
})
},
getStorageDetails() {
axios.get('/api/users/' + this.$route.params.id + '/storage')
axios.get('/api/admin/users/' + this.$route.params.id + '/storage')
.then(response => {
this.storage = response.data.data
this.isLoading = false

View File

@@ -82,7 +82,7 @@
}
},
created() {
axios.get('/api/users/' + this.$route.params.id + '/subscription')
axios.get('/api/admin/users/' + this.$route.params.id + '/subscription')
.then(response => {
this.subscription = response.data.data
this.isLoading = false