diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 5c14a7b9a..e7a7e0b5d 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -11,6 +11,7 @@
use Illuminate\Foundation\Auth\Access\AuthorizesRequests;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
+use Illuminate\Support\Facades\DB;
class Controller extends BaseController
{
diff --git a/app/Http/Livewire/Team/Delete.php b/app/Http/Livewire/Team/Delete.php
new file mode 100644
index 000000000..f25a8b8d8
--- /dev/null
+++ b/app/Http/Livewire/Team/Delete.php
@@ -0,0 +1,30 @@
+delete();
+
+ $team = auth()->user()->teams()->first();
+ $currentTeam->members->each(function ($user) use ($currentTeam) {
+ if ($user->id === auth()->user()->id) {
+ return;
+ }
+ $user->teams()->detach($currentTeam);
+ $session = DB::table('sessions')->where('user_id', $user->id)->first();
+ if ($session) {
+ DB::table('sessions')->where('id', $session->id)->delete();
+ }
+ });
+
+ session(['currentTeam' => $team]);
+ return redirect()->route('team.show');
+ }
+}
diff --git a/app/Models/Team.php b/app/Models/Team.php
index b1c93c4ac..5029df7eb 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -79,4 +79,11 @@ public function sources()
$sources = $sources->merge($github_apps)->merge($gitlab_apps);
return $sources;
}
+ public function isEmpty()
+ {
+ if ($this->projects()->count() === 0 && $this->servers()->count() === 0 && $this->privateKeys()->count() === 0 && $this->sources()->count() === 0) {
+ return true;
+ }
+ return false;
+ }
}
diff --git a/app/Models/User.php b/app/Models/User.php
index b1804d7b4..fa3b83859 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -30,7 +30,6 @@ class User extends Authenticatable implements SendsEmail
protected static function boot()
{
parent::boot();
-
static::created(function (User $user) {
$team = [
'name' => $user->name . "'s Team",
@@ -48,6 +47,7 @@ public function routeNotificationForEmail()
{
return $this->email;
}
+
public function isAdmin()
{
if (auth()->user()->id === 0) {
diff --git a/resources/js/components/MagicBar.vue b/resources/js/components/MagicBar.vue
index d93e4cf0d..58b485e40 100644
--- a/resources/js/components/MagicBar.vue
+++ b/resources/js/components/MagicBar.vue
@@ -163,6 +163,16 @@
d="M3 8a9 9 0 0 1 9 9v1l1.428 -4.285a12 12 0 0 1 6.018 -6.938l.554 -.277" />
{{ $message }}
+{!! $message !!}