Skip to content

Commit

Permalink
Merge pull request #3 from JNU-econovation/develop
Browse files Browse the repository at this point in the history
style: eslint 규칙에 맞춰 코드 스타일 수정
  • Loading branch information
bada308 authored Mar 14, 2024
2 parents 95f9c92 + ca45d05 commit 89459fc
Show file tree
Hide file tree
Showing 22 changed files with 19 additions and 43 deletions.
2 changes: 1 addition & 1 deletion FE/src/app/(auth)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { PropsWithChildren } from "react";

export default function AuthLayout({ children }: PropsWithChildren<{}>) {
export default function AuthLayout({ children }: PropsWithChildren) {
return (
<main className="mb-28 mt-16 h-full w-full max-w-[500px] sm:max-w-[800px] lg:max-w-[1112px]">
{children}
Expand Down
2 changes: 1 addition & 1 deletion FE/src/app/(private)/(program)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { PropsWithChildren } from "react";
import Header from "@/components/common/header/Header";

export default function ProgramLayout({ children }: PropsWithChildren<{}>) {
export default function ProgramLayout({ children }: PropsWithChildren) {
return (
<>
<Header />
Expand Down
2 changes: 1 addition & 1 deletion FE/src/app/(private)/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { PropsWithChildren } from "react";
import AuthValidate from "@/components/common/validate/Auth";

const PrivateLayout = ({ children }: PropsWithChildren<{}>) => {
const PrivateLayout = ({ children }: PropsWithChildren) => {
return (
<>
<AuthValidate />
Expand Down
1 change: 0 additions & 1 deletion FE/src/app/(private)/team-building/detail/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import { useRouter } from "next/navigation";
import { toast } from "react-toastify";
import LoadingSpinner from "@/components/common/LoadingSpinner";
import InputStatusInfoContainer from "@/components/teamBuildingDetail/inputStatus/InputStatusInfo.container";
import TeamBuildingInfo from "@/components/teamBuildingDetail/teamBuilding/TeamBuildingInfo";
import UserInputModalContainer from "@/components/teamBuildingDetail/userInputModal/UserInputModal.container";
import ERROR_CODE from "@/constants/ERROR_CODE";
Expand Down
4 changes: 1 addition & 3 deletions FE/src/app/(private)/team-building/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import { PropsWithChildren } from "react";
import Header from "@/components/common/header/Header";

export default function TeamBuildingLayout({
children,
}: PropsWithChildren<{}>) {
export default function TeamBuildingLayout({ children }: PropsWithChildren) {
return (
<>
<Header />
Expand Down
11 changes: 1 addition & 10 deletions FE/src/app/(private)/team-building/result/error.tsx
Original file line number Diff line number Diff line change
@@ -1,18 +1,9 @@
"use client"; // Error components must be Client Components

import { useRouter } from "next/navigation";
import Title from "@/components/common/Title";
import ERROR_CODE from "@/constants/ERROR_CODE";
import ERROR_MESSAGE from "@/constants/ERROR_MESSAGE";
import ROUTES from "@/constants/ROUTES";

export default function TeamBuildingResultError({
error,
reset,
}: {
error: Error & { digest?: string };
reset: () => void;
}) {
export default function TeamBuildingResultError() {
const router = useRouter();
const handleBackHome = () => {
router.push(ROUTES.MAIN);
Expand Down
6 changes: 1 addition & 5 deletions FE/src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,12 +1,8 @@
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import "./globals.css";
import { PropsWithChildren } from "react";
import Header from "@/components/common/header/Header";
import Provider from "@/utils/provider";

const inter = Inter({ subsets: ["latin"] });

export const metadata: Metadata = {
title: "EEOS",
description: "에코노베이션 행사 관리 서비스",
Expand All @@ -23,7 +19,7 @@ export const metadata: Metadata = {
},
};

export default function RootLayout({ children }: PropsWithChildren<{}>) {
export default function RootLayout({ children }: PropsWithChildren) {
return (
<html lang="ko">
<body className="flex flex-col items-center">
Expand Down
2 changes: 1 addition & 1 deletion FE/src/components/common/Dropup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ interface DropupItem {
onClick: () => void;
}

interface DropupProps extends PropsWithChildren<{}> {
interface DropupProps extends PropsWithChildren {
title: string;
items: DropupItem[];
}
Expand Down
2 changes: 2 additions & 0 deletions FE/src/components/common/ErrorFallback.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,9 @@ const ERROR_TITLE = "ERROR";
const RETRY_BUTTON_TEXT = "Try again";

type FallbackProps = {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
error: any;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
resetErrorBoundary?: (...args: any[]) => void;
retryButton?: boolean;
};
Expand Down
2 changes: 2 additions & 0 deletions FE/src/components/common/ErrorFallbackNoIcon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@ const ERROR_TITLE = "ERROR";
const RETRY_BUTTON_TEXT = "Try again";

type FallbackProps = {
// eslint-disable-next-line @typescript-eslint/no-explicit-any
error: any;
// eslint-disable-next-line @typescript-eslint/no-explicit-any
resetErrorBoundary?: (...args: any[]) => void;
};

Expand Down
5 changes: 1 addition & 4 deletions FE/src/components/common/form/program/ProgramForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import ProgramDemandCheckBox from "./ProgramDemandCheckBox";
import ProgramTitle from "./ProgramTitle";
import FORM_INFO from "@/constants/FORM_INFO";
import PROGRAM from "@/constants/PROGRAM";
import {
ProgramFormData,
ProgramFormDataAction,
} from "@/hooks/useProgramFormData";
import { ProgramFormData } from "@/hooks/useProgramFormData";
import { FormType } from "@/types/form";
import { ProgramCategory } from "@/types/program";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ import { PropsWithChildren } from "react";
import MarkdownEditor from "../../markdown/MarkdownEditor";
import FormBtn from "../FormBtn";
import TeamBuildingMaxTeamSize from "./TeamBuildingMaxTeamSize";
import TeamBuildingMinTeamSize from "./TeamBuildingMinTeamSize";
import TeamBuildingTitle from "./TeamBuildingTitle";
import FORM_INFO from "@/constants/FORM_INFO";
import { TeamBuildingFormData } from "@/hooks/useTeamBuildingFormData";
Expand Down
2 changes: 1 addition & 1 deletion FE/src/components/common/memberTable/MemberTable.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
"use client";

import { Suspense, useState } from "react";
import { useState } from "react";
import { ErrorBoundary } from "react-error-boundary";
import ErrorFallback from "../ErrorFallback";
import Tab from "../tabs/Tab";
Expand Down
4 changes: 0 additions & 4 deletions FE/src/components/login/RightSection.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
import Title from "../common/Title";
import SlackLoginSection from "./slack/LoginSection";

const responsiveClass = {
sm: "",
};

const LoginRightSection = () => {
return (
<div
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import AttendStatusModalLoader from "./AttendStatusModal.loader";
import AttendStatusView from "./AttendStatusView";
import AttendToggleLabel from "./AttendToggleLabel";
import AttendStatusToggle from "@/components/common/attendStatusToggle/AttendStatusToggle";
import ATTEND_STATUS from "@/constants/ATTEND_STATUS";
import MESSAGE from "@/constants/MESSAGE";
import {
useGetMyAttendStatus,
Expand Down
6 changes: 3 additions & 3 deletions FE/src/components/programEdit/EditMemberTableItem.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import AttendStatusToggle from "../common/attendStatusToggle/AttendStatusToggle"
import CheckBox from "../common/CheckBox";
import ACTIVE_STATUS from "@/constants/ACTIVE_STATUS";
import MESSAGE from "@/constants/MESSAGE";
import { AttendStatus } from "@/types/member";
import { ActiveStatus, AttendStatus } from "@/types/member";

interface EditMemberTableItemProps {
memberId: number;
name: string;
activeStatus: AttendStatus;
activeStatus: ActiveStatus;
initAttendStatus: AttendStatus;
setMembers: (
memberId: number,
Expand All @@ -27,7 +27,7 @@ const EditMemberTableItem = ({
initAttendStatus,
setMembers,
isEditable = true,
}) => {
}: EditMemberTableItemProps) => {
const [selectedAttend, setSelectedAttend] =
useState<AttendStatus>(initAttendStatus);
const isRelated = selectedAttend !== "nonRelated";
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import { create } from "domain";
import classNames from "classnames";
import { Dispatch, SetStateAction, useEffect, useRef } from "react";
import { toast } from "react-toastify";
Expand Down
1 change: 1 addition & 0 deletions FE/src/hooks/query/useAuthQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export const useSlackLoginMutation = () => {

router.replace(ROUTES.MAIN);
},
// eslint-disable-next-line @typescript-eslint/no-explicit-any
onError: (error: any) => {
const errorCode = error?.response?.data?.code;
errorCode === ERROR_CODE.AUTH.INVALID_NAME &&
Expand Down
1 change: 0 additions & 1 deletion FE/src/hooks/query/useTeamBuildingQuery.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
import { AxiosError } from "axios";
import { useRouter } from "next/navigation";
import { toast } from "react-toastify";
import {
CreateTeamBuildingRequest,
TeamBuildingSentenceRequest,
Expand Down
2 changes: 1 addition & 1 deletion FE/src/hooks/query/useUserQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export const usePutMyAttendStatus = ({
beforeAttendStatus,
afterAttendStatus: afterAttendStatus,
}),
onSettled: (data) => {
onSettled: () => {
queryClient.invalidateQueries({
queryKey: [API.USER.ATTEND_STATUS(programId)],
});
Expand Down
2 changes: 0 additions & 2 deletions FE/src/utils/convert.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
import { toast } from "react-toastify";

const WEEK = ["일", "월", "화", "수", "목", "금", "토"];

export const convertDate = (
Expand Down
2 changes: 1 addition & 1 deletion FE/src/utils/provider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { PropsWithChildren } from "react";
import { ToastContainer } from "react-toastify";
import "react-toastify/dist/ReactToastify.css";

const Provider = ({ children }: PropsWithChildren<{}>) => {
const Provider = ({ children }: PropsWithChildren) => {
const client = new QueryClient({
defaultOptions: {
queries: {
Expand Down

0 comments on commit 89459fc

Please sign in to comment.