Skip to content

first commit #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
masa1109 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

first commit #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/page.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down Expand Up @@ -125,7 +125,7 @@ const Page = () => {
<AppBar position="static" sx={{ p: 1 }}>
<Toolbar>
<Typography variant="h1" component="h1">
タイトル
日本の都道府県別人口データ
</Typography>
</Toolbar>
</AppBar>
Expand Down
48 changes: 36 additions & 12 deletions components/DataTable/DataTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
},
];
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion utils/commaToNum.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
* カンマ区切りの文字列を数値に変換します
*/
export const commaToNum = (str: string) => {
const noCommaStr = str.replace(",", "");
const noCommaStr = str.replaceAll(",", "");
return Number(noCommaStr);
};