roles

app/Actions/Fortify/CreateNewUser.php

@@ -43,34 +43,21 @@ public function create(array $input): User
         if (User::count() == 0) {
             // If this is the first user, make them the root user
             // Team is already created in the database/seeders/ProductionSeeder.php
-            $team = Team::find(0);
             $user = User::create([
                 'id' => 0,
                 'name' => $input['name'],
                 'email' => $input['email'],
                 'password' => Hash::make($input['password']),
-                'is_root_user' => true,
             ]);
+            $team = $user->teams()->first();
         } else {
-            $team = Team::create([
-                'name' => explode(' ', $input['name'], 2)[0] . "'s Team",
-                'personal_team' => true,
-            ]);
             $user = User::create([
                 'name' => $input['name'],
                 'email' => $input['email'],
                 'password' => Hash::make($input['password']),
-                'is_root_user' => false,
             ]);
+            $team = $user->teams()->first();
         }
-
-        // Add user to team
-        DB::table('team_user')->insert([
-            'user_id' => $user->id,
-            'team_id' => $team->id,
-            'role' => 'admin',
-        ]);
-
         // Set session variable
         session(['currentTeam' => $user->currentTeam = $team]);
         return $user;

app/Http/Controllers/Controller.php

@@ -51,4 +51,16 @@ public function emails()
             return redirect()->route('dashboard');
         }
     }
+    public function team()
+    {
+        ray(auth()->user()->isAdmin());
+        $invitations = [];
+        if (auth()->user()->isAdmin()) {
+            $invitations = auth()->user()->currentTeam()->invitations;
+        }
+        return view('team.show', [
+            'transactional_emails_active' => data_get(InstanceSettings::get(), 'extra_attributes.smtp_host') ? true : false,
+            'invitations' => $invitations,
+        ]);
+    }
 }

app/Http/Livewire/Destination/Form.php

@@ -31,7 +31,7 @@ public function delete()
             $this->destination->delete();
             return redirect()->route('dashboard');
         } catch (\Exception $e) {
-            return general_error_handler($e);
+            return general_error_handler(err: $e);
         }
     }
 }

app/Http/Livewire/ForceUpgrade.php

@@ -14,7 +14,7 @@ public function upgrade()
             $this->visible = true;
             dispatch(new InstanceAutoUpdateJob(force: true));
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Notifications/EmailSettings.php

@@ -26,15 +26,15 @@ class EmailSettings extends Component
         'model.extra_attributes.smtp_test_recipients' => 'nullable',
     ];
     protected $validationAttributes = [
-        'model.extra_attributes.smtp_from_address' => '',
+        'model.extra_attributes.smtp_from_address' => 'From Address',
-        'model.extra_attributes.smtp_from_name' => '',
+        'model.extra_attributes.smtp_from_name' => 'From Name',
-        'model.extra_attributes.smtp_recipients' => '',
+        'model.extra_attributes.smtp_recipients' => 'Recipients',
-        'model.extra_attributes.smtp_host' => '',
+        'model.extra_attributes.smtp_host' => 'Host',
-        'model.extra_attributes.smtp_port' => '',
+        'model.extra_attributes.smtp_port' => 'Port',
-        'model.extra_attributes.smtp_encryption' => '',
+        'model.extra_attributes.smtp_encryption' => 'Encryption',
-        'model.extra_attributes.smtp_username' => '',
+        'model.extra_attributes.smtp_username' => 'Username',
-        'model.extra_attributes.smtp_password' => '',
+        'model.extra_attributes.smtp_password' => 'Password',
-        'model.extra_attributes.smtp_test_recipients' => '',
+        'model.extra_attributes.smtp_test_recipients' => 'Test Recipients',
     ];
     public function copySMTP()
     {

app/Http/Livewire/PrivateKey/Change.php

@@ -35,7 +35,7 @@ public function changePrivateKey()
             $this->private_key->save();
             session('currentTeam')->privateKeys = PrivateKey::where('team_id', session('currentTeam')->id)->get();
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/PrivateKey/Create.php

@@ -38,7 +38,7 @@ public function createPrivateKey()
             }
             return redirect()->route('private-key.show', ['private_key_uuid' => $private_key->uuid]);
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Profile/Form.php

@@ -28,8 +28,8 @@ public function submit()
             User::where('id', $this->userId)->update([
                 'name' => $this->name,
             ]);
-        } catch (\Throwable $error) {
+        } catch (\Throwable $e) {
-            return general_error_handler($error, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/Application/DeploymentNavbar.php

@@ -37,8 +37,8 @@ public function cancel()
             // Remove builder container
             instant_remote_process(["docker rm -f {$this->deployment_uuid}"], $this->application->destination->server, throwError: false, repeat: 25);
             queue_next_deployment($this->application);
-        } catch (\Throwable $th) {
+        } catch (\Throwable $e) {
-            return general_error_handler($th, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/Application/EnvironmentVariable/All.php

@@ -27,7 +27,7 @@ public function submit($data)
             $this->application->refresh();
             $this->emit('clearAddEnv');
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/Application/General.php

@@ -112,7 +112,7 @@ public function submit()
             $this->application->fqdn = $domains->implode(',');
             $this->application->save();
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/Application/Previews.php

@@ -41,9 +41,9 @@ public function load_prs()
             ['rate_limit_remaining' => $rate_limit_remaining, 'data' => $data] = get_from_git_api($this->application->source, "/repos/{$this->application->git_repository}/pulls");
             $this->rate_limit_remaining = $rate_limit_remaining;
             $this->pull_requests = $data->sortBy('number')->values();
-        } catch (\Throwable $th) {
+        } catch (\Throwable $e) {
             $this->rate_limit_remaining = 0;
-            return general_error_handler($th, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
     public function deploy(int $pull_request_id, string|null $pull_request_html_url = null)
@@ -70,8 +70,8 @@ public function deploy(int $pull_request_id, string|null $pull_request_html_url
                 'deployment_uuid' => $this->deployment_uuid,
                 'environment_name' => $this->parameters['environment_name'],
             ]);
-        } catch (\Throwable $th) {
+        } catch (\Throwable $e) {
-            return general_error_handler($th, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
     public function stop(int $pull_request_id)
@@ -83,8 +83,8 @@ public function stop(int $pull_request_id)
             instant_remote_process(["docker rm -f $container_name"], $this->application->destination->server, throwError: false);
             ApplicationPreview::where('application_id', $this->application->id)->where('pull_request_id', $pull_request_id)->delete();
             $this->application->refresh();
-        } catch (\Throwable $th) {
+        } catch (\Throwable $e) {
-            return general_error_handler($th, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/Application/ResourceLimits.php

@@ -44,7 +44,7 @@ public function submit()
             $this->validate();
             $this->application->save();
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/Application/Rollback.php

@@ -63,7 +63,7 @@ public function loadImages()
                 ];
             })->toArray();
         } catch (\Throwable $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/Application/Storages/All.php

@@ -27,7 +27,7 @@ public function submit($data)
             $this->application->refresh();
             $this->emit('clearAddStorage');
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/New/GithubPrivateRepository.php

@@ -138,7 +138,7 @@ public function submit()
                 'project_uuid' => $project->uuid,
             ]);
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
     public function instantSave()

app/Http/Livewire/Project/New/GithubPrivateRepositoryDeployKey.php

@@ -96,7 +96,7 @@ public function submit()
                 'application_uuid' => $application->uuid,
             ]);
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Project/New/PublicGitRepository.php

@@ -68,8 +68,8 @@ public function load_branches()
         try {
             ['data' => $data] = get_from_git_api($this->git_source, "/repos/{$this->git_repository}/branches");
             $this->branches = collect($data)->pluck('name')->toArray();
-        } catch (\Throwable $th) {
+        } catch (\Throwable $e) {
-            return general_error_handler($th, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
     private function get_git_source()
@@ -135,7 +135,7 @@ public function submit()
                 'application_uuid' => $application->uuid,
             ]);
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/RunCommand.php

@@ -29,7 +29,7 @@ public function runCommand()
             $activity = remote_process([$this->command], Server::where('uuid', $this->server)->first(), ignore_errors: true);
             $this->emit('newMonitorActivity', $activity->id);
         } catch (\Exception $e) {
-            return general_error_handler($e);
+            return general_error_handler(err: $e);
         }
     }
 }

app/Http/Livewire/Server/Form.php

@@ -55,7 +55,7 @@ public function validateServer()
                 $this->dockerComposeVersion = 'Not installed.';
             }
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
     public function delete()

app/Http/Livewire/Server/New/ByIp.php

@@ -61,7 +61,7 @@ public function submit()
             $server->settings->save();
             return redirect()->route('server.show', $server->uuid);
         } catch (\Exception $e) {
-            return general_error_handler($e);
+            return general_error_handler(err: $e);
         }
     }
 }

app/Http/Livewire/Server/Proxy.php

@@ -64,7 +64,7 @@ public function saveConfiguration(Server $server)
                 "echo '$docker_compose_yml_base64' | base64 -d > $proxy_path/docker-compose.yml",
             ], $server);
         } catch (\Exception $e) {
-            return general_error_handler($e);
+            return general_error_handler(err: $e);
         }
     }
     public function resetProxy()
@@ -72,7 +72,7 @@ public function resetProxy()
         try {
             $this->proxy_settings = resolve(CheckProxySettingsInSync::class)($this->server, true);
         } catch (\Exception $e) {
-            return general_error_handler($e);
+            return general_error_handler(err: $e);
         }
     }
     public function checkProxySettingsInSync()
@@ -80,7 +80,7 @@ public function checkProxySettingsInSync()
         try {
             $this->proxy_settings = resolve(CheckProxySettingsInSync::class)($this->server);
         } catch (\Exception $e) {
-            return general_error_handler($e);
+            return general_error_handler(err: $e);
         }
     }
 }

app/Http/Livewire/Source/Github/Change.php

@@ -35,7 +35,7 @@ public function submit()
             $this->validate();
             $this->github_app->save();
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
     public function instantSave()
@@ -45,7 +45,7 @@ public function instantSave()
             $this->github_app->save();
             $this->emit('saved', 'GitHub settings updated!');
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
     public function mount()
@@ -63,7 +63,7 @@ public function delete()
             $this->github_app->delete();
             redirect()->route('dashboard');
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Source/Github/Create.php

@@ -43,7 +43,7 @@ public function createGitHubApp()
             ]);
             redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
         } catch (\Exception $e) {
-            return general_error_handler($e, $this);
+            return general_error_handler(err: $e, that: $this);
         }
     }
 }

app/Http/Livewire/Team/InviteLink.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Http\Livewire\Team;
+
+use App\Models\TeamInvitation;
+use App\Models\User;
+use Livewire\Component;
+use Visus\Cuid2\Cuid2;
+
+class InviteLink extends Component
+{
+    public string $email;
+    public function mount()
+    {
+        $this->email = config('app.env') === 'local' ? 'test@example.com' : '';
+    }
+    public function inviteByLink()
+    {
+        $uuid = new Cuid2(32);
+        $link = url('/') . '/api/invitation/' . $uuid;
+        try {
+            $user_exists = User::whereEmail($this->email)->exists();
+            if (!$user_exists) {
+                return general_error_handler(that: $this, customErrorMessage: "$this->email must be registered first (or activate transactional emails to invite via email).");
+            }
+            $invitation = TeamInvitation::where('email', $this->email);
+            if ($invitation->exists()) {
+                $created_at = $invitation->first()->created_at;
+                $diff = $created_at->diffInMinutes(now());
+                if ($diff < 11) {
+                    return general_error_handler(that: $this, customErrorMessage: "Invitation already sent and active for $this->email.");
+                } else {
+                    $invitation->delete();
+                }
+            }
+            $invitation = TeamInvitation::firstOrCreate([
+                'team_id' => session('currentTeam')->id,
+                'email' => $this->email,
+                'role' => 'readonly',
+                'link' => $link,
+            ]);
+            $this->emit('reloadWindow');
+        } catch (\Throwable $e) {
+            $error_message = $e->getMessage();
+            if ($e->getCode() === '23505') {
+                $error_message = 'Invitation already sent.';
+            }
+            return general_error_handler(err: $e, that: $this, customErrorMessage: $error_message);
+        }
+    }
+}

app/Http/Livewire/Team/Member.php

@@ -8,10 +8,19 @@
 class Member extends Component
 {
     public User $member;
+    public function makeAdmin()
+    {
+        $this->member->teams()->updateExistingPivot(session('currentTeam')->id, ['role' => 'admin']);
+        $this->emit('reloadWindow');
+    }
+    public function makeReadonly()
+    {
+        $this->member->teams()->updateExistingPivot(session('currentTeam')->id, ['role' => 'readonly']);
+        $this->emit('reloadWindow');
+    }
     public function remove()
     {
         $this->member->teams()->detach(session('currentTeam'));
-        session(['currentTeam' => session('currentTeam')->fresh()]);
         $this->emit('reloadWindow');
     }
 }

app/Models/Team.php

@@ -62,6 +62,10 @@ public function privateKeys()
     }
     public function members()
     {
-        return $this->belongsToMany(User::class, 'team_user', 'team_id', 'user_id');
+        return $this->belongsToMany(User::class, 'team_user', 'team_id', 'user_id')->withPivot('role');
+    }
+    public function invitations()
+    {
+        return $this->hasMany(TeamInvitation::class);
     }
 }

app/Models/TeamInvitation.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class TeamInvitation extends Model
+{
+    protected $fillable = [
+        'team_id',
+        'email',
+        'role',
+        'link',
+    ];
+    public function team()
+    {
+        return $this->belongsTo(Team::class);
+    }
+}

app/Models/User.php

@@ -33,11 +33,37 @@ protected static function boot()
         static::creating(function (Model $model) {
             $model->uuid = (string) new Cuid2(7);
         });
+        static::created(function (User $user) {
+            $team = [
+                'name' => $user->name . "'s Team",
+                'personal_team' => true,
+            ];
+            if ($user->id === 0) {
+                $team['id'] = 0;
+                $team['name'] = 'Root Team';
+            }
+            $new_team = Team::create($team);
+            $user->teams()->attach($new_team, ['role' => 'owner']);
+        });
     }
     public function isAdmin()
     {
-        ray(session('currentTeam'));
+        if (auth()->user()->id === 0) {
-        return session('currentTeam');
+            ray('is root user');
+            return true;
+        }
+        $teams = $this->teams()->get();
+
+        $is_part_of_root_team = $teams->where('id', 0)->first();
+        $is_admin_of_root_team = $is_part_of_root_team &&
+            ($is_part_of_root_team->pivot->role === 'admin' || $is_part_of_root_team->pivot->role === 'owner');
+
+        if ($is_part_of_root_team && $is_admin_of_root_team) {
+            ray('is admin of root team');
+            return true;
+        }
+        $role = $teams->where('id', session('currentTeam')->id)->first()->pivot->role;
+        return $role === 'admin' || $role === 'owner';
     }
     public function isInstanceAdmin()
     {
@@ -51,14 +77,12 @@ public function isInstanceAdmin()
     }
     public function teams()
     {
-        return $this->belongsToMany(Team::class);
+        return $this->belongsToMany(Team::class)->withPivot('role');
+    }
+    public function currentTeam()
+    {
+        return $this->teams()->where('team_id', session('currentTeam')->id)->first();
     }
-
-    // public function currentTeam()
-    // {
-    //     return $this->belongsTo(Team::class);
-    // }
-
     public function otherTeams()
     {
         $team_id = session('currentTeam')->id;
@@ -66,6 +90,13 @@ public function otherTeams()
             return $team->id != $team_id;
         });
     }
+    public function role()
+    {
+        if ($this->teams()->where('team_id', 0)->first()) {
+            return 'admin';
+        }
+        return $this->teams()->where('team_id', session('currentTeam')->id)->first()->pivot->role;
+    }
     public function resources()
     {
         $team_id = session('currentTeam')->id;

bootstrap/helpers/shared.php

@@ -6,30 +6,31 @@
 use Visus\Cuid2\Cuid2;
 use Illuminate\Support\Str;
 
-function general_error_handler(\Throwable $e, $that = null, $isJson = false)
+function general_error_handler(\Throwable|null $err = null, $that = null, $isJson = false, $customErrorMessage = null)
 {
     try {
-        ray('ERROR OCCURED: ' . $e->getMessage());
+        ray('ERROR OCCURED: ' . $err->getMessage());
-        if ($e instanceof QueryException) {
+        if ($err instanceof QueryException) {
-            if ($e->errorInfo[0] === '23505') {
+            if ($err->errorInfo[0] === '23505') {
-                throw new \Exception('Duplicate entry found.', '23505');
+                throw new \Exception($customErrorMessage ?? 'Duplicate entry found.', '23505');
-            } else if (count($e->errorInfo) === 4) {
+            } else if (count($err->errorInfo) === 4) {
-                throw new \Exception($e->errorInfo[3]);
+                throw new \Exception($customErrorMessage ?? $err->errorInfo[3]);
             } else {
-                throw new \Exception($e->errorInfo[2]);
+                throw new \Exception($customErrorMessage ?? $err->errorInfo[2]);
             }
         } else {
-            throw new \Exception($e->getMessage());
+            throw new \Exception($customErrorMessage ?? $err->getMessage());
         }
     } catch (\Throwable $error) {
         if ($that) {
-            return $that->emit('error', $error->getMessage());
+            return $that->emit('error', $customErrorMessage ?? $error->getMessage());
         } elseif ($isJson) {
             return response()->json([
                 'code' => $error->getCode(),
                 'error' => $error->getMessage(),
             ]);
         } else {
+            ray($customErrorMessage);
             ray($error);
         }
     }

database/migrations/2014_10_12_000000_create_users_table.php

@@ -14,7 +14,6 @@ public function up(): void
         Schema::create('users', function (Blueprint $table) {
             $table->id();
             $table->string('uuid')->unique();
-            $table->boolean('is_root_user')->default(false);
             $table->string('name')->default('Your Name Here');
             $table->string('email')->unique();
             $table->timestamp('email_verified_at')->nullable();

database/migrations/2023_03_20_112812_create_team_user_table.php

@@ -15,7 +15,7 @@ public function up(): void
             $table->id();
             $table->foreignId('team_id');
             $table->foreignId('user_id');
-            $table->string('role')->nullable();
+            $table->string('role')->default('readonly');
             $table->timestamps();
 
             $table->unique(['team_id', 'user_id']);

database/migrations/2023_03_20_112813_create_team_invitations_table.php

@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('team_invitations', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('team_id')->constrained()->cascadeOnDelete();
+            $table->string('email');
+            $table->string('role')->default('readonly');
+            $table->string('link')->nullable();
+            $table->timestamps();
+
+            $table->unique(['team_id', 'email']);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('team_invitations');
+    }
+};

database/seeders/ProductionSeeder.php

@@ -46,13 +46,13 @@ public function run(): void
         }
 
         // Add first Team if it doesn't exist
-        if (Team::find(0) == null) {
+        // if (Team::find(0) == null) {
-            Team::create([
+        //     Team::create([
-                'id' => 0,
+        //         'id' => 0,
-                'name' => "Root's Team",
+        //         'name' => "Root's Team",
-                'personal_team' => true,
+        //         'personal_team' => true,
-            ]);
+        //     ]);
-        }
+        // }
 
         // Save SSH Keys for the Coolify Host
         $coolify_key_name = "id.root@host.docker.internal";

database/seeders/TeamSeeder.php

@@ -11,42 +11,13 @@ class TeamSeeder extends Seeder
 {
     public function run(): void
     {
-        $root_user = User::find(0);
+        $normal_user_in_root_team = User::find(1);
-        $normal_user = User::find(1);
+        $root_user_personal_team = Team::find(0);
 
-        $root_user_personal_team = Team::create([
+        $normal_user_in_root_team->teams()->attach($root_user_personal_team);
-            'id' => 0,
+
-            'name' => "Root Team",
+        $normal_user_not_in_root_team = User::find(2);
-            'personal_team' => true,
+        $normal_user_in_root_team_personal_team = Team::find(1);
-        ]);
+        $normal_user_not_in_root_team->teams()->attach($normal_user_in_root_team_personal_team, ['role' => 'admin']);
-        $root_user_other_team = Team::create([
-            'name' => "Root User's Other Team",
-            'personal_team' => false,
-        ]);
-        $normal_user_personal_team = Team::create([
-            'name' => 'Normal Team',
-            'personal_team' => true,
-        ]);
-        // $root_user->teams()->attach($root_user_personal_team);
-        // $root_user->teams()->attach($root_user_other_team);
-        // $normal_user->teams()->attach($normal_user_personal_team);
-        // $normal_user->teams()->attach($root_user_personal_team);
-        DB::table('team_user')->insert([
-            'team_id' => $root_user_personal_team->id,
-            'user_id' => $root_user->id,
-            'role' => 'admin',
-        ]);
-        DB::table('team_user')->insert([
-            'team_id' =>  $root_user_other_team->id,
-            'user_id' => $root_user->id,
-        ]);
-        DB::table('team_user')->insert([
-            'team_id' =>  $normal_user_personal_team->id,
-            'user_id' => $normal_user->id,
-        ]);
-        DB::table('team_user')->insert([
-            'team_id' =>  $root_user_personal_team->id,
-            'user_id' => $normal_user->id,
-        ]);
     }
 }

database/seeders/UserSeeder.php

@@ -13,11 +13,14 @@ public function run(): void
             'id' => 0,
             'name' => 'Root User',
             'email' => 'test@example.com',
-            'is_root_user' => true,
         ]);
         User::factory()->create([
-            'name' => 'Normal User',
+            'name' => 'Normal User (but in root team)',
             'email' => 'test2@example.com',
         ]);
+        User::factory()->create([
+            'name' => 'Normal User (not in root team)',
+            'email' => 'test3@example.com',
+        ]);
     }
 }

resources/views/livewire/notifications/discord-settings.blade.php

@@ -5,10 +5,12 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
+            @if ($model->extra_attributes->discord_active)
                 <x-forms.button class="text-white normal-case btn btn-xs no-animation btn-primary"
                     wire:click="sendTestNotification">
                     Send Test Notifications
                 </x-forms.button>
+            @endif
         </div>
         <div class="flex flex-col gap-2 xl:flex-row w-96">
             <x-forms.checkbox instantSave id="model.extra_attributes.discord_active" label="Notification Enabled" />

resources/views/livewire/notifications/email-settings.blade.php

@@ -10,10 +10,12 @@
                     Copy from Instance Settings
                 </x-forms.button>
             @endif
+            @if ($model->extra_attributes->smtp_active)
                 <x-forms.button class="text-white normal-case btn btn-xs no-animation btn-primary"
                     wire:click="sendTestNotification">
                     Send Test Notifications
                 </x-forms.button>
+            @endif
         </div>
         <div class="flex flex-col w-96">
             <x-forms.checkbox instantSave id="model.extra_attributes.smtp_active" label="Notification Enabled" />

resources/views/livewire/team/invite-link.blade.php

@@ -0,0 +1,6 @@
+<div>
+    <form wire:submit.prevent='inviteByLink' class="flex items-center gap-2">
+        <x-forms.input id="email" type="email" name="email" placeholder="Email" />
+        <x-forms.button type="submit">Invite with link</x-forms.button>
+    </form>
+</div>

resources/views/livewire/team/member.blade.php

@@ -1,17 +1,25 @@
 <tr class="border-coolgray-200">
-    <th class="text-warning">{{ $member->id }}</th>
+    {{-- <th class="text-warning">{{ $member->id }}</th> --}}
-    <td>{{ $member->name }}</td>
+    <th>{{ $member->name }}</th>
     <td>{{ $member->email }}</td>
+    <td>{{ data_get($member, 'pivot.role') }}</td>
     <td>
-        {{-- @if (auth()->user()->isAdmin())
+        {{-- TODO: This is not good --}}
+        @if (auth()->user()->isAdmin())
+            @if ($member->id !== auth()->user()->id)
+                @if (data_get($member, 'pivot.role') !== 'owner')
+                    @if (data_get($member, 'pivot.role') !== 'admin')
                         <x-forms.button wire:click="makeAdmin">Make admin</x-forms.button>
                     @else
-            <x-forms.button disabled>Make admin</x-forms.button>
+                        <x-forms.button wire:click="makeReadonly">Make readonly</x-forms.button>
-        @endif --}}
+                    @endif
-        @if ($member->id !== auth()->user()->id)
                     <x-forms.button wire:click="remove">Remove</x-forms.button>
                 @else
                     <x-forms.button disabled>Remove</x-forms.button>
                 @endif
+            @else
+                <x-forms.button disabled>Remove</x-forms.button>
+            @endif
+        @endif
     </td>
 </tr>

resources/views/team/show.blade.php

@@ -5,24 +5,46 @@
         <table class="table">
             <thead>
                 <tr class="text-warning border-coolgray-200">
-                    <th></th>
                     <th>Name</th>
                     <th>Email</th>
+                    <th>Role</th>
                     <th>Actions</th>
                 </tr>
             </thead>
             <tbody>
-                @foreach (session('currentTeam')->members as $member)
+                @foreach (auth()->user()->currentTeam()->members->sortBy('name') as $member)
                     <livewire:team.member :member="$member" :wire:key="$member->id" />
                 @endforeach
             </tbody>
         </table>
     </div>
-    {{-- <div class="py-4">
+    @if (auth()->user()->isAdmin())
-        <h3>Invite a new member</h3>
+        @if (!$transactional_emails_active)
+            <div class="py-4">
+                <h3 class="pb-4">Invite a new member</h3>
                 <form class="flex items-center gap-2">
                     <x-forms.input type="email" name="email" placeholder="Email" />
                     <x-forms.button>Invite</x-forms.button>
                 </form>
-    </div> --}}
+            </div>
+        @else
+            <div class="py-4">
+                <h3 class="pb-4">Invite a new member</h3>
+                <livewire:team.invite-link />
+                <div class="text-sm text-warning">You need to configure SMTP settings before you can invite a new member
+                    via
+                    email.
+                </div>
+            </div>
+            @if ($invitations->count() > 0)
+                <h2 class="pb-2">Pending Invitations</h2>
+            @endif
+            @foreach ($invitations as $invite)
+                <div class="flex gap-2 text-sm">
+                    <div>{{ $invite->email }}</div>
+                    <div>Sent: {{ $invite->created_at }}</div>
+                </div>
+            @endforeach
+        @endif
+    @endif
 </x-layout>

routes/api.php

@@ -18,6 +18,10 @@
 Route::get('/health', function () {
     return 'OK';
 });
+Route::get('/invitation/{uuid}', function () {
+    ray('Invitation', request()->route('uuid'));
+    return 'OK';
+});
 // Route::middleware('auth:sanctum')->get('/user', function (Request $request) {
 //     return $request->user();
 // });

routes/web.php

@@ -54,7 +54,7 @@
     Route::get('/settings', [Controller::class, 'settings'])->name('settings.configuration');
     Route::get('/settings/emails', [Controller::class, 'emails'])->name('settings.emails');
     Route::get('/profile', fn () => view('profile', ['request' => request()]))->name('profile');
-    Route::get('/profile/team', fn () => view('team.show'))->name('team.show');
+    Route::get('/profile/team', [Controller::class, 'team'])->name('team.show');
     Route::get('/profile/team/notifications', fn () => view('team.notifications'))->name('team.notifications');
     Route::get('/command-center', fn () => view('command-center', ['servers' => Server::validated()->get()]))->name('command-center');
 });

routes/webhooks.php

@@ -37,7 +37,7 @@
         $github_app->save();
         return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
     } catch (\Exception $e) {
-        return general_error_handler($e);
+        return general_error_handler(err: $e);
     }
 });
 
@@ -53,7 +53,7 @@
         }
         return redirect()->route('source.github.show', ['github_app_uuid' => $github_app->uuid]);
     } catch (\Exception $e) {
-        return general_error_handler($e);
+        return general_error_handler(err: $e);
     }
 });
 Route::post('/source/github/events', function () {
@@ -166,6 +166,6 @@
             }
         }
     } catch (\Exception $e) {
-        return general_error_handler($e);
+        return general_error_handler(err: $e);
     }
 });