Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions frontend/app/components/books/BookCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,7 @@ const BookCard = ({ book }: BookCardProps) => {
<BookCardThumbnail id={book.id} thumbnail={book.thumbnail} />
</Card.Section>

{!!user && (
<BookCardFooter
id={book.id}
stock={book.stock}
thumbnail={book.thumbnail}
/>
)}
{!!user && <BookCardFooter book={book} />}
</Card>
);
};
Expand Down
20 changes: 9 additions & 11 deletions frontend/app/components/books/BookCardCartButton.tsx
Original file line number Diff line number Diff line change
@@ -1,36 +1,34 @@
import { Button } from '@mantine/core';
import { useNavigate } from '@remix-run/react';
import { Book } from 'client/client.schemas';
import { useAtom } from 'jotai';
import { BiSolidCartAdd } from 'react-icons/bi';
import { cartAtom } from '~/stores/cartAtom';
import { addBooksToCart } from '~/utils/cart';

interface BookCardCartButtonProps {
id: number;
stock: number;
thumbnail?: string;
book: Book;
}

const BookCardCartButton = ({
id,
stock,
thumbnail,
}: BookCardCartButtonProps) => {
const BookCardCartButton = ({ book }: BookCardCartButtonProps) => {
const [cart, setCart] = useAtom(cartAtom);
const navigate = useNavigate();
const addCart = () => {
setCart(addBooksToCart(cart, [{ id, stock, thumbnail }]));
setCart(addBooksToCart(cart, [book]));
navigate('/home/cart');
};
return (
<Button
variant="filled"
color="yellow"
radius="xl"
disabled={stock === 0}
disabled={book.stock === 0}
onClick={addCart}
leftSection={<BiSolidCartAdd size={23} />}
fz={10}
fz={{
base: 10,
md: 'xs',
}}
>
カートに入れる
</Button>
Expand Down
9 changes: 4 additions & 5 deletions frontend/app/components/books/BookCardFooter.tsx
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
import { Center } from '@mantine/core';
import { Book } from 'client/client.schemas';
import BookCardCartButton from './BookCardCartButton';

interface BookCardFooterProps {
id: number;
stock: number;
thumbnail?: string;
book: Book;
}

const BookCardFooter = ({ id, stock, thumbnail }: BookCardFooterProps) => {
const BookCardFooter = ({ book }: BookCardFooterProps) => {
return (
<Center pt={10}>
<BookCardCartButton id={id} stock={stock} thumbnail={thumbnail} />
<BookCardCartButton book={book} />
</Center>
);
};
Expand Down
4 changes: 2 additions & 2 deletions frontend/app/components/books/BookCardHeaderBadge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@ interface BookCardHeaderBadgeProps {
const BookCardHeaderBadge = ({ stock }: BookCardHeaderBadgeProps) => {
if (stock > 0) {
return (
<Badge color="lime" radius="xs">
<Badge fz="sm" color="lime" radius="xs">
貸出可
</Badge>
);
} else {
return (
<Badge color="red" radius="xs">
<Badge fz="sm" color="red" radius="xs">
貸出不可
</Badge>
);
Expand Down
2 changes: 1 addition & 1 deletion frontend/app/components/users/UsersListTable.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ const UsersListTable = ({ users }: UsersTableProps) => {
<Table.Tr key={user.id}>
{user.id && (
<>
<Table.Td>{user.name}</Table.Td>
<Table.Td fz="md">{user.name}</Table.Td>
<Table.Td maw={rem(5)}>
<UserDeleteButton id={user.id} />
</Table.Td>
Expand Down
Loading