summaryrefslogtreecommitdiff
path: root/app/routes
diff options
context:
space:
mode:
authoryyamashita <yyamashita@mosquit.one>2026-05-08 08:38:32 +0900
committeryyamashita <yyamashita@mosquit.one>2026-05-08 08:38:32 +0900
commit1246c8382c8734dc705f96bf9fa6b5efdd3819bc (patch)
treecc840910f942aace0f21f3550151e95d08dafcf2 /app/routes
parent6579d8423bdeeca0e6b11df5410051c0aaed5d16 (diff)
Fix all TODO bugs and implement feature additions
- SCRAPE_TARGETS.md: add 5 missing venues (nine-spices, nishieifuku-jam, fever-shindaita, moon-step-nakano, mod-shibasaki) - Navigation: add 日付別 link to venues.tsx and events.$id.tsx headers - venues.tsx: add official site external links per venue card - ScrapeButton: new component with useFetcher-based trigger + 2s polling progress UI showing per-venue status and event count - venues.tsx / events._index.tsx: wire in ScrapeButton - FilterBar + db.server.ts: add area filter derived from venues, threaded through queryEvents Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Diffstat (limited to 'app/routes')
-rw-r--r--app/routes/events.$id.tsx1
-rw-r--r--app/routes/events._index.tsx14
-rw-r--r--app/routes/venues.tsx29
3 files changed, 34 insertions, 10 deletions
diff --git a/app/routes/events.$id.tsx b/app/routes/events.$id.tsx
index 4a84308..423cda5 100644
--- a/app/routes/events.$id.tsx
+++ b/app/routes/events.$id.tsx
@@ -21,6 +21,7 @@ export default function EventDetail() {
</Link>
<nav className="flex gap-4 sm:gap-6 text-sm text-gray-400">
<Link to="/events" className="hover:text-white transition-colors">イベント</Link>
+ <Link to="/events/by-date" className="hover:text-white transition-colors">日付別</Link>
<Link to="/venues" className="hover:text-white transition-colors">会場一覧</Link>
</nav>
</header>
diff --git a/app/routes/events._index.tsx b/app/routes/events._index.tsx
index cb1a019..890e0fd 100644
--- a/app/routes/events._index.tsx
+++ b/app/routes/events._index.tsx
@@ -4,6 +4,7 @@ import { queryEvents, getVenues, type CapacityRange } from "~/lib/db.server";
import EventCard from "~/components/EventCard";
import EventListRow from "~/components/EventListRow";
import FilterBar from "~/components/FilterBar";
+import ScrapeButton from "~/components/ScrapeButton";
function defaultWindow() {
const today = new Date();
@@ -24,18 +25,20 @@ export async function loader({ request }: Route.LoaderArgs) {
const venue_id = url.searchParams.get("venue_id") ?? undefined;
const keyword = url.searchParams.get("keyword") ?? undefined;
const capacity_range = (url.searchParams.get("capacity_range") ?? undefined) as CapacityRange | undefined;
+ const area = url.searchParams.get("area") ?? undefined;
const page = Math.max(1, parseInt(url.searchParams.get("page") ?? "1", 10));
const limit = 30;
const offset = (page - 1) * limit;
- const events = queryEvents({ date_from, date_to, venue_id, keyword, capacity_range, limit, offset });
+ const events = queryEvents({ date_from, date_to, venue_id, keyword, capacity_range, area, limit, offset });
const venues = getVenues();
+ const areas = [...new Set(venues.filter((v) => v.area).map((v) => v.area as string))].sort();
- return { events, venues, page, hasMore: events.length === limit, date_from, date_to };
+ return { events, venues, areas, page, hasMore: events.length === limit, date_from, date_to };
}
export default function EventsIndex() {
- const { events, venues, page, hasMore, date_from, date_to } = useLoaderData<typeof loader>();
+ const { events, venues, areas, page, hasMore, date_from, date_to } = useLoaderData<typeof loader>();
const [searchParams, setSearchParams] = useSearchParams();
const view = (searchParams.get("view") ?? "card") as "card" | "list";
@@ -62,6 +65,8 @@ export default function EventsIndex() {
<main className="max-w-6xl mx-auto px-4 py-8">
<div className="mb-6 flex items-center justify-between">
<h1 className="text-2xl font-bold">イベント一覧</h1>
+ <div className="flex items-center gap-3">
+ <ScrapeButton />
<div className="flex rounded-lg overflow-hidden border border-gray-700 text-sm">
<button
onClick={() => switchView("card")}
@@ -78,9 +83,10 @@ export default function EventsIndex() {
</button>
</div>
+ </div>
</div>
- <FilterBar venues={venues} defaultDateFrom={date_from} defaultDateTo={date_to} />
+ <FilterBar venues={venues} areas={areas} defaultDateFrom={date_from} defaultDateTo={date_to} />
{events.length === 0 ? (
<div className="mt-16 text-center text-gray-500">
diff --git a/app/routes/venues.tsx b/app/routes/venues.tsx
index b027707..f2a7d54 100644
--- a/app/routes/venues.tsx
+++ b/app/routes/venues.tsx
@@ -1,6 +1,7 @@
import { useLoaderData, Link } from "react-router";
import type { Route } from "./+types/venues";
import { getVenues, getLastScrapePerVenue, type ScrapeLog } from "~/lib/db.server";
+import ScrapeButton from "~/components/ScrapeButton";
export async function loader(_: Route.LoaderArgs) {
const venues = getVenues();
@@ -20,16 +21,20 @@ export default function Venues() {
</Link>
<nav className="flex gap-4 sm:gap-6 text-sm text-gray-400">
<Link to="/events" className="hover:text-white transition-colors">イベント</Link>
+ <Link to="/events/by-date" className="hover:text-white transition-colors">日付別</Link>
<Link to="/venues" className="text-white font-medium">会場一覧</Link>
</nav>
</header>
<main className="max-w-4xl mx-auto px-4 py-10">
- <div className="mb-8">
- <h1 className="text-2xl font-bold">会場一覧</h1>
- <p className="mt-1 text-sm text-gray-400">
- 現在 {venues.length} 会場が登録されています。
- </p>
+ <div className="mb-8 flex items-start justify-between gap-4">
+ <div>
+ <h1 className="text-2xl font-bold">会場一覧</h1>
+ <p className="mt-1 text-sm text-gray-400">
+ 現在 {venues.length} 会場が登録されています。
+ </p>
+ </div>
+ <ScrapeButton />
</div>
{venues.length === 0 ? (
@@ -51,7 +56,19 @@ export default function Venues() {
>
{v.name}
</Link>
- {v.area && <p className="text-xs text-gray-400">{v.area}</p>}
+ <div className="flex items-center gap-2 mt-0.5">
+ {v.area && <span className="text-xs text-gray-400">{v.area}</span>}
+ {v.url && (
+ <a
+ href={v.url}
+ target="_blank"
+ rel="noopener noreferrer"
+ className="text-xs text-gray-600 hover:text-indigo-400 transition-colors"
+ >
+ 公式サイト ↗
+ </a>
+ )}
+ </div>
</div>
{/* イベント件数 */}