From 76fbe28bb07b32dab9bd44533317f406155c572e Mon Sep 17 00:00:00 2001 From: yotay-g-3 Date: Sat, 11 Apr 2026 12:22:22 +0900 Subject: [PATCH 1/3] =?UTF-8?q?feat:=20=E3=83=8F=E3=83=B3=E3=82=BA?= =?UTF-8?q?=E3=82=AA=E3=83=B3=E3=81=AE=E4=BF=AE=E6=AD=A3=E5=AE=9F=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/page.tsx | 4 +-- components/DataTable/DataTable.tsx | 48 ++++++++++++++++++++++-------- package-lock.json | 4 +-- utils/commaToNum.ts | 2 +- 4 files changed, 41 insertions(+), 17 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index bc32afb..5f33b2d 100644 --- a/app/page.tsx +++ b/app/page.tsx @@ -93,7 +93,7 @@ const Page = () => { if (yearElement.current) { const date = new Date(); const year = date.getFullYear(); - yearElement.current.textContent = year; + yearElement.current.textContent = String(year); } const layoutStyle = (tabValue: TabState) => css` @@ -125,7 +125,7 @@ const Page = () => { - タイトル + 日本の都道府県別の人口データ diff --git a/components/DataTable/DataTable.tsx b/components/DataTable/DataTable.tsx index 1295565..2b9f881 100644 --- a/components/DataTable/DataTable.tsx +++ b/components/DataTable/DataTable.tsx @@ -13,21 +13,45 @@ type Props = { }; const DataTable = ({ prefPopulationList }: Props) => { - const columns: GridColDef[] = [{field: "prefName",headerName: "都道府県",width: 240,sortComparator: sortPrefId,}, - {field: "population",headerName: "人口（人）",headerAlign: "right",align: "right",width: 180,sortComparator: (v1, v2) => { - return commaToNum(v1) - commaToNum(v2);}, + const columns: GridColDef[] = [ + { + field: "prefName", + headerName: "都道府県", + width: 240, + sortComparator: sortPrefId, }, -{field: "populationDensity",headerName: "人口密度（人/km²）",headerAlign: "right",align: "right",width: 180, + { + field: "population", + headerName: "人口（人）", + headerAlign: "right", + align: "right", + width: 180, + sortComparator: (v1, v2) => { + return commaToNum(v1) - commaToNum(v2); + }, }, -{ field: "populationIncrease",headerName: "5年間の人口増減数（人）", - headerAlign: "right",align: "right", - width: 200,sortComparator: (v1, v2) => { - return commaToNum(v1) - commaToNum(v2);}, - },{ + { + field: "populationDensity", + headerName: "人口密度（人/km²）", + headerAlign: "right", + align: "right", + width: 180, + }, + { + field: "populationIncrease", + headerName: "5年間の人口増減数（人）", + headerAlign: "right", + align: "right", + width: 200, + sortComparator: (v1, v2) => { + return commaToNum(v1) - commaToNum(v2); + }, + }, + { field: "populationIncreaseRatio", - headerName: "5年間の人口増減率（%）", - headerAlign: "right", - align: "right", + headerName: "5年間の人口増減率（%）", + headerAlign: "right", + align: "right", width: 200, }, ]; diff --git a/package-lock.json b/package-lock.json index 2100d2f..d23c476 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,11 +1,11 @@ { - "name": "hands-on-sample", + "name": "hands-on-example", "version": "1.0.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "hands-on-sample", + "name": "hands-on-example", "version": "1.0.0", "dependencies": { "@emotion/react": "11.11.1", diff --git a/utils/commaToNum.ts b/utils/commaToNum.ts index ad82f61..8386c0e 100644 --- a/utils/commaToNum.ts +++ b/utils/commaToNum.ts @@ -2,6 +2,6 @@ * カンマ区切りの文字列を数値に変換します */ export const commaToNum = (str: string) => { - const noCommaStr = str.replace(",", ""); + const noCommaStr = str.replaceAll(",", ""); return Number(noCommaStr); }; From 2f0eb6777876c69e976eb0e6540c618d50849f11 Mon Sep 17 00:00:00 2001 From: yotay-g-3 Date: Sat, 11 Apr 2026 12:30:56 +0900 Subject: [PATCH 2/3] =?UTF-8?q?.git=20=E5=86=85=E3=81=AEdeploy=20version?= =?UTF-8?q?=E3=82=922=E3=81=8B=E3=82=894=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/static.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 5f95f96..247b950 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -54,4 +54,4 @@ jobs: path: './out/' - name: Deploy to GitHub Pages id: deployment - uses: actions/deploy-pages@v2 + uses: actions/deploy-pages@v4 From 917499ae9cb4f17d64de120c5606ff5a049734c8 Mon Sep 17 00:00:00 2001 From: yotay-g-3 Date: Sat, 11 Apr 2026 12:37:17 +0900 Subject: [PATCH 3/3] feat: upload-pages-artifact@v1 -> v3 --- .github/workflows/static.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml index 247b950..9095170 100644 --- a/.github/workflows/static.yml +++ b/.github/workflows/static.yml @@ -48,7 +48,7 @@ jobs: - name: Setup Pages uses: actions/configure-pages@v3 - name: Upload artifact - uses: actions/upload-pages-artifact@v1 + uses: actions/upload-pages-artifact@v3 with: # Upload entire repository path: './out/'