diff --git a/README.md b/README.md
index c46ffca..4dfce62 100644
--- a/README.md
+++ b/README.md
@@ -1,17 +1,33 @@
# Family Calendar Display
-A smart display application for Raspberry Pi that shows time, weather, calendar events, and rotating background images.
+A smart display application for Raspberry Pi that shows a color-coded, week-view family calendar with live weather, styled after wall-mounted family calendar devices (e.g. Skylight).
**Project created:** February 14, 2026
+**UI redesigned:** June 30, 2026 β switched from a scrolling event list over a photo background to a light-themed week grid with per-person event colors.
## Features
+- π
**Week-View Calendar** - SundayβSaturday grid with a "Next Week" preview column, Prev/Next navigation
+- π¨βπ©βπ§βπ¦ **Color-Coded Family Members** - Events tagged `[Name]` are shown in that person's color (see below)
+- π **Filter by Person** - Dropdown to show only one family member's events
+- π€οΈ **Weather** - Current temperature and icon in the header (OpenWeatherMap)
- π **Real-time Clock** - Current time and date display
-- π€οΈ **Weather** - Current weather and 3-day forecast (OpenWeatherMap)
-- π
**Google Calendar** - Calendar events display (supports public iCal feeds)
-- πΌοΈ **Rotating Backgrounds** - Beautiful images from local directory
-- π¨ **Dynamic Text Color** - Automatically adjusts text color based on background brightness
-- π **Dad Jokes** - Random jokes to brighten your day (optional)
+- π **Read-only by design** - The "+" button is a visual affordance only; this app reads a public iCal feed and cannot write events back to Google Calendar. Add/edit events directly in Google Calendar.
+
+> The previous rotating-background-photo and dad-joke features were dropped in the redesign to match the cleaner device look. The `/api/background` and `/api/joke` endpoints still exist server-side if you want to bring them back.
+
+## Family Member Colors
+
+Prefix an event title in Google Calendar with `[Name]` (case-insensitive) and the app will strip the prefix and color the event card accordingly. Unprefixed events fall back to a neutral gray "Family" color.
+
+| Name / alias | Color |
+|---|---|
+| `[Ludwig]` or `[Dad]` | Blue |
+| `[Michelle]` or `[Mom]` | Pink |
+| `[Jason]` | Green |
+| `[Daniel]` | Yellow |
+
+Example: an event titled `[Daniel] Football Practice` displays as **Football Practice** in Daniel's yellow card. Member names/aliases/colors are configured in `config.py` (`FAMILY_MEMBERS`).
## Requirements
@@ -98,30 +114,9 @@ If you prefer to use private calendars with authentication:
6. Save it as `credentials/google_calendar_credentials.json`
7. Share your calendar with the service account email
-### 6. Add Background Images
+### 6. Set Up Family Member Colors (optional)
-Place your images in the `static/backgrounds/` directory:
-
-```bash
-cp /path/to/your/images/*.jpg static/backgrounds/
-```
-
-**Supported formats:** JPG, JPEG, PNG, GIF, WebP
-
-**Recommended specifications:**
-- Resolution: 1920x1080 or higher
-- Aspect ratio: 16:9 (for full-screen displays)
-- File size: Keep under 5MB for faster loading
-
-**Changing Image Rotation Interval:**
-
-Edit `static/js/app.js`:
-```javascript
-const INTERVALS = {
- BACKGROUND: 3600000, // Milliseconds (3600000 = 60 minutes)
- ...
-};
-```
+Prefix event titles in your calendar with `[Name]` to color-code them per person β see [Family Member Colors](#family-member-colors) above. Edit `FAMILY_MEMBERS` in `config.py` to change names, aliases, or colors.
### 7. Run the Application
@@ -219,12 +214,11 @@ This will:
**Calendar Settings:**
- `GOOGLE_CALENDAR_ID` - Your calendar ID
- `GOOGLE_CALENDAR_ICAL_URL` - Public iCal feed URL (easiest method)
-- `CALENDAR_DAYS_AHEAD` - Number of days ahead to show events (default: 5)
+- `CALENDAR_DAYS_AHEAD` - Used only by the legacy events fetch; the week view always fetches two weeks at a time
**Update Intervals (in seconds):**
- `WEATHER_UPDATE_INTERVAL` - Weather refresh interval (default: 900)
- `CALENDAR_UPDATE_INTERVAL` - Calendar refresh interval (default: 300)
-- `JOKE_UPDATE_INTERVAL` - Dad joke refresh interval (default: 3600)
**Other:**
- `FLASK_SECRET_KEY` - Flask session secret key
@@ -237,20 +231,10 @@ For more precise control over update intervals, edit the `INTERVALS` object:
const INTERVALS = {
TIME: 1000, // 1 second
WEATHER: 900000, // 15 minutes
- CALENDAR: 300000, // 5 minutes
- BACKGROUND: 3600000, // 60 minutes
- JOKE: 3600000 // 1 hour
+ CALENDAR: 300000 // 5 minutes
};
```
-**To change image rotation time:**
-1. Open `static/js/app.js`
-2. Find the `INTERVALS` object at the top
-3. Change `BACKGROUND` to your desired value in milliseconds
- - 300000 = 5 minutes
- - 1800000 = 30 minutes
- - 3600000 = 60 minutes (default)
-
## Project Structure
```
@@ -274,9 +258,9 @@ Calender/
- `GET /` - Main display page
- `GET /api/weather` - Weather data (cached for 15 min)
-- `GET /api/calendar` - Calendar events (cached for 5 min)
-- `GET /api/background` - Random background image
-- `GET /api/joke` - Dad joke (cached for 1 hour)
+- `GET /api/calendar?start=YYYY-MM-DD` - Sunday-starting week of events plus a "Next Week" preview, color-coded by family member (cached per-week for 5 min). `start` defaults to the current week if omitted.
+- `GET /api/background` - Random background image (no longer used by the UI, kept for future use)
+- `GET /api/joke` - Dad joke (no longer used by the UI, kept for future use)
## Troubleshooting
@@ -285,18 +269,17 @@ Calender/
- Ensure you're not exceeding the free tier rate limits (60 calls/min)
### Calendar not loading
-- Verify Google Calendar API credentials are set up correctly
+- Verify the iCal URL in `.env` is correct and the calendar is set to Public
- Check the calendar ID is correct
-- Ensure the service account has access to the calendar
+
+### Events showing the wrong color / "Family" instead of a person
+- The event title must start with `[Name]` exactly, e.g. `[Daniel] Football Practice`
+- Check `FAMILY_MEMBERS` in `config.py` for the recognized aliases
### Display not starting on boot
- Check systemd service status: `sudo systemctl status calendar-display.service`
- View logs: `sudo journalctl -u calendar-display.service -f`
-### Background images not showing
-- Ensure images are in [static/backgrounds/](static/backgrounds/)
-- Check file permissions: `chmod 644 static/backgrounds/*`
-
## Contributing
Feel free to submit issues or pull requests!
diff --git a/app.py b/app.py
index e261987..9393f5c 100644
--- a/app.py
+++ b/app.py
@@ -1,7 +1,8 @@
-from flask import Flask, render_template, jsonify
+from flask import Flask, render_template, jsonify, request
import requests
import os
import random
+import re
from datetime import datetime, timedelta, date
from icalendar import Calendar
from config import Config
@@ -13,7 +14,7 @@ app.config.from_object(Config)
# Cache for API responses to avoid rate limiting
weather_cache = {'data': None, 'timestamp': None}
-calendar_cache = {'data': None, 'timestamp': None}
+calendar_cache = {'data': None, 'timestamp': None, 'key': None}
joke_cache = {'data': None, 'timestamp': None}
@@ -94,35 +95,84 @@ def get_weather():
return jsonify({'error': 'Unable to fetch weather data'}), 500
+MEMBER_PREFIX_RE = re.compile(r'^\s*\[([^\]]+)\]\s*(.*)')
+
+
+def parse_member_and_title(summary, family_members):
+ """Split a "[Alias] Title" event summary into (member_dict, clean_title)."""
+ match = MEMBER_PREFIX_RE.match(summary)
+ if not match:
+ return None, summary
+
+ alias = match.group(1).strip().lower()
+ title = match.group(2).strip() or summary
+ for member in family_members:
+ if alias in member['aliases']:
+ return member, title
+ return None, title
+
+
+def week_start_for(d):
+ """Return the Sunday on/before date d (Sunday-starting week)."""
+ return d - timedelta(days=(d.weekday() + 1) % 7)
+
+
+def empty_week_payload(week_start_date, members):
+ days = []
+ for i in range(7):
+ d = week_start_date + timedelta(days=i)
+ days.append({'date': d.isoformat(), 'weekday': d.strftime('%A'), 'events': []})
+ next_week_start = week_start_date + timedelta(days=7)
+ next_week_end = next_week_start + timedelta(days=6)
+ return {
+ 'week_start': week_start_date.isoformat(),
+ 'week_end': (week_start_date + timedelta(days=6)).isoformat(),
+ 'days': days,
+ 'next_week': {'start': next_week_start.isoformat(), 'end': next_week_end.isoformat(), 'count': 0, 'events': []},
+ 'members': members,
+ }
+
+
@app.route('/api/calendar')
def get_calendar():
- """Fetch Google Calendar events from iCal feed."""
+ """Fetch Google Calendar events from iCal feed for a Sunday-starting week."""
global calendar_cache
- # Check cache - use timezone-aware datetime
nz_tz = pytz.timezone('Pacific/Auckland')
now = datetime.now(nz_tz)
- if (calendar_cache['data'] and calendar_cache['timestamp'] and
+
+ start_param = request.args.get('start')
+ if start_param:
+ try:
+ week_start_date = week_start_for(datetime.strptime(start_param, '%Y-%m-%d').date())
+ except ValueError:
+ week_start_date = week_start_for(now.date())
+ else:
+ week_start_date = week_start_for(now.date())
+
+ family_members = app.config['FAMILY_MEMBERS']
+ default_member = app.config['DEFAULT_MEMBER']
+ members_for_filter = family_members + [default_member]
+
+ cache_key = week_start_date.isoformat()
+ if (calendar_cache.get('key') == cache_key and calendar_cache['data'] and calendar_cache['timestamp'] and
(now - calendar_cache['timestamp']).total_seconds() < app.config['CALENDAR_UPDATE_INTERVAL']):
return jsonify(calendar_cache['data'])
try:
- # Fetch iCal feed
ical_url = app.config.get('GOOGLE_CALENDAR_ICAL_URL')
if not ical_url:
- return jsonify([])
+ return jsonify(empty_week_payload(week_start_date, members_for_filter))
response = requests.get(ical_url, timeout=10)
response.raise_for_status()
- # Parse iCal data
cal = Calendar.from_ical(response.content)
- # Use recurring_ical_events to get all events in the date range (including recurring ones)
- cutoff_date = now + timedelta(days=app.config['CALENDAR_DAYS_AHEAD'])
-
- # Get all events between now and cutoff_date
- recurring_events = recurring_ical_events.of(cal).between(now, cutoff_date)
+ # Fetch this week + next week, so the "Next Week" preview column has data.
+ range_start = nz_tz.localize(datetime.combine(week_start_date, datetime.min.time()))
+ range_end = range_start + timedelta(days=14)
+ recurring_events = recurring_ical_events.of(cal).between(range_start, range_end)
events = []
for component in recurring_events:
@@ -131,23 +181,18 @@ def get_calendar():
summary = str(component.get('summary', 'No Title'))
if dtstart and dtstart.dt:
- # Handle both datetime and date objects
if isinstance(dtstart.dt, datetime):
event_start = dtstart.dt
- # Make sure event_start is timezone-aware
if event_start.tzinfo is None:
event_start = nz_tz.localize(event_start)
elif isinstance(dtstart.dt, date):
- # For date-only events, create a timezone-aware datetime
event_start = nz_tz.localize(datetime.combine(dtstart.dt, datetime.min.time()))
else:
continue
- # Handle end time
if dtend and dtend.dt:
if isinstance(dtend.dt, datetime):
event_end = dtend.dt
- # Make sure event_end is timezone-aware
if event_end.tzinfo is None:
event_end = nz_tz.localize(event_end)
elif isinstance(dtend.dt, date):
@@ -157,24 +202,53 @@ def get_calendar():
else:
event_end = event_start + timedelta(hours=1)
+ member, title = parse_member_and_title(summary, family_members)
+ member_info = member or default_member
+
events.append({
- 'title': summary,
+ 'title': title,
'start': event_start.isoformat(),
'end': event_end.isoformat(),
- 'location': str(component.get('location', ''))
+ 'location': str(component.get('location', '')),
+ 'member': member_info['key'],
+ 'member_name': member_info['name'],
+ 'color': member_info['color'],
+ 'bg': member_info['bg'],
})
- # Sort events by start time
events.sort(key=lambda x: x['start'])
- calendar_cache = {'data': events, 'timestamp': now}
- return jsonify(events)
+ days = []
+ for i in range(7):
+ d = week_start_date + timedelta(days=i)
+ day_events = [e for e in events if datetime.fromisoformat(e['start']).date() == d]
+ days.append({'date': d.isoformat(), 'weekday': d.strftime('%A'), 'events': day_events})
+
+ next_week_start = week_start_date + timedelta(days=7)
+ next_week_end = next_week_start + timedelta(days=6)
+ next_week_events = [e for e in events if datetime.fromisoformat(e['start']).date() >= next_week_start]
+
+ result = {
+ 'week_start': week_start_date.isoformat(),
+ 'week_end': (week_start_date + timedelta(days=6)).isoformat(),
+ 'days': days,
+ 'next_week': {
+ 'start': next_week_start.isoformat(),
+ 'end': next_week_end.isoformat(),
+ 'count': len(next_week_events),
+ 'events': next_week_events[:5],
+ },
+ 'members': members_for_filter,
+ }
+
+ calendar_cache = {'data': result, 'timestamp': now, 'key': cache_key}
+ return jsonify(result)
except Exception as e:
app.logger.error(f"Error fetching calendar: {str(e)}")
- if calendar_cache['data']:
+ if calendar_cache.get('data') and calendar_cache.get('key') == cache_key:
return jsonify(calendar_cache['data'])
- return jsonify([])
+ return jsonify(empty_week_payload(week_start_date, members_for_filter))
@app.route('/api/background')
diff --git a/config.py b/config.py
index 021f3d8..f18cdf5 100644
--- a/config.py
+++ b/config.py
@@ -29,3 +29,14 @@ class Config:
# Directories
BACKGROUNDS_DIR = os.path.join('static', 'backgrounds')
CREDENTIALS_DIR = 'credentials'
+
+ # Family members for event color-coding.
+ # Event titles prefixed with "[Alias]" (e.g. "[Daniel] Football Practice")
+ # are tagged with that member's name/color and the prefix is stripped for display.
+ FAMILY_MEMBERS = [
+ {'key': 'dad', 'name': 'Ludwig', 'aliases': ['ludwig', 'dad'], 'color': '#4A90D9', 'bg': '#DCEAFB'},
+ {'key': 'mom', 'name': 'Michelle', 'aliases': ['michelle', 'mom'], 'color': '#D9669B', 'bg': '#FBDDEB'},
+ {'key': 'jason', 'name': 'Jason', 'aliases': ['jason'], 'color': '#5FA85B', 'bg': '#E1F2DD'},
+ {'key': 'daniel', 'name': 'Daniel', 'aliases': ['daniel'], 'color': '#D9A53B', 'bg': '#FBEFD3'},
+ ]
+ DEFAULT_MEMBER = {'key': 'family', 'name': 'Family', 'color': '#8C8C8C', 'bg': '#E9E9E9'}
diff --git a/static/css/style.css b/static/css/style.css
index dbfc730..423bb25 100644
--- a/static/css/style.css
+++ b/static/css/style.css
@@ -1,441 +1,326 @@
-/* Reset and base styles */
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
-body {
- font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, sans-serif;
+html, body {
+ height: 100%;
+ font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Helvetica, Arial, sans-serif;
+ background: #F4F5F7;
+ color: #2B2B33;
overflow: hidden;
- width: 100vw;
- height: 100vh;
- color: #ffffff;
- transition: color 0.5s ease-in-out;
}
-/* Dark text for bright backgrounds */
-body.light-bg {
- color: #1a1a1a;
-}
-
-body.light-bg .time,
-body.light-bg .date,
-body.light-bg .current-temp,
-body.light-bg .weather-label,
-body.light-bg .weather-icon,
-body.light-bg .forecast-icon,
-body.light-bg section h2,
-body.light-bg .day-name,
-body.light-bg .day-date,
-body.light-bg .event-title,
-body.light-bg .event-location,
-body.light-bg .joke {
- text-shadow: 1px 1px 3px rgba(255, 255, 255, 0.8);
-}
-
-body.light-bg .event-time {
- color: #0066cc;
-}
-
-body.light-bg .event {
- border-left-color: #0066cc;
-}
-
-/* White text for dark backgrounds (default) */
-body.dark-bg {
- color: #ffffff;
-}
-
-body.dark-bg .event-time {
- color: #4a9eff;
-}
-
-body.dark-bg .event {
- border-left-color: #4a9eff;
-}
-
-/* Background */
-#background {
- position: fixed;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background-size: cover;
- background-position: center;
- background-repeat: no-repeat;
- z-index: 0;
- transition: background-image 1s ease-in-out;
-}
-
-#background::before {
- content: '';
- position: absolute;
- top: 0;
- left: 0;
- width: 100%;
- height: 100%;
- background: rgba(0, 0, 0, 0.1);
- z-index: 1;
-}
-
-/* Main container */
-.container {
- position: relative;
- z-index: 2;
- width: 100%;
+.app {
height: 100vh;
display: flex;
flex-direction: column;
- padding: 1rem;
+ padding: 18px 24px 24px;
}
-/* Header β maximally transparent; text readable via text-shadow */
-.header {
+/* ---------- Top bar ---------- */
+
+.topbar {
display: flex;
- justify-content: space-between;
align-items: flex-start;
- margin-bottom: 1rem;
- background: rgba(0, 0, 0, 0.03);
- padding: 1rem 1.5rem;
- border-radius: 10px;
+ justify-content: space-between;
+ margin-bottom: 18px;
+ flex-wrap: wrap;
+ gap: 12px;
}
-.time-display {
+.date-time {
display: flex;
- flex-direction: column;
+ align-items: baseline;
+ gap: 10px;
}
-.time {
- font-size: 4.5rem;
- font-weight: 600;
- line-height: 1;
- text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
+.icon-badge {
+ font-size: 22px;
+ margin-right: 2px;
}
-.date {
- font-size: 1.6rem;
+.header-date {
+ font-size: 28px;
+ font-weight: 700;
+ color: #1F2430;
+}
+
+.header-time {
+ font-size: 18px;
font-weight: 500;
- margin-top: 0.3rem;
- opacity: 0.9;
- text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+ color: #8A8F9C;
}
-.weather-summary {
+.nav-row {
display: flex;
align-items: center;
- gap: 1.5rem;
+ gap: 10px;
+ margin-top: 10px;
}
-.current-weather-item {
- display: flex;
- flex-direction: column;
+.pill {
+ display: inline-flex;
align-items: center;
- gap: 0.2rem;
+ background: #FFFFFF;
+ border: 1px solid #E3E5EA;
+ border-radius: 18px;
+ padding: 6px 14px;
+ font-size: 13px;
+ font-weight: 600;
+ color: #4A4E5A;
}
-.weather-label {
- font-size: 1.2rem;
- font-weight: 600;
- opacity: 0.8;
- text-transform: uppercase;
- letter-spacing: 0.05em;
+.filter-select {
+ appearance: none;
+ -webkit-appearance: none;
+ cursor: pointer;
+ padding-right: 28px;
+ background-image: linear-gradient(45deg, transparent 50%, #8A8F9C 50%), linear-gradient(135deg, #8A8F9C 50%, transparent 50%);
+ background-position: calc(100% - 14px) center, calc(100% - 9px) center;
+ background-size: 5px 5px, 5px 5px;
+ background-repeat: no-repeat;
}
-.current-temp {
- font-size: 3rem;
+.week-nav {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ background: #FFFFFF;
+ border: 1px solid #E3E5EA;
+ border-radius: 18px;
+ padding: 4px 8px;
+}
+
+.nav-arrow {
+ border: none;
+ background: transparent;
+ font-size: 18px;
+ line-height: 1;
+ color: #4A4E5A;
+ cursor: pointer;
+ padding: 4px 8px;
+ border-radius: 50%;
+}
+
+.nav-arrow:hover {
+ background: #F0F1F4;
+}
+
+.week-range {
+ font-size: 13px;
font-weight: 600;
- text-shadow: 2px 2px 4px rgba(0, 0, 0, 0.5);
+ color: #4A4E5A;
+ min-width: 80px;
+ text-align: center;
+}
+
+.topbar-right {
+ display: flex;
+ align-items: center;
+ gap: 14px;
+}
+
+.weather-chip {
+ display: flex;
+ align-items: center;
+ gap: 6px;
+ background: #FFFFFF;
+ border: 1px solid #E3E5EA;
+ border-radius: 18px;
+ padding: 6px 14px;
}
.weather-icon {
- font-size: 2.5rem;
+ width: 22px;
+ height: 22px;
+ background-size: contain;
+ background-repeat: no-repeat;
}
-.header-forecast {
- display: flex;
- gap: 1rem;
-}
-
-.forecast-item {
- display: flex;
- flex-direction: column;
- align-items: center;
- gap: 0.2rem;
-}
-
-.forecast-icon {
- font-size: 2.2rem;
-}
-
-.forecast-temps {
- display: flex;
- gap: 0.3rem;
- font-size: 1.3rem;
-}
-
-.forecast-temps .high {
+.current-temp {
+ font-size: 14px;
font-weight: 700;
+ color: #4A4E5A;
}
-.forecast-temps .low {
- opacity: 0.6;
+.wifi-icon {
+ font-size: 18px;
+ color: #8A8F9C;
}
-/* Main content */
-.main-content {
+/* ---------- Week grid ---------- */
+
+.week-grid {
flex: 1;
- display: flex;
- overflow: hidden;
-}
-
-/* Sections */
-section {
- background: rgba(0, 0, 0, 0.03);
- padding: 1rem 1.5rem;
- border-radius: 10px;
- overflow-y: auto;
- flex: 1;
-}
-
-section h2 {
- font-size: 2rem;
- font-weight: 700;
- margin-bottom: 0.8rem;
- text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-}
-
-section h3 {
- font-size: 1.1rem;
- font-weight: 400;
- margin: 1rem 0 0.5rem;
- text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
-}
-
-/* Weather Section */
-.weather-description {
- font-size: 1.1rem;
- margin-bottom: 0.6rem;
- text-transform: capitalize;
-}
-
-.weather-details {
- display: flex;
- flex-direction: column;
- gap: 0.4rem;
- margin: 0.8rem 0;
-}
-
-.weather-detail {
- display: flex;
- justify-content: space-between;
- font-size: 0.95rem;
- padding: 0.3rem 0;
- border-bottom: 1px solid rgba(255, 255, 255, 0.1);
-}
-
-.weather-detail .label {
- opacity: 0.8;
-}
-
-/* Forecast */
-.forecast-days {
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
-}
-
-.forecast-day {
display: grid;
- grid-template-columns: 60px 1fr 100px;
- align-items: center;
- padding: 0.6rem;
- background: rgba(255, 255, 255, 0.04);
- border-radius: 8px;
- gap: 0.8rem;
-}
-
-.forecast-day-name {
- font-size: 1rem;
- font-weight: 500;
-}
-
-.forecast-description {
- font-size: 0.9rem;
- opacity: 0.8;
- text-transform: capitalize;
-}
-
-.forecast-temp {
- font-size: 1rem;
- text-align: right;
-}
-
-.forecast-temp .high {
- font-weight: 500;
-}
-
-.forecast-temp .low {
- opacity: 0.6;
- margin-left: 0.5rem;
-}
-
-/* Calendar Section */
-.events-list {
- display: grid;
- grid-template-columns: repeat(5, 1fr);
- gap: 0.8rem;
- height: 100%;
-}
-
-.day-group {
- display: flex;
- flex-direction: column;
+ grid-template-columns: repeat(7, 1fr) 1.1fr;
+ gap: 12px;
min-height: 0;
}
-.day-header {
+.day-column {
+ background: #FFFFFF;
+ border-radius: 14px;
+ padding: 12px 10px;
display: flex;
flex-direction: column;
- align-items: center;
- padding: 0.6rem;
- background: rgba(255, 255, 255, 0.06);
- border-radius: 8px 8px 0 0;
- margin-bottom: 0.5rem;
- text-align: center;
+ min-height: 0;
+ overflow: hidden;
+}
+
+.day-column.is-today {
+ box-shadow: 0 0 0 2px #4A90D9 inset;
+}
+
+.day-header {
+ margin-bottom: 8px;
}
.day-name {
- font-size: 1.5rem;
+ font-size: 11px;
font-weight: 700;
- text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+ text-transform: uppercase;
+ color: #A6AAB4;
+ letter-spacing: 0.04em;
}
-.day-date {
- font-size: 1.2rem;
- font-weight: 600;
- opacity: 0.8;
- margin-top: 0.2rem;
+.day-number {
+ font-size: 20px;
+ font-weight: 700;
+ color: #1F2430;
+}
+
+.day-count {
+ font-size: 11px;
+ color: #A6AAB4;
+ margin-top: 2px;
}
.day-events {
+ flex: 1;
+ overflow-y: auto;
display: flex;
flex-direction: column;
- gap: 0.5rem;
- overflow-y: auto;
- flex: 1;
+ gap: 6px;
}
-.no-events {
- font-size: 1.2rem;
- font-weight: 500;
- opacity: 0.5;
- font-style: italic;
- padding: 0.5rem;
- text-align: center;
-}
-
-.event {
- background: rgba(255, 255, 255, 0.04);
- padding: 0.5rem 0.6rem;
- border-radius: 6px;
- border-left: 3px solid #4a9eff;
+.event-card {
+ border-radius: 8px;
+ padding: 6px 8px;
+ border-left: 4px solid transparent;
+ font-size: 11.5px;
+ line-height: 1.35;
}
.event-time {
- font-size: 1.1rem;
font-weight: 700;
- margin-bottom: 0.2rem;
- color: #4a9eff;
+ color: rgba(0, 0, 0, 0.55);
+ font-size: 10.5px;
}
.event-title {
- font-size: 1.3rem;
font-weight: 600;
- margin-bottom: 0.2rem;
- line-height: 1.2;
+ color: #2B2B33;
+ overflow-wrap: anywhere;
}
-.event-location {
- font-size: 1.1rem;
- font-weight: 500;
- opacity: 0.7;
- font-style: italic;
+.event-member {
+ font-size: 10px;
+ color: rgba(0, 0, 0, 0.5);
+ margin-top: 1px;
+}
+
+.next-week-column {
+ background: #FFFFFF;
+ border-radius: 14px;
+ padding: 14px 12px;
+ display: flex;
+ flex-direction: column;
+ cursor: pointer;
+}
+
+.next-week-column:hover {
+ background: #F7F8FA;
+}
+
+.next-week-title {
+ font-size: 14px;
+ font-weight: 700;
+ color: #1F2430;
+}
+
+.next-week-range {
+ font-size: 11px;
+ color: #A6AAB4;
+ margin-bottom: 10px;
+}
+
+.next-week-count {
+ font-size: 13px;
+ color: #4A4E5A;
+ font-weight: 600;
}
.event-placeholder {
- font-size: 1rem;
- opacity: 0.6;
+ grid-column: 1 / -1;
text-align: center;
- padding: 2rem;
+ color: #A6AAB4;
+ padding-top: 60px;
+ font-size: 14px;
}
-/* Footer */
-.footer {
- margin-top: 1rem;
- background: rgba(0, 0, 0, 0.03);
- padding: 0.8rem 1.5rem;
+/* ---------- Add button ---------- */
+
+.add-fab {
+ position: fixed;
+ bottom: 26px;
+ right: 26px;
+ width: 52px;
+ height: 52px;
+ border-radius: 50%;
+ border: none;
+ background: #4A90D9;
+ color: #FFFFFF;
+ font-size: 26px;
+ font-weight: 400;
+ line-height: 1;
+ cursor: pointer;
+ box-shadow: 0 6px 16px rgba(74, 144, 217, 0.4);
+}
+
+.add-fab:hover {
+ background: #3A7BC0;
+}
+
+.add-toast {
+ position: fixed;
+ bottom: 90px;
+ right: 26px;
+ background: #1F2430;
+ color: #FFFFFF;
+ padding: 10px 16px;
border-radius: 10px;
+ font-size: 12.5px;
+ max-width: 240px;
+ opacity: 0;
+ transform: translateY(6px);
+ transition: opacity 0.2s ease, transform 0.2s ease;
+ pointer-events: none;
}
-.joke {
- font-size: 1.3rem;
- font-weight: 500;
- font-style: italic;
- text-align: center;
- opacity: 0.9;
- text-shadow: 1px 1px 2px rgba(0, 0, 0, 0.5);
+.add-toast.visible {
+ opacity: 1;
+ transform: translateY(0);
}
-/* Scrollbar styling */
-::-webkit-scrollbar {
- width: 8px;
+/* Scrollbar styling for day columns */
+.day-events::-webkit-scrollbar {
+ width: 4px;
}
-::-webkit-scrollbar-track {
- background: rgba(255, 255, 255, 0.05);
- border-radius: 10px;
-}
-
-::-webkit-scrollbar-thumb {
- background: rgba(255, 255, 255, 0.2);
- border-radius: 10px;
-}
-
-::-webkit-scrollbar-thumb:hover {
- background: rgba(255, 255, 255, 0.3);
-}
-
-/* Responsive adjustments for smaller screens */
-@media (max-width: 1200px) {
- .time {
- font-size: 5rem;
- }
-
- .date {
- font-size: 2rem;
- }
-
- .current-temp {
- font-size: 4rem;
- }
-
- section h2 {
- font-size: 2.5rem;
- }
-}
-
-@media (max-width: 768px) {
- .main-content {
- grid-template-columns: 1fr;
- }
-
- .time {
- font-size: 4rem;
- }
-
- .current-temp {
- font-size: 3.5rem;
- }
+.day-events::-webkit-scrollbar-thumb {
+ background: #E3E5EA;
+ border-radius: 4px;
}
diff --git a/static/js/app.js b/static/js/app.js
index a3a0b3b..654b6ac 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -2,315 +2,195 @@
const INTERVALS = {
TIME: 1000, // 1 second
WEATHER: 900000, // 15 minutes
- CALENDAR: 300000, // 5 minutes
- BACKGROUND: 3600000, // 60 minutes
- JOKE: 3600000 // 1 hour
+ CALENDAR: 300000 // 5 minutes
};
+const DAY_LABELS = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday'];
+const MONTH_LABELS = ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'];
+
+let currentWeekStart = startOfWeek(new Date());
+let activeFilter = 'all';
+let filterOptionsBuilt = false;
+let lastWeekData = null;
+
// Return an OWM icon image tag for a given icon code
function weatherIcon(code) {
const src = `https://openweathermap.org/img/wn/${code}@2x.png`;
return `
`;
}
-// Initialize the application
-document.addEventListener('DOMContentLoaded', () => {
- // Start all update functions
- updateTime();
- updateWeather();
- updateCalendar();
- updateBackground();
- updateJoke();
-
- // Set up intervals
- setInterval(updateTime, INTERVALS.TIME);
- setInterval(updateWeather, INTERVALS.WEATHER);
- setInterval(updateCalendar, INTERVALS.CALENDAR);
- setInterval(updateBackground, INTERVALS.BACKGROUND);
- setInterval(updateJoke, INTERVALS.JOKE);
-});
-
-// Update time and date
-function updateTime() {
- const now = new Date();
-
- // Format time (HH:MM)
- const hours = String(now.getHours()).padStart(2, '0');
- const minutes = String(now.getMinutes()).padStart(2, '0');
- document.getElementById('time').textContent = `${hours}:${minutes}`;
-
- // Format date (Day, Month Date)
- const options = { weekday: 'long', month: 'long', day: 'numeric' };
- const dateString = now.toLocaleDateString('en-NZ', options);
- document.getElementById('date').textContent = dateString;
+// Sunday-starting week for a given date
+function startOfWeek(date) {
+ const d = new Date(date);
+ d.setHours(0, 0, 0, 0);
+ d.setDate(d.getDate() - d.getDay());
+ return d;
}
-// Fetch and update weather
+function toISODate(date) {
+ const y = date.getFullYear();
+ const m = String(date.getMonth() + 1).padStart(2, '0');
+ const d = String(date.getDate()).padStart(2, '0');
+ return `${y}-${m}-${d}`;
+}
+
+function formatRangeLabel(startISO, endISO) {
+ const start = new Date(startISO + 'T00:00:00');
+ const end = new Date(endISO + 'T00:00:00');
+ const startLabel = `${MONTH_LABELS[start.getMonth()]} ${start.getDate()}`;
+ const endLabel = end.getMonth() === start.getMonth() ? `${end.getDate()}` : `${MONTH_LABELS[end.getMonth()]} ${end.getDate()}`;
+ return `${startLabel}-${endLabel}`;
+}
+
+// Initialize the application
+document.addEventListener('DOMContentLoaded', () => {
+ updateTime();
+ updateWeather();
+ fetchCalendar();
+
+ document.getElementById('prev-week').addEventListener('click', () => shiftWeek(-7));
+ document.getElementById('next-week').addEventListener('click', () => shiftWeek(7));
+ document.getElementById('member-filter').addEventListener('change', (e) => {
+ activeFilter = e.target.value;
+ if (lastWeekData) renderWeek(lastWeekData);
+ });
+ document.getElementById('add-btn').addEventListener('click', showAddToast);
+
+ setInterval(updateTime, INTERVALS.TIME);
+ setInterval(updateWeather, INTERVALS.WEATHER);
+ setInterval(fetchCalendar, INTERVALS.CALENDAR);
+});
+
+function shiftWeek(days) {
+ currentWeekStart = new Date(currentWeekStart);
+ currentWeekStart.setDate(currentWeekStart.getDate() + days);
+ fetchCalendar();
+}
+
+// Update time and date in the header
+function updateTime() {
+ const now = new Date();
+ const hours = String(now.getHours()).padStart(2, '0');
+ const minutes = String(now.getMinutes()).padStart(2, '0');
+ document.getElementById('header-time').textContent = `${hours}:${minutes}`;
+ document.getElementById('header-date').textContent = `${MONTH_LABELS[now.getMonth()]} ${String(now.getDate()).padStart(2, '0')}`;
+}
+
+// Fetch and update weather chip
async function updateWeather() {
try {
const response = await fetch('/api/weather');
if (!response.ok) throw new Error('Weather fetch failed');
const data = await response.json();
+ if (data.error || !data.current) return;
- if (data.error) {
- console.error('Weather error:', data.error);
- return;
- }
-
- // Update current weather in header
- const { current, forecast } = data;
-
- document.getElementById('current-temp').textContent = `${current.temp}Β°`;
- document.getElementById('weather-icon').innerHTML = weatherIcon(current.icon);
-
- // Update 3-day forecast in header
- const headerForecast = document.getElementById('header-forecast');
- headerForecast.innerHTML = '';
-
- forecast.forEach(day => {
- const dayElement = document.createElement('div');
- dayElement.className = 'forecast-item';
- dayElement.innerHTML = `
- ${day.date}
- ${weatherIcon(day.icon)}
-
- ${day.temp_max}Β°
- ${day.temp_min}Β°
-
- `;
- headerForecast.appendChild(dayElement);
- });
-
+ document.getElementById('current-temp').textContent = `${data.current.temp}Β°`;
+ document.getElementById('weather-icon').innerHTML = weatherIcon(data.current.icon);
} catch (error) {
console.error('Error updating weather:', error);
}
}
-// Fetch and update calendar events
-async function updateCalendar() {
+// Fetch the current week's calendar data and render it
+async function fetchCalendar() {
try {
- const response = await fetch('/api/calendar');
+ const response = await fetch(`/api/calendar?start=${toISODate(currentWeekStart)}`);
if (!response.ok) throw new Error('Calendar fetch failed');
- const events = await response.json();
-
- if (events.error) {
- console.error('Calendar error:', events.error);
- return;
- }
-
- const eventsContainer = document.getElementById('calendar-events');
-
- if (!events || events.length === 0) {
- eventsContainer.innerHTML = 'No upcoming events
';
- return;
- }
-
- // Group events by day
- const eventsByDay = {};
- const today = new Date();
- today.setHours(0, 0, 0, 0);
-
- // Create 5 days (today + 4 more)
- for (let i = 0; i < 5; i++) {
- const date = new Date(today);
- date.setDate(today.getDate() + i);
- const dateKey = date.toISOString().split('T')[0];
- eventsByDay[dateKey] = {
- date: date,
- events: []
- };
- }
-
- // Group events by their date (including multi-day events)
- events.forEach(event => {
- const eventStart = new Date(event.start);
- const eventEnd = new Date(event.end);
- eventStart.setHours(0, 0, 0, 0);
- eventEnd.setHours(0, 0, 0, 0);
-
- // Check each day in our 5-day view
- Object.keys(eventsByDay).forEach(dateKey => {
- const dayDate = new Date(eventsByDay[dateKey].date);
- dayDate.setHours(0, 0, 0, 0);
-
- // Include event if this day falls within the event's duration
- if (dayDate >= eventStart && dayDate <= eventEnd) {
- eventsByDay[dateKey].events.push(event);
- }
- });
- });
-
- // Render events grouped by day
- eventsContainer.innerHTML = '';
-
- Object.keys(eventsByDay).sort().forEach(dateKey => {
- const dayData = eventsByDay[dateKey];
- const dayElement = document.createElement('div');
- dayElement.className = 'day-group';
-
- // Format day header
- const dayDate = dayData.date;
- const isToday = dayDate.toDateString() === new Date().toDateString();
- const dayName = isToday ? 'Today' : dayDate.toLocaleDateString('en-NZ', { weekday: 'long' });
- const dateStr = dayDate.toLocaleDateString('en-NZ', { day: 'numeric', month: 'short' });
-
- dayElement.innerHTML = `
-
-
- `;
-
- const dayEventsContainer = dayElement.querySelector('.day-events');
-
- if (dayData.events.length === 0) {
- dayEventsContainer.innerHTML = 'No events
';
- } else {
- dayData.events.forEach(event => {
- const eventElement = document.createElement('div');
- eventElement.className = 'event';
-
- const startTime = new Date(event.start);
- const endTime = new Date(event.end);
-
- // Check if it's an all-day event (time is 00:00)
- const isAllDay = startTime.getHours() === 0 && startTime.getMinutes() === 0
- && endTime.getHours() === 0 && endTime.getMinutes() === 0;
-
- let timeString;
- if (isAllDay) {
- timeString = 'All day';
- } else {
- timeString = startTime.toLocaleTimeString('en-NZ', { hour: '2-digit', minute: '2-digit' });
- }
-
- eventElement.innerHTML = `
- ${timeString}
- ${event.title}
- ${event.location ? `π ${event.location}
` : ''}
- `;
-
- dayEventsContainer.appendChild(eventElement);
- });
- }
-
- eventsContainer.appendChild(dayElement);
- });
+ const data = await response.json();
+ lastWeekData = data;
+ document.getElementById('week-range').textContent = formatRangeLabel(data.week_start, data.week_end);
+ buildFilterOptions(data.members);
+ renderWeek(data);
} catch (error) {
console.error('Error updating calendar:', error);
+ document.getElementById('week-grid').innerHTML = 'Unable to load calendar
';
}
}
-// Calculate brightness of an image
-function calculateImageBrightness(imageSrc, callback) {
- const img = new Image();
- img.crossOrigin = 'Anonymous';
-
- img.onload = () => {
- // Create a canvas to analyze the image
- const canvas = document.createElement('canvas');
- const ctx = canvas.getContext('2d');
-
- // Use a smaller size for faster processing
- canvas.width = 100;
- canvas.height = 100;
-
- // Draw the image scaled down
- ctx.drawImage(img, 0, 0, 100, 100);
-
- // Get image data
- const imageData = ctx.getImageData(0, 0, 100, 100);
- const data = imageData.data;
-
- // Calculate average brightness
- let totalBrightness = 0;
- const pixelCount = data.length / 4;
-
- for (let i = 0; i < data.length; i += 4) {
- const r = data[i];
- const g = data[i + 1];
- const b = data[i + 2];
-
- // Calculate perceived brightness (using luminance formula)
- const brightness = (0.299 * r + 0.587 * g + 0.114 * b);
- totalBrightness += brightness;
- }
-
- const avgBrightness = totalBrightness / pixelCount;
-
- // Return brightness value (0-255)
- callback(avgBrightness);
- };
-
- img.onerror = () => {
- console.error('Error loading image for brightness analysis');
- // Default to dark background if error
- callback(100);
- };
-
- img.src = imageSrc;
+function buildFilterOptions(members) {
+ if (filterOptionsBuilt || !members) return;
+ const select = document.getElementById('member-filter');
+ members.forEach(member => {
+ const option = document.createElement('option');
+ option.value = member.key;
+ option.textContent = member.name;
+ select.appendChild(option);
+ });
+ filterOptionsBuilt = true;
}
-// Update background image
-async function updateBackground() {
- try {
- const response = await fetch('/api/background');
- if (!response.ok) throw new Error('Background fetch failed');
+function filterEvents(events) {
+ if (activeFilter === 'all') return events;
+ return events.filter(e => e.member === activeFilter);
+}
- const data = await response.json();
- const backgroundElement = document.getElementById('background');
+function formatEventTime(event) {
+ const start = new Date(event.start);
+ const end = new Date(event.end);
+ const isAllDay = start.getHours() === 0 && start.getMinutes() === 0 && end.getHours() === 0 && end.getMinutes() === 0;
+ if (isAllDay) return 'All day';
+ return start.toLocaleTimeString('en-NZ', { hour: '2-digit', minute: '2-digit' });
+}
- if (data.image) {
- // Preload image to avoid flicker
- const img = new Image();
- img.onload = () => {
- backgroundElement.style.backgroundImage = `url('${data.image}')`;
+function eventCardHTML(event) {
+ return `
+
+
${formatEventTime(event)}
+
${event.title}
+
${event.member_name}
+
+ ${events.map(eventCardHTML).join('') || ''}
+
+ `;
+ grid.appendChild(column);
+ });
+
+ const nextWeekEvents = filterEvents(data.next_week.events);
+ const nextColumn = document.createElement('div');
+ nextColumn.className = 'next-week-column';
+ nextColumn.innerHTML = `
+ Next Week
+ ${formatRangeLabel(data.next_week.start, data.next_week.end)}
+ ${data.next_week.count} event${data.next_week.count === 1 ? '' : 's'}
+ `;
+ nextColumn.addEventListener('click', () => shiftWeek(7));
+ grid.appendChild(nextColumn);
+}
+
+function showAddToast() {
+ let toast = document.querySelector('.add-toast');
+ if (!toast) {
+ toast = document.createElement('div');
+ toast.className = 'add-toast';
+ toast.textContent = 'This display is read-only β add events directly in Google Calendar.';
+ document.body.appendChild(toast);
}
+ toast.classList.add('visible');
+ clearTimeout(showAddToast._timer);
+ showAddToast._timer = setTimeout(() => toast.classList.remove('visible'), 3000);
}
diff --git a/templates/index.html b/templates/index.html
index 06d2493..3575325 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -3,48 +3,46 @@
- Family Calendar Display
+ Family Calendar
-
-
-
-
-
-
-