diff --git a/Dockerfile b/Dockerfile index b850a08..d3c250e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,8 @@ COPY ./hook.sh /app/hook.sh # Get the app in there COPY . /app -ENV ENABLE_QUEUE_WORKER=true -ENV ENABLE_SCHEDULER=true +# ENV ENABLE_QUEUE_WORKER=true +# ENV ENABLE_SCHEDULER=true VOLUME [ "/app/storage/oauth" ] VOLUME [ "/app/database" ] \ No newline at end of file diff --git a/Makefile b/Makefile index 019785c..345a709 100644 --- a/Makefile +++ b/Makefile @@ -17,6 +17,7 @@ setup: ## Install Laravel Octane with FrankenPHP # Docker build targets build: ## Build the Docker image @echo "Building Docker image: $(IMAGE_NAME):$(VERSION)" + npm run build docker build -t $(IMAGE_NAME):$(VERSION) . @echo "✅ Image built successfully" @@ -35,7 +36,7 @@ run: ## Run the container (production-like) -p $(PORT):8000 \ -e APP_NAME="AuthentiKate" \ -e APP_ENV=production \ - -e APP_DEBUG=false \ + -e APP_DEBUG=true \ -e APP_KEY=base64:$$(openssl rand -base64 32) \ -e APP_URL=http://localhost:$(PORT) \ -e DB_CONNECTION=sqlite \ diff --git a/app/Console/Commands/CreateInitialAdmin.php b/app/Console/Commands/CreateInitialAdmin.php index 203ff23..995e700 100644 --- a/app/Console/Commands/CreateInitialAdmin.php +++ b/app/Console/Commands/CreateInitialAdmin.php @@ -34,7 +34,7 @@ class CreateInitialAdmin extends Command // Check if admin users already exist (unless forced) if (!$this->option('force') && User::where('is_admin', true)->exists()) { $this->error('Admin users already exist! Use --force to create anyway.'); - return 1; + return Command::SUCCESS; } // Get user input for email and name @@ -44,13 +44,13 @@ class CreateInitialAdmin extends Command // Validate email format if (!filter_var($email, FILTER_VALIDATE_EMAIL)) { $this->error('Invalid email address format.'); - return 1; + return Command::SUCCESS; } // Check if email already exists if (User::where('email', $email)->exists()) { $this->error("A user with email '{$email}' already exists."); - return 1; + return Command::SUCCESS; } // Generate a random password @@ -68,16 +68,16 @@ class CreateInitialAdmin extends Command // Display success message with login credentials $this->info('✅ Initial admin user created successfully!'); $this->newLine(); - + $this->line('🔐 Login Credentials:'); $this->line("📧 Email: {$email}"); $this->line("🔑 Password: {$password}"); $this->newLine(); - + $this->warn('⚠️ Please log in and change your password immediately!'); $this->info('💡 You can access the admin panel to manage users and applications.'); - - return 0; + + return Command::SUCCESS; } /** @@ -91,22 +91,22 @@ class CreateInitialAdmin extends Command $uppercase = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'; $numbers = '0123456789'; $symbols = '!@#$%^&*()_+-=[]{}|;:,.<>?'; - + $password = ''; - + // Ensure at least one character from each category $password .= $lowercase[random_int(0, strlen($lowercase) - 1)]; $password .= $uppercase[random_int(0, strlen($uppercase) - 1)]; $password .= $numbers[random_int(0, strlen($numbers) - 1)]; $password .= $symbols[random_int(0, strlen($symbols) - 1)]; - + // Fill the rest with random characters from all categories $allChars = $lowercase . $uppercase . $numbers . $symbols; for ($i = 4; $i < $length; $i++) { $password .= $allChars[random_int(0, strlen($allChars) - 1)]; } - + // Shuffle the password to randomize the order return str_shuffle($password); } -} \ No newline at end of file +} diff --git a/resources/views/components/app-logo-icon.blade.php b/resources/views/components/app-logo-icon.blade.php index 8ed1108..8d626d8 100644 --- a/resources/views/components/app-logo-icon.blade.php +++ b/resources/views/components/app-logo-icon.blade.php @@ -1,6 +1,3 @@ -{{-- -fill="currentColor" fill-rule="evenodd" clip-rule="evenodd" {{ $attributes }} ---}} +{{--
-
+ --}}
{{ config('app.name') }}
\ No newline at end of file diff --git a/resources/views/components/layouts/auth/split.blade.php b/resources/views/components/layouts/auth/split.blade.php index d384e2c..1785a38 100644 --- a/resources/views/components/layouts/auth/split.blade.php +++ b/resources/views/components/layouts/auth/split.blade.php @@ -14,7 +14,8 @@ class="absolute inset-0 bg-neutral-900"> - + {{-- + --}} {{ config('app.name', 'Laravel') }} @@ -38,7 +39,8 @@ - + {{-- + --}} {{ config('app.name', 'Laravel') }}