Skip to content

Commit

Permalink
Merge pull request #43 from /issues/9
Browse files Browse the repository at this point in the history
achievementsの一覧表示
  • Loading branch information
nrak126 authored Jun 18, 2024
2 parents 13d5b57 + 8d6c252 commit ff41e76
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 21 deletions.
40 changes: 25 additions & 15 deletions src/components/achievements/Card.tsx
Original file line number Diff line number Diff line change
@@ -1,20 +1,30 @@
import { Text } from "@radix-ui/themes";
import { Avatar, Box, Card, Flex, Text } from "@radix-ui/themes";
import { type ReactElement } from "react";
import { type Achievement } from "@/types/achievement";
import { type Achievement, } from "@/types/achievement";

export function AchievementCard({
data,
showRelativeDate = false,
}: {
data: Achievement;
showRelativeDate: boolean;
}): ReactElement {
export function AchievementCard({achievement}: {achievement: Achievement}): ReactElement {
return (
<>
{showRelativeDate && <Text>1日前</Text>}
<Text>Hello This page is AchievementCard</Text>
<Text>{data.name}</Text>
<Text>{data.description}</Text>
</>
<Card>
<Flex align="center" gap="3">
<Avatar
fallback="T"
radius="full"
size="3"
src={achievement.icon}
/>
<Box>
<Text as="div" size="2" weight="bold">
{achievement.name}
</Text>
<Text as="div" color="gray" size="2">
{achievement.description}
</Text>
<Text as="div" color="gray" size="2">
#{achievement.tags[0].name}
</Text>
</Box>
</Flex>

</Card>
);
}
11 changes: 5 additions & 6 deletions src/pages/achievements/index.tsx
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import { type ReactElement } from "react";
import { FirstPenguin } from "@/components/achievements/FirstPenguin";
import Achievements from "@/assets/achievements.json";
import { AchievementCard } from "@/components/achievements/Card";
import data from "@/assets/achievements.json";
import { FirstPenguin } from "@/components/achievements/FirstPenguin";

export default function Page(): ReactElement {
return (
<>
<FirstPenguin />
{data.achievements.map((achievement) => (
{Achievements.achievements.map((achievement) => (
<AchievementCard
key={achievement.id}
data={achievement}
showRelativeDate={false}
key={achievement.id}
achievement={achievement}
/>
))}
</>
Expand Down

0 comments on commit ff41e76

Please sign in to comment.