Skip to content

Commit

Permalink
Merge branch 'issues/2'
Browse files Browse the repository at this point in the history
  • Loading branch information
kinako1415 committed Jun 13, 2024
2 parents 24e5815 + 1b6cc90 commit fb65a9f
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 62 deletions.
4 changes: 2 additions & 2 deletions src/assets/members.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"role": "member",
"posts_count": 0,
"joined_at": "2019-01-01T00:00:00Z",
"last_accessed_at": "2019-01-01T00:00:00Z",
"last_posted_at": "2019-01-01T00:00:00Z",
"email": "xxxxxx"
},
{
Expand All @@ -19,7 +19,7 @@
"role": "owner",
"posts_count": 0,
"joined_at": "2019-01-01T00:00:00Z",
"last_accessed_at": "2019-01-01T00:00:00Z",
"last_posted_at": "2019-01-01T00:00:00Z",
"email": "xxxxxx"
}
],
Expand Down
33 changes: 0 additions & 33 deletions src/components/List.tsx

This file was deleted.

7 changes: 4 additions & 3 deletions src/components/member/Card.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { Member } from "@/types/member";
import { Text } from "@radix-ui/themes";
import { type ReactElement } from "react";

export function MemberCard({ data }: { data: any }): ReactElement {
export function MemberCard({ member }: { member: Member }): ReactElement {
return (
<>
<Text>Hello This page is memberCard</Text>
<Text>{data.name}</Text>
<Text>{data.email}</Text>
<Text>{member.name}</Text>
<Text>{member.email}</Text>
</>
);
}
7 changes: 1 addition & 6 deletions src/pages/achievements/index.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import { type ReactElement } from "react";
import { List } from "@/components/List";
import { MemberCard } from "@/components/member/Card";

Check failure on line 2 in src/pages/achievements/index.tsx

View workflow job for this annotation

GitHub Actions / build

'MemberCard' is declared but its value is never read.

export function Page(): ReactElement {
Expand All @@ -15,9 +14,5 @@ export function Page(): ReactElement {
description: "",
},
];
return (
<List data={achievementsTestData}>
<MemberCard data={undefined} />
</List>
);
return <p></p>;
}
23 changes: 5 additions & 18 deletions src/pages/members/index.tsx
Original file line number Diff line number Diff line change
@@ -1,23 +1,10 @@
import { type ReactElement } from "react";
import { List } from "@/components/List";
import { MemberCard } from "@/components/member/Card";
import SampleMember from "@/assets/members.json";
import { Member } from "@/types/member";

export function Page(): ReactElement {
const membersTestData = [
{
id: 1,
name: "John Doe",
email: "[email protected]",
},
{
id: 2,
name: "Jane Doe",
email: "[email protected]",
},
];
return (
<List data={membersTestData}>
<MemberCard data={undefined} />
</List>
);
const teto = SampleMember.members.at(-1) as Member;

return <MemberCard member={teto}></MemberCard>;
}
13 changes: 13 additions & 0 deletions src/pages/ranking/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { MemberCard } from "@/components/member/Card";
import { ReactElement } from "react";
import SampleMember from "@/assets/members.json";
import members from "@/assets/members.json";

Check failure on line 4 in src/pages/ranking/index.tsx

View workflow job for this annotation

GitHub Actions / build

'members' is declared but its value is never read.
import { Member } from "@/types/member";

export default function Page(): ReactElement {
const teto = SampleMember.members.at(-1) as Member;

if (teto == null) throw new Error("Teto not found!");

return <MemberCard member={teto}></MemberCard>;
}

0 comments on commit fb65a9f

Please sign in to comment.