From 23e355259b4a7100825f1902e7389c9ba018d468 Mon Sep 17 00:00:00 2001 From: isaacclad Date: Thu, 16 Jul 2026 00:25:26 +0000 Subject: [PATCH] Move Team, Security, and Webhooks under Meet Settings. Drop them from the admin sidebar, surface Team on the settings page, remove the unused branches message, and add Settings back-links on those screens. --- app/Http/Controllers/Meet/SettingsController.php | 6 ------ resources/views/meet/admin/members/create.blade.php | 13 +++---------- resources/views/meet/admin/members/index.blade.php | 6 ++++-- resources/views/meet/settings/calendar.blade.php | 3 +++ resources/views/meet/settings/edit.blade.php | 11 ++++++++--- resources/views/meet/settings/security.blade.php | 3 +++ resources/views/meet/settings/webhooks.blade.php | 3 +++ resources/views/partials/sidebar.blade.php | 11 ++--------- 8 files changed, 26 insertions(+), 30 deletions(-) diff --git a/app/Http/Controllers/Meet/SettingsController.php b/app/Http/Controllers/Meet/SettingsController.php index bcc16dd..4efb59c 100644 --- a/app/Http/Controllers/Meet/SettingsController.php +++ b/app/Http/Controllers/Meet/SettingsController.php @@ -4,7 +4,6 @@ namespace App\Http\Controllers\Meet; use App\Http\Controllers\Controller; use App\Http\Controllers\Meet\Concerns\ScopesToAccount; -use App\Models\Branch; use App\Services\Meet\AuditLogger; use App\Services\Meet\MeetPermissions; use App\Services\Meet\SecurityPolicyService; @@ -23,14 +22,9 @@ class SettingsController extends Controller $organization = $this->organization($request); $canManage = app(MeetPermissions::class)->can($this->member($request), 'settings.manage'); - $branchCount = Branch::owned($this->ownerRef($request)) - ->where('organization_id', $organization->id) - ->count(); - return view('meet.settings.edit', [ 'organization' => $organization, 'canManage' => $canManage, - 'branchCount' => $branchCount, 'isAdmin' => app(MeetPermissions::class)->isAdmin($this->member($request)), 'orgTypes' => [ 'business' => 'Business', diff --git a/resources/views/meet/admin/members/create.blade.php b/resources/views/meet/admin/members/create.blade.php index 4845a54..8d7d25a 100644 --- a/resources/views/meet/admin/members/create.blade.php +++ b/resources/views/meet/admin/members/create.blade.php @@ -1,5 +1,8 @@
+
+ ← Team +

Invite team member

@@ -36,16 +39,6 @@
-
- - -
- diff --git a/resources/views/meet/admin/members/index.blade.php b/resources/views/meet/admin/members/index.blade.php index 5e4c9ba..aaea6c2 100644 --- a/resources/views/meet/admin/members/index.blade.php +++ b/resources/views/meet/admin/members/index.blade.php @@ -1,4 +1,7 @@ +
+ ← Settings +

Team members

Add member @@ -7,7 +10,7 @@
- + @foreach ($members as $member) @@ -19,7 +22,6 @@ -
MemberRoleBranch
MemberRole
{{ $display }} {{ $roles[$member->role] ?? $member->role }}{{ $member->branch?->name ?? 'All branches' }} @if ($member->user_ref !== auth()->user()->public_id) +
+ ← Settings +
  • diff --git a/resources/views/meet/settings/edit.blade.php b/resources/views/meet/settings/edit.blade.php index 0ba6a4a..292aebc 100644 --- a/resources/views/meet/settings/edit.blade.php +++ b/resources/views/meet/settings/edit.blade.php @@ -52,8 +52,15 @@ @if ($isAdmin ?? false) - +
      +
    • +
      +

      Team

      +

      Invite members and assign roles for this Meet organization.

      +
      + Manage +

    • Security policy

      @@ -78,7 +85,5 @@
    @endif - -

    {{ $branchCount }} branch(es) configured.

    diff --git a/resources/views/meet/settings/security.blade.php b/resources/views/meet/settings/security.blade.php index cb03ef8..1683fb6 100644 --- a/resources/views/meet/settings/security.blade.php +++ b/resources/views/meet/settings/security.blade.php @@ -1,5 +1,8 @@ +
    + ← Settings +
    @csrf @method('PUT') diff --git a/resources/views/meet/settings/webhooks.blade.php b/resources/views/meet/settings/webhooks.blade.php index 20daedb..26db186 100644 --- a/resources/views/meet/settings/webhooks.blade.php +++ b/resources/views/meet/settings/webhooks.blade.php @@ -1,5 +1,8 @@ +
    + ← Settings +
    @csrf diff --git a/resources/views/partials/sidebar.blade.php b/resources/views/partials/sidebar.blade.php index c8cf165..7115e32 100644 --- a/resources/views/partials/sidebar.blade.php +++ b/resources/views/partials/sidebar.blade.php @@ -40,19 +40,12 @@ if ($permissions->isAdmin($member)) { $adminNav[] = ['name' => 'Usage', 'route' => route('meet.admin.usage'), 'active' => request()->routeIs('meet.admin.*'), 'icon' => '']; - $adminNav[] = ['name' => 'Security', 'route' => route('meet.settings.security'), 'active' => request()->routeIs('meet.settings.security*'), - 'icon' => '']; - $adminNav[] = ['name' => 'Calendar', 'route' => route('meet.settings.calendar'), 'active' => request()->routeIs('meet.settings.calendar*'), - 'icon' => '']; - $adminNav[] = ['name' => 'Webhooks', 'route' => route('meet.settings.webhooks'), 'active' => request()->routeIs('meet.settings.webhooks*'), - 'icon' => '']; $adminNav[] = ['name' => 'Contacts', 'route' => route('meet.contacts.groups'), 'active' => request()->routeIs('meet.contacts.*'), 'icon' => '']; - $adminNav[] = ['name' => 'Team', 'route' => route('meet.members.index'), 'active' => request()->routeIs('meet.members.*'), - 'icon' => '']; } - $settingsActive = request()->routeIs('meet.settings*'); + // Team, Security, Calendar, and Webhooks live under Settings (not as top-level admin items). + $settingsActive = request()->routeIs('meet.settings*', 'meet.members.*'); @endphp