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

Compare commits

base: timmybee:fd53a28f03fed6c47ec9fa436f51b32f3ccc0371
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:feature/dark-mode-default
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

3 Commits
fd53a28f03 ... feature/da

Author SHA1 Message Date
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
Tim Basten
9f47e6e2c8 Seed OpenLDAP with bootstrap users including email addresses
All checks were successful
linter / quality (pull_request) Successful in 1m20s
Details
security / Dependency Audit (pull_request) Successful in 2m22s
Details
security / Static Analysis (pull_request) Successful in 1m42s
Details
tests / ci (8.4) (pull_request) Successful in 1m25s
Details
tests / ci (8.5) (pull_request) Successful in 1m24s
Details 
Add docker/openldap/bootstrap.ldif which creates an ou=people OU and
three test users (admin, approver, staff) each with a mail attribute,
matching the database seeder. Mount the LDIF into the openldap container
and add --copy-service so it is loaded on first boot.
 2026-03-06 02:47:54 +00:00
4 changed files with 50 additions and 2 deletions
Expand all files Collapse all files

2
compose.yaml
View File

@@ -84,6 +84,7 @@ services:
- sail - sail
openldap: openldap:
image: 'osixia/openldap:1.5.0' image: 'osixia/openldap:1.5.0'
command: '--copy-service'
ports: ports:
- '${FORWARD_LDAP_PORT:-389}:389' - '${FORWARD_LDAP_PORT:-389}:389'
- '${FORWARD_LDAPS_PORT:-636}:636' - '${FORWARD_LDAPS_PORT:-636}:636'
@@ -98,6 +99,7 @@ services:
volumes: volumes:
- 'sail-ldap-data:/var/lib/ldap' - 'sail-ldap-data:/var/lib/ldap'
- 'sail-ldap-config:/etc/ldap/slapd.d' - 'sail-ldap-config:/etc/ldap/slapd.d'
- './docker/openldap/bootstrap.ldif:/container/service/slapd/assets/config/bootstrap/ldif/custom/bootstrap.ldif'
networks: networks:
- sail - sail
healthcheck: healthcheck:

46
docker/openldap/bootstrap.ldif Normal file
View File

@@ -0,0 +1,46 @@
# People OU
dn: ou=people,dc=travel,dc=local
objectClass: organizationalUnit
ou: people
# Administrator
dn: uid=admin,ou=people,dc=travel,dc=local
objectClass: inetOrgPerson
objectClass: posixAccount
objectClass: shadowAccount
cn: Administrator
sn: Administrator
uid: admin
mail: admin@travel.local
uidNumber: 1000
gidNumber: 1000
homeDirectory: /home/admin
userPassword: password
# Travel Approver
dn: uid=approver,ou=people,dc=travel,dc=local
objectClass: inetOrgPerson
objectClass: posixAccount
objectClass: shadowAccount
cn: Travel Approver
sn: Approver
uid: approver
mail: approver@travel.local
uidNumber: 1001
gidNumber: 1000
homeDirectory: /home/approver
userPassword: password
# Staff Member
dn: uid=staff,ou=people,dc=travel,dc=local
objectClass: inetOrgPerson
objectClass: posixAccount
objectClass: shadowAccount
cn: Staff Member
sn: Member
uid: staff
mail: staff@travel.local
uidNumber: 1002
gidNumber: 1000
homeDirectory: /home/staff
userPassword: password

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

@@ -1,6 +1,6 @@
<!doctype html> <!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" <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);" 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" :data-bs-theme="theme"
> >

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

@@ -1,6 +1,6 @@
<!doctype html> <!doctype html>
<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" <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);" x-init="document.documentElement.setAttribute('data-bs-theme', theme);"
:data-bs-theme="theme" :data-bs-theme="theme"
> >