From 477b9faf5999f99971178352aa0542b5cfc2fea6 Mon Sep 17 00:00:00 2001 From: shizimi50 Date: Sun, 26 Nov 2023 14:49:41 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=83=AA=E3=83=9D=E3=82=B8=E3=83=88?= =?UTF-8?q?=E3=83=AA=E5=90=8D=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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", From 15cf29a9b9ff26439144f4916d3e58ed22925632 Mon Sep 17 00:00:00 2001 From: shizimi50 Date: Sun, 26 Nov 2023 14:50:13 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E5=9E=8B=E3=83=81=E3=82=A7=E3=83=83?= =?UTF-8?q?=E3=82=AF=E3=81=A7=E3=82=A8=E3=83=A9=E3=83=BC=E3=81=AB=E3=81=AA?= =?UTF-8?q?=E3=81=A3=E3=81=A6=E3=81=84=E3=81=9F=E7=AE=87=E6=89=80=E3=82=92?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/page.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/page.tsx b/app/page.tsx index bc32afb..892654c 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 = () => { - タイトル + 日本の都道府県別人口データ From 4eb000f9c8d56334192ded0736efa1303ac9aa2f Mon Sep 17 00:00:00 2001 From: shizimi50 Date: Sun, 26 Nov 2023 14:51:07 +0900 Subject: [PATCH 3/4] =?UTF-8?q?prettier=E3=81=A7=E3=83=95=E3=82=A9?= =?UTF-8?q?=E3=83=BC=E3=83=9E=E3=83=83=E3=83=88=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/DataTable/DataTable.tsx | 48 ++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 12 deletions(-) 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, }, ]; From ac177e2fd3810b6e2242fac8d6a6696a45ac681b Mon Sep 17 00:00:00 2001 From: shizimi50 Date: Sun, 26 Nov 2023 14:51:23 +0900 Subject: [PATCH 4/4] =?UTF-8?q?jest=E3=81=A7=E8=90=BD=E3=81=A1=E3=81=A6?= =?UTF-8?q?=E3=81=84=E3=81=9F=E7=AE=87=E6=89=80=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- utils/commaToNum.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); };