Skip to content

Commit

Permalink
微調整
Browse files Browse the repository at this point in the history
  • Loading branch information
nasubi-dev committed Sep 23, 2024
1 parent 5ee1849 commit 6db5da6
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 21 deletions.
6 changes: 4 additions & 2 deletions src/components/Footer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ export function Footer(): ReactElement {
flexDirection="column"
fontSize="sm"
gap="5"
p="4"
px="4"
py="16"
>
<HStack gap="5">
<a
Expand Down Expand Up @@ -70,7 +71,8 @@ export function Footer(): ReactElement {
rounded: "md",
},
})}
gap="5"
gap="1"
mdDown={{ mr: "1" }}
ml="5" // NOTE: 中央揃えの見た目のため, 右にずらしている
>
<LinkText currentLoc={resolvedLocation} to="/projects" />
Expand Down
3 changes: 1 addition & 2 deletions src/routes/_auth/projects/$uuid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ function GridDetailInfo({
py={4}
rounded="md"
>
<HStack gap={2} justify="center">
<HStack color="wkb-neutral.0" gap={2} justify="center">
<Icon icon={ICON[data.status]} width="2rem" />
<p.p color="wkb-neutral.0" fontSize="95%" fontWeight="bold">
{data.status === "wakaba" && "このWakabaを支援する"}
Expand Down Expand Up @@ -377,7 +377,6 @@ export const Route = createFileRoute("/_auth/projects/$uuid")({
if (seed === undefined) throw new Error("No data5 found");
return seed;
});
if (data5 === undefined) throw new Error("No data5 found");

const data: needs = {
amount_of_money: data2.amount_of_money,
Expand Down
2 changes: 1 addition & 1 deletion src/routes/_auth/projects/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ export const Route = createFileRoute("/_auth/projects/")({
<HStack>
{projectsData.map((_) => (
<SwiperSlide key={_.project_id} zoom={false}>
<Link key={_.project_id} to={`/projects/${_.project_id}`}>
<Link to={`/projects/${_.project_id}`}>
<ProjectCard
amount_of_money={_.amount_of_money}
key_visual={_.key_visual ?? ""}
Expand Down
21 changes: 13 additions & 8 deletions src/routes/_auth/seeds/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,11 @@ export const Route = createFileRoute("/_auth/seeds/")({

return (
<p.div key={seed.seed_id} minW={400} p={4} width="1/3">
<Link to={`/projects/${seed.seed_id}`}>
<SownSeed
category={category}
createdAt={formatCreatedAt(seed.created_at)}
description={seed.description ?? ""}
/>
</Link>
<SownSeed
category={category}
createdAt={formatCreatedAt(seed.created_at)}
description={seed.description ?? ""}
/>
</p.div>
);
})}
Expand All @@ -134,7 +132,14 @@ export const Route = createFileRoute("/_auth/seeds/")({
key_visual={_.key_visual ?? ""}
location={_.location}
name={_.name}
status="wakaba"
status={
// eslint-disable-next-line
_.project_id === "1"
? "tsubomi"
: _.project_id === "7"
? "hana"
: "wakaba"
}
/>
</Link>
))}
Expand Down
15 changes: 7 additions & 8 deletions src/routes/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -98,15 +98,14 @@ export const Route = createFileRoute("/")({
<p.p
color="wkb.bg"
fadeIn="5"
fontSize="100%"
maxWidth={{ base: "85%", sm: "70%" }}
fontSize="1.5rem"
mt="20px"
mx="auto"
textAlign="center"
>
昔、あるところになかなか子どもが生まれない夫婦がいました。
でも、ある時、ようやくかわいらしい男の子が産まれました。
れどれ。あら、こぶなんてないじゃないの?」
意見を投稿して、住みやすい街を
<br />
作るアイデアの種を植えよう!
</p.p>
<Link to="/user">
<Button
Expand Down Expand Up @@ -186,7 +185,7 @@ export const Route = createFileRoute("/")({
height="100%"
width="100%"
>
# カフェ
# 休憩
</Button>
</p.a>
<p.a height={100} href="/projects?q=library" width="100%">
Expand All @@ -202,7 +201,7 @@ export const Route = createFileRoute("/")({
height="100%"
width="100%"
>
# 図書館
# 施設
</Button>
</p.a>
<p.a height={100} href="/projects?q=gym" width="100%">
Expand All @@ -218,7 +217,7 @@ export const Route = createFileRoute("/")({
height="100%"
width="100%"
>
# 運動施設
# 飲食
</Button>
</p.a>
</p.div>
Expand Down

0 comments on commit 6db5da6

Please sign in to comment.