-
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 #153 from /issues/152
member詳細画面 引数対応
- Loading branch information
Showing
3 changed files
with
115 additions
and
141 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 was deleted.
Oops, something went wrong.
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,58 +1,106 @@ | ||
| // import { type ReactElement } from "react"; | ||
| // import useSWRImmutable from "swr/immutable"; | ||
| // import { match } from "ts-pattern"; | ||
| // import { ErrorScreen } from "@/components/ErrorScreen"; | ||
| // import { useTeam } from "@/hooks/teams"; | ||
| // import { S } from "@/lib/consts"; | ||
| // import { handleSWRError } from "@/lib/utils/swr"; | ||
| // import { useParams } from "@/router"; | ||
|
|
||
| // export default function Page(): ReactElement { | ||
| // const { id } = useParams("/members/:id"); | ||
| // const { fetchMembers } = useTeam(); | ||
| // const swrMembers = useSWRImmutable("members", fetchMembers); | ||
|
|
||
| // 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(({ data, error }) => ( | ||
| // <ErrorScreen error={handleSWRError(data, error)} /> | ||
| // )); | ||
| // } | ||
|
|
||
| import { Flex } from "@radix-ui/themes"; | ||
| import { Box, Flex } from "@radix-ui/themes"; | ||
| import { type ReactElement } from "react"; | ||
| import { useParams } from "react-router-dom"; | ||
| import styled from "styled-components"; | ||
| import useSWRImmutable from "swr/immutable"; | ||
| import { match } from "ts-pattern"; | ||
| import { ErrorScreen } from "@/components/ErrorScreen"; | ||
| import { AchievementCard } from "@/components/achievements/Card"; | ||
| import { Info } from "@/components/member/Info"; | ||
| import { UnlockedCard } from "@/components/member/UnlockedCard"; | ||
| import { useAchievements } from "@/hooks/db/achievements"; | ||
| import { useUnlockedAchievements } from "@/hooks/db/unlocked-achievements"; | ||
| import { useTeam } from "@/hooks/teams"; | ||
| import { S } from "@/lib/consts"; | ||
| import { | ||
| fetchMembersAndUnlockedAchievementsAndAchievements, | ||
| getUnlockedAchievementsFromMember, | ||
| } from "@/lib/utils/fetchers"; | ||
| import { handleSWRError } from "@/lib/utils/swr"; | ||
|
|
||
| const BoxStyle = styled(Box)` | ||
| margin: 0 auto; | ||
| height: 80vh; | ||
| overflow: scroll; | ||
| `; | ||
|
|
||
| export default function Page(): ReactElement { | ||
| return ( | ||
| <Flex> | ||
| <Info /> | ||
| <Flex overflow="scroll" width="100%"> | ||
| <UnlockedCard /> | ||
| </Flex> | ||
| </Flex> | ||
| const { id } = useParams(); | ||
| const { fetchMembers } = useTeam(); | ||
| const { fetch: fetchAchievements } = useAchievements(useTeam); | ||
| const { fetch: fetchUnlockedAchievements } = useUnlockedAchievements(useTeam); | ||
| const swrMembersAndUnlockedAchievementsAndAchievements = useSWRImmutable( | ||
| "membersAndUnlockedAchievementsAndAchievements", | ||
| async () => | ||
| await fetchMembersAndUnlockedAchievementsAndAchievements( | ||
| fetchMembers, | ||
| fetchAchievements, | ||
| fetchUnlockedAchievements, | ||
| ), | ||
| ); | ||
|
|
||
| return match(swrMembersAndUnlockedAchievementsAndAchievements) | ||
| .with(S.Loading, () => <p>Loading...</p>) | ||
| .with( | ||
| S.Success, | ||
| ({ data: { members, unlockedAchievements, achievements } }) => ( | ||
| <div> | ||
| {members.map((m) => { | ||
| if (m.email === id) { | ||
| const point = unlockedAchievements.filter( | ||
| (u) => u.memberEmail === m.email, | ||
| ).length; | ||
| const rateOfUnlocked = | ||
| Math.round((point / achievements.length) * 10) / 10; | ||
|
|
||
| const thisMemberUnlockedAchievements = unlockedAchievements | ||
| .filter((u) => u.memberEmail === m.email) | ||
| .map((u) => achievements.find((a) => a.id === u.achievementID)); | ||
|
|
||
| const rankedMembers = members | ||
| .map((l) => ({ | ||
| ...l, | ||
| point: getUnlockedAchievementsFromMember( | ||
| l, | ||
| unlockedAchievements, | ||
| ).length, | ||
| })) | ||
| .sort((a, b) => b.point - a.point); | ||
|
|
||
| const ranking = | ||
| rankedMembers.findIndex((member) => member.email === m.email) + | ||
| 1; | ||
|
|
||
| return ( | ||
| <Flex key={m.email} gap="9"> | ||
| <Info | ||
| name={m.name} | ||
| point={point} | ||
| ranking={ranking} | ||
| rateOfUnlocked={rateOfUnlocked} | ||
| /> | ||
| <div> | ||
| <Box mt="20vh" /> | ||
| <BoxStyle> | ||
| {thisMemberUnlockedAchievements.map((achievement) => { | ||
| if (achievement === undefined) return null; | ||
| return ( | ||
| <AchievementCard | ||
| key={achievement.id} | ||
| achievement={achievement} | ||
| /> | ||
| ); | ||
| })} | ||
| </BoxStyle> | ||
| </div> | ||
| </Flex> | ||
| ); | ||
| } | ||
| return null; | ||
| })} | ||
| </div> | ||
| ), | ||
| ) | ||
| .otherwise(({ data, error }) => ( | ||
| <ErrorScreen error={handleSWRError(data, error)} /> | ||
| )); | ||
| } |