BruCandy commented 1 month ago

Summary (GitHub Copilot)

This pull request introduces several new components and functionalities to the application, focusing on improving the user interface and adding CRUD operations for orders, products, and details. The most important changes include the addition of new UI components for different parts of the application, the implementation of CRUD operations using Prisma, and updates to the application's root and index files to enhance the overall structure and functionality.

New UI Components:

app/components/atoms/button/MenuIconButton.tsx: Added a new MenuIconButton component using Chakra UI's IconButton and HamburgerIcon for the menu button.
app/components/molecules/MenueDrawer.tsx: Introduced the MenueDrawer component, which includes buttons for navigating to different sections of the application.
app/components/organisms/kitchen/OrderCard.tsx: Created the OrderCard component to display order details and manage order status transitions.
app/components/organisms/reception/ReceptionCard.tsx: Added the ReceptionCard component to handle product orders and cancellations.
app/components/organisms/register/ProductCard.tsx: Implemented the ProductCard component for managing product details, including deletion and modification.

CRUD Operations:

app/crud/crud_details.ts: Added CRUD operations for order_details, including creation, reading, and deletion of details.
app/crud/crud_orders.ts: Implemented CRUD operations for orders, including creation, reading by ID and status, updating status, and deleting orders.
app/crud/crud_products.ts: Introduced CRUD operations for products, including creation, reading, updating stock, modifying product details, and deletion.

Application Structure Enhancements:

app/root.tsx: Updated the root component to include a ChakraProvider, Header, and Sidebar, and structured the layout using Chakra UI's Grid component.
app/routes/_index.tsx: Refactored the home page component to use Chakra UI's Box, HStack, and VStack for displaying total sales.
app/routes/header.tsx: Added a new Header component that includes navigation buttons and integrates the MenuIconButton and MenueDrawer components.

Additional Changes:

app/hooks/useMessage.ts: Added a custom hook useMessage to display toast notifications using Chakra UI's useToast.
app/routes/$.tsx: Added a 404 error page component to handle non-existent routes.

r4ai commented 1 month ago

@BruCandy

4 にてPrettierを導入して自動フォーマットをかけた関係で、一部コンフリクトが発生しているので、コンフリクト解消お願いします！

競合している箇所は、mainブランチの内容を無視して、このブランチの内容で上書きすると良いと思います！

bun.lockbに関しては、package.jsonのコンフリクトを解決した後に、bun installを実行してbun.lockbを再生成すると良いと思います

BruCandy commented 1 month ago

vscode上でgitignoreにprisma/dev.dbを追加し、MenuIconButton.tsxの内容も簡潔に直したのですが、コンフリクトについてがよくわからないです。本来はコンフリクトが起きていたら、vscode上で以下のようになりますか？ <<<<<<< HEAD

=======

ricora / order