diff --git a/README.md b/README.md index 8f8dbe4..5c1260e 100755 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ By default the contents of `dat.live` will be mounted, so changes made on the ** If you want to experiment a little without interfering with the master calendar there is a `dat.test` folder that can be used instead. Switch to using that folder by launching with... ```bash -HLBDAT=dat.test docker compose up +HLBDAT=test docker compose up ``` Even if you forget to use the `dat.test` folder, you'd still need to `git add`, `git commit` and `git push` before anything leaves your local machine. Moreover, *somebody* would need to `git pull` and `docker restart` on the production hosting environment before anybody else would see what you've done, so this is **super** low risk. diff --git a/app/index.php b/app/index.php index 36e042d..51ba5f0 100755 --- a/app/index.php +++ b/app/index.php @@ -100,8 +100,9 @@ use Michelf\Markdown; ?>

-

" class="accordion-collapse collapse" data-bs-parent="#accordionExample"> diff --git a/dat/live/events.json b/dat/live/events.json index 7c01faf..c5e1e6d 100755 --- a/dat/live/events.json +++ b/dat/live/events.json @@ -1 +1 @@ -[{"start":"2025-07-24T18:30:00","end":"2025-07-24T21:00:00","title":"July 2025 In Person Catch Up","description":"Monthly In Person Get Together","location":"Chermside Library","coordinates":"-27.38621539644283,153.0351689206467","ctl":"202507241830","agenda":"- 6.30 pm - Welcome\n- 6.35 pm - Agreement on Agenda Items\n- 6.40 pm - Administrivia (if any)\n- 6.45 pm - Presentation 1: James: Git\n- 7.15 pm - Presentation 2: Terry?: Fossil?\n- 7.45 pm - Loose (Discourse) Threads\n"},{"coordinates":"-27.38621539644283,153.0351689206467","start":"2025-07-11T18:30","end":"2025-07-11T21:00","title":"Event Title3","description":"Event Description","location":"Event Location","ctl":"202507111830"},{"start":"2025-07-08T19:00:00","end":"2025-07-08T21:00:00","title":"July 2025 Online Catch Up","description":"Monthly Online Jitsi Get Together","location":"Jitsi","ctl":"202507081900","agenda":"- 7.30 pm - Welcome\n- 7.35 pm - Agreement on Agenda Items\n- 7.40 pm - Administrivia (if any)\n- 7.45 pm - Presentation 1 - James: Git\n- 8.15 pm - Presentation 2 - Terry?: Fossil?\n- 8.45 pm - Loose (Discourse) Threads\n"},{"start":"2025-06-19T18:30:00","end":"2025-06-19T21:00:00","title":"June 2025 In Person Catch Up","description":"Social get-together. Discussion about large language models and meshtastic experiments. Clumsy attempt at adhering to an agenda and taking minutes.","location":"Chermside Library","coordinates":"-27.38621539644283,153.0351689206467","ctl":"202506191830","minutes":"- Admin\n\t- ToS and Privacy Policy doesn't need to be hosted on the main page. It's already got a publicly accessible presence in Discourse.\n\t- James to formalise agenda procedure\n\t- James to render cal.php on main page\n\t- James to publish \"subscribe\" link for calendar\n- Recap from Last Month\n\t- Hardware Donations for Education\n\t\t- Substation 33, in Kingston or Logan?\n\t\t- Dirk has a carload of stuff to offload\n- Discourse Themes\n\t- LLMs\n\t- Hardware for LLMs\n\t- Tiny11\n- Agenda\n\t- Motioneye\n\t- Meshtastic\n- Next Month\n\t- Location Requests\n"},{"start":"2025-06-10T19:00:00","end":"2025-06-10T21:00:00","title":"June 2025 Online Catch Up","description":"Getting started with meshtastic","location":"Jitsi","ctl":"202506101900"}] \ No newline at end of file +[{"start":"2025-07-24T18:30:00","end":"2025-07-24T21:00:00","title":"July 2025 In Person Catch Up","description":"Monthly In Person Get Together","location":"Chermside Library","coordinates":"-27.38621539644283,153.0351689206467","ctl":"202507241830","agenda":"- 6.30 pm - Welcome\n- 6.35 pm - Agreement on Agenda Items\n- 6.40 pm - Administrivia (if any)\n- 6.45 pm - Presentation 1: James: Git\n- 7.15 pm - Presentation 2: Terry?: Fossil?\n- 7.45 pm - Loose (Discourse) Threads\n"},{"start":"2025-07-08T19:00:00","end":"2025-07-08T21:00:00","title":"July 2025 Online Catch Up","description":"Monthly Online Jitsi Get Together","location":"Jitsi","ctl":"202507081900","agenda":"- 7.30 pm - Welcome\n- 7.35 pm - Agreement on Agenda Items\n- 7.40 pm - Administrivia (if any)\n- 7.45 pm - Presentation 1 - James: Git\n- 8.15 pm - Presentation 2 - Terry?: Fossil?\n- 8.45 pm - Loose (Discourse) Threads\n"},{"start":"2025-06-19T18:30:00","end":"2025-06-19T21:00:00","title":"June 2025 In Person Catch Up","description":"Social get-together. Discussion about large language models and meshtastic experiments. Clumsy attempt at adhering to an agenda and taking minutes.","location":"Chermside Library","coordinates":"-27.38621539644283,153.0351689206467","ctl":"202506191830","minutes":"- Admin\n\t- ToS and Privacy Policy doesn't need to be hosted on the main page. It's already got a publicly accessible presence in Discourse.\n\t- James to formalise agenda procedure\n\t- James to render cal.php on main page\n\t- James to publish \"subscribe\" link for calendar\n- Recap from Last Month\n\t- Hardware Donations for Education\n\t\t- Substation 33, in Kingston or Logan?\n\t\t- Dirk has a carload of stuff to offload\n- Discourse Themes\n\t- LLMs\n\t- Hardware for LLMs\n\t- Tiny11\n- Agenda\n\t- Motioneye\n\t- Meshtastic\n- Next Month\n\t- Location Requests\n"},{"start":"2025-06-10T19:00:00","end":"2025-06-10T21:00:00","title":"June 2025 Online Catch Up","description":"Getting started with meshtastic","location":"Jitsi","ctl":"202506101900"}] \ No newline at end of file diff --git a/dat/test/events.json b/dat/test/events.json index 7e9c440..d2d6f8c 100755 --- a/dat/test/events.json +++ b/dat/test/events.json @@ -1,16 +1 @@ -[ - { - "start": "2025-06-10T19:00:00", - "end": "2025-06-10T21:00:00", - "title": "June 2025 Online Catch Up", - "description": "Getting started with meshtastic", - "location": "Jitsi" - }, - { - "start": "2025-06-19T18:30:00", - "end": "2025-06-19T21:00:00", - "title": "June 2025 In Person Catch Up", - "location": "Chermside Library" - } -] - +[{"start":"2025-06-19T18:30:00","end":"2025-06-19T21:00:00","title":"June 2025 In Person Catch Up","location":"Chermside Library","ctl":"202506191830","agenda":"20250619: agenda\n","minutes":"20250619: minutes\n","description":"XXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"},{"start":"2025-06-10T19:00:00","end":"2025-06-10T21:00:00","title":"June 2025 Online Catch Up","description":"Getting started with meshtastic","location":"Jitsi","ctl":"202506101900","agenda":"20250610: agenda\n","minutes":"20250610: minutes\n"}] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index a7f8dbd..5e517d4 100755 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -11,7 +11,7 @@ services: volumes: - ./app/:/var/www/html:Z - ./lib:/var/www/html/lib:Z - - ./${HLBDAT:-dat.live}:/var/www/html/dat:Z + - ./dat/${HLBDAT:-live}:/var/www/html/dat:Z - ./entrypoint.sh:/entrypoint.sh:Z entrypoint: ["bash", "/entrypoint.sh"] networks: @@ -25,7 +25,7 @@ services: volumes: - ./adm/:/var/www/html:Z - ./lib:/var/www/html/lib:Z - - ./${HLBDAT:-dat.live}:/var/www/html/dat:Z + - ./dat/${HLBDAT:-live}:/var/www/html/dat:Z - ./entrypoint.sh:/entrypoint.sh:Z entrypoint: ["bash", "/entrypoint.sh"] networks: