-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
受領後の画面作成 #33
Merged
受領後の画面作成 #33
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,139 @@ | ||
import * as React from "react" | ||
import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog" | ||
|
||
import { cn } from "~/lib/utils" | ||
import { buttonVariants } from "~/components/ui/button" | ||
|
||
const AlertDialog = AlertDialogPrimitive.Root | ||
|
||
const AlertDialogTrigger = AlertDialogPrimitive.Trigger | ||
|
||
const AlertDialogPortal = AlertDialogPrimitive.Portal | ||
|
||
const AlertDialogOverlay = React.forwardRef< | ||
React.ElementRef<typeof AlertDialogPrimitive.Overlay>, | ||
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Overlay> | ||
>(({ className, ...props }, ref) => ( | ||
<AlertDialogPrimitive.Overlay | ||
className={cn( | ||
"fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0", | ||
className | ||
)} | ||
{...props} | ||
ref={ref} | ||
/> | ||
)) | ||
AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName | ||
|
||
const AlertDialogContent = React.forwardRef< | ||
React.ElementRef<typeof AlertDialogPrimitive.Content>, | ||
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Content> | ||
>(({ className, ...props }, ref) => ( | ||
<AlertDialogPortal> | ||
<AlertDialogOverlay /> | ||
<AlertDialogPrimitive.Content | ||
ref={ref} | ||
className={cn( | ||
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg", | ||
className | ||
)} | ||
{...props} | ||
/> | ||
</AlertDialogPortal> | ||
)) | ||
AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName | ||
|
||
const AlertDialogHeader = ({ | ||
className, | ||
...props | ||
}: React.HTMLAttributes<HTMLDivElement>) => ( | ||
<div | ||
className={cn( | ||
"flex flex-col space-y-2 text-center sm:text-left", | ||
className | ||
)} | ||
{...props} | ||
/> | ||
) | ||
AlertDialogHeader.displayName = "AlertDialogHeader" | ||
|
||
const AlertDialogFooter = ({ | ||
className, | ||
...props | ||
}: React.HTMLAttributes<HTMLDivElement>) => ( | ||
<div | ||
className={cn( | ||
"flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2", | ||
className | ||
)} | ||
{...props} | ||
/> | ||
) | ||
AlertDialogFooter.displayName = "AlertDialogFooter" | ||
|
||
const AlertDialogTitle = React.forwardRef< | ||
React.ElementRef<typeof AlertDialogPrimitive.Title>, | ||
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Title> | ||
>(({ className, ...props }, ref) => ( | ||
<AlertDialogPrimitive.Title | ||
ref={ref} | ||
className={cn("text-lg font-semibold", className)} | ||
{...props} | ||
/> | ||
)) | ||
AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName | ||
|
||
const AlertDialogDescription = React.forwardRef< | ||
React.ElementRef<typeof AlertDialogPrimitive.Description>, | ||
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description> | ||
>(({ className, ...props }, ref) => ( | ||
<AlertDialogPrimitive.Description | ||
ref={ref} | ||
className={cn("text-sm text-muted-foreground", className)} | ||
{...props} | ||
/> | ||
)) | ||
AlertDialogDescription.displayName = | ||
AlertDialogPrimitive.Description.displayName | ||
|
||
const AlertDialogAction = React.forwardRef< | ||
React.ElementRef<typeof AlertDialogPrimitive.Action>, | ||
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Action> | ||
>(({ className, ...props }, ref) => ( | ||
<AlertDialogPrimitive.Action | ||
ref={ref} | ||
className={cn(buttonVariants(), className)} | ||
{...props} | ||
/> | ||
)) | ||
AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName | ||
|
||
const AlertDialogCancel = React.forwardRef< | ||
React.ElementRef<typeof AlertDialogPrimitive.Cancel>, | ||
React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Cancel> | ||
>(({ className, ...props }, ref) => ( | ||
<AlertDialogPrimitive.Cancel | ||
ref={ref} | ||
className={cn( | ||
buttonVariants({ variant: "outline" }), | ||
"mt-2 sm:mt-0", | ||
className | ||
)} | ||
{...props} | ||
/> | ||
)) | ||
AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName | ||
|
||
export { | ||
AlertDialog, | ||
AlertDialogPortal, | ||
AlertDialogOverlay, | ||
AlertDialogTrigger, | ||
AlertDialogContent, | ||
AlertDialogHeader, | ||
AlertDialogFooter, | ||
AlertDialogTitle, | ||
AlertDialogDescription, | ||
AlertDialogAction, | ||
AlertDialogCancel, | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,90 @@ | ||
import { AlertDialogCancel } from "@radix-ui/react-alert-dialog"; | ||
import { useState } from "react"; | ||
import { | ||
AlertDialog, | ||
AlertDialogAction, | ||
AlertDialogContent, | ||
AlertDialogDescription, | ||
AlertDialogFooter, | ||
AlertDialogHeader, | ||
AlertDialogTitle, | ||
AlertDialogTrigger, | ||
} from "~/components/ui/alert-dialog"; | ||
import { Button } from "~/components/ui/button"; | ||
import { Input } from "~/components/ui/input"; | ||
import { Order } from "~/models/order"; | ||
|
||
const mockOrder: Order = { | ||
orderId: 1, | ||
createdAt: new Date(), | ||
servedAt: null, | ||
items: [ | ||
{ | ||
type: "ice", | ||
name: "珈琲・俺ブレンド", | ||
price: 300, | ||
}, | ||
{ | ||
type: "ice", | ||
name: "珈琲・俺ブレンド", | ||
price: 400, | ||
}, | ||
], | ||
assignee: "1st", | ||
total: 700, | ||
orderReady: false, | ||
}; | ||
|
||
export default function Casher() { | ||
// const total = mockOrder.items.reduce((acc, cur) => acc + cur.price, 0); | ||
const [recieved, setText] = useState(""); | ||
const recieved_int = parseInt(recieved); | ||
|
||
console.log(mockOrder); | ||
return ( | ||
<div> | ||
<h1>珈琲・俺POS</h1> | ||
<ul> | ||
<p> | ||
<h2>合計金額:</h2> | ||
{/* <h3>{total}</h3> */} | ||
<h3>{mockOrder.total}</h3> | ||
</p> | ||
<p> | ||
<h2>受領金額:</h2> | ||
<form> | ||
<Input | ||
type="number" | ||
placeholder="受け取った金額を入力してください" | ||
value={recieved} | ||
onChange={(event) => setText(event.target.value)} | ||
/> | ||
<AlertDialog> | ||
<AlertDialogTrigger asChild> | ||
<Button>次の画面へ</Button> | ||
</AlertDialogTrigger> | ||
<AlertDialogContent> | ||
<AlertDialogHeader> | ||
<AlertDialogTitle>金額を確認してください</AlertDialogTitle> | ||
<AlertDialogDescription> | ||
<p>{"合計金額:" + String(mockOrder.total)}</p> | ||
<p>{"受領額:" + recieved}</p> | ||
<p> | ||
{"お釣り:" + | ||
String(recieved_int - mockOrder.total) + | ||
" 円"} | ||
</p> | ||
</AlertDialogDescription> | ||
</AlertDialogHeader> | ||
<AlertDialogFooter> | ||
<AlertDialogCancel>戻る</AlertDialogCancel> | ||
<AlertDialogAction type="submit">送信</AlertDialogAction> | ||
</AlertDialogFooter> | ||
</AlertDialogContent> | ||
</AlertDialog> | ||
</form> | ||
</p> | ||
</ul> | ||
</div> | ||
); | ||
} |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
実は
らしい