Skip to content

Commit

Permalink
chore :: api key값 변경
Browse files Browse the repository at this point in the history
chore :: api key값 변경
  • Loading branch information
phyuna0525 authored Sep 25, 2024
2 parents cfa3753 + 79b5446 commit d4c9414
Show file tree
Hide file tree
Showing 20 changed files with 55 additions and 68 deletions.
2 changes: 1 addition & 1 deletion src/apis/afterManage/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const After = (param: Type) => {
grade: param.grade,
class_num: param.class_num,
num: param.num,
name: param.name,
user_name: param.user_name,
});
} catch (error) {
handleError(error);
Expand Down
2 changes: 1 addition & 1 deletion src/apis/changeClass/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export const AcceptClass = () => {
try {
await instance.patch(`/class-room/status`, {
status: param.status,
ids: param.id,
id_list: param.id,
});
} catch (error) {
handleError(error);
Expand Down
6 changes: 3 additions & 3 deletions src/apis/outAccept/outAccept.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@ interface applicationDataProp {
reason: string;
start: string;
user_id: string;
username: string;
user_name: string;
}

interface accept {
type: "application" | "early-return";
status: "OK" | "NO";
ids: string[];
id_list: string[];
}

type RequestType = {
Expand Down Expand Up @@ -59,7 +59,7 @@ export const useOutAccept = () => {
try {
const response = await instance.patch(`${param.type}/status`, {
status: param.status,
ids: param.ids,
id_list: param.id_list,
});
return response.data;
} catch (error) {
Expand Down
12 changes: 6 additions & 6 deletions src/apis/outList/list.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { useMutation, useQueries, useQuery } from "@tanstack/react-query";

interface applicationOK {
id: string;
username: string;
user_name: string;
user_id: string;
start: string;
end: string;
Expand All @@ -17,7 +17,7 @@ interface applicationOK {
interface OutListData {
id: string;
user_id: string;
username: string;
user_name: string;
start: string;
end: string;
grade: number;
Expand All @@ -36,15 +36,15 @@ interface previousStudent {
reason: string;
start: string;
end: string;
username: string;
user_name: string;
date: string;
type: "APPLICATION" | "EARLY_RETURN";
}

interface ReturnHomeData {
id: string;
user_id: string;
username: string;
user_name: string;
start: string;
grade: number;
class_num: number;
Expand All @@ -54,7 +54,7 @@ interface ReturnHomeData {

interface earlyReturnHome {
user_id: string;
username: string;
user_name: string;
start: string;
grade: number;
class_num: number;
Expand Down Expand Up @@ -98,7 +98,7 @@ export const GetPreviousList = () => {
try {
const response = await instance.get(`/story/query`, {
params: {
name: requestParam.name,
user_name: requestParam.name,
},
});
return response.data;
Expand Down
4 changes: 2 additions & 2 deletions src/apis/previousList/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { instance } from "..";
import { useMutation } from "@tanstack/react-query";

export interface PreviousType {
username: string;
user_name: string;
application_story: {
reason: string;
start_time: string;
Expand All @@ -15,7 +15,7 @@ export interface PreviousType {

interface GetCntType {
id: string;
name: string;
user_name: string;
grade: number;
class_num: number;
num: number;
Expand Down
2 changes: 1 addition & 1 deletion src/apis/selfStudy/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import apiError from "@/hook/apiError";

interface ClassCheck {
id: string;
username: string;
user_name: string;
grade: number;
class_num: number;
num: number;
Expand Down
14 changes: 7 additions & 7 deletions src/apis/type.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export interface Type {
grade: number;
class_num: number;
num: number;
name: string;
user_name: string;
}

export interface ChangeStatus {
Expand All @@ -26,15 +26,15 @@ export interface AfterStudent {
grade: number;
class_num: number;
num: number;
name: string;
user_name: string;
status1: string;
status2: string;
status3: string;
}

export interface ClubList {
id: string;
username: string;
user_name: string;
grade: number;
class_num: number;
num: number;
Expand All @@ -46,7 +46,7 @@ export interface ClubList {
}

export interface Students {
name: string;
user_name: string;
grade: number;
class_num: number;
num: number;
Expand All @@ -66,7 +66,7 @@ export interface changeClass {
move: string;
num: number;
start_period: number;
username: string;
user_name: string;
}

export interface FloorClass {
Expand All @@ -78,7 +78,7 @@ export interface FloorClass {
move: string;
num: number;
start_period: number;
username: string;
user_name: string;
}

export interface postTeacherProp {
Expand All @@ -94,7 +94,7 @@ export interface data {

export interface Student {
user_id: string;
name: string;
user_name: string;
grade: number;
class_num: number;
num: number;
Expand Down
4 changes: 2 additions & 2 deletions src/apis/weekendMeal/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface ChangeStateParams {

interface mealcheckProp {
id: string;
name: string;
user_name: string;
status: "OK" | "NO";
grade: number;
class_num: number;
Expand All @@ -18,7 +18,7 @@ interface mealcheckProp {

interface notCheckMeal {
id: string;
name: string;
user_name: string;
status: "QUIET";
grade: number;
class_num: number;
Expand Down
4 changes: 2 additions & 2 deletions src/app/WeekendMeals/all/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { useRouter } from "next/navigation";

interface StudentStatus {
id: string;
name: string;
user_name: string;
status: "OK" | "NO" | "QUIET";
grade: number;
class_num: number;
Expand Down Expand Up @@ -54,7 +54,7 @@ const AllWeekendMeal = () => {
<Allmeals
key={index}
state={item.status}
name={item.name}
name={item.user_name}
number={setStudentNum(item)}
/>
))}
Expand Down
4 changes: 2 additions & 2 deletions src/app/WeekendMeals/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ const WeekendMeals: NextPage = () => {
<Classmeals
key={index}
number={setStudentNum(item)}
name={item.name}
name={item.user_name}
state={item.status || "NO"}
onclick={(selectedOption) =>
Change(selectedOption, item.id)
Expand All @@ -133,7 +133,7 @@ const WeekendMeals: NextPage = () => {
<Classmeals
key={index}
number={setStudentNum(item)}
name={item.name}
name={item.user_name}
state={item.status || "NO"}
onclick={(selectedOption) =>
Change(selectedOption, item.id)
Expand Down
14 changes: 7 additions & 7 deletions src/app/afterManage/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -293,7 +293,7 @@ const AfterManage = () => {
state5={item.status10}
friday={true}
onClick={() =>
handleAcceptListClick(item.id, item.username)
handleAcceptListClick(item.id, item.user_name)
}
/>
);
Expand All @@ -309,7 +309,7 @@ const AfterManage = () => {
state4={item.status9}
state5={item.status10}
onClick={() =>
handleAcceptListClick(item.id, item.username)
handleAcceptListClick(item.id, item.user_name)
}
/>
);
Expand All @@ -330,7 +330,7 @@ const AfterManage = () => {
state5={item.status10}
friday={true}
onClick={() =>
handleAcceptListClick(item.id, item.username)
handleAcceptListClick(item.id, item.user_name)
}
type="NO"
/>
Expand All @@ -347,7 +347,7 @@ const AfterManage = () => {
state4={item.status9}
state5={item.status10}
onClick={() =>
handleAcceptListClick(item.id, item.username)
handleAcceptListClick(item.id, item.user_name)
}
type="NO"
/>
Expand Down Expand Up @@ -379,7 +379,7 @@ const AfterManage = () => {
className="flex w-32 bg-white h-14 items-center justify-center rounded-lg text-label1"
key={index}
>
{setStudentNum(item)} {item.name}
{setStudentNum(item)} {item.user_name}
</div>
))}
</div>
Expand All @@ -397,7 +397,7 @@ const AfterManage = () => {
state4={item.status2}
state5={item.status3}
onClick={() =>
handleAcceptListClick(item.id, item.name)
handleAcceptListClick(item.id, item.user_name)
}
createRoom={true}
/>
Expand All @@ -415,7 +415,7 @@ const AfterManage = () => {
<div className=" text-heading5 text-primary-100">창조실</div>
<div className=" flex gap-x-13 gap-y-5 flex-wrap w-full">
{dataList?.map((item, index) => (
<AfterDelete student={item.name} key={index} id={item.id} />
<AfterDelete student={item.user_name} key={index} id={item.id} />
))}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion src/app/classChange/ok/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ interface changeClass {
move: string;
num: number;
start_period: number;
username: string;
user_name: string;
}

const ClassChangeOk = () => {
Expand Down
4 changes: 2 additions & 2 deletions src/app/classChange/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ interface FloorClass {
move: string;
num: number;
start_period: number;
username: string;
user_name: string;
}

const ClassChange = () => {
Expand Down Expand Up @@ -154,7 +154,7 @@ const ClassChange = () => {
<ChangeClass
type="accept"
key={index}
onClick={() => handleAcceptListClick(item.user_id, item.username)}
onClick={() => handleAcceptListClick(item.user_id, item.user_name)}
prevClass={item.move}
nextClass={`${item.classroom_name}`}
student={getStudentString(item)}
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/common/list/before/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ import OutBedge from "./badge";

interface getProp {
id: string;
userName: string;
user_name: string;
APPLICATION: number;
EARLY_RETURN: number;
}

interface Type {
username: string;
user_name: string;
application_story: {
reason: string;
start: string;
Expand All @@ -27,7 +27,7 @@ interface Type {

const PreviousList: React.FC<getProp> = ({
id,
userName,
user_name,
APPLICATION,
EARLY_RETURN,
}) => {
Expand Down Expand Up @@ -76,7 +76,7 @@ const PreviousList: React.FC<getProp> = ({
onClick={toggleDropdown}
>
<div className=" flex flex-col text-label1 gap-3">
<div>{userName}</div>
<div>{user_name}</div>
<div className=" flex items-center gap-3">
<div className=" flex gap-2 items-center">
<OutBedge type="APPLICATION" />
Expand Down
Loading

0 comments on commit d4c9414

Please sign in to comment.