wip

Author: mhortulanus

composer.json

@@ -90,7 +90,8 @@
     "extra": {
         "laravel": {
             "providers": [
-                "Backstage\\UserManagement\\UserManagementServiceProvider"
+                "Backstage\\UserManagement\\UserManagementServiceProvider",
+                "Backstage\\UserManagement\\RegisterUserPanelProvider"
             ],
             "aliases": {
                 "UserManagement": "Backstage\\UserManagement\\Facades\\UserManagement"

config/backstage/user.php config/backstage/users.phpconfig/backstage/user.php renamed to config/backstage/users.php

@@ -0,0 +1,32 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Filament\Pages\SubNavigationPosition;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->enum('sub_navigation_preference', ['start', 'end', 'top'])
+                ->default('top')
+                ->after('remember_token')
+                ->comment('The user\'s preference for the sub navigation position. The default is top.');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('sub_navigation_preference');
+        });
+    }
+};

database/migrations/add_sub_navigation_preference_to_users_table.php.stub

@@ -0,0 +1,11 @@
+<x-filament-panels::page.simple>
+
+   <x-filament-panels::form id="form" wire:submit="register">
+      {{ $this->registerForm }}
+
+      <x-filament-panels::form.actions
+          :actions="$this->getCachedFormActions()"
+          :full-width="$this->hasFullWidthFormActions()"
+      />
+  </x-filament-panels::form>
+</x-filament-panels::page.simple>

resources/views/pages/register.blade.php

@@ -12,7 +12,8 @@ trait UserIsVerified
 {
     public function isVerified(): bool
     {
-        return $this->email_verified_at !== null;
+        return $this->email_verified_at !== null
+            && $this->password !== null;
     }
 
     public function isNotVerified(): bool

src/Concerns/Conditionals/UserIsVerified.php

@@ -11,6 +11,6 @@ trait HasLoginsRelation
      */
     public function logins()
     {
-        return $this->hasMany(config('backstage.user.eloquent.user_logins.model', \Backstage\UserManagement\Models\UserLogin::class), 'user_id');
+        return $this->hasMany(config('backstage.users.eloquent.user_logins.model', \Backstage\UserManagement\Models\UserLogin::class), 'user_id');
     }
 }

src/Concerns/Relations/HasLoginsRelation.php

@@ -11,6 +11,6 @@ trait HasTraffic
      */
     public function traffic()
     {
-        return $this->hasMany(config('backstage.user.eloquent.user_traffic.model', \Backstage\UserManagement\Models\UserTraffic::class), 'user_id');
+        return $this->hasMany(config('backstage.users.eloquent.user_traffic.model', \Backstage\UserManagement\Models\UserTraffic::class), 'user_id');
     }
 }

src/Concerns/Relations/HasTraffic.php

@@ -2,7 +2,8 @@
 
 namespace Backstage\UserManagement\Concerns\Scopes;
 
-use Filament\Forms\Components\Builder;
+use Illuminate\Database\Eloquent\Builder;
+
 
 trait IsVerfiedScope
 {
@@ -14,7 +15,8 @@ trait IsVerfiedScope
      */
     public function scopeVerified(Builder $query)
     {
-        return $query->where('is_verified', true);
+        return $query->where('email_verified_at', '!=', null)
+            ->where('password', '!=', null);
     }
 
     /**
@@ -25,6 +27,7 @@ public function scopeVerified(Builder $query)
      */
     public function scopeUnverified(Builder $query)
     {
-        return $query->where('is_verified', false);
+        return  $query->where('email_verified_at', null)
+            ->orWhere('password', null);
     }
 }

src/Concerns/Scopes/IsVerfiedScope.php

@@ -11,7 +11,7 @@ class UserExporter extends Exporter
 {
     public static function getModel(): string
     {
-        return config('backstage.user.eloquent.users.model', User::class);
+        return config('backstage.users.eloquent.users.model', User::class);
     }
 
     public static function getColumns(): array

src/Exports/UserExporter.php

@@ -11,7 +11,7 @@ class UserImporter extends Importer
 {
     public static function getModel(): string
     {
-        return config('backstage.user.eloquent.users.model', User::class);
+        return config('backstage.users.eloquent.users.model', User::class);
     }
 
     public static function getColumns(): array