-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41 from SystemEngineeringTeam/issue/10
Issue/10
- Loading branch information
Showing
4 changed files
with
65 additions
and
46 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,41 +1,30 @@ | ||
import { Member } from "@/types/member"; | ||
import { Avatar, Box, Flex, Separator, Text } from "@radix-ui/themes"; | ||
import { Avatar, Flex, Table, Text } from "@radix-ui/themes"; | ||
import { type ReactElement } from "react"; | ||
import { type Member } from "@/types/member"; | ||
|
||
export function MemberCard({ member }: { member: Member }): ReactElement { | ||
//仮の情報を表示 | ||
//icon,name,screen_name,post_count,role | ||
export function MemberCard({ member,point }: { member: Member,point:number }): ReactElement { | ||
return ( | ||
<> | ||
<Flex gap="4" align="center" height="80px"> | ||
<Table.Row> | ||
<Table.RowHeaderCell> | ||
<Flex gap="2"> | ||
<Avatar | ||
size="5" | ||
src = {member.icon} | ||
fallback="A" | ||
radius="full" | ||
fallback="T" | ||
size="6" | ||
src={member.icon} | ||
/> | ||
<Box width="300px" > | ||
<Text as="div" size="7" weight="bold"> | ||
{member.name} | ||
</Text> | ||
</Box> | ||
<Box width="60px"> | ||
<Text as="div" size="5" color="gray" align="center"> | ||
{member.screen_name} | ||
</Text> | ||
</Box> | ||
<Box width="60px"> | ||
<Text as="div" size="5" color="gray" align="center"> | ||
{member.posts_count} | ||
</Text> | ||
</Box> | ||
<Box width="60px"> | ||
<Text as="div" size="5" color="gray" align="center"> | ||
{member.role} | ||
</Text> | ||
</Box> | ||
</Flex> | ||
<Separator my="1" size="4" /> | ||
</> | ||
</Flex> | ||
</Table.RowHeaderCell> | ||
<Table.Cell> | ||
<Text as="div" size="8" weight="bold"> | ||
{member.name} | ||
</Text> | ||
</Table.Cell> | ||
<Table.Cell> | ||
<Text as="div" size="6"> | ||
{point} | ||
</Text> | ||
</Table.Cell> | ||
</Table.Row> | ||
); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,36 @@ | ||
import { Table } from "@radix-ui/themes"; | ||
import { type ReactElement } from "react"; | ||
import { MemberCard } from "@/components/member/Card"; | ||
import SampleMember from "@/assets/members.json"; | ||
import { Member } from "@/types/member"; | ||
import SampleUnlockedAchievements from '@/assets/unlockedAchievements.json' | ||
import { MemberCard } from "@/components/member/Card"; | ||
import { type Member } from "@/types/member"; | ||
|
||
export default function Page(): ReactElement { | ||
let point:number = 0; | ||
return ( | ||
<> | ||
{SampleMember.members.map((e: any) => { | ||
const member = e as Member; | ||
<MemberCard member={member}></MemberCard>; | ||
})} | ||
</> | ||
<Table.Root> | ||
<Table.Header> | ||
<Table.Row> | ||
<Table.ColumnHeaderCell> </Table.ColumnHeaderCell> | ||
<Table.ColumnHeaderCell>名前</Table.ColumnHeaderCell> | ||
<Table.ColumnHeaderCell>ポイント</Table.ColumnHeaderCell> | ||
</Table.Row> | ||
</Table.Header> | ||
|
||
<Table.Body> | ||
|
||
|
||
{SampleMember.members.map((e: any) => { | ||
const member: Member = e as Member; | ||
|
||
SampleUnlockedAchievements.unlockedAchievements.forEach((unlockedAchievement)=>{ | ||
if(unlockedAchievement.userEmail === member.email){ | ||
point += 1; | ||
} | ||
}) | ||
return <MemberCard key="index" member={member} point={point} /> | ||
})} | ||
</Table.Body> | ||
</Table.Root> | ||
); | ||
} |