Merge pull request 'Update project config and remove tailwindcss skill' (#10 ) from feature/ldap-email-bootstrap into master

Reviewed-on: #10
Merge pull request 'Default Bootstrap theme to dark mode' (#9 ) from feature/dark-mode-default into master
2026-03-06 12:02:20 +08:00 · 2026-03-06 12:01:57 +08:00 · 2026-03-06 03:54:34 +00:00 · 2026-03-06 10:48:31 +08:00
5 changed files with 4 additions and 139 deletions
--- a/app/Services/ApprovalService.php
+++ b/app/Services/ApprovalService.php
@@ -17,7 +17,7 @@ class ApprovalService
        $workflow = $travelRequest->workflow;

        if (! $workflow) {
-            throw new \RuntimeException('No active approval workflow is configured.');
+            return;
        }

        $steps = $workflow->steps()->orderBy('order')->get();
--- a/resources/views/components/layouts/app.blade.php
+++ b/resources/views/components/layouts/app.blade.php
@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
-    x-data="{ theme: localStorage.getItem('theme') || 'light' }"
+    x-data="{ theme: localStorage.getItem('theme') || 'dark' }"
    x-init="$watch('theme', val => { document.documentElement.setAttribute('data-bs-theme', val); localStorage.setItem('theme', val); }); document.documentElement.setAttribute('data-bs-theme', theme);"
    :data-bs-theme="theme"
 >
--- a/resources/views/components/layouts/guest.blade.php
+++ b/resources/views/components/layouts/guest.blade.php
@@ -1,6 +1,6 @@
 <!doctype html>
 <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
-    x-data="{ theme: localStorage.getItem('theme') || 'light' }"
+    x-data="{ theme: localStorage.getItem('theme') || 'dark' }"
    x-init="document.documentElement.setAttribute('data-bs-theme', theme);"
    :data-bs-theme="theme"
 >
--- a/resources/views/livewire/travel-request/create.blade.php
+++ b/resources/views/livewire/travel-request/create.blade.php
@@ -92,6 +92,7 @@ new #[Layout('components.layouts.app')] class extends Component {
    public function saveDraft(): void
    {
        $this->saveRequest(submit: false);
+        session()->flash('success', 'Draft saved successfully.');
    }

    public function submit(): void
@@ -101,12 +102,6 @@ new #[Layout('components.layouts.app')] class extends Component {

    private function saveRequest(bool $submit): void
    {
-        if ($submit && ! ApprovalWorkflow::where('is_active', true)->exists()) {
-            $this->addError('workflow', 'No active approval workflow is configured. Please contact an administrator.');
-
-            return;
-        }
-
        $this->validate([
            'emergencyFullName' => ['required', 'string', 'max:255'],
            'emergencyPhone' => ['required', 'string', 'max:50'],
@@ -187,8 +182,6 @@ new #[Layout('components.layouts.app')] class extends Component {
        if ($submit) {
            app(ApprovalService::class)->submit($travelRequest);
            session()->flash('success', 'Travel request submitted for approval.');
-        } else {
-            session()->flash('success', 'Draft saved successfully.');
        }

        $this->redirect(route('travel-requests.show', $travelRequest), navigate: true);
@@ -216,10 +209,6 @@ new #[Layout('components.layouts.app')] class extends Component {
        </div>
    @endif

-    @error('workflow')
-        <div class="alert alert-danger">{{ $message }}</div>
-    @enderror
-
    <form wire:submit.prevent>

        {{-- Applicant Details --}}
--- a/tests/Feature/TravelRequestSubmissionTest.php
+++ b/tests/Feature/TravelRequestSubmissionTest.php
@@ -1,124 +0,0 @@
-<?php
-
-namespace Tests\Feature;
-
-use App\Enums\ApprovalStatus;
-use App\Enums\JourneyMethod;
-use App\Enums\TravelStatus;
-use App\Models\ApprovalStep;
-use App\Models\ApprovalWorkflow;
-use App\Models\TravelRequest;
-use App\Models\User;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Livewire\Livewire;
-use Spatie\Permission\Models\Role;
-use Tests\TestCase;
-
-class TravelRequestSubmissionTest extends TestCase
-{
-    use RefreshDatabase;
-
-    private User $staff;
-
-    /** @var array<string, mixed> */
-    private array $validFormData;
-
-    protected function setUp(): void
-    {
-        parent::setUp();
-
-        Role::firstOrCreate(['name' => 'staff']);
-        Role::firstOrCreate(['name' => 'travel_approver']);
-        Role::firstOrCreate(['name' => 'administrator']);
-
-        $this->staff = User::factory()->create();
-        $this->staff->assignRole('staff');
-
-        $this->validFormData = [
-            'emergencyFullName' => 'Jane Doe',
-            'emergencyPhone' => '0400000000',
-            'emergencyRelationship' => 'Spouse',
-            'reasonSummary' => 'Attending a medical conference in Sydney',
-            'journeys' => [
-                [
-                    'origin' => 'Perth',
-                    'destination' => 'Sydney',
-                    'date' => '2026-04-01',
-                    'time' => '09:00',
-                    'method' => JourneyMethod::Air->value,
-                ],
-            ],
-            'costCodes' => [],
-        ];
-    }
-
-    private function makeWorkflow(): ApprovalWorkflow
-    {
-        $workflow = ApprovalWorkflow::factory()->create(['is_active' => true]);
-
-        ApprovalStep::factory()->create([
-            'workflow_id' => $workflow->id,
-            'order' => 1,
-            'name' => 'Travel Approver Review',
-            'role' => 'travel_approver',
-        ]);
-
-        return $workflow;
-    }
-
-    public function test_submitting_form_with_active_workflow_sets_status_to_pending(): void
-    {
-        $this->makeWorkflow();
-
-        Livewire::actingAs($this->staff)
-            ->test('travel-request.create')
-            ->set($this->validFormData)
-            ->call('submit');
-
-        $request = TravelRequest::first();
-        $this->assertNotNull($request);
-        $this->assertSame(TravelStatus::Pending, $request->status);
-        $this->assertNotNull($request->submitted_at);
-    }
-
-    public function test_submitting_form_with_active_workflow_creates_pending_approval(): void
-    {
-        $this->makeWorkflow();
-
-        Livewire::actingAs($this->staff)
-            ->test('travel-request.create')
-            ->set($this->validFormData)
-            ->call('submit');
-
-        $request = TravelRequest::first();
-        $this->assertCount(1, $request->approvals);
-        $this->assertSame(ApprovalStatus::Pending->value, $request->approvals->first()->status->value);
-    }
-
-    public function test_submitting_form_with_no_active_workflow_shows_error(): void
-    {
-        Livewire::actingAs($this->staff)
-            ->test('travel-request.create')
-            ->set($this->validFormData)
-            ->call('submit')
-            ->assertHasErrors(['workflow']);
-
-        $this->assertDatabaseCount('travel_requests', 0);
-    }
-
-    public function test_saving_draft_does_not_submit_for_approval(): void
-    {
-        $this->makeWorkflow();
-
-        Livewire::actingAs($this->staff)
-            ->test('travel-request.create')
-            ->set($this->validFormData)
-            ->call('saveDraft');
-
-        $request = TravelRequest::first();
-        $this->assertNotNull($request);
-        $this->assertSame(TravelStatus::Draft, $request->status);
-        $this->assertNull($request->submitted_at);
-        $this->assertCount(0, $request->approvals);
-    }
-}
Author	SHA1	Message	Date
timmybee	a4a31c97e3	Merge pull request 'Update project config and remove tailwindcss skill' (#10 ) from feature/ldap-email-bootstrap into master Some checks failed linter / quality (push) Has been cancelled Details security / Dependency Audit (push) Has been cancelled Details security / Static Analysis (push) Has been cancelled Details tests / ci (8.4) (push) Has been cancelled Details tests / ci (8.5) (push) Has been cancelled Details Reviewed-on: #10	2026-03-06 12:02:20 +08:00
timmybee	2ef5014919	Merge pull request 'Default Bootstrap theme to dark mode' (#9 ) from feature/dark-mode-default into master Some checks failed linter / quality (push) Has been cancelled Details security / Dependency Audit (push) Has been cancelled Details security / Static Analysis (push) Has been cancelled Details tests / ci (8.4) (push) Has been cancelled Details tests / ci (8.5) (push) Has been cancelled Details Reviewed-on: #9	2026-03-06 12:01:57 +08:00
Tim Basten	e07984fa97	Default Bootstrap theme to dark mode All checks were successful linter / quality (pull_request) Successful in 1m51s Details security / Dependency Audit (pull_request) Successful in 1m24s Details security / Static Analysis (pull_request) Successful in 1m53s Details tests / ci (8.4) (pull_request) Successful in 1m28s Details tests / ci (8.5) (pull_request) Successful in 1m54s Details - Change default theme from light to dark for first-time visitors - Fix Alpine reactive theme toggle so icons and data-bs-theme update correctly - Remove hardcoded bg-light classes that prevented dark mode from applying - Fix broken duplicate Bootstrap bundle import in app.js	2026-03-06 03:54:34 +00:00
timmybee	dd3c623bfc	Merge pull request 'Seed OpenLDAP with bootstrap users including email addresses' (#8 ) from feature/ldap-email-bootstrap into master All checks were successful linter / quality (push) Successful in 1m34s Details security / Dependency Audit (push) Successful in 1m24s Details security / Static Analysis (push) Successful in 2m42s Details tests / ci (8.4) (push) Successful in 1m23s Details tests / ci (8.5) (push) Successful in 1m51s Details Reviewed-on: #8	2026-03-06 10:48:31 +08:00