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 10, 2024
2 parents 95f7702 + 8966afb commit 9a82813
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 13 deletions.
3 changes: 1 addition & 2 deletions src/app/afterManage/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@ const AfterManage = () => {
const { mutate: changeStatus } = FixStatus();
const { data: getStudent } = GetAfterStudent();
const { mutate: CulbCheck } = CheckStatus();
const { selectedStudents, selectedStudentName, handleAcceptListClick } =
useAcceptListSelection();
const { handleAcceptListClick } = useAcceptListSelection();
const handleSaveClub = async () => {
const updatedData: ChangeClub[] = [];
studentData?.forEach((item) => {
Expand Down
1 change: 1 addition & 0 deletions src/app/attendanceCheck/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ const attendanceCheck = () => {
await attendanceSave(updatedData, {
onSuccess: () => {
alert("저장되었습니다");
location.reload();
},
onError: (error) => {
alert(error.name);
Expand Down
14 changes: 8 additions & 6 deletions src/components/list/afterManage/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -51,15 +51,17 @@ export const AfterList = ({

useEffect(() => {
setStatusList([state1, state2, state3, state4, state5]);
}, [state1, state2, state3]);
}, [state1, state2, state3, state4, state5]);

useEffect(() => {
localStorage.setItem(id, JSON.stringify(statusList));
}, [id, statusList]);

const handleChange = (index: number, newState: string) => {
const newStatusList = [...statusList];
newStatusList[index] = newState;
for (let i = index; i < newStatusList.length; i++) {
newStatusList[i] = newState;
}
setStatusList(newStatusList);
};

Expand Down Expand Up @@ -107,13 +109,13 @@ export const AfterList = ({
<div
className={`min-w-fit gap-2 flex justify-between w-full bg-white px-4 py-3 rounded-lg flex-col`}
>
<div className=" whitespace-nowrap min-w-fit gap-2 items-center flex justify-between w-full rounded-lg">
<div className=" flex whitespace-nowrap gap-2 items-center justify-between">
<div className=" text-sub-title4-M">{name}</div>
<div className="whitespace-nowrap min-w-fit gap-2 items-center flex justify-between w-full rounded-lg">
<div className="flex whitespace-nowrap gap-2 items-center justify-between">
<div className="text-sub-title4-M">{name}</div>
{class_name === "" ? (
""
) : (
<div className=" border border-primary-400 px-2 py-1 rounded-2xl bg-primary-400 text-body3 text-white">
<div className="border border-primary-400 px-2 py-1 rounded-2xl bg-primary-400 text-body3 text-white">
{class_name}
</div>
)}
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -263,9 +263,9 @@ brace-expansion@^2.0.1:
dependencies:
balanced-match "^1.0.0"

braces@^3.0.2, braces@~3.0.2:
version "3.0.2"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
braces@^3.0.3, braces@~3.0.3:
version "3.0.3"
resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
dependencies:
fill-range "^7.0.1"
Expand Down Expand Up @@ -293,7 +293,7 @@ chokidar@^3.5.3:
integrity sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==
dependencies:
anymatch "~3.1.2"
braces "~3.0.2"
braces "~3.0.3"
glob-parent "~5.1.2"
is-binary-path "~2.1.0"
is-glob "~4.0.1"
Expand Down Expand Up @@ -588,7 +588,7 @@ micromatch@^4.0.4, micromatch@^4.0.5:
resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
dependencies:
braces "^3.0.2"
braces "^3.0.3"
picomatch "^2.3.1"

[email protected]:
Expand Down

0 comments on commit 9a82813

Please sign in to comment.