-
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 #111 from /issues/110
Issues/110
- Loading branch information
Showing
3 changed files
with
68 additions
and
100 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,82 +1,49 @@ | ||
| import { Box, Flex, Table } from "@radix-ui/themes"; | ||
| import { type ReactElement } from "react"; | ||
| import styled from "styled-components"; | ||
| import Members from "@/assets/members.json"; | ||
| import UnlockedAchievements from "@/assets/unlockedAchievements.json"; | ||
| import { RecentUnlockedCard } from "@/components/achievements/RecentUnlockedCard"; | ||
| import { Info } from "@/components/member/Info"; | ||
| import useSWRImmutable from "swr/immutable"; | ||
| import { match } from "ts-pattern"; | ||
| import { useTeam } from "@/hooks/teams"; | ||
| import { S } from "@/lib/consts"; | ||
| import { useParams } from "@/router"; | ||
| import { type UnlockedAchievement } from "@/types/post-data/unlocked-achievements"; | ||
|
|
||
| const BoxStyle = styled(Box)` | ||
| margin: 0 auto; | ||
| `; | ||
|
|
||
| const FlexStyle = styled(Flex)` | ||
| margin: 1rem 1rem; | ||
| `; | ||
|
|
||
| const ScrollStyle = styled.div` | ||
| height: calc(100vh - 4.8rem); | ||
| width: 100%; | ||
| overflow: scroll; | ||
| `; | ||
| import { type Member } from "@/types/member"; | ||
|
|
||
| export default function Page(): ReactElement { | ||
| // const { params } = useMatch('/posts/$id') | ||
| const { id } = useParams("/achievements/:id"); | ||
|
|
||
| const memberRecentUnlocked = UnlockedAchievements.unlockedAchievements.filter( | ||
| (a) => a.memberEmail === id, | ||
| ); | ||
|
|
||
| const memberList = Members.members.map((m) => { | ||
| const unlockedArchievements = | ||
| UnlockedAchievements.unlockedAchievements.filter( | ||
| (u) => u.memberEmail === m.email, | ||
| ); | ||
| return { | ||
| ...m, | ||
| unlockedCount: unlockedArchievements.length, | ||
| }; | ||
| }); | ||
| let memberIndex: number = 0; | ||
| memberList.sort((a, b) => b.unlockedCount - a.unlockedCount); | ||
| memberList.forEach((m, index) => { | ||
| if (m.email === id) { | ||
| memberIndex = index + 1; | ||
| } | ||
| }); | ||
|
|
||
| return ( | ||
| <FlexStyle gap="5"> | ||
| <Info id={id} point={memberRecentUnlocked.length} rank={memberIndex} /> | ||
| <BoxStyle width="70%"> | ||
| <ScrollStyle> | ||
| <Table.Root> | ||
| <Table.Header> | ||
| <Table.Row> | ||
| <Table.ColumnHeaderCell> </Table.ColumnHeaderCell> | ||
| <Table.ColumnHeaderCell> </Table.ColumnHeaderCell> | ||
| <Table.ColumnHeaderCell>名前</Table.ColumnHeaderCell> | ||
| <Table.ColumnHeaderCell>説明</Table.ColumnHeaderCell> | ||
| <Table.ColumnHeaderCell>タグ</Table.ColumnHeaderCell> | ||
| </Table.Row> | ||
| </Table.Header> | ||
|
|
||
| <Table.Body> | ||
| {memberRecentUnlocked.map((achievement) => ( | ||
| <RecentUnlockedCard | ||
| key={achievement.memberEmail} | ||
| unlockedAchievement={ | ||
| achievement as unknown as UnlockedAchievement | ||
| } | ||
| /> | ||
| ))} | ||
| </Table.Body> | ||
| </Table.Root> | ||
| </ScrollStyle> | ||
| </BoxStyle> | ||
| </FlexStyle> | ||
| ); | ||
| const { id } = useParams("/members/:id"); | ||
| const { fetchMembers } = useTeam(); | ||
| const swrMembers = useSWRImmutable("members", fetchMember); | ||
|
|
||
| async function fetchMember(): Promise<Member[]> { | ||
| const members = await fetchMembers(); | ||
|
|
||
| if (members == null) throw new Error("No unlockedAchievements found."); | ||
|
|
||
| return members; | ||
| } | ||
|
|
||
| return match(swrMembers) | ||
| .with(S.Loading, () => <p>Loading...</p>) | ||
| .with(S.Success, ({ data }) => ( | ||
| <div> | ||
| {data.map((d) => { | ||
| if (d.email === id) { | ||
| return ( | ||
| <div key={d.email}> | ||
| <h1>name: {d.name}</h1> | ||
| <p>screen_name: {d.screen_name}</p> | ||
| <p>email: {d.email}</p> | ||
| <p>myself: {d.myself}</p> | ||
| <p>createdAt: {String(d.joined_at)}</p> | ||
| <p>posts_count: {d.posts_count}</p> | ||
| <p>last_accessed_at: {d.last_accessed_at}</p> | ||
| <p>role: {d.role}</p> | ||
| <p>icon: {d.icon}</p> | ||
| </div> | ||
| ); | ||
| } | ||
| return null; | ||
| })} | ||
| </div> | ||
| )) | ||
| .otherwise(({ error }) => { | ||
| throw error; | ||
| }); | ||
| } |