お題変わったら変換

jphacks · Nov 14, 2024 · 23199eb · 23199eb
1 parent 94ee97b
commit 23199eb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/app/src/app/camera/page.tsx b/app/src/app/camera/page.tsx
@@ -331,7 +331,16 @@ const CameraApp = () => {
 				const notAnsweredAssignment = newAssignments.find(
 					(assignment: todayAssignment) => !assignment.isAnswered,
 				);
+
 				setTodayAssignment(notAnsweredAssignment);
+
+				setIsUploading(false);
+				toast(message);
+				setAssignments(newAssignments);
+
+				if (newAssignments.every((assignment) => assignment.isAnswered)) {
+					setIsActive(false);
+				}
 			} catch (error) {
 				setIsUploading(false);
 				console.error("アップロード中にエラーが発生しました:", error);
@@ -461,7 +470,7 @@ const CameraApp = () => {
 					)}
 				</>
 			) : (
-				<Answered assignments={assignments}/>
+				<Answered assignments={assignments} />
 			)}
 		</>
 	);

diff --git a/app/src/components/AssignmentBadge.tsx b/app/src/components/AssignmentBadge.tsx
@@ -28,7 +28,7 @@ export const AssignmentBadge = ({
 	return (
 		<div className="flex flex-col items-center justify-center text-center fixed top-0 left-0 w-full h-1/4">
 			<div className="py-2 px-4 bg-orange-500 text-white rounded-full">
-				<Select defaultValue={assignment.english} onValueChange={handleSelect}>
+				<Select value={assignment.english} onValueChange={handleSelect}>
 					<SelectTrigger className="w-[180px]">
 						<SelectValue />
 					</SelectTrigger>