diff --git a/src/apis/user/index.ts b/src/apis/user/index.ts index f3ec23a..3342bd0 100644 --- a/src/apis/user/index.ts +++ b/src/apis/user/index.ts @@ -1,9 +1,9 @@ -import { useToastStore, Toast } from "@team-return/design-system"; import { useMutation } from "@tanstack/react-query"; +import { useToastStore } from "@team-return/design-system"; +import axios, { AxiosError } from "axios"; import { useRouter } from "next/navigation"; import { useCookies } from "react-cookie"; import { RequestBody, ResponseBody } from "./type"; -import axios, { AxiosError } from "axios"; const router = "/users"; diff --git a/src/components/SuggestionHeader.tsx b/src/components/SuggestionHeader.tsx index a1cb12e..5a677f4 100644 --- a/src/components/SuggestionHeader.tsx +++ b/src/components/SuggestionHeader.tsx @@ -9,11 +9,7 @@ interface PropsType { } export default function SuggestionHeader({ listType }: PropsType) { -<<<<<<< HEAD - const { data: profile } = MyProfile(); -======= - const { data } = useMyProfile(); ->>>>>>> develop + const { data: profile } = useMyProfile(); const suggestionHeaderDummy = { Company: { diff --git a/src/components/common/Header.tsx b/src/components/common/Header.tsx index 21578d2..b944a07 100644 --- a/src/components/common/Header.tsx +++ b/src/components/common/Header.tsx @@ -14,11 +14,7 @@ function Header() { return null; } -<<<<<<< HEAD - const { data: profile } = MyProfile(); -======= - const profile = useMyProfile(); ->>>>>>> develop + const { data: profile } = useMyProfile(); return (
>>>>>> develop import GhostBtn from "./Button/GhostBtn"; import Chips from "./Chips"; import TextFiled from "./TextFiled"; diff --git a/src/components/company/CompanyTitle.tsx b/src/components/company/CompanyTitle.tsx index ae5a1fd..1baf113 100644 --- a/src/components/company/CompanyTitle.tsx +++ b/src/components/company/CompanyTitle.tsx @@ -1,15 +1,9 @@ "use client"; -<<<<<<< HEAD import { getCompanyKebabItems } from "@/util/object/kebabMenuItems"; import { KebabItemType } from "@/util/type/kebabMenu"; import Image from "next/image"; import KebabMenu from "../common/Dropdown/KebabMenu"; -======= -import { useDropDown } from "@/hook/useDropDown"; -import { Icon } from "@team-return/design-system"; -import Image from "next/image"; ->>>>>>> develop interface PropsType { business_number?: string; @@ -28,14 +22,10 @@ export default function CompanyTitle({ onClickInterview, children, }: PropsType) { -<<<<<<< HEAD - const kebabItems = getCompanyKebabItems( + const kebabItems: KebabItemType[] = getCompanyKebabItems( onClickRecruitments, onClickInterview ); -======= - const { DropDownComponent, toggleDropdown, closeDropDown } = useDropDown(); ->>>>>>> develop return (