Skip to content
This repository was archived by the owner on Feb 9, 2026. It is now read-only.

Commit 694ef83

Browse files
committed
frontend:TopPageの全体的なデザインの調整
1 parent 858e043 commit 694ef83

File tree

7 files changed

+38
-113
lines changed

7 files changed

+38
-113
lines changed

frontend/src/components/ExampleBillingDetailCard.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ export default function ExampleBillingDetailCard({
2121
const payerPayments = samplePayments.filter((p) => p.paidBy === paidBy.id);
2222

2323
return (
24-
<Card className="h-[450px] overflow-y-auto shadow-md">
24+
<Card className="h-[330px] overflow-y-auto shadow-md">
2525
<CardHeader>
2626
<CardTitle>{paidBy.name}さんが受け取る金額の入力</CardTitle>
2727
</CardHeader>

frontend/src/components/NetworkGraph.tsx

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,16 @@ import type { Result } from "@/types/result";
55
interface Props {
66
members: Member[];
77
results: Result[];
8+
height?: string;
9+
width?: string;
810
}
911

10-
export default function NetworkGraph({ members, results }: Props) {
12+
export default function NetworkGraph({
13+
members,
14+
results,
15+
height = "500px",
16+
width = "500px",
17+
}: Props) {
1118
if (results.length === 0) {
1219
return (
1320
<div className="p-8 text-center">
@@ -100,9 +107,10 @@ export default function NetworkGraph({ members, results }: Props) {
100107
return (
101108
<div
102109
style={{
103-
width: "calc(100% - 48px)",
110+
width: width,
111+
// width: "100%",
104112
margin: "0 24px",
105-
height: "500px",
113+
height: height,
106114
boxShadow: "0 4px 12px rgba(0, 0, 0, 0.25)",
107115
borderRadius: "8px",
108116
background: "#ffffff",

frontend/src/components/ResultDetailCard.tsx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,14 @@ interface ResultDetailCardProps {
1313
personId: MemberId;
1414
members: Member[];
1515
results: Result[];
16+
height?: string;
1617
}
1718

1819
export default function ResultDetailCard({
1920
personId,
2021
members,
2122
results,
23+
height = "250px",
2224
}: ResultDetailCardProps) {
2325
const person = members.find((m) => m.id === personId);
2426
const personName = person?.name || `メンバー${personId}`;
@@ -40,7 +42,10 @@ export default function ResultDetailCard({
4042
<CardTitle className="text-xl">{personName}さんの精算結果</CardTitle>
4143
</CardHeader>
4244

43-
<CardContent className="flex h-full min-h-[250px] items-start gap-6 px-6 py-4">
45+
<CardContent
46+
className="flex h-full items-start gap-6 px-6 py-4"
47+
style={{ minHeight: height }}
48+
>
4449
<div className="flex-1">
4550
<h3 className="mb-3 font-semibold text-lg text-red-700">
4651
支払うお金 ({formatCurrency(totalPayment)}円)

frontend/src/components/ResultTab.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,10 @@ import ResultDetailCard from "./ResultDetailCard";
66
interface ResultProps {
77
members: Member[];
88
results: Result[];
9+
height?: string;
910
}
1011

11-
export default function ResultTab({ members, results }: ResultProps) {
12+
export default function ResultTab({ members, results, height }: ResultProps) {
1213
// 結果がない場合の表示
1314
if (results.length === 0) {
1415
return (
@@ -49,6 +50,7 @@ export default function ResultTab({ members, results }: ResultProps) {
4950
personId={person}
5051
members={members}
5152
results={results}
53+
height={height}
5254
/>
5355
</TabsContent>
5456
))}

frontend/src/components/TopPageHeader.tsx

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { useNavigate } from "react-router-dom";
22
import { cn } from "@/lib/utils";
3-
import CardWrapper from "./CardWrapper";
43
import { Button } from "./ui/button";
54
import { Card, CardContent } from "./ui/card";
65

@@ -38,13 +37,13 @@ export default function TopPageHeader({
3837
</div>
3938
<Card
4039
className={cn(
41-
"mx-auto mb-8 w-[90%] max-w-md bg-gray-100 shadow-md",
40+
"-mt-4 mx-auto mb-5 w-[90%] max-w-md bg-gray-100 shadow-md",
4241
className,
4342
)}
4443
>
45-
<CardContent className="flex flex-col">
44+
<CardContent className="flex flex-col p-1">
4645
<div className="text-center">
47-
<p className="mb-8 text-black text-lg">
46+
<p className="mb-4 text-black text-lg">
4847
頻繁に起こる建て替えを最適化します。
4948
</p>
5049
<Button

frontend/src/data/tmp_data.ts

Lines changed: 0 additions & 101 deletions
This file was deleted.

frontend/src/pages/TopPage.tsx

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -181,9 +181,14 @@ export default function TopPage() {
181181
/>
182182
<div className="flex flex-col items-center gap-6 md:flex-row md:justify-center">
183183
<CardWrapper title="結果表示" nextButton={null}>
184-
<ResultTab members={sampleMembers} results={sampleResults} />
184+
<ResultTab
185+
members={sampleMembers}
186+
results={sampleResults}
187+
height="150px"
188+
/>
185189
<div className="mt-4 flex gap-4">
186190
<Button variant="outline">戻る</Button>
191+
<Button size="lg">CSV出力</Button>
187192
</div>
188193
</CardWrapper>
189194
<Card
@@ -208,7 +213,14 @@ export default function TopPage() {
208213
</div>
209214
<div className="flex flex-col items-center gap-6 md:flex-row md:justify-center">
210215
<CardWrapper title="ネットワークグラフ">
211-
<NetworkGraph members={sampleMembers} results={sampleResults} />
216+
<div className="flex w-full justify-center">
217+
<NetworkGraph
218+
members={sampleMembers}
219+
results={sampleResults}
220+
height="300px"
221+
width="300px"
222+
/>
223+
</div>
212224
<div className="mt-4 flex gap-4">
213225
<Button variant="outline">戻る</Button>
214226
</div>

0 commit comments

Comments
 (0)