Merge branch 'main' of github.com:ut-code/CourseMate into update-scraper

Author: nakaterm

server/src/.gitignore

@@ -1,2 +1,3 @@
 /common
-/seeds/json/*
+/seeds/data.json
+/seeds/json

web/app/signup/steps/step1_profile.tsx

@@ -129,7 +129,7 @@ export default function Step1({ onSave, prev, caller }: StepProps<Step1User>) {
               error={errors?.intro}
             >
               <textarea
-                className="textarea textarea-bordered w-full"
+                className="textarea textarea-bordered w-full text-base"
                 rows={5}
                 placeholder="こんにちは！仲良くしてください！"
                 {...register("intro")}

web/components/course/components/SelectCourseDialog.tsx

@@ -20,6 +20,7 @@ export default function SelectCourseDialog({
   handleCoursesUpdate: (courses: Course[]) => void;
 }) {
   const [availableCourses, setAvailableCourses] = useState<Course[]>([]);
+  const [searchText, setSearchText] = useState("");
   const [filteredAvailableCourses, setFilteredAvailableCourses] = useState<
     Course[]
   >([]);
@@ -48,7 +49,14 @@ export default function SelectCourseDialog({
       onClick={(e) => e.stopPropagation()}
     >
       <form className="modal-backdrop">
-        <button type="button" onClick={onClose}>
+        <button
+          type="button"
+          onClick={() => {
+            setSearchText("");
+            setFilteredAvailableCourses(availableCourses);
+            onClose();
+          }}
+        >
           閉じる
         </button>
       </form>
@@ -64,7 +72,11 @@ export default function SelectCourseDialog({
         <button
           type="button"
           className="btn btn-ghost btn-sm absolute top-3 right-3"
-          onClick={onClose}
+          onClick={() => {
+            setSearchText("");
+            setFilteredAvailableCourses(availableCourses);
+            onClose();
+          }}
         >
           閉じる
         </button>
@@ -102,9 +114,12 @@ export default function SelectCourseDialog({
             type="text"
             placeholder="授業名で検索"
             className="input input-bordered mt-4 w-full"
+            value={searchText}
             onChange={(e) => {
+              const text = e.target.value.trim();
+              setSearchText(text);
               const newFilteredCourses = availableCourses.filter((course) =>
-                course.name.includes(e.target.value.trim()),
+                course.name.includes(text),
               );
               setFilteredAvailableCourses(newFilteredCourses);
             }}
@@ -140,6 +155,8 @@ export default function SelectCourseDialog({
             onClose={() => {
               setConfirmDialogStatus("closed");
               setNewCourse(null);
+              setSearchText("");
+              setFilteredAvailableCourses(availableCourses);
               onClose();
             }}
             onCancel={() => {