refactoring

This commit is contained in:
Čarodej
2021-11-23 10:39:44 +01:00
parent 884c36a5a3
commit c5aadd3c6e
5 changed files with 47 additions and 13 deletions

View File

@@ -2,7 +2,7 @@
"/js/main.js": "/js/main.js", "/js/main.js": "/js/main.js",
"/css/app.css": "/css/app.css", "/css/app.css": "/css/app.css",
"/css/tailwind.css": "/css/tailwind.css", "/css/tailwind.css": "/css/tailwind.css",
"/chunks/admin.js": "/chunks/admin.js?id=acb6c11e28ee8ad0124a", "/chunks/admin.js": "/chunks/admin.js?id=4648dcc5c93c59d5e458",
"/chunks/admin-account.js": "/chunks/admin-account.js?id=55f9b983b9aa60c21a62", "/chunks/admin-account.js": "/chunks/admin-account.js?id=55f9b983b9aa60c21a62",
"/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=b6966627bd253eda63ba", "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js": "/chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/app-index~chu~c7a13fb0.js?id=b6966627bd253eda63ba",
"/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=d7a8e5b5b913858da427", "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js": "/chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~chunks/~3e4fdd8b.js?id=d7a8e5b5b913858da427",
@@ -21,7 +21,7 @@
"/chunks/app-billings.js": "/chunks/app-billings.js?id=c507004c1e6a3bdeb574", "/chunks/app-billings.js": "/chunks/app-billings.js?id=c507004c1e6a3bdeb574",
"/chunks/app-email.js": "/chunks/app-email.js?id=20f70ca270cf76a68439", "/chunks/app-email.js": "/chunks/app-email.js?id=20f70ca270cf76a68439",
"/chunks/app-index.js": "/chunks/app-index.js?id=072ca392fe4b07a263cf", "/chunks/app-index.js": "/chunks/app-index.js?id=072ca392fe4b07a263cf",
"/chunks/app-language.js": "/chunks/app-language.js?id=61f1ee015dfdb3977b56", "/chunks/app-language.js": "/chunks/app-language.js?id=bc7b162598794d12a71c",
"/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js?id=38b2085e829a84df0e5f", "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js": "/chunks/app-language~chunks/app-settings~chunks/dashboard~chunks/invoices~chunks/page-edit~chunks/pag~824d674f.js?id=38b2085e829a84df0e5f",
"/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js?id=3cbb19b80e635b3524e5", "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js": "/chunks/app-language~chunks/dashboard~chunks/files~chunks/invoices~chunks/my-shared-items~chunks/page~7dbb6a42.js?id=3cbb19b80e635b3524e5",
"/chunks/app-others.js": "/chunks/app-others.js?id=f60c0311260d76d7e2d7", "/chunks/app-others.js": "/chunks/app-others.js?id=f60c0311260d76d7e2d7",
@@ -100,7 +100,7 @@
"/chunks/user-password.js": "/chunks/user-password.js?id=ce6c12a5b038f5481bd1", "/chunks/user-password.js": "/chunks/user-password.js?id=ce6c12a5b038f5481bd1",
"/chunks/user-storage.js": "/chunks/user-storage.js?id=4313d87360b8911ca839", "/chunks/user-storage.js": "/chunks/user-storage.js?id=4313d87360b8911ca839",
"/chunks/user-subscription.js": "/chunks/user-subscription.js?id=370b3df08b2ee39bf6ac", "/chunks/user-subscription.js": "/chunks/user-subscription.js?id=370b3df08b2ee39bf6ac",
"/chunks/users.js": "/chunks/users.js?id=bd78d2a3c0c6253da984", "/chunks/users.js": "/chunks/users.js?id=90f7cc304d20dd44f0a2",
"/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js?id=ee89932f7ee76e74483e", "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~24b428d3.js?id=ee89932f7ee76e74483e",
"/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js?id=8163e0eab55c50f8afb8", "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js": "/vendors~chunks/admin~chunks/admin-account~chunks/app-appearance~chunks/app-billings~chunks/app-email~b505e62a.js?id=8163e0eab55c50f8afb8",
"/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js?id=37ce1e1ab9968c100712", "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js": "/vendors~chunks/admin~chunks/files~chunks/my-shared-items~chunks/platform~chunks/recent-uploads~chunk~40ccbae3.js?id=37ce1e1ab9968c100712",
@@ -1268,5 +1268,38 @@
"/chunks/settings.afa864b89e381de2a866.hot-update.js": "/chunks/settings.afa864b89e381de2a866.hot-update.js", "/chunks/settings.afa864b89e381de2a866.hot-update.js": "/chunks/settings.afa864b89e381de2a866.hot-update.js",
"/chunks/settings.f1e3d221010473c3179c.hot-update.js": "/chunks/settings.f1e3d221010473c3179c.hot-update.js", "/chunks/settings.f1e3d221010473c3179c.hot-update.js": "/chunks/settings.f1e3d221010473c3179c.hot-update.js",
"/chunks/user.fbe98acc20edb54f443d.hot-update.js": "/chunks/user.fbe98acc20edb54f443d.hot-update.js", "/chunks/user.fbe98acc20edb54f443d.hot-update.js": "/chunks/user.fbe98acc20edb54f443d.hot-update.js",
"/chunks/user.0a9193bda9ef24d8a347.hot-update.js": "/chunks/user.0a9193bda9ef24d8a347.hot-update.js" "/chunks/user.0a9193bda9ef24d8a347.hot-update.js": "/chunks/user.0a9193bda9ef24d8a347.hot-update.js",
"/chunks/admin.3cfe613a4c753e7984c4.hot-update.js": "/chunks/admin.3cfe613a4c753e7984c4.hot-update.js",
"/chunks/admin.5cf77ee34cdec99b2160.hot-update.js": "/chunks/admin.5cf77ee34cdec99b2160.hot-update.js",
"/chunks/admin.1f827a974d3854e7c96f.hot-update.js": "/chunks/admin.1f827a974d3854e7c96f.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings~chunks/shared.01414f4b04630fc55c7b.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.01414f4b04630fc55c7b.hot-update.js",
"/chunks/app-appearance.01414f4b04630fc55c7b.hot-update.js": "/chunks/app-appearance.01414f4b04630fc55c7b.hot-update.js",
"/chunks/app-billings.01414f4b04630fc55c7b.hot-update.js": "/chunks/app-billings.01414f4b04630fc55c7b.hot-update.js",
"/chunks/app-email.01414f4b04630fc55c7b.hot-update.js": "/chunks/app-email.01414f4b04630fc55c7b.hot-update.js",
"/chunks/app-index.01414f4b04630fc55c7b.hot-update.js": "/chunks/app-index.01414f4b04630fc55c7b.hot-update.js",
"/chunks/app-language.01414f4b04630fc55c7b.hot-update.js": "/chunks/app-language.01414f4b04630fc55c7b.hot-update.js",
"/chunks/app-others.01414f4b04630fc55c7b.hot-update.js": "/chunks/app-others.01414f4b04630fc55c7b.hot-update.js",
"/chunks/app-payments.01414f4b04630fc55c7b.hot-update.js": "/chunks/app-payments.01414f4b04630fc55c7b.hot-update.js",
"/chunks/page-edit.01414f4b04630fc55c7b.hot-update.js": "/chunks/page-edit.01414f4b04630fc55c7b.hot-update.js",
"/chunks/profile~chunks/settings-password.01414f4b04630fc55c7b.hot-update.js": "/chunks/profile~chunks/settings-password.01414f4b04630fc55c7b.hot-update.js",
"/chunks/user-create.01414f4b04630fc55c7b.hot-update.js": "/chunks/user-create.01414f4b04630fc55c7b.hot-update.js",
"/chunks/user-delete.01414f4b04630fc55c7b.hot-update.js": "/chunks/user-delete.01414f4b04630fc55c7b.hot-update.js",
"/chunks/user-detail.01414f4b04630fc55c7b.hot-update.js": "/chunks/user-detail.01414f4b04630fc55c7b.hot-update.js",
"/chunks/user-storage.01414f4b04630fc55c7b.hot-update.js": "/chunks/user-storage.01414f4b04630fc55c7b.hot-update.js",
"/chunks/admin~chunks/platform~chunks/settings~chunks/shared.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/admin~chunks/platform~chunks/settings~chunks/shared.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/app-appearance.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/app-appearance.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/app-billings.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/app-billings.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/app-email.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/app-email.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/app-index.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/app-index.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/app-language.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/app-language.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/app-others.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/app-others.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/app-payments.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/app-payments.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/page-edit.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/page-edit.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/profile~chunks/settings-password.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/profile~chunks/settings-password.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/user-create.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/user-create.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/user-delete.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/user-delete.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/user-detail.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/user-detail.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/user-storage.5e42c1b9c3db1618bbbd.hot-update.js": "/chunks/user-storage.5e42c1b9c3db1618bbbd.hot-update.js",
"/chunks/app-language.422588dbf7bed9c2add6.hot-update.js": "/chunks/app-language.422588dbf7bed9c2add6.hot-update.js",
"/chunks/users.25a94f1f180b0bdc8cbb.hot-update.js": "/chunks/users.25a94f1f180b0bdc8cbb.hot-update.js"
} }

View File

@@ -1,5 +1,5 @@
<template> <template>
<div class="sm:flex md:h-screen md:overflow-hidden"> <div class="sm:flex md:h-screen md:overflow-hidden" style="background: rgba(244, 245, 246, 0.6)">
<!--On Top of App Components--> <!--On Top of App Components-->
<FilePreview /> <FilePreview />
<Spotlight /> <Spotlight />
@@ -87,7 +87,7 @@
</ContentGroup> </ContentGroup>
</ContentSidebar> </ContentSidebar>
<router-view class="lg:pl-0 pl-6 pr-6 w-full overflow-x-hidden relative lg:pt-6 pt-4" style="background: rgba(244, 245, 246, 0.6)" /> <router-view class="lg:pl-0 pl-6 pr-6 w-full overflow-x-hidden relative lg:pt-6 pt-4" />
</div> </div>
</template> </template>

View File

@@ -94,7 +94,7 @@
</div> </div>
<ValidationProvider tag="div" name="Language string" rules="required" v-slot="{ errors }"> <ValidationProvider tag="div" name="Language string" rules="required" v-slot="{ errors }">
<AppInputText :title="referenceTranslations[key]" :error="errors[0]" v-for="(translation, key) in translationList" :key="key" :is-last="true"> <AppInputText :title="referenceTranslations[key]" :error="errors[0]" v-for="(translation, key) in translationList" :key="key">
<textarea <textarea
v-model="selectedLanguage.data.attributes.translations[key]" v-model="selectedLanguage.data.attributes.translations[key]"
@input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])" @input="$updateText(`/admin/languages/${selectedLanguage.data.id}/strings`, key, selectedLanguage.data.attributes.translations[key])"

View File

@@ -54,7 +54,7 @@
</td> </td>
<td> <td>
<span class="cell-item"> <span class="cell-item">
{{ row.data.attributes.created_at_formatted }} {{ row.data.attributes.created_at }}
</span> </span>
</td> </td>
<td> <td>

View File

@@ -1,4 +1,5 @@
<?php <?php
namespace App\Users\Resources; namespace App\Users\Resources;
use Domain\Folders\Resources\FolderCollection; use Domain\Folders\Resources\FolderCollection;
@@ -20,7 +21,7 @@ class UserResource extends JsonResource
'id' => $this->id, 'id' => $this->id,
'type' => 'user', 'type' => 'user',
'attributes' => [ 'attributes' => [
'avatar' => $this->settings->avatar, 'avatar' => $this->settings->avatar,
'email' => is_demo() ? obfuscate_email($this->email) : $this->email, 'email' => is_demo() ? obfuscate_email($this->email) : $this->email,
'role' => $this->role, 'role' => $this->role,
'two_factor_authentication' => $this->two_factor_secret ? true : false, 'two_factor_authentication' => $this->two_factor_secret ? true : false,
@@ -33,13 +34,13 @@ class UserResource extends JsonResource
'settings' => new SettingsResource($this->settings), 'settings' => new SettingsResource($this->settings),
'favourites' => new FolderCollection($this->favouriteFolders), 'favourites' => new FolderCollection($this->favouriteFolders),
'limitations' => [ 'limitations' => [
'id' => $this->id, 'id' => $this->id,
'type' => 'limitations', 'type' => 'limitations',
'data' => [ 'data' => [
'attributes' => $this->limitations, 'attributes' => $this->limitations,
], ],
], ],
$this->mergeWhen($this->hasSubscription(), fn () => [ $this->mergeWhen($this->hasSubscription(), fn() => [
'subscription' => new SubscriptionResource($this->subscription), 'subscription' => new SubscriptionResource($this->subscription),
]), ]),
], ],