From 47aafee97f66db1a25eec1a0a34b44830c233c8f Mon Sep 17 00:00:00 2001
From: Andy Newhouse <andy@techenby.com>
Date: Thu, 14 May 2026 17:04:02 -0500
Subject: [PATCH 01/57] =?UTF-8?q?Just=20Keep=20Swimming=20=F0=9F=90=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Actions/Calendars/FetchCalendarEvents.php | 122 ++++++
 app/Concerns/ProfileValidationRules.php       |   7 +
 app/Models/CalendarFeed.php                   |  24 ++
 app/Models/User.php                           |  10 +-
 composer.json                                 |   1 +
 composer.lock                                 | 240 +++++++++++-
 database/factories/CalendarFeedFactory.php    |  26 ++
 database/factories/UserFactory.php            |   1 +
 ..._14_204921_create_calendar_feeds_table.php |  27 ++
 ..._14_211119_add_timezone_to_users_table.php |  22 ++
 .../dashboard/\342\232\241calendar.blade.php" | 349 ++++++++++++++++++
 .../dashboard/\342\232\241calendar.test.php"  | 236 ++++++++++++
 resources/views/dashboard.blade.php           |  17 +-
 .../views/flux/icon/cooking-pot.blade.php     |  46 +++
 resources/views/layouts/kiosk.blade.php       |  31 ++
 .../\342\232\241calendar/calendar.blade.php"  |  69 ++++
 .../kiosk/\342\232\241calendar/calendar.php"  | 194 ++++++++++
 .../\342\232\241calendar/calendar.test.php"   |   8 +
 .../settings/\342\232\241profile.blade.php"   |  14 +
 routes/web.php                                |   7 +
 tests/Feature/Settings/ProfileUpdateTest.php  |  12 +
 21 files changed, 1445 insertions(+), 18 deletions(-)
 create mode 100644 app/Actions/Calendars/FetchCalendarEvents.php
 create mode 100644 app/Models/CalendarFeed.php
 create mode 100644 database/factories/CalendarFeedFactory.php
 create mode 100644 database/migrations/2026_05_14_204921_create_calendar_feeds_table.php
 create mode 100644 database/migrations/2026_05_14_211119_add_timezone_to_users_table.php
 create mode 100644 "resources/views/components/dashboard/\342\232\241calendar.blade.php"
 create mode 100644 "resources/views/components/dashboard/\342\232\241calendar.test.php"
 create mode 100644 resources/views/flux/icon/cooking-pot.blade.php
 create mode 100644 resources/views/layouts/kiosk.blade.php
 create mode 100644 "resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"

diff --git a/app/Actions/Calendars/FetchCalendarEvents.php b/app/Actions/Calendars/FetchCalendarEvents.php
new file mode 100644
index 0000000..8421417
--- /dev/null
+++ b/app/Actions/Calendars/FetchCalendarEvents.php
@@ -0,0 +1,122 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Calendars;
+
+use App\Models\CalendarFeed;
+use Carbon\CarbonImmutable;
+use DateTimeInterface;
+use DateTimeZone;
+use Illuminate\Support\Collection;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Http;
+use Sabre\VObject\Component\VEvent;
+use Sabre\VObject\DateTimeParser;
+use Sabre\VObject\Reader;
+
+class FetchCalendarEvents
+{
+    /**
+     * @return Collection<int, array{
+     *     feed_id: int,
+     *     feed_name: string,
+     *     feed_color: string,
+     *     title: string,
+     *     location: string|null,
+     *     starts_at: CarbonImmutable,
+     *     ends_at: CarbonImmutable|null,
+     *     all_day: bool
+     * }>
+     */
+    public function handle(CalendarFeed $feed, int $days = 30, ?CarbonImmutable $from = null): Collection
+    {
+        $body = Cache::remember(
+            key: "calendar-feed:{$feed->id}:" . md5($feed->url),
+            ttl: now()->addMinutes(15),
+            callback: fn () => Http::withHeaders([
+                'Accept' => 'text/calendar,text/plain,*/*',
+                'User-Agent' => 'SunnyCalendar/1.0',
+            ])->timeout(10)->get($feed->url)->throw()->body(),
+        );
+
+        return $this->parse($body, $feed, $from ?? CarbonImmutable::now($this->timezoneName($feed)), $days);
+    }
+
+    /**
+     * @return Collection<int, array{
+     *     feed_id: int,
+     *     feed_name: string,
+     *     feed_color: string,
+     *     title: string,
+     *     location: string|null,
+     *     starts_at: CarbonImmutable,
+     *     ends_at: CarbonImmutable|null,
+     *     all_day: bool
+     * }>
+     */
+    public function parse(string $ics, CalendarFeed $feed, CarbonImmutable $from, int $days = 30): Collection
+    {
+        $timezone = new DateTimeZone($this->timezoneName($feed));
+        $from = $from->setTimezone($timezone);
+        $until = $from->addDays($days);
+        $calendar = Reader::read($ics);
+        $expandedCalendar = $calendar->expand($from, $until, $timezone);
+
+        return collect($expandedCalendar->select('VEVENT'))
+            ->filter(fn ($event) => $event instanceof VEvent && isset($event->DTSTART))
+            ->map(fn (VEvent $event) => $this->eventData($event, $feed, $timezone))
+            ->sortBy('starts_at')
+            ->values();
+    }
+
+    /**
+     * @return array{
+     *     feed_id: int,
+     *     feed_name: string,
+     *     feed_color: string,
+     *     title: string,
+     *     location: string|null,
+     *     starts_at: CarbonImmutable,
+     *     ends_at: CarbonImmutable|null,
+     *     all_day: bool
+     * }
+     */
+    private function eventData(VEvent $event, CalendarFeed $feed, DateTimeZone $timezone): array
+    {
+        return [
+            'feed_id' => $feed->id,
+            'feed_name' => $feed->name,
+            'feed_color' => $feed->color,
+            'title' => blank((string) ($event->SUMMARY ?? '')) ? __('Untitled event') : (string) $event->SUMMARY,
+            'location' => blank((string) ($event->LOCATION ?? '')) ? null : (string) $event->LOCATION,
+            'starts_at' => $this->carbon($event->DTSTART->getDateTime($timezone), $timezone),
+            'ends_at' => $this->endDate($event, $timezone),
+            'all_day' => ! $event->DTSTART->hasTime(),
+        ];
+    }
+
+    private function endDate(VEvent $event, DateTimeZone $timezone): ?CarbonImmutable
+    {
+        if (isset($event->DTEND)) {
+            return $this->carbon($event->DTEND->getDateTime($timezone), $timezone);
+        }
+
+        if (isset($event->DURATION)) {
+            return $this->carbon($event->DTSTART->getDateTime($timezone), $timezone)
+                ->add(DateTimeParser::parseDuration((string) $event->DURATION));
+        }
+
+        return null;
+    }
+
+    private function carbon(DateTimeInterface $dateTime, DateTimeZone $timezone): CarbonImmutable
+    {
+        return CarbonImmutable::instance($dateTime)->setTimezone($timezone);
+    }
+
+    private function timezoneName(CalendarFeed $feed): string
+    {
+        return $feed->user?->timezone ?: 'America/Chicago';
+    }
+}
diff --git a/app/Concerns/ProfileValidationRules.php b/app/Concerns/ProfileValidationRules.php
index 3005420..c2c7e49 100644
--- a/app/Concerns/ProfileValidationRules.php
+++ b/app/Concerns/ProfileValidationRules.php
@@ -16,6 +16,7 @@ protected function profileRules(?int $userId = null): array
         return [
             'name' => $this->nameRules(),
             'email' => $this->emailRules($userId),
+            'timezone' => $this->timezoneRules(),
         ];
     }
 
@@ -38,4 +39,10 @@ protected function emailRules(?int $userId = null): array
                 : Rule::unique(User::class)->ignore($userId),
         ];
     }
+
+    /** @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string> */
+    protected function timezoneRules(): array
+    {
+        return ['required', 'string', Rule::in(timezone_identifiers_list())];
+    }
 }
diff --git a/app/Models/CalendarFeed.php b/app/Models/CalendarFeed.php
new file mode 100644
index 0000000..0cef1d9
--- /dev/null
+++ b/app/Models/CalendarFeed.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use Database\Factories\CalendarFeedFactory;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable(['user_id', 'name', 'url', 'color'])]
+class CalendarFeed extends Model
+{
+    /** @use HasFactory<CalendarFeedFactory> */
+    use HasFactory;
+
+    /** @return BelongsTo<User, $this> */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index 431eb23..ff9afc5 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -10,6 +10,7 @@
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Str;
@@ -18,7 +19,7 @@
 use Laravel\Fortify\TwoFactorAuthenticatable;
 use Laravel\Sanctum\HasApiTokens;
 
-#[Fillable(['name', 'email', 'password', 'current_team_id'])]
+#[Fillable(['name', 'email', 'password', 'current_team_id', 'timezone'])]
 #[Hidden(['password', 'two_factor_secret', 'two_factor_recovery_codes', 'remember_token'])]
 class User extends Authenticatable implements PasskeyUser
 {
@@ -42,10 +43,17 @@ public function initials(): string
     public function purge(): void
     {
         $this->ownedTeams->each->purge();
+        $this->calendarFeeds()->delete();
         $this->teamMemberships()->delete();
         $this->delete();
     }
 
+    /** @return HasMany<CalendarFeed, $this> */
+    public function calendarFeeds(): HasMany
+    {
+        return $this->hasMany(CalendarFeed::class);
+    }
+
     /** @return array<string, string> */
     protected function casts(): array
     {
diff --git a/composer.json b/composer.json
index 701e722..fdd1cfb 100644
--- a/composer.json
+++ b/composer.json
@@ -25,6 +25,7 @@
         "livewire/flux-pro": "^2.13",
         "livewire/livewire": "^4.1",
         "nunomaduro/essentials": "^1.2",
+        "sabre/vobject": "^4.5",
         "spatie/simple-excel": "^3.9"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 9fb4819..2139677 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "791fd78bee159cb1d764bc55ac57367b",
+    "content-hash": "1bc20519780b28785b4ad3ae2a87155d",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -5090,6 +5090,244 @@
             },
             "time": "2025-12-14T04:43:48+00:00"
         },
+        {
+            "name": "sabre/uri",
+            "version": "3.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabre-io/uri.git",
+                "reference": "a926c749dddfb289b8a9b5218d16ac06affdc631"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabre-io/uri/zipball/a926c749dddfb289b8a9b5218d16ac06affdc631",
+                "reference": "a926c749dddfb289b8a9b5218d16ac06affdc631",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.2"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.95",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^10.5",
+                "rector/rector": "^2.4"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/functions.php"
+                ],
+                "psr-4": {
+                    "Sabre\\Uri\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Functions for making sense out of URIs.",
+            "homepage": "http://sabre.io/uri/",
+            "keywords": [
+                "rfc3986",
+                "uri",
+                "url"
+            ],
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/uri/issues",
+                "source": "https://github.com/fruux/sabre-uri"
+            },
+            "time": "2026-04-26T04:19:03+00:00"
+        },
+        {
+            "name": "sabre/vobject",
+            "version": "4.5.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabre-io/vobject.git",
+                "reference": "d554eb24d64232922e1eab5896cc2f84b3b9ffb1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabre-io/vobject/zipball/d554eb24d64232922e1eab5896cc2f84b3b9ffb1",
+                "reference": "d554eb24d64232922e1eab5896cc2f84b3b9ffb1",
+                "shasum": ""
+            },
+            "require": {
+                "ext-mbstring": "*",
+                "php": "^7.1 || ^8.0",
+                "sabre/xml": "^2.1 || ^3.0 || ^4.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "~2.17.1",
+                "phpstan/phpstan": "^0.12 || ^1.12 || ^2.0",
+                "phpunit/php-invoker": "^2.0 || ^3.1",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.6"
+            },
+            "suggest": {
+                "hoa/bench": "If you would like to run the benchmark scripts"
+            },
+            "bin": [
+                "bin/vobject",
+                "bin/generate_vcards"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Sabre\\VObject\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Dominik Tobschall",
+                    "email": "dominik@fruux.com",
+                    "homepage": "http://tobschall.de/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Ivan Enderlin",
+                    "email": "ivan.enderlin@hoa-project.net",
+                    "homepage": "http://mnt.io/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The VObject library for PHP allows you to easily parse and manipulate iCalendar and vCard objects",
+            "homepage": "http://sabre.io/vobject/",
+            "keywords": [
+                "availability",
+                "freebusy",
+                "iCalendar",
+                "ical",
+                "ics",
+                "jCal",
+                "jCard",
+                "recurrence",
+                "rfc2425",
+                "rfc2426",
+                "rfc2739",
+                "rfc4770",
+                "rfc5545",
+                "rfc5546",
+                "rfc6321",
+                "rfc6350",
+                "rfc6351",
+                "rfc6474",
+                "rfc6638",
+                "rfc6715",
+                "rfc6868",
+                "vCalendar",
+                "vCard",
+                "vcf",
+                "xCal",
+                "xCard"
+            ],
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/vobject/issues",
+                "source": "https://github.com/fruux/sabre-vobject"
+            },
+            "time": "2026-01-12T10:45:19+00:00"
+        },
+        {
+            "name": "sabre/xml",
+            "version": "4.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sabre-io/xml.git",
+                "reference": "bec83cbe2f4e1e1ca4254ed8d7caa7e32cc74b05"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sabre-io/xml/zipball/bec83cbe2f4e1e1ca4254ed8d7caa7e32cc74b05",
+                "reference": "bec83cbe2f4e1e1ca4254ed8d7caa7e32cc74b05",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-xmlreader": "*",
+                "ext-xmlwriter": "*",
+                "lib-libxml": ">=2.6.20",
+                "php": "^8.2",
+                "sabre/uri": ">=2.0,<4.0.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.95",
+                "phpstan/extension-installer": "^1.4",
+                "phpstan/phpstan": "^2.1",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^10.5",
+                "rector/rector": "^2.4"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/Deserializer/functions.php",
+                    "lib/Serializer/functions.php"
+                ],
+                "psr-4": {
+                    "Sabre\\Xml\\": "lib/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Evert Pot",
+                    "email": "me@evertpot.com",
+                    "homepage": "http://evertpot.com/",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Markus Staab",
+                    "email": "markus.staab@redaxo.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "sabre/xml is an XML library that you may not hate.",
+            "homepage": "https://sabre.io/xml/",
+            "keywords": [
+                "XMLReader",
+                "XMLWriter",
+                "dom",
+                "xml"
+            ],
+            "support": {
+                "forum": "https://groups.google.com/group/sabredav-discuss",
+                "issues": "https://github.com/sabre-io/xml/issues",
+                "source": "https://github.com/fruux/sabre-xml"
+            },
+            "time": "2026-04-27T10:56:01+00:00"
+        },
         {
             "name": "saloonphp/saloon",
             "version": "v4.0.0",
diff --git a/database/factories/CalendarFeedFactory.php b/database/factories/CalendarFeedFactory.php
new file mode 100644
index 0000000..4023ce7
--- /dev/null
+++ b/database/factories/CalendarFeedFactory.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\CalendarFeed;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<CalendarFeed>
+ */
+class CalendarFeedFactory extends Factory
+{
+    /** @return array<string, mixed> */
+    public function definition(): array
+    {
+        return [
+            'user_id' => User::factory(),
+            'name' => fake()->words(2, true),
+            'url' => fake()->url() . '/calendar.ics',
+            'color' => fake()->randomElement(['#2563eb', '#16a34a', '#dc2626', '#9333ea', '#ea580c', '#0891b2']),
+        ];
+    }
+}
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 00704a8..f6dd12c 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -25,6 +25,7 @@ public function definition(): array
             'name' => fake()->name(),
             'email' => fake()->unique()->safeEmail(),
             'email_verified_at' => now(),
+            'timezone' => 'America/Chicago',
             'password' => static::$password ??= Hash::make('password'),
             'remember_token' => Str::random(10),
             'two_factor_secret' => null,
diff --git a/database/migrations/2026_05_14_204921_create_calendar_feeds_table.php b/database/migrations/2026_05_14_204921_create_calendar_feeds_table.php
new file mode 100644
index 0000000..361e609
--- /dev/null
+++ b/database/migrations/2026_05_14_204921_create_calendar_feeds_table.php
@@ -0,0 +1,27 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('calendar_feeds', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id')->constrained()->cascadeOnDelete();
+            $table->string('name');
+            $table->text('url');
+            $table->string('color', 7)->default('#2563eb');
+            $table->timestamps();
+
+            $table->index(['user_id', 'name']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('calendar_feeds');
+    }
+};
diff --git a/database/migrations/2026_05_14_211119_add_timezone_to_users_table.php b/database/migrations/2026_05_14_211119_add_timezone_to_users_table.php
new file mode 100644
index 0000000..c118402
--- /dev/null
+++ b/database/migrations/2026_05_14_211119_add_timezone_to_users_table.php
@@ -0,0 +1,22 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('timezone')->default('America/Chicago')->after('email_verified_at');
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('timezone');
+        });
+    }
+};
diff --git "a/resources/views/components/dashboard/\342\232\241calendar.blade.php" "b/resources/views/components/dashboard/\342\232\241calendar.blade.php"
new file mode 100644
index 0000000..6bdea41
--- /dev/null
+++ "b/resources/views/components/dashboard/\342\232\241calendar.blade.php"
@@ -0,0 +1,349 @@
+<?php
+
+use App\Actions\Calendars\FetchCalendarEvents;
+use App\Models\CalendarFeed;
+use Carbon\CarbonImmutable;
+use Carbon\CarbonInterface;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
+use Illuminate\Validation\Rule;
+use Livewire\Attributes\Computed;
+use Livewire\Component;
+
+new class extends Component
+{
+    private const DEFAULT_COLOR = '#2563eb';
+
+    private const COLOR_OPTIONS = [
+        '#2563eb' => 'Blue',
+        '#16a34a' => 'Green',
+        '#dc2626' => 'Red',
+        '#9333ea' => 'Purple',
+        '#ea580c' => 'Orange',
+        '#0891b2' => 'Cyan',
+        '#ca8a04' => 'Gold',
+        '#4f46e5' => 'Indigo',
+    ];
+
+    public string $feedName = '';
+
+    public string $feedUrl = '';
+
+    public string $feedColor = self::DEFAULT_COLOR;
+
+    public string $weekStartDate = '';
+
+    public function mount(): void
+    {
+        $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
+            ->startOfWeek(CarbonInterface::SUNDAY)
+            ->toDateString();
+    }
+
+    /** @return EloquentCollection<int, CalendarFeed> */
+    #[Computed]
+    public function feeds(): EloquentCollection
+    {
+        return Auth::user()
+            ->calendarFeeds()
+            ->orderBy('name')
+            ->get();
+    }
+
+    /** @return array<int, array<string, mixed>> */
+    #[Computed]
+    public function weekEvents(): array
+    {
+        $weekStartsAt = $this->weekStartsAt();
+
+        return $this->feeds
+            ->flatMap(function (CalendarFeed $feed) {
+                try {
+                    return app(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
+                } catch (Throwable) {
+                    return collect();
+                }
+            })
+            ->sortBy('starts_at')
+            ->take(12)
+            ->values()
+            ->all();
+    }
+
+    /** @return array<int, array{date: CarbonImmutable, events: array<int, array<string, mixed>>, is_today: bool}> */
+    #[Computed]
+    public function weekDays(): array
+    {
+        $events = collect($this->weekEvents);
+
+        return collect(range(0, 6))
+            ->map(function (int $offset) use ($events): array {
+                $date = $this->weekStartsAt()->addDays($offset);
+
+                return [
+                    'date' => $date,
+                    'events' => $events
+                        ->filter(fn (array $event) => $event['starts_at']->isSameDay($date))
+                        ->values()
+                        ->all(),
+                    'is_today' => $date->isSameDay(CarbonImmutable::now($this->timezoneName())),
+                ];
+            })
+            ->all();
+    }
+
+    #[Computed]
+    public function weekLabel(): string
+    {
+        $weekStartsAt = $this->weekStartsAt();
+        $weekEndsAt = $weekStartsAt->addDays(6);
+
+        if ($weekStartsAt->isSameMonth($weekEndsAt)) {
+            return $weekStartsAt->format('M j') . ' - ' . $weekEndsAt->format('j, Y');
+        }
+
+        return $weekStartsAt->format('M j') . ' - ' . $weekEndsAt->format('M j, Y');
+    }
+
+    /** @return array<string, string> */
+    public function colorOptions(): array
+    {
+        return self::COLOR_OPTIONS;
+    }
+
+    public function addFeed(): void
+    {
+        $this->feedUrl = rtrim($this->feedUrl, " \t\n\r\0\x0B,");
+
+        $validated = $this->validate([
+            'feedName' => ['nullable', 'string', 'max:255'],
+            'feedUrl' => ['required', 'url', 'starts_with:http://,https://', 'max:2048'],
+            'feedColor' => ['required', Rule::in(array_keys(self::COLOR_OPTIONS))],
+        ]);
+
+        $url = $validated['feedUrl'];
+        $host = parse_url($url, PHP_URL_HOST);
+
+        Auth::user()->calendarFeeds()->create([
+            'name' => filled($validated['feedName']) ? $validated['feedName'] : Str::headline((string) $host),
+            'url' => $url,
+            'color' => $validated['feedColor'],
+        ]);
+
+        $this->reset('feedName', 'feedUrl');
+        $this->feedColor = self::DEFAULT_COLOR;
+        unset($this->feeds, $this->weekEvents, $this->weekDays);
+
+        Flux::toast(__('Calendar feed added.'));
+    }
+
+    public function updateFeedColor(int $feedId, string $color): void
+    {
+        validator(['color' => $color], [
+            'color' => [Rule::in(array_keys(self::COLOR_OPTIONS))],
+        ])->validate();
+
+        Auth::user()->calendarFeeds()->whereKey($feedId)->update(['color' => $color]);
+
+        unset($this->feeds, $this->weekEvents, $this->weekDays);
+    }
+
+    public function deleteFeed(int $feedId): void
+    {
+        Auth::user()->calendarFeeds()->whereKey($feedId)->delete();
+
+        unset($this->feeds, $this->weekEvents, $this->weekDays);
+
+        Flux::toast(__('Calendar feed removed.'));
+    }
+
+    public function previousWeek(): void
+    {
+        $this->weekStartDate = $this->weekStartsAt()->subWeek()->toDateString();
+        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+    }
+
+    public function nextWeek(): void
+    {
+        $this->weekStartDate = $this->weekStartsAt()->addWeek()->toDateString();
+        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+    }
+
+    public function currentWeek(): void
+    {
+        $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
+            ->startOfWeek(CarbonInterface::SUNDAY)
+            ->toDateString();
+
+        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+    }
+
+    private function weekStartsAt(): CarbonImmutable
+    {
+        return CarbonImmutable::parse($this->weekStartDate, $this->timezoneName())
+            ->startOfWeek(CarbonInterface::SUNDAY);
+    }
+
+    private function timezoneName(): string
+    {
+        return Auth::user()->timezone ?: 'America/Chicago';
+    }
+};
+?>
+
+<section class="flex w-full flex-col gap-6">
+    <div class="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
+        <div>
+            <flux:heading size="xl">{{ __('Calendar') }}</flux:heading>
+            <flux:text class="mt-1 text-zinc-500 dark:text-zinc-400">
+                {{ __('Weekly events from your subscribed calendars') }}
+            </flux:text>
+        </div>
+
+        <form wire:submit="addFeed" class="grid gap-3 rounded-lg border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900 sm:grid-cols-[minmax(0,12rem)_minmax(16rem,1fr)_auto] lg:w-[48rem]">
+            <flux:input wire:model="feedName" :label="__('Name')" :placeholder="__('Family')" />
+            <flux:input wire:model="feedUrl" :label="__('Feed URL')" type="url" :placeholder="__('https://.../calendar.ics')" />
+            <div class="flex items-end">
+                <flux:button type="submit" variant="primary" icon="plus" class="w-full sm:w-auto">
+                    {{ __('Add') }}
+                </flux:button>
+            </div>
+            <fieldset class="sm:col-span-3">
+                <legend class="mb-2 text-sm font-medium text-zinc-800 dark:text-zinc-200">{{ __('Color') }}</legend>
+                <div class="flex flex-wrap gap-2">
+                    @foreach ($this->colorOptions() as $color => $label)
+                        <label class="relative cursor-pointer">
+                            <input wire:model="feedColor" type="radio" value="{{ $color }}" class="peer sr-only" aria-label="{{ __($label) }}" />
+                            <span
+                                class="block size-7 rounded-full border border-black/10 ring-offset-2 peer-checked:ring-2 peer-checked:ring-zinc-900 dark:border-white/15 dark:ring-offset-zinc-900 dark:peer-checked:ring-white"
+                                style="background-color: {{ $color }}"
+                            ></span>
+                        </label>
+                    @endforeach
+                </div>
+                <flux:error name="feedColor" />
+            </fieldset>
+        </form>
+    </div>
+
+    <div class="grid gap-6 xl:grid-cols-[minmax(0,1fr)_20rem]">
+        <div class="overflow-hidden rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900">
+            <div class="flex flex-col gap-3 border-b border-zinc-200 px-5 py-4 dark:border-zinc-700 sm:flex-row sm:items-center sm:justify-between">
+                <div>
+                    <flux:heading size="lg">{{ __('Week') }}</flux:heading>
+                    <flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ $this->weekLabel }}</flux:text>
+                </div>
+
+                <div class="flex items-center gap-2">
+                    <flux:button type="button" variant="ghost" size="sm" icon="chevron-left" wire:click="previousWeek" />
+                    <flux:button type="button" variant="filled" size="sm" wire:click="currentWeek">{{ __('Today') }}</flux:button>
+                    <flux:button type="button" variant="ghost" size="sm" icon="chevron-right" wire:click="nextWeek" />
+                </div>
+            </div>
+
+            @if ($this->feeds->isEmpty())
+                <div class="px-5 py-12 text-center">
+                    <flux:icon name="calendar-days" class="mx-auto mb-3 size-8 text-zinc-400" />
+                    <flux:text class="text-zinc-500 dark:text-zinc-400">
+                        {{ __('Add a calendar feed to see weekly events.') }}
+                    </flux:text>
+                </div>
+            @else
+                <div class="grid min-h-[32rem] divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
+                    @foreach ($this->weekDays as $day)
+                        <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col">
+                            <div @class([
+                                'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
+                                'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
+                                'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
+                            ])>
+                                <div>
+                                    <div @class([
+                                        'text-xs font-medium uppercase',
+                                        'text-zinc-500 dark:text-zinc-400'
+                                    ])>{{ $day['date']->format('D') }}</div>
+                                    <div @class([
+                                        'text-sm font-semibold',
+                                        'text-zinc-900 dark:text-zinc-100'
+                                    ])>{{ $day['date']->format('M j') }}</div>
+                                </div>
+                            </div>
+
+                            <div class="flex flex-1 flex-col gap-2 p-3">
+                                @forelse ($day['events'] as $event)
+                                    <div
+                                        wire:key="calendar-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
+                                        class="rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:border-zinc-700 dark:bg-zinc-950"
+                                        style="border-left: 4px solid {{ $event['feed_color'] }}"
+                                    >
+                                        <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
+                                            <span class="size-2 rounded-full" style="background-color: {{ $event['feed_color'] }}"></span>
+                                            {{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}
+                                        </div>
+
+                                        <div class="break-words font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
+                                        <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['feed_name'] }}</div>
+
+                                        @if ($event['location'])
+                                            <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['location'] }}</div>
+                                        @endif
+                                    </div>
+                                @empty
+                                @endforelse
+                            </div>
+                        </div>
+                    @endforeach
+                </div>
+            @endif
+        </div>
+
+        <div class="rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900">
+            <div class="border-b border-zinc-200 px-5 py-4 dark:border-zinc-700">
+                <flux:heading size="lg">{{ __('Feeds') }}</flux:heading>
+            </div>
+
+            <div class="divide-y divide-zinc-100 dark:divide-zinc-800">
+                @forelse ($this->feeds as $feed)
+                    <div wire:key="calendar-feed-{{ $feed->id }}" class="flex items-center justify-between gap-3 px-5 py-4">
+                        <div class="min-w-0">
+                            <div class="flex min-w-0 items-center gap-2">
+                                <span class="size-2.5 shrink-0 rounded-full" style="background-color: {{ $feed->color }}"></span>
+                                <div class="truncate font-medium text-zinc-900 dark:text-zinc-100">{{ $feed->name }}</div>
+                            </div>
+                            <div class="truncate text-sm text-zinc-500 dark:text-zinc-400">{{ parse_url($feed->url, PHP_URL_HOST) }}</div>
+                            <div class="mt-2 flex flex-wrap gap-1.5">
+                                @foreach ($this->colorOptions() as $color => $label)
+                                    <flux:tooltip :content="__($label)">
+                                        <button
+                                            type="button"
+                                            wire:click="updateFeedColor({{ $feed->id }}, '{{ $color }}')"
+                                            class="size-5 rounded-full border border-black/10 ring-offset-2 {{ $feed->color === $color ? 'ring-2 ring-zinc-900 dark:ring-white' : '' }} dark:border-white/15 dark:ring-offset-zinc-900"
+                                            style="background-color: {{ $color }}"
+                                            aria-label="{{ __('Set :feed to :color', ['feed' => $feed->name, 'color' => __($label)]) }}"
+                                        ></button>
+                                    </flux:tooltip>
+                                @endforeach
+                            </div>
+                        </div>
+
+                        <flux:tooltip :content="__('Remove feed')">
+                            <flux:button
+                                type="button"
+                                variant="ghost"
+                                size="sm"
+                                icon="trash"
+                                wire:click="deleteFeed({{ $feed->id }})"
+                                wire:confirm="{{ __('Remove this calendar feed?') }}"
+                            />
+                        </flux:tooltip>
+                    </div>
+                @empty
+                    <div class="px-5 py-8 text-center">
+                        <flux:text class="text-zinc-500 dark:text-zinc-400">{{ __('No feeds yet') }}</flux:text>
+                    </div>
+                @endforelse
+            </div>
+        </div>
+    </div>
+</section>
diff --git "a/resources/views/components/dashboard/\342\232\241calendar.test.php" "b/resources/views/components/dashboard/\342\232\241calendar.test.php"
new file mode 100644
index 0000000..ab733f3
--- /dev/null
+++ "b/resources/views/components/dashboard/\342\232\241calendar.test.php"
@@ -0,0 +1,236 @@
+<?php
+
+use App\Actions\Calendars\FetchCalendarEvents;
+use App\Models\CalendarFeed;
+use App\Models\User;
+use Carbon\CarbonImmutable;
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Http;
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::actingAs(User::factory()->create())
+        ->test('dashboard.calendar')
+        ->assertStatus(200);
+});
+
+it('adds calendar feeds for the authenticated user', function () {
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('dashboard.calendar')
+        ->set('feedName', 'Work')
+        ->set('feedUrl', 'https://calendar.example.com/basic.ics,')
+        ->set('feedColor', '#16a34a')
+        ->call('addFeed')
+        ->assertSet('feedName', '')
+        ->assertSet('feedUrl', '')
+        ->assertSet('feedColor', '#2563eb');
+
+    expect($user->calendarFeeds()->first())
+        ->name->toBe('Work')
+        ->url->toBe('https://calendar.example.com/basic.ics')
+        ->color->toBe('#16a34a');
+});
+
+it('requires a valid calendar feed url', function () {
+    Livewire::actingAs(User::factory()->create())
+        ->test('dashboard.calendar')
+        ->set('feedUrl', 'not-a-url')
+        ->call('addFeed')
+        ->assertHasErrors(['feedUrl']);
+});
+
+it('requires a valid calendar feed color', function () {
+    Livewire::actingAs(User::factory()->create())
+        ->test('dashboard.calendar')
+        ->set('feedUrl', 'https://calendar.example.com/basic.ics')
+        ->set('feedColor', '#ffffff')
+        ->call('addFeed')
+        ->assertHasErrors(['feedColor']);
+});
+
+it('updates only the authenticated users feed colors', function () {
+    $user = User::factory()->create();
+    $otherUser = User::factory()->create();
+    $feed = CalendarFeed::factory()->for($user)->create(['color' => '#2563eb']);
+    $otherFeed = CalendarFeed::factory()->for($otherUser)->create(['color' => '#2563eb']);
+
+    Livewire::actingAs($user)
+        ->test('dashboard.calendar')
+        ->call('updateFeedColor', $feed->id, '#dc2626')
+        ->call('updateFeedColor', $otherFeed->id, '#dc2626');
+
+    expect($feed->fresh()->color)->toBe('#dc2626')
+        ->and($otherFeed->fresh()->color)->toBe('#2563eb');
+});
+
+it('removes only the authenticated users calendar feeds', function () {
+    $user = User::factory()->create();
+    $otherUser = User::factory()->create();
+    $feed = CalendarFeed::factory()->for($user)->create();
+    $otherFeed = CalendarFeed::factory()->for($otherUser)->create();
+
+    Livewire::actingAs($user)
+        ->test('dashboard.calendar')
+        ->call('deleteFeed', $feed->id)
+        ->call('deleteFeed', $otherFeed->id);
+
+    expect($feed->fresh())->toBeNull()
+        ->and($otherFeed->fresh())->not->toBeNull();
+});
+
+it('shows upcoming events from calendar feeds', function () {
+    CarbonImmutable::setTestNow('2026-05-14 09:00:00');
+    Cache::store()->flush();
+    Http::fake([
+        'calendar.example.com/*' => Http::response(calendarFixture()),
+    ]);
+
+    $user = User::factory()->create();
+    CalendarFeed::factory()->for($user)->create([
+        'name' => 'Work',
+        'url' => 'https://calendar.example.com/basic.ics',
+        'color' => '#9333ea',
+    ]);
+
+    Livewire::actingAs($user)
+        ->test('dashboard.calendar')
+        ->assertSee('Design review')
+        ->assertSee('Work')
+        ->assertSee('#9333ea')
+        ->assertSee('10:00 AM')
+        ->assertSee('Office');
+
+    CarbonImmutable::setTestNow();
+});
+
+it('shows events for the selected week and can navigate weeks', function () {
+    CarbonImmutable::setTestNow('2026-05-14 09:00:00');
+    Cache::store()->flush();
+    Http::fake([
+        'calendar.example.com/*' => Http::response(calendarFixture(<<<ICS
+BEGIN:VEVENT
+UID:this-week@example.com
+SUMMARY:This week review
+DTSTART:20260514T150000Z
+DTEND:20260514T160000Z
+END:VEVENT
+BEGIN:VEVENT
+UID:next-week@example.com
+SUMMARY:Next week planning
+DTSTART:20260520T150000Z
+DTEND:20260520T160000Z
+END:VEVENT
+ICS)),
+    ]);
+
+    $user = User::factory()->create();
+    CalendarFeed::factory()->for($user)->create([
+        'name' => 'Work',
+        'url' => 'https://calendar.example.com/basic.ics',
+    ]);
+
+    Livewire::actingAs($user)
+        ->test('dashboard.calendar')
+        ->assertSee('May 10 - 16, 2026')
+        ->assertSee('This week review')
+        ->assertDontSee('Next week planning')
+        ->call('nextWeek')
+        ->assertSee('May 17 - 23, 2026')
+        ->assertSee('Next week planning')
+        ->assertDontSee('This week review');
+
+    CarbonImmutable::setTestNow();
+});
+
+it('expands simple recurring calendar events', function () {
+    $feed = CalendarFeed::factory()->make([
+        'id' => 10,
+        'name' => 'Family',
+    ]);
+
+    $events = app(FetchCalendarEvents::class)->parse(
+        calendarFixture(<<<ICS
+BEGIN:VEVENT
+UID:standup@example.com
+SUMMARY:Standup
+DTSTART:20260514T140000Z
+DTEND:20260514T143000Z
+RRULE:FREQ=WEEKLY;COUNT=3
+END:VEVENT
+ICS),
+        $feed,
+        CarbonImmutable::parse('2026-05-14 00:00:00'),
+        30,
+    );
+
+    expect($events)->toHaveCount(3)
+        ->and($events->pluck('title')->all())->toBe(['Standup', 'Standup', 'Standup']);
+});
+
+it('honors excluded recurring calendar dates', function () {
+    $feed = CalendarFeed::factory()->make([
+        'id' => 10,
+        'name' => 'Family',
+    ]);
+
+    $events = app(FetchCalendarEvents::class)->parse(
+        calendarFixture(<<<ICS
+BEGIN:VEVENT
+UID:standup@example.com
+SUMMARY:Standup
+DTSTART:20260514T140000Z
+DTEND:20260514T143000Z
+RRULE:FREQ=WEEKLY;COUNT=3
+EXDATE:20260521T140000Z
+END:VEVENT
+ICS),
+        $feed,
+        CarbonImmutable::parse('2026-05-14 00:00:00'),
+        30,
+    );
+
+    expect($events)->toHaveCount(2)
+        ->and($events->pluck('starts_at')->map->toDateString()->all())->toBe(['2026-05-14', '2026-05-28']);
+});
+
+it('converts calendar feed times to the users timezone', function () {
+    $user = User::factory()->create(['timezone' => 'America/New_York']);
+    $feed = CalendarFeed::factory()->for($user)->create([
+        'name' => 'Work',
+        'url' => 'https://calendar.example.com/basic.ics',
+    ]);
+
+    $events = app(FetchCalendarEvents::class)->parse(
+        calendarFixture(),
+        $feed,
+        CarbonImmutable::parse('2026-05-14 00:00:00', 'America/New_York'),
+        30,
+    );
+
+    expect($events)->toHaveCount(1)
+        ->and($events->first()['starts_at']->timezoneName)->toBe('America/New_York')
+        ->and($events->first()['starts_at']->format('g:i A'))->toBe('11:00 AM');
+});
+
+function calendarFixture(string $events = ''): string
+{
+    $events = $events ?: <<<ICS
+BEGIN:VEVENT
+UID:design-review@example.com
+SUMMARY:Design review
+LOCATION:Office
+DTSTART:20260514T150000Z
+DTEND:20260514T160000Z
+END:VEVENT
+ICS;
+
+    return <<<ICS
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Sunny//Calendar Test//EN
+{$events}
+END:VCALENDAR
+ICS;
+}
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 8f08c05..c95cae6 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -1,18 +1,3 @@
 <x-layouts::app :title="__('Dashboard')">
-    <div class="flex h-full w-full flex-1 flex-col gap-4 rounded-xl">
-        <div class="grid auto-rows-min gap-4 md:grid-cols-3">
-            <div class="relative aspect-video overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
-                <x-placeholder-pattern class="absolute inset-0 size-full stroke-gray-900/20 dark:stroke-neutral-100/20" />
-            </div>
-            <div class="relative aspect-video overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
-                <x-placeholder-pattern class="absolute inset-0 size-full stroke-gray-900/20 dark:stroke-neutral-100/20" />
-            </div>
-            <div class="relative aspect-video overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
-                <x-placeholder-pattern class="absolute inset-0 size-full stroke-gray-900/20 dark:stroke-neutral-100/20" />
-            </div>
-        </div>
-        <div class="relative h-full flex-1 overflow-hidden rounded-xl border border-neutral-200 dark:border-neutral-700">
-            <x-placeholder-pattern class="absolute inset-0 size-full stroke-gray-900/20 dark:stroke-neutral-100/20" />
-        </div>
-    </div>
+    <livewire:dashboard.calendar />
 </x-layouts::app>
diff --git a/resources/views/flux/icon/cooking-pot.blade.php b/resources/views/flux/icon/cooking-pot.blade.php
new file mode 100644
index 0000000..7e732ea
--- /dev/null
+++ b/resources/views/flux/icon/cooking-pot.blade.php
@@ -0,0 +1,46 @@
+@blaze(fold: true)
+
+{{-- Credit: Lucide (https://lucide.dev) --}}
+
+@props([
+    'variant' => 'outline',
+])
+
+@php
+if ($variant === 'solid') {
+    throw new \Exception('The "solid" variant is not supported in Lucide.');
+}
+
+$classes = Flux::classes('shrink-0')
+    ->add(match($variant) {
+        'outline' => '[:where(&)]:size-6',
+        'solid' => '[:where(&)]:size-6',
+        'mini' => '[:where(&)]:size-5',
+        'micro' => '[:where(&)]:size-4',
+    });
+
+$strokeWidth = match ($variant) {
+    'outline' => 2,
+    'mini' => 2.25,
+    'micro' => 2.5,
+};
+@endphp
+
+<svg
+    {{ $attributes->class($classes) }}
+    data-flux-icon
+    xmlns="http://www.w3.org/2000/svg"
+    viewBox="0 0 24 24"
+    fill="none"
+    stroke="currentColor"
+    stroke-width="{{ $strokeWidth }}"
+    stroke-linecap="round"
+    stroke-linejoin="round"
+    aria-hidden="true"
+    data-slot="icon"
+>
+  <path d="M2 12h20" />
+  <path d="M20 12v8a2 2 0 0 1-2 2H6a2 2 0 0 1-2-2v-8" />
+  <path d="m4 8 16-4" />
+  <path d="m8.86 6.78-.45-1.81a2 2 0 0 1 1.45-2.43l1.94-.48a2 2 0 0 1 2.43 1.46l.45 1.8" />
+</svg>
diff --git a/resources/views/layouts/kiosk.blade.php b/resources/views/layouts/kiosk.blade.php
new file mode 100644
index 0000000..6a69676
--- /dev/null
+++ b/resources/views/layouts/kiosk.blade.php
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}" class="dark">
+    <head>
+        @include('layouts.partials.head')
+    </head>
+    <body class="min-h-screen bg-white dark:bg-zinc-800">
+        <flux:sidebar sticky collapsible class="bg-zinc-50 dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-700">
+            <flux:sidebar.header>
+                <flux:sidebar.collapse class="in-data-flux-sidebar-on-desktop:not-in-data-flux-sidebar-collapsed-desktop:-mr-2" />
+            </flux:sidebar.header>
+
+            <flux:sidebar.nav>
+                <flux:sidebar.item icon="calendar" href="#">Calendar</flux:sidebar.item>
+                <flux:sidebar.item icon="arrow-path-rounded-square" href="#">Routines</flux:sidebar.item>
+                <flux:sidebar.item icon="clipboard-document-list" href="#">Chore Chart</flux:sidebar.item>
+                <flux:sidebar.item icon="queue-list" href="#">Lists</flux:sidebar.item>
+                <flux:sidebar.item icon="cooking-pot" href="#">Meal Planning</flux:sidebar.item>
+            </flux:sidebar.nav>
+        </flux:sidebar>
+
+        <flux:main>
+            {{ $slot }}
+        </flux:main>
+
+        @persist('toast')
+            <flux:toast />
+        @endpersist
+
+        @fluxScripts
+    </body>
+</html>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
new file mode 100644
index 0000000..bb82c6f
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -0,0 +1,69 @@
+<div class="overflow-hidden rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900">
+    <div class="flex flex-col gap-3 border-b border-zinc-200 px-5 py-4 dark:border-zinc-700 sm:flex-row sm:items-center sm:justify-between">
+        <div>
+            <flux:heading size="lg">{{ __('Week') }}</flux:heading>
+            <flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ $this->weekLabel }}</flux:text>
+        </div>
+
+        <div class="flex items-center gap-2">
+            <flux:button type="button" variant="ghost" size="sm" icon="chevron-left" wire:click="previousWeek" />
+            <flux:button type="button" variant="filled" size="sm" wire:click="currentWeek">{{ __('Today') }}</flux:button>
+            <flux:button type="button" variant="ghost" size="sm" icon="chevron-right" wire:click="nextWeek" />
+        </div>
+    </div>
+
+    @if ($this->feeds->isEmpty())
+        <div class="px-5 py-12 text-center">
+            <flux:icon name="calendar-days" class="mx-auto mb-3 size-8 text-zinc-400" />
+            <flux:text class="text-zinc-500 dark:text-zinc-400">
+                {{ __('Add a calendar feed to see weekly events.') }}
+            </flux:text>
+        </div>
+    @else
+        <div class="grid min-h-[32rem] divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
+            @foreach ($this->weekDays as $day)
+                <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col">
+                    <div @class([
+                        'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
+                        'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
+                        'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
+                    ])>
+                        <div>
+                            <div @class([
+                                'text-xs font-medium uppercase',
+                                'text-zinc-500 dark:text-zinc-400'
+                            ])>{{ $day['date']->format('D') }}</div>
+                            <div @class([
+                                'text-sm font-semibold',
+                                'text-zinc-900 dark:text-zinc-100'
+                            ])>{{ $day['date']->format('M j') }}</div>
+                        </div>
+                    </div>
+
+                    <div class="flex flex-1 flex-col gap-2 p-3">
+                        @forelse ($day['events'] as $event)
+                            <div
+                                wire:key="calendar-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
+                                class="rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:border-zinc-700 dark:bg-zinc-950"
+                                style="border-left: 4px solid {{ $event['feed_color'] }}"
+                            >
+                                <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
+                                    <span class="size-2 rounded-full" style="background-color: {{ $event['feed_color'] }}"></span>
+                                    {{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}
+                                </div>
+
+                                <div class="break-words font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
+                                <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['feed_name'] }}</div>
+
+                                @if ($event['location'])
+                                    <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['location'] }}</div>
+                                @endif
+                            </div>
+                        @empty
+                        @endforelse
+                    </div>
+                </div>
+            @endforeach
+        </div>
+    @endif
+</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
new file mode 100644
index 0000000..cebf4df
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -0,0 +1,194 @@
+<?php
+
+use App\Actions\Calendars\FetchCalendarEvents;
+use App\Models\CalendarFeed;
+use Carbon\CarbonImmutable;
+use Carbon\CarbonInterface;
+use Flux\Flux;
+use Illuminate\Database\Eloquent\Collection as EloquentCollection;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Str;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\Layout;
+use Livewire\Attributes\Rule;
+use Livewire\Component;
+
+new #[Layout('layouts::kiosk')] class extends Component
+{
+    private const DEFAULT_COLOR = '#2563eb';
+
+    private const COLOR_OPTIONS = [
+        '#2563eb' => 'Blue',
+        '#16a34a' => 'Green',
+        '#dc2626' => 'Red',
+        '#9333ea' => 'Purple',
+        '#ea580c' => 'Orange',
+        '#0891b2' => 'Cyan',
+        '#ca8a04' => 'Gold',
+        '#4f46e5' => 'Indigo',
+    ];
+
+    public string $feedName = '';
+
+    public string $feedUrl = '';
+
+    public string $feedColor = self::DEFAULT_COLOR;
+
+    public string $weekStartDate = '';
+
+    public function mount(): void
+    {
+        $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
+            ->startOfWeek(CarbonInterface::SUNDAY)
+            ->toDateString();
+    }
+
+    /** @return EloquentCollection<int, CalendarFeed> */
+    #[Computed]
+    public function feeds(): EloquentCollection
+    {
+        return Auth::user()
+            ->calendarFeeds()
+            ->orderBy('name')
+            ->get();
+    }
+
+    /** @return array<int, array<string, mixed>> */
+    #[Computed]
+    public function weekEvents(): array
+    {
+        $weekStartsAt = $this->weekStartsAt();
+
+        return $this->feeds
+            ->flatMap(function (CalendarFeed $feed) {
+                try {
+                    return app(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
+                } catch (Throwable) {
+                    return collect();
+                }
+            })
+            ->sortBy('starts_at')
+            ->take(12)
+            ->values()
+            ->all();
+    }
+
+    /** @return array<int, array{date: CarbonImmutable, events: array<int, array<string, mixed>>, is_today: bool}> */
+    #[Computed]
+    public function weekDays(): array
+    {
+        $events = collect($this->weekEvents);
+
+        return collect(range(0, 6))
+            ->map(function (int $offset) use ($events): array {
+                $date = $this->weekStartsAt()->addDays($offset);
+
+                return [
+                    'date' => $date,
+                    'events' => $events
+                        ->filter(fn (array $event) => $event['starts_at']->isSameDay($date))
+                        ->values()
+                        ->all(),
+                    'is_today' => $date->isSameDay(CarbonImmutable::now($this->timezoneName())),
+                ];
+            })
+            ->all();
+    }
+
+    #[Computed]
+    public function weekLabel(): string
+    {
+        $weekStartsAt = $this->weekStartsAt();
+        $weekEndsAt = $weekStartsAt->addDays(6);
+
+        if ($weekStartsAt->isSameMonth($weekEndsAt)) {
+            return $weekStartsAt->format('M j') . ' - ' . $weekEndsAt->format('j, Y');
+        }
+
+        return $weekStartsAt->format('M j') . ' - ' . $weekEndsAt->format('M j, Y');
+    }
+
+    /** @return array<string, string> */
+    public function colorOptions(): array
+    {
+        return self::COLOR_OPTIONS;
+    }
+
+    public function addFeed(): void
+    {
+        $this->feedUrl = rtrim($this->feedUrl, " \t\n\r\0\x0B,");
+
+        $validated = $this->validate([
+            'feedName' => ['nullable', 'string', 'max:255'],
+            'feedUrl' => ['required', 'url', 'starts_with:http://,https://', 'max:2048'],
+            'feedColor' => ['required', Rule::in(array_keys(self::COLOR_OPTIONS))],
+        ]);
+
+        $url = $validated['feedUrl'];
+        $host = parse_url($url, PHP_URL_HOST);
+
+        Auth::user()->calendarFeeds()->create([
+            'name' => filled($validated['feedName']) ? $validated['feedName'] : Str::headline((string) $host),
+            'url' => $url,
+            'color' => $validated['feedColor'],
+        ]);
+
+        $this->reset('feedName', 'feedUrl');
+        $this->feedColor = self::DEFAULT_COLOR;
+        unset($this->feeds, $this->weekEvents, $this->weekDays);
+
+        Flux::toast(__('Calendar feed added.'));
+    }
+
+    public function updateFeedColor(int $feedId, string $color): void
+    {
+        validator(['color' => $color], [
+            'color' => [Rule::in(array_keys(self::COLOR_OPTIONS))],
+        ])->validate();
+
+        Auth::user()->calendarFeeds()->whereKey($feedId)->update(['color' => $color]);
+
+        unset($this->feeds, $this->weekEvents, $this->weekDays);
+    }
+
+    public function deleteFeed(int $feedId): void
+    {
+        Auth::user()->calendarFeeds()->whereKey($feedId)->delete();
+
+        unset($this->feeds, $this->weekEvents, $this->weekDays);
+
+        Flux::toast(__('Calendar feed removed.'));
+    }
+
+    public function previousWeek(): void
+    {
+        $this->weekStartDate = $this->weekStartsAt()->subWeek()->toDateString();
+        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+    }
+
+    public function nextWeek(): void
+    {
+        $this->weekStartDate = $this->weekStartsAt()->addWeek()->toDateString();
+        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+    }
+
+    public function currentWeek(): void
+    {
+        $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
+            ->startOfWeek(CarbonInterface::SUNDAY)
+            ->toDateString();
+
+        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+    }
+
+    private function weekStartsAt(): CarbonImmutable
+    {
+        return CarbonImmutable::parse($this->weekStartDate, $this->timezoneName())
+            ->startOfWeek(CarbonInterface::SUNDAY);
+    }
+
+    private function timezoneName(): string
+    {
+        return Auth::user()->timezone ?: 'America/Chicago';
+    }
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
new file mode 100644
index 0000000..25eec7c
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -0,0 +1,8 @@
+<?php
+
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::test('pages::kiosk.calendar')
+        ->assertStatus(200);
+});
diff --git "a/resources/views/pages/settings/\342\232\241profile.blade.php" "b/resources/views/pages/settings/\342\232\241profile.blade.php"
index 75c6cf2..f30d7f2 100644
--- "a/resources/views/pages/settings/\342\232\241profile.blade.php"
+++ "b/resources/views/pages/settings/\342\232\241profile.blade.php"
@@ -14,11 +14,13 @@
 
     public string $name = '';
     public string $email = '';
+    public string $timezone = 'America/Chicago';
 
     public function mount(): void
     {
         $this->name = Auth::user()->name;
         $this->email = Auth::user()->email;
+        $this->timezone = Auth::user()->timezone;
     }
 
     public function updateProfileInformation(): void
@@ -65,6 +67,12 @@ public function showDeleteUser(): bool
         return ! Auth::user() instanceof MustVerifyEmail
             || (Auth::user() instanceof MustVerifyEmail && Auth::user()->hasVerifiedEmail());
     }
+
+    /** @return array<int, string> */
+    public function timezones(): array
+    {
+        return \DateTimeZone::listIdentifiers();
+    }
 }; ?>
 
 <section class="w-full">
@@ -98,6 +106,12 @@ public function showDeleteUser(): bool
                 @endif
             </div>
 
+            <flux:select wire:model="timezone" :label="__('Timezone')" variant="listbox" searchable>
+                @foreach ($this->timezones() as $timezoneOption)
+                    <flux:select.option value="{{ $timezoneOption }}">{{ str_replace('_', ' ', $timezoneOption) }}</flux:select.option>
+                @endforeach
+            </flux:select>
+
             <div class="flex items-center gap-4">
                 <div class="flex items-center justify-end">
                     <flux:button variant="primary" type="submit" class="w-full" data-test="update-profile-button">
diff --git a/routes/web.php b/routes/web.php
index 340ee19..c7ef328 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -19,3 +19,10 @@
 require __DIR__ . '/inventory.php';
 require __DIR__ . '/recipes.php';
 require __DIR__ . '/settings.php';
+
+Route::prefix('{current_team}/kiosk')
+    ->middleware(['auth', 'verified', EnsureTeamMembership::class])
+    ->name('kiosk')
+    ->group(function (): void {
+        Route::livewire('/calendar', 'pages::kiosk.calendar')->name('.calendar');
+    });
diff --git a/tests/Feature/Settings/ProfileUpdateTest.php b/tests/Feature/Settings/ProfileUpdateTest.php
index d5f703a..b5eec28 100644
--- a/tests/Feature/Settings/ProfileUpdateTest.php
+++ b/tests/Feature/Settings/ProfileUpdateTest.php
@@ -16,15 +16,27 @@
         ->test('pages::settings.profile')
         ->set('name', 'Test User')
         ->set('email', 'test@example.com')
+        ->set('timezone', 'America/New_York')
         ->call('updateProfileInformation')
         ->assertHasNoErrors();
 
     expect($user->fresh())
         ->name->toEqual('Test User')
         ->email->toEqual('test@example.com')
+        ->timezone->toEqual('America/New_York')
         ->email_verified_at->toBeNull();
 });
 
+test('profile timezone must be valid', function () {
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::settings.profile')
+        ->set('timezone', 'Not/AZone')
+        ->call('updateProfileInformation')
+        ->assertHasErrors(['timezone']);
+});
+
 test('email verification status is unchanged when email address is unchanged', function () {
     $user = User::factory()->create();
 

From ad59b22e04201fb43fd5b26f8c74cd1130dc1943 Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Thu, 14 May 2026 22:05:59 +0000
Subject: [PATCH 02/57] Rector fixes

---
 .../components/dashboard/\342\232\241calendar.blade.php"    | 2 +-
 .../components/dashboard/\342\232\241calendar.test.php"     | 6 +++---
 .../views/pages/kiosk/\342\232\241calendar/calendar.php"    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git "a/resources/views/components/dashboard/\342\232\241calendar.blade.php" "b/resources/views/components/dashboard/\342\232\241calendar.blade.php"
index 6bdea41..ec199d5 100644
--- "a/resources/views/components/dashboard/\342\232\241calendar.blade.php"
+++ "b/resources/views/components/dashboard/\342\232\241calendar.blade.php"
@@ -60,7 +60,7 @@ public function weekEvents(): array
         return $this->feeds
             ->flatMap(function (CalendarFeed $feed) {
                 try {
-                    return app(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
+                    return resolve(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
                 } catch (Throwable) {
                     return collect();
                 }
diff --git "a/resources/views/components/dashboard/\342\232\241calendar.test.php" "b/resources/views/components/dashboard/\342\232\241calendar.test.php"
index ab733f3..feca966 100644
--- "a/resources/views/components/dashboard/\342\232\241calendar.test.php"
+++ "b/resources/views/components/dashboard/\342\232\241calendar.test.php"
@@ -150,7 +150,7 @@
         'name' => 'Family',
     ]);
 
-    $events = app(FetchCalendarEvents::class)->parse(
+    $events = resolve(FetchCalendarEvents::class)->parse(
         calendarFixture(<<<ICS
 BEGIN:VEVENT
 UID:standup@example.com
@@ -175,7 +175,7 @@
         'name' => 'Family',
     ]);
 
-    $events = app(FetchCalendarEvents::class)->parse(
+    $events = resolve(FetchCalendarEvents::class)->parse(
         calendarFixture(<<<ICS
 BEGIN:VEVENT
 UID:standup@example.com
@@ -202,7 +202,7 @@
         'url' => 'https://calendar.example.com/basic.ics',
     ]);
 
-    $events = app(FetchCalendarEvents::class)->parse(
+    $events = resolve(FetchCalendarEvents::class)->parse(
         calendarFixture(),
         $feed,
         CarbonImmutable::parse('2026-05-14 00:00:00', 'America/New_York'),
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index cebf4df..13d49c6 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -62,7 +62,7 @@ public function weekEvents(): array
         return $this->feeds
             ->flatMap(function (CalendarFeed $feed) {
                 try {
-                    return app(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
+                    return resolve(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
                 } catch (Throwable) {
                     return collect();
                 }

From 8795366b7b94c50f744dbff6ada0126369471edb Mon Sep 17 00:00:00 2001
From: Andy Newhouse <andy@techenby.com>
Date: Thu, 14 May 2026 17:13:06 -0500
Subject: [PATCH 03/57] Stub out other pages

---
 resources/views/layouts/kiosk.blade.php               | 10 +++++-----
 .../kiosk/\342\232\241calendar/calendar.test.php"     |  4 +++-
 .../\342\232\241chore-chart/chore-chart.blade.php"    |  9 +++++++++
 .../kiosk/\342\232\241chore-chart/chore-chart.php"    |  9 +++++++++
 .../\342\232\241chore-chart/chore-chart.test.php"     | 11 +++++++++++
 .../pages/kiosk/\342\232\241lists/lists.blade.php"    |  9 +++++++++
 .../views/pages/kiosk/\342\232\241lists/lists.php"    |  9 +++++++++
 .../pages/kiosk/\342\232\241lists/lists.test.php"     | 11 +++++++++++
 .../meal-planning.blade.php"                          |  9 +++++++++
 .../\342\232\241meal-planning/meal-planning.php"      |  9 +++++++++
 .../\342\232\241meal-planning/meal-planning.test.php" | 11 +++++++++++
 .../kiosk/\342\232\241routines/routines.blade.php"    |  9 +++++++++
 .../pages/kiosk/\342\232\241routines/routines.php"    |  9 +++++++++
 .../kiosk/\342\232\241routines/routines.test.php"     | 11 +++++++++++
 routes/web.php                                        |  6 +++++-
 15 files changed, 129 insertions(+), 7 deletions(-)
 create mode 100644 "resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.test.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241lists/lists.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241lists/lists.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241lists/lists.test.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.test.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241routines/routines.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241routines/routines.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241routines/routines.test.php"

diff --git a/resources/views/layouts/kiosk.blade.php b/resources/views/layouts/kiosk.blade.php
index 6a69676..046d8da 100644
--- a/resources/views/layouts/kiosk.blade.php
+++ b/resources/views/layouts/kiosk.blade.php
@@ -10,11 +10,11 @@
             </flux:sidebar.header>
 
             <flux:sidebar.nav>
-                <flux:sidebar.item icon="calendar" href="#">Calendar</flux:sidebar.item>
-                <flux:sidebar.item icon="arrow-path-rounded-square" href="#">Routines</flux:sidebar.item>
-                <flux:sidebar.item icon="clipboard-document-list" href="#">Chore Chart</flux:sidebar.item>
-                <flux:sidebar.item icon="queue-list" href="#">Lists</flux:sidebar.item>
-                <flux:sidebar.item icon="cooking-pot" href="#">Meal Planning</flux:sidebar.item>
+                <flux:sidebar.item icon="calendar" :href="route('kiosk.calendar')" :current="request()->routeIs('kiosk.calendar')" wire:navigate>Calendar</flux:sidebar.item>
+                <flux:sidebar.item icon="arrow-path-rounded-square" :href="route('kiosk.routines')" :current="request()->routeIs('kiosk.routines')" wire:navigate>Routines</flux:sidebar.item>
+                <flux:sidebar.item icon="clipboard-document-list" :href="route('kiosk.chore-chart')" :current="request()->routeIs('kiosk.chore-chart')" wire:navigate>Chore Chart</flux:sidebar.item>
+                <flux:sidebar.item icon="queue-list" :href="route('kiosk.lists')" :current="request()->routeIs('kiosk.lists')" wire:navigate>Lists</flux:sidebar.item>
+                <flux:sidebar.item icon="cooking-pot" :href="route('kiosk.meal-planning')" :current="request()->routeIs('kiosk.meal-planning')" wire:navigate>Meal Planning</flux:sidebar.item>
             </flux:sidebar.nav>
         </flux:sidebar>
 
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index 25eec7c..5cf9d82 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -1,8 +1,10 @@
 <?php
 
+use App\Models\User;
 use Livewire\Livewire;
 
 it('renders successfully', function () {
-    Livewire::test('pages::kiosk.calendar')
+    Livewire::actingAs(User::factory()->create())
+        ->test('pages::kiosk.calendar')
         ->assertStatus(200);
 });
diff --git "a/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.blade.php" "b/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.blade.php"
new file mode 100644
index 0000000..e0c7043
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.blade.php"
@@ -0,0 +1,9 @@
+<section class="flex min-h-[calc(100vh-4rem)] items-center justify-center p-6">
+    <div class="w-full max-w-3xl rounded-lg border border-zinc-200 bg-white p-8 text-center dark:border-zinc-700 dark:bg-zinc-900">
+        <flux:icon name="clipboard-document-list" class="mx-auto mb-4 size-10 text-zinc-400" />
+        <flux:heading size="xl">{{ __('Chore Chart') }}</flux:heading>
+        <flux:text class="mt-2 text-zinc-500 dark:text-zinc-400">
+            {{ __('Household chores and assignments will live here.') }}
+        </flux:text>
+    </div>
+</section>
diff --git "a/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.php" "b/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.php"
new file mode 100644
index 0000000..80b1f7b
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.php"
@@ -0,0 +1,9 @@
+<?php
+
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+new #[Layout('layouts::kiosk')] class extends Component
+{
+    //
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.test.php" "b/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.test.php"
new file mode 100644
index 0000000..8a69dfa
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.test.php"
@@ -0,0 +1,11 @@
+<?php
+
+use App\Models\User;
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::actingAs(User::factory()->create())
+        ->test('pages::kiosk.chore-chart')
+        ->assertStatus(200)
+        ->assertSee('Chore Chart');
+});
diff --git "a/resources/views/pages/kiosk/\342\232\241lists/lists.blade.php" "b/resources/views/pages/kiosk/\342\232\241lists/lists.blade.php"
new file mode 100644
index 0000000..6a78ce6
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241lists/lists.blade.php"
@@ -0,0 +1,9 @@
+<section class="flex min-h-[calc(100vh-4rem)] items-center justify-center p-6">
+    <div class="w-full max-w-3xl rounded-lg border border-zinc-200 bg-white p-8 text-center dark:border-zinc-700 dark:bg-zinc-900">
+        <flux:icon name="queue-list" class="mx-auto mb-4 size-10 text-zinc-400" />
+        <flux:heading size="xl">{{ __('Lists') }}</flux:heading>
+        <flux:text class="mt-2 text-zinc-500 dark:text-zinc-400">
+            {{ __('Shared lists will live here.') }}
+        </flux:text>
+    </div>
+</section>
diff --git "a/resources/views/pages/kiosk/\342\232\241lists/lists.php" "b/resources/views/pages/kiosk/\342\232\241lists/lists.php"
new file mode 100644
index 0000000..80b1f7b
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241lists/lists.php"
@@ -0,0 +1,9 @@
+<?php
+
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+new #[Layout('layouts::kiosk')] class extends Component
+{
+    //
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241lists/lists.test.php" "b/resources/views/pages/kiosk/\342\232\241lists/lists.test.php"
new file mode 100644
index 0000000..0c3671b
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241lists/lists.test.php"
@@ -0,0 +1,11 @@
+<?php
+
+use App\Models\User;
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::actingAs(User::factory()->create())
+        ->test('pages::kiosk.lists')
+        ->assertStatus(200)
+        ->assertSee('Lists');
+});
diff --git "a/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.blade.php" "b/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.blade.php"
new file mode 100644
index 0000000..ec35fe1
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.blade.php"
@@ -0,0 +1,9 @@
+<section class="flex min-h-[calc(100vh-4rem)] items-center justify-center p-6">
+    <div class="w-full max-w-3xl rounded-lg border border-zinc-200 bg-white p-8 text-center dark:border-zinc-700 dark:bg-zinc-900">
+        <flux:icon name="cooking-pot" class="mx-auto mb-4 size-10 text-zinc-400" />
+        <flux:heading size="xl">{{ __('Meal Planning') }}</flux:heading>
+        <flux:text class="mt-2 text-zinc-500 dark:text-zinc-400">
+            {{ __('Meal plans and dinner ideas will live here.') }}
+        </flux:text>
+    </div>
+</section>
diff --git "a/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.php" "b/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.php"
new file mode 100644
index 0000000..80b1f7b
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.php"
@@ -0,0 +1,9 @@
+<?php
+
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+new #[Layout('layouts::kiosk')] class extends Component
+{
+    //
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.test.php" "b/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.test.php"
new file mode 100644
index 0000000..b2a98bb
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.test.php"
@@ -0,0 +1,11 @@
+<?php
+
+use App\Models\User;
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::actingAs(User::factory()->create())
+        ->test('pages::kiosk.meal-planning')
+        ->assertStatus(200)
+        ->assertSee('Meal Planning');
+});
diff --git "a/resources/views/pages/kiosk/\342\232\241routines/routines.blade.php" "b/resources/views/pages/kiosk/\342\232\241routines/routines.blade.php"
new file mode 100644
index 0000000..c1cc933
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241routines/routines.blade.php"
@@ -0,0 +1,9 @@
+<section class="flex min-h-[calc(100vh-4rem)] items-center justify-center p-6">
+    <div class="w-full max-w-3xl rounded-lg border border-zinc-200 bg-white p-8 text-center dark:border-zinc-700 dark:bg-zinc-900">
+        <flux:icon name="arrow-path-rounded-square" class="mx-auto mb-4 size-10 text-zinc-400" />
+        <flux:heading size="xl">{{ __('Routines') }}</flux:heading>
+        <flux:text class="mt-2 text-zinc-500 dark:text-zinc-400">
+            {{ __('Routine tracking will live here.') }}
+        </flux:text>
+    </div>
+</section>
diff --git "a/resources/views/pages/kiosk/\342\232\241routines/routines.php" "b/resources/views/pages/kiosk/\342\232\241routines/routines.php"
new file mode 100644
index 0000000..80b1f7b
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241routines/routines.php"
@@ -0,0 +1,9 @@
+<?php
+
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+new #[Layout('layouts::kiosk')] class extends Component
+{
+    //
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241routines/routines.test.php" "b/resources/views/pages/kiosk/\342\232\241routines/routines.test.php"
new file mode 100644
index 0000000..3a5eb66
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241routines/routines.test.php"
@@ -0,0 +1,11 @@
+<?php
+
+use App\Models\User;
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::actingAs(User::factory()->create())
+        ->test('pages::kiosk.routines')
+        ->assertStatus(200)
+        ->assertSee('Routines');
+});
diff --git a/routes/web.php b/routes/web.php
index c7ef328..0bcec20 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,5 +24,9 @@
     ->middleware(['auth', 'verified', EnsureTeamMembership::class])
     ->name('kiosk')
     ->group(function (): void {
-        Route::livewire('/calendar', 'pages::kiosk.calendar')->name('.calendar');
+        Route::livewire('calendar', 'pages::kiosk.calendar')->name('.calendar');
+        Route::livewire('routines', 'pages::kiosk.routines')->name('.routines');
+        Route::livewire('chore-chart', 'pages::kiosk.chore-chart')->name('.chore-chart');
+        Route::livewire('lists', 'pages::kiosk.lists')->name('.lists');
+        Route::livewire('meal-planning', 'pages::kiosk.meal-planning')->name('.meal-planning');
     });

From 71551d4fff8da09e1e535e7a74dc0124276ba421 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 12:45:55 -0500
Subject: [PATCH 04/57] =?UTF-8?q?Just=20Keep=20Swimming=20=F0=9F=90=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Enums/CalendarColor.php                   |  15 +++
 app/Livewire/Forms/Kiosk/SettingsForm.php     |  33 ++++++
 ...14_211119_add_timezone_to_teams_table.php} |  10 +-
 .../components/kiosk/sidebar/index.blade.php  |  17 +++
 .../components/kiosk/sidebar/item.blade.php   |  15 +++
 .../weather-tile.blade.php"                   |  13 +++
 .../weather-tile.php"                         |   8 ++
 .../weather-tile.test.php"                    |   8 ++
 resources/views/layouts/kiosk.blade.php       |  24 ++---
 .../\342\232\241calendar/calendar.blade.php"  |  29 +++--
 .../kiosk/\342\232\241calendar/calendar.php"  | 101 +++---------------
 .../\342\232\241settings/settings.blade.php"  |  19 ++++
 .../kiosk/\342\232\241settings/settings.php"  |  21 ++++
 .../\342\232\241settings/settings.test.php"   |   8 ++
 routes/web.php                                |   1 +
 15 files changed, 206 insertions(+), 116 deletions(-)
 create mode 100644 app/Enums/CalendarColor.php
 create mode 100644 app/Livewire/Forms/Kiosk/SettingsForm.php
 rename database/migrations/{2026_05_14_211119_add_timezone_to_users_table.php => 2026_05_14_211119_add_timezone_to_teams_table.php} (51%)
 create mode 100644 resources/views/components/kiosk/sidebar/index.blade.php
 create mode 100644 resources/views/components/kiosk/sidebar/item.blade.php
 create mode 100644 "resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.blade.php"
 create mode 100644 "resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
 create mode 100644 "resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241settings/settings.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241settings/settings.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241settings/settings.test.php"

diff --git a/app/Enums/CalendarColor.php b/app/Enums/CalendarColor.php
new file mode 100644
index 0000000..9184c0b
--- /dev/null
+++ b/app/Enums/CalendarColor.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Enums;
+
+enum CalendarColor: string
+{
+    case Blue = '#2563eb';
+    case Green = '#16a34a';
+    case Red = '#dc2626';
+    case Purple = '#9333ea';
+    case Orange = '#ea580c';
+    case Cyan = '#0891b2';
+    case Gold = '#ca8a04';
+    case Indigo = '#4f46e5';
+}
diff --git a/app/Livewire/Forms/Kiosk/SettingsForm.php b/app/Livewire/Forms/Kiosk/SettingsForm.php
new file mode 100644
index 0000000..af97c5b
--- /dev/null
+++ b/app/Livewire/Forms/Kiosk/SettingsForm.php
@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Livewire\Forms\Kiosk;
+
+use App\Models\Team;
+use Illuminate\Support\Carbon;
+use Livewire\Attributes\Validate;
+use Livewire\Form;
+
+class SettingsForm extends Form
+{
+    public Team $editingTeam;
+
+    #[Validate('required')]
+    public string $timezone = 'America/Chicago';
+
+    #[Validate('required')]
+    public int $week_start = Carbon::SUNDAY;
+
+    public function load(Team $team)
+    {
+        $this->editingTeam = $team;
+        $this->timezone = $team->timezone;
+        $this->week_start = $team->week_start;
+    }
+
+    public function save()
+    {
+        $data = $this->validate();
+
+        $this->editingTeam->query()->update($data);
+    }
+}
diff --git a/database/migrations/2026_05_14_211119_add_timezone_to_users_table.php b/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
similarity index 51%
rename from database/migrations/2026_05_14_211119_add_timezone_to_users_table.php
rename to database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
index c118402..ad39cf5 100644
--- a/database/migrations/2026_05_14_211119_add_timezone_to_users_table.php
+++ b/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
@@ -2,21 +2,23 @@
 
 use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Schema;
 
 return new class extends Migration
 {
     public function up(): void
     {
-        Schema::table('users', function (Blueprint $table) {
-            $table->string('timezone')->default('America/Chicago')->after('email_verified_at');
+        Schema::table('teams', function (Blueprint $table) {
+            $table->string('timezone')->default('America/Chicago')->after('is_personal');
+            $table->integer('week_start')->default(Carbon::SUNDAY)->after('timezone');
         });
     }
 
     public function down(): void
     {
-        Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn('timezone');
+        Schema::table('teams', function (Blueprint $table) {
+            $table->dropColumns(['timezone', 'week_start']);
         });
     }
 };
diff --git a/resources/views/components/kiosk/sidebar/index.blade.php b/resources/views/components/kiosk/sidebar/index.blade.php
new file mode 100644
index 0000000..5f99995
--- /dev/null
+++ b/resources/views/components/kiosk/sidebar/index.blade.php
@@ -0,0 +1,17 @@
+@blaze(fold: true)
+
+@php
+    $classes = Flux::classes('[grid-area:sidebar]')
+        ->add('z-1 flex flex-col [:where(&)]:w-32')
+        ->add('bg-zinc-50 dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-700')
+        ->add('divide-y divide-zinc-200 dark:divide-zinc-700')
+        // ->add('data-flux-sidebar-collapsed-desktop:w-14 data-flux-sidebar-collapsed-desktop:px-2')
+        // ->add('data-flux-sidebar-collapsed-desktop:cursor-e-resize rtl:data-flux-sidebar-collapsed-desktop:cursor-w-resize')
+        ;
+@endphp
+
+<div
+    {{ $attributes->class($classes) }}
+>
+    {{ $slot }}
+</div>
diff --git a/resources/views/components/kiosk/sidebar/item.blade.php b/resources/views/components/kiosk/sidebar/item.blade.php
new file mode 100644
index 0000000..204043d
--- /dev/null
+++ b/resources/views/components/kiosk/sidebar/item.blade.php
@@ -0,0 +1,15 @@
+@props(['icon'])
+
+@php
+    $classes = Flux::classes()
+        ->add('flex flex-col items-center justify-center p-2 h-20')
+        ->add('data-current:text-(--color-accent-content) hover:data-current:text-(--color-accent-content)')
+        ->add('data-current:bg-white dark:data-current:bg-white/[7%]')
+        ->add('last:border-b last:border-zinc-200 last:dark:border-zinc-700')
+        ;
+@endphp
+
+<a {{ $attributes->merge(['class' => $classes]) }}>
+    <flux:icon :$icon />
+    <flux:text>{{ $slot }}</flux:text>
+</a>
diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.blade.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.blade.php"
new file mode 100644
index 0000000..bcea664
--- /dev/null
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.blade.php"
@@ -0,0 +1,13 @@
+<div class="p-2">
+    <div class="flex justify-between">
+        <div>
+            <flux:text>Chicago</flux:text>
+            <flux:heading size="xl">63°</flux:heading>
+        </div>
+        <div class="flex flex-col items-end">
+            <flux:icon.cloud variant="micro" />
+            <flux:text variant="strong"><flux:icon.arrow-up class="inline" variant="micro"/> 73°</flux:text>
+            <flux:text variant="subtle"><flux:icon.arrow-down class="inline" variant="micro"/> 55°</flux:text>
+        </div>
+    </div>
+</div>
diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
new file mode 100644
index 0000000..008929e
--- /dev/null
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
@@ -0,0 +1,8 @@
+<?php
+
+use Livewire\Component;
+
+new class extends Component
+{
+    //
+};
\ No newline at end of file
diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
new file mode 100644
index 0000000..5da4fad
--- /dev/null
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
@@ -0,0 +1,8 @@
+<?php
+
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::test('kiosk.weather-tile')
+        ->assertStatus(200);
+});
diff --git a/resources/views/layouts/kiosk.blade.php b/resources/views/layouts/kiosk.blade.php
index 046d8da..114af06 100644
--- a/resources/views/layouts/kiosk.blade.php
+++ b/resources/views/layouts/kiosk.blade.php
@@ -4,21 +4,17 @@
         @include('layouts.partials.head')
     </head>
     <body class="min-h-screen bg-white dark:bg-zinc-800">
-        <flux:sidebar sticky collapsible class="bg-zinc-50 dark:bg-zinc-900 border-r border-zinc-200 dark:border-zinc-700">
-            <flux:sidebar.header>
-                <flux:sidebar.collapse class="in-data-flux-sidebar-on-desktop:not-in-data-flux-sidebar-collapsed-desktop:-mr-2" />
-            </flux:sidebar.header>
+        <x-kiosk.sidebar>
+            <livewire:kiosk.weather-tile />
+            <x-kiosk.sidebar.item icon="calendar" :href="route('kiosk.calendar')" :current="request()->routeIs('kiosk.calendar')" wire:navigate>{{ __('Calendar') }}</x-kiosk.sidebar.item>
+            <x-kiosk.sidebar.item icon="arrow-path-rounded-square" :href="route('kiosk.routines')" :current="request()->routeIs('kiosk.routines')" wire:navigate>{{ __('Routines') }}</x-kiosk.sidebar.item>
+            <x-kiosk.sidebar.item icon="clipboard-document-list" :href="route('kiosk.chore-chart')" :current="request()->routeIs('kiosk.chore-chart')" wire:navigate>{{ __('Chores') }}</x-kiosk.sidebar.item>
+            <x-kiosk.sidebar.item icon="queue-list" :href="route('kiosk.lists')" :current="request()->routeIs('kiosk.lists')" wire:navigate>{{ __('Lists') }}</x-kiosk.sidebar.item>
+            <x-kiosk.sidebar.item icon="cooking-pot" :href="route('kiosk.meal-planning')" :current="request()->routeIs('kiosk.meal-planning')" wire:navigate>{{ __('Meals') }}</x-kiosk.sidebar.item>
+            <x-kiosk.sidebar.item icon="cog" :href="route('kiosk.settings')" :current="request()->routeIs('kiosk.settings')" wire:navigate>{{ __('Settings') }}</x-kiosk.sidebar.item>
+        </x-kiosk.sidebar>
 
-            <flux:sidebar.nav>
-                <flux:sidebar.item icon="calendar" :href="route('kiosk.calendar')" :current="request()->routeIs('kiosk.calendar')" wire:navigate>Calendar</flux:sidebar.item>
-                <flux:sidebar.item icon="arrow-path-rounded-square" :href="route('kiosk.routines')" :current="request()->routeIs('kiosk.routines')" wire:navigate>Routines</flux:sidebar.item>
-                <flux:sidebar.item icon="clipboard-document-list" :href="route('kiosk.chore-chart')" :current="request()->routeIs('kiosk.chore-chart')" wire:navigate>Chore Chart</flux:sidebar.item>
-                <flux:sidebar.item icon="queue-list" :href="route('kiosk.lists')" :current="request()->routeIs('kiosk.lists')" wire:navigate>Lists</flux:sidebar.item>
-                <flux:sidebar.item icon="cooking-pot" :href="route('kiosk.meal-planning')" :current="request()->routeIs('kiosk.meal-planning')" wire:navigate>Meal Planning</flux:sidebar.item>
-            </flux:sidebar.nav>
-        </flux:sidebar>
-
-        <flux:main>
+        <flux:main class="!p-0">
             {{ $slot }}
         </flux:main>
 
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index bb82c6f..e8f3671 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -1,11 +1,16 @@
-<div class="overflow-hidden rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900">
-    <div class="flex flex-col gap-3 border-b border-zinc-200 px-5 py-4 dark:border-zinc-700 sm:flex-row sm:items-center sm:justify-between">
+<div class="flex h-dvh flex-col overflow-hidden">
+    <div class="flex shrink-0 flex-col gap-3 border-b border-zinc-200 px-5 py-4 dark:border-zinc-700 sm:flex-row sm:items-center sm:justify-between">
         <div>
-            <flux:heading size="lg">{{ __('Week') }}</flux:heading>
-            <flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ $this->weekLabel }}</flux:text>
+            <flux:heading size="xl">{{ $this->nowLabel }}</flux:heading>
         </div>
 
         <div class="flex items-center gap-2">
+            <flux:radio.group wire:model.live="format" variant="segmented">
+                <flux:radio value="day" label="Day" />
+                <flux:radio value="week" label="Week" />
+                <flux:radio value="month" label="Month" />
+            </flux:radio.group>
+
             <flux:button type="button" variant="ghost" size="sm" icon="chevron-left" wire:click="previousWeek" />
             <flux:button type="button" variant="filled" size="sm" wire:click="currentWeek">{{ __('Today') }}</flux:button>
             <flux:button type="button" variant="ghost" size="sm" icon="chevron-right" wire:click="nextWeek" />
@@ -20,9 +25,17 @@
             </flux:text>
         </div>
     @else
-        <div class="grid min-h-[32rem] divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
+        <div class="shrink-0 p-2">
+            <flux:checkbox.group wire:model.live="selectedFeeds" variant="buttons">
+                @foreach ($this->feeds as $feed)
+                <flux:checkbox :value="$feed->id" :label="$feed->name" size="sm" style="border-left: 4px solid {{ $feed->color }}" />
+                @endforeach
+            </flux:checkbox.group>
+        </div>
+
+        <div data-calendar class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
             @foreach ($this->weekDays as $day)
-                <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col">
+                <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
                     <div @class([
                         'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
                         'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
@@ -48,12 +61,10 @@ class="rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:bor
                                 style="border-left: 4px solid {{ $event['feed_color'] }}"
                             >
                                 <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
-                                    <span class="size-2 rounded-full" style="background-color: {{ $event['feed_color'] }}"></span>
                                     {{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}
                                 </div>
 
-                                <div class="break-words font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
-                                <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['feed_name'] }}</div>
+                                <div class="wrap-break-word font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
 
                                 @if ($event['location'])
                                     <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['location'] }}</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index 13d49c6..95c32f3 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -1,46 +1,31 @@
 <?php
 
 use App\Actions\Calendars\FetchCalendarEvents;
+use App\Enums\CalendarColor;
 use App\Models\CalendarFeed;
 use Carbon\CarbonImmutable;
 use Carbon\CarbonInterface;
-use Flux\Flux;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Str;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Layout;
-use Livewire\Attributes\Rule;
 use Livewire\Component;
 
 new #[Layout('layouts::kiosk')] class extends Component
 {
-    private const DEFAULT_COLOR = '#2563eb';
-
-    private const COLOR_OPTIONS = [
-        '#2563eb' => 'Blue',
-        '#16a34a' => 'Green',
-        '#dc2626' => 'Red',
-        '#9333ea' => 'Purple',
-        '#ea580c' => 'Orange',
-        '#0891b2' => 'Cyan',
-        '#ca8a04' => 'Gold',
-        '#4f46e5' => 'Indigo',
-    ];
-
-    public string $feedName = '';
-
-    public string $feedUrl = '';
+    public string $weekStartDate = '';
 
-    public string $feedColor = self::DEFAULT_COLOR;
+    public string $format = 'week';
 
-    public string $weekStartDate = '';
+    public array $selectedFeeds = [];
 
     public function mount(): void
     {
         $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
-            ->startOfWeek(CarbonInterface::SUNDAY)
+            ->startOfWeek(Auth::user()->currentTeam->week_start)
             ->toDateString();
+
+        $this->selectedFeeds = $this->feeds->pluck('id')->toArray();
     }
 
     /** @return EloquentCollection<int, CalendarFeed> */
@@ -49,7 +34,6 @@ public function feeds(): EloquentCollection
     {
         return Auth::user()
             ->calendarFeeds()
-            ->orderBy('name')
             ->get();
     }
 
@@ -57,9 +41,8 @@ public function feeds(): EloquentCollection
     #[Computed]
     public function weekEvents(): array
     {
-        $weekStartsAt = $this->weekStartsAt();
-
         return $this->feeds
+            ->whereIn('id', $this->selectedFeeds)
             ->flatMap(function (CalendarFeed $feed) {
                 try {
                     return resolve(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
@@ -68,7 +51,6 @@ public function weekEvents(): array
                 }
             })
             ->sortBy('starts_at')
-            ->take(12)
             ->values()
             ->all();
     }
@@ -96,68 +78,9 @@ public function weekDays(): array
     }
 
     #[Computed]
-    public function weekLabel(): string
-    {
-        $weekStartsAt = $this->weekStartsAt();
-        $weekEndsAt = $weekStartsAt->addDays(6);
-
-        if ($weekStartsAt->isSameMonth($weekEndsAt)) {
-            return $weekStartsAt->format('M j') . ' - ' . $weekEndsAt->format('j, Y');
-        }
-
-        return $weekStartsAt->format('M j') . ' - ' . $weekEndsAt->format('M j, Y');
-    }
-
-    /** @return array<string, string> */
-    public function colorOptions(): array
-    {
-        return self::COLOR_OPTIONS;
-    }
-
-    public function addFeed(): void
+    public function nowLabel(): string
     {
-        $this->feedUrl = rtrim($this->feedUrl, " \t\n\r\0\x0B,");
-
-        $validated = $this->validate([
-            'feedName' => ['nullable', 'string', 'max:255'],
-            'feedUrl' => ['required', 'url', 'starts_with:http://,https://', 'max:2048'],
-            'feedColor' => ['required', Rule::in(array_keys(self::COLOR_OPTIONS))],
-        ]);
-
-        $url = $validated['feedUrl'];
-        $host = parse_url($url, PHP_URL_HOST);
-
-        Auth::user()->calendarFeeds()->create([
-            'name' => filled($validated['feedName']) ? $validated['feedName'] : Str::headline((string) $host),
-            'url' => $url,
-            'color' => $validated['feedColor'],
-        ]);
-
-        $this->reset('feedName', 'feedUrl');
-        $this->feedColor = self::DEFAULT_COLOR;
-        unset($this->feeds, $this->weekEvents, $this->weekDays);
-
-        Flux::toast(__('Calendar feed added.'));
-    }
-
-    public function updateFeedColor(int $feedId, string $color): void
-    {
-        validator(['color' => $color], [
-            'color' => [Rule::in(array_keys(self::COLOR_OPTIONS))],
-        ])->validate();
-
-        Auth::user()->calendarFeeds()->whereKey($feedId)->update(['color' => $color]);
-
-        unset($this->feeds, $this->weekEvents, $this->weekDays);
-    }
-
-    public function deleteFeed(int $feedId): void
-    {
-        Auth::user()->calendarFeeds()->whereKey($feedId)->delete();
-
-        unset($this->feeds, $this->weekEvents, $this->weekDays);
-
-        Flux::toast(__('Calendar feed removed.'));
+        return CarbonImmutable::now($this->timezoneName())->format('D, M j g:i A');
     }
 
     public function previousWeek(): void
@@ -184,11 +107,11 @@ public function currentWeek(): void
     private function weekStartsAt(): CarbonImmutable
     {
         return CarbonImmutable::parse($this->weekStartDate, $this->timezoneName())
-            ->startOfWeek(CarbonInterface::SUNDAY);
+            ->startOfWeek(Auth::user()->currentTeam->week_start);
     }
 
     private function timezoneName(): string
     {
-        return Auth::user()->timezone ?: 'America/Chicago';
+        return Auth::user()->currentTeam->timezone ?: 'America/Chicago';
     }
 };
diff --git "a/resources/views/pages/kiosk/\342\232\241settings/settings.blade.php" "b/resources/views/pages/kiosk/\342\232\241settings/settings.blade.php"
new file mode 100644
index 0000000..fff10e6
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241settings/settings.blade.php"
@@ -0,0 +1,19 @@
+<form wire:submit="save" class="space-y-6 p-6 lg:p-8'">
+    <flux:select wire:model="form.timezone" :label="__('Timezone')" variant="listbox">
+        @foreach (DateTimeZone::listIdentifiers() as $timezoneOption)
+            <flux:select.option value="{{ $timezoneOption }}">{{ str_replace('_', ' ', $timezoneOption) }}</flux:select.option>
+        @endforeach
+    </flux:select>
+
+    <flux:select wire:model="form.week_start" :label="__('Calendar Week Start')" variant="listbox">
+            <flux:select.option value="0">{{ __('Sunday') }}</flux:select.option>
+            <flux:select.option value="1">{{ __('Monday') }}</flux:select.option>
+            <flux:select.option value="2">{{ __('Tuesday') }}</flux:select.option>
+            <flux:select.option value="3">{{ __('Wednesday') }}</flux:select.option>
+            <flux:select.option value="4">{{ __('Thursday') }}</flux:select.option>
+            <flux:select.option value="5">{{ __('Friday') }}</flux:select.option>
+            <flux:select.option value="6">{{ __('Saturday') }}</flux:select.option>
+    </flux:select>
+
+    <flux:button type="submit" variant="primary">Save</flux:button>
+</form>
diff --git "a/resources/views/pages/kiosk/\342\232\241settings/settings.php" "b/resources/views/pages/kiosk/\342\232\241settings/settings.php"
new file mode 100644
index 0000000..48e79e2
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241settings/settings.php"
@@ -0,0 +1,21 @@
+<?php
+
+use App\Livewire\Forms\Kiosk\SettingsForm;
+use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+new #[Layout('layouts::kiosk')] class extends Component
+{
+    public SettingsForm $form;
+
+    public function mount()
+    {
+        $this->form->load(Auth::user()->currentTeam);
+    }
+
+    public function save()
+    {
+        $this->form->save();
+    }
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241settings/settings.test.php" "b/resources/views/pages/kiosk/\342\232\241settings/settings.test.php"
new file mode 100644
index 0000000..34b2aa5
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241settings/settings.test.php"
@@ -0,0 +1,8 @@
+<?php
+
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::test('pages::kiosk.settings')
+        ->assertStatus(200);
+});
diff --git a/routes/web.php b/routes/web.php
index 0bcec20..182863e 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -29,4 +29,5 @@
         Route::livewire('chore-chart', 'pages::kiosk.chore-chart')->name('.chore-chart');
         Route::livewire('lists', 'pages::kiosk.lists')->name('.lists');
         Route::livewire('meal-planning', 'pages::kiosk.meal-planning')->name('.meal-planning');
+        Route::livewire('settings', 'pages::kiosk.settings')->name('.settings');
     });

From 3c66e254d150f6a6381e01897daebefc80998c03 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 12:48:04 -0500
Subject: [PATCH 05/57] Remove timezone from factory

---
 database/factories/UserFactory.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index f6dd12c..00704a8 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -25,7 +25,6 @@ public function definition(): array
             'name' => fake()->name(),
             'email' => fake()->unique()->safeEmail(),
             'email_verified_at' => now(),
-            'timezone' => 'America/Chicago',
             'password' => static::$password ??= Hash::make('password'),
             'remember_token' => Str::random(10),
             'two_factor_secret' => null,

From 5b36d4d6d23ae371ad7df3fa77633b4fcf923431 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 13:07:28 -0500
Subject: [PATCH 06/57] =?UTF-8?q?Just=20Keep=20Swimming=20=F0=9F=90=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Actions/Calendars/FetchCalendarEvents.php | 33 ++++++++++
 .../dashboard/\342\232\241calendar.test.php"  | 60 +++++++++++++++++++
 .../\342\232\241calendar/calendar.blade.php"  |  7 ++-
 3 files changed, 98 insertions(+), 2 deletions(-)

diff --git a/app/Actions/Calendars/FetchCalendarEvents.php b/app/Actions/Calendars/FetchCalendarEvents.php
index 8421417..ab4cedc 100644
--- a/app/Actions/Calendars/FetchCalendarEvents.php
+++ b/app/Actions/Calendars/FetchCalendarEvents.php
@@ -27,6 +27,7 @@ class FetchCalendarEvents
      *     starts_at: CarbonImmutable,
      *     ends_at: CarbonImmutable|null,
      *     all_day: bool
+     *     response_status: string|null
      * }>
      */
     public function handle(CalendarFeed $feed, int $days = 30, ?CarbonImmutable $from = null): Collection
@@ -53,6 +54,7 @@ public function handle(CalendarFeed $feed, int $days = 30, ?CarbonImmutable $fro
      *     starts_at: CarbonImmutable,
      *     ends_at: CarbonImmutable|null,
      *     all_day: bool
+     *     response_status: string|null
      * }>
      */
     public function parse(string $ics, CalendarFeed $feed, CarbonImmutable $from, int $days = 30): Collection
@@ -80,10 +82,13 @@ public function parse(string $ics, CalendarFeed $feed, CarbonImmutable $from, in
      *     starts_at: CarbonImmutable,
      *     ends_at: CarbonImmutable|null,
      *     all_day: bool
+     *     response_status: string|null
      * }
      */
     private function eventData(VEvent $event, CalendarFeed $feed, DateTimeZone $timezone): array
     {
+        $responseStatus = $this->responseStatus($event, $feed);
+
         return [
             'feed_id' => $feed->id,
             'feed_name' => $feed->name,
@@ -93,6 +98,7 @@ private function eventData(VEvent $event, CalendarFeed $feed, DateTimeZone $time
             'starts_at' => $this->carbon($event->DTSTART->getDateTime($timezone), $timezone),
             'ends_at' => $this->endDate($event, $timezone),
             'all_day' => ! $event->DTSTART->hasTime(),
+            'response_status' => $responseStatus,
         ];
     }
 
@@ -115,6 +121,33 @@ private function carbon(DateTimeInterface $dateTime, DateTimeZone $timezone): Ca
         return CarbonImmutable::instance($dateTime)->setTimezone($timezone);
     }
 
+    private function responseStatus(VEvent $event, CalendarFeed $feed): ?string
+    {
+        if (! isset($event->ATTENDEE)) {
+            return null;
+        }
+
+        $email = mb_strtolower((string) $feed->user?->email);
+
+        if ($email === '') {
+            return null;
+        }
+
+        foreach ($event->ATTENDEE as $attendee) {
+            $attendeeEmail = mb_strtolower(preg_replace('/^mailto:/i', '', (string) $attendee->getValue()));
+
+            if ($attendeeEmail !== $email) {
+                continue;
+            }
+
+            return isset($attendee['PARTSTAT'])
+                ? strtoupper((string) $attendee['PARTSTAT'])
+                : null;
+        }
+
+        return null;
+    }
+
     private function timezoneName(CalendarFeed $feed): string
     {
         return $feed->user?->timezone ?: 'America/Chicago';
diff --git "a/resources/views/components/dashboard/\342\232\241calendar.test.php" "b/resources/views/components/dashboard/\342\232\241calendar.test.php"
index feca966..d7e79b4 100644
--- "a/resources/views/components/dashboard/\342\232\241calendar.test.php"
+++ "b/resources/views/components/dashboard/\342\232\241calendar.test.php"
@@ -214,6 +214,66 @@
         ->and($events->first()['starts_at']->format('g:i A'))->toBe('11:00 AM');
 });
 
+it('marks events pending response when the feed owner attendee needs action', function () {
+    $feed = new CalendarFeed([
+        'name' => 'Work',
+        'url' => 'https://calendar.example.com/basic.ics',
+        'color' => '#2563eb',
+    ]);
+    $feed->id = 10;
+    $feed->setRelation('user', User::factory()->make([
+        'email' => 'andy@example.com',
+        'timezone' => 'America/Chicago',
+    ]));
+
+    $events = resolve(FetchCalendarEvents::class)->parse(
+        calendarFixture(<<<ICS
+BEGIN:VEVENT
+UID:pending@example.com
+SUMMARY:Needs reply
+DTSTART:20260514T150000Z
+DTEND:20260514T160000Z
+ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:andy@example.com
+END:VEVENT
+ICS),
+        $feed,
+        CarbonImmutable::parse('2026-05-14 00:00:00'),
+        30,
+    );
+
+    expect($events->first()['response_status'])->toBe('NEEDS-ACTION');
+});
+
+it('marks declined events when the feed owner attendee has declined', function () {
+    $feed = new CalendarFeed([
+        'name' => 'Work',
+        'url' => 'https://calendar.example.com/basic.ics',
+        'color' => '#2563eb',
+    ]);
+    $feed->id = 10;
+    $feed->setRelation('user', User::factory()->make([
+        'email' => 'andy@example.com',
+        'timezone' => 'America/Chicago',
+    ]));
+
+    $events = resolve(FetchCalendarEvents::class)->parse(
+        calendarFixture(<<<ICS
+BEGIN:VEVENT
+UID:declined@example.com
+SUMMARY:Declined meeting
+DTSTART:20260514T150000Z
+DTEND:20260514T160000Z
+ATTENDEE;PARTSTAT=DECLINED:mailto:andy@example.com
+END:VEVENT
+ICS),
+        $feed,
+        CarbonImmutable::parse('2026-05-14 00:00:00'),
+        30,
+    );
+
+    expect($events->first()['response_status'])->toBe('DECLINED');
+});
+
 function calendarFixture(string $events = ''): string
 {
     $events = $events ?: <<<ICS
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index e8f3671..9097173 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -57,8 +57,11 @@
                         @forelse ($day['events'] as $event)
                             <div
                                 wire:key="calendar-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
-                                class="rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:border-zinc-700 dark:bg-zinc-950"
-                                style="border-left: 4px solid {{ $event['feed_color'] }}"
+                                @class([
+                                    'rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:border-zinc-700 dark:bg-zinc-950',
+                                    'line-through decoration-2 opacity-60' => ($event['response_status'] ?? null) === 'DECLINED',
+                                ])
+                                style="border-left: 4px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
                             >
                                 <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
                                     {{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}

From 9c68be08121ab2038e16da77a01baa98f239fb46 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 13:40:07 -0500
Subject: [PATCH 07/57] =?UTF-8?q?Just=20Keep=20Swimming=20=F0=9F=90=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Concerns/ProfileValidationRules.php       |   7 -
 app/Livewire/Forms/Kiosk/SettingsForm.php     |   4 +-
 database/factories/TeamFactory.php            |   3 +
 database/factories/UserFactory.php            |   6 +
 .../dashboard/\342\232\241calendar.blade.php" | 349 ------------------
 .../dashboard/\342\232\241calendar.test.php"  | 296 ---------------
 .../components/kiosk/calendar/event.blade.php |  18 +
 .../\342\232\241calendar/calendar.blade.php"  |  36 +-
 .../\342\232\241calendar/calendar.test.php"   |  16 +-
 .../chore-chart.test.php"                     |  17 +-
 .../kiosk/\342\232\241lists/lists.test.php"   |  17 +-
 .../meal-planning.test.php"                   |  17 +-
 .../\342\232\241routines/routines.test.php"   |  17 +-
 .../\342\232\241settings/settings.test.php"   |  57 ++-
 .../settings/\342\232\241profile.blade.php"   |  14 -
 tests/Feature/Settings/ProfileUpdateTest.php  |  12 -
 16 files changed, 149 insertions(+), 737 deletions(-)
 delete mode 100644 "resources/views/components/dashboard/\342\232\241calendar.blade.php"
 delete mode 100644 "resources/views/components/dashboard/\342\232\241calendar.test.php"
 create mode 100644 resources/views/components/kiosk/calendar/event.blade.php

diff --git a/app/Concerns/ProfileValidationRules.php b/app/Concerns/ProfileValidationRules.php
index c2c7e49..3005420 100644
--- a/app/Concerns/ProfileValidationRules.php
+++ b/app/Concerns/ProfileValidationRules.php
@@ -16,7 +16,6 @@ protected function profileRules(?int $userId = null): array
         return [
             'name' => $this->nameRules(),
             'email' => $this->emailRules($userId),
-            'timezone' => $this->timezoneRules(),
         ];
     }
 
@@ -39,10 +38,4 @@ protected function emailRules(?int $userId = null): array
                 : Rule::unique(User::class)->ignore($userId),
         ];
     }
-
-    /** @return array<int, \Illuminate\Contracts\Validation\Rule|array<mixed>|string> */
-    protected function timezoneRules(): array
-    {
-        return ['required', 'string', Rule::in(timezone_identifiers_list())];
-    }
 }
diff --git a/app/Livewire/Forms/Kiosk/SettingsForm.php b/app/Livewire/Forms/Kiosk/SettingsForm.php
index af97c5b..de0a812 100644
--- a/app/Livewire/Forms/Kiosk/SettingsForm.php
+++ b/app/Livewire/Forms/Kiosk/SettingsForm.php
@@ -11,10 +11,10 @@ class SettingsForm extends Form
 {
     public Team $editingTeam;
 
-    #[Validate('required')]
+    #[Validate('required|string|timezone:all')]
     public string $timezone = 'America/Chicago';
 
-    #[Validate('required')]
+    #[Validate('required|int|between:0,6')]
     public int $week_start = Carbon::SUNDAY;
 
     public function load(Team $team)
diff --git a/database/factories/TeamFactory.php b/database/factories/TeamFactory.php
index 21ff380..db870a7 100644
--- a/database/factories/TeamFactory.php
+++ b/database/factories/TeamFactory.php
@@ -6,6 +6,7 @@
 
 use App\Models\Team;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Carbon;
 use Illuminate\Support\Str;
 
 /**
@@ -22,6 +23,8 @@ public function definition(): array
             'name' => $name,
             'slug' => Str::slug($name),
             'is_personal' => false,
+            'timezone' => 'America/Chicago',
+            'week_start' => Carbon::SUNDAY,
         ];
     }
 
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 00704a8..34ef8ee 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -63,4 +63,10 @@ public function withTwoFactor(): static
             'two_factor_confirmed_at' => now(),
         ]);
     }
+
+    public function memberOf(Team $team): static
+    {
+        return $this->hasAttached($team)
+            ->afterCreating(fn ($user) => $user->switchTeam($team));
+    }
 }
diff --git "a/resources/views/components/dashboard/\342\232\241calendar.blade.php" "b/resources/views/components/dashboard/\342\232\241calendar.blade.php"
deleted file mode 100644
index ec199d5..0000000
--- "a/resources/views/components/dashboard/\342\232\241calendar.blade.php"
+++ /dev/null
@@ -1,349 +0,0 @@
-<?php
-
-use App\Actions\Calendars\FetchCalendarEvents;
-use App\Models\CalendarFeed;
-use Carbon\CarbonImmutable;
-use Carbon\CarbonInterface;
-use Illuminate\Database\Eloquent\Collection as EloquentCollection;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Str;
-use Illuminate\Validation\Rule;
-use Livewire\Attributes\Computed;
-use Livewire\Component;
-
-new class extends Component
-{
-    private const DEFAULT_COLOR = '#2563eb';
-
-    private const COLOR_OPTIONS = [
-        '#2563eb' => 'Blue',
-        '#16a34a' => 'Green',
-        '#dc2626' => 'Red',
-        '#9333ea' => 'Purple',
-        '#ea580c' => 'Orange',
-        '#0891b2' => 'Cyan',
-        '#ca8a04' => 'Gold',
-        '#4f46e5' => 'Indigo',
-    ];
-
-    public string $feedName = '';
-
-    public string $feedUrl = '';
-
-    public string $feedColor = self::DEFAULT_COLOR;
-
-    public string $weekStartDate = '';
-
-    public function mount(): void
-    {
-        $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
-            ->startOfWeek(CarbonInterface::SUNDAY)
-            ->toDateString();
-    }
-
-    /** @return EloquentCollection<int, CalendarFeed> */
-    #[Computed]
-    public function feeds(): EloquentCollection
-    {
-        return Auth::user()
-            ->calendarFeeds()
-            ->orderBy('name')
-            ->get();
-    }
-
-    /** @return array<int, array<string, mixed>> */
-    #[Computed]
-    public function weekEvents(): array
-    {
-        $weekStartsAt = $this->weekStartsAt();
-
-        return $this->feeds
-            ->flatMap(function (CalendarFeed $feed) {
-                try {
-                    return resolve(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
-                } catch (Throwable) {
-                    return collect();
-                }
-            })
-            ->sortBy('starts_at')
-            ->take(12)
-            ->values()
-            ->all();
-    }
-
-    /** @return array<int, array{date: CarbonImmutable, events: array<int, array<string, mixed>>, is_today: bool}> */
-    #[Computed]
-    public function weekDays(): array
-    {
-        $events = collect($this->weekEvents);
-
-        return collect(range(0, 6))
-            ->map(function (int $offset) use ($events): array {
-                $date = $this->weekStartsAt()->addDays($offset);
-
-                return [
-                    'date' => $date,
-                    'events' => $events
-                        ->filter(fn (array $event) => $event['starts_at']->isSameDay($date))
-                        ->values()
-                        ->all(),
-                    'is_today' => $date->isSameDay(CarbonImmutable::now($this->timezoneName())),
-                ];
-            })
-            ->all();
-    }
-
-    #[Computed]
-    public function weekLabel(): string
-    {
-        $weekStartsAt = $this->weekStartsAt();
-        $weekEndsAt = $weekStartsAt->addDays(6);
-
-        if ($weekStartsAt->isSameMonth($weekEndsAt)) {
-            return $weekStartsAt->format('M j') . ' - ' . $weekEndsAt->format('j, Y');
-        }
-
-        return $weekStartsAt->format('M j') . ' - ' . $weekEndsAt->format('M j, Y');
-    }
-
-    /** @return array<string, string> */
-    public function colorOptions(): array
-    {
-        return self::COLOR_OPTIONS;
-    }
-
-    public function addFeed(): void
-    {
-        $this->feedUrl = rtrim($this->feedUrl, " \t\n\r\0\x0B,");
-
-        $validated = $this->validate([
-            'feedName' => ['nullable', 'string', 'max:255'],
-            'feedUrl' => ['required', 'url', 'starts_with:http://,https://', 'max:2048'],
-            'feedColor' => ['required', Rule::in(array_keys(self::COLOR_OPTIONS))],
-        ]);
-
-        $url = $validated['feedUrl'];
-        $host = parse_url($url, PHP_URL_HOST);
-
-        Auth::user()->calendarFeeds()->create([
-            'name' => filled($validated['feedName']) ? $validated['feedName'] : Str::headline((string) $host),
-            'url' => $url,
-            'color' => $validated['feedColor'],
-        ]);
-
-        $this->reset('feedName', 'feedUrl');
-        $this->feedColor = self::DEFAULT_COLOR;
-        unset($this->feeds, $this->weekEvents, $this->weekDays);
-
-        Flux::toast(__('Calendar feed added.'));
-    }
-
-    public function updateFeedColor(int $feedId, string $color): void
-    {
-        validator(['color' => $color], [
-            'color' => [Rule::in(array_keys(self::COLOR_OPTIONS))],
-        ])->validate();
-
-        Auth::user()->calendarFeeds()->whereKey($feedId)->update(['color' => $color]);
-
-        unset($this->feeds, $this->weekEvents, $this->weekDays);
-    }
-
-    public function deleteFeed(int $feedId): void
-    {
-        Auth::user()->calendarFeeds()->whereKey($feedId)->delete();
-
-        unset($this->feeds, $this->weekEvents, $this->weekDays);
-
-        Flux::toast(__('Calendar feed removed.'));
-    }
-
-    public function previousWeek(): void
-    {
-        $this->weekStartDate = $this->weekStartsAt()->subWeek()->toDateString();
-        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
-    }
-
-    public function nextWeek(): void
-    {
-        $this->weekStartDate = $this->weekStartsAt()->addWeek()->toDateString();
-        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
-    }
-
-    public function currentWeek(): void
-    {
-        $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
-            ->startOfWeek(CarbonInterface::SUNDAY)
-            ->toDateString();
-
-        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
-    }
-
-    private function weekStartsAt(): CarbonImmutable
-    {
-        return CarbonImmutable::parse($this->weekStartDate, $this->timezoneName())
-            ->startOfWeek(CarbonInterface::SUNDAY);
-    }
-
-    private function timezoneName(): string
-    {
-        return Auth::user()->timezone ?: 'America/Chicago';
-    }
-};
-?>
-
-<section class="flex w-full flex-col gap-6">
-    <div class="flex flex-col gap-4 lg:flex-row lg:items-start lg:justify-between">
-        <div>
-            <flux:heading size="xl">{{ __('Calendar') }}</flux:heading>
-            <flux:text class="mt-1 text-zinc-500 dark:text-zinc-400">
-                {{ __('Weekly events from your subscribed calendars') }}
-            </flux:text>
-        </div>
-
-        <form wire:submit="addFeed" class="grid gap-3 rounded-lg border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900 sm:grid-cols-[minmax(0,12rem)_minmax(16rem,1fr)_auto] lg:w-[48rem]">
-            <flux:input wire:model="feedName" :label="__('Name')" :placeholder="__('Family')" />
-            <flux:input wire:model="feedUrl" :label="__('Feed URL')" type="url" :placeholder="__('https://.../calendar.ics')" />
-            <div class="flex items-end">
-                <flux:button type="submit" variant="primary" icon="plus" class="w-full sm:w-auto">
-                    {{ __('Add') }}
-                </flux:button>
-            </div>
-            <fieldset class="sm:col-span-3">
-                <legend class="mb-2 text-sm font-medium text-zinc-800 dark:text-zinc-200">{{ __('Color') }}</legend>
-                <div class="flex flex-wrap gap-2">
-                    @foreach ($this->colorOptions() as $color => $label)
-                        <label class="relative cursor-pointer">
-                            <input wire:model="feedColor" type="radio" value="{{ $color }}" class="peer sr-only" aria-label="{{ __($label) }}" />
-                            <span
-                                class="block size-7 rounded-full border border-black/10 ring-offset-2 peer-checked:ring-2 peer-checked:ring-zinc-900 dark:border-white/15 dark:ring-offset-zinc-900 dark:peer-checked:ring-white"
-                                style="background-color: {{ $color }}"
-                            ></span>
-                        </label>
-                    @endforeach
-                </div>
-                <flux:error name="feedColor" />
-            </fieldset>
-        </form>
-    </div>
-
-    <div class="grid gap-6 xl:grid-cols-[minmax(0,1fr)_20rem]">
-        <div class="overflow-hidden rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900">
-            <div class="flex flex-col gap-3 border-b border-zinc-200 px-5 py-4 dark:border-zinc-700 sm:flex-row sm:items-center sm:justify-between">
-                <div>
-                    <flux:heading size="lg">{{ __('Week') }}</flux:heading>
-                    <flux:text class="text-sm text-zinc-500 dark:text-zinc-400">{{ $this->weekLabel }}</flux:text>
-                </div>
-
-                <div class="flex items-center gap-2">
-                    <flux:button type="button" variant="ghost" size="sm" icon="chevron-left" wire:click="previousWeek" />
-                    <flux:button type="button" variant="filled" size="sm" wire:click="currentWeek">{{ __('Today') }}</flux:button>
-                    <flux:button type="button" variant="ghost" size="sm" icon="chevron-right" wire:click="nextWeek" />
-                </div>
-            </div>
-
-            @if ($this->feeds->isEmpty())
-                <div class="px-5 py-12 text-center">
-                    <flux:icon name="calendar-days" class="mx-auto mb-3 size-8 text-zinc-400" />
-                    <flux:text class="text-zinc-500 dark:text-zinc-400">
-                        {{ __('Add a calendar feed to see weekly events.') }}
-                    </flux:text>
-                </div>
-            @else
-                <div class="grid min-h-[32rem] divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
-                    @foreach ($this->weekDays as $day)
-                        <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col">
-                            <div @class([
-                                'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
-                                'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
-                                'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
-                            ])>
-                                <div>
-                                    <div @class([
-                                        'text-xs font-medium uppercase',
-                                        'text-zinc-500 dark:text-zinc-400'
-                                    ])>{{ $day['date']->format('D') }}</div>
-                                    <div @class([
-                                        'text-sm font-semibold',
-                                        'text-zinc-900 dark:text-zinc-100'
-                                    ])>{{ $day['date']->format('M j') }}</div>
-                                </div>
-                            </div>
-
-                            <div class="flex flex-1 flex-col gap-2 p-3">
-                                @forelse ($day['events'] as $event)
-                                    <div
-                                        wire:key="calendar-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
-                                        class="rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:border-zinc-700 dark:bg-zinc-950"
-                                        style="border-left: 4px solid {{ $event['feed_color'] }}"
-                                    >
-                                        <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
-                                            <span class="size-2 rounded-full" style="background-color: {{ $event['feed_color'] }}"></span>
-                                            {{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}
-                                        </div>
-
-                                        <div class="break-words font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
-                                        <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['feed_name'] }}</div>
-
-                                        @if ($event['location'])
-                                            <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['location'] }}</div>
-                                        @endif
-                                    </div>
-                                @empty
-                                @endforelse
-                            </div>
-                        </div>
-                    @endforeach
-                </div>
-            @endif
-        </div>
-
-        <div class="rounded-lg border border-zinc-200 bg-white dark:border-zinc-700 dark:bg-zinc-900">
-            <div class="border-b border-zinc-200 px-5 py-4 dark:border-zinc-700">
-                <flux:heading size="lg">{{ __('Feeds') }}</flux:heading>
-            </div>
-
-            <div class="divide-y divide-zinc-100 dark:divide-zinc-800">
-                @forelse ($this->feeds as $feed)
-                    <div wire:key="calendar-feed-{{ $feed->id }}" class="flex items-center justify-between gap-3 px-5 py-4">
-                        <div class="min-w-0">
-                            <div class="flex min-w-0 items-center gap-2">
-                                <span class="size-2.5 shrink-0 rounded-full" style="background-color: {{ $feed->color }}"></span>
-                                <div class="truncate font-medium text-zinc-900 dark:text-zinc-100">{{ $feed->name }}</div>
-                            </div>
-                            <div class="truncate text-sm text-zinc-500 dark:text-zinc-400">{{ parse_url($feed->url, PHP_URL_HOST) }}</div>
-                            <div class="mt-2 flex flex-wrap gap-1.5">
-                                @foreach ($this->colorOptions() as $color => $label)
-                                    <flux:tooltip :content="__($label)">
-                                        <button
-                                            type="button"
-                                            wire:click="updateFeedColor({{ $feed->id }}, '{{ $color }}')"
-                                            class="size-5 rounded-full border border-black/10 ring-offset-2 {{ $feed->color === $color ? 'ring-2 ring-zinc-900 dark:ring-white' : '' }} dark:border-white/15 dark:ring-offset-zinc-900"
-                                            style="background-color: {{ $color }}"
-                                            aria-label="{{ __('Set :feed to :color', ['feed' => $feed->name, 'color' => __($label)]) }}"
-                                        ></button>
-                                    </flux:tooltip>
-                                @endforeach
-                            </div>
-                        </div>
-
-                        <flux:tooltip :content="__('Remove feed')">
-                            <flux:button
-                                type="button"
-                                variant="ghost"
-                                size="sm"
-                                icon="trash"
-                                wire:click="deleteFeed({{ $feed->id }})"
-                                wire:confirm="{{ __('Remove this calendar feed?') }}"
-                            />
-                        </flux:tooltip>
-                    </div>
-                @empty
-                    <div class="px-5 py-8 text-center">
-                        <flux:text class="text-zinc-500 dark:text-zinc-400">{{ __('No feeds yet') }}</flux:text>
-                    </div>
-                @endforelse
-            </div>
-        </div>
-    </div>
-</section>
diff --git "a/resources/views/components/dashboard/\342\232\241calendar.test.php" "b/resources/views/components/dashboard/\342\232\241calendar.test.php"
deleted file mode 100644
index d7e79b4..0000000
--- "a/resources/views/components/dashboard/\342\232\241calendar.test.php"
+++ /dev/null
@@ -1,296 +0,0 @@
-<?php
-
-use App\Actions\Calendars\FetchCalendarEvents;
-use App\Models\CalendarFeed;
-use App\Models\User;
-use Carbon\CarbonImmutable;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Http;
-use Livewire\Livewire;
-
-it('renders successfully', function () {
-    Livewire::actingAs(User::factory()->create())
-        ->test('dashboard.calendar')
-        ->assertStatus(200);
-});
-
-it('adds calendar feeds for the authenticated user', function () {
-    $user = User::factory()->create();
-
-    Livewire::actingAs($user)
-        ->test('dashboard.calendar')
-        ->set('feedName', 'Work')
-        ->set('feedUrl', 'https://calendar.example.com/basic.ics,')
-        ->set('feedColor', '#16a34a')
-        ->call('addFeed')
-        ->assertSet('feedName', '')
-        ->assertSet('feedUrl', '')
-        ->assertSet('feedColor', '#2563eb');
-
-    expect($user->calendarFeeds()->first())
-        ->name->toBe('Work')
-        ->url->toBe('https://calendar.example.com/basic.ics')
-        ->color->toBe('#16a34a');
-});
-
-it('requires a valid calendar feed url', function () {
-    Livewire::actingAs(User::factory()->create())
-        ->test('dashboard.calendar')
-        ->set('feedUrl', 'not-a-url')
-        ->call('addFeed')
-        ->assertHasErrors(['feedUrl']);
-});
-
-it('requires a valid calendar feed color', function () {
-    Livewire::actingAs(User::factory()->create())
-        ->test('dashboard.calendar')
-        ->set('feedUrl', 'https://calendar.example.com/basic.ics')
-        ->set('feedColor', '#ffffff')
-        ->call('addFeed')
-        ->assertHasErrors(['feedColor']);
-});
-
-it('updates only the authenticated users feed colors', function () {
-    $user = User::factory()->create();
-    $otherUser = User::factory()->create();
-    $feed = CalendarFeed::factory()->for($user)->create(['color' => '#2563eb']);
-    $otherFeed = CalendarFeed::factory()->for($otherUser)->create(['color' => '#2563eb']);
-
-    Livewire::actingAs($user)
-        ->test('dashboard.calendar')
-        ->call('updateFeedColor', $feed->id, '#dc2626')
-        ->call('updateFeedColor', $otherFeed->id, '#dc2626');
-
-    expect($feed->fresh()->color)->toBe('#dc2626')
-        ->and($otherFeed->fresh()->color)->toBe('#2563eb');
-});
-
-it('removes only the authenticated users calendar feeds', function () {
-    $user = User::factory()->create();
-    $otherUser = User::factory()->create();
-    $feed = CalendarFeed::factory()->for($user)->create();
-    $otherFeed = CalendarFeed::factory()->for($otherUser)->create();
-
-    Livewire::actingAs($user)
-        ->test('dashboard.calendar')
-        ->call('deleteFeed', $feed->id)
-        ->call('deleteFeed', $otherFeed->id);
-
-    expect($feed->fresh())->toBeNull()
-        ->and($otherFeed->fresh())->not->toBeNull();
-});
-
-it('shows upcoming events from calendar feeds', function () {
-    CarbonImmutable::setTestNow('2026-05-14 09:00:00');
-    Cache::store()->flush();
-    Http::fake([
-        'calendar.example.com/*' => Http::response(calendarFixture()),
-    ]);
-
-    $user = User::factory()->create();
-    CalendarFeed::factory()->for($user)->create([
-        'name' => 'Work',
-        'url' => 'https://calendar.example.com/basic.ics',
-        'color' => '#9333ea',
-    ]);
-
-    Livewire::actingAs($user)
-        ->test('dashboard.calendar')
-        ->assertSee('Design review')
-        ->assertSee('Work')
-        ->assertSee('#9333ea')
-        ->assertSee('10:00 AM')
-        ->assertSee('Office');
-
-    CarbonImmutable::setTestNow();
-});
-
-it('shows events for the selected week and can navigate weeks', function () {
-    CarbonImmutable::setTestNow('2026-05-14 09:00:00');
-    Cache::store()->flush();
-    Http::fake([
-        'calendar.example.com/*' => Http::response(calendarFixture(<<<ICS
-BEGIN:VEVENT
-UID:this-week@example.com
-SUMMARY:This week review
-DTSTART:20260514T150000Z
-DTEND:20260514T160000Z
-END:VEVENT
-BEGIN:VEVENT
-UID:next-week@example.com
-SUMMARY:Next week planning
-DTSTART:20260520T150000Z
-DTEND:20260520T160000Z
-END:VEVENT
-ICS)),
-    ]);
-
-    $user = User::factory()->create();
-    CalendarFeed::factory()->for($user)->create([
-        'name' => 'Work',
-        'url' => 'https://calendar.example.com/basic.ics',
-    ]);
-
-    Livewire::actingAs($user)
-        ->test('dashboard.calendar')
-        ->assertSee('May 10 - 16, 2026')
-        ->assertSee('This week review')
-        ->assertDontSee('Next week planning')
-        ->call('nextWeek')
-        ->assertSee('May 17 - 23, 2026')
-        ->assertSee('Next week planning')
-        ->assertDontSee('This week review');
-
-    CarbonImmutable::setTestNow();
-});
-
-it('expands simple recurring calendar events', function () {
-    $feed = CalendarFeed::factory()->make([
-        'id' => 10,
-        'name' => 'Family',
-    ]);
-
-    $events = resolve(FetchCalendarEvents::class)->parse(
-        calendarFixture(<<<ICS
-BEGIN:VEVENT
-UID:standup@example.com
-SUMMARY:Standup
-DTSTART:20260514T140000Z
-DTEND:20260514T143000Z
-RRULE:FREQ=WEEKLY;COUNT=3
-END:VEVENT
-ICS),
-        $feed,
-        CarbonImmutable::parse('2026-05-14 00:00:00'),
-        30,
-    );
-
-    expect($events)->toHaveCount(3)
-        ->and($events->pluck('title')->all())->toBe(['Standup', 'Standup', 'Standup']);
-});
-
-it('honors excluded recurring calendar dates', function () {
-    $feed = CalendarFeed::factory()->make([
-        'id' => 10,
-        'name' => 'Family',
-    ]);
-
-    $events = resolve(FetchCalendarEvents::class)->parse(
-        calendarFixture(<<<ICS
-BEGIN:VEVENT
-UID:standup@example.com
-SUMMARY:Standup
-DTSTART:20260514T140000Z
-DTEND:20260514T143000Z
-RRULE:FREQ=WEEKLY;COUNT=3
-EXDATE:20260521T140000Z
-END:VEVENT
-ICS),
-        $feed,
-        CarbonImmutable::parse('2026-05-14 00:00:00'),
-        30,
-    );
-
-    expect($events)->toHaveCount(2)
-        ->and($events->pluck('starts_at')->map->toDateString()->all())->toBe(['2026-05-14', '2026-05-28']);
-});
-
-it('converts calendar feed times to the users timezone', function () {
-    $user = User::factory()->create(['timezone' => 'America/New_York']);
-    $feed = CalendarFeed::factory()->for($user)->create([
-        'name' => 'Work',
-        'url' => 'https://calendar.example.com/basic.ics',
-    ]);
-
-    $events = resolve(FetchCalendarEvents::class)->parse(
-        calendarFixture(),
-        $feed,
-        CarbonImmutable::parse('2026-05-14 00:00:00', 'America/New_York'),
-        30,
-    );
-
-    expect($events)->toHaveCount(1)
-        ->and($events->first()['starts_at']->timezoneName)->toBe('America/New_York')
-        ->and($events->first()['starts_at']->format('g:i A'))->toBe('11:00 AM');
-});
-
-it('marks events pending response when the feed owner attendee needs action', function () {
-    $feed = new CalendarFeed([
-        'name' => 'Work',
-        'url' => 'https://calendar.example.com/basic.ics',
-        'color' => '#2563eb',
-    ]);
-    $feed->id = 10;
-    $feed->setRelation('user', User::factory()->make([
-        'email' => 'andy@example.com',
-        'timezone' => 'America/Chicago',
-    ]));
-
-    $events = resolve(FetchCalendarEvents::class)->parse(
-        calendarFixture(<<<ICS
-BEGIN:VEVENT
-UID:pending@example.com
-SUMMARY:Needs reply
-DTSTART:20260514T150000Z
-DTEND:20260514T160000Z
-ATTENDEE;PARTSTAT=NEEDS-ACTION:mailto:andy@example.com
-END:VEVENT
-ICS),
-        $feed,
-        CarbonImmutable::parse('2026-05-14 00:00:00'),
-        30,
-    );
-
-    expect($events->first()['response_status'])->toBe('NEEDS-ACTION');
-});
-
-it('marks declined events when the feed owner attendee has declined', function () {
-    $feed = new CalendarFeed([
-        'name' => 'Work',
-        'url' => 'https://calendar.example.com/basic.ics',
-        'color' => '#2563eb',
-    ]);
-    $feed->id = 10;
-    $feed->setRelation('user', User::factory()->make([
-        'email' => 'andy@example.com',
-        'timezone' => 'America/Chicago',
-    ]));
-
-    $events = resolve(FetchCalendarEvents::class)->parse(
-        calendarFixture(<<<ICS
-BEGIN:VEVENT
-UID:declined@example.com
-SUMMARY:Declined meeting
-DTSTART:20260514T150000Z
-DTEND:20260514T160000Z
-ATTENDEE;PARTSTAT=DECLINED:mailto:andy@example.com
-END:VEVENT
-ICS),
-        $feed,
-        CarbonImmutable::parse('2026-05-14 00:00:00'),
-        30,
-    );
-
-    expect($events->first()['response_status'])->toBe('DECLINED');
-});
-
-function calendarFixture(string $events = ''): string
-{
-    $events = $events ?: <<<ICS
-BEGIN:VEVENT
-UID:design-review@example.com
-SUMMARY:Design review
-LOCATION:Office
-DTSTART:20260514T150000Z
-DTEND:20260514T160000Z
-END:VEVENT
-ICS;
-
-    return <<<ICS
-BEGIN:VCALENDAR
-VERSION:2.0
-PRODID:-//Sunny//Calendar Test//EN
-{$events}
-END:VCALENDAR
-ICS;
-}
diff --git a/resources/views/components/kiosk/calendar/event.blade.php b/resources/views/components/kiosk/calendar/event.blade.php
new file mode 100644
index 0000000..c8f68aa
--- /dev/null
+++ b/resources/views/components/kiosk/calendar/event.blade.php
@@ -0,0 +1,18 @@
+<div
+    wire:key="calendar-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
+    @class([
+        'rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:border-zinc-700 dark:bg-zinc-950',
+        'line-through decoration-2 opacity-60' => ($event['response_status'] ?? null) === 'DECLINED',
+    ])
+    style="border-left: 4px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
+>
+    <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
+        {{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}
+    </div>
+
+    <div class="wrap-break-word font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
+
+    @if ($event['location'])
+        <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['location'] }}</div>
+    @endif
+</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index 9097173..642b9ab 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -33,7 +33,7 @@
             </flux:checkbox.group>
         </div>
 
-        <div data-calendar class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
+        <div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
             @foreach ($this->weekDays as $day)
                 <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
                     <div @class([
@@ -42,39 +42,15 @@
                         'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
                     ])>
                         <div>
-                            <div @class([
-                                'text-xs font-medium uppercase',
-                                'text-zinc-500 dark:text-zinc-400'
-                            ])>{{ $day['date']->format('D') }}</div>
-                            <div @class([
-                                'text-sm font-semibold',
-                                'text-zinc-900 dark:text-zinc-100'
-                            ])>{{ $day['date']->format('M j') }}</div>
+                            <div class="text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">{{ $day['date']->format('D') }}</div>
+                            <div class="text-sm font-semibold text-zinc-900 dark:text-zinc-100">{{ $day['date']->format('M j') }}</div>
                         </div>
                     </div>
 
                     <div class="flex flex-1 flex-col gap-2 p-3">
-                        @forelse ($day['events'] as $event)
-                            <div
-                                wire:key="calendar-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
-                                @class([
-                                    'rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:border-zinc-700 dark:bg-zinc-950',
-                                    'line-through decoration-2 opacity-60' => ($event['response_status'] ?? null) === 'DECLINED',
-                                ])
-                                style="border-left: 4px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
-                            >
-                                <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
-                                    {{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}
-                                </div>
-
-                                <div class="wrap-break-word font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
-
-                                @if ($event['location'])
-                                    <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['location'] }}</div>
-                                @endif
-                            </div>
-                        @empty
-                        @endforelse
+                        @foreach ($day['events'] as $event)
+                            <x-kiosk.calendar.event :$event />
+                        @endforeach
                     </div>
                 </div>
             @endforeach
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index 5cf9d82..a46e94a 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -3,8 +3,16 @@
 use App\Models\User;
 use Livewire\Livewire;
 
-it('renders successfully', function () {
-    Livewire::actingAs(User::factory()->create())
+use function Pest\Laravel\actingAs;
+
+test('renders successfully', function () {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->get(route('kiosk.calendar'))
+        ->assertOk();
+
+    Livewire::actingAs($user)
         ->test('pages::kiosk.calendar')
-        ->assertStatus(200);
-});
+        ->assertOk();
+})->group('smoke');
diff --git "a/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.test.php" "b/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.test.php"
index 8a69dfa..1707b74 100644
--- "a/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241chore-chart/chore-chart.test.php"
@@ -3,9 +3,16 @@
 use App\Models\User;
 use Livewire\Livewire;
 
-it('renders successfully', function () {
-    Livewire::actingAs(User::factory()->create())
+use function Pest\Laravel\actingAs;
+
+test('renders successfully', function () {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->get(route('kiosk.chore-chart'))
+        ->assertOk();
+
+    Livewire::actingAs($user)
         ->test('pages::kiosk.chore-chart')
-        ->assertStatus(200)
-        ->assertSee('Chore Chart');
-});
+        ->assertOk();
+})->group('smoke');
diff --git "a/resources/views/pages/kiosk/\342\232\241lists/lists.test.php" "b/resources/views/pages/kiosk/\342\232\241lists/lists.test.php"
index 0c3671b..18106bc 100644
--- "a/resources/views/pages/kiosk/\342\232\241lists/lists.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241lists/lists.test.php"
@@ -3,9 +3,16 @@
 use App\Models\User;
 use Livewire\Livewire;
 
-it('renders successfully', function () {
-    Livewire::actingAs(User::factory()->create())
+use function Pest\Laravel\actingAs;
+
+test('renders successfully', function () {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->get(route('kiosk.lists'))
+        ->assertOk();
+
+    Livewire::actingAs($user)
         ->test('pages::kiosk.lists')
-        ->assertStatus(200)
-        ->assertSee('Lists');
-});
+        ->assertOk();
+})->group('smoke');
diff --git "a/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.test.php" "b/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.test.php"
index b2a98bb..b8e8c3a 100644
--- "a/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241meal-planning/meal-planning.test.php"
@@ -3,9 +3,16 @@
 use App\Models\User;
 use Livewire\Livewire;
 
-it('renders successfully', function () {
-    Livewire::actingAs(User::factory()->create())
+use function Pest\Laravel\actingAs;
+
+test('renders successfully', function () {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->get(route('kiosk.meal-planning'))
+        ->assertOk();
+
+    Livewire::actingAs($user)
         ->test('pages::kiosk.meal-planning')
-        ->assertStatus(200)
-        ->assertSee('Meal Planning');
-});
+        ->assertOk();
+})->group('smoke');
diff --git "a/resources/views/pages/kiosk/\342\232\241routines/routines.test.php" "b/resources/views/pages/kiosk/\342\232\241routines/routines.test.php"
index 3a5eb66..1b3dd3d 100644
--- "a/resources/views/pages/kiosk/\342\232\241routines/routines.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241routines/routines.test.php"
@@ -3,9 +3,16 @@
 use App\Models\User;
 use Livewire\Livewire;
 
-it('renders successfully', function () {
-    Livewire::actingAs(User::factory()->create())
+use function Pest\Laravel\actingAs;
+
+test('renders successfully', function () {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->get(route('kiosk.routines'))
+        ->assertOk();
+
+    Livewire::actingAs($user)
         ->test('pages::kiosk.routines')
-        ->assertStatus(200)
-        ->assertSee('Routines');
-});
+        ->assertOk();
+})->group('smoke');
diff --git "a/resources/views/pages/kiosk/\342\232\241settings/settings.test.php" "b/resources/views/pages/kiosk/\342\232\241settings/settings.test.php"
index 34b2aa5..70a156a 100644
--- "a/resources/views/pages/kiosk/\342\232\241settings/settings.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241settings/settings.test.php"
@@ -1,8 +1,59 @@
 <?php
 
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Support\Carbon;
 use Livewire\Livewire;
 
-it('renders successfully', function () {
-    Livewire::test('pages::kiosk.settings')
-        ->assertStatus(200);
+use function Pest\Laravel\actingAs;
+
+test('renders successfully', function () {
+    $team = Team::factory()->create([
+        'name' => 'Straw Hats',
+        'timezone' => 'Asia/Tokyo',
+        'week_start' => Carbon::MONDAY,
+    ]);
+
+    $user = User::factory()->memberOf($team)->create();
+
+    actingAs($user)
+        ->get(route('kiosk.settings'))
+        ->assertOk();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.settings')
+        ->assertOk()
+        ->assertSet('form.timezone', 'Asia/Tokyo')
+        ->assertSet('form.week_start', Carbon::MONDAY);
+})->group('smoke');
+
+test('can change kiosk settings', function () {
+    $team = Team::factory()->create([
+        'name' => 'Straw Hats',
+        'timezone' => 'Asia/Tokyo',
+        'week_start' => Carbon::MONDAY,
+    ]);
+
+    $user = User::factory()->memberOf($team)->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.settings')
+        ->set('form.timezone', 'America/Sao_Paulo')
+        ->set('form.week_start', Carbon::SUNDAY)
+        ->call('save');
+
+    expect($team->fresh())
+        ->timezone->toBe('America/Sao_Paulo')
+        ->week_start->toBe(Carbon::SUNDAY);
+});
+
+test('options must be valid', function () {
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.settings')
+        ->set('form.timezone', 'Not/AZone')
+        ->set('form.week_start', 15)
+        ->call('save')
+        ->assertHasErrors(['form.timezone', 'form.week_start']);
 });
diff --git "a/resources/views/pages/settings/\342\232\241profile.blade.php" "b/resources/views/pages/settings/\342\232\241profile.blade.php"
index f30d7f2..75c6cf2 100644
--- "a/resources/views/pages/settings/\342\232\241profile.blade.php"
+++ "b/resources/views/pages/settings/\342\232\241profile.blade.php"
@@ -14,13 +14,11 @@
 
     public string $name = '';
     public string $email = '';
-    public string $timezone = 'America/Chicago';
 
     public function mount(): void
     {
         $this->name = Auth::user()->name;
         $this->email = Auth::user()->email;
-        $this->timezone = Auth::user()->timezone;
     }
 
     public function updateProfileInformation(): void
@@ -67,12 +65,6 @@ public function showDeleteUser(): bool
         return ! Auth::user() instanceof MustVerifyEmail
             || (Auth::user() instanceof MustVerifyEmail && Auth::user()->hasVerifiedEmail());
     }
-
-    /** @return array<int, string> */
-    public function timezones(): array
-    {
-        return \DateTimeZone::listIdentifiers();
-    }
 }; ?>
 
 <section class="w-full">
@@ -106,12 +98,6 @@ public function timezones(): array
                 @endif
             </div>
 
-            <flux:select wire:model="timezone" :label="__('Timezone')" variant="listbox" searchable>
-                @foreach ($this->timezones() as $timezoneOption)
-                    <flux:select.option value="{{ $timezoneOption }}">{{ str_replace('_', ' ', $timezoneOption) }}</flux:select.option>
-                @endforeach
-            </flux:select>
-
             <div class="flex items-center gap-4">
                 <div class="flex items-center justify-end">
                     <flux:button variant="primary" type="submit" class="w-full" data-test="update-profile-button">
diff --git a/tests/Feature/Settings/ProfileUpdateTest.php b/tests/Feature/Settings/ProfileUpdateTest.php
index b5eec28..d5f703a 100644
--- a/tests/Feature/Settings/ProfileUpdateTest.php
+++ b/tests/Feature/Settings/ProfileUpdateTest.php
@@ -16,27 +16,15 @@
         ->test('pages::settings.profile')
         ->set('name', 'Test User')
         ->set('email', 'test@example.com')
-        ->set('timezone', 'America/New_York')
         ->call('updateProfileInformation')
         ->assertHasNoErrors();
 
     expect($user->fresh())
         ->name->toEqual('Test User')
         ->email->toEqual('test@example.com')
-        ->timezone->toEqual('America/New_York')
         ->email_verified_at->toBeNull();
 });
 
-test('profile timezone must be valid', function () {
-    $user = User::factory()->create();
-
-    Livewire::actingAs($user)
-        ->test('pages::settings.profile')
-        ->set('timezone', 'Not/AZone')
-        ->call('updateProfileInformation')
-        ->assertHasErrors(['timezone']);
-});
-
 test('email verification status is unchanged when email address is unchanged', function () {
     $user = User::factory()->create();
 

From 1418ff50592dbc94246a3b49d81e1fcb00be9a8f Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 14:02:04 -0500
Subject: [PATCH 08/57] Remove calendar component from dashboard

---
 resources/views/dashboard.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index c95cae6..c8dd8d5 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -1,3 +1,6 @@
 <x-layouts::app :title="__('Dashboard')">
-    <livewire:dashboard.calendar />
+    <flux:heading level="1" size="xl" class="mb-4">What would you like to see here?</flux:heading>
+    <flux:button icon="light-bulb" icon:trailing="arrow-up-right" href="https://suggest.gg/techenby" target="_blank">
+        {{ __('Make a Suggestion') }}
+    </flux:button>
 </x-layouts::app>

From 86a111dca3995b7cacd8ce34d9a21364cb63993d Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Fri, 15 May 2026 19:02:46 +0000
Subject: [PATCH 09/57] Rector fixes

---
 app/Enums/CalendarColor.php                                     | 2 ++
 app/Livewire/Forms/Kiosk/SettingsForm.php                       | 2 ++
 "resources/views/pages/kiosk/\342\232\241calendar/calendar.php" | 1 -
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/Enums/CalendarColor.php b/app/Enums/CalendarColor.php
index 9184c0b..8ef9c82 100644
--- a/app/Enums/CalendarColor.php
+++ b/app/Enums/CalendarColor.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Enums;
 
 enum CalendarColor: string
diff --git a/app/Livewire/Forms/Kiosk/SettingsForm.php b/app/Livewire/Forms/Kiosk/SettingsForm.php
index de0a812..d1aa026 100644
--- a/app/Livewire/Forms/Kiosk/SettingsForm.php
+++ b/app/Livewire/Forms/Kiosk/SettingsForm.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Livewire\Forms\Kiosk;
 
 use App\Models\Team;
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index 95c32f3..3edd10e 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -1,7 +1,6 @@
 <?php
 
 use App\Actions\Calendars\FetchCalendarEvents;
-use App\Enums\CalendarColor;
 use App\Models\CalendarFeed;
 use Carbon\CarbonImmutable;
 use Carbon\CarbonInterface;

From 193ac99c5b4aa9dc918bf71abf94061ae08e6e05 Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Fri, 15 May 2026 19:03:12 +0000
Subject: [PATCH 10/57] Dusting

---
 .../components/kiosk/\342\232\241weather-tile/weather-tile.php" | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
index 008929e..f1acb2f 100644
--- "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
@@ -5,4 +5,4 @@
 new class extends Component
 {
     //
-};
\ No newline at end of file
+};

From 2da9c5a01cd6340de8d43d086e24b1c5b162de0f Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Fri, 15 May 2026 19:03:14 +0000
Subject: [PATCH 11/57] Ignore Dusting commit in git blame

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index cde1494..03cd634 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1 +1,2 @@
 24b8f32bcf7e24f999bd8763bc9baca607fad516
+62f533191a8f08fb724b207b4e3f53f9ab2b35bb

From f28390fdcd5652f490cc3b0c53eff312ad05ceb6 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 15:14:02 -0500
Subject: [PATCH 12/57] Add tests, move calendar feeds to teams

---
 app/Actions/Calendars/FetchCalendarEvents.php | 20 +++-
 app/Models/CalendarFeed.php                   |  8 +-
 app/Models/Team.php                           |  6 ++
 app/Models/User.php                           |  8 --
 database/factories/CalendarFeedFactory.php    |  7 +-
 ..._14_204921_create_calendar_feeds_table.php |  4 +-
 .../\342\232\241calendar/calendar.blade.php"  | 61 ++++++-------
 .../kiosk/\342\232\241calendar/calendar.php"  | 17 ++--
 .../\342\232\241calendar/calendar.test.php"   | 91 +++++++++++++++++++
 .../Unit/Actions/FetchCalendarEventsTest.php  | 49 ++++++++++
 10 files changed, 204 insertions(+), 67 deletions(-)
 create mode 100644 tests/Unit/Actions/FetchCalendarEventsTest.php

diff --git a/app/Actions/Calendars/FetchCalendarEvents.php b/app/Actions/Calendars/FetchCalendarEvents.php
index ab4cedc..de54bf5 100644
--- a/app/Actions/Calendars/FetchCalendarEvents.php
+++ b/app/Actions/Calendars/FetchCalendarEvents.php
@@ -127,16 +127,16 @@ private function responseStatus(VEvent $event, CalendarFeed $feed): ?string
             return null;
         }
 
-        $email = mb_strtolower((string) $feed->user?->email);
+        $emails = $this->teamMemberEmails($feed);
 
-        if ($email === '') {
+        if ($emails->isEmpty()) {
             return null;
         }
 
         foreach ($event->ATTENDEE as $attendee) {
             $attendeeEmail = mb_strtolower(preg_replace('/^mailto:/i', '', (string) $attendee->getValue()));
 
-            if ($attendeeEmail !== $email) {
+            if (! $emails->contains($attendeeEmail)) {
                 continue;
             }
 
@@ -148,8 +148,20 @@ private function responseStatus(VEvent $event, CalendarFeed $feed): ?string
         return null;
     }
 
+    /** @return Collection<int, string> */
+    private function teamMemberEmails(CalendarFeed $feed): Collection
+    {
+        $feed->loadMissing('team.members');
+
+        return $feed->team->members
+            ->pluck('email')
+            ->map(fn (string $email): string => mb_strtolower($email))
+            ->filter()
+            ->values();
+    }
+
     private function timezoneName(CalendarFeed $feed): string
     {
-        return $feed->user?->timezone ?: 'America/Chicago';
+        return $feed->team?->timezone ?: 'America/Chicago';
     }
 }
diff --git a/app/Models/CalendarFeed.php b/app/Models/CalendarFeed.php
index 0cef1d9..a1100ae 100644
--- a/app/Models/CalendarFeed.php
+++ b/app/Models/CalendarFeed.php
@@ -10,15 +10,15 @@
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Relations\BelongsTo;
 
-#[Fillable(['user_id', 'name', 'url', 'color'])]
+#[Fillable(['team_id', 'name', 'url', 'color'])]
 class CalendarFeed extends Model
 {
     /** @use HasFactory<CalendarFeedFactory> */
     use HasFactory;
 
-    /** @return BelongsTo<User, $this> */
-    public function user(): BelongsTo
+    /** @return BelongsTo<Team, $this> */
+    public function team(): BelongsTo
     {
-        return $this->belongsTo(User::class);
+        return $this->belongsTo(Team::class);
     }
 }
diff --git a/app/Models/Team.php b/app/Models/Team.php
index a2ca519..57194e2 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -38,6 +38,12 @@ protected static function boot(): void
         });
     }
 
+    /** @return HasMany<CalendarFeed, $this> */
+    public function calendarFeeds(): HasMany
+    {
+        return $this->hasMany(CalendarFeed::class);
+    }
+
     public function owner(): ?Model
     {
         return $this->members()
diff --git a/app/Models/User.php b/app/Models/User.php
index ff9afc5..a1862e0 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -10,7 +10,6 @@
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Attributes\Hidden;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
 use Illuminate\Support\Str;
@@ -43,17 +42,10 @@ public function initials(): string
     public function purge(): void
     {
         $this->ownedTeams->each->purge();
-        $this->calendarFeeds()->delete();
         $this->teamMemberships()->delete();
         $this->delete();
     }
 
-    /** @return HasMany<CalendarFeed, $this> */
-    public function calendarFeeds(): HasMany
-    {
-        return $this->hasMany(CalendarFeed::class);
-    }
-
     /** @return array<string, string> */
     protected function casts(): array
     {
diff --git a/database/factories/CalendarFeedFactory.php b/database/factories/CalendarFeedFactory.php
index 4023ce7..1351e73 100644
--- a/database/factories/CalendarFeedFactory.php
+++ b/database/factories/CalendarFeedFactory.php
@@ -4,8 +4,9 @@
 
 namespace Database\Factories;
 
+use App\Enums\CalendarColor;
 use App\Models\CalendarFeed;
-use App\Models\User;
+use App\Models\Team;
 use Illuminate\Database\Eloquent\Factories\Factory;
 
 /**
@@ -17,10 +18,10 @@ class CalendarFeedFactory extends Factory
     public function definition(): array
     {
         return [
-            'user_id' => User::factory(),
+            'team_id' => Team::factory(),
             'name' => fake()->words(2, true),
             'url' => fake()->url() . '/calendar.ics',
-            'color' => fake()->randomElement(['#2563eb', '#16a34a', '#dc2626', '#9333ea', '#ea580c', '#0891b2']),
+            'color' => fake()->randomElement(CalendarColor::class),
         ];
     }
 }
diff --git a/database/migrations/2026_05_14_204921_create_calendar_feeds_table.php b/database/migrations/2026_05_14_204921_create_calendar_feeds_table.php
index 361e609..4ecdbac 100644
--- a/database/migrations/2026_05_14_204921_create_calendar_feeds_table.php
+++ b/database/migrations/2026_05_14_204921_create_calendar_feeds_table.php
@@ -10,13 +10,13 @@ public function up(): void
     {
         Schema::create('calendar_feeds', function (Blueprint $table) {
             $table->id();
-            $table->foreignId('user_id')->constrained()->cascadeOnDelete();
+            $table->foreignId('team_id')->constrained()->cascadeOnDelete();
             $table->string('name');
             $table->text('url');
             $table->string('color', 7)->default('#2563eb');
             $table->timestamps();
 
-            $table->index(['user_id', 'name']);
+            $table->index(['team_id', 'name']);
         });
     }
 
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index 642b9ab..4ff9789 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -17,43 +17,34 @@
         </div>
     </div>
 
-    @if ($this->feeds->isEmpty())
-        <div class="px-5 py-12 text-center">
-            <flux:icon name="calendar-days" class="mx-auto mb-3 size-8 text-zinc-400" />
-            <flux:text class="text-zinc-500 dark:text-zinc-400">
-                {{ __('Add a calendar feed to see weekly events.') }}
-            </flux:text>
-        </div>
-    @else
-        <div class="shrink-0 p-2">
-            <flux:checkbox.group wire:model.live="selectedFeeds" variant="buttons">
-                @foreach ($this->feeds as $feed)
-                <flux:checkbox :value="$feed->id" :label="$feed->name" size="sm" style="border-left: 4px solid {{ $feed->color }}" />
-                @endforeach
-            </flux:checkbox.group>
-        </div>
+    <div class="shrink-0 p-2">
+        <flux:checkbox.group wire:model.live="selectedFeeds" variant="buttons">
+            @foreach ($this->feeds as $feed)
+            <flux:checkbox :value="$feed->id" :label="$feed->name" size="sm" style="border-left: 4px solid {{ $feed->color }}" />
+            @endforeach
+        </flux:checkbox.group>
+    </div>
 
-        <div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
-            @foreach ($this->weekDays as $day)
-                <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
-                    <div @class([
-                        'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
-                        'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
-                        'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
-                    ])>
-                        <div>
-                            <div class="text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">{{ $day['date']->format('D') }}</div>
-                            <div class="text-sm font-semibold text-zinc-900 dark:text-zinc-100">{{ $day['date']->format('M j') }}</div>
-                        </div>
+    <div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
+        @foreach ($this->weekDays as $day)
+            <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
+                <div @class([
+                    'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
+                    'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
+                    'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
+                ])>
+                    <div>
+                        <div class="text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">{{ $day['date']->format('D') }}</div>
+                        <div class="text-sm font-semibold text-zinc-900 dark:text-zinc-100">{{ $day['date']->format('M j') }}</div>
                     </div>
+                </div>
 
-                    <div class="flex flex-1 flex-col gap-2 p-3">
-                        @foreach ($day['events'] as $event)
-                            <x-kiosk.calendar.event :$event />
-                        @endforeach
-                    </div>
+                <div class="flex flex-1 flex-col gap-2 p-3">
+                    @foreach ($day['events'] as $event)
+                        <x-kiosk.calendar.event :$event />
+                    @endforeach
                 </div>
-            @endforeach
-        </div>
-    @endif
+            </div>
+        @endforeach
+    </div>
 </div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index 3edd10e..ff8281a 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -3,7 +3,6 @@
 use App\Actions\Calendars\FetchCalendarEvents;
 use App\Models\CalendarFeed;
 use Carbon\CarbonImmutable;
-use Carbon\CarbonInterface;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Attributes\Computed;
@@ -31,7 +30,7 @@ public function mount(): void
     #[Computed]
     public function feeds(): EloquentCollection
     {
-        return Auth::user()
+        return Auth::user()->currentTeam
             ->calendarFeeds()
             ->get();
     }
@@ -43,11 +42,7 @@ public function weekEvents(): array
         return $this->feeds
             ->whereIn('id', $this->selectedFeeds)
             ->flatMap(function (CalendarFeed $feed) {
-                try {
-                    return resolve(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
-                } catch (Throwable) {
-                    return collect();
-                }
+                return resolve(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
             })
             ->sortBy('starts_at')
             ->values()
@@ -85,22 +80,22 @@ public function nowLabel(): string
     public function previousWeek(): void
     {
         $this->weekStartDate = $this->weekStartsAt()->subWeek()->toDateString();
-        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+        unset($this->weekEvents, $this->weekDays);
     }
 
     public function nextWeek(): void
     {
         $this->weekStartDate = $this->weekStartsAt()->addWeek()->toDateString();
-        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+        unset($this->weekEvents, $this->weekDays);
     }
 
     public function currentWeek(): void
     {
         $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
-            ->startOfWeek(CarbonInterface::SUNDAY)
+            ->startOfWeek(Auth::user()->currentTeam->week_start)
             ->toDateString();
 
-        unset($this->weekEvents, $this->weekDays, $this->weekLabel);
+        unset($this->weekEvents, $this->weekDays);
     }
 
     private function weekStartsAt(): CarbonImmutable
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index a46e94a..a5824f3 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -1,6 +1,11 @@
 <?php
 
+use App\Enums\CalendarColor;
+use App\Models\CalendarFeed;
+use App\Models\Team;
 use App\Models\User;
+use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Http;
 use Livewire\Livewire;
 
 use function Pest\Laravel\actingAs;
@@ -16,3 +21,89 @@
         ->test('pages::kiosk.calendar')
         ->assertOk();
 })->group('smoke');
+
+test('can view events from feed', function () {
+    Http::allowStrayRequests(['https://calendar.google.com/calendar/ical/*']);
+
+    $this->travelTo(Carbon::parse('2026-05-08'));
+
+    $team = Team::factory()
+        ->has(CalendarFeed::factory()->state([
+            'url' => 'https://calendar.google.com/calendar/ical/en.usa%23holiday%40group.v.calendar.google.com/public/basic.ics',
+            'name' => 'US Holidays',
+            'color' => CalendarColor::Green,
+        ]))
+        ->create();
+    $user = User::factory()->memberOf($team)->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.calendar')
+        ->assertSee('Cinco de Mayo');
+});
+
+test('can go to the next and previous weeks', function () {
+    $this->travelTo(Carbon::parse('2026-05-08'));
+
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.calendar')
+        ->assertSeeInOrder([
+            'calendar-day-2026-05-03', 'calendar-day-2026-05-04', 'calendar-day-2026-05-05', 'calendar-day-2026-05-06', 'calendar-day-2026-05-07', 'calendar-day-2026-05-08', 'calendar-day-2026-05-09',
+        ])
+        ->call('previousWeek')
+        ->assertSeeInOrder([
+            'calendar-day-2026-04-26', 'calendar-day-2026-04-27', 'calendar-day-2026-04-28', 'calendar-day-2026-04-29', 'calendar-day-2026-04-30', 'calendar-day-2026-05-01', 'calendar-day-2026-05-02',
+        ])
+        ->call('currentWeek')
+        ->assertSeeInOrder([
+            'calendar-day-2026-05-03', 'calendar-day-2026-05-04', 'calendar-day-2026-05-05', 'calendar-day-2026-05-06', 'calendar-day-2026-05-07', 'calendar-day-2026-05-08', 'calendar-day-2026-05-09',
+        ])
+        ->call('nextWeek')
+        ->assertSeeInOrder([
+            'calendar-day-2026-05-10', 'calendar-day-2026-05-11', 'calendar-day-2026-05-12', 'calendar-day-2026-05-13', 'calendar-day-2026-05-14', 'calendar-day-2026-05-15', 'calendar-day-2026-05-16',
+        ]);
+});
+
+test('can hide feed from calendar', function () {
+    Http::allowStrayRequests([
+        'https://calendar.google.com/calendar/ical/*',
+        'https://worldpublicholiday.com/calendar-feeds/*'
+    ]);
+
+    $this->travelTo(Carbon::parse('2026-03-20'));
+
+    $team = Team::factory()
+        ->has(
+            CalendarFeed::factory()
+                ->count(2)
+                ->sequence([
+                    'url' => 'https://calendar.google.com/calendar/ical/en.usa%23holiday%40group.v.calendar.google.com/public/basic.ics',
+                    'name' => 'US Holidays',
+                    'color' => CalendarColor::Green,
+                ], [
+                    'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=2026',
+                    'name' => 'Brazilian Holidays',
+                    'color' => CalendarColor::Blue,
+                ])
+        )
+        ->create();
+    $user = User::factory()->memberOf($team)->create();
+    [$brazilianHolidays, $usHolidays] = $team->calendarFeeds;
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.calendar')
+        ->assertSet('selectedFeeds', [$brazilianHolidays->id, $usHolidays->id])
+        ->assertSeeInOrder([
+            'calendar-day-2026-03-17', "St. Patrick's Day",
+            'calendar-day-2026-03-18', 'Autonomia do Estado',
+            'calendar-day-2026-03-19', 'Dia de São José'
+        ])
+        ->set('selectedFeeds', [$usHolidays->id])
+        ->assertSeeInOrder([
+            'calendar-day-2026-03-17', "St. Patrick's Day",
+            'calendar-day-2026-03-18', // 'Autonomia do Estado',
+            'calendar-day-2026-03-19', // 'Dia de São José'
+        ])
+        ->assertDontSee(['Autonomia do Estado', 'Dia de São José']);
+});
diff --git a/tests/Unit/Actions/FetchCalendarEventsTest.php b/tests/Unit/Actions/FetchCalendarEventsTest.php
new file mode 100644
index 0000000..425b26e
--- /dev/null
+++ b/tests/Unit/Actions/FetchCalendarEventsTest.php
@@ -0,0 +1,49 @@
+<?php
+
+use App\Actions\Calendars\FetchCalendarEvents;
+use App\Enums\TeamRole;
+use App\Models\CalendarFeed;
+use App\Models\Team;
+use App\Models\User;
+use Carbon\CarbonImmutable;
+
+test('it checks attendee response status against team member emails', function () {
+    $team = Team::factory()->create();
+    $team->members()->attach(
+        User::factory()->create(['email' => 'zoro@example.com']),
+        ['role' => TeamRole::Member->value],
+    );
+    $team->members()->attach(
+        User::factory()->create(['email' => 'nami@example.com']),
+        ['role' => TeamRole::Member->value],
+    );
+
+    $feed = CalendarFeed::factory()->for($team)->create([
+        'name' => 'Crew Calendar',
+        'url' => 'https://example.com/calendar.ics',
+    ]);
+
+    $events = app(FetchCalendarEvents::class)->parse(
+        ics: <<<'ICS'
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Sunny//Calendar Test//EN
+BEGIN:VEVENT
+UID:crew-meeting@example.com
+DTSTAMP:20260501T120000Z
+DTSTART:20260505T150000Z
+DTEND:20260505T160000Z
+SUMMARY:Crew Meeting
+ATTENDEE;PARTSTAT=ACCEPTED:mailto:zoro@example.com
+ATTENDEE;PARTSTAT=DECLINED:mailto:sanji@example.com
+END:VEVENT
+END:VCALENDAR
+ICS,
+        feed: $feed,
+        from: CarbonImmutable::parse('2026-05-05', 'America/Chicago'),
+        days: 1,
+    );
+
+    expect($events)->toHaveCount(1)
+        ->and($events->first()['response_status'])->toBe('ACCEPTED');
+});

From b243c02a26e225559deb1d1300853ce58b0444e4 Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Fri, 15 May 2026 20:14:50 +0000
Subject: [PATCH 13/57] Rector fixes

---
 app/Actions/Calendars/FetchCalendarEvents.php             | 2 +-
 .../pages/kiosk/\342\232\241calendar/calendar.test.php"   | 8 ++++----
 tests/Unit/Actions/FetchCalendarEventsTest.php            | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/Actions/Calendars/FetchCalendarEvents.php b/app/Actions/Calendars/FetchCalendarEvents.php
index de54bf5..1e2550e 100644
--- a/app/Actions/Calendars/FetchCalendarEvents.php
+++ b/app/Actions/Calendars/FetchCalendarEvents.php
@@ -136,7 +136,7 @@ private function responseStatus(VEvent $event, CalendarFeed $feed): ?string
         foreach ($event->ATTENDEE as $attendee) {
             $attendeeEmail = mb_strtolower(preg_replace('/^mailto:/i', '', (string) $attendee->getValue()));
 
-            if (! $emails->contains($attendeeEmail)) {
+            if ($emails->doesntContain($attendeeEmail)) {
                 continue;
             }
 
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index a5824f3..dbdac53 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -1,10 +1,10 @@
 <?php
 
+use Illuminate\Support\Facades\Date;
 use App\Enums\CalendarColor;
 use App\Models\CalendarFeed;
 use App\Models\Team;
 use App\Models\User;
-use Illuminate\Support\Carbon;
 use Illuminate\Support\Facades\Http;
 use Livewire\Livewire;
 
@@ -25,7 +25,7 @@
 test('can view events from feed', function () {
     Http::allowStrayRequests(['https://calendar.google.com/calendar/ical/*']);
 
-    $this->travelTo(Carbon::parse('2026-05-08'));
+    $this->travelTo(Date::parse('2026-05-08'));
 
     $team = Team::factory()
         ->has(CalendarFeed::factory()->state([
@@ -42,7 +42,7 @@
 });
 
 test('can go to the next and previous weeks', function () {
-    $this->travelTo(Carbon::parse('2026-05-08'));
+    $this->travelTo(Date::parse('2026-05-08'));
 
     $user = User::factory()->create();
 
@@ -71,7 +71,7 @@
         'https://worldpublicholiday.com/calendar-feeds/*'
     ]);
 
-    $this->travelTo(Carbon::parse('2026-03-20'));
+    $this->travelTo(Date::parse('2026-03-20'));
 
     $team = Team::factory()
         ->has(
diff --git a/tests/Unit/Actions/FetchCalendarEventsTest.php b/tests/Unit/Actions/FetchCalendarEventsTest.php
index 425b26e..69bdb58 100644
--- a/tests/Unit/Actions/FetchCalendarEventsTest.php
+++ b/tests/Unit/Actions/FetchCalendarEventsTest.php
@@ -23,7 +23,7 @@
         'url' => 'https://example.com/calendar.ics',
     ]);
 
-    $events = app(FetchCalendarEvents::class)->parse(
+    $events = resolve(FetchCalendarEvents::class)->parse(
         ics: <<<'ICS'
 BEGIN:VCALENDAR
 VERSION:2.0

From 14c4d44be34f0edd3b7de4370e420f636859eef6 Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Fri, 15 May 2026 20:15:12 +0000
Subject: [PATCH 14/57] Dusting

---
 .../pages/kiosk/\342\232\241calendar/calendar.test.php"     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index dbdac53..c5c3aa1 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -1,10 +1,10 @@
 <?php
 
-use Illuminate\Support\Facades\Date;
 use App\Enums\CalendarColor;
 use App\Models\CalendarFeed;
 use App\Models\Team;
 use App\Models\User;
+use Illuminate\Support\Facades\Date;
 use Illuminate\Support\Facades\Http;
 use Livewire\Livewire;
 
@@ -68,7 +68,7 @@
 test('can hide feed from calendar', function () {
     Http::allowStrayRequests([
         'https://calendar.google.com/calendar/ical/*',
-        'https://worldpublicholiday.com/calendar-feeds/*'
+        'https://worldpublicholiday.com/calendar-feeds/*',
     ]);
 
     $this->travelTo(Date::parse('2026-03-20'));
@@ -97,7 +97,7 @@
         ->assertSeeInOrder([
             'calendar-day-2026-03-17', "St. Patrick's Day",
             'calendar-day-2026-03-18', 'Autonomia do Estado',
-            'calendar-day-2026-03-19', 'Dia de São José'
+            'calendar-day-2026-03-19', 'Dia de São José',
         ])
         ->set('selectedFeeds', [$usHolidays->id])
         ->assertSeeInOrder([

From 48e5c6fc380d82400261f958c45e31960926dbe2 Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Fri, 15 May 2026 20:15:14 +0000
Subject: [PATCH 15/57] Ignore Dusting commit in git blame

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 03cd634..be1d517 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,2 +1,3 @@
 24b8f32bcf7e24f999bd8763bc9baca607fad516
 62f533191a8f08fb724b207b4e3f53f9ab2b35bb
+e42a663c237250cc6e17eed50a7e3802d35e6a34

From d00233d46165d17803b559bf0169859107ecf49a Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 15:55:27 -0500
Subject: [PATCH 16/57] Move filters to dropdown

---
 .../\342\232\241calendar/calendar.blade.php"  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index 4ff9789..1d40590 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -5,6 +5,20 @@
         </div>
 
         <div class="flex items-center gap-2">
+            <flux:dropdown>
+                <flux:button icon="funnel" icon:variant="outline" />
+                <flux:menu keep-open>
+                    <flux:menu.checkbox.group wire:model.live="selectedFeeds">
+                        @foreach ($this->feeds as $feed)
+                            <flux:menu.checkbox :value="$feed->id">
+                                <span class="size-2 rounded-full mr-2" style="background: {{ $feed->color }}"></span>
+                                {{ $feed->name }}
+                            </flux:menu.checkbox>
+                        @endforeach
+                    </flux:menu.checkbox.group>
+                </flux:menu>
+            </flux:dropdown>
+
             <flux:radio.group wire:model.live="format" variant="segmented">
                 <flux:radio value="day" label="Day" />
                 <flux:radio value="week" label="Week" />
@@ -17,14 +31,6 @@
         </div>
     </div>
 
-    <div class="shrink-0 p-2">
-        <flux:checkbox.group wire:model.live="selectedFeeds" variant="buttons">
-            @foreach ($this->feeds as $feed)
-            <flux:checkbox :value="$feed->id" :label="$feed->name" size="sm" style="border-left: 4px solid {{ $feed->color }}" />
-            @endforeach
-        </flux:checkbox.group>
-    </div>
-
     <div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
         @foreach ($this->weekDays as $day)
             <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">

From 79e1d64972c8b39f914c806664f464d3fe14ff1e Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 16:26:59 -0500
Subject: [PATCH 17/57] Add month view

---
 .../components/kiosk/calendar/month.blade.php |  53 +++++++++
 .../components/kiosk/calendar/week.blade.php  |  22 ++++
 .../\342\232\241calendar/calendar.blade.php"  |  33 ++----
 .../kiosk/\342\232\241calendar/calendar.php"  | 110 ++++++++++++++----
 .../\342\232\241calendar/calendar.test.php"   |  35 +++++-
 5 files changed, 201 insertions(+), 52 deletions(-)
 create mode 100644 resources/views/components/kiosk/calendar/month.blade.php
 create mode 100644 resources/views/components/kiosk/calendar/week.blade.php

diff --git a/resources/views/components/kiosk/calendar/month.blade.php b/resources/views/components/kiosk/calendar/month.blade.php
new file mode 100644
index 0000000..7a9a3b5
--- /dev/null
+++ b/resources/views/components/kiosk/calendar/month.blade.php
@@ -0,0 +1,53 @@
+<div class="grid min-h-0 flex-1 grid-rows-[auto_1fr] overflow-hidden">
+    <div class="grid grid-cols-7 border-b border-zinc-100 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-800">
+        @foreach (range(0, 6) as $offset)
+            <div wire:key="calendar-month-weekday-{{ $offset }}" class="px-3 py-2 text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">
+                {{ $this->monthDays[$offset]['date']->format('D') }}
+            </div>
+        @endforeach
+    </div>
+
+    <div class="grid min-h-0 grid-cols-7 grid-rows-6 divide-x divide-y divide-zinc-100 overflow-hidden dark:divide-zinc-700">
+        @foreach ($this->monthDays as $day)
+            <div
+                wire:key="calendar-day-{{ $day['date']->toDateString() }}"
+                @class([
+                    'flex min-h-0 flex-col gap-1 overflow-hidden p-2',
+                    'bg-white dark:bg-zinc-950' => $day['is_current_month'] && ! $day['is_today'],
+                    'bg-zinc-50 text-zinc-500 dark:bg-zinc-900 dark:text-zinc-500' => ! $day['is_current_month'] && ! $day['is_today'],
+                    'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
+                ])
+            >
+                <div @class([
+                    'text-sm font-semibold',
+                    'text-zinc-900 dark:text-zinc-100' => $day['is_current_month'] || $day['is_today'],
+                    'text-zinc-400 dark:text-zinc-500' => ! $day['is_current_month'] && ! $day['is_today'],
+                ])>
+                    {{ $day['date']->format('j') }}
+                </div>
+
+                <div class="flex min-h-0 flex-col gap-1 overflow-hidden">
+                    @foreach (array_slice($day['events'], 0, 3) as $event)
+                        <div
+                            wire:key="calendar-month-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
+                            @class([
+                                'truncate rounded-sm border border-zinc-200 bg-white px-1.5 py-1 text-xs leading-tight text-zinc-900 shadow-xs dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100',
+                                'line-through decoration-2 opacity-60' => ($event['response_status'] ?? null) === 'DECLINED',
+                            ])
+                            style="border-left: 3px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
+                        >
+                            <span class="font-medium">{{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}</span>
+                            {{ $event['title'] }}
+                        </div>
+                    @endforeach
+
+                    @if (count($day['events']) > 3)
+                        <div class="px-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
+                            {{ __('+:count more', ['count' => count($day['events']) - 3]) }}
+                        </div>
+                    @endif
+                </div>
+            </div>
+        @endforeach
+    </div>
+</div>
diff --git a/resources/views/components/kiosk/calendar/week.blade.php b/resources/views/components/kiosk/calendar/week.blade.php
new file mode 100644
index 0000000..2fae652
--- /dev/null
+++ b/resources/views/components/kiosk/calendar/week.blade.php
@@ -0,0 +1,22 @@
+<div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
+    @foreach ($this->weekDays as $day)
+        <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
+            <div @class([
+                'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
+                'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
+                'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
+            ])>
+                <div>
+                    <div class="text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">{{ $day['date']->format('D') }}</div>
+                    <div class="text-sm font-semibold text-zinc-900 dark:text-zinc-100">{{ $day['date']->format('M j') }}</div>
+                </div>
+            </div>
+
+            <div class="flex flex-1 flex-col gap-2 p-3">
+                @foreach ($day['events'] as $event)
+                    <x-kiosk.calendar.event :$event />
+                @endforeach
+            </div>
+        </div>
+    @endforeach
+</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index 1d40590..eef0573 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -25,32 +25,15 @@
                 <flux:radio value="month" label="Month" />
             </flux:radio.group>
 
-            <flux:button type="button" variant="ghost" size="sm" icon="chevron-left" wire:click="previousWeek" />
-            <flux:button type="button" variant="filled" size="sm" wire:click="currentWeek">{{ __('Today') }}</flux:button>
-            <flux:button type="button" variant="ghost" size="sm" icon="chevron-right" wire:click="nextWeek" />
+            <flux:button type="button" variant="ghost" size="sm" icon="chevron-left" wire:click="previous" />
+            <flux:button type="button" variant="filled" size="sm" wire:click="current">{{ __('Today') }}</flux:button>
+            <flux:button type="button" variant="ghost" size="sm" icon="chevron-right" wire:click="next" />
         </div>
     </div>
 
-    <div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
-        @foreach ($this->weekDays as $day)
-            <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
-                <div @class([
-                    'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
-                    'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
-                    'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
-                ])>
-                    <div>
-                        <div class="text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">{{ $day['date']->format('D') }}</div>
-                        <div class="text-sm font-semibold text-zinc-900 dark:text-zinc-100">{{ $day['date']->format('M j') }}</div>
-                    </div>
-                </div>
-
-                <div class="flex flex-1 flex-col gap-2 p-3">
-                    @foreach ($day['events'] as $event)
-                        <x-kiosk.calendar.event :$event />
-                    @endforeach
-                </div>
-            </div>
-        @endforeach
-    </div>
+    @if ($format === 'month')
+        <x-kiosk.calendar.month />
+    @else
+        <x-kiosk.calendar.week />
+    @endif
 </div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index ff8281a..a6a0a96 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -11,7 +11,7 @@
 
 new #[Layout('layouts::kiosk')] class extends Component
 {
-    public string $weekStartDate = '';
+    public string $focusedDate = '';
 
     public string $format = 'week';
 
@@ -19,9 +19,7 @@
 
     public function mount(): void
     {
-        $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
-            ->startOfWeek(Auth::user()->currentTeam->week_start)
-            ->toDateString();
+        $this->focusedDate = CarbonImmutable::now($this->timezoneName())->toDateString();
 
         $this->selectedFeeds = $this->feeds->pluck('id')->toArray();
     }
@@ -39,14 +37,7 @@ public function feeds(): EloquentCollection
     #[Computed]
     public function weekEvents(): array
     {
-        return $this->feeds
-            ->whereIn('id', $this->selectedFeeds)
-            ->flatMap(function (CalendarFeed $feed) {
-                return resolve(FetchCalendarEvents::class)->handle($feed, 7, $this->weekStartsAt());
-            })
-            ->sortBy('starts_at')
-            ->values()
-            ->all();
+        return $this->eventsForRange($this->weekStartsAt(), 7);
     }
 
     /** @return array<int, array{date: CarbonImmutable, events: array<int, array<string, mixed>>, is_today: bool}> */
@@ -71,39 +62,110 @@ public function weekDays(): array
             ->all();
     }
 
+    /** @return array<int, array<string, mixed>> */
+    #[Computed]
+    public function monthEvents(): array
+    {
+        return $this->eventsForRange($this->monthGridStartsAt(), 42);
+    }
+
+    /** @return array<int, array{date: CarbonImmutable, events: array<int, array<string, mixed>>, is_today: bool, is_current_month: bool}> */
+    #[Computed]
+    public function monthDays(): array
+    {
+        $events = collect($this->monthEvents);
+        $month = $this->monthStartsAt();
+
+        return collect(range(0, 41))
+            ->map(function (int $offset) use ($events, $month): array {
+                $date = $this->monthGridStartsAt()->addDays($offset);
+
+                return [
+                    'date' => $date,
+                    'events' => $events
+                        ->filter(fn (array $event) => $event['starts_at']->isSameDay($date))
+                        ->values()
+                        ->all(),
+                    'is_today' => $date->isSameDay(CarbonImmutable::now($this->timezoneName())),
+                    'is_current_month' => $date->isSameMonth($month),
+                ];
+            })
+            ->all();
+    }
+
     #[Computed]
     public function nowLabel(): string
     {
         return CarbonImmutable::now($this->timezoneName())->format('D, M j g:i A');
     }
 
-    public function previousWeek(): void
+    public function previous(): void
     {
-        $this->weekStartDate = $this->weekStartsAt()->subWeek()->toDateString();
-        unset($this->weekEvents, $this->weekDays);
+        $this->focusedDate = match ($this->format) {
+            'month' => $this->focusedDate()->subMonthNoOverflow()->toDateString(),
+            default => $this->weekStartsAt()->subWeek()->toDateString(),
+        };
+
+        $this->clearCalendarState();
     }
 
-    public function nextWeek(): void
+    public function next(): void
     {
-        $this->weekStartDate = $this->weekStartsAt()->addWeek()->toDateString();
-        unset($this->weekEvents, $this->weekDays);
+        $this->focusedDate = match ($this->format) {
+            'month' => $this->focusedDate()->addMonthNoOverflow()->toDateString(),
+            default => $this->weekStartsAt()->addWeek()->toDateString(),
+        };
+
+        $this->clearCalendarState();
     }
 
-    public function currentWeek(): void
+    public function current(): void
     {
-        $this->weekStartDate = CarbonImmutable::now($this->timezoneName())
-            ->startOfWeek(Auth::user()->currentTeam->week_start)
-            ->toDateString();
+        $this->focusedDate = CarbonImmutable::now($this->timezoneName())->toDateString();
 
-        unset($this->weekEvents, $this->weekDays);
+        $this->clearCalendarState();
     }
 
     private function weekStartsAt(): CarbonImmutable
     {
-        return CarbonImmutable::parse($this->weekStartDate, $this->timezoneName())
+        return $this->focusedDate()
             ->startOfWeek(Auth::user()->currentTeam->week_start);
     }
 
+    private function monthStartsAt(): CarbonImmutable
+    {
+        return $this->focusedDate()->startOfMonth();
+    }
+
+    private function monthGridStartsAt(): CarbonImmutable
+    {
+        return $this->monthStartsAt()
+            ->startOfWeek(Auth::user()->currentTeam->week_start);
+    }
+
+    private function focusedDate(): CarbonImmutable
+    {
+        return CarbonImmutable::parse($this->focusedDate, $this->timezoneName());
+    }
+
+    /** @return array<int, array<string, mixed>> */
+    private function eventsForRange(CarbonImmutable $startsAt, int $days): array
+    {
+        return $this->feeds
+            ->whereIn('id', $this->selectedFeeds)
+            ->flatMap(function (CalendarFeed $feed) use ($days, $startsAt) {
+                return resolve(FetchCalendarEvents::class)->handle($feed, $days, $startsAt);
+            })
+            ->sortBy('starts_at')
+            ->values()
+            ->all();
+    }
+
+    private function clearCalendarState(): void
+    {
+        unset($this->weekEvents, $this->weekDays, $this->monthEvents, $this->monthDays);
+    }
+
     private function timezoneName(): string
     {
         return Auth::user()->currentTeam->timezone ?: 'America/Chicago';
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index c5c3aa1..5d95f55 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -38,6 +38,8 @@
 
     Livewire::actingAs($user)
         ->test('pages::kiosk.calendar')
+        ->assertSee('Cinco de Mayo')
+        ->set('format', 'month')
         ->assertSee('Cinco de Mayo');
 });
 
@@ -51,20 +53,47 @@
         ->assertSeeInOrder([
             'calendar-day-2026-05-03', 'calendar-day-2026-05-04', 'calendar-day-2026-05-05', 'calendar-day-2026-05-06', 'calendar-day-2026-05-07', 'calendar-day-2026-05-08', 'calendar-day-2026-05-09',
         ])
-        ->call('previousWeek')
+        ->call('previous')
         ->assertSeeInOrder([
             'calendar-day-2026-04-26', 'calendar-day-2026-04-27', 'calendar-day-2026-04-28', 'calendar-day-2026-04-29', 'calendar-day-2026-04-30', 'calendar-day-2026-05-01', 'calendar-day-2026-05-02',
         ])
-        ->call('currentWeek')
+        ->call('current')
         ->assertSeeInOrder([
             'calendar-day-2026-05-03', 'calendar-day-2026-05-04', 'calendar-day-2026-05-05', 'calendar-day-2026-05-06', 'calendar-day-2026-05-07', 'calendar-day-2026-05-08', 'calendar-day-2026-05-09',
         ])
-        ->call('nextWeek')
+        ->call('next')
         ->assertSeeInOrder([
             'calendar-day-2026-05-10', 'calendar-day-2026-05-11', 'calendar-day-2026-05-12', 'calendar-day-2026-05-13', 'calendar-day-2026-05-14', 'calendar-day-2026-05-15', 'calendar-day-2026-05-16',
         ]);
 });
 
+test('can view and navigate a month calendar', function () {
+    $this->travelTo(Date::parse('2026-05-15'));
+
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.calendar')
+        ->set('format', 'month')
+        ->assertSeeInOrder([
+            'calendar-day-2026-04-26', 'calendar-day-2026-04-27', 'calendar-day-2026-04-28', 'calendar-day-2026-04-29', 'calendar-day-2026-04-30', 'calendar-day-2026-05-01', 'calendar-day-2026-05-02',
+            'calendar-day-2026-05-03', 'calendar-day-2026-05-04', 'calendar-day-2026-05-05', 'calendar-day-2026-05-06', 'calendar-day-2026-05-07', 'calendar-day-2026-05-08', 'calendar-day-2026-05-09',
+            'calendar-day-2026-05-31', 'calendar-day-2026-06-01', 'calendar-day-2026-06-02', 'calendar-day-2026-06-03', 'calendar-day-2026-06-04', 'calendar-day-2026-06-05', 'calendar-day-2026-06-06',
+        ])
+        ->call('previous')
+        ->assertSeeInOrder([
+            'calendar-day-2026-03-29', 'calendar-day-2026-03-30', 'calendar-day-2026-03-31', 'calendar-day-2026-04-01', 'calendar-day-2026-04-02', 'calendar-day-2026-04-03', 'calendar-day-2026-04-04',
+        ])
+        ->call('current')
+        ->assertSeeInOrder([
+            'calendar-day-2026-04-26', 'calendar-day-2026-04-27', 'calendar-day-2026-04-28', 'calendar-day-2026-04-29', 'calendar-day-2026-04-30', 'calendar-day-2026-05-01', 'calendar-day-2026-05-02',
+        ])
+        ->call('next')
+        ->assertSeeInOrder([
+            'calendar-day-2026-05-31', 'calendar-day-2026-06-01', 'calendar-day-2026-06-02', 'calendar-day-2026-06-03', 'calendar-day-2026-06-04', 'calendar-day-2026-06-05', 'calendar-day-2026-06-06',
+        ]);
+});
+
 test('can hide feed from calendar', function () {
     Http::allowStrayRequests([
         'https://calendar.google.com/calendar/ical/*',

From dfc30a4767248961ca8bf2a3262755319703b3ba Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 16:31:29 -0500
Subject: [PATCH 18/57] Add day view

---
 .../components/kiosk/calendar/day.blade.php   | 27 +++++++++++++++++++
 .../components/kiosk/calendar/week.blade.php  |  2 +-
 .../\342\232\241calendar/calendar.blade.php"  | 19 +++++++++----
 .../kiosk/\342\232\241calendar/calendar.php"  | 24 ++++++++++++++++-
 .../\342\232\241calendar/calendar.test.php"   | 24 +++++++++++++++++
 5 files changed, 89 insertions(+), 7 deletions(-)
 create mode 100644 resources/views/components/kiosk/calendar/day.blade.php

diff --git a/resources/views/components/kiosk/calendar/day.blade.php b/resources/views/components/kiosk/calendar/day.blade.php
new file mode 100644
index 0000000..52251e1
--- /dev/null
+++ b/resources/views/components/kiosk/calendar/day.blade.php
@@ -0,0 +1,27 @@
+<div class="flex min-h-0 flex-1 flex-col overflow-hidden">
+    <div
+        wire:key="calendar-day-{{ $this->day['date']->toDateString() }}"
+        @class([
+            'border-b px-5 py-4 border-zinc-100 dark:border-zinc-700',
+            'bg-zinc-50 dark:bg-zinc-800' => ! $this->day['is_today'],
+            'bg-blue-100 dark:bg-blue-900' => $this->day['is_today'],
+        ])
+    >
+        <div class="text-sm font-medium uppercase text-zinc-500 dark:text-zinc-400">{{ $this->day['date']->format('l') }}</div>
+        <div class="text-3xl font-semibold text-zinc-900 dark:text-zinc-100">{{ $this->day['date']->format('F j') }}</div>
+    </div>
+
+    <div class="min-h-0 flex-1 overflow-y-auto p-5">
+        @if (count($this->day['events']) > 0)
+            <div class="grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
+                @foreach ($this->day['events'] as $event)
+                    <x-kiosk.calendar.event :$event />
+                @endforeach
+            </div>
+        @else
+            <div class="flex h-full items-center justify-center rounded-md border border-dashed border-zinc-200 bg-zinc-50 text-sm font-medium text-zinc-500 dark:border-zinc-700 dark:bg-zinc-900 dark:text-zinc-400">
+                {{ __('No events') }}
+            </div>
+        @endif
+    </div>
+</div>
diff --git a/resources/views/components/kiosk/calendar/week.blade.php b/resources/views/components/kiosk/calendar/week.blade.php
index 2fae652..6b300c0 100644
--- a/resources/views/components/kiosk/calendar/week.blade.php
+++ b/resources/views/components/kiosk/calendar/week.blade.php
@@ -2,7 +2,7 @@
     @foreach ($this->weekDays as $day)
         <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
             <div @class([
-                'border-b px-3 py-3 border-zinc-100 dark:border-zinc-700',
+                'border-b px-3 py-2 border-zinc-100 dark:border-zinc-700',
                 'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],
                 'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
             ])>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index eef0573..0574d9e 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -31,9 +31,18 @@
         </div>
     </div>
 
-    @if ($format === 'month')
-        <x-kiosk.calendar.month />
-    @else
-        <x-kiosk.calendar.week />
-    @endif
+    @switch($format)
+        @case('day')
+            <x-kiosk.calendar.day />
+
+            @break
+
+        @case('month')
+            <x-kiosk.calendar.month />
+
+            @break
+
+        @default
+            <x-kiosk.calendar.week />
+    @endswitch
 </div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index a6a0a96..641a2ab 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -33,6 +33,26 @@ public function feeds(): EloquentCollection
             ->get();
     }
 
+    /** @return array<int, array<string, mixed>> */
+    #[Computed]
+    public function dayEvents(): array
+    {
+        return $this->eventsForRange($this->focusedDate(), 1);
+    }
+
+    /** @return array{date: CarbonImmutable, events: array<int, array<string, mixed>>, is_today: bool} */
+    #[Computed]
+    public function day(): array
+    {
+        $date = $this->focusedDate();
+
+        return [
+            'date' => $date,
+            'events' => $this->dayEvents,
+            'is_today' => $date->isSameDay(CarbonImmutable::now($this->timezoneName())),
+        ];
+    }
+
     /** @return array<int, array<string, mixed>> */
     #[Computed]
     public function weekEvents(): array
@@ -102,6 +122,7 @@ public function nowLabel(): string
     public function previous(): void
     {
         $this->focusedDate = match ($this->format) {
+            'day' => $this->focusedDate()->subDay()->toDateString(),
             'month' => $this->focusedDate()->subMonthNoOverflow()->toDateString(),
             default => $this->weekStartsAt()->subWeek()->toDateString(),
         };
@@ -112,6 +133,7 @@ public function previous(): void
     public function next(): void
     {
         $this->focusedDate = match ($this->format) {
+            'day' => $this->focusedDate()->addDay()->toDateString(),
             'month' => $this->focusedDate()->addMonthNoOverflow()->toDateString(),
             default => $this->weekStartsAt()->addWeek()->toDateString(),
         };
@@ -163,7 +185,7 @@ private function eventsForRange(CarbonImmutable $startsAt, int $days): array
 
     private function clearCalendarState(): void
     {
-        unset($this->weekEvents, $this->weekDays, $this->monthEvents, $this->monthDays);
+        unset($this->dayEvents, $this->day, $this->weekEvents, $this->weekDays, $this->monthEvents, $this->monthDays);
     }
 
     private function timezoneName(): string
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index 5d95f55..b5d7b23 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -39,10 +39,34 @@
     Livewire::actingAs($user)
         ->test('pages::kiosk.calendar')
         ->assertSee('Cinco de Mayo')
+        ->set('format', 'day')
+        ->set('focusedDate', '2026-05-05')
+        ->assertSee('Cinco de Mayo')
         ->set('format', 'month')
         ->assertSee('Cinco de Mayo');
 });
 
+test('can view and navigate a day calendar', function () {
+    $this->travelTo(Date::parse('2026-05-08 12:00:00', 'America/Chicago'));
+
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.calendar')
+        ->set('format', 'day')
+        ->assertSee('Friday')
+        ->assertSee('May 8')
+        ->call('previous')
+        ->assertSee('Thursday')
+        ->assertSee('May 7')
+        ->call('current')
+        ->assertSee('Friday')
+        ->assertSee('May 8')
+        ->call('next')
+        ->assertSee('Saturday')
+        ->assertSee('May 9');
+});
+
 test('can go to the next and previous weeks', function () {
     $this->travelTo(Date::parse('2026-05-08'));
 

From eeca4a538e006cfe55b12398838597a306cd0856 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 16:44:52 -0500
Subject: [PATCH 19/57] Adjustments

---
 .../components/kiosk/calendar/day.blade.php   | 54 ++++++-----
 .../components/kiosk/calendar/month.blade.php | 97 ++++++++++---------
 .../\342\232\241calendar/calendar.blade.php"  | 15 +--
 3 files changed, 82 insertions(+), 84 deletions(-)

diff --git a/resources/views/components/kiosk/calendar/day.blade.php b/resources/views/components/kiosk/calendar/day.blade.php
index 52251e1..ce237de 100644
--- a/resources/views/components/kiosk/calendar/day.blade.php
+++ b/resources/views/components/kiosk/calendar/day.blade.php
@@ -1,27 +1,33 @@
-<div class="flex min-h-0 flex-1 flex-col overflow-hidden">
-    <div
-        wire:key="calendar-day-{{ $this->day['date']->toDateString() }}"
-        @class([
-            'border-b px-5 py-4 border-zinc-100 dark:border-zinc-700',
-            'bg-zinc-50 dark:bg-zinc-800' => ! $this->day['is_today'],
-            'bg-blue-100 dark:bg-blue-900' => $this->day['is_today'],
-        ])
-    >
-        <div class="text-sm font-medium uppercase text-zinc-500 dark:text-zinc-400">{{ $this->day['date']->format('l') }}</div>
-        <div class="text-3xl font-semibold text-zinc-900 dark:text-zinc-100">{{ $this->day['date']->format('F j') }}</div>
-    </div>
+<div class="flex divide-x h-full divide-zinc-100 dark:divide-zinc-700">
+    <div class="flex-1 flex min-h-0 flex-col overflow-hidden">
+        <div
+            wire:key="calendar-day-{{ $this->day['date']->toDateString() }}"
+            @class([
+                'border-b px-5 py-4 border-zinc-100 dark:border-zinc-700',
+                'bg-zinc-50 dark:bg-zinc-800' => ! $this->day['is_today'],
+                'bg-blue-100 dark:bg-blue-900' => $this->day['is_today'],
+            ])
+        >
+            <div class="text-sm font-medium uppercase text-zinc-500 dark:text-zinc-400">{{ $this->day['date']->format('l') }}</div>
+            <div class="text-3xl font-semibold text-zinc-900 dark:text-zinc-100">{{ $this->day['date']->format('F j') }}</div>
+        </div>
 
-    <div class="min-h-0 flex-1 overflow-y-auto p-5">
-        @if (count($this->day['events']) > 0)
-            <div class="grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
-                @foreach ($this->day['events'] as $event)
-                    <x-kiosk.calendar.event :$event />
-                @endforeach
-            </div>
-        @else
-            <div class="flex h-full items-center justify-center rounded-md border border-dashed border-zinc-200 bg-zinc-50 text-sm font-medium text-zinc-500 dark:border-zinc-700 dark:bg-zinc-900 dark:text-zinc-400">
-                {{ __('No events') }}
-            </div>
-        @endif
+        <div class="min-h-0 flex-1 overflow-y-auto p-5">
+            @if (count($this->day['events']) > 0)
+                <div class="grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
+                    @foreach ($this->day['events'] as $event)
+                        <x-kiosk.calendar.event :$event />
+                    @endforeach
+                </div>
+            @endif
+        </div>
+    </div>
+    <div class="shrink-none">
+        <flux:calendar
+            static
+            value="2026-05-15"
+            size="xs"
+            :navigation="false"
+        />
     </div>
 </div>
diff --git a/resources/views/components/kiosk/calendar/month.blade.php b/resources/views/components/kiosk/calendar/month.blade.php
index 7a9a3b5..b0df4d6 100644
--- a/resources/views/components/kiosk/calendar/month.blade.php
+++ b/resources/views/components/kiosk/calendar/month.blade.php
@@ -1,53 +1,58 @@
-<div class="grid min-h-0 flex-1 grid-rows-[auto_1fr] overflow-hidden">
-    <div class="grid grid-cols-7 border-b border-zinc-100 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-800">
-        @foreach (range(0, 6) as $offset)
-            <div wire:key="calendar-month-weekday-{{ $offset }}" class="px-3 py-2 text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">
-                {{ $this->monthDays[$offset]['date']->format('D') }}
-            </div>
-        @endforeach
+<div>
+    <div class="px-3 pt-2 w-full bg-zinc-50 dark:bg-zinc-800 text-sm font-semibold">
+        {{ now()->format('F') }}
     </div>
-
-    <div class="grid min-h-0 grid-cols-7 grid-rows-6 divide-x divide-y divide-zinc-100 overflow-hidden dark:divide-zinc-700">
-        @foreach ($this->monthDays as $day)
-            <div
-                wire:key="calendar-day-{{ $day['date']->toDateString() }}"
-                @class([
-                    'flex min-h-0 flex-col gap-1 overflow-hidden p-2',
-                    'bg-white dark:bg-zinc-950' => $day['is_current_month'] && ! $day['is_today'],
-                    'bg-zinc-50 text-zinc-500 dark:bg-zinc-900 dark:text-zinc-500' => ! $day['is_current_month'] && ! $day['is_today'],
-                    'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
-                ])
-            >
-                <div @class([
-                    'text-sm font-semibold',
-                    'text-zinc-900 dark:text-zinc-100' => $day['is_current_month'] || $day['is_today'],
-                    'text-zinc-400 dark:text-zinc-500' => ! $day['is_current_month'] && ! $day['is_today'],
-                ])>
-                    {{ $day['date']->format('j') }}
+    <div class="grid min-h-0 flex-1 grid-rows-[auto_1fr] overflow-hidden">
+        <div class="grid grid-cols-7 border-b border-zinc-100 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-800">
+            @foreach (range(0, 6) as $offset)
+                <div wire:key="calendar-month-weekday-{{ $offset }}" class="px-3 pb-2 text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">
+                    {{ $this->monthDays[$offset]['date']->format('D') }}
                 </div>
+            @endforeach
+        </div>
+
+        <div class="grid min-h-0 grid-cols-7 grid-rows-6 divide-x divide-y divide-zinc-100 overflow-hidden dark:divide-zinc-700">
+            @foreach ($this->monthDays as $day)
+                <div
+                    wire:key="calendar-day-{{ $day['date']->toDateString() }}"
+                    @class([
+                        'flex min-h-0 flex-col gap-1 overflow-hidden p-2',
+                        'bg-white dark:bg-zinc-950' => $day['is_current_month'] && ! $day['is_today'],
+                        'bg-zinc-50 text-zinc-500 dark:bg-zinc-900 dark:text-zinc-500' => ! $day['is_current_month'] && ! $day['is_today'],
+                        'bg-blue-100 dark:bg-blue-900' => $day['is_today'],
+                    ])
+                >
+                    <div @class([
+                        'text-sm font-semibold',
+                        'text-zinc-900 dark:text-zinc-100' => $day['is_current_month'] || $day['is_today'],
+                        'text-zinc-400 dark:text-zinc-500' => ! $day['is_current_month'] && ! $day['is_today'],
+                    ])>
+                        {{ $day['date']->format('j') }}
+                    </div>
 
-                <div class="flex min-h-0 flex-col gap-1 overflow-hidden">
-                    @foreach (array_slice($day['events'], 0, 3) as $event)
-                        <div
-                            wire:key="calendar-month-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
-                            @class([
-                                'truncate rounded-sm border border-zinc-200 bg-white px-1.5 py-1 text-xs leading-tight text-zinc-900 shadow-xs dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100',
-                                'line-through decoration-2 opacity-60' => ($event['response_status'] ?? null) === 'DECLINED',
-                            ])
-                            style="border-left: 3px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
-                        >
-                            <span class="font-medium">{{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}</span>
-                            {{ $event['title'] }}
-                        </div>
-                    @endforeach
+                    <div class="flex min-h-0 flex-col gap-1 overflow-hidden">
+                        @foreach (array_slice($day['events'], 0, 3) as $event)
+                            <div
+                                wire:key="calendar-month-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
+                                @class([
+                                    'truncate rounded-sm border border-zinc-200 bg-white px-1.5 py-1 text-xs leading-tight text-zinc-900 shadow-xs dark:border-zinc-700 dark:bg-zinc-950 dark:text-zinc-100',
+                                    'line-through decoration-2 opacity-60' => ($event['response_status'] ?? null) === 'DECLINED',
+                                ])
+                                style="border-left: 3px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
+                            >
+                                <span class="font-medium">{{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}</span>
+                                {{ $event['title'] }}
+                            </div>
+                        @endforeach
 
-                    @if (count($day['events']) > 3)
-                        <div class="px-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
-                            {{ __('+:count more', ['count' => count($day['events']) - 3]) }}
-                        </div>
-                    @endif
+                        @if (count($day['events']) > 3)
+                            <div class="px-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
+                                {{ __('+:count more', ['count' => count($day['events']) - 3]) }}
+                            </div>
+                        @endif
+                    </div>
                 </div>
-            </div>
-        @endforeach
+            @endforeach
+        </div>
     </div>
 </div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index 0574d9e..95d1ce9 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -31,18 +31,5 @@
         </div>
     </div>
 
-    @switch($format)
-        @case('day')
-            <x-kiosk.calendar.day />
-
-            @break
-
-        @case('month')
-            <x-kiosk.calendar.month />
-
-            @break
-
-        @default
-            <x-kiosk.calendar.week />
-    @endswitch
+    <x-dynamic-component :component="'kiosk.calendar.' . $format" />
 </div>

From ea4a948ad440a7da23a751abf57e1f89b305dccb Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 16:48:24 -0500
Subject: [PATCH 20/57] Add date and format to url, and adjust styles

---
 resources/views/components/kiosk/calendar/day.blade.php  | 9 +++++----
 .../views/pages/kiosk/\342\232\241calendar/calendar.php" | 3 +++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/resources/views/components/kiosk/calendar/day.blade.php b/resources/views/components/kiosk/calendar/day.blade.php
index ce237de..99491b5 100644
--- a/resources/views/components/kiosk/calendar/day.blade.php
+++ b/resources/views/components/kiosk/calendar/day.blade.php
@@ -1,5 +1,5 @@
-<div class="flex divide-x h-full divide-zinc-100 dark:divide-zinc-700">
-    <div class="flex-1 flex min-h-0 flex-col overflow-hidden">
+<div class="flex h-full divide-x divide-zinc-100 dark:divide-zinc-700">
+    <div class="flex min-h-0 flex-1 flex-col overflow-hidden">
         <div
             wire:key="calendar-day-{{ $this->day['date']->toDateString() }}"
             @class([
@@ -22,10 +22,11 @@
             @endif
         </div>
     </div>
-    <div class="shrink-none">
+
+    <div class="shrink-0">
         <flux:calendar
             static
-            value="2026-05-15"
+            :value="$this->day['date']->toDateString()"
             size="xs"
             :navigation="false"
         />
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index 641a2ab..91677b8 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -7,12 +7,15 @@
 use Illuminate\Support\Facades\Auth;
 use Livewire\Attributes\Computed;
 use Livewire\Attributes\Layout;
+use Livewire\Attributes\Url;
 use Livewire\Component;
 
 new #[Layout('layouts::kiosk')] class extends Component
 {
+    #[Url]
     public string $focusedDate = '';
 
+    #[Url]
     public string $format = 'week';
 
     public array $selectedFeeds = [];

From da91768d57fc28e1f3887a47b44f63363abc870d Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 16:48:39 -0500
Subject: [PATCH 21/57] Change day view to hours

---
 .../components/kiosk/calendar/day.blade.php   | 60 +++++++++++++++++--
 .../kiosk/\342\232\241calendar/calendar.php"  | 38 +++++++++++-
 .../\342\232\241calendar/calendar.test.php"   | 51 ++++++++++++++++
 3 files changed, 143 insertions(+), 6 deletions(-)

diff --git a/resources/views/components/kiosk/calendar/day.blade.php b/resources/views/components/kiosk/calendar/day.blade.php
index 99491b5..17a51b0 100644
--- a/resources/views/components/kiosk/calendar/day.blade.php
+++ b/resources/views/components/kiosk/calendar/day.blade.php
@@ -12,14 +12,64 @@
             <div class="text-3xl font-semibold text-zinc-900 dark:text-zinc-100">{{ $this->day['date']->format('F j') }}</div>
         </div>
 
-        <div class="min-h-0 flex-1 overflow-y-auto p-5">
-            @if (count($this->day['events']) > 0)
-                <div class="grid gap-3 sm:grid-cols-2 xl:grid-cols-3">
-                    @foreach ($this->day['events'] as $event)
+        @if (count($this->dayAllDayEvents) > 0)
+            <div class="grid grid-cols-[4rem_1fr] border-b border-zinc-100 dark:border-zinc-700">
+                <div class="border-r border-zinc-100 px-3 py-3 text-right text-xs font-medium uppercase text-zinc-500 dark:border-zinc-700 dark:text-zinc-400">
+                    {{ __('All day') }}
+                </div>
+
+                <div class="grid gap-2 p-3 sm:grid-cols-2 xl:grid-cols-3">
+                    @foreach ($this->dayAllDayEvents as $event)
                         <x-kiosk.calendar.event :$event />
                     @endforeach
                 </div>
-            @endif
+            </div>
+        @endif
+
+        <div class="min-h-0 flex-1 overflow-y-auto">
+            <div class="relative grid min-h-[120rem] grid-cols-[4rem_1fr]">
+                @foreach (range(0, 23) as $hour)
+                    <div
+                        wire:key="calendar-day-hour-label-{{ $hour }}"
+                        class="h-20 border-r border-zinc-100 px-3 pt-2 text-right text-xs font-medium text-zinc-500 dark:border-zinc-700 dark:text-zinc-400"
+                    >
+                        {{ Carbon\CarbonImmutable::createFromTime($hour)->format('g A') }}
+                    </div>
+
+                    <div
+                        wire:key="calendar-day-hour-row-{{ $hour }}"
+                        class="h-20 border-b border-zinc-100 dark:border-zinc-800"
+                    ></div>
+                @endforeach
+
+                <div class="pointer-events-none absolute inset-y-0 left-16 right-3">
+                    @foreach ($this->dayTimedEvents as $event)
+                        <div
+                            wire:key="calendar-timed-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
+                            @class([
+                                'pointer-events-auto absolute overflow-hidden rounded-md border border-zinc-200 bg-white p-2 text-sm shadow-xs dark:border-zinc-700 dark:bg-zinc-950',
+                                'line-through decoration-2 opacity-60' => ($event['response_status'] ?? null) === 'DECLINED',
+                            ])
+                            style="top: {{ $event['timeline_top'] }}%; height: {{ $event['timeline_height'] }}%; left: 0; right: 0; min-height: 2.5rem; border-left: 4px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
+                        >
+                            <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
+                                {{ $event['starts_at']->format('g:i A') }}
+
+                                @if ($event['ends_at'])
+                                    <span>{{ __('-') }}</span>
+                                    <span>{{ $event['ends_at']->format('g:i A') }}</span>
+                                @endif
+                            </div>
+
+                            <div class="truncate font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
+
+                            @if ($event['location'])
+                                <div class="mt-1 truncate text-xs text-zinc-500 dark:text-zinc-400">{{ $event['location'] }}</div>
+                            @endif
+                        </div>
+                    @endforeach
+                </div>
+            </div>
         </div>
     </div>
 
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index 91677b8..72555c8 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -56,6 +56,42 @@ public function day(): array
         ];
     }
 
+    /** @return array<int, array<string, mixed>> */
+    #[Computed]
+    public function dayAllDayEvents(): array
+    {
+        return collect($this->dayEvents)
+            ->filter(fn (array $event): bool => $event['all_day'])
+            ->values()
+            ->all();
+    }
+
+    /** @return array<int, array<string, mixed>> */
+    #[Computed]
+    public function dayTimedEvents(): array
+    {
+        $dayStartsAt = $this->focusedDate()->startOfDay();
+        $dayEndsAt = $this->focusedDate()->endOfDay();
+
+        return collect($this->dayEvents)
+            ->reject(fn (array $event): bool => $event['all_day'])
+            ->map(function (array $event) use ($dayEndsAt, $dayStartsAt): array {
+                $startsAt = $event['starts_at']->lessThan($dayStartsAt) ? $dayStartsAt : $event['starts_at'];
+                $endsAt = $event['ends_at'] instanceof CarbonImmutable ? $event['ends_at'] : $event['starts_at']->addMinutes(30);
+                $endsAt = $endsAt->greaterThan($dayEndsAt) ? $dayEndsAt : $endsAt;
+                $duration = max(15, (int) round($startsAt->diffInMinutes($endsAt)));
+                $startsAfterMidnight = (int) round($dayStartsAt->diffInMinutes($startsAt));
+
+                return [
+                    ...$event,
+                    'timeline_top' => ($startsAfterMidnight / 1440) * 100,
+                    'timeline_height' => ($duration / 1440) * 100,
+                ];
+            })
+            ->values()
+            ->all();
+    }
+
     /** @return array<int, array<string, mixed>> */
     #[Computed]
     public function weekEvents(): array
@@ -188,7 +224,7 @@ private function eventsForRange(CarbonImmutable $startsAt, int $days): array
 
     private function clearCalendarState(): void
     {
-        unset($this->dayEvents, $this->day, $this->weekEvents, $this->weekDays, $this->monthEvents, $this->monthDays);
+        unset($this->dayEvents, $this->day, $this->dayAllDayEvents, $this->dayTimedEvents, $this->weekEvents, $this->weekDays, $this->monthEvents, $this->monthDays);
     }
 
     private function timezoneName(): string
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index b5d7b23..eca241b 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -67,6 +67,57 @@
         ->assertSee('May 9');
 });
 
+test('day calendar shows hours and sizes timed events by duration', function () {
+    Http::fake([
+        'https://example.com/day-calendar.ics' => Http::response(<<<'ICS'
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Sunny//Tests//EN
+BEGIN:VEVENT
+UID:family-day
+DTSTAMP:20260501T120000Z
+DTSTART;VALUE=DATE:20260508
+DTEND;VALUE=DATE:20260509
+SUMMARY:Family Day
+END:VEVENT
+BEGIN:VEVENT
+UID:morning-standup
+DTSTAMP:20260501T120000Z
+DTSTART;TZID=America/Chicago:20260508T090000
+DTEND;TZID=America/Chicago:20260508T103000
+SUMMARY:Morning Standup
+LOCATION:Kitchen
+END:VEVENT
+END:VCALENDAR
+ICS),
+    ]);
+
+    $this->travelTo(Date::parse('2026-05-08 12:00:00', 'America/Chicago'));
+
+    $team = Team::factory()
+        ->has(CalendarFeed::factory()->state([
+            'url' => 'https://example.com/day-calendar.ics',
+            'name' => 'Family Calendar',
+            'color' => CalendarColor::Blue,
+        ]))
+        ->create();
+    $user = User::factory()->memberOf($team)->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.calendar')
+        ->set('format', 'day')
+        ->assertSee('12 AM')
+        ->assertSee('9 AM')
+        ->assertSee('All day')
+        ->assertSee('Family Day')
+        ->assertSee('Morning Standup')
+        ->assertSee('Kitchen')
+        ->assertSee('9:00 AM')
+        ->assertSee('10:30 AM')
+        ->assertSee('top: 37.5%', false)
+        ->assertSee('height: 6.25%', false);
+});
+
 test('can go to the next and previous weeks', function () {
     $this->travelTo(Date::parse('2026-05-08'));
 

From 3f295abe716b91be345bbf259abe11533374a971 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 16:52:21 -0500
Subject: [PATCH 22/57] Adjust styles

---
 resources/views/components/kiosk/calendar/day.blade.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/components/kiosk/calendar/day.blade.php b/resources/views/components/kiosk/calendar/day.blade.php
index 17a51b0..9a75d18 100644
--- a/resources/views/components/kiosk/calendar/day.blade.php
+++ b/resources/views/components/kiosk/calendar/day.blade.php
@@ -1,9 +1,9 @@
-<div class="flex h-full divide-x divide-zinc-100 dark:divide-zinc-700">
+<div class="flex min-h-0 divide-x divide-zinc-100 dark:divide-zinc-700">
     <div class="flex min-h-0 flex-1 flex-col overflow-hidden">
         <div
             wire:key="calendar-day-{{ $this->day['date']->toDateString() }}"
             @class([
-                'border-b px-5 py-4 border-zinc-100 dark:border-zinc-700',
+                'border-b px-3 py-2 border-zinc-100 dark:border-zinc-700',
                 'bg-zinc-50 dark:bg-zinc-800' => ! $this->day['is_today'],
                 'bg-blue-100 dark:bg-blue-900' => $this->day['is_today'],
             ])

From 4c0b89f0fb21ea6e6ecf0aecfada245fa1c8a3d6 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 16:54:57 -0500
Subject: [PATCH 23/57] Change to button group

---
 .../pages/kiosk/\342\232\241calendar/calendar.blade.php"  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index 95d1ce9..8ba66bc 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -25,9 +25,11 @@
                 <flux:radio value="month" label="Month" />
             </flux:radio.group>
 
-            <flux:button type="button" variant="ghost" size="sm" icon="chevron-left" wire:click="previous" />
-            <flux:button type="button" variant="filled" size="sm" wire:click="current">{{ __('Today') }}</flux:button>
-            <flux:button type="button" variant="ghost" size="sm" icon="chevron-right" wire:click="next" />
+            <flux:button.group>
+                <flux:button icon="chevron-left" wire:click="previous" />
+                <flux:button wire:click="current">{{ __('Today') }}</flux:button>
+                <flux:button icon="chevron-right" wire:click="next" />
+            </flux:button.group>
         </div>
     </div>
 

From a7b9e9d2aa52df3ca0c75a66d7f877ff5d156283 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 17:01:20 -0500
Subject: [PATCH 24/57] Adjust month view to scroll, and hide more than two
 events on month view

---
 .../components/kiosk/calendar/month.blade.php | 14 ++---
 .../\342\232\241calendar/calendar.test.php"   | 51 +++++++++++++++++++
 2 files changed, 58 insertions(+), 7 deletions(-)

diff --git a/resources/views/components/kiosk/calendar/month.blade.php b/resources/views/components/kiosk/calendar/month.blade.php
index b0df4d6..47c53cb 100644
--- a/resources/views/components/kiosk/calendar/month.blade.php
+++ b/resources/views/components/kiosk/calendar/month.blade.php
@@ -1,9 +1,9 @@
-<div>
-    <div class="px-3 pt-2 w-full bg-zinc-50 dark:bg-zinc-800 text-sm font-semibold">
+<div class="flex min-h-0 flex-1 flex-col overflow-hidden">
+    <div class="w-full shrink-0 bg-zinc-50 px-3 pt-2 text-sm font-semibold dark:bg-zinc-800">
         {{ now()->format('F') }}
     </div>
     <div class="grid min-h-0 flex-1 grid-rows-[auto_1fr] overflow-hidden">
-        <div class="grid grid-cols-7 border-b border-zinc-100 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-800">
+        <div class="grid shrink-0 grid-cols-7 border-b border-zinc-100 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-800">
             @foreach (range(0, 6) as $offset)
                 <div wire:key="calendar-month-weekday-{{ $offset }}" class="px-3 pb-2 text-xs font-medium uppercase text-zinc-500 dark:text-zinc-400">
                     {{ $this->monthDays[$offset]['date']->format('D') }}
@@ -11,7 +11,7 @@
             @endforeach
         </div>
 
-        <div class="grid min-h-0 grid-cols-7 grid-rows-6 divide-x divide-y divide-zinc-100 overflow-hidden dark:divide-zinc-700">
+        <div class="grid min-h-0 grid-cols-7 auto-rows-[7rem] divide-x divide-y divide-zinc-100 overflow-y-auto dark:divide-zinc-700">
             @foreach ($this->monthDays as $day)
                 <div
                     wire:key="calendar-day-{{ $day['date']->toDateString() }}"
@@ -31,7 +31,7 @@
                     </div>
 
                     <div class="flex min-h-0 flex-col gap-1 overflow-hidden">
-                        @foreach (array_slice($day['events'], 0, 3) as $event)
+                        @foreach (array_slice($day['events'], 0, 2) as $event)
                             <div
                                 wire:key="calendar-month-event-{{ $event['feed_id'] }}-{{ $event['starts_at']->timestamp }}-{{ str($event['title'])->slug() }}"
                                 @class([
@@ -45,9 +45,9 @@
                             </div>
                         @endforeach
 
-                        @if (count($day['events']) > 3)
+                        @if (count($day['events']) > 2)
                             <div class="px-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
-                                {{ __('+:count more', ['count' => count($day['events']) - 3]) }}
+                                {{ __('+:count events', ['count' => count($day['events']) - 2]) }}
                             </div>
                         @endif
                     </div>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index eca241b..29f74c9 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -169,6 +169,57 @@
         ]);
 });
 
+test('month calendar shows two events before overflow count', function () {
+    Http::fake([
+        'https://example.com/month-calendar.ics' => Http::response(<<<'ICS'
+BEGIN:VCALENDAR
+VERSION:2.0
+PRODID:-//Sunny//Tests//EN
+BEGIN:VEVENT
+UID:first-event
+DTSTAMP:20260501T120000Z
+DTSTART;TZID=America/Chicago:20260515T090000
+DTEND;TZID=America/Chicago:20260515T100000
+SUMMARY:First Event
+END:VEVENT
+BEGIN:VEVENT
+UID:second-event
+DTSTAMP:20260501T120000Z
+DTSTART;TZID=America/Chicago:20260515T110000
+DTEND;TZID=America/Chicago:20260515T120000
+SUMMARY:Second Event
+END:VEVENT
+BEGIN:VEVENT
+UID:third-event
+DTSTAMP:20260501T120000Z
+DTSTART;TZID=America/Chicago:20260515T130000
+DTEND;TZID=America/Chicago:20260515T140000
+SUMMARY:Third Event
+END:VEVENT
+END:VCALENDAR
+ICS),
+    ]);
+
+    $this->travelTo(Date::parse('2026-05-15 12:00:00', 'America/Chicago'));
+
+    $team = Team::factory()
+        ->has(CalendarFeed::factory()->state([
+            'url' => 'https://example.com/month-calendar.ics',
+            'name' => 'Family Calendar',
+            'color' => CalendarColor::Blue,
+        ]))
+        ->create();
+    $user = User::factory()->memberOf($team)->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.calendar')
+        ->set('format', 'month')
+        ->assertSee('First Event')
+        ->assertSee('Second Event')
+        ->assertSee('+1 events')
+        ->assertDontSee('Third Event');
+});
+
 test('can hide feed from calendar', function () {
     Http::allowStrayRequests([
         'https://calendar.google.com/calendar/ical/*',

From 4a94c5ae8f5752e4ea7a04b9c23bb3c6d17fe10a Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Fri, 15 May 2026 17:22:25 -0500
Subject: [PATCH 25/57] =?UTF-8?q?Just=20Keep=20Swimming=20=F0=9F=90=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resources/views/layouts/app.blade.php                       | 4 ++++
 .../pages/kiosk/\342\232\241calendar/calendar.blade.php"    | 4 +---
 .../views/pages/kiosk/\342\232\241calendar/calendar.php"    | 6 ------
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 05ce63a..111658d 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -21,6 +21,10 @@
                         {{ __('Recipes') }}
                     </flux:sidebar.item>
 
+                    <flux:sidebar.item icon="tv" :href="route('kiosk.calendar')" :current="request()->routeIs('kiosk.*')" wire:navigate>
+                        {{ __('Kiosk') }}
+                    </flux:sidebar.item>
+
                 </flux:sidebar.group>
             </flux:sidebar.nav>
 
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index 8ba66bc..1209822 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -1,8 +1,6 @@
 <div class="flex h-dvh flex-col overflow-hidden">
     <div class="flex shrink-0 flex-col gap-3 border-b border-zinc-200 px-5 py-4 dark:border-zinc-700 sm:flex-row sm:items-center sm:justify-between">
-        <div>
-            <flux:heading size="xl">{{ $this->nowLabel }}</flux:heading>
-        </div>
+        <flux:heading size="xl">{{ Carbon\CarbonImmutable::now($this->timezoneName())->format('D, M j g:i A') }}</flux:heading>
 
         <div class="flex items-center gap-2">
             <flux:dropdown>
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index 72555c8..3b44d8d 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -152,12 +152,6 @@ public function monthDays(): array
             ->all();
     }
 
-    #[Computed]
-    public function nowLabel(): string
-    {
-        return CarbonImmutable::now($this->timezoneName())->format('D, M j g:i A');
-    }
-
     public function previous(): void
     {
         $this->focusedDate = match ($this->format) {

From fd74418a535ce8f2c4bcb9499a2e661c7b9a4f6f Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 20:01:08 -0500
Subject: [PATCH 26/57] Add collapsible sidebar

---
 resources/views/layouts/app.blade.php | 39 +++++++++++++++------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index 111658d..e5ba331 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -4,33 +4,38 @@
         @include('layouts.partials.head')
     </head>
     <body class="min-h-screen bg-white dark:bg-zinc-800">
-        <flux:sidebar sticky collapsible="mobile" class="border-e border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
+        <flux:sidebar sticky collapsible class="border-e border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
+            <flux:sidebar.header>
+                <flux:sidebar.brand
+                    href="#"
+                    :logo="asset('icon.png')"
+                    name="Sunny Home"
+                />
+                <flux:sidebar.collapse class="in-data-flux-sidebar-on-desktop:not-in-data-flux-sidebar-collapsed-desktop:-mr-2" />
+            </flux:sidebar.header>
+
             <livewire:team-switcher />
 
             <flux:sidebar.nav>
-                <flux:sidebar.group :heading="__('Platform')" class="grid">
-                    <flux:sidebar.item icon="home" :href="route('dashboard')" :current="request()->routeIs('dashboard')" wire:navigate>
-                        {{ __('Dashboard') }}
-                    </flux:sidebar.item>
-
-                    <flux:sidebar.item icon="archive-box" :href="route('inventory.index')" :current="request()->routeIs('inventory.*')" wire:navigate>
-                        {{ __('Inventory') }}
-                    </flux:sidebar.item>
+                <flux:sidebar.item icon="home" :href="route('dashboard')" :current="request()->routeIs('dashboard')" wire:navigate>
+                    {{ __('Dashboard') }}
+                </flux:sidebar.item>
 
-                    <flux:sidebar.item icon="book-open" :href="route('recipes.index')" :current="request()->routeIs('recipes.*')" wire:navigate>
-                        {{ __('Recipes') }}
-                    </flux:sidebar.item>
+                <flux:sidebar.item icon="archive-box" :href="route('inventory.index')" :current="request()->routeIs('inventory.*')" wire:navigate>
+                    {{ __('Inventory') }}
+                </flux:sidebar.item>
 
-                    <flux:sidebar.item icon="tv" :href="route('kiosk.calendar')" :current="request()->routeIs('kiosk.*')" wire:navigate>
-                        {{ __('Kiosk') }}
-                    </flux:sidebar.item>
+                <flux:sidebar.item icon="book-open" :href="route('recipes.index')" :current="request()->routeIs('recipes.*')" wire:navigate>
+                    {{ __('Recipes') }}
+                </flux:sidebar.item>
 
-                </flux:sidebar.group>
+                <flux:sidebar.item icon="tv" :href="route('kiosk.configure')" :current="request()->routeIs('kiosk.*')" wire:navigate>
+                    {{ __('Kiosk') }}
+                </flux:sidebar.item>
             </flux:sidebar.nav>
 
             <flux:spacer />
 
-
             <flux:sidebar.item icon="light-bulb" icon:trailing="arrow-up-right" href="https://suggest.gg/techenby" target="_blank">
                 {{ __('Make a Suggestion') }}
             </flux:sidebar.item>

From e93966a768cbe41fe982b68d12e368fcda1a5e8c Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 20:01:18 -0500
Subject: [PATCH 27/57] Add kiosk configure page

---
 .../kiosk/\342\232\241configure/configure.blade.php"      | 8 ++++++++
 .../pages/kiosk/\342\232\241configure/configure.php"      | 8 ++++++++
 .../pages/kiosk/\342\232\241configure/configure.test.php" | 8 ++++++++
 routes/web.php                                            | 2 ++
 4 files changed, 26 insertions(+)
 create mode 100644 "resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241configure/configure.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241configure/configure.test.php"

diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
new file mode 100644
index 0000000..631a7e1
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
@@ -0,0 +1,8 @@
+
+<div>
+    <div class="w-255 h-150 rounded-lg border overflow-hidden border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
+        <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="w-full h-full"></iframe>
+    </div>
+
+
+</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.php"
new file mode 100644
index 0000000..008929e
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.php"
@@ -0,0 +1,8 @@
+<?php
+
+use Livewire\Component;
+
+new class extends Component
+{
+    //
+};
\ No newline at end of file
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.test.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
new file mode 100644
index 0000000..6665156
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
@@ -0,0 +1,8 @@
+<?php
+
+use Livewire\Livewire;
+
+it('renders successfully', function () {
+    Livewire::test('pages::kiosk.configure')
+        ->assertStatus(200);
+});
diff --git a/routes/web.php b/routes/web.php
index 182863e..31f64a0 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,6 +24,8 @@
     ->middleware(['auth', 'verified', EnsureTeamMembership::class])
     ->name('kiosk')
     ->group(function (): void {
+        Route::livewire('configure', 'pages::kiosk.configure')->name('.configure');
+
         Route::livewire('calendar', 'pages::kiosk.calendar')->name('.calendar');
         Route::livewire('routines', 'pages::kiosk.routines')->name('.routines');
         Route::livewire('chore-chart', 'pages::kiosk.chore-chart')->name('.chore-chart');

From fb7a5571001b26de0420f26605f3782994d3b239 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 20:03:33 -0500
Subject: [PATCH 28/57] Add calendar feeds for Strawhat's holidays

---
 composer.lock                        |  2 +-
 database/seeders/StrawhatsSeeder.php | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/composer.lock b/composer.lock
index 2139677..2f19129 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1bc20519780b28785b4ad3ae2a87155d",
+    "content-hash": "1e4cdaf58e2e0319de050fa8276e65a8",
     "packages": [
         {
             "name": "aws/aws-crt-php",
diff --git a/database/seeders/StrawhatsSeeder.php b/database/seeders/StrawhatsSeeder.php
index c01bc44..766cc97 100644
--- a/database/seeders/StrawhatsSeeder.php
+++ b/database/seeders/StrawhatsSeeder.php
@@ -4,7 +4,9 @@
 
 namespace Database\Seeders;
 
+use App\Enums\CalendarColor;
 use App\Enums\ItemType;
+use App\Models\CalendarFeed;
 use App\Models\Item;
 use App\Models\Recipe;
 use App\Models\Team;
@@ -130,5 +132,22 @@ public function run(): void
                 ['name' => 'Master Oda\'s Dinner Paparazzi! (Home)'],
             )
             ->create();
+
+        CalendarFeed::factory()
+            ->for($strawhats)
+            ->count(10)
+            ->sequence(
+                ['name' => 'Brazilian Holidays (Luffy)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=' . now('Y'), 'color' => CalendarColor::Green],
+                ['name' => 'Japanese Holidays (Zoro)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=JP&year=' . now('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'Swedish Holidays (Nami)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=SE&year=' . now('Y'), 'color' => CalendarColor::Gold],
+                ['name' => 'South African Holidays (Usopp)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=ZA&year=' . now('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'French Holidays (Sanji)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=FR&year=' . now('Y'), 'color' => CalendarColor::Blue],
+                ['name' => 'Canadian Holidays (Chopper)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=CA&year=' . now('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'Russian Holidays (Robin)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=RU&year=' . now('Y'), 'color' => CalendarColor::Blue],
+                ['name' => 'American Holidays (Franky)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=US&year=' . now('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'Austrian Holidays (Brook)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=AT&year=' . now('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'Indian Holidays (Jinbe)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=IN&year=' . now('Y'), 'color' => CalendarColor::Orange],
+            )
+            ->create();
     }
 }

From 3565b6df69d0e55f7b199d05f0f8295b5cdf36bc Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 20:31:05 -0500
Subject: [PATCH 29/57] Fix year formatting

---
 database/seeders/StrawhatsSeeder.php | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/database/seeders/StrawhatsSeeder.php b/database/seeders/StrawhatsSeeder.php
index 766cc97..e80c5ec 100644
--- a/database/seeders/StrawhatsSeeder.php
+++ b/database/seeders/StrawhatsSeeder.php
@@ -137,16 +137,16 @@ public function run(): void
             ->for($strawhats)
             ->count(10)
             ->sequence(
-                ['name' => 'Brazilian Holidays (Luffy)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=' . now('Y'), 'color' => CalendarColor::Green],
-                ['name' => 'Japanese Holidays (Zoro)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=JP&year=' . now('Y'), 'color' => CalendarColor::Red],
-                ['name' => 'Swedish Holidays (Nami)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=SE&year=' . now('Y'), 'color' => CalendarColor::Gold],
-                ['name' => 'South African Holidays (Usopp)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=ZA&year=' . now('Y'), 'color' => CalendarColor::Red],
-                ['name' => 'French Holidays (Sanji)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=FR&year=' . now('Y'), 'color' => CalendarColor::Blue],
-                ['name' => 'Canadian Holidays (Chopper)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=CA&year=' . now('Y'), 'color' => CalendarColor::Red],
-                ['name' => 'Russian Holidays (Robin)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=RU&year=' . now('Y'), 'color' => CalendarColor::Blue],
-                ['name' => 'American Holidays (Franky)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=US&year=' . now('Y'), 'color' => CalendarColor::Red],
-                ['name' => 'Austrian Holidays (Brook)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=AT&year=' . now('Y'), 'color' => CalendarColor::Red],
-                ['name' => 'Indian Holidays (Jinbe)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=IN&year=' . now('Y'), 'color' => CalendarColor::Orange],
+                ['name' => 'Brazilian Holidays (Luffy)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=' . now()->format('Y'), 'color' => CalendarColor::Green],
+                ['name' => 'Japanese Holidays (Zoro)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=JP&year=' . now()->format('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'Swedish Holidays (Nami)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=SE&year=' . now()->format('Y'), 'color' => CalendarColor::Gold],
+                ['name' => 'South African Holidays (Usopp)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=ZA&year=' . now()->format('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'French Holidays (Sanji)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=FR&year=' . now()->format('Y'), 'color' => CalendarColor::Blue],
+                ['name' => 'Canadian Holidays (Chopper)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=CA&year=' . now()->format('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'Russian Holidays (Robin)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=RU&year=' . now()->format('Y'), 'color' => CalendarColor::Blue],
+                ['name' => 'American Holidays (Franky)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=US&year=' . now()->format('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'Austrian Holidays (Brook)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=AT&year=' . now()->format('Y'), 'color' => CalendarColor::Red],
+                ['name' => 'Indian Holidays (Jinbe)', 'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=IN&year=' . now()->format('Y'), 'color' => CalendarColor::Orange],
             )
             ->create();
     }

From 784790e06c9d1c20cf4cc0900a671910a471460e Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 20:31:32 -0500
Subject: [PATCH 30/57] Add local screensize widget

---
 .../views/components/kiosk/calendar/week.blade.php     |  2 +-
 resources/views/components/screensize.blade.php        | 10 ++++++++++
 resources/views/layouts/app.blade.php                  |  2 ++
 resources/views/layouts/auth.blade.php                 |  7 +++++++
 resources/views/layouts/guest.blade.php                |  2 ++
 resources/views/layouts/kiosk.blade.php                |  2 ++
 6 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 resources/views/components/screensize.blade.php

diff --git a/resources/views/components/kiosk/calendar/week.blade.php b/resources/views/components/kiosk/calendar/week.blade.php
index 6b300c0..115587c 100644
--- a/resources/views/components/kiosk/calendar/week.blade.php
+++ b/resources/views/components/kiosk/calendar/week.blade.php
@@ -1,4 +1,4 @@
-<div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 lg:grid-cols-7 lg:divide-x lg:divide-y-0">
+<div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 md:grid-cols-7 md:divide-x md:divide-y-0">
     @foreach ($this->weekDays as $day)
         <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
             <div @class([
diff --git a/resources/views/components/screensize.blade.php b/resources/views/components/screensize.blade.php
new file mode 100644
index 0000000..3f1b041
--- /dev/null
+++ b/resources/views/components/screensize.blade.php
@@ -0,0 +1,10 @@
+@env('local')
+<div class="pointer-events-none fixed right-3 bottom-3 z-50 rounded bg-zinc-950/85 px-2 py-1 text-[10px] font-semibold text-white uppercase shadow-lg ring-1 ring-white/10">
+    <span class="sm:hidden">base</span>
+    <span class="hidden sm:inline md:hidden">sm</span>
+    <span class="hidden md:inline lg:hidden">md</span>
+    <span class="hidden lg:inline xl:hidden">lg</span>
+    <span class="hidden xl:inline 2xl:hidden">xl</span>
+    <span class="hidden 2xl:inline">2xl</span>
+</div>
+@endenv
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index e5ba331..f15b584 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -112,6 +112,8 @@ class="w-full cursor-pointer"
             {{ $slot }}
         </flux:main>
 
+        <x-screensize />
+
         @persist('toast')
             <flux:toast.group>
                 <flux:toast />
diff --git a/resources/views/layouts/auth.blade.php b/resources/views/layouts/auth.blade.php
index 394c5e6..13319cf 100644
--- a/resources/views/layouts/auth.blade.php
+++ b/resources/views/layouts/auth.blade.php
@@ -17,6 +17,13 @@
                 </div>
             </div>
         </div>
+
+        <x-screensize />
+
+        @persist('toast')
+            <flux:toast />
+        @endpersist
+
         @fluxScripts
     </body>
 </html>
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
index 90a91f3..cd487d9 100644
--- a/resources/views/layouts/guest.blade.php
+++ b/resources/views/layouts/guest.blade.php
@@ -15,6 +15,8 @@
             {{ $slot }}
         </div>
 
+        <x-screensize />
+
         @persist('toast')
             <flux:toast />
         @endpersist
diff --git a/resources/views/layouts/kiosk.blade.php b/resources/views/layouts/kiosk.blade.php
index 114af06..8213247 100644
--- a/resources/views/layouts/kiosk.blade.php
+++ b/resources/views/layouts/kiosk.blade.php
@@ -18,6 +18,8 @@
             {{ $slot }}
         </flux:main>
 
+        <x-screensize />
+
         @persist('toast')
             <flux:toast />
         @endpersist

From 802df37c2511ca1b6147f476cbf8cd6adf0dc4c4 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 20:31:45 -0500
Subject: [PATCH 31/57] Start on configure page

---
 .../configure.blade.php"                      |  76 +++++++++++-
 .../\342\232\241configure/configure.php"      | 115 +++++++++++++++++-
 .../\342\232\241configure/configure.test.php" | 110 ++++++++++++++++-
 3 files changed, 293 insertions(+), 8 deletions(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
index 631a7e1..4615582 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
@@ -1,8 +1,76 @@
-
-<div>
-    <div class="w-255 h-150 rounded-lg border overflow-hidden border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
-        <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="w-full h-full"></iframe>
+<div class="grid min-h-dvh gap-6 p-6 xl:grid-cols-[minmax(0,1fr)_24rem]">
+    <div class="min-h-[34rem] overflow-hidden rounded-lg border border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
+        <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="h-full w-full"></iframe>
     </div>
 
+    <aside class="space-y-6">
+        <form wire:submit="saveFeed" class="space-y-4 rounded-lg border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900">
+            <div class="flex items-center justify-between gap-3">
+                <flux:heading size="lg">
+                    {{ $editingFeedId ? __('Edit feed') : __('Add feed') }}
+                </flux:heading>
+
+                @if ($editingFeedId)
+                    <flux:button type="button" variant="ghost" size="sm" wire:click="resetFeedForm">
+                        {{ __('Cancel') }}
+                    </flux:button>
+                @endif
+            </div>
+
+            <flux:input wire:model="feedName" :label="__('Name')" required />
+
+            <flux:input wire:model="feedUrl" :label="__('Calendar URL')" type="url" required />
+
+            <flux:select wire:model="feedColor" :label="__('Color')" variant="listbox">
+                @foreach (App\Enums\CalendarColor::cases() as $color)
+                    <flux:select.option :value="$color->value">{{ $color->name }}</flux:select.option>
+                @endforeach
+            </flux:select>
+
+            <div class="flex items-center gap-3">
+                <span class="size-4 rounded-full ring-1 ring-black/10" style="background: {{ $feedColor }}"></span>
+
+                <flux:button type="submit" variant="primary">
+                    {{ $editingFeedId ? __('Update feed') : __('Add feed') }}
+                </flux:button>
+            </div>
+        </form>
+
+        <div class="space-y-3">
+            <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
+
+            <div class="space-y-2">
+                @forelse ($this->feeds as $feed)
+                    <div wire:key="calendar-feed-{{ $feed->id }}" class="rounded-lg border border-zinc-200 bg-white p-3 dark:border-zinc-700 dark:bg-zinc-900">
+                        <div class="flex items-start justify-between gap-3">
+                            <div class="min-w-0 space-y-1">
+                                <div class="flex items-center gap-2">
+                                    <span class="size-2.5 shrink-0 rounded-full" style="background: {{ $feed->color }}"></span>
+                                    <span class="truncate font-medium">{{ $feed->name }}</span>
+                                </div>
+
+                                <flux:text class="block truncate text-xs text-zinc-500 dark:text-zinc-400">
+                                    {{ $feed->url }}
+                                </flux:text>
+                            </div>
+
+                            <div class="flex shrink-0 items-center gap-1">
+                                <flux:tooltip :content="__('Edit feed')">
+                                    <flux:button type="button" variant="ghost" size="sm" icon="pencil" wire:click="editFeed({{ $feed->id }})" />
+                                </flux:tooltip>
 
+                                <flux:tooltip :content="__('Remove feed')">
+                                    <flux:button type="button" variant="ghost" size="sm" icon="trash" wire:click="deleteFeed({{ $feed->id }})" wire:confirm="{{ __('Remove this calendar feed?') }}" />
+                                </flux:tooltip>
+                            </div>
+                        </div>
+                    </div>
+                @empty
+                    <div class="rounded-lg border border-dashed border-zinc-300 p-4 text-sm text-zinc-500 dark:border-zinc-700 dark:text-zinc-400">
+                        {{ __('No calendar feeds yet.') }}
+                    </div>
+                @endforelse
+            </div>
+        </div>
+    </aside>
 </div>
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.php"
index 008929e..ad1cbb6 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.php"
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.php"
@@ -1,8 +1,119 @@
 <?php
 
+use App\Enums\CalendarColor;
+use App\Models\CalendarFeed;
+use Flux\Flux;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+use Livewire\Attributes\Computed;
 use Livewire\Component;
 
 new class extends Component
 {
-    //
-};
\ No newline at end of file
+    public ?int $editingFeedId = null;
+
+    public string $feedName = '';
+
+    public string $feedUrl = '';
+
+    public string $feedColor = '#2563eb';
+
+    #[Computed]
+    public function feeds()
+    {
+        return Auth::user()
+            ->currentTeam
+            ->calendarFeeds()
+            ->orderBy('name')
+            ->get();
+    }
+
+    public function saveFeed(): void
+    {
+        $validated = $this->validate([
+            'feedName' => ['required', 'string', 'max:255'],
+            'feedUrl' => ['required', 'url', 'max:2048'],
+            'feedColor' => ['required', 'string', Rule::in($this->calendarColorValues())],
+        ]);
+
+        $attributes = [
+            'name' => $validated['feedName'],
+            'url' => $validated['feedUrl'],
+            'color' => $validated['feedColor'],
+        ];
+
+        if ($this->editingFeedId) {
+            $this->feedQuery()
+                ->whereKey($this->editingFeedId)
+                ->firstOrFail()
+                ->update($attributes);
+
+            Flux::toast(variant: 'success', text: __('Calendar feed updated.'));
+        } else {
+            $this->feedQuery()->create($attributes);
+
+            Flux::toast(variant: 'success', text: __('Calendar feed added.'));
+        }
+
+        unset($this->feeds);
+
+        $this->resetFeedForm();
+    }
+
+    public function editFeed(int $feedId): void
+    {
+        $feed = $this->feedQuery()
+            ->whereKey($feedId)
+            ->firstOrFail();
+
+        $this->editingFeedId = $feed->id;
+        $this->feedName = $feed->name;
+        $this->feedUrl = $feed->url;
+        $this->feedColor = $feed->color;
+
+        $this->resetValidation();
+    }
+
+    public function deleteFeed(int $feedId): void
+    {
+        $this->feedQuery()
+            ->whereKey($feedId)
+            ->firstOrFail()
+            ->delete();
+
+        if ($this->editingFeedId === $feedId) {
+            $this->resetFeedForm();
+        }
+
+        unset($this->feeds);
+
+        Flux::toast(variant: 'success', text: __('Calendar feed removed.'));
+    }
+
+    public function resetFeedForm(): void
+    {
+        $this->reset(['editingFeedId', 'feedName', 'feedUrl']);
+        $this->feedColor = CalendarColor::Blue->value;
+        $this->resetValidation();
+    }
+
+    /** @return array<int, CalendarColor> */
+    public function calendarColors(): array
+    {
+        return CalendarColor::cases();
+    }
+
+    private function feedQuery()
+    {
+        return Auth::user()->currentTeam->calendarFeeds();
+    }
+
+    /** @return array<int, string> */
+    private function calendarColorValues(): array
+    {
+        return array_map(
+            fn (CalendarColor $color): string => $color->value,
+            CalendarColor::cases(),
+        );
+    }
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.test.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
index 6665156..eaa3acb 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
@@ -1,8 +1,114 @@
 <?php
 
+use App\Enums\CalendarColor;
+use App\Models\CalendarFeed;
+use App\Models\Team;
+use App\Models\User;
 use Livewire\Livewire;
 
+use function Pest\Laravel\actingAs;
+
 it('renders successfully', function () {
-    Livewire::test('pages::kiosk.configure')
-        ->assertStatus(200);
+    $team = Team::factory()
+        ->has(CalendarFeed::factory()->state([
+            'name' => 'Family Calendar',
+            'url' => 'https://example.com/family.ics',
+            'color' => CalendarColor::Green,
+        ]))
+        ->create();
+    $user = User::factory()->memberOf($team)->create();
+
+    actingAs($user)
+        ->get(route('kiosk.configure'))
+        ->assertOk()
+        ->assertSee('Family Calendar');
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.configure')
+        ->assertStatus(200)
+        ->assertSee('Family Calendar');
+});
+
+it('can add a calendar feed', function () {
+    $team = Team::factory()->create();
+    $user = User::factory()->memberOf($team)->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.configure')
+        ->set('feedName', 'Brazilian Holidays')
+        ->set('feedUrl', 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=2026')
+        ->set('feedColor', CalendarColor::Green->value)
+        ->call('saveFeed')
+        ->assertHasNoErrors()
+        ->assertSet('feedName', '')
+        ->assertSet('feedUrl', '')
+        ->assertSet('feedColor', CalendarColor::Blue->value);
+
+    $this->assertDatabaseHas('calendar_feeds', [
+        'team_id' => $team->id,
+        'name' => 'Brazilian Holidays',
+        'url' => 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=2026',
+        'color' => CalendarColor::Green->value,
+    ]);
+});
+
+it('can edit a team calendar feed', function () {
+    $team = Team::factory()
+        ->has(CalendarFeed::factory()->state([
+            'name' => 'US Holidays',
+            'url' => 'https://example.com/us.ics',
+            'color' => CalendarColor::Red,
+        ]))
+        ->create();
+    $user = User::factory()->memberOf($team)->create();
+    $feed = $team->calendarFeeds()->firstOrFail();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.configure')
+        ->call('editFeed', $feed->id)
+        ->assertSet('editingFeedId', $feed->id)
+        ->assertSet('feedName', 'US Holidays')
+        ->set('feedName', 'American Holidays')
+        ->set('feedUrl', 'https://example.com/american.ics')
+        ->set('feedColor', CalendarColor::Indigo->value)
+        ->call('saveFeed')
+        ->assertHasNoErrors()
+        ->assertSet('editingFeedId', null);
+
+    $this->assertDatabaseHas('calendar_feeds', [
+        'id' => $feed->id,
+        'team_id' => $team->id,
+        'name' => 'American Holidays',
+        'url' => 'https://example.com/american.ics',
+        'color' => CalendarColor::Indigo->value,
+    ]);
+});
+
+it('can remove a team calendar feed', function () {
+    $team = Team::factory()
+        ->has(CalendarFeed::factory())
+        ->create();
+    $user = User::factory()->memberOf($team)->create();
+    $feed = $team->calendarFeeds()->firstOrFail();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.configure')
+        ->call('deleteFeed', $feed->id)
+        ->assertHasNoErrors();
+
+    $this->assertDatabaseMissing('calendar_feeds', [
+        'id' => $feed->id,
+    ]);
+});
+
+it('validates calendar feed input', function () {
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.configure')
+        ->set('feedName', '')
+        ->set('feedUrl', 'not-a-url')
+        ->set('feedColor', '#ffffff')
+        ->call('saveFeed')
+        ->assertHasErrors(['feedName', 'feedUrl', 'feedColor']);
 });

From d048fb00e0ab4643da2fd6f3671ed3b0e7d6f41a Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 20:39:31 -0500
Subject: [PATCH 32/57] Add actions and form

---
 app/Actions/Kiosk/CreateFeed.php              | 17 ++++++
 app/Actions/Kiosk/UpdateFeed.php              | 18 ++++++
 app/Livewire/Forms/Kiosk/CalendarFeedForm.php | 59 +++++++++++++++++++
 3 files changed, 94 insertions(+)
 create mode 100644 app/Actions/Kiosk/CreateFeed.php
 create mode 100644 app/Actions/Kiosk/UpdateFeed.php
 create mode 100644 app/Livewire/Forms/Kiosk/CalendarFeedForm.php

diff --git a/app/Actions/Kiosk/CreateFeed.php b/app/Actions/Kiosk/CreateFeed.php
new file mode 100644
index 0000000..58cc9c5
--- /dev/null
+++ b/app/Actions/Kiosk/CreateFeed.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Kiosk;
+
+use App\Models\CalendarFeed;
+use App\Models\Team;
+
+class CreateFeed
+{
+    /** @param  array<string, mixed>  $data */
+    public function handle(Team $team, array $data): CalendarFeed
+    {
+        return $team->calendarFeeds()->create($data);
+    }
+}
diff --git a/app/Actions/Kiosk/UpdateFeed.php b/app/Actions/Kiosk/UpdateFeed.php
new file mode 100644
index 0000000..4e201f2
--- /dev/null
+++ b/app/Actions/Kiosk/UpdateFeed.php
@@ -0,0 +1,18 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Actions\Kiosk;
+
+use App\Models\CalendarFeed;
+
+class UpdateFeed
+{
+    /** @param  array<string, mixed>  $data */
+    public function handle(CalendarFeed $feed, array $data): CalendarFeed
+    {
+        $feed->update($data);
+
+        return $feed;
+    }
+}
diff --git a/app/Livewire/Forms/Kiosk/CalendarFeedForm.php b/app/Livewire/Forms/Kiosk/CalendarFeedForm.php
new file mode 100644
index 0000000..c78576c
--- /dev/null
+++ b/app/Livewire/Forms/Kiosk/CalendarFeedForm.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Livewire\Forms\Kiosk;
+
+use App\Actions\Kiosk\CreateFeed;
+use App\Actions\Kiosk\UpdateFeed;
+use App\Enums\CalendarColor;
+use App\Models\CalendarFeed;
+use App\Models\Item;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+use Livewire\Form;
+
+/** @package App\Livewire\Forms\Kiosk */
+class CalendarFeedForm extends Form
+{
+    public ?Item $editingFeed = null;
+
+    public string $name = '';
+
+    public string $url = '';
+
+    public string $color = CalendarColor::Blue->value;
+
+    public function load(CalendarFeed $feed): void
+    {
+        $this->fill([
+            'editingFeed' => $feed,
+            'name' => $feed->name,
+            'url' => $feed->url,
+            'color' => $feed->color->value,
+        ]);
+    }
+
+    public function save(): void
+    {
+        $data = $this->validate();
+
+        if ($this->editingItem) {
+            (new UpdateFeed)->handle($this->editingFeed, $data);
+        } else {
+            (new CreateFeed)->handle(Auth::user()->currentTeam, $data);
+        }
+
+        $this->reset();
+    }
+
+    /** @return array<string, mixed> */
+    protected function rules(): array
+    {
+        return [
+            'name' => ['required', 'string', 'max:255'],
+            'url' => ['required', 'string', 'url'],
+            'color' => ['required', Rule::enum(CalendarColor::class)],
+        ];
+    }
+}

From 4ed6ca9afce632a00c4e12f19815f791dc9bbfea Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 21:24:16 -0500
Subject: [PATCH 33/57] Clean up configure form

---
 app/Livewire/Forms/Kiosk/CalendarFeedForm.php |   6 +-
 app/Models/CalendarFeed.php                   |   9 ++
 app/Policies/CalendarFeedPolicy.php           |  36 ++++++
 .../pages/kiosk/modals/feed-form.blade.php    |  29 +++++
 .../configure.blade.php"                      |  58 ++++------
 .../\342\232\241configure/configure.php"      | 105 ++++--------------
 .../\342\232\241configure/configure.test.php" |  60 +++++-----
 7 files changed, 147 insertions(+), 156 deletions(-)
 create mode 100644 app/Policies/CalendarFeedPolicy.php
 create mode 100644 resources/views/pages/kiosk/modals/feed-form.blade.php

diff --git a/app/Livewire/Forms/Kiosk/CalendarFeedForm.php b/app/Livewire/Forms/Kiosk/CalendarFeedForm.php
index c78576c..9d0104a 100644
--- a/app/Livewire/Forms/Kiosk/CalendarFeedForm.php
+++ b/app/Livewire/Forms/Kiosk/CalendarFeedForm.php
@@ -8,15 +8,13 @@
 use App\Actions\Kiosk\UpdateFeed;
 use App\Enums\CalendarColor;
 use App\Models\CalendarFeed;
-use App\Models\Item;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\Rule;
 use Livewire\Form;
 
-/** @package App\Livewire\Forms\Kiosk */
 class CalendarFeedForm extends Form
 {
-    public ?Item $editingFeed = null;
+    public ?CalendarFeed $editingFeed = null;
 
     public string $name = '';
 
@@ -38,7 +36,7 @@ public function save(): void
     {
         $data = $this->validate();
 
-        if ($this->editingItem) {
+        if ($this->editingFeed) {
             (new UpdateFeed)->handle($this->editingFeed, $data);
         } else {
             (new CreateFeed)->handle(Auth::user()->currentTeam, $data);
diff --git a/app/Models/CalendarFeed.php b/app/Models/CalendarFeed.php
index a1100ae..0535bd0 100644
--- a/app/Models/CalendarFeed.php
+++ b/app/Models/CalendarFeed.php
@@ -4,6 +4,7 @@
 
 namespace App\Models;
 
+use App\Enums\CalendarColor;
 use Database\Factories\CalendarFeedFactory;
 use Illuminate\Database\Eloquent\Attributes\Fillable;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
@@ -21,4 +22,12 @@ public function team(): BelongsTo
     {
         return $this->belongsTo(Team::class);
     }
+
+    /** @return array<string, string> */
+    protected function casts(): array
+    {
+        return [
+            'color' => CalendarColor::class,
+        ];
+    }
 }
diff --git a/app/Policies/CalendarFeedPolicy.php b/app/Policies/CalendarFeedPolicy.php
new file mode 100644
index 0000000..a4e6391
--- /dev/null
+++ b/app/Policies/CalendarFeedPolicy.php
@@ -0,0 +1,36 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Policies;
+
+use App\Models\CalendarFeed;
+use App\Models\User;
+
+class CalendarFeedPolicy
+{
+    public function viewAny(User $user): bool
+    {
+        return true;
+    }
+
+    public function view(User $user, CalendarFeed $feed): bool
+    {
+        return $feed->team_id === $user->current_team_id;
+    }
+
+    public function create(User $user): bool
+    {
+        return true;
+    }
+
+    public function update(User $user, CalendarFeed $feed): bool
+    {
+        return $feed->team_id === $user->current_team_id;
+    }
+
+    public function delete(User $user, CalendarFeed $feed): bool
+    {
+        return $feed->team_id === $user->current_team_id;
+    }
+}
diff --git a/resources/views/pages/kiosk/modals/feed-form.blade.php b/resources/views/pages/kiosk/modals/feed-form.blade.php
new file mode 100644
index 0000000..cfea931
--- /dev/null
+++ b/resources/views/pages/kiosk/modals/feed-form.blade.php
@@ -0,0 +1,29 @@
+@teleport('body')
+<flux:modal name="feed-form" flyout variant="floating" class="md:w-96">
+    <form wire:submit="save" class="space-y-6">
+        <flux:heading size="lg">{{ $form->editingFeed ? __('Edit Feed') : __('Add Feed') }}</flux:heading>
+
+        <flux:input wire:model="form.name" :label="__('Name')" type="text" required />
+
+        <flux:input wire:model="form.url" :label="__('URL')" type="text" required />
+
+        <flux:select wire:model="form.color" :label="__('Color')" placeholder="Select type" variant="listbox" searchable>
+            @foreach (\App\Enums\CalendarColor::cases() as $color)
+                <flux:select.option :value="$color->value">
+                    <div class="flex items-center gap-2">
+                        <div class="size-4 rounded-full border border-zinc-200 dark:border-zinc-700" style="background: {{ $color->value }}"></div> {{ ucfirst($color->name) }}
+                    </div>
+                </flux:select.option>
+            @endforeach
+        </flux:select>
+
+        <div class="flex">
+            <flux:spacer />
+            <flux:modal.close>
+                <flux:button variant="ghost" class="mr-2">{{ __('Cancel') }}</flux:button>
+            </flux:modal.close>
+            <flux:button type="submit" variant="primary">{{ $form->editingFeed ? __('Update') : __('Create') }}</flux:button>
+        </div>
+    </form>
+</flux:modal>
+@endteleport
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
index 4615582..eb13c60 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
@@ -1,43 +1,21 @@
-<div class="grid min-h-dvh gap-6 p-6 xl:grid-cols-[minmax(0,1fr)_24rem]">
-    <div class="min-h-[34rem] overflow-hidden rounded-lg border border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
-        <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="h-full w-full"></iframe>
+<div class="space-y-6 p-6">
+    <div>
+        <flux:heading size="xl" level="1">{{ __('Kiosk Configuration') }}</flux:heading>
+        <flux:subheading size="lg">{{ __('Preview your kiosk and manage its data sources.') }}</flux:subheading>
     </div>
 
-    <aside class="space-y-6">
-        <form wire:submit="saveFeed" class="space-y-4 rounded-lg border border-zinc-200 bg-white p-4 dark:border-zinc-700 dark:bg-zinc-900">
-            <div class="flex items-center justify-between gap-3">
-                <flux:heading size="lg">
-                    {{ $editingFeedId ? __('Edit feed') : __('Add feed') }}
-                </flux:heading>
-
-                @if ($editingFeedId)
-                    <flux:button type="button" variant="ghost" size="sm" wire:click="resetFeedForm">
-                        {{ __('Cancel') }}
-                    </flux:button>
-                @endif
-            </div>
-
-            <flux:input wire:model="feedName" :label="__('Name')" required />
-
-            <flux:input wire:model="feedUrl" :label="__('Calendar URL')" type="url" required />
-
-            <flux:select wire:model="feedColor" :label="__('Color')" variant="listbox">
-                @foreach (App\Enums\CalendarColor::cases() as $color)
-                    <flux:select.option :value="$color->value">{{ $color->name }}</flux:select.option>
-                @endforeach
-            </flux:select>
-
-            <div class="flex items-center gap-3">
-                <span class="size-4 rounded-full ring-1 ring-black/10" style="background: {{ $feedColor }}"></span>
+    <div class="grid min-h-dvh gap-6 xl:grid-cols-[minmax(0,1fr)_24rem]">
+        <div class="min-h-[34rem] overflow-hidden rounded-lg border border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
+            <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="h-full w-full"></iframe>
+        </div>
 
-                <flux:button type="submit" variant="primary">
-                    {{ $editingFeedId ? __('Update feed') : __('Add feed') }}
-                </flux:button>
+        <div class="space-y-4 rounded-xl bg-white p-6 ring-1 ring-zinc-950/5 dark:bg-zinc-900 dark:ring-white/10">
+            <div class="flex items-center justify-between">
+                <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
+                <flux:modal.trigger name="feed-form">
+                    <flux:button variant="primary" size="sm">{{ __('Add Calendar Feed') }}</flux:button>
+                </flux:modal.trigger>
             </div>
-        </form>
-
-        <div class="space-y-3">
-            <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
 
             <div class="space-y-2">
                 @forelse ($this->feeds as $feed)
@@ -56,11 +34,11 @@
 
                             <div class="flex shrink-0 items-center gap-1">
                                 <flux:tooltip :content="__('Edit feed')">
-                                    <flux:button type="button" variant="ghost" size="sm" icon="pencil" wire:click="editFeed({{ $feed->id }})" />
+                                    <flux:button type="button" variant="ghost" size="sm" icon="pencil" wire:click="edit({{ $feed->id }})" />
                                 </flux:tooltip>
 
                                 <flux:tooltip :content="__('Remove feed')">
-                                    <flux:button type="button" variant="ghost" size="sm" icon="trash" wire:click="deleteFeed({{ $feed->id }})" wire:confirm="{{ __('Remove this calendar feed?') }}" />
+                                    <flux:button type="button" variant="ghost" size="sm" icon="trash" wire:click="delete({{ $feed->id }})" wire:confirm="{{ __('Remove this calendar feed?') }}" />
                                 </flux:tooltip>
                             </div>
                         </div>
@@ -72,5 +50,7 @@
                 @endforelse
             </div>
         </div>
-    </aside>
+
+        @include('pages.kiosk.modals.feed-form')
+    </div>
 </div>
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.php"
index ad1cbb6..7c6f412 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.php"
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.php"
@@ -1,119 +1,54 @@
 <?php
 
-use App\Enums\CalendarColor;
+use App\Livewire\Forms\Kiosk\CalendarFeedForm;
 use App\Models\CalendarFeed;
 use Flux\Flux;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Validation\Rule;
 use Livewire\Attributes\Computed;
 use Livewire\Component;
 
 new class extends Component
 {
-    public ?int $editingFeedId = null;
-
-    public string $feedName = '';
-
-    public string $feedUrl = '';
-
-    public string $feedColor = '#2563eb';
+    public CalendarFeedForm $form;
 
     #[Computed]
     public function feeds()
     {
-        return Auth::user()
-            ->currentTeam
-            ->calendarFeeds()
-            ->orderBy('name')
-            ->get();
+        return Auth::user()->currentTeam->calendarFeeds()->orderBy('name')->get();
     }
 
-    public function saveFeed(): void
+    public function delete(int $id): void
     {
-        $validated = $this->validate([
-            'feedName' => ['required', 'string', 'max:255'],
-            'feedUrl' => ['required', 'url', 'max:2048'],
-            'feedColor' => ['required', 'string', Rule::in($this->calendarColorValues())],
-        ]);
-
-        $attributes = [
-            'name' => $validated['feedName'],
-            'url' => $validated['feedUrl'],
-            'color' => $validated['feedColor'],
-        ];
+        $feed = $this->feeds->firstWhere('id', $id);
 
-        if ($this->editingFeedId) {
-            $this->feedQuery()
-                ->whereKey($this->editingFeedId)
-                ->firstOrFail()
-                ->update($attributes);
+        $this->authorize('delete', $feed);
 
-            Flux::toast(variant: 'success', text: __('Calendar feed updated.'));
-        } else {
-            $this->feedQuery()->create($attributes);
-
-            Flux::toast(variant: 'success', text: __('Calendar feed added.'));
-        }
+        $feed->delete();
 
         unset($this->feeds);
-
-        $this->resetFeedForm();
+        Flux::toast(variant: 'success', text: __('Calendar feed removed.'));
     }
 
-    public function editFeed(int $feedId): void
+    public function edit(int $id): void
     {
-        $feed = $this->feedQuery()
-            ->whereKey($feedId)
-            ->firstOrFail();
+        $feed = $this->feeds->firstWhere('id', $id);
 
-        $this->editingFeedId = $feed->id;
-        $this->feedName = $feed->name;
-        $this->feedUrl = $feed->url;
-        $this->feedColor = $feed->color;
+        $this->authorize('update', $feed);
 
-        $this->resetValidation();
+        $this->form->load($feed);
+        $this->modal('feed-form')->show();
     }
 
-    public function deleteFeed(int $feedId): void
+    public function save(): void
     {
-        $this->feedQuery()
-            ->whereKey($feedId)
-            ->firstOrFail()
-            ->delete();
-
-        if ($this->editingFeedId === $feedId) {
-            $this->resetFeedForm();
+        if ($this->form->editingFeed) {
+            $this->authorize('update', $this->form->editingFeed);
+        } else {
+            $this->authorize('create', CalendarFeed::class);
         }
 
+        $this->form->save();
+        $this->modal('feed-form')->close();
         unset($this->feeds);
-
-        Flux::toast(variant: 'success', text: __('Calendar feed removed.'));
-    }
-
-    public function resetFeedForm(): void
-    {
-        $this->reset(['editingFeedId', 'feedName', 'feedUrl']);
-        $this->feedColor = CalendarColor::Blue->value;
-        $this->resetValidation();
-    }
-
-    /** @return array<int, CalendarColor> */
-    public function calendarColors(): array
-    {
-        return CalendarColor::cases();
-    }
-
-    private function feedQuery()
-    {
-        return Auth::user()->currentTeam->calendarFeeds();
-    }
-
-    /** @return array<int, string> */
-    private function calendarColorValues(): array
-    {
-        return array_map(
-            fn (CalendarColor $color): string => $color->value,
-            CalendarColor::cases(),
-        );
     }
 };
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.test.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
index eaa3acb..b0d995c 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
@@ -8,7 +8,7 @@
 
 use function Pest\Laravel\actingAs;
 
-it('renders successfully', function () {
+test('renders successfully', function () {
     $team = Team::factory()
         ->has(CalendarFeed::factory()->state([
             'name' => 'Family Calendar',
@@ -29,20 +29,20 @@
         ->assertSee('Family Calendar');
 });
 
-it('can add a calendar feed', function () {
+test('can add a calendar feed', function () {
     $team = Team::factory()->create();
     $user = User::factory()->memberOf($team)->create();
 
     Livewire::actingAs($user)
         ->test('pages::kiosk.configure')
-        ->set('feedName', 'Brazilian Holidays')
-        ->set('feedUrl', 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=2026')
-        ->set('feedColor', CalendarColor::Green->value)
-        ->call('saveFeed')
+        ->set('form.name', 'Brazilian Holidays')
+        ->set('form.url', 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=2026')
+        ->set('form.color', CalendarColor::Green->value)
+        ->call('save')
         ->assertHasNoErrors()
-        ->assertSet('feedName', '')
-        ->assertSet('feedUrl', '')
-        ->assertSet('feedColor', CalendarColor::Blue->value);
+        ->assertSet('form.name', '')
+        ->assertSet('form.url', '')
+        ->assertSet('form.color', CalendarColor::Blue->value);
 
     $this->assertDatabaseHas('calendar_feeds', [
         'team_id' => $team->id,
@@ -52,7 +52,7 @@
     ]);
 });
 
-it('can edit a team calendar feed', function () {
+test('can edit a team calendar feed', function () {
     $team = Team::factory()
         ->has(CalendarFeed::factory()->state([
             'name' => 'US Holidays',
@@ -65,15 +65,14 @@
 
     Livewire::actingAs($user)
         ->test('pages::kiosk.configure')
-        ->call('editFeed', $feed->id)
-        ->assertSet('editingFeedId', $feed->id)
-        ->assertSet('feedName', 'US Holidays')
-        ->set('feedName', 'American Holidays')
-        ->set('feedUrl', 'https://example.com/american.ics')
-        ->set('feedColor', CalendarColor::Indigo->value)
-        ->call('saveFeed')
+        ->call('edit', $feed->id)
+        ->assertSet('form.name', 'US Holidays')
+        ->set('form.name', 'American Holidays')
+        ->set('form.url', 'https://example.com/american.ics')
+        ->set('form.color', CalendarColor::Indigo->value)
+        ->call('save')
         ->assertHasNoErrors()
-        ->assertSet('editingFeedId', null);
+        ->assertSet('editingFeed', null);
 
     $this->assertDatabaseHas('calendar_feeds', [
         'id' => $feed->id,
@@ -84,31 +83,36 @@
     ]);
 });
 
-it('can remove a team calendar feed', function () {
+test('can remove a team calendar feed', function () {
     $team = Team::factory()
-        ->has(CalendarFeed::factory())
+        ->has(CalendarFeed::factory()->state([
+            'name' => 'US Holidays',
+            'url' => 'https://example.com/us.ics',
+            'color' => CalendarColor::Red,
+        ]))
         ->create();
     $user = User::factory()->memberOf($team)->create();
     $feed = $team->calendarFeeds()->firstOrFail();
 
     Livewire::actingAs($user)
         ->test('pages::kiosk.configure')
-        ->call('deleteFeed', $feed->id)
-        ->assertHasNoErrors();
+        ->call('delete', $feed->id)
+        ->assertHasNoErrors()
+        ->assertDontSee('US Holidays');
 
     $this->assertDatabaseMissing('calendar_feeds', [
         'id' => $feed->id,
     ]);
 });
 
-it('validates calendar feed input', function () {
+test('validates calendar feed input', function () {
     $user = User::factory()->create();
 
     Livewire::actingAs($user)
         ->test('pages::kiosk.configure')
-        ->set('feedName', '')
-        ->set('feedUrl', 'not-a-url')
-        ->set('feedColor', '#ffffff')
-        ->call('saveFeed')
-        ->assertHasErrors(['feedName', 'feedUrl', 'feedColor']);
+        ->set('form.name', '')
+        ->set('form.url', 'not-a-url')
+        ->set('form.color', '#ffffff')
+        ->call('save')
+        ->assertHasErrors(['form.name', 'form.url', 'form.color']);
 });

From d210de38ba4f2a81526aa53f9584ed9d9951f75d Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 21:30:59 -0500
Subject: [PATCH 34/57] Add tabs

---
 .../configure.blade.php"                      | 101 ++++++++++--------
 1 file changed, 59 insertions(+), 42 deletions(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
index eb13c60..fc191a3 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
@@ -1,56 +1,73 @@
-<div class="space-y-6 p-6">
+<div class="space-y-6">
     <div>
         <flux:heading size="xl" level="1">{{ __('Kiosk Configuration') }}</flux:heading>
         <flux:subheading size="lg">{{ __('Preview your kiosk and manage its data sources.') }}</flux:subheading>
     </div>
 
-    <div class="grid min-h-dvh gap-6 xl:grid-cols-[minmax(0,1fr)_24rem]">
-        <div class="min-h-[34rem] overflow-hidden rounded-lg border border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
-            <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="h-full w-full"></iframe>
-        </div>
-
-        <div class="space-y-4 rounded-xl bg-white p-6 ring-1 ring-zinc-950/5 dark:bg-zinc-900 dark:ring-white/10">
-            <div class="flex items-center justify-between">
-                <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
-                <flux:modal.trigger name="feed-form">
-                    <flux:button variant="primary" size="sm">{{ __('Add Calendar Feed') }}</flux:button>
-                </flux:modal.trigger>
-            </div>
+    <div class="w-[1020px] h-[600px] overflow-hidden rounded-lg border border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
+        <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="h-full w-full"></iframe>
+    </div>
 
-            <div class="space-y-2">
-                @forelse ($this->feeds as $feed)
-                    <div wire:key="calendar-feed-{{ $feed->id }}" class="rounded-lg border border-zinc-200 bg-white p-3 dark:border-zinc-700 dark:bg-zinc-900">
-                        <div class="flex items-start justify-between gap-3">
-                            <div class="min-w-0 space-y-1">
-                                <div class="flex items-center gap-2">
-                                    <span class="size-2.5 shrink-0 rounded-full" style="background: {{ $feed->color }}"></span>
-                                    <span class="truncate font-medium">{{ $feed->name }}</span>
-                                </div>
+    <flux:tab.group>
+        <flux:tabs class="px-4">
+            <flux:tab name="calendar">Calendar</flux:tab>
+            <flux:tab name="routines">Routines</flux:tab>
+            <flux:tab name="chores">Chores</flux:tab>
+            <flux:tab name="lists">Lists</flux:tab>
+            <flux:tab name="meals">Meals</flux:tab>
+            <flux:tab name="settings">Settings</flux:tab>
+        </flux:tabs>
 
-                                <flux:text class="block truncate text-xs text-zinc-500 dark:text-zinc-400">
-                                    {{ $feed->url }}
-                                </flux:text>
-                            </div>
+        <flux:tab.panel name="calendar">
+            <div class="space-y-4 rounded-xl bg-white p-6 ring-1 ring-zinc-950/5 dark:bg-zinc-900 dark:ring-white/10">
+                <div class="flex items-center justify-between">
+                    <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
+                    <flux:modal.trigger name="feed-form">
+                        <flux:button variant="primary" size="sm">{{ __('Add Calendar Feed') }}</flux:button>
+                    </flux:modal.trigger>
+                </div>
+
+                <div class="space-y-2">
+                    @forelse ($this->feeds as $feed)
+                        <div wire:key="calendar-feed-{{ $feed->id }}" class="rounded-lg border border-zinc-200 bg-white p-3 dark:border-zinc-700 dark:bg-zinc-900">
+                            <div class="flex items-start justify-between gap-3">
+                                <div class="min-w-0 space-y-1">
+                                    <div class="flex items-center gap-2">
+                                        <span class="size-2.5 shrink-0 rounded-full" style="background: {{ $feed->color }}"></span>
+                                        <span class="truncate font-medium">{{ $feed->name }}</span>
+                                    </div>
 
-                            <div class="flex shrink-0 items-center gap-1">
-                                <flux:tooltip :content="__('Edit feed')">
-                                    <flux:button type="button" variant="ghost" size="sm" icon="pencil" wire:click="edit({{ $feed->id }})" />
-                                </flux:tooltip>
+                                    <flux:text class="block truncate text-xs text-zinc-500 dark:text-zinc-400">
+                                        {{ $feed->url }}
+                                    </flux:text>
+                                </div>
 
-                                <flux:tooltip :content="__('Remove feed')">
-                                    <flux:button type="button" variant="ghost" size="sm" icon="trash" wire:click="delete({{ $feed->id }})" wire:confirm="{{ __('Remove this calendar feed?') }}" />
-                                </flux:tooltip>
+                                <div class="flex shrink-0 items-center gap-1">
+                                    <flux:tooltip :content="__('Edit feed')">
+                                        <flux:button type="button" variant="ghost" size="sm" icon="pencil" wire:click="edit({{ $feed->id }})" />
+                                    </flux:tooltip>
+
+                                    <flux:tooltip :content="__('Remove feed')">
+                                        <flux:button type="button" variant="ghost" size="sm" icon="trash" wire:click="delete({{ $feed->id }})" wire:confirm="{{ __('Remove this calendar feed?') }}" />
+                                    </flux:tooltip>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                @empty
-                    <div class="rounded-lg border border-dashed border-zinc-300 p-4 text-sm text-zinc-500 dark:border-zinc-700 dark:text-zinc-400">
-                        {{ __('No calendar feeds yet.') }}
-                    </div>
-                @endforelse
+                    @empty
+                        <div class="rounded-lg border border-dashed border-zinc-300 p-4 text-sm text-zinc-500 dark:border-zinc-700 dark:text-zinc-400">
+                            {{ __('No calendar feeds yet.') }}
+                        </div>
+                    @endforelse
+                </div>
             </div>
-        </div>
+        </flux:tab.panel>
+        <flux:tab.panel name="routines">...</flux:tab.panel>
+        <flux:tab.panel name="chores">...</flux:tab.panel>
+        <flux:tab.panel name="lists">...</flux:tab.panel>
+        <flux:tab.panel name="meals">...</flux:tab.panel>
+        <flux:tab.panel name="settings">...</flux:tab.panel>
+    </flux:tab.group>
 
-        @include('pages.kiosk.modals.feed-form')
-    </div>
+
+    @include('pages.kiosk.modals.feed-form')
 </div>

From 00bbb13301364502f54678a35a5c8f85865a0e58 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Sun, 24 May 2026 21:35:39 -0500
Subject: [PATCH 35/57] Add flux components

---
 .../\342\232\241configure/configure.blade.php"   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
index fc191a3..08f4495 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
@@ -19,7 +19,7 @@
         </flux:tabs>
 
         <flux:tab.panel name="calendar">
-            <div class="space-y-4 rounded-xl bg-white p-6 ring-1 ring-zinc-950/5 dark:bg-zinc-900 dark:ring-white/10">
+            <flux:card class="space-y-4">
                 <div class="flex items-center justify-between">
                     <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
                     <flux:modal.trigger name="feed-form">
@@ -29,17 +29,15 @@
 
                 <div class="space-y-2">
                     @forelse ($this->feeds as $feed)
-                        <div wire:key="calendar-feed-{{ $feed->id }}" class="rounded-lg border border-zinc-200 bg-white p-3 dark:border-zinc-700 dark:bg-zinc-900">
+                        <flux:card size="sm" wire:key="calendar-feed-{{ $feed->id }}">
                             <div class="flex items-start justify-between gap-3">
                                 <div class="min-w-0 space-y-1">
-                                    <div class="flex items-center gap-2">
+                                    <flux:heading class="flex items-center gap-2">
                                         <span class="size-2.5 shrink-0 rounded-full" style="background: {{ $feed->color }}"></span>
                                         <span class="truncate font-medium">{{ $feed->name }}</span>
-                                    </div>
+                                    </flux:heading>
 
-                                    <flux:text class="block truncate text-xs text-zinc-500 dark:text-zinc-400">
-                                        {{ $feed->url }}
-                                    </flux:text>
+                                    <flux:text variant="subtle">{{ $feed->url }}</flux:text>
                                 </div>
 
                                 <div class="flex shrink-0 items-center gap-1">
@@ -52,14 +50,14 @@
                                     </flux:tooltip>
                                 </div>
                             </div>
-                        </div>
+                        </flux:card>
                     @empty
                         <div class="rounded-lg border border-dashed border-zinc-300 p-4 text-sm text-zinc-500 dark:border-zinc-700 dark:text-zinc-400">
                             {{ __('No calendar feeds yet.') }}
                         </div>
                     @endforelse
                 </div>
-            </div>
+            </flux:card>
         </flux:tab.panel>
         <flux:tab.panel name="routines">...</flux:tab.panel>
         <flux:tab.panel name="chores">...</flux:tab.panel>

From fbc75de9d95c5169a9ec075376e69b1452108121 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 26 May 2026 09:28:12 -0500
Subject: [PATCH 36/57] =?UTF-8?q?Just=20Keep=20Swimming=20=F0=9F=90=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Livewire/Forms/Kiosk/SettingsForm.php     | 16 ++++-
 app/Models/Team.php                           |  3 +-
 config/services.php                           |  4 ++
 ..._14_211119_add_timezone_to_teams_table.php |  1 +
 resources/views/layouts/app.blade.php         |  2 +-
 .../views/layouts/kiosk-configure.blade.php   | 25 +++++++
 resources/views/layouts/kiosk.blade.php       |  1 -
 .../views/layouts/partials/head.blade.php     |  1 +
 .../\342\232\241calendar/calendar.blade.php"  | 41 +++++++++++
 .../\342\232\241calendar/calendar.php"        |  3 +-
 .../\342\232\241calendar/calendar.test.php"   | 12 ++--
 .../configure/\342\232\241preview.blade.php"  | 43 +++++++++++
 .../\342\232\241settings/settings.blade.php"  | 48 +++++++++++++
 .../\342\232\241settings/settings.php"        |  2 +-
 .../\342\232\241settings/settings.test.php"   |  0
 .../configure.blade.php"                      | 71 -------------------
 .../\342\232\241settings/settings.blade.php"  | 19 -----
 routes/web.php                                |  5 +-
 18 files changed, 193 insertions(+), 104 deletions(-)
 create mode 100644 resources/views/layouts/kiosk-configure.blade.php
 create mode 100644 "resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
 rename "resources/views/pages/kiosk/\342\232\241configure/configure.php" => "resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.php" (92%)
 rename "resources/views/pages/kiosk/\342\232\241configure/configure.test.php" => "resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php" (92%)
 create mode 100644 "resources/views/pages/kiosk/configure/\342\232\241preview.blade.php"
 create mode 100644 "resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
 rename "resources/views/pages/kiosk/\342\232\241settings/settings.php" => "resources/views/pages/kiosk/configure/\342\232\241settings/settings.php" (83%)
 rename "resources/views/pages/kiosk/\342\232\241settings/settings.test.php" => "resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php" (100%)
 delete mode 100644 "resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
 delete mode 100644 "resources/views/pages/kiosk/\342\232\241settings/settings.blade.php"

diff --git a/app/Livewire/Forms/Kiosk/SettingsForm.php b/app/Livewire/Forms/Kiosk/SettingsForm.php
index d1aa026..db38ea3 100644
--- a/app/Livewire/Forms/Kiosk/SettingsForm.php
+++ b/app/Livewire/Forms/Kiosk/SettingsForm.php
@@ -19,17 +19,31 @@ class SettingsForm extends Form
     #[Validate('required|int|between:0,6')]
     public int $week_start = Carbon::SUNDAY;
 
+    #[Validate([
+        'address' => 'required|array',
+        'address.*' => 'required',
+    ])]
+    public array $address = [
+        'address' => '',
+        'city' => '',
+        'state' => '',
+        'zip' => '',
+        'lat' => '',
+        'long' => '',
+    ];
+
     public function load(Team $team)
     {
         $this->editingTeam = $team;
         $this->timezone = $team->timezone;
         $this->week_start = $team->week_start;
+        $this->address = $team->address;
     }
 
     public function save()
     {
         $data = $this->validate();
 
-        $this->editingTeam->query()->update($data);
+        $this->editingTeam->update($data);
     }
 }
diff --git a/app/Models/Team.php b/app/Models/Team.php
index 57194e2..fd12c28 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -15,7 +15,7 @@
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-#[Fillable(['name', 'slug', 'is_personal'])]
+#[Fillable(['name', 'slug', 'is_personal', 'address'])]
 class Team extends Model
 {
     /** @use HasFactory<TeamFactory> */
@@ -106,6 +106,7 @@ protected function casts(): array
     {
         return [
             'is_personal' => 'boolean',
+            'address' => 'array',
         ];
     }
 }
diff --git a/config/services.php b/config/services.php
index 6a90eb8..c30a252 100644
--- a/config/services.php
+++ b/config/services.php
@@ -14,6 +14,10 @@
     |
     */
 
+    'mapbox' => [
+        'key' => env('MAPBOX_API_KEY'),
+    ],
+
     'postmark' => [
         'key' => env('POSTMARK_API_KEY'),
     ],
diff --git a/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php b/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
index ad39cf5..9290e3a 100644
--- a/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
+++ b/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
@@ -12,6 +12,7 @@ public function up(): void
         Schema::table('teams', function (Blueprint $table) {
             $table->string('timezone')->default('America/Chicago')->after('is_personal');
             $table->integer('week_start')->default(Carbon::SUNDAY)->after('timezone');
+            $table->json('address')->nullable()->after('week_start');
         });
     }
 
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
index f15b584..40e676c 100644
--- a/resources/views/layouts/app.blade.php
+++ b/resources/views/layouts/app.blade.php
@@ -29,7 +29,7 @@
                     {{ __('Recipes') }}
                 </flux:sidebar.item>
 
-                <flux:sidebar.item icon="tv" :href="route('kiosk.configure')" :current="request()->routeIs('kiosk.*')" wire:navigate>
+                <flux:sidebar.item icon="tv" :href="route('kiosk.configure.calendar')" :current="request()->routeIs('kiosk.*')" wire:navigate>
                     {{ __('Kiosk') }}
                 </flux:sidebar.item>
             </flux:sidebar.nav>
diff --git a/resources/views/layouts/kiosk-configure.blade.php b/resources/views/layouts/kiosk-configure.blade.php
new file mode 100644
index 0000000..c960abc
--- /dev/null
+++ b/resources/views/layouts/kiosk-configure.blade.php
@@ -0,0 +1,25 @@
+<x-layouts::app>
+    <div class="relative mb-6 w-full">
+        <flux:heading size="xl" level="1">{{ __('Kiosk Configuration') }}</flux:heading>
+        <flux:subheading size="lg" class="mb-6">{{ __('Preview your kiosk and manage its data sources') }}</flux:subheading>
+        <flux:separator variant="subtle" />
+    </div>
+
+    <div class="flex items-start max-md:flex-col">
+        <div class="me-10 w-full pb-4 md:w-[120px]">
+            <flux:navlist aria-label="{{ __('Configuration') }}">
+                <flux:navlist.item :href="route('kiosk.configure.preview')" wire:navigate>{{ __('Preview') }}</flux:navlist.item>
+                <flux:navlist.item :href="route('kiosk.configure.calendar')" wire:navigate>{{ __('Calendar') }}</flux:navlist.item>
+                <flux:navlist.item :href="route('kiosk.configure.settings')" wire:navigate>{{ __('Settings') }}</flux:navlist.item>
+            </flux:navlist>
+        </div>
+
+        <flux:separator class="md:hidden" />
+
+        <div class="flex-1 self-stretch max-md:pt-6">
+            <div class="w-full max-w-4xl">
+                {{ $slot }}
+            </div>
+        </div>
+    </div>
+</x-layouts::app>
diff --git a/resources/views/layouts/kiosk.blade.php b/resources/views/layouts/kiosk.blade.php
index 8213247..c4ad432 100644
--- a/resources/views/layouts/kiosk.blade.php
+++ b/resources/views/layouts/kiosk.blade.php
@@ -11,7 +11,6 @@
             <x-kiosk.sidebar.item icon="clipboard-document-list" :href="route('kiosk.chore-chart')" :current="request()->routeIs('kiosk.chore-chart')" wire:navigate>{{ __('Chores') }}</x-kiosk.sidebar.item>
             <x-kiosk.sidebar.item icon="queue-list" :href="route('kiosk.lists')" :current="request()->routeIs('kiosk.lists')" wire:navigate>{{ __('Lists') }}</x-kiosk.sidebar.item>
             <x-kiosk.sidebar.item icon="cooking-pot" :href="route('kiosk.meal-planning')" :current="request()->routeIs('kiosk.meal-planning')" wire:navigate>{{ __('Meals') }}</x-kiosk.sidebar.item>
-            <x-kiosk.sidebar.item icon="cog" :href="route('kiosk.settings')" :current="request()->routeIs('kiosk.settings')" wire:navigate>{{ __('Settings') }}</x-kiosk.sidebar.item>
         </x-kiosk.sidebar>
 
         <flux:main class="!p-0">
diff --git a/resources/views/layouts/partials/head.blade.php b/resources/views/layouts/partials/head.blade.php
index 0665c3f..d6b2a30 100644
--- a/resources/views/layouts/partials/head.blade.php
+++ b/resources/views/layouts/partials/head.blade.php
@@ -28,3 +28,4 @@
 
 @vite(['resources/css/app.css', 'resources/js/app.js'])
 @fluxAppearance
+@stack('head')
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
new file mode 100644
index 0000000..40975f3
--- /dev/null
+++ "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
@@ -0,0 +1,41 @@
+<div class="space-y-6">
+    <div class="flex items-center justify-between">
+        <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
+        <flux:modal.trigger name="feed-form">
+            <flux:button variant="primary" size="sm">{{ __('Add Calendar Feed') }}</flux:button>
+        </flux:modal.trigger>
+    </div>
+
+    <div class="space-y-2">
+        @forelse ($this->feeds as $feed)
+            <flux:card size="sm" wire:key="calendar-feed-{{ $feed->id }}">
+                <div class="flex items-start justify-between gap-3">
+                    <div class="min-w-0 space-y-1">
+                        <flux:heading class="flex items-center gap-2">
+                            <span class="size-2.5 shrink-0 rounded-full" style="background: {{ $feed->color }}"></span>
+                            <span class="truncate font-medium">{{ $feed->name }}</span>
+                        </flux:heading>
+
+                        <flux:text variant="subtle">{{ $feed->url }}</flux:text>
+                    </div>
+
+                    <div class="flex shrink-0 items-center gap-1">
+                        <flux:tooltip :content="__('Edit feed')">
+                            <flux:button type="button" variant="ghost" size="sm" icon="pencil" wire:click="edit({{ $feed->id }})" />
+                        </flux:tooltip>
+
+                        <flux:tooltip :content="__('Remove feed')">
+                            <flux:button type="button" variant="ghost" size="sm" icon="trash" wire:click="delete({{ $feed->id }})" wire:confirm="{{ __('Remove this calendar feed?') }}" />
+                        </flux:tooltip>
+                    </div>
+                </div>
+            </flux:card>
+        @empty
+            <div class="rounded-lg border border-dashed border-zinc-300 p-4 text-sm text-zinc-500 dark:border-zinc-700 dark:text-zinc-400">
+                {{ __('No calendar feeds yet.') }}
+            </div>
+        @endforelse
+    </div>
+
+    @include('pages.kiosk.modals.feed-form')
+</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.php" "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.php"
similarity index 92%
rename from "resources/views/pages/kiosk/\342\232\241configure/configure.php"
rename to "resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.php"
index 7c6f412..2dc8453 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.php"
@@ -5,9 +5,10 @@
 use Flux\Flux;
 use Illuminate\Support\Facades\Auth;
 use Livewire\Attributes\Computed;
+use Livewire\Attributes\Layout;
 use Livewire\Component;
 
-new class extends Component
+new #[Layout('layouts::kiosk-configure')] class extends Component
 {
     public CalendarFeedForm $form;
 
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.test.php" "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
similarity index 92%
rename from "resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
rename to "resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
index b0d995c..d67cba9 100644
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.test.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
@@ -19,12 +19,12 @@
     $user = User::factory()->memberOf($team)->create();
 
     actingAs($user)
-        ->get(route('kiosk.configure'))
+        ->get(route('kiosk.configure.calendar'))
         ->assertOk()
         ->assertSee('Family Calendar');
 
     Livewire::actingAs($user)
-        ->test('pages::kiosk.configure')
+        ->test('pages::kiosk.configure.calendar')
         ->assertStatus(200)
         ->assertSee('Family Calendar');
 });
@@ -34,7 +34,7 @@
     $user = User::factory()->memberOf($team)->create();
 
     Livewire::actingAs($user)
-        ->test('pages::kiosk.configure')
+        ->test('pages::kiosk.configure.calendar')
         ->set('form.name', 'Brazilian Holidays')
         ->set('form.url', 'https://worldpublicholiday.com/calendar-feeds/feed.ics?country=BR&year=2026')
         ->set('form.color', CalendarColor::Green->value)
@@ -64,7 +64,7 @@
     $feed = $team->calendarFeeds()->firstOrFail();
 
     Livewire::actingAs($user)
-        ->test('pages::kiosk.configure')
+        ->test('pages::kiosk.configure.calendar')
         ->call('edit', $feed->id)
         ->assertSet('form.name', 'US Holidays')
         ->set('form.name', 'American Holidays')
@@ -95,7 +95,7 @@
     $feed = $team->calendarFeeds()->firstOrFail();
 
     Livewire::actingAs($user)
-        ->test('pages::kiosk.configure')
+        ->test('pages::kiosk.configure.calendar')
         ->call('delete', $feed->id)
         ->assertHasNoErrors()
         ->assertDontSee('US Holidays');
@@ -109,7 +109,7 @@
     $user = User::factory()->create();
 
     Livewire::actingAs($user)
-        ->test('pages::kiosk.configure')
+        ->test('pages::kiosk.configure.calendar')
         ->set('form.name', '')
         ->set('form.url', 'not-a-url')
         ->set('form.color', '#ffffff')
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241preview.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241preview.blade.php"
new file mode 100644
index 0000000..0e6fc62
--- /dev/null
+++ "b/resources/views/pages/kiosk/configure/\342\232\241preview.blade.php"
@@ -0,0 +1,43 @@
+<?php
+
+use Livewire\Component;
+use Livewire\Attributes\Layout;
+
+new #[Layout('layouts::kiosk-configure')] class extends Component
+{
+    public int $width = 1020;
+    public int $height = 600;
+
+    public function swap()
+    {
+        $width = $this->width;
+        $height = $this->height;
+
+        $this->width = $height;
+        $this->height = $width;
+    }
+};
+?>
+
+<div>
+    <div class="flex items-end gap-4 mb-6">
+        <flux:field>
+            <flux:label>{{ __('Width') }}</flux:label>
+            <flux:input.group>
+                <flux:input wire:model.live.debounce.250ms="width" step="5" type="number" />
+                <flux:input.group.suffix>px</flux:input.group.suffix>
+            </flux:input.group>
+        </flux:field>
+        <flux:field>
+            <flux:label>{{ __('Height') }}</flux:label>
+            <flux:input.group>
+                <flux:input wire:model.live.debounce.250ms="height" step="5" type="number" />
+                <flux:input.group.suffix>px</flux:input.group.suffix>
+            </flux:input.group>
+        </flux:field>
+        <flux:button wire:click="swap" icon="arrow-path-rounded-square" square />
+    </div>
+    <div class="overflow-hidden rounded-lg border border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900" style="width: {{ $width }}px; height: {{ $height }}px;">
+        <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="h-full w-full"></iframe>
+    </div>
+</div>
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
new file mode 100644
index 0000000..0f3e869
--- /dev/null
+++ "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
@@ -0,0 +1,48 @@
+<form wire:submit="save" class="space-y-6 p-6 lg:p-8">
+    <flux:select wire:model="form.timezone" :label="__('Timezone')" variant="listbox">
+        @foreach (DateTimeZone::listIdentifiers() as $timezoneOption)
+            <flux:select.option value="{{ $timezoneOption }}">{{ str_replace('_', ' ', $timezoneOption) }}</flux:select.option>
+        @endforeach
+    </flux:select>
+
+    <flux:select wire:model="form.week_start" :label="__('Calendar Week Start')" variant="listbox">
+        <flux:select.option value="0">{{ __('Sunday') }}</flux:select.option>
+        <flux:select.option value="1">{{ __('Monday') }}</flux:select.option>
+        <flux:select.option value="2">{{ __('Tuesday') }}</flux:select.option>
+        <flux:select.option value="3">{{ __('Wednesday') }}</flux:select.option>
+        <flux:select.option value="4">{{ __('Thursday') }}</flux:select.option>
+        <flux:select.option value="5">{{ __('Friday') }}</flux:select.option>
+        <flux:select.option value="6">{{ __('Saturday') }}</flux:select.option>
+    </flux:select>
+
+    <flux:field>
+        <flux:label>Address for Weather</flux:label>
+
+        <mapbox-address-autofill access-token="{{ config('services.mapbox.key') }}">
+            <flux:input wire:model="form.address.address" name="address" autocomplete="address-line1" placeholder="Address"/>
+        </mapbox-address-autofill>
+
+        <div class="flex gap-2 mt-2">
+            <flux:input wire:model="form.address.city" name="city" autocomplete="address-level2" placeholder="City" />
+            <flux:input wire:model="form.address.state" name="state" autocomplete="address-level1" placeholder="State" />
+            <flux:input wire:model="form.address.zip" name="postcode" autocomplete="postal-code" placeholder="ZIP / Postcode" />
+        </div>
+    </flux:field>
+
+    <flux:button type="submit" variant="primary">Save</flux:button>
+</form>
+
+@assets
+<script id="search-js" defer="" src="https://api.mapbox.com/search-js/v1.5.0/web.js"></script>
+@endassets
+
+@script
+<script>
+    const autofill = document.querySelector('mapbox-address-autofill');
+
+    autofill.addEventListener('retrieve', (event) => {
+        $wire.$set('form.address.lat', event.detail.features[0].geometry.coordinates[0]);
+        $wire.$set('form.address.long', event.detail.features[0].geometry.coordinates[1]);
+    });
+</script>
+@endscript
diff --git "a/resources/views/pages/kiosk/\342\232\241settings/settings.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.php"
similarity index 83%
rename from "resources/views/pages/kiosk/\342\232\241settings/settings.php"
rename to "resources/views/pages/kiosk/configure/\342\232\241settings/settings.php"
index 48e79e2..2cd6cbf 100644
--- "a/resources/views/pages/kiosk/\342\232\241settings/settings.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.php"
@@ -5,7 +5,7 @@
 use Livewire\Attributes\Layout;
 use Livewire\Component;
 
-new #[Layout('layouts::kiosk')] class extends Component
+new #[Layout('layouts::kiosk-configure')] class extends Component
 {
     public SettingsForm $form;
 
diff --git "a/resources/views/pages/kiosk/\342\232\241settings/settings.test.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php"
similarity index 100%
rename from "resources/views/pages/kiosk/\342\232\241settings/settings.test.php"
rename to "resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php"
diff --git "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php" "b/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
deleted file mode 100644
index 08f4495..0000000
--- "a/resources/views/pages/kiosk/\342\232\241configure/configure.blade.php"
+++ /dev/null
@@ -1,71 +0,0 @@
-<div class="space-y-6">
-    <div>
-        <flux:heading size="xl" level="1">{{ __('Kiosk Configuration') }}</flux:heading>
-        <flux:subheading size="lg">{{ __('Preview your kiosk and manage its data sources.') }}</flux:subheading>
-    </div>
-
-    <div class="w-[1020px] h-[600px] overflow-hidden rounded-lg border border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900">
-        <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="h-full w-full"></iframe>
-    </div>
-
-    <flux:tab.group>
-        <flux:tabs class="px-4">
-            <flux:tab name="calendar">Calendar</flux:tab>
-            <flux:tab name="routines">Routines</flux:tab>
-            <flux:tab name="chores">Chores</flux:tab>
-            <flux:tab name="lists">Lists</flux:tab>
-            <flux:tab name="meals">Meals</flux:tab>
-            <flux:tab name="settings">Settings</flux:tab>
-        </flux:tabs>
-
-        <flux:tab.panel name="calendar">
-            <flux:card class="space-y-4">
-                <div class="flex items-center justify-between">
-                    <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
-                    <flux:modal.trigger name="feed-form">
-                        <flux:button variant="primary" size="sm">{{ __('Add Calendar Feed') }}</flux:button>
-                    </flux:modal.trigger>
-                </div>
-
-                <div class="space-y-2">
-                    @forelse ($this->feeds as $feed)
-                        <flux:card size="sm" wire:key="calendar-feed-{{ $feed->id }}">
-                            <div class="flex items-start justify-between gap-3">
-                                <div class="min-w-0 space-y-1">
-                                    <flux:heading class="flex items-center gap-2">
-                                        <span class="size-2.5 shrink-0 rounded-full" style="background: {{ $feed->color }}"></span>
-                                        <span class="truncate font-medium">{{ $feed->name }}</span>
-                                    </flux:heading>
-
-                                    <flux:text variant="subtle">{{ $feed->url }}</flux:text>
-                                </div>
-
-                                <div class="flex shrink-0 items-center gap-1">
-                                    <flux:tooltip :content="__('Edit feed')">
-                                        <flux:button type="button" variant="ghost" size="sm" icon="pencil" wire:click="edit({{ $feed->id }})" />
-                                    </flux:tooltip>
-
-                                    <flux:tooltip :content="__('Remove feed')">
-                                        <flux:button type="button" variant="ghost" size="sm" icon="trash" wire:click="delete({{ $feed->id }})" wire:confirm="{{ __('Remove this calendar feed?') }}" />
-                                    </flux:tooltip>
-                                </div>
-                            </div>
-                        </flux:card>
-                    @empty
-                        <div class="rounded-lg border border-dashed border-zinc-300 p-4 text-sm text-zinc-500 dark:border-zinc-700 dark:text-zinc-400">
-                            {{ __('No calendar feeds yet.') }}
-                        </div>
-                    @endforelse
-                </div>
-            </flux:card>
-        </flux:tab.panel>
-        <flux:tab.panel name="routines">...</flux:tab.panel>
-        <flux:tab.panel name="chores">...</flux:tab.panel>
-        <flux:tab.panel name="lists">...</flux:tab.panel>
-        <flux:tab.panel name="meals">...</flux:tab.panel>
-        <flux:tab.panel name="settings">...</flux:tab.panel>
-    </flux:tab.group>
-
-
-    @include('pages.kiosk.modals.feed-form')
-</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241settings/settings.blade.php" "b/resources/views/pages/kiosk/\342\232\241settings/settings.blade.php"
deleted file mode 100644
index fff10e6..0000000
--- "a/resources/views/pages/kiosk/\342\232\241settings/settings.blade.php"
+++ /dev/null
@@ -1,19 +0,0 @@
-<form wire:submit="save" class="space-y-6 p-6 lg:p-8'">
-    <flux:select wire:model="form.timezone" :label="__('Timezone')" variant="listbox">
-        @foreach (DateTimeZone::listIdentifiers() as $timezoneOption)
-            <flux:select.option value="{{ $timezoneOption }}">{{ str_replace('_', ' ', $timezoneOption) }}</flux:select.option>
-        @endforeach
-    </flux:select>
-
-    <flux:select wire:model="form.week_start" :label="__('Calendar Week Start')" variant="listbox">
-            <flux:select.option value="0">{{ __('Sunday') }}</flux:select.option>
-            <flux:select.option value="1">{{ __('Monday') }}</flux:select.option>
-            <flux:select.option value="2">{{ __('Tuesday') }}</flux:select.option>
-            <flux:select.option value="3">{{ __('Wednesday') }}</flux:select.option>
-            <flux:select.option value="4">{{ __('Thursday') }}</flux:select.option>
-            <flux:select.option value="5">{{ __('Friday') }}</flux:select.option>
-            <flux:select.option value="6">{{ __('Saturday') }}</flux:select.option>
-    </flux:select>
-
-    <flux:button type="submit" variant="primary">Save</flux:button>
-</form>
diff --git a/routes/web.php b/routes/web.php
index 31f64a0..a6c2748 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -24,12 +24,13 @@
     ->middleware(['auth', 'verified', EnsureTeamMembership::class])
     ->name('kiosk')
     ->group(function (): void {
-        Route::livewire('configure', 'pages::kiosk.configure')->name('.configure');
+        Route::livewire('configure/preview', 'pages::kiosk.configure.preview')->name('.configure.preview');
+        Route::livewire('configure/calendar', 'pages::kiosk.configure.calendar')->name('.configure.calendar');
+        Route::livewire('configure/settings', 'pages::kiosk.configure.settings')->name('.configure.settings');
 
         Route::livewire('calendar', 'pages::kiosk.calendar')->name('.calendar');
         Route::livewire('routines', 'pages::kiosk.routines')->name('.routines');
         Route::livewire('chore-chart', 'pages::kiosk.chore-chart')->name('.chore-chart');
         Route::livewire('lists', 'pages::kiosk.lists')->name('.lists');
         Route::livewire('meal-planning', 'pages::kiosk.meal-planning')->name('.meal-planning');
-        Route::livewire('settings', 'pages::kiosk.settings')->name('.settings');
     });

From 2ec6416f4bb4221614dcc931d25c85d03eda7551 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 26 May 2026 10:29:02 -0500
Subject: [PATCH 37/57] Install Saloon and start on OpenWeather

---
 .env.example                                  |  4 ++
 .../OpenWeather/OpenWeatherConnector.php      | 23 ++++++
 composer.json                                 |  2 +
 composer.lock                                 | 72 ++++++++++++++++++-
 config/services.php                           |  4 ++
 5 files changed, 104 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Integrations/OpenWeather/OpenWeatherConnector.php

diff --git a/.env.example b/.env.example
index c0660ea..48b6515 100644
--- a/.env.example
+++ b/.env.example
@@ -63,3 +63,7 @@ AWS_BUCKET=
 AWS_USE_PATH_STYLE_ENDPOINT=false
 
 VITE_APP_NAME="${APP_NAME}"
+
+# Services
+MAPBOX_API_KEY=
+OPENWEATHER_API_KEY=
diff --git a/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php b/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
new file mode 100644
index 0000000..6fa92d8
--- /dev/null
+++ b/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Http\Integrations\OpenWeather;
+
+use Saloon\Http\Connector;
+use Saloon\Traits\Plugins\AcceptsJson;
+
+class OpenWeatherConnector extends Connector
+{
+    use AcceptsJson;
+
+    public function resolveBaseUrl(): string
+    {
+        return 'https://api.openweathermap.org';
+    }
+
+    protected function defaultQuery(): array
+    {
+        return [
+            'appid' => config('services.openweather.key'),
+        ];
+    }
+}
diff --git a/composer.json b/composer.json
index fdd1cfb..7770227 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,8 @@
         "livewire/livewire": "^4.1",
         "nunomaduro/essentials": "^1.2",
         "sabre/vobject": "^4.5",
+        "saloonphp/laravel-plugin": "^4.3",
+        "saloonphp/saloon": "^4.0",
         "spatie/simple-excel": "^3.9"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
index 2f19129..2455b85 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "1e4cdaf58e2e0319de050fa8276e65a8",
+    "content-hash": "8c12ca248c64e0a023e0a53357518065",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -5328,6 +5328,76 @@
             },
             "time": "2026-04-27T10:56:01+00:00"
         },
+        {
+            "name": "saloonphp/laravel-plugin",
+            "version": "v4.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/saloonphp/laravel-plugin.git",
+                "reference": "c9754084dabe1002000d01cc2192fd08cfa6079d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/saloonphp/laravel-plugin/zipball/c9754084dabe1002000d01cc2192fd08cfa6079d",
+                "reference": "c9754084dabe1002000d01cc2192fd08cfa6079d",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/console": "^11.0 || ^12.39.0 || ^13.0",
+                "illuminate/support": "^11.0 || ^12.39.0 || ^13.0",
+                "php": "^8.2",
+                "saloonphp/saloon": "^4.0",
+                "symfony/finder": "^6.4 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3.48",
+                "laravel/pulse": "^1.4",
+                "laravel/telescope": "^5.16",
+                "orchestra/testbench": "^9.15 || ^10.7 || ^11.0",
+                "pestphp/pest": "^3.0|^4.0",
+                "phpstan/phpstan": "^1.10.57|^2.0.2"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Saloon": "Saloon\\Laravel\\Facades\\Saloon"
+                    },
+                    "providers": [
+                        "Saloon\\Laravel\\SaloonServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Saloon\\Laravel\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Sam Carré",
+                    "email": "29132017+Sammyjo20@users.noreply.github.com",
+                    "role": "Developer"
+                }
+            ],
+            "description": "The official Laravel plugin for Saloon",
+            "homepage": "https://github.com/saloonphp/laravel-plugin",
+            "keywords": [
+                "api",
+                "api-integrations",
+                "saloon",
+                "saloonphp",
+                "sdk"
+            ],
+            "support": {
+                "source": "https://github.com/saloonphp/laravel-plugin/tree/v4.3.0"
+            },
+            "time": "2026-04-23T23:22:12+00:00"
+        },
         {
             "name": "saloonphp/saloon",
             "version": "v4.0.0",
diff --git a/config/services.php b/config/services.php
index c30a252..4f963f1 100644
--- a/config/services.php
+++ b/config/services.php
@@ -18,6 +18,10 @@
         'key' => env('MAPBOX_API_KEY'),
     ],
 
+    'openweather' => [
+        'key' => env('OPENWEATHER_API_KEY'),
+    ],
+
     'postmark' => [
         'key' => env('POSTMARK_API_KEY'),
     ],

From a7559eda916e008540abd2877beb6f0db7b12af0 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 26 May 2026 10:50:59 -0500
Subject: [PATCH 38/57] Start on OneCall

---
 .../OpenWeather/OpenWeatherConnector.php      |  2 +-
 .../OpenWeather/Requests/OneCall.php          | 31 +++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Integrations/OpenWeather/Requests/OneCall.php

diff --git a/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php b/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
index 6fa92d8..c73c54f 100644
--- a/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
+++ b/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
@@ -11,7 +11,7 @@ class OpenWeatherConnector extends Connector
 
     public function resolveBaseUrl(): string
     {
-        return 'https://api.openweathermap.org';
+        return 'https://api.openweathermap.org/data/3.0/';
     }
 
     protected function defaultQuery(): array
diff --git a/app/Http/Integrations/OpenWeather/Requests/OneCall.php b/app/Http/Integrations/OpenWeather/Requests/OneCall.php
new file mode 100644
index 0000000..9736a7e
--- /dev/null
+++ b/app/Http/Integrations/OpenWeather/Requests/OneCall.php
@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Integrations\OpenWeather\Requests;
+
+use Saloon\Enums\Method;
+use Saloon\Http\Request;
+
+class OneCall extends Request
+{
+    protected Method $method = Method::GET;
+
+    public function __construct(
+        public readonly float $lat,
+        public readonly float $lon,
+        public readonly ?string $exclude = null
+    ) {}
+
+    public function resolveEndpoint(): string
+    {
+        return '/onecall';
+    }
+
+    public function defaultQuery(): array
+    {
+        return array_filter([
+            'lat' => $this->lat,
+            'lon' => $this->lon,
+            'exclude' => $this->exclude,
+        ]);
+    }
+}

From 6592ad03344412f179468f59e94fce40ed095f41 Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Tue, 26 May 2026 15:51:48 +0000
Subject: [PATCH 39/57] Rector fixes

---
 app/Http/Integrations/OpenWeather/OpenWeatherConnector.php | 2 ++
 app/Http/Integrations/OpenWeather/Requests/OneCall.php     | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php b/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
index c73c54f..226c4d4 100644
--- a/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
+++ b/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Integrations\OpenWeather;
 
 use Saloon\Http\Connector;
diff --git a/app/Http/Integrations/OpenWeather/Requests/OneCall.php b/app/Http/Integrations/OpenWeather/Requests/OneCall.php
index 9736a7e..37f3010 100644
--- a/app/Http/Integrations/OpenWeather/Requests/OneCall.php
+++ b/app/Http/Integrations/OpenWeather/Requests/OneCall.php
@@ -1,5 +1,7 @@
 <?php
 
+declare(strict_types=1);
+
 namespace App\Http\Integrations\OpenWeather\Requests;
 
 use Saloon\Enums\Method;

From cb4b250b85d58d6dd7a641f1c4c60a609c717d71 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 26 May 2026 12:00:27 -0500
Subject: [PATCH 40/57] Start on weather tile

---
 .../OpenWeather/OpenWeatherConnector.php      |  3 ++
 .../weather-tile.blade.php"                   | 38 ++++++++++----
 .../weather-tile.php"                         | 40 ++++++++++++++-
 .../weather-tile.test.php"                    | 50 +++++++++++++++++--
 .../\342\232\241settings/settings.blade.php"  |  4 +-
 5 files changed, 119 insertions(+), 16 deletions(-)

diff --git a/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php b/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
index 226c4d4..49bb347 100644
--- a/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
+++ b/app/Http/Integrations/OpenWeather/OpenWeatherConnector.php
@@ -6,10 +6,12 @@
 
 use Saloon\Http\Connector;
 use Saloon\Traits\Plugins\AcceptsJson;
+use Saloon\Traits\Plugins\AlwaysThrowOnErrors;
 
 class OpenWeatherConnector extends Connector
 {
     use AcceptsJson;
+    use AlwaysThrowOnErrors;
 
     public function resolveBaseUrl(): string
     {
@@ -20,6 +22,7 @@ protected function defaultQuery(): array
     {
         return [
             'appid' => config('services.openweather.key'),
+            'units' => 'imperial',
         ];
     }
 }
diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.blade.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.blade.php"
index bcea664..06bd5d4 100644
--- "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.blade.php"
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.blade.php"
@@ -1,13 +1,31 @@
 <div class="p-2">
-    <div class="flex justify-between">
-        <div>
-            <flux:text>Chicago</flux:text>
-            <flux:heading size="xl">63°</flux:heading>
+    @if ($temp !== null)
+        <div >
+            <div class="flex justify-between items-center">
+                <flux:text>{{ $location }}</flux:text>
+                <img src="https://openweathermap.org/img/wn/{{ $icon }}@2x.png" alt="{{ $description }}" class="size-8 -mr-1.5" />
+            </div>
+            <div class="flex justify-between">
+                <flux:heading size="xl">{{ $temp }}°</flux:heading>
+                <div>
+                    <flux:text variant="strong"><flux:icon.arrow-up class="inline" variant="micro"/> {{ $high }}°</flux:text>
+                    <flux:text variant="subtle"><flux:icon.arrow-down class="inline" variant="micro"/> {{ $low }}°</flux:text>
+                </div>
+            </div>
         </div>
-        <div class="flex flex-col items-end">
-            <flux:icon.cloud variant="micro" />
-            <flux:text variant="strong"><flux:icon.arrow-up class="inline" variant="micro"/> 73°</flux:text>
-            <flux:text variant="subtle"><flux:icon.arrow-down class="inline" variant="micro"/> 55°</flux:text>
-        </div>
-    </div>
+    @else
+        <flux:skeleton.group animate="shimmer">
+            <div class="flex justify-between">
+                <div>
+                    <flux:skeleton.line class="w-16 mb-1" />
+                    <flux:skeleton.line size="lg" class="w-12" />
+                </div>
+                <div class="flex flex-col items-end gap-1">
+                    <flux:skeleton class="size-4 rounded" />
+                    <flux:skeleton.line class="w-10" />
+                    <flux:skeleton.line class="w-10" />
+                </div>
+            </div>
+        </flux:skeleton.group>
+    @endif
 </div>
diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
index f1acb2f..fd66009 100644
--- "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
@@ -1,8 +1,46 @@
 <?php
 
+use App\Http\Integrations\OpenWeather\OpenWeatherConnector;
+use App\Http\Integrations\OpenWeather\Requests\OneCall;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cache;
 use Livewire\Component;
 
 new class extends Component
 {
-    //
+    public ?string $location = null;
+
+    public ?float $temp = null;
+
+    public ?float $high = null;
+
+    public ?float $low = null;
+
+    public ?string $description = null;
+
+    public ?string $icon = null;
+
+    public function mount(): void
+    {
+        $team = Auth::user()->currentTeam;
+
+        if (! ($team->address['lat'] ?? null) || ! ($team->address['long'] ?? null)) {
+            return;
+        }
+
+        $weather = Cache::remember(
+            "weather:{$team->id}",
+            now()->addMinutes(30),
+            fn () => (new OpenWeatherConnector)->send(
+                new OneCall($team->address['lat'], $team->address['long'], 'minutely,hourly,alerts')
+            )->json(),
+        );
+
+        $this->location = $team->address['city'] ?? null;
+        $this->temp = round($weather['current']['temp']);
+        $this->high = round($weather['daily'][0]['temp']['max']);
+        $this->low = round($weather['daily'][0]['temp']['min']);
+        $this->description = $weather['current']['weather'][0]['description'] ?? null;
+        $this->icon = $weather['current']['weather'][0]['icon'] ?? null;
+    }
 };
diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
index 5da4fad..6c84931 100644
--- "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
@@ -1,8 +1,52 @@
 <?php
 
+use App\Http\Integrations\OpenWeather\Requests\OneCall;
+use App\Models\Team;
+use App\Models\User;
 use Livewire\Livewire;
+use Saloon\Http\Faking\MockResponse;
+use Saloon\Laravel\Saloon;
 
-it('renders successfully', function () {
-    Livewire::test('kiosk.weather-tile')
-        ->assertStatus(200);
+test('renders weather from api', function () {
+    Saloon::fake([
+        OneCall::class => MockResponse::make([
+            'current' => [
+                'temp' => 63.4,
+                'weather' => [['description' => 'overcast clouds', 'icon' => '04d']],
+            ],
+            'daily' => [
+                ['temp' => ['max' => 73.2, 'min' => 55.1]],
+            ],
+        ]),
+    ]);
+
+    $team = Team::factory()->create([
+        'address' => [
+            'address' => '123 Main St',
+            'city' => 'Chicago',
+            'state' => 'IL',
+            'zip' => '60601',
+            'lat' => '41.8781',
+            'long' => '-87.6298',
+        ],
+    ]);
+
+    $user = User::factory()->memberOf($team)->create();
+
+    Livewire::actingAs($user)
+        ->test('kiosk.weather-tile')
+        ->assertSee('Chicago')
+        ->assertSee('63°')
+        ->assertSee('73°')
+        ->assertSee('55°');
+
+    Saloon::assertSent(OneCall::class);
+});
+
+test('renders nothing without address coordinates', function () {
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('kiosk.weather-tile')
+        ->assertDontSee('°');
 });
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
index 0f3e869..e627b83 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
@@ -41,8 +41,8 @@
     const autofill = document.querySelector('mapbox-address-autofill');
 
     autofill.addEventListener('retrieve', (event) => {
-        $wire.$set('form.address.lat', event.detail.features[0].geometry.coordinates[0]);
-        $wire.$set('form.address.long', event.detail.features[0].geometry.coordinates[1]);
+        $wire.$set('form.address.long', event.detail.features[0].geometry.coordinates[0]);
+        $wire.$set('form.address.lat', event.detail.features[0].geometry.coordinates[1]);
     });
 </script>
 @endscript

From a84bc18417b6da57c7bd1c61298c82ebaffcf2c1 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 26 May 2026 12:19:47 -0500
Subject: [PATCH 41/57] =?UTF-8?q?Just=20Keep=20Swimming=20=F0=9F=90=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../weather-tile.php"                         | 17 +++++++++--
 .../weather-tile.test.php"                    | 29 +++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
index fd66009..0af7546 100644
--- "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cache;
 use Livewire\Component;
+use Saloon\Exceptions\Request\RequestException;
 
 new class extends Component
 {
@@ -31,11 +32,21 @@ public function mount(): void
         $weather = Cache::remember(
             "weather:{$team->id}",
             now()->addMinutes(30),
-            fn () => (new OpenWeatherConnector)->send(
-                new OneCall($team->address['lat'], $team->address['long'], 'minutely,hourly,alerts')
-            )->json(),
+            function () use ($team) {
+                try {
+                    return (new OpenWeatherConnector)->send(
+                        new OneCall($team->address['lat'], $team->address['long'], 'minutely,hourly,alerts')
+                    )->json();
+                } catch (RequestException) {
+                    return null;
+                }
+            },
         );
 
+        if (! $weather) {
+            return;
+        }
+
         $this->location = $team->address['city'] ?? null;
         $this->temp = round($weather['current']['temp']);
         $this->high = round($weather['daily'][0]['temp']['max']);
diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
index 6c84931..1cfc0d1 100644
--- "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.test.php"
@@ -43,6 +43,35 @@
     Saloon::assertSent(OneCall::class);
 });
 
+test('shows skeleton when api returns 429', function () {
+    Saloon::fake([
+        OneCall::class => MockResponse::make(
+            ['cod' => 429, 'message' => 'Too Many Requests'],
+            429,
+        ),
+    ]);
+
+    $team = Team::factory()->create([
+        'address' => [
+            'address' => '123 Main St',
+            'city' => 'Chicago',
+            'state' => 'IL',
+            'zip' => '60601',
+            'lat' => '41.8781',
+            'long' => '-87.6298',
+        ],
+    ]);
+
+    $user = User::factory()->memberOf($team)->create();
+
+    Livewire::actingAs($user)
+        ->test('kiosk.weather-tile')
+        ->assertDontSee('°')
+        ->assertSee('shimmer');
+
+    Saloon::assertSent(OneCall::class);
+});
+
 test('renders nothing without address coordinates', function () {
     $user = User::factory()->create();
 

From 84088402249a961f1d78c8a7a139165cc9f7e60b Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 26 May 2026 12:31:03 -0500
Subject: [PATCH 42/57] Adjust css

---
 resources/views/components/kiosk/calendar/day.blade.php  | 4 ++--
 resources/views/components/kiosk/calendar/week.blade.php | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/components/kiosk/calendar/day.blade.php b/resources/views/components/kiosk/calendar/day.blade.php
index 9a75d18..48d939c 100644
--- a/resources/views/components/kiosk/calendar/day.blade.php
+++ b/resources/views/components/kiosk/calendar/day.blade.php
@@ -1,4 +1,4 @@
-<div class="flex min-h-0 divide-x divide-zinc-100 dark:divide-zinc-700">
+<div class="flex min-h-0 md:divide-x divide-zinc-100 dark:divide-zinc-700">
     <div class="flex min-h-0 flex-1 flex-col overflow-hidden">
         <div
             wire:key="calendar-day-{{ $this->day['date']->toDateString() }}"
@@ -73,7 +73,7 @@ class="h-20 border-b border-zinc-100 dark:border-zinc-800"
         </div>
     </div>
 
-    <div class="shrink-0">
+    <div class="hidden shrink-0 md:block">
         <flux:calendar
             static
             :value="$this->day['date']->toDateString()"
diff --git a/resources/views/components/kiosk/calendar/week.blade.php b/resources/views/components/kiosk/calendar/week.blade.php
index 115587c..68e778e 100644
--- a/resources/views/components/kiosk/calendar/week.blade.php
+++ b/resources/views/components/kiosk/calendar/week.blade.php
@@ -1,6 +1,6 @@
 <div class="grid min-h-0 flex-1 overflow-y-auto divide-y divide-zinc-100 dark:divide-zinc-700 md:grid-cols-7 md:divide-x md:divide-y-0">
     @foreach ($this->weekDays as $day)
-        <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex min-h-40 flex-col lg:min-h-0">
+        <div wire:key="calendar-day-{{ $day['date']->toDateString() }}" class="flex flex-col lg:min-h-0">
             <div @class([
                 'border-b px-3 py-2 border-zinc-100 dark:border-zinc-700',
                 'bg-zinc-50 dark:bg-zinc-800' => ! $day['is_today'],

From 9f7129adee0f608fb94a9e501eb2fe6df426c9e3 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 26 May 2026 13:00:35 -0500
Subject: [PATCH 43/57] Fix issues

---
 app/Actions/Calendars/FetchCalendarEvents.php |  6 +++---
 app/Livewire/Forms/Kiosk/SettingsForm.php     |  2 +-
 app/Models/Team.php                           |  2 +-
 ..._14_211119_add_timezone_to_teams_table.php |  2 +-
 .../\342\232\241calendar/calendar.test.php"   |  2 +-
 .../\342\232\241settings/settings.blade.php"  |  1 +
 .../\342\232\241settings/settings.test.php"   | 19 ++++++++++++++-----
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/app/Actions/Calendars/FetchCalendarEvents.php b/app/Actions/Calendars/FetchCalendarEvents.php
index 1e2550e..d99e52c 100644
--- a/app/Actions/Calendars/FetchCalendarEvents.php
+++ b/app/Actions/Calendars/FetchCalendarEvents.php
@@ -26,7 +26,7 @@ class FetchCalendarEvents
      *     location: string|null,
      *     starts_at: CarbonImmutable,
      *     ends_at: CarbonImmutable|null,
-     *     all_day: bool
+     *     all_day: bool,
      *     response_status: string|null
      * }>
      */
@@ -53,7 +53,7 @@ public function handle(CalendarFeed $feed, int $days = 30, ?CarbonImmutable $fro
      *     location: string|null,
      *     starts_at: CarbonImmutable,
      *     ends_at: CarbonImmutable|null,
-     *     all_day: bool
+     *     all_day: bool,
      *     response_status: string|null
      * }>
      */
@@ -81,7 +81,7 @@ public function parse(string $ics, CalendarFeed $feed, CarbonImmutable $from, in
      *     location: string|null,
      *     starts_at: CarbonImmutable,
      *     ends_at: CarbonImmutable|null,
-     *     all_day: bool
+     *     all_day: bool,
      *     response_status: string|null
      * }
      */
diff --git a/app/Livewire/Forms/Kiosk/SettingsForm.php b/app/Livewire/Forms/Kiosk/SettingsForm.php
index db38ea3..8fbc702 100644
--- a/app/Livewire/Forms/Kiosk/SettingsForm.php
+++ b/app/Livewire/Forms/Kiosk/SettingsForm.php
@@ -37,7 +37,7 @@ public function load(Team $team)
         $this->editingTeam = $team;
         $this->timezone = $team->timezone;
         $this->week_start = $team->week_start;
-        $this->address = $team->address;
+        $this->address = $team->address ?? $this->address;
     }
 
     public function save()
diff --git a/app/Models/Team.php b/app/Models/Team.php
index fd12c28..eb7a7eb 100644
--- a/app/Models/Team.php
+++ b/app/Models/Team.php
@@ -15,7 +15,7 @@
 use Illuminate\Database\Eloquent\Relations\Pivot;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-#[Fillable(['name', 'slug', 'is_personal', 'address'])]
+#[Fillable(['name', 'slug', 'is_personal', 'address', 'timezone', 'week_start'])]
 class Team extends Model
 {
     /** @use HasFactory<TeamFactory> */
diff --git a/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php b/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
index 9290e3a..ece2c2b 100644
--- a/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
+++ b/database/migrations/2026_05_14_211119_add_timezone_to_teams_table.php
@@ -19,7 +19,7 @@ public function up(): void
     public function down(): void
     {
         Schema::table('teams', function (Blueprint $table) {
-            $table->dropColumns(['timezone', 'week_start']);
+            $table->dropColumns(['timezone', 'week_start', 'address']);
         });
     }
 };
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
index d67cba9..dc265de 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
@@ -72,7 +72,7 @@
         ->set('form.color', CalendarColor::Indigo->value)
         ->call('save')
         ->assertHasNoErrors()
-        ->assertSet('editingFeed', null);
+        ->assertSet('form.editingFeed', null);
 
     $this->assertDatabaseHas('calendar_feeds', [
         'id' => $feed->id,
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
index e627b83..c32f52d 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
@@ -40,6 +40,7 @@
 <script>
     const autofill = document.querySelector('mapbox-address-autofill');
 
+    // Mapbox returns GeoJSON [lng, lat] but retrieve event emits [lng, lat] in this order
     autofill.addEventListener('retrieve', (event) => {
         $wire.$set('form.address.long', event.detail.features[0].geometry.coordinates[0]);
         $wire.$set('form.address.lat', event.detail.features[0].geometry.coordinates[1]);
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php"
index 70a156a..0f80a41 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php"
@@ -17,11 +17,11 @@
     $user = User::factory()->memberOf($team)->create();
 
     actingAs($user)
-        ->get(route('kiosk.settings'))
+        ->get(route('kiosk.configure.settings'))
         ->assertOk();
 
     Livewire::actingAs($user)
-        ->test('pages::kiosk.settings')
+        ->test('pages::kiosk.configure.settings')
         ->assertOk()
         ->assertSet('form.timezone', 'Asia/Tokyo')
         ->assertSet('form.week_start', Carbon::MONDAY);
@@ -37,10 +37,19 @@
     $user = User::factory()->memberOf($team)->create();
 
     Livewire::actingAs($user)
-        ->test('pages::kiosk.settings')
+        ->test('pages::kiosk.configure.settings')
         ->set('form.timezone', 'America/Sao_Paulo')
         ->set('form.week_start', Carbon::SUNDAY)
-        ->call('save');
+        ->set('form.address', [
+            'address' => '123 Grand Line',
+            'city' => 'East Blue',
+            'state' => 'GL',
+            'zip' => '00001',
+            'lat' => '0.0',
+            'long' => '0.0',
+        ])
+        ->call('save')
+        ->assertHasNoErrors();
 
     expect($team->fresh())
         ->timezone->toBe('America/Sao_Paulo')
@@ -51,7 +60,7 @@
     $user = User::factory()->create();
 
     Livewire::actingAs($user)
-        ->test('pages::kiosk.settings')
+        ->test('pages::kiosk.configure.settings')
         ->set('form.timezone', 'Not/AZone')
         ->set('form.week_start', 15)
         ->call('save')

From f58a342afdd0f6ecc3c63254f73e240e365e3473 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 26 May 2026 13:46:42 -0500
Subject: [PATCH 44/57] Fix other issues

---
 app/Livewire/Forms/Kiosk/CalendarFeedForm.php |  2 +-
 .../weather-tile.php"                         | 24 +++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/app/Livewire/Forms/Kiosk/CalendarFeedForm.php b/app/Livewire/Forms/Kiosk/CalendarFeedForm.php
index 9d0104a..c37604b 100644
--- a/app/Livewire/Forms/Kiosk/CalendarFeedForm.php
+++ b/app/Livewire/Forms/Kiosk/CalendarFeedForm.php
@@ -50,7 +50,7 @@ protected function rules(): array
     {
         return [
             'name' => ['required', 'string', 'max:255'],
-            'url' => ['required', 'string', 'url'],
+            'url' => ['required', 'string', 'url:http,https'],
             'color' => ['required', Rule::enum(CalendarColor::class)],
         ];
     }
diff --git "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php" "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
index 0af7546..ab1f6c7 100644
--- "a/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
+++ "b/resources/views/components/kiosk/\342\232\241weather-tile/weather-tile.php"
@@ -29,19 +29,17 @@ public function mount(): void
             return;
         }
 
-        $weather = Cache::remember(
-            "weather:{$team->id}",
-            now()->addMinutes(30),
-            function () use ($team) {
-                try {
-                    return (new OpenWeatherConnector)->send(
-                        new OneCall($team->address['lat'], $team->address['long'], 'minutely,hourly,alerts')
-                    )->json();
-                } catch (RequestException) {
-                    return null;
-                }
-            },
-        );
+        try {
+            $weather = Cache::remember(
+                "weather:{$team->id}",
+                now()->addMinutes(30),
+                fn () => (new OpenWeatherConnector)->send(
+                    new OneCall($team->address['lat'], $team->address['long'], 'minutely,hourly,alerts')
+                )->json(),
+            );
+        } catch (RequestException) {
+            $weather = null;
+        }
 
         if (! $weather) {
             return;

From 4662bad965f5a2bc493bba726c09482de36825b1 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Wed, 27 May 2026 13:35:53 -0500
Subject: [PATCH 45/57] Add button to open kiosk in new tab

---
 .../views/pages/kiosk/configure/\342\232\241preview.blade.php"   | 1 +
 1 file changed, 1 insertion(+)

diff --git "a/resources/views/pages/kiosk/configure/\342\232\241preview.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241preview.blade.php"
index 0e6fc62..90a102f 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241preview.blade.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241preview.blade.php"
@@ -36,6 +36,7 @@ public function swap()
             </flux:input.group>
         </flux:field>
         <flux:button wire:click="swap" icon="arrow-path-rounded-square" square />
+        <flux:button :href="route('kiosk.calendar')" variant="primary" target="_blank" icon="arrow-top-right-on-square">Preview in New Tab</flux:button>
     </div>
     <div class="overflow-hidden rounded-lg border border-zinc-200 bg-zinc-50 dark:border-zinc-700 dark:bg-zinc-900" style="width: {{ $width }}px; height: {{ $height }}px;">
         <iframe src="{{ route('kiosk.calendar') }}" frameborder="0" class="h-full w-full"></iframe>

From 03ab85ed429e3477e571bfd419f69b48380aa3d1 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Wed, 27 May 2026 19:30:19 -0500
Subject: [PATCH 46/57] Move kiosk routes

---
 routes/kiosk.php | 19 +++++++++++++++++++
 routes/web.php   | 16 +---------------
 2 files changed, 20 insertions(+), 15 deletions(-)
 create mode 100644 routes/kiosk.php

diff --git a/routes/kiosk.php b/routes/kiosk.php
new file mode 100644
index 0000000..27b2351
--- /dev/null
+++ b/routes/kiosk.php
@@ -0,0 +1,19 @@
+<?php
+
+use App\Http\Middleware\EnsureTeamMembership;
+use Illuminate\Support\Facades\Route;
+
+Route::prefix('{current_team}/kiosk')
+    ->middleware(['auth', 'verified', EnsureTeamMembership::class])
+    ->name('kiosk')
+    ->group(function (): void {
+        Route::livewire('configure/preview', 'pages::kiosk.configure.preview')->name('.configure.preview');
+        Route::livewire('configure/calendar', 'pages::kiosk.configure.calendar')->name('.configure.calendar');
+        Route::livewire('configure/settings', 'pages::kiosk.configure.settings')->name('.configure.settings');
+
+        Route::livewire('calendar', 'pages::kiosk.calendar')->name('.calendar');
+        Route::livewire('routines', 'pages::kiosk.routines')->name('.routines');
+        Route::livewire('chore-chart', 'pages::kiosk.chore-chart')->name('.chore-chart');
+        Route::livewire('lists', 'pages::kiosk.lists')->name('.lists');
+        Route::livewire('meal-planning', 'pages::kiosk.meal-planning')->name('.meal-planning');
+    });
diff --git a/routes/web.php b/routes/web.php
index a6c2748..eb6c48f 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -17,20 +17,6 @@
 
 require __DIR__ . '/admin.php';
 require __DIR__ . '/inventory.php';
+require __DIR__ . '/kiosk.php';
 require __DIR__ . '/recipes.php';
 require __DIR__ . '/settings.php';
-
-Route::prefix('{current_team}/kiosk')
-    ->middleware(['auth', 'verified', EnsureTeamMembership::class])
-    ->name('kiosk')
-    ->group(function (): void {
-        Route::livewire('configure/preview', 'pages::kiosk.configure.preview')->name('.configure.preview');
-        Route::livewire('configure/calendar', 'pages::kiosk.configure.calendar')->name('.configure.calendar');
-        Route::livewire('configure/settings', 'pages::kiosk.configure.settings')->name('.configure.settings');
-
-        Route::livewire('calendar', 'pages::kiosk.calendar')->name('.calendar');
-        Route::livewire('routines', 'pages::kiosk.routines')->name('.routines');
-        Route::livewire('chore-chart', 'pages::kiosk.chore-chart')->name('.chore-chart');
-        Route::livewire('lists', 'pages::kiosk.lists')->name('.lists');
-        Route::livewire('meal-planning', 'pages::kiosk.meal-planning')->name('.meal-planning');
-    });

From 6e24b7bd5f32ba861b99cb403074f369bceaf71a Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Thu, 28 May 2026 07:46:42 -0500
Subject: [PATCH 47/57] Fix status assertions

---
 .../kiosk/configure/\342\232\241calendar/calendar.test.php"   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
index dc265de..9a7a343 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.test.php"
@@ -25,9 +25,9 @@
 
     Livewire::actingAs($user)
         ->test('pages::kiosk.configure.calendar')
-        ->assertStatus(200)
+        ->assertOk()
         ->assertSee('Family Calendar');
-});
+})->group('smoke');
 
 test('can add a calendar feed', function () {
     $team = Team::factory()->create();

From 754fb3ec86f04bf2f2380e7574456570049180d2 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 2 Jun 2026 09:39:24 -0500
Subject: [PATCH 48/57] Add dot dot dot loading component

---
 resources/css/app.css                         | 18 ++++++++++++++++++
 resources/views/components/ui/dotx3.blade.php |  2 ++
 2 files changed, 20 insertions(+)
 create mode 100644 resources/views/components/ui/dotx3.blade.php

diff --git a/resources/css/app.css b/resources/css/app.css
index 3076b8d..e221be8 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -10,6 +10,24 @@
 @source '../../vendor/livewire/flux-pro/stubs/**/*.blade.php';
 @source '../../vendor/livewire/flux/stubs/**/*.blade.php';
 
+@utility animate-duration-* {
+  --animate-duration: --value(integer)ms;
+  --animate-duration: --value([time]);
+  animation-duration: var(--animate-duration);
+}
+
+@utility animate-delay-* {
+  --animate-delay: --value(integer)ms;
+  --animate-delay: --value([time]);
+  animation-delay: var(--animate-delay);
+}
+
+@utility animate-ease-* {
+  --animate-easing: --value(--ease-*);
+  --animate-easing: --value([*]);
+  animation-timing-function: var(--animate-easing);
+}
+
 
 .prose li p {
     margin: 0;
diff --git a/resources/views/components/ui/dotx3.blade.php b/resources/views/components/ui/dotx3.blade.php
new file mode 100644
index 0000000..30932ab
--- /dev/null
+++ b/resources/views/components/ui/dotx3.blade.php
@@ -0,0 +1,2 @@
+<span class="text-2xl"><span class="animate-pulse">.</span><span class="animate-delay-600 animate-pulse">.</span><span class="animate-delay-1200 animate-pulse">.</span></span>
+{{-- Requires adding utility classes to app.css. @see https://www.hyperui.dev/blog/animation-duration-delay-with-tailwindcss/  --}}

From 58dfaf44439afe5ffb52dea7983457175f5913ca Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 2 Jun 2026 11:27:42 -0500
Subject: [PATCH 49/57] Add tv style authentication

---
 app/Http/Middleware/RestrictKioskSession.php  |  43 +++
 app/Models/KioskDevice.php                    |  89 +++++++
 bootstrap/app.php                             |   4 +
 database/factories/KioskDeviceFactory.php     |  59 +++++
 ...6_02_025423_create_kiosk_devices_table.php |  33 +++
 .../\342\232\241settings/settings.blade.php"  | 105 +++++---
 .../\342\232\241settings/settings.php"        |  24 ++
 .../\342\232\241settings/settings.test.php"   |  34 +++
 .../kiosk/\342\232\241index/index.blade.php"  |  23 ++
 .../pages/kiosk/\342\232\241index/index.php"  | 170 ++++++++++++
 .../kiosk/\342\232\241pair/pair.blade.php"    |  61 +++++
 .../pages/kiosk/\342\232\241pair/pair.php"    | 128 +++++++++
 .../kiosk/\342\232\241pair/pair.test.php"     | 248 ++++++++++++++++++
 routes/kiosk.php                              |   6 +
 14 files changed, 994 insertions(+), 33 deletions(-)
 create mode 100644 app/Http/Middleware/RestrictKioskSession.php
 create mode 100644 app/Models/KioskDevice.php
 create mode 100644 database/factories/KioskDeviceFactory.php
 create mode 100644 database/migrations/2026_06_02_025423_create_kiosk_devices_table.php
 create mode 100644 "resources/views/pages/kiosk/\342\232\241index/index.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241index/index.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241pair/pair.blade.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241pair/pair.php"
 create mode 100644 "resources/views/pages/kiosk/\342\232\241pair/pair.test.php"

diff --git a/app/Http/Middleware/RestrictKioskSession.php b/app/Http/Middleware/RestrictKioskSession.php
new file mode 100644
index 0000000..25d7d44
--- /dev/null
+++ b/app/Http/Middleware/RestrictKioskSession.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class RestrictKioskSession
+{
+    /** @param  Closure(Request): (Response)  $next */
+    public function handle(Request $request, Closure $next): Response
+    {
+        if (! $request->session()->has('kiosk_device_id')) {
+            return $next($request);
+        }
+
+        if ($this->isKioskPath($request)) {
+            return $next($request);
+        }
+
+        abort(403, 'This kiosk session is restricted to kiosk pages.');
+    }
+
+    protected function isKioskPath(Request $request): bool
+    {
+        $path = '/' . ltrim($request->path(), '/');
+
+        if (str_starts_with($path, '/livewire/') || str_starts_with($path, '/livewire-')) {
+            return true;
+        }
+
+        if ($path === '/kiosk' || str_starts_with($path, '/kiosk/')) {
+            return true;
+        }
+
+        $segments = explode('/', trim($path, '/'));
+
+        return count($segments) >= 2 && $segments[1] === 'kiosk';
+    }
+}
diff --git a/app/Models/KioskDevice.php b/app/Models/KioskDevice.php
new file mode 100644
index 0000000..6180c6c
--- /dev/null
+++ b/app/Models/KioskDevice.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Models;
+
+use Database\Factories\KioskDeviceFactory;
+use Illuminate\Database\Eloquent\Attributes\Fillable;
+use Illuminate\Database\Eloquent\Attributes\Scope;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+#[Fillable([
+    'uuid',
+    'pairing_code',
+    'name',
+    'user_agent',
+    'last_ip',
+    'user_id',
+    'team_id',
+    'paired_at',
+    'expires_at',
+    'last_seen_at',
+])]
+class KioskDevice extends Model
+{
+    /** @use HasFactory<KioskDeviceFactory> */
+    use HasFactory;
+
+    public const PAIRING_ALPHABET = '23456789ABCDEFGHJKMNPQRSTUVWXYZ';
+
+    public const PAIRING_CODE_LENGTH = 8;
+
+    public const PAIRING_TTL_MINUTES = 15;
+
+    public static function generatePairingCode(): string
+    {
+        $code = '';
+
+        for ($i = 0; $i < self::PAIRING_CODE_LENGTH; $i++) {
+            $code .= self::PAIRING_ALPHABET[random_int(0, strlen(self::PAIRING_ALPHABET) - 1)];
+        }
+
+        return $code;
+    }
+
+    /** @return BelongsTo<User, $this> */
+    public function user(): BelongsTo
+    {
+        return $this->belongsTo(User::class);
+    }
+
+    /** @return BelongsTo<Team, $this> */
+    public function team(): BelongsTo
+    {
+        return $this->belongsTo(Team::class);
+    }
+
+    public function isPaired(): bool
+    {
+        return $this->paired_at !== null;
+    }
+
+    /** @param Builder<KioskDevice> $query */
+    #[Scope]
+    protected function pending(Builder $query): void
+    {
+        $query->whereNull('paired_at')->where('expires_at', '>', now());
+    }
+
+    /** @param Builder<KioskDevice> $query */
+    #[Scope]
+    protected function paired(Builder $query): void
+    {
+        $query->whereNotNull('paired_at');
+    }
+
+    /** @return array<string, string> */
+    protected function casts(): array
+    {
+        return [
+            'paired_at' => 'datetime',
+            'expires_at' => 'datetime',
+            'last_seen_at' => 'datetime',
+        ];
+    }
+}
diff --git a/bootstrap/app.php b/bootstrap/app.php
index b1be166..1a33712 100644
--- a/bootstrap/app.php
+++ b/bootstrap/app.php
@@ -1,5 +1,8 @@
 <?php
 
+declare(strict_types=1);
+
+use App\Http\Middleware\RestrictKioskSession;
 use App\Http\Middleware\SetTeamUrlDefaults;
 use Illuminate\Foundation\Application;
 use Illuminate\Foundation\Configuration\Exceptions;
@@ -15,6 +18,7 @@
     ->withMiddleware(function (Middleware $middleware): void {
         $middleware->web(append: [
             SetTeamUrlDefaults::class,
+            RestrictKioskSession::class,
         ]);
     })
     ->withExceptions(function (Exceptions $exceptions): void {
diff --git a/database/factories/KioskDeviceFactory.php b/database/factories/KioskDeviceFactory.php
new file mode 100644
index 0000000..114d162
--- /dev/null
+++ b/database/factories/KioskDeviceFactory.php
@@ -0,0 +1,59 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Database\Factories;
+
+use App\Models\KioskDevice;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Str;
+
+/**
+ * @extends Factory<KioskDevice>
+ */
+class KioskDeviceFactory extends Factory
+{
+    /** @return array<string, mixed> */
+    public function definition(): array
+    {
+        return [
+            'uuid' => Str::uuid()->toString(),
+            'pairing_code' => KioskDevice::generatePairingCode(),
+            'user_agent' => fake()->userAgent(),
+            'last_ip' => fake()->ipv4(),
+            'expires_at' => now()->addMinutes(KioskDevice::PAIRING_TTL_MINUTES),
+        ];
+    }
+
+    public function pending(): self
+    {
+        return $this->state(fn (): array => [
+            'paired_at' => null,
+            'user_id' => null,
+            'team_id' => null,
+            'expires_at' => now()->addMinutes(KioskDevice::PAIRING_TTL_MINUTES),
+        ]);
+    }
+
+    public function paired(?User $user = null, ?Team $team = null): self
+    {
+        return $this->state(fn (): array => [
+            'user_id' => $user ?? User::factory(),
+            'team_id' => $team ?? Team::factory(),
+            'paired_at' => now(),
+            'expires_at' => null,
+            'pairing_code' => null,
+            'name' => fake()->words(2, true),
+        ]);
+    }
+
+    public function expired(): self
+    {
+        return $this->state(fn (): array => [
+            'paired_at' => null,
+            'expires_at' => now()->subMinutes(5),
+        ]);
+    }
+}
diff --git a/database/migrations/2026_06_02_025423_create_kiosk_devices_table.php b/database/migrations/2026_06_02_025423_create_kiosk_devices_table.php
new file mode 100644
index 0000000..d7271eb
--- /dev/null
+++ b/database/migrations/2026_06_02_025423_create_kiosk_devices_table.php
@@ -0,0 +1,33 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    public function up(): void
+    {
+        Schema::create('kiosk_devices', function (Blueprint $table): void {
+            $table->id();
+            $table->string('uuid')->unique();
+            $table->string('pairing_code')->nullable()->unique();
+            $table->string('name')->nullable();
+            $table->string('user_agent')->nullable();
+            $table->string('last_ip', 45)->nullable();
+            $table->foreignId('user_id')->nullable()->constrained()->nullOnDelete();
+            $table->foreignId('team_id')->nullable()->constrained()->cascadeOnDelete();
+            $table->timestamp('paired_at')->nullable();
+            $table->timestamp('expires_at')->nullable();
+            $table->timestamp('last_seen_at')->nullable();
+            $table->timestamps();
+
+            $table->index(['team_id', 'paired_at']);
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::dropIfExists('kiosk_devices');
+    }
+};
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
index c32f52d..974bd17 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.blade.php"
@@ -1,36 +1,75 @@
-<form wire:submit="save" class="space-y-6 p-6 lg:p-8">
-    <flux:select wire:model="form.timezone" :label="__('Timezone')" variant="listbox">
-        @foreach (DateTimeZone::listIdentifiers() as $timezoneOption)
-            <flux:select.option value="{{ $timezoneOption }}">{{ str_replace('_', ' ', $timezoneOption) }}</flux:select.option>
-        @endforeach
-    </flux:select>
-
-    <flux:select wire:model="form.week_start" :label="__('Calendar Week Start')" variant="listbox">
-        <flux:select.option value="0">{{ __('Sunday') }}</flux:select.option>
-        <flux:select.option value="1">{{ __('Monday') }}</flux:select.option>
-        <flux:select.option value="2">{{ __('Tuesday') }}</flux:select.option>
-        <flux:select.option value="3">{{ __('Wednesday') }}</flux:select.option>
-        <flux:select.option value="4">{{ __('Thursday') }}</flux:select.option>
-        <flux:select.option value="5">{{ __('Friday') }}</flux:select.option>
-        <flux:select.option value="6">{{ __('Saturday') }}</flux:select.option>
-    </flux:select>
-
-    <flux:field>
-        <flux:label>Address for Weather</flux:label>
-
-        <mapbox-address-autofill access-token="{{ config('services.mapbox.key') }}">
-            <flux:input wire:model="form.address.address" name="address" autocomplete="address-line1" placeholder="Address"/>
-        </mapbox-address-autofill>
-
-        <div class="flex gap-2 mt-2">
-            <flux:input wire:model="form.address.city" name="city" autocomplete="address-level2" placeholder="City" />
-            <flux:input wire:model="form.address.state" name="state" autocomplete="address-level1" placeholder="State" />
-            <flux:input wire:model="form.address.zip" name="postcode" autocomplete="postal-code" placeholder="ZIP / Postcode" />
-        </div>
-    </flux:field>
-
-    <flux:button type="submit" variant="primary">Save</flux:button>
-</form>
+<div>
+    <form wire:submit="save" class="space-y-6 p-6 lg:p-8">
+        <flux:select wire:model="form.timezone" :label="__('Timezone')" variant="listbox">
+            @foreach (DateTimeZone::listIdentifiers() as $timezoneOption)
+                <flux:select.option value="{{ $timezoneOption }}">{{ str_replace('_', ' ', $timezoneOption) }}</flux:select.option>
+            @endforeach
+        </flux:select>
+
+        <flux:select wire:model="form.week_start" :label="__('Calendar Week Start')" variant="listbox">
+            <flux:select.option value="0">{{ __('Sunday') }}</flux:select.option>
+            <flux:select.option value="1">{{ __('Monday') }}</flux:select.option>
+            <flux:select.option value="2">{{ __('Tuesday') }}</flux:select.option>
+            <flux:select.option value="3">{{ __('Wednesday') }}</flux:select.option>
+            <flux:select.option value="4">{{ __('Thursday') }}</flux:select.option>
+            <flux:select.option value="5">{{ __('Friday') }}</flux:select.option>
+            <flux:select.option value="6">{{ __('Saturday') }}</flux:select.option>
+        </flux:select>
+
+        <flux:field>
+            <flux:label>Address for Weather</flux:label>
+
+            <mapbox-address-autofill access-token="{{ config('services.mapbox.key') }}">
+                <flux:input wire:model="form.address.address" name="address" autocomplete="address-line1" placeholder="Address"/>
+            </mapbox-address-autofill>
+
+            <div class="flex gap-2 mt-2">
+                <flux:input wire:model="form.address.city" name="city" autocomplete="address-level2" placeholder="City" />
+                <flux:input wire:model="form.address.state" name="state" autocomplete="address-level1" placeholder="State" />
+                <flux:input wire:model="form.address.zip" name="postcode" autocomplete="postal-code" placeholder="ZIP / Postcode" />
+            </div>
+        </flux:field>
+
+        <flux:button type="submit" variant="primary">Save</flux:button>
+    </form>
+
+    <section class="space-y-4 border-t border-zinc-200 p-6 dark:border-zinc-700 lg:p-8">
+        <flux:heading size="lg">{{ __('Paired displays') }}</flux:heading>
+        <flux:text class="text-zinc-500 dark:text-zinc-400">
+            {{ __('Devices that are signed in to the kiosk view for this team.') }}
+        </flux:text>
+
+        @if ($this->pairedDevices->isEmpty())
+            <flux:text class="text-sm italic text-zinc-500 dark:text-zinc-400">
+                {{ __('No paired displays yet.') }}
+            </flux:text>
+        @else
+            <ul class="space-y-2">
+                @foreach ($this->pairedDevices as $device)
+                    <flux:card class="flex items-center justify-between gap-3 px-4 py-3">
+                        <div>
+                            <flux:heading>{{ $device->name ?: __('Unnamed display') }}</flux:heading>
+                            <flux:text variant="subtle" class="text-xs">
+                                {{ __('Paired') }} {{ $device->paired_at?->diffForHumans() }}
+                                @if ($device->last_seen_at)
+                                    · {{ __('Last seen') }} {{ $device->last_seen_at->diffForHumans() }}
+                                @endif
+                            </flux:text>
+                        </div>
+                        <flux:button
+                            size="sm"
+                            variant="ghost"
+                            wire:click="forget({{ $device->id }})"
+                            wire:confirm="{{ __('Forget this display? It will return to the QR pairing screen.') }}"
+                        >
+                            {{ __('Forget') }}
+                        </flux:button>
+                    </flux:card>
+                @endforeach
+            </ul>
+        @endif
+    </section>
+</div>
 
 @assets
 <script id="search-js" defer="" src="https://api.mapbox.com/search-js/v1.5.0/web.js"></script>
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.php"
index 2cd6cbf..703ab21 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.php"
@@ -1,7 +1,10 @@
 <?php
 
 use App\Livewire\Forms\Kiosk\SettingsForm;
+use App\Models\KioskDevice;
+use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\Computed;
 use Livewire\Attributes\Layout;
 use Livewire\Component;
 
@@ -18,4 +21,25 @@ public function save()
     {
         $this->form->save();
     }
+
+    public function forget(int $deviceId): void
+    {
+        KioskDevice::query()
+            ->where('team_id', Auth::user()->current_team_id)
+            ->whereKey($deviceId)
+            ->delete();
+
+        unset($this->pairedDevices);
+    }
+
+    /** @return Collection<int, KioskDevice> */
+    #[Computed]
+    public function pairedDevices(): Collection
+    {
+        return KioskDevice::query()
+            ->where('team_id', Auth::user()->current_team_id)
+            ->paired()
+            ->orderByDesc('last_seen_at')
+            ->get();
+    }
 };
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php" "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php"
index 0f80a41..c86d51e 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241settings/settings.test.php"
@@ -1,11 +1,14 @@
 <?php
 
+use App\Models\KioskDevice;
 use App\Models\Team;
 use App\Models\User;
 use Illuminate\Support\Carbon;
 use Livewire\Livewire;
 
 use function Pest\Laravel\actingAs;
+use function Pest\Laravel\assertModelExists;
+use function Pest\Laravel\assertModelMissing;
 
 test('renders successfully', function () {
     $team = Team::factory()->create([
@@ -66,3 +69,34 @@
         ->call('save')
         ->assertHasErrors(['form.timezone', 'form.week_start']);
 });
+
+describe('device management', function () {
+    test('can forget a paired display for the current team', function () {
+        $user = User::factory()->create();
+
+        $kitchen = KioskDevice::factory()->paired($user, $user->currentTeam)->create(['name' => 'Kitchen']);
+        $bedroom = KioskDevice::factory()->paired($user, $user->currentTeam)->create(['name' => 'Bedroom']);
+
+        Livewire::actingAs($user)
+            ->test('pages::kiosk.configure.settings')
+            ->assertSee('Kitchen')
+            ->assertSee('Bedroom')
+            ->call('forget', $kitchen->id)
+            ->assertDontSee('Kitchen')
+            ->assertSee('Bedroom');
+
+        assertModelMissing($kitchen);
+        assertModelExists($bedroom);
+    });
+
+    test('cannot forget device from another team', function () {
+        $user = User::factory()->create();
+        $other = KioskDevice::factory()->paired()->create();
+
+        Livewire::actingAs($user)
+            ->test('pages::kiosk.configure.settings')
+            ->call('forget', $other->id);
+
+        assertModelExists($other);
+    });
+});
diff --git "a/resources/views/pages/kiosk/\342\232\241index/index.blade.php" "b/resources/views/pages/kiosk/\342\232\241index/index.blade.php"
new file mode 100644
index 0000000..d2d757d
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241index/index.blade.php"
@@ -0,0 +1,23 @@
+<div wire:poll.2s="check" class="w-full max-w-xl">
+    <flux:card class="text-center">
+        <flux:heading size="xl">{{ __('Pair this display') }}</flux:heading>
+        <flux:text class="mt-2 text-zinc-500 dark:text-zinc-400">
+            {{ __('Scan the QR code with your phone, or visit the URL and enter the code below.') }}
+        </flux:text>
+
+        <flux:card class="p-1 mx-auto mt-6 inline-flex">
+            {!! $this->qrSvg !!}
+        </flux:card>
+
+        <div class="mt-6 flex flex-col items-center gap-2">
+            <flux:text class="text-xs uppercase tracking-widest text-zinc-500 dark:text-zinc-400">
+                {{ __('Pairing code') }}
+            </flux:text>
+            <flux:heading size="xl" class="font-mono tracking-[0.4em]">{{ $pairingCode }}</flux:heading>
+        </div>
+
+        <flux:text class="mt-6 text-sm text-zinc-500 dark:text-zinc-400">
+            {{ __('Waiting for confirmation') }}<x-ui.dotx3 />
+        </flux:text>
+    </flux:card>
+</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241index/index.php" "b/resources/views/pages/kiosk/\342\232\241index/index.php"
new file mode 100644
index 0000000..6b4970a
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241index/index.php"
@@ -0,0 +1,170 @@
+<?php
+
+use App\Models\KioskDevice;
+use BaconQrCode\Renderer\Image\SvgImageBackEnd;
+use BaconQrCode\Renderer\ImageRenderer;
+use BaconQrCode\Renderer\RendererStyle\RendererStyle;
+use BaconQrCode\Writer;
+use Illuminate\Database\QueryException;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cookie;
+use Illuminate\Support\Str;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+new #[Layout('layouts.auth')] class extends Component
+{
+    public const COOKIE_NAME = 'kiosk_device_uuid';
+
+    public ?int $deviceId = null;
+
+    public string $pairingCode = '';
+
+    public ?string $expiresAt = null;
+
+    public bool $expired = false;
+
+    public function mount(): void
+    {
+        $device = $this->resolveDevice();
+
+        if ($device->isPaired()) {
+            $this->loginAndRedirect($device);
+
+            return;
+        }
+
+        $this->syncFromDevice($device);
+    }
+
+    public function check(): mixed
+    {
+        $device = KioskDevice::query()->find($this->deviceId);
+
+        if (! $device) {
+            return $this->redirect(request()->fullUrl(), navigate: false);
+        }
+
+        $device->forceFill(['last_seen_at' => now()])->save();
+
+        if ($device->isPaired()) {
+            return $this->loginAndRedirect($device);
+        }
+
+        if ($device->expires_at && $device->expires_at->isPast()) {
+            $this->rotateCode($device);
+        }
+
+        $this->syncFromDevice($device);
+
+        return null;
+    }
+
+    #[Computed]
+    public function qrSvg(): string
+    {
+        $renderer = new ImageRenderer(
+            new RendererStyle(280),
+            new SvgImageBackEnd,
+        );
+
+        return (new Writer($renderer))->writeString(route('kiosk.pair', ['code' => $this->pairingCode]));
+    }
+
+    protected function resolveDevice(): KioskDevice
+    {
+        $uuid = request()->cookie(self::COOKIE_NAME);
+
+        if ($uuid) {
+            $device = KioskDevice::query()->where('uuid', $uuid)->first();
+
+            if ($device && ($device->isPaired() || ! $device->expires_at?->isPast())) {
+                return $device;
+            }
+
+            if ($device) {
+                $this->rotateCode($device);
+
+                return $device->fresh();
+            }
+        }
+
+        return $this->createDevice();
+    }
+
+    protected function createDevice(): KioskDevice
+    {
+        $attempts = 0;
+
+        do {
+            $attempts++;
+            try {
+                $device = KioskDevice::query()->create([
+                    'uuid' => (string) Str::uuid(),
+                    'pairing_code' => KioskDevice::generatePairingCode(),
+                    'user_agent' => Str::limit((string) request()->userAgent(), 250, ''),
+                    'last_ip' => request()->ip(),
+                    'expires_at' => now()->addMinutes(KioskDevice::PAIRING_TTL_MINUTES),
+                ]);
+
+                Cookie::queue(Cookie::make(
+                    self::COOKIE_NAME,
+                    $device->uuid,
+                    60 * 24 * 30,
+                    '/',
+                    null,
+                    request()->isSecure(),
+                    true,
+                    false,
+                    'lax',
+                ));
+
+                return $device;
+            } catch (QueryException $e) {
+                throw_if($attempts >= 5, $e);
+            }
+        } while (true);
+    }
+
+    protected function rotateCode(KioskDevice $device): void
+    {
+        $attempts = 0;
+
+        do {
+            $attempts++;
+            try {
+                $device->forceFill([
+                    'pairing_code' => KioskDevice::generatePairingCode(),
+                    'expires_at' => now()->addMinutes(KioskDevice::PAIRING_TTL_MINUTES),
+                ])->save();
+
+                return;
+            } catch (QueryException $e) {
+                throw_if($attempts >= 5, $e);
+            }
+        } while (true);
+    }
+
+    protected function syncFromDevice(KioskDevice $device): void
+    {
+        $this->deviceId = $device->id;
+        $this->pairingCode = (string) $device->pairing_code;
+        $this->expiresAt = $device->expires_at?->toIso8601String();
+        $this->expired = false;
+        unset($this->qrSvg);
+    }
+
+    protected function loginAndRedirect(KioskDevice $device): mixed
+    {
+        Auth::login($device->user);
+        session()->regenerate(true);
+        $device->user->switchTeam($device->team);
+        session(['kiosk_device_id' => $device->id]);
+
+        return $this->redirect(
+            route('kiosk.calendar', ['current_team' => $device->team->slug]),
+            navigate: false,
+        );
+    }
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241pair/pair.blade.php" "b/resources/views/pages/kiosk/\342\232\241pair/pair.blade.php"
new file mode 100644
index 0000000..2c85a31
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241pair/pair.blade.php"
@@ -0,0 +1,61 @@
+<div class="w-full max-w-md">
+    <flux:card >
+        @if ($expired)
+            <div class="text-center">
+                <flux:icon name="exclamation-triangle" class="mx-auto mb-3 size-10 text-amber-500" />
+                <flux:heading size="lg">{{ __('Pairing code expired') }}</flux:heading>
+                <flux:text class="mt-2">
+                    {{ __('Refresh the kiosk display and scan the new code.') }}
+                </flux:text>
+            </div>
+        @elseif ($paired)
+            <div class="text-center">
+                <flux:icon name="check-circle" class="mx-auto mb-3 size-10 text-emerald-500" />
+                <flux:heading size="lg">{{ __('Device paired') }}</flux:heading>
+                <flux:text class="mt-2">{{ __('The display will load shortly.') }}</flux:text>
+            </div>
+        @else
+            <flux:heading size="lg">{{ __('Pair this display') }}</flux:heading>
+            <flux:text class="mt-2">
+                {{ __('Code') }}: <span class="font-mono tracking-widest">{{ $code }}</span>
+            </flux:text>
+
+            <flux:card size="sm" class="mt-4">
+                <flux:heading>{{ $this->deviceLabel }}</flux:heading>
+                <flux:text variant="subtle">{{ $device->last_ip }}</flux:text>
+            </flux:card>
+
+            <form wire:submit="approve" class="mt-5 space-y-4">
+                <flux:input
+                    wire:model="name"
+                    :label="__('Name (optional)')"
+                    :placeholder="__('Kitchen display')"
+                    maxlength="60"
+                />
+
+                @if ($this->teams->count() > 1)
+                    <flux:select wire:model="teamId" :label="__('Pair to team')">
+                        <option value="">{{ __('Select a team') }}</option>
+                        @foreach ($this->teams as $team)
+                            <option value="{{ $team->id }}">{{ $team->name }}</option>
+                        @endforeach
+                    </flux:select>
+                @else
+                    <input type="hidden" wire:model="teamId" />
+                    <flux:text class="text-sm text-zinc-500 dark:text-zinc-400">
+                        {{ __('Pairing to') }} <strong>{{ $this->teams->first()?->name }}</strong>
+                    </flux:text>
+                @endif
+
+                <div class="flex items-center justify-between gap-3">
+                    <flux:button type="button" wire:click="reject" variant="ghost">
+                        {{ __('Cancel') }}
+                    </flux:button>
+                    <flux:button type="submit" variant="primary">
+                        {{ __('Pair display') }}
+                    </flux:button>
+                </div>
+            </form>
+        @endif
+    </flux:card>
+</div>
diff --git "a/resources/views/pages/kiosk/\342\232\241pair/pair.php" "b/resources/views/pages/kiosk/\342\232\241pair/pair.php"
new file mode 100644
index 0000000..94bcd45
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241pair/pair.php"
@@ -0,0 +1,128 @@
+<?php
+
+use App\Models\KioskDevice;
+use App\Models\Team;
+use Illuminate\Database\Eloquent\Collection;
+use Illuminate\Support\Facades\Auth;
+use Livewire\Attributes\Computed;
+use Livewire\Attributes\Layout;
+use Livewire\Component;
+
+new #[Layout('layouts.auth')] class extends Component
+{
+    public string $code = '';
+
+    public KioskDevice $device;
+
+    public string $name = '';
+
+    public ?int $teamId = null;
+
+    public bool $paired = false;
+
+    public bool $expired = false;
+
+    public function mount(string $code): void
+    {
+        $device = KioskDevice::query()
+            ->where('pairing_code', $code)
+            ->pending()
+            ->first();
+
+        if (! $device) {
+            $this->code = $code;
+            $this->expired = true;
+            $this->device = new KioskDevice;
+
+            return;
+        }
+
+        $this->code = $code;
+        $this->device = $device;
+
+        $teams = $this->teams;
+        if ($teams->count() === 1) {
+            $this->teamId = $teams->first()->id;
+        } elseif (Auth::user()->current_team_id && $teams->contains('id', Auth::user()->current_team_id)) {
+            $this->teamId = Auth::user()->current_team_id;
+        }
+    }
+
+    /** @return Collection<int, Team> */
+    #[Computed]
+    public function teams(): Collection
+    {
+        return Auth::user()->teams()->orderBy('name')->get();
+    }
+
+    #[Computed]
+    public function deviceLabel(): string
+    {
+        $ua = (string) $this->device->user_agent;
+
+        if ($ua === '') {
+            return __('Unknown device');
+        }
+
+        return match (true) {
+            str_contains($ua, 'iPhone') => 'iPhone',
+            str_contains($ua, 'iPad') => 'iPad',
+            str_contains($ua, 'Android') => 'Android device',
+            str_contains($ua, 'Macintosh') => 'Mac',
+            str_contains($ua, 'Windows') => 'Windows PC',
+            str_contains($ua, 'Linux') => 'Linux device',
+            default => __('Web browser'),
+        };
+    }
+
+    public function approve(): void
+    {
+        if ($this->expired) {
+            return;
+        }
+
+        $validated = $this->validate([
+            'name' => ['nullable', 'string', 'max:60'],
+            'teamId' => ['required', 'integer', 'in:' . $this->teams->pluck('id')->implode(',')],
+        ]);
+
+        $name = trim((string) $validated['name']) ?: null;
+
+        $affected = KioskDevice::query()
+            ->whereKey($this->device->id)
+            ->whereNull('paired_at')
+            ->where('expires_at', '>', now())
+            ->where('pairing_code', $this->code)
+            ->update([
+                'user_id' => Auth::id(),
+                'team_id' => $validated['teamId'],
+                'name' => $name,
+                'paired_at' => now(),
+                'expires_at' => null,
+                'pairing_code' => null,
+                'updated_at' => now(),
+            ]);
+
+        if ($affected !== 1) {
+            $this->expired = true;
+
+            return;
+        }
+
+        $this->paired = true;
+    }
+
+    public function reject(): void
+    {
+        if ($this->expired) {
+            return;
+        }
+
+        KioskDevice::query()
+            ->whereKey($this->device->id)
+            ->whereNull('paired_at')
+            ->delete();
+
+        $this->expired = true;
+    }
+};
diff --git "a/resources/views/pages/kiosk/\342\232\241pair/pair.test.php" "b/resources/views/pages/kiosk/\342\232\241pair/pair.test.php"
new file mode 100644
index 0000000..141a54d
--- /dev/null
+++ "b/resources/views/pages/kiosk/\342\232\241pair/pair.test.php"
@@ -0,0 +1,248 @@
+<?php
+
+use App\Models\KioskDevice;
+use App\Models\Team;
+use App\Models\User;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Cookie;
+use Livewire\Livewire;
+use Livewire\Mechanisms\HandleRequests\EndpointResolver;
+
+use function Pest\Laravel\actingAs;
+use function Pest\Laravel\get;
+use function Pest\Laravel\withCookie;
+
+test('guest visiting /kiosk gets a QR code and pairing row', function (): void {
+    get('/kiosk')
+        ->assertOk()
+        ->assertCookie('kiosk_device_uuid');
+
+    expect(KioskDevice::query()->first())->not->toBeNull()
+        ->pairing_code->toHaveLength(8)
+        ->paired_at->toBeNull()
+        ->expires_at->not->toBeNull();
+});
+
+test('the same browser keeps its pairing row on repeat visits', function (): void {
+    expect(KioskDevice::query()->count())->toBe(0);
+
+    // generate device code
+    get('/kiosk');
+
+    $device = KioskDevice::query()->first();
+    $cookie = Cookie::queued('kiosk_device_uuid')->getValue();
+    expect($device->uuid)->toBe($cookie);
+
+    // visit again and see same code
+    withCookie('kiosk_device_uuid', $cookie)
+        ->get('/kiosk')
+        ->assertOk()
+        ->assertSee($device->pairing_code);
+
+    expect(KioskDevice::query()->count())->toBe(1);
+});
+
+test('phone confirm route requires authentication', function (): void {
+    $device = KioskDevice::factory()->pending()->create();
+
+    get(route('kiosk.pair', ['code' => $device->pairing_code]))
+        ->assertRedirect(route('login'));
+});
+
+test('phone visiting an expired code sees the expired view', function (): void {
+    $user = User::factory()->create();
+    $device = KioskDevice::factory()->expired()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.pair', ['code' => $device->pairing_code])
+        ->assertSet('expired', true)
+        ->assertSee(__('Pairing code expired'));
+});
+
+test('phone visiting an unknown code sees the expired view', function (): void {
+    $user = User::factory()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.pair', ['code' => 'NOPECODE'])
+        ->assertSet('expired', true);
+});
+
+test('phone can approve a pending device and mark it paired', function (): void {
+    $user = User::factory()->create();
+    $device = KioskDevice::factory()->pending()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.pair', ['code' => $device->pairing_code])
+        ->set('name', 'Kitchen TV')
+        ->set('teamId', $user->currentTeam->id)
+        ->call('approve')
+        ->assertSet('paired', true);
+
+    expect($device->refresh())
+        ->paired_at->not->toBeNull()
+        ->expires_at->toBeNull()
+        ->pairing_code->toBeNull()
+        ->user_id->toBe($user->id)
+        ->team_id->toBe($user->currentTeam->id)
+        ->name->toBe('Kitchen TV');
+});
+
+test('phone cannot approve a team they are not a member of', function (): void {
+    $user = User::factory()->create();
+    $otherTeam = Team::factory()->create();
+    $device = KioskDevice::factory()->pending()->create();
+
+    Livewire::actingAs($user)
+        ->test('pages::kiosk.pair', ['code' => $device->pairing_code])
+        ->set('teamId', $otherTeam->id)
+        ->call('approve')
+        ->assertHasErrors(['teamId']);
+
+    expect($device->fresh())
+        ->paired_at->toBeNull();
+});
+
+test('once a phone approves the device poll logs in and redirects', function (): void {
+    $user = User::factory()->create();
+    $device = KioskDevice::factory()->pending()->create();
+
+    $component = Livewire::test('pages::kiosk.index')
+        ->set('deviceId', $device->id);
+
+    KioskDevice::query()->whereKey($device->id)->update([
+        'user_id' => $user->id,
+        'team_id' => $user->currentTeam->id,
+        'paired_at' => now(),
+        'expires_at' => null,
+        'pairing_code' => null,
+    ]);
+
+    $component->call('check')
+        ->assertRedirect(route('kiosk.calendar', ['current_team' => $user->currentTeam->slug]));
+
+    expect(Auth::check())->toBeTrue()
+        ->and(Auth::id())->toBe($user->id)
+        ->and(session('kiosk_device_id'))->toBe($device->id);
+});
+
+test('concurrent approve only succeeds once', function (): void {
+    $userA = User::factory()->create();
+    $userB = User::factory()->create();
+    $device = KioskDevice::factory()->pending()->create();
+
+    Livewire::actingAs($userA)
+        ->test('pages::kiosk.pair', ['code' => $device->pairing_code])
+        ->set('teamId', $userA->currentTeam->id)
+        ->call('approve')
+        ->assertSet('paired', true);
+
+    Livewire::actingAs($userB)
+        ->test('pages::kiosk.pair', ['code' => $device->pairing_code])
+        ->set('teamId', $userB->currentTeam->id)
+        ->call('approve')
+        ->assertSet('expired', true)
+        ->assertSet('paired', false);
+
+    expect($device->refresh())
+        ->user_id->toBe($userA->id)
+        ->team_id->toBe($userA->currentTeam->id);
+});
+
+test('approve fails if pairing_code rotates between mount and approve', function (): void {
+    $user = User::factory()->create();
+    $device = KioskDevice::factory()->pending()->create();
+
+    $phone = Livewire::actingAs($user)
+        ->test('pages::kiosk.pair', ['code' => $device->pairing_code])
+        ->set('teamId', $user->currentTeam->id);
+
+    KioskDevice::query()->whereKey($device->id)->update([
+        'pairing_code' => KioskDevice::generatePairingCode(),
+    ]);
+
+    $phone
+        ->call('approve')
+        ->assertSet('expired', true);
+
+    expect($device->fresh())
+        ->paired_at->toBeNull();
+});
+
+test('paired kiosk session cannot access dashboard', function (): void {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->withSession(['kiosk_device_id' => 99])
+        ->get(route('dashboard'))
+        ->assertForbidden();
+});
+
+test('paired kiosk session can access kiosk pages', function (): void {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->withSession(['kiosk_device_id' => 99])
+        ->get(route('kiosk.calendar'))
+        ->assertOk();
+});
+
+test('paired kiosk session can access root /kiosk after its device row is deleted', function (): void {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->withSession(['kiosk_device_id' => 99])
+        ->get('/kiosk')
+        ->assertOk();
+});
+
+test('paired kiosk session can hit livewire update endpoint', function (): void {
+    $user = User::factory()->create();
+    $updatePath = EndpointResolver::updatePath();
+
+    $response = $this->actingAs($user)->withSession(['kiosk_device_id' => 99])
+        ->post($updatePath, []);
+
+    expect($response->status())->not->toBe(403);
+});
+
+test('normal user session is not restricted', function (): void {
+    $user = User::factory()->create();
+
+    actingAs($user)
+        ->get(route('dashboard'))
+        ->assertOk();
+});
+
+test('deleting a paired device returns it to QR on next visit', function (): void {
+    $user = User::factory()->create();
+    $device = KioskDevice::factory()->paired()->create([
+        'uuid' => 'fixed-uuid',
+        'user_id' => $user->id,
+        'team_id' => $user->currentTeam->id,
+    ]);
+
+    $device->delete();
+
+    withCookie('kiosk_device_uuid', 'fixed-uuid')
+        ->get('/kiosk')
+        ->assertOk();
+
+    expect(KioskDevice::query()->count())->toBe(1);
+    expect(KioskDevice::query()->first())
+        ->uuid->not->toBe('fixed-uuid')
+        ->paired_at->toBeNull();
+});
+
+test('session id rotates after pair-completion login', function (): void {
+    $user = User::factory()->create();
+    $device = KioskDevice::factory()->paired($user, $user->currentTeam)->create();
+
+    session()->put('marker', 'before-pair');
+    $sessionIdBefore = session()->getId();
+
+    Livewire::test('pages::kiosk.index')
+        ->set('deviceId', $device->id)
+        ->call('check');
+
+    expect(session()->getId())->not->toBe($sessionIdBefore);
+});
diff --git a/routes/kiosk.php b/routes/kiosk.php
index 27b2351..b8bcd57 100644
--- a/routes/kiosk.php
+++ b/routes/kiosk.php
@@ -3,6 +3,12 @@
 use App\Http\Middleware\EnsureTeamMembership;
 use Illuminate\Support\Facades\Route;
 
+Route::livewire('kiosk', 'pages::kiosk.index')->name('kiosk.index');
+
+Route::livewire('kiosk/pair/{code}', 'pages::kiosk.pair')
+    ->middleware(['auth', 'verified'])
+    ->name('kiosk.pair');
+
 Route::prefix('{current_team}/kiosk')
     ->middleware(['auth', 'verified', EnsureTeamMembership::class])
     ->name('kiosk')

From eb41b5947a6cb87db634a247d7770f49499e1221 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 2 Jun 2026 16:45:07 -0500
Subject: [PATCH 50/57] Add clock component with js rendering and truncate URLs

---
 resources/views/components/ui/clock.blade.php | 40 +++++++++++++++++++
 .../\342\232\241calendar/calendar.blade.php"  |  2 +-
 .../\342\232\241calendar/calendar.blade.php"  |  2 +-
 3 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 resources/views/components/ui/clock.blade.php

diff --git a/resources/views/components/ui/clock.blade.php b/resources/views/components/ui/clock.blade.php
new file mode 100644
index 0000000..595d978
--- /dev/null
+++ b/resources/views/components/ui/clock.blade.php
@@ -0,0 +1,40 @@
+@props(['timezone'])
+
+<div
+    x-data='{
+        interval: null,
+        now: new Date(),
+        timezone: "{{ $timezone }}",
+
+        init() {
+            this.interval = setInterval(() => {
+                this.now = new Date()
+            }, 1000)
+        },
+
+        destroy() {
+            clearInterval(this.interval)
+        },
+
+        formattedDateTime() {
+            const parts = new Intl.DateTimeFormat("en-US", {
+                day: "numeric",
+                hour: "numeric",
+                minute: "2-digit",
+                month: "short",
+                timeZone: this.timezone,
+                weekday: "short",
+            }).formatToParts(this.now).reduce((carry, part) => {
+                carry[part.type] = part.value
+
+                return carry
+            }, {})
+
+            return `${parts.weekday}, ${parts.month} ${parts.day} ${parts.hour}:${parts.minute} ${parts.dayPeriod}`
+        },
+    }'
+>
+    <flux:heading size="xl" x-text="formattedDateTime()">
+        {{ Carbon\CarbonImmutable::now($this->timezoneName())->format('D, M j g:i A') }}
+    </flux:heading>
+</div>
diff --git "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
index 40975f3..44a31f0 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
@@ -16,7 +16,7 @@
                             <span class="truncate font-medium">{{ $feed->name }}</span>
                         </flux:heading>
 
-                        <flux:text variant="subtle">{{ $feed->url }}</flux:text>
+                        <flux:text variant="subtle" class="truncate max-w-64" title="{{ $feed->url }}">{{ $feed->url }}</flux:text>
                     </div>
 
                     <div class="flex shrink-0 items-center gap-1">
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index 1209822..afdf9e7 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -1,6 +1,6 @@
 <div class="flex h-dvh flex-col overflow-hidden">
     <div class="flex shrink-0 flex-col gap-3 border-b border-zinc-200 px-5 py-4 dark:border-zinc-700 sm:flex-row sm:items-center sm:justify-between">
-        <flux:heading size="xl">{{ Carbon\CarbonImmutable::now($this->timezoneName())->format('D, M j g:i A') }}</flux:heading>
+        <x-ui.clock :timezone="auth()->user()->currentTeam->timezone"/>
 
         <div class="flex items-center gap-2">
             <flux:dropdown>

From f8b6819f3572a75436cb56bcd5be1fcdad751d16 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 2 Jun 2026 16:50:31 -0500
Subject: [PATCH 51/57] Add polling

---
 .../kiosk/configure/\342\232\241calendar/calendar.blade.php"    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
index 44a31f0..3ad1a5c 100644
--- "a/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/configure/\342\232\241calendar/calendar.blade.php"
@@ -1,4 +1,4 @@
-<div class="space-y-6">
+<div class="space-y-6" wire:poll.60s>
     <div class="flex items-center justify-between">
         <flux:heading size="lg">{{ __('Calendar feeds') }}</flux:heading>
         <flux:modal.trigger name="feed-form">

From 5721db39a6d800c82ca5d2a27e185ad5d53f1c9f Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 2 Jun 2026 17:25:36 -0500
Subject: [PATCH 52/57] Add polling for slow refreshes

---
 .../views/pages/kiosk/\342\232\241calendar/calendar.blade.php"  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
index afdf9e7..49d2196 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.blade.php"
@@ -1,4 +1,4 @@
-<div class="flex h-dvh flex-col overflow-hidden">
+<div class="flex h-dvh flex-col overflow-hidden" wire:poll.600s>
     <div class="flex shrink-0 flex-col gap-3 border-b border-zinc-200 px-5 py-4 dark:border-zinc-700 sm:flex-row sm:items-center sm:justify-between">
         <x-ui.clock :timezone="auth()->user()->currentTeam->timezone"/>
 

From 4c039654d91f0071a565d71cd0ce6456bd360d06 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 2 Jun 2026 17:27:58 -0500
Subject: [PATCH 53/57] Add manual refresh button

---
 resources/views/layouts/kiosk.blade.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/resources/views/layouts/kiosk.blade.php b/resources/views/layouts/kiosk.blade.php
index c4ad432..417b581 100644
--- a/resources/views/layouts/kiosk.blade.php
+++ b/resources/views/layouts/kiosk.blade.php
@@ -11,6 +11,17 @@
             <x-kiosk.sidebar.item icon="clipboard-document-list" :href="route('kiosk.chore-chart')" :current="request()->routeIs('kiosk.chore-chart')" wire:navigate>{{ __('Chores') }}</x-kiosk.sidebar.item>
             <x-kiosk.sidebar.item icon="queue-list" :href="route('kiosk.lists')" :current="request()->routeIs('kiosk.lists')" wire:navigate>{{ __('Lists') }}</x-kiosk.sidebar.item>
             <x-kiosk.sidebar.item icon="cooking-pot" :href="route('kiosk.meal-planning')" :current="request()->routeIs('kiosk.meal-planning')" wire:navigate>{{ __('Meals') }}</x-kiosk.sidebar.item>
+
+            <button
+                type="button"
+                class="mt-auto flex h-20 flex-col items-center justify-center p-2 text-zinc-700 hover:text-(--color-accent-content) dark:text-zinc-300"
+                data-kiosk-refresh
+                x-data
+                x-on:click="window.location.reload()"
+            >
+                <flux:icon icon="arrow-path" />
+                <flux:text>{{ __('Refresh') }}</flux:text>
+            </button>
         </x-kiosk.sidebar>
 
         <flux:main class="!p-0">

From 112d3e1c87b32cda6434d79a663738c309669899 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 2 Jun 2026 17:38:39 -0500
Subject: [PATCH 54/57] Add time range to calendar events

---
 .../components/kiosk/calendar/day.blade.php   |  7 +------
 .../components/kiosk/calendar/event.blade.php |  2 +-
 .../components/kiosk/calendar/month.blade.php |  2 +-
 .../kiosk/\342\232\241calendar/calendar.php"  | 18 ++++++++++++++++
 .../\342\232\241calendar/calendar.test.php"   | 21 +++++++++++++++++--
 5 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/resources/views/components/kiosk/calendar/day.blade.php b/resources/views/components/kiosk/calendar/day.blade.php
index 48d939c..3a7ea15 100644
--- a/resources/views/components/kiosk/calendar/day.blade.php
+++ b/resources/views/components/kiosk/calendar/day.blade.php
@@ -53,12 +53,7 @@ class="h-20 border-b border-zinc-100 dark:border-zinc-800"
                             style="top: {{ $event['timeline_top'] }}%; height: {{ $event['timeline_height'] }}%; left: 0; right: 0; min-height: 2.5rem; border-left: 4px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
                         >
                             <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
-                                {{ $event['starts_at']->format('g:i A') }}
-
-                                @if ($event['ends_at'])
-                                    <span>{{ __('-') }}</span>
-                                    <span>{{ $event['ends_at']->format('g:i A') }}</span>
-                                @endif
+                                {{ $this->eventTimeRange($event) }}
                             </div>
 
                             <div class="truncate font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
diff --git a/resources/views/components/kiosk/calendar/event.blade.php b/resources/views/components/kiosk/calendar/event.blade.php
index c8f68aa..6d70e74 100644
--- a/resources/views/components/kiosk/calendar/event.blade.php
+++ b/resources/views/components/kiosk/calendar/event.blade.php
@@ -7,7 +7,7 @@
     style="border-left: 4px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
 >
     <div class="mb-1 flex items-center gap-1.5 text-xs font-medium text-zinc-500 dark:text-zinc-400">
-        {{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}
+        {{ $this->eventTimeRange($event) }}
     </div>
 
     <div class="wrap-break-word font-medium leading-snug text-zinc-900 dark:text-zinc-100">{{ $event['title'] }}</div>
diff --git a/resources/views/components/kiosk/calendar/month.blade.php b/resources/views/components/kiosk/calendar/month.blade.php
index 47c53cb..53c9c42 100644
--- a/resources/views/components/kiosk/calendar/month.blade.php
+++ b/resources/views/components/kiosk/calendar/month.blade.php
@@ -40,7 +40,7 @@
                                 ])
                                 style="border-left: 3px {{ ($event['response_status'] ?? null) === 'NEEDS-ACTION' ? 'dashed' : 'solid' }} {{ $event['feed_color'] }}"
                             >
-                                <span class="font-medium">{{ $event['all_day'] ? __('All day') : $event['starts_at']->format('g:i A') }}</span>
+                                <span class="font-medium">{{ $this->eventTimeRange($event) }}</span>
                                 {{ $event['title'] }}
                             </div>
                         @endforeach
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index 3b44d8d..c106456 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -181,6 +181,24 @@ public function current(): void
         $this->clearCalendarState();
     }
 
+    /** @param array{starts_at: CarbonImmutable, ends_at: CarbonImmutable|null, all_day: bool} $event */
+    public function eventTimeRange(array $event): string
+    {
+        if ($event['all_day']) {
+            return __('All day');
+        }
+
+        if (! $event['ends_at'] instanceof CarbonImmutable) {
+            return $event['starts_at']->format('g:i A');
+        }
+
+        $startsAtFormat = $event['starts_at']->format('A') === $event['ends_at']->format('A')
+            ? 'g:i'
+            : 'g:i A';
+
+        return $event['starts_at']->format($startsAtFormat).' - '.$event['ends_at']->format('g:i A');
+    }
+
     private function weekStartsAt(): CarbonImmutable
     {
         return $this->focusedDate()
diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
index 29f74c9..8facf2e 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.test.php"
@@ -88,6 +88,20 @@
 SUMMARY:Morning Standup
 LOCATION:Kitchen
 END:VEVENT
+BEGIN:VEVENT
+UID:family-lunch
+DTSTAMP:20260501T120000Z
+DTSTART;TZID=America/Chicago:20260508T100000
+DTEND;TZID=America/Chicago:20260508T130000
+SUMMARY:Family Lunch
+END:VEVENT
+BEGIN:VEVENT
+UID:evening-game
+DTSTAMP:20260501T120000Z
+DTSTART;TZID=America/Chicago:20260508T170000
+DTEND;TZID=America/Chicago:20260508T190000
+SUMMARY:Evening Game
+END:VEVENT
 END:VCALENDAR
 ICS),
     ]);
@@ -111,9 +125,12 @@
         ->assertSee('All day')
         ->assertSee('Family Day')
         ->assertSee('Morning Standup')
+        ->assertSee('Family Lunch')
+        ->assertSee('Evening Game')
         ->assertSee('Kitchen')
-        ->assertSee('9:00 AM')
-        ->assertSee('10:30 AM')
+        ->assertSee('9:00 - 10:30 AM')
+        ->assertSee('10:00 AM - 1:00 PM')
+        ->assertSee('5:00 - 7:00 PM')
         ->assertSee('top: 37.5%', false)
         ->assertSee('height: 6.25%', false);
 });

From 7dc4a38cd79c5cb74f6d0ababf1ded730ab1d030 Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Tue, 2 Jun 2026 22:40:00 +0000
Subject: [PATCH 55/57] Dusting

---
 "resources/views/pages/kiosk/\342\232\241calendar/calendar.php" | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php" "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
index c106456..f05312b 100644
--- "a/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
+++ "b/resources/views/pages/kiosk/\342\232\241calendar/calendar.php"
@@ -196,7 +196,7 @@ public function eventTimeRange(array $event): string
             ? 'g:i'
             : 'g:i A';
 
-        return $event['starts_at']->format($startsAtFormat).' - '.$event['ends_at']->format('g:i A');
+        return $event['starts_at']->format($startsAtFormat) . ' - ' . $event['ends_at']->format('g:i A');
     }
 
     private function weekStartsAt(): CarbonImmutable

From 7d03bac22151badf5f5e79827178954378a84420 Mon Sep 17 00:00:00 2001
From: techenby <6541180+techenby@users.noreply.github.com>
Date: Tue, 2 Jun 2026 22:40:01 +0000
Subject: [PATCH 56/57] Ignore Dusting commit in git blame

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index be1d517..6863968 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,3 +1,4 @@
 24b8f32bcf7e24f999bd8763bc9baca607fad516
 62f533191a8f08fb724b207b4e3f53f9ab2b35bb
 e42a663c237250cc6e17eed50a7e3802d35e6a34
+7dc4a38cd79c5cb74f6d0ababf1ded730ab1d030

From 7c535d96679c0d4b73e6d64fecacdea002ffb584 Mon Sep 17 00:00:00 2001
From: Andy Swick <andy@techenby.com>
Date: Tue, 2 Jun 2026 22:56:31 -0500
Subject: [PATCH 57/57] Remove device id

---
 .../pages/kiosk/\342\232\241index/index.php"  | 17 ++++++++++++---
 .../kiosk/\342\232\241pair/pair.test.php"     | 21 +++++++++++++------
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git "a/resources/views/pages/kiosk/\342\232\241index/index.php" "b/resources/views/pages/kiosk/\342\232\241index/index.php"
index 6b4970a..b96e67b 100644
--- "a/resources/views/pages/kiosk/\342\232\241index/index.php"
+++ "b/resources/views/pages/kiosk/\342\232\241index/index.php"
@@ -17,8 +17,6 @@
 {
     public const COOKIE_NAME = 'kiosk_device_uuid';
 
-    public ?int $deviceId = null;
-
     public string $pairingCode = '';
 
     public ?string $expiresAt = null;
@@ -40,7 +38,7 @@ public function mount(): void
 
     public function check(): mixed
     {
-        $device = KioskDevice::query()->find($this->deviceId);
+        $device = $this->deviceFromCookie();
 
         if (! $device) {
             return $this->redirect(request()->fullUrl(), navigate: false);
@@ -93,6 +91,19 @@ protected function resolveDevice(): KioskDevice
         return $this->createDevice();
     }
 
+    protected function deviceFromCookie(): ?KioskDevice
+    {
+        $uuid = request()->cookie(self::COOKIE_NAME);
+
+        if (! $uuid) {
+            return null;
+        }
+
+        return KioskDevice::query()
+            ->where('uuid', $uuid)
+            ->first();
+    }
+
     protected function createDevice(): KioskDevice
     {
         $attempts = 0;
diff --git "a/resources/views/pages/kiosk/\342\232\241pair/pair.test.php" "b/resources/views/pages/kiosk/\342\232\241pair/pair.test.php"
index 141a54d..3103fd9 100644
--- "a/resources/views/pages/kiosk/\342\232\241pair/pair.test.php"
+++ "b/resources/views/pages/kiosk/\342\232\241pair/pair.test.php"
@@ -106,8 +106,8 @@
     $user = User::factory()->create();
     $device = KioskDevice::factory()->pending()->create();
 
-    $component = Livewire::test('pages::kiosk.index')
-        ->set('deviceId', $device->id);
+    $component = Livewire::withCookie('kiosk_device_uuid', $device->uuid)
+        ->test('pages::kiosk.index');
 
     KioskDevice::query()->whereKey($device->id)->update([
         'user_id' => $user->id,
@@ -235,14 +235,23 @@
 
 test('session id rotates after pair-completion login', function (): void {
     $user = User::factory()->create();
-    $device = KioskDevice::factory()->paired($user, $user->currentTeam)->create();
+    $device = KioskDevice::factory()->pending()->create();
 
     session()->put('marker', 'before-pair');
     $sessionIdBefore = session()->getId();
 
-    Livewire::test('pages::kiosk.index')
-        ->set('deviceId', $device->id)
-        ->call('check');
+    $component = Livewire::withCookie('kiosk_device_uuid', $device->uuid)
+        ->test('pages::kiosk.index');
+
+    KioskDevice::query()->whereKey($device->id)->update([
+        'user_id' => $user->id,
+        'team_id' => $user->currentTeam->id,
+        'paired_at' => now(),
+        'expires_at' => null,
+        'pairing_code' => null,
+    ]);
+
+    $component->call('check');
 
     expect(session()->getId())->not->toBe($sessionIdBefore);
 });