diff --git a/packages/nextjs/app/enterpreneur/create/page.tsx b/packages/nextjs/app/enterpreneur/create/page.tsx index 1f88877..957227f 100644 --- a/packages/nextjs/app/enterpreneur/create/page.tsx +++ b/packages/nextjs/app/enterpreneur/create/page.tsx @@ -2,11 +2,13 @@ import { useState } from "react"; import { useEffect } from "react"; -import { Card } from "../form/card"; import { SelectTab } from "../form/selectTab"; import { SwitchField } from "../form/switchField"; import { Box, Tab, Tabs } from "@mui/material"; import { Typography } from "@mui/material"; +import { Card } from "~~/components/Card"; +import { CardList } from "~~/components/CardList"; +import DividerWithText from "~~/components/DividerWithText"; // タブの種類を表すユニオン型を定義 type TabType = "割引券" | "引換券" | "会員券"; @@ -27,9 +29,36 @@ export default function TicketTabs() { setValue(tabLabels[newValue]); }; - useEffect(() => { - console.log(value); - }, [value]); + const cards = [ + { + title: "引換券", + issueDate: "2024.12.05", + amount: 7000, + expiryDate: "2025.06.30", + usageScope: "店舗全体", + }, + { + title: "引換券", + issueDate: "2024.12.05", + amount: 7000, + expiryDate: "2025.06.30", + usageScope: "店舗全体", + }, + { + title: "引換券", + issueDate: "2024.12.05", + amount: 7000, + expiryDate: "2025.06.30", + usageScope: "店舗全体", + }, + { + title: "引換券", + issueDate: "2024.12.05", + amount: 7000, + expiryDate: "2025.06.30", + usageScope: "店舗全体", + }, + ]; return (
@@ -37,10 +66,12 @@ export default function TicketTabs() { クーポンの登録 - + + +
); } diff --git a/packages/nextjs/app/enterpreneur/form/card.tsx b/packages/nextjs/app/enterpreneur/form/card.tsx deleted file mode 100644 index e44c26e..0000000 --- a/packages/nextjs/app/enterpreneur/form/card.tsx +++ /dev/null @@ -1,116 +0,0 @@ -"use client"; - -import React from "react"; -import { Box, CardContent, Divider, Card as MuiCard, Typography } from "@mui/material"; - -type CardProps = { - title: string; // タイトル - amount: number; // 金額 - expiryDate: string; // 有効期限 - usageScope: string; // 使用範囲 -}; - -export const Card = ({ title, amount, expiryDate, usageScope }: CardProps) => { - return ( - - {/* 上部の丸いアイコン */} - - - - {/* 金額 */} - - {amount}円 - - - {/* バーコード */} - - バーコード - - - - - {/* 有効期限 */} - - - 有効期限 - - - {expiryDate} - - - - {/* 使用範囲 */} - - - 使用範囲 - - - {usageScope} - - - - - - {/* 詳細情報 */} - - - 1. クーポンは1回のご購入につき1枚のみご利用いただけます。 -
- 2. 他のクーポンや割引サービスの併用はできません。 -
-
-
-
- ); -}; diff --git a/packages/nextjs/app/enterpreneur/form/selectTab.tsx b/packages/nextjs/app/enterpreneur/form/selectTab.tsx index d60741f..7414c22 100644 --- a/packages/nextjs/app/enterpreneur/form/selectTab.tsx +++ b/packages/nextjs/app/enterpreneur/form/selectTab.tsx @@ -36,9 +36,27 @@ export const SelectTab: FC = ({ value, handleChange }) => { return ( - - - + + + ); diff --git a/packages/nextjs/components/Card.tsx b/packages/nextjs/components/Card.tsx index c3229c0..9658db9 100644 --- a/packages/nextjs/components/Card.tsx +++ b/packages/nextjs/components/Card.tsx @@ -2,6 +2,7 @@ import React from "react"; import { Box, CardContent, Card as MuiCard, Typography } from "@mui/material"; +import { Divider } from "@mui/material"; type CardProps = { title: string; // タイトル @@ -18,47 +19,101 @@ export const Card = ({ title, issueDate, amount, expiryDate, usageScope }: CardP width: 300, borderRadius: 2, boxShadow: 3, - backgroundColor: "#f9f9f9", + backgroundColor: "#F0F0F0", + padding: 2, + position: "relative", + overflow: "visible", + pt: 5, + mb: 4, }} > - - - {title} - + {/* 上部の丸いアイコン */} + + + - - {issueDate} 発行 + + {/* 金額 */} + + {amount}円 + {/* バーコード */} - {amount}円 + バーコード + + + {/* 有効期限 */} + + + 有効期限 + + + {expiryDate} + + + + {/* 使用範囲 */} + + + 使用範囲 + + + {usageScope} + + + + + + {/* 詳細情報 */} - - 有効期限: {expiryDate} + + 1. クーポンは1回のご購入につき1枚のみご利用いただけます。 +
+ 2. 他のクーポンや割引サービスの併用はできません。
- - - 使用範囲: {usageScope} -
); diff --git a/packages/nextjs/components/CardList.tsx b/packages/nextjs/components/CardList.tsx index 9a4975a..fd144da 100644 --- a/packages/nextjs/components/CardList.tsx +++ b/packages/nextjs/components/CardList.tsx @@ -23,7 +23,7 @@ export const CardList = ({ cards }: CardListProps) => { justifyContent: "center", alignItems: "center", width: "70%", - margin: "100px auto", + margin: "50px auto", }} > {cards.map((card, index) => ( diff --git a/packages/nextjs/components/DividerWithText.tsx b/packages/nextjs/components/DividerWithText.tsx new file mode 100644 index 0000000..65b2bf1 --- /dev/null +++ b/packages/nextjs/components/DividerWithText.tsx @@ -0,0 +1,45 @@ +import React from "react"; +import { Box, Typography } from "@mui/material"; + +export default function DividerWithText() { + return ( + + {/* 左の線 */} + + + {/* テキスト */} + + 過去発行されたクーポン + + + {/* 右の線 */} + + + ); +} diff --git a/packages/nextjs/components/Header.tsx b/packages/nextjs/components/Header.tsx index 6b27ce3..39bf177 100644 --- a/packages/nextjs/components/Header.tsx +++ b/packages/nextjs/components/Header.tsx @@ -90,8 +90,12 @@ export const Header = () => { )} -
- SE2 logo +
+ SE2 logo