Merge branch '1.x' into fixes

README.md

@@ -31,27 +31,21 @@ And more on the way.
 
 ### install
 
-`composer require lara-zeus/tartarus`
 
-## setup
+## Installations:
 
-add locales to zeus-tartarus.php
+- install laravel
+- install filament
+or use the [filament installer](https://github.com/lara-zeus/filament-installer) to install both together
 
-```php
-'locales' => [
-    'en' => ['name' => 'English', 'native' => 'English', 'regional' => 'en_GB', 'flag' => 'gb'],
-],
-```
-### Env:
+- run `composer require lara-zeus/tartarus`
+- run `php artisan tartarus:install `
+- run `php artisan migrate:fresh --seed`
+- `npm i && npm run dev`
+- login: email: `[email protected]` pass: `basebasebase`
 
-`CENTRAL_DOMAIN=domain.test`
 
-### config
 
-- filament-logger.php:
-```php
-    'activity_resource' => \LaraZeus\Erebus\Filament\Clusters\Employees\Resources\ActivityResource::class,
-```
 ## Changelog
 
 Please see [CHANGELOG](CHANGELOG.md) for more information on recent changes.

composer.json

@@ -28,14 +28,14 @@
     "require": {
         "php": "^8.1",
         "awcodes/preset-color-picker": "^0.1.0",
+        "spatie/laravel-package-tools": "^1.16",
         "calebporzio/sushi": "^2.4",
         "filament/filament": "^3.2",
         "filament/spatie-laravel-translatable-plugin": "^3.2",
         "lara-zeus/chaos": "^1.0",
         "lara-zeus/erebus": "^1.0",
         "rickdbcn/filament-email": "^1.0",
         "ryangjchandler/blade-tabler-icons": "^2.3",
-        "spatie/laravel-package-tools": "^1.16",
         "spatie/laravel-tags": "^4.6",
         "stechstudio/filament-impersonate": "^3.7"
     },

src/Configuration.php

@@ -12,7 +12,7 @@ trait Configuration
     protected Closure | string $navigationGroupLabel = 'Tartarus';
 
     protected array $tartarusModels = [
-        //'Notification' => \LaraZeus\Tartarus\Models\Notification::class,
+        'Company' => \LaraZeus\Tartarus\Models\Company::class,
     ];
 
     public function navigationGroupLabel(Closure | string $label): static

src/Filament/Clusters/System.php

@@ -3,7 +3,6 @@
 namespace LaraZeus\Tartarus\Filament\Clusters;
 
 use Filament\Clusters\Cluster;
-use Illuminate\Contracts\Support\Htmlable;
 
 class System extends Cluster
 {
@@ -14,16 +13,6 @@ public static function getNavigationLabel(): string
         return __('app.System_cluster');
     }
 
-    public function getTitle(): string | Htmlable
-    {
-        return __('app.System_cluster');
-    }
-
-    public function getHeading(): string | Htmlable
-    {
-        return __('app.System_cluster');
-    }
-
     public static function getClusterBreadcrumb(): ?string
     {
         return __('app.System_cluster');

src/Middleware/SetTenant.php

@@ -5,8 +5,8 @@
 use Closure;
 use Filament\Support\Colors\Color;
 use Filament\Support\Facades\FilamentColor;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
+use LaraZeus\Tartarus\Models\Company;
 use Symfony\Component\HttpFoundation\Response;
 
 class SetTenant
@@ -32,17 +32,19 @@ public function handle(Request $request, Closure $next): Response
         return $next($request);
     }
 
-    private function setPanelConfiguration(Model $tenant): void
+    private function setPanelConfiguration(Company $tenant): void
     {
-        $colorName = str($tenant->primary_color ?? 'Blue')->title();
-        $color = constant("Filament\Support\Colors\Color::$colorName");
-        FilamentColor::register([
-            'primary' => $color,
-            'secondary' => Color::Amber,
-            'danger' => Color::Red,
-            'info' => Color::Blue,
-            'success' => Color::Green,
-            'warning' => Color::Yellow,
-        ]);
+        if ($tenant->primary_color !== null) {
+            $colorName = str($tenant->primary_color)->title();
+            $color = constant("Filament\Support\Colors\Color::$colorName");
+            FilamentColor::register([
+                'primary' => $color,
+                'secondary' => Color::Amber,
+                'danger' => Color::Red,
+                'info' => Color::Blue,
+                'success' => Color::Green,
+                'warning' => Color::Yellow,
+            ]);
+        }
     }
 }

src/Models/Company.php

@@ -30,6 +30,12 @@ class Company extends Model implements HasAvatar, HasCurrentTenantLabel, HasName
     use CompanyRelations;
     use HasTranslations;
 
+    public function getTenantId(): ?string
+    {
+        // @phpstan-ignore-next-line
+        return auth()->user()?->company_id;
+    }
+
     public array $translatable = ['name'];
 
     public function saveCompanySettings(array $data): void
@@ -128,9 +134,12 @@ protected function defaultProfilePhotoUrl(): string
             return mb_substr($segment, 0, 1);
         })->join(' '));
 
-        $colorName = str(tenant()->primary_color ?? 'Blue')->title();
-        $color = constant("Filament\Support\Colors\Color::$colorName");
-        $bgColor = str(Rgb::fromString('rgb(' . $color[500] . ')')->toHex())->replace('#', '');
+        $bgColor = 'BFA577';
+        if (tenant()->primary_color !== null) {
+            $colorName = str(tenant()->primary_color)->title();
+            $color = constant("Filament\Support\Colors\Color::$colorName");
+            $bgColor = str(Rgb::fromString('rgb(' . $color[500] . ')')->toHex())->replace('#', '');
+        }
 
         return sprintf('https://ui-avatars.com/api/?name=%s&color=FFFFFF&background=' . $bgColor, urlencode($name));
     }

src/Models/Concerns/CompanyRelations.php

@@ -5,7 +5,6 @@
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 use Illuminate\Database\Eloquent\Relations\HasMany;
-use LaraZeus\Tartarus\Models\CompanyInvitation;
 use LaraZeus\Tartarus\Models\Employeeship;
 use LaraZeus\Tartarus\Models\Settings;
 
@@ -16,11 +15,6 @@ public function owner(): BelongsTo
         return $this->belongsTo(config('auth.providers.users.model'), 'user_id');
     }
 
-    public function companyInvitations(): HasMany
-    {
-        return $this->hasMany(CompanyInvitation::class);
-    }
-
     public function users(): BelongsToMany
     {
         return $this->belongsToMany(config('auth.providers.users.model'), Employeeship::class)

src/Models/Concerns/HasCompanies.php

@@ -66,7 +66,7 @@ public function ownsCompany(?Model $company = null): bool
         return $this->id === $company->{$this->getForeignKey()};
     }
 
-    public function belongsToCompany(?Company $company = null): bool
+    public function belongsToCompany(null | Company | Model $company = null): bool
     {
         if ($company === null) {
             return false;

stubs/Models/User.php

@@ -20,7 +20,6 @@
 use LaraZeus\Tartarus\Models\Concerns\HasCompanies;
 use LaraZeus\Tartarus\Models\ConnectedAccount;
 use LaraZeus\Tartarus\Models\Employeeship;
-use Rinvex\Subscriptions\Traits\HasPlanSubscriptions;
 use Spatie\Color\Rgb;
 use Spatie\Permission\Models\Role;
 use Spatie\Permission\Traits\HasRoles;
@@ -40,8 +39,6 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasDefaul
     use ChaosModel;
     use ForFilament;
     use HasCompanies;
-
-    /*use HasPlanSubscriptions;*/
     use HasRoles;
     use HasTranslations;
     use TwoFactorAuthenticatable;
@@ -57,10 +54,7 @@ class User extends Authenticatable implements FilamentUser, HasAvatar, HasDefaul
         'email_verified_at' => 'datetime',
     ];
 
-    /* *
-     * @var Company $tenant
-     */
-    public function canAccessTenant(Model | Company $tenant): bool
+    public function canAccessTenant(null | Company | Model $tenant): bool
     {
         return $this->belongsToCompany($tenant);
     }
@@ -83,7 +77,7 @@ protected function defaultProfilePhotoUrl(): string
         if (tenant() !== null) {
             $colorName = str(tenant()?->primary_color ?? 'Blue')->title();
             $color = constant("Filament\Support\Colors\Color::$colorName");
-            $bgColor = str(Rgb::fromString('rgb(' . $color[500] . ')')->toHex())->replace('#', '') ?? $bgColor;
+            $bgColor = str(Rgb::fromString('rgb(' . $color[500] . ')')->toHex())->replace('#', '');
         }
 
         return sprintf('https://ui-avatars.com/api/?name=%s&color=fff&background=' . $bgColor, urlencode($name));