From de22432cc5ed329f51c5cc845a7c28601865879c Mon Sep 17 00:00:00 2001 From: Ricky Stretch Date: Wed, 18 Mar 2026 15:59:14 -0400 Subject: [PATCH] v0.9.80 filter fixes --- .env.example | 2 +- backend/package.json | 2 +- build.sh | 2 +- frontend/package.json | 2 +- frontend/src/components/SchedulePage.jsx | 12 +++++------- 5 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.env.example b/.env.example index eae4d3b..bfc6d3c 100644 --- a/.env.example +++ b/.env.example @@ -10,7 +10,7 @@ PROJECT_NAME=jama # Image version to run (set by build.sh, or use 'latest') -JAMA_VERSION=0.9.79 +JAMA_VERSION=0.9.80 # App port — the host port Docker maps to the container PORT=3000 diff --git a/backend/package.json b/backend/package.json index 08aec10..672e439 100644 --- a/backend/package.json +++ b/backend/package.json @@ -1,6 +1,6 @@ { "name": "jama-backend", - "version": "0.9.79", + "version": "0.9.80", "description": "TeamChat backend server", "main": "src/index.js", "scripts": { diff --git a/build.sh b/build.sh index b1211a8..c41386c 100644 --- a/build.sh +++ b/build.sh @@ -13,7 +13,7 @@ # ───────────────────────────────────────────────────────────── set -euo pipefail -VERSION="${1:-0.9.79}" +VERSION="${1:-0.9.80}" ACTION="${2:-}" REGISTRY="${REGISTRY:-}" IMAGE_NAME="jama" diff --git a/frontend/package.json b/frontend/package.json index 054cad7..85be1a0 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -1,6 +1,6 @@ { "name": "jama-frontend", - "version": "0.9.79", + "version": "0.9.80", "private": true, "scripts": { "dev": "vite", diff --git a/frontend/src/components/SchedulePage.jsx b/frontend/src/components/SchedulePage.jsx index 638ce76..395eedb 100644 --- a/frontend/src/components/SchedulePage.jsx +++ b/frontend/src/components/SchedulePage.jsx @@ -712,12 +712,10 @@ function ScheduleView({ events, selectedDate, onSelect, filterKeyword='', filter const today=new Date(); today.setHours(0,0,0,0); const terms=parseKeywords(filterKeyword); const hasFilters = terms.length > 0 || !!filterTypeId; - // Always show from today forward (desktop and mobile). - // Desktop: when no filters, restrict to selected month for browsing context. - // Mobile: always from today forward regardless of filters. - // With any filter active: always today+future on both platforms. - const from = (hasFilters || isMobile) ? today : new Date(y,m,1); - const to = (hasFilters || isMobile) ? new Date(9999,11,31) : new Date(y,m+1,0,23,59,59); + // No filters: show selected month only (desktop and mobile — month nav arrows control the month). + // Filters active: show today + all future on both platforms. + const from = hasFilters ? today : new Date(y,m,1); + const to = hasFilters ? new Date(9999,11,31) : new Date(y,m+1,0,23,59,59); const filtered=events.filter(e=>{ const s=new Date(e.start_at); if(sto) return false; @@ -728,7 +726,7 @@ function ScheduleView({ events, selectedDate, onSelect, filterKeyword='', filter } return true; }); - const emptyMsg = hasFilters ? 'No events match your filters' : isMobile ? 'No upcoming events' : `No events in ${MONTHS[m]} ${y}`; + const emptyMsg = hasFilters ? 'No events match your filters' : `No events in ${MONTHS[m]} ${y}`; if(!filtered.length) return
{emptyMsg}
; return <>{filtered.map(e=>{const s=new Date(e.start_at);const col=e.event_type?.colour||'#9ca3af'; // Desktop: original pre-v0.9.64 sizes. Mobile: compact sizes from v0.9.64