Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
hyuna committed Jul 1, 2024
2 parents 5c4f57a + 20ac07f commit ccd465d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion src/app/components/common/dropdown/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const Dropdown: React.FC<DropProps> = ({ type, onChange }) => {
const [selectedFloorOption, setSelectedFloorOption] = useState<number>(5);
const [selectedClubOption, setSelectedClubOption] =
useState<string>("세미나실 2-1(대동여지도)");
const [selectedAllOption, setSelectedAllOption] = useState<number>(1);
const [selectedAllOption, setSelectedAllOption] = useState<number>(5);
const [isDropdownVisible, setIsDropdownVisible] = useState<boolean>(false);
const dropdownRef = useRef<HTMLDivElement>(null);

Expand Down
8 changes: 4 additions & 4 deletions src/app/outAccept/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ const OutAccept = () => {
const router = useRouter();
const [selectedTab, setSelectedTab] = useState<boolean>(true);
const [refuse, setRefuse] = useState<boolean>(false);
const [selectedGrade, setSelectedGrade] = useState<number>();
const [selectedClass, setSelectedClass] = useState<number>();
const [selectedGrade, setSelectedGrade] = useState<number>(5);
const [selectedClass, setSelectedClass] = useState<number>(5);
const [accept, setAccept] = useState<boolean>(false);
const { selectedStudents, selectedStudentName, handleAcceptListClick } =
useAcceptListSelection();
Expand Down Expand Up @@ -71,8 +71,8 @@ const OutAccept = () => {
useEffect(() => {
const grade = parseInt(localStorage.getItem("grade") || "1", 10);
const class_num = parseInt(localStorage.getItem("class_num") || "1", 10);
const setgrade = grade === 0 ? 1 : grade;
const setclass_num = class_num === 0 ? 1 : class_num;
const setgrade = grade === 0 ? 5 : grade;
const setclass_num = class_num === 0 ? 5 : class_num;
setSelectedGrade(setgrade);
setSelectedClass(setclass_num);
}, []);
Expand Down

0 comments on commit ccd465d

Please sign in to comment.