From 881485f010d6d576bab958548e3c955b8067dd34 Mon Sep 17 00:00:00 2001 From: Yasutake Yohei <61961825+yasutakeyohei@users.noreply.github.com> Date: Thu, 5 Nov 2026 13:37:53 +0900 Subject: events: URLを/kodaira/events/に移しサイドバー直下へ MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit hp-archive配下から独立したページとして、小平市についての 直下に置いた。旧URL3種は.htaccessで301転送する。 --- astro.config.mjs | 5 +- public/.htaccess | 14 +-- scripts/capture-schedule-shot.mjs | 2 +- src/content/docs/index.mdx | 2 +- src/content/docs/kodaira-data/events.mdx | 130 --------------------------- src/content/docs/kodaira-data/hp-archive.mdx | 2 +- src/content/docs/kodaira/events.mdx | 130 +++++++++++++++++++++++++++ src/data/schedule/config.ts | 6 +- src/pages/kodaira-data/events/[month].astro | 72 --------------- src/pages/kodaira/events/[month].astro | 72 +++++++++++++++ 10 files changed, 220 insertions(+), 215 deletions(-) delete mode 100644 src/content/docs/kodaira-data/events.mdx create mode 100644 src/content/docs/kodaira/events.mdx delete mode 100644 src/pages/kodaira-data/events/[month].astro create mode 100644 src/pages/kodaira/events/[month].astro diff --git a/astro.config.mjs b/astro.config.mjs index d0759ce..03c5b9e 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -352,13 +352,16 @@ export default defineConfig({ label: "小平市について", collapsed: true, items: [ + { + label: "小平市のイベント・行事予定カレンダー", + link: "/kodaira/events/", + }, { label: "小平市のデータ", collapsed: true, items: [ // 公園ページはドラフト公開停止中(公開時に戻す) // { label: "公園さんぽマップ", link: "/kodaira-data/parks/" }, - { label: "小平市のイベント・審議会 日程一覧", link: "/kodaira-data/events/" }, { label: "小平市ホームページのアーカイブ(暫定)等", collapsed: true, diff --git a/public/.htaccess b/public/.htaccess index 0075e99..a4cefd8 100644 --- a/public/.htaccess +++ b/public/.htaccess @@ -6,13 +6,15 @@ ErrorDocument 404 /404.html RewriteEngine On # ============================================================ -# 行事予定ページの移転: 旧URL → /kodaira-data/events/ -# (アーカイブから独立させ、さらに URL を events に変更した) +# 行事予定ページの移転: 旧URL → /kodaira/events/ +# (アーカイブから独立させ、さらに「小平市について」直下に移した) # ============================================================ -RewriteRule ^kodaira-data/hp-archive/schedule/?$ /kodaira-data/events/ [R=301,L] -RewriteRule ^kodaira-data/hp-archive/schedule/(.+)$ /kodaira-data/events/$1 [R=301,L] -RewriteRule ^kodaira-data/schedule/?$ /kodaira-data/events/ [R=301,L] -RewriteRule ^kodaira-data/schedule/(.+)$ /kodaira-data/events/$1 [R=301,L] +RewriteRule ^kodaira-data/hp-archive/schedule/?$ /kodaira/events/ [R=301,L] +RewriteRule ^kodaira-data/hp-archive/schedule/(.+)$ /kodaira/events/$1 [R=301,L] +RewriteRule ^kodaira-data/schedule/?$ /kodaira/events/ [R=301,L] +RewriteRule ^kodaira-data/schedule/(.+)$ /kodaira/events/$1 [R=301,L] +RewriteRule ^kodaira-data/events/?$ /kodaira/events/ [R=301,L] +RewriteRule ^kodaira-data/events/(.+)$ /kodaira/events/$1 [R=301,L] # ============================================================ # 旧Docusaurus (baseUrl: /docs) → 新Starlight (base: /) へのリダイレクト diff --git a/scripts/capture-schedule-shot.mjs b/scripts/capture-schedule-shot.mjs index 7ebdee5..5c0e821 100644 --- a/scripts/capture-schedule-shot.mjs +++ b/scripts/capture-schedule-shot.mjs @@ -69,7 +69,7 @@ const port = server.address().port; const browser = await chromium.launch(); const page = await browser.newPage({ viewport: { width, height: 2600 }, deviceScaleFactor: dpr }); -await page.goto(`http://localhost:${port}/kodaira-data/hp-archive/schedule/`, { +await page.goto(`http://localhost:${port}/kodaira/events/`, { waitUntil: 'networkidle', }); await page.waitForSelector('#schedule-map.leaflet-container'); diff --git a/src/content/docs/index.mdx b/src/content/docs/index.mdx index 014709e..374ea1a 100644 --- a/src/content/docs/index.mdx +++ b/src/content/docs/index.mdx @@ -21,7 +21,7 @@ import * as assets from '@/assets/images'; {/* 暫定:市ホームページ復旧までの行事・イベント一覧へのリンク */}