timmybee/travel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: timmybee:worktree-ldap-issues
Branches Tags
timmybee:master timmybee:fix/ldap-admin-email timmybee:fix/submit-draft-status timmybee:feature/town-sync timmybee:fix/ldap-bootstrap timmybee:feature/ldap-email-bootstrap timmybee:feature/dark-mode-default timmybee:worktree-ldap-issues timmybee:feature/bootstrap-theming timmybee:feature/phpldapadmin timmybee:fix/migration-order timmybee:fix/consolidate-docker-compose timmybee:test/test-pr
..
compare: timmybee:98abc637c8f9410406d3474ab9da2bd695c315fc
Branches Tags
timmybee:master timmybee:fix/ldap-admin-email timmybee:fix/submit-draft-status timmybee:feature/town-sync timmybee:fix/ldap-bootstrap timmybee:feature/ldap-email-bootstrap timmybee:feature/dark-mode-default timmybee:worktree-ldap-issues timmybee:feature/bootstrap-theming timmybee:feature/phpldapadmin timmybee:fix/migration-order timmybee:fix/consolidate-docker-compose timmybee:test/test-pr

2 Commits
worktree-l ... 98abc637c8

Author SHA1 Message Date
timmybee
98abc637c8 Merge pull request 'Fix Bootstrap light/dark theming' (#6) from feature/bootstrap-theming into master
All checks were successful
linter / quality (push) Successful in 1m15s
Details
security / Dependency Audit (push) Successful in 1m29s
Details
security / Static Analysis (push) Successful in 1m25s
Details
tests / ci (8.4) (push) Successful in 1m58s
Details
tests / ci (8.5) (push) Successful in 1m28s
Details 
Reviewed-on: #6
 2026-03-06 10:17:48 +08:00
Tim Basten
236ba9558c Fix Bootstrap light/dark theming across all layouts
All checks were successful
linter / quality (pull_request) Successful in 1m52s
Details
security / Dependency Audit (pull_request) Successful in 1m27s
Details
security / Static Analysis (pull_request) Successful in 1m44s
Details
tests / ci (8.4) (pull_request) Successful in 1m40s
Details
tests / ci (8.5) (pull_request) Successful in 1m49s
Details 
- Make dark mode toggle reactive using Alpine x-data theme property
- Apply saved theme on page load via data-bs-theme attribute binding
- Remove hardcoded bg-light classes that broke dark mode styling
- Fix duplicate/broken Bootstrap bundle import in app.js
 2026-03-06 02:16:45 +00:00
7 changed files with 18 additions and 36 deletions
Expand all files Collapse all files

7
.env.example
View File

@@ -63,10 +63,3 @@ AWS_BUCKET=
AWS_USE_PATH_STYLE_ENDPOINT=false AWS_USE_PATH_STYLE_ENDPOINT=false
VITE_APP_NAME="${APP_NAME}" VITE_APP_NAME="${APP_NAME}"
LDAP_HOST=openldap
LDAP_USERNAME="cn=admin,dc=travel,dc=local"
LDAP_PASSWORD=adminpassword
LDAP_PORT=389
LDAP_BASE_DN="dc=travel,dc=local"
LDAP_LOGGING=true

10
app/Models/User.php
View File

@@ -64,16 +64,6 @@ class User extends Authenticatable implements FilamentUser, LdapAuthenticatable
return $this->hasRole('administrator'); return $this->hasRole('administrator');
} }
public function getLdapGuidColumn(): string
{
return 'ldap_guid';
}
public function getLdapDomainColumn(): string
{
return 'ldap_domain';
}
public function emergencyContacts(): HasMany public function emergencyContacts(): HasMany
{ {
return $this->hasMany(EmergencyContact::class); return $this->hasMany(EmergencyContact::class);

1
resources/js/app.js
View File

@@ -1,4 +1,3 @@
import * as bootstrap from 'bootstrap'; import * as bootstrap from 'bootstrap';
import './../../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js';
window.bootstrap = bootstrap; window.bootstrap = bootstrap;

20
resources/views/components/layouts/app.blade.php
View File

@@ -1,8 +1,9 @@
<!doctype html> <!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" x-data x-init=" <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
const saved = localStorage.getItem('theme'); x-data="{ theme: localStorage.getItem('theme') || 'light' }"
if (saved) { document.documentElement.setAttribute('data-bs-theme', saved); } 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"
>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -43,16 +44,11 @@
<li class="nav-item me-2"> <li class="nav-item me-2">
<button <button
class="btn btn-sm btn-outline-light" class="btn btn-sm btn-outline-light"
x-on:click=" x-on:click="theme = theme === 'dark' ? 'light' : 'dark'"
const current = document.documentElement.getAttribute('data-bs-theme');
const next = current === 'dark' ? 'light' : 'dark';
document.documentElement.setAttribute('data-bs-theme', next);
localStorage.setItem('theme', next);
"
title="Toggle dark/light mode" title="Toggle dark/light mode"
> >
<span x-show="document.documentElement.getAttribute('data-bs-theme') !== 'dark'">🌙</span> <span x-show="theme !== 'dark'">🌙</span>
<span x-show="document.documentElement.getAttribute('data-bs-theme') === 'dark'">☀️</span> <span x-show="theme === 'dark'">☀️</span>
</button> </button>
</li> </li>
@auth @auth

8
resources/views/components/layouts/guest.blade.php
View File

@@ -1,5 +1,9 @@
<!doctype html> <!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}"> <html lang="{{ str_replace('_', '-', app()->getLocale()) }}"
x-data="{ theme: localStorage.getItem('theme') || 'light' }"
x-init="document.documentElement.setAttribute('data-bs-theme', theme);"
:data-bs-theme="theme"
>
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -8,7 +12,7 @@
@vite(['resources/css/app.css', 'resources/js/app.js']) @vite(['resources/css/app.css', 'resources/js/app.js'])
@livewireStyles @livewireStyles
</head> </head>
<body class="bg-light"> <body>
{{ $slot }} {{ $slot }}
@livewireScripts @livewireScripts
</body> </body>

4
resources/views/livewire/auth/login.blade.php
View File

@@ -18,7 +18,7 @@ new #[Layout('components.layouts.guest')] class extends Component {
{ {
$this->validate(); $this->validate();
if (Auth::attempt(['uid' => $this->username, 'password' => $this->password], $this->rememberMe)) { if (Auth::attempt(['username' => $this->username, 'password' => $this->password], $this->rememberMe)) {
session()->regenerate(); session()->regenerate();
$this->redirectIntended(route('dashboard'), navigate: true); $this->redirectIntended(route('dashboard'), navigate: true);
return; return;
@@ -29,7 +29,7 @@ new #[Layout('components.layouts.guest')] class extends Component {
} }
?> ?>
<div class="min-vh-100 d-flex align-items-center justify-content-center bg-light"> <div class="min-vh-100 d-flex align-items-center justify-content-center">
<div class="card shadow-sm" style="width: 100%; max-width: 420px;"> <div class="card shadow-sm" style="width: 100%; max-width: 420px;">
<div class="card-body p-4"> <div class="card-body p-4">
<div class="text-center mb-4"> <div class="text-center mb-4">

4
resources/views/livewire/travel-request/create.blade.php
View File

@@ -318,7 +318,7 @@ new #[Layout('components.layouts.app')] class extends Component {
@error('journeys') <div class="alert alert-danger">{{ $message }}</div> @enderror @error('journeys') <div class="alert alert-danger">{{ $message }}</div> @enderror
@foreach ($journeys as $i => $journey) @foreach ($journeys as $i => $journey)
<div class="border rounded p-3 mb-3 bg-light" wire:key="journey-{{ $i }}"> <div class="border rounded p-3 mb-3" wire:key="journey-{{ $i }}">
<div class="d-flex justify-content-between align-items-center mb-2"> <div class="d-flex justify-content-between align-items-center mb-2">
<strong class="small">Journey {{ $i + 1 }}</strong> <strong class="small">Journey {{ $i + 1 }}</strong>
@if (count($journeys) > 1) @if (count($journeys) > 1)
@@ -413,7 +413,7 @@ new #[Layout('components.layouts.app')] class extends Component {
</div> </div>
<div class="card-body"> <div class="card-body">
@foreach ($costCodes as $i => $code) @foreach ($costCodes as $i => $code)
<div class="border rounded p-3 mb-3 bg-light" wire:key="code-{{ $i }}"> <div class="border rounded p-3 mb-3" wire:key="code-{{ $i }}">
<div class="d-flex justify-content-between align-items-center mb-2"> <div class="d-flex justify-content-between align-items-center mb-2">
<strong class="small">Cost Code {{ $i + 1 }}</strong> <strong class="small">Cost Code {{ $i + 1 }}</strong>
@if (count($costCodes) > 1) @if (count($costCodes) > 1)