- |
+ |
diff --git a/resources/js/components/UI/Bar.vue b/resources/js/components/UI/Bar.vue
index 0df87c49..933b09a0 100644
--- a/resources/js/components/UI/Bar.vue
+++ b/resources/js/components/UI/Bar.vue
@@ -7,19 +7,19 @@
>
diff --git a/resources/js/views/FileView/Components/NavigationSharePanel.vue b/resources/js/views/FileView/Components/NavigationSharePanel.vue
index 00d212be..d47da453 100644
--- a/resources/js/views/FileView/Components/NavigationSharePanel.vue
+++ b/resources/js/views/FileView/Components/NavigationSharePanel.vue
@@ -23,7 +23,6 @@
diff --git a/src/App/Users/Models/User.php b/src/App/Users/Models/User.php
index 507ee6fc..791efb15 100644
--- a/src/App/Users/Models/User.php
+++ b/src/App/Users/Models/User.php
@@ -121,19 +121,6 @@ class User extends Authenticatable implements MustVerifyEmail
->sum('filesize');
}
- /**
- * Get user full folder tree
- */
- public function getFolderTreeAttribute(): Collection
- {
- return Folder::with(['folders.shared', 'shared:token,id,item_id,permission,is_protected,expire_in'])
- ->where('parent_id')
- ->where('team_folder', false)
- ->where('user_id', $this->id)
- ->sortable()
- ->get();
- }
-
public function settings(): HasOne
{
return $this->hasOne(UserSetting::class);
diff --git a/src/App/Users/Resources/UserResource.php b/src/App/Users/Resources/UserResource.php
index 42c70f12..beea3700 100644
--- a/src/App/Users/Resources/UserResource.php
+++ b/src/App/Users/Resources/UserResource.php
@@ -36,7 +36,6 @@ class UserResource extends JsonResource
'role' => $this->role,
'two_factor_authentication' => $this->two_factor_secret ? true : false,
'socialite_account' => $this->password ? false : true,
- 'folders' => $this->folder_tree,
'storage' => $this->storage,
'created_at' => format_date($this->created_at, '%d. %b. %Y'),
'updated_at' => format_date($this->updated_at, '%d. %B. %Y'),
diff --git a/src/App/Users/Resources/UserStorageResource.php b/src/App/Users/Resources/UserStorageResource.php
index 5c473f46..189e6639 100644
--- a/src/App/Users/Resources/UserStorageResource.php
+++ b/src/App/Users/Resources/UserStorageResource.php
@@ -134,13 +134,13 @@ class UserStorageResource extends JsonResource
->get();
$upload = $trafficRecords->map(fn($record) => [
- 'created_at' => format_date($record->created_at),
+ 'created_at' => format_date($record->created_at, '%d. %B'),
'percentage' => $uploadMax !== 0 ? round(($record->upload / $uploadMax) * 100, 2) : 0,
'amount' => Metric::bytes($record->upload)->format(),
]);
$download = $trafficRecords->map(fn($record) => [
- 'created_at' => format_date($record->created_at),
+ 'created_at' => format_date($record->created_at, '%d. %B'),
'percentage' => $downloadMax !== 0 ? round(($record->download / $downloadMax) * 100, 2) : 0,
'amount' => Metric::bytes($record->download)->format(),
]);
diff --git a/tests/App/Users/UserAccountTest.php b/tests/App/Users/UserAccountTest.php
index 2616fb4a..39a1f5c6 100644
--- a/tests/App/Users/UserAccountTest.php
+++ b/tests/App/Users/UserAccountTest.php
@@ -161,7 +161,6 @@ class UserAccountTest extends TestCase
'role' => $user->role,
'socialite_account' => false,
'two_factor_authentication' => false,
- 'folders' => [],
'storage' => [
'used' => 0,
'used_formatted' => '0%',
|