Use vue-based main application layout

OHFLesvos · Mar 24, 2024 · 0621cb0 · 0621cb0
1 parent cbb687b
commit 0621cb0
Show file tree

Hide file tree

Showing 50 changed files with 356 additions and 1,264 deletions.
diff --git a/app/Http/Controllers/Settings/API/SettingsController.php b/app/Http/Controllers/Settings/API/SettingsController.php
@@ -209,6 +209,7 @@ public function list(): JsonResponse
     {
         return response()
             ->json([
+                'branding.signet_file' => Setting::has('branding.signet_file') ? Storage::url(Setting::get('branding.signet_file')) : null,
                 'accounting.transactions.currency' => Setting::get('accounting.transactions.currency'),
                 'accounting.transactions.use_locations' => filter_var(Setting::get('accounting.transactions.use_locations', false), FILTER_VALIDATE_BOOLEAN),
                 'accounting.transactions.use_secondary_categories' => filter_var(Setting::get('accounting.transactions.use_secondary_categories', false), FILTER_VALIDATE_BOOLEAN),

diff --git a/app/Http/Controllers/UserManagement/API/UserProfileController.php b/app/Http/Controllers/UserManagement/API/UserProfileController.php
@@ -17,6 +17,18 @@
 
 class UserProfileController extends Controller
 {
+    public function authenticatedUser(): JsonResponse
+    {
+        $user = Auth::user();
+
+        return response()
+            ->json($user !== null ? [
+                'id' => $user->id,
+                'name' => $user->name,
+                'avatar_url' => $user->avatarUrl(),
+            ] : null);
+    }
+
     public function index(): JsonResponse
     {
         $user = Auth::user()->load('roles');

diff --git a/app/Http/Controllers/UserManagement/UserController.php b/app/Http/Controllers/UserManagement/UserController.php
diff --git a/app/Http/ViewComposers/NavigationComposer.php b/app/Http/ViewComposers/NavigationComposer.php
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -106,10 +106,10 @@ public function permissions(): Collection
             ->values();
     }
 
-    public function avatarUrl(?int $size = null): string
+    public function avatarUrl(): ?string
     {
         if (blank($this->avatar)) {
-            return route('users.avatar', [$this, 'size' => $size]);
+            return null;
         }
 
         if (filter_var($this->avatar, FILTER_VALIDATE_URL)) {

diff --git a/app/Navigation/Drawer/Accounting/AccountingNavigationItem.php b/app/Navigation/Drawer/Accounting/AccountingNavigationItem.php
diff --git a/app/Navigation/Drawer/Badges/BadgesNavigationItem.php b/app/Navigation/Drawer/Badges/BadgesNavigationItem.php
diff --git a/app/Navigation/Drawer/BaseNavigationItem.php b/app/Navigation/Drawer/BaseNavigationItem.php
diff --git a/app/Navigation/Drawer/CommunityVolunteers/CommunityVolunteersNavigationItem.php b/app/Navigation/Drawer/CommunityVolunteers/CommunityVolunteersNavigationItem.php
diff --git a/app/Navigation/Drawer/Fundraising/FundraisingNavigationItem.php b/app/Navigation/Drawer/Fundraising/FundraisingNavigationItem.php
diff --git a/app/Navigation/Drawer/HomeNavigationItem.php b/app/Navigation/Drawer/HomeNavigationItem.php
diff --git a/app/Navigation/Drawer/NavigationItem.php b/app/Navigation/Drawer/NavigationItem.php
diff --git a/app/Navigation/Drawer/ReportsNavigationItem.php b/app/Navigation/Drawer/ReportsNavigationItem.php
diff --git a/app/Navigation/Drawer/Settings/SettingsNavigationItem.php b/app/Navigation/Drawer/Settings/SettingsNavigationItem.php
diff --git a/app/Navigation/Drawer/UserManagement/UsersNavigationItem.php b/app/Navigation/Drawer/UserManagement/UsersNavigationItem.php