Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/#9 코드 정리 #13

Merged
merged 2 commits into from
Mar 7, 2024
Merged

Feat/#9 코드 정리 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6acb48c
chore: #9 chore
frombozztoang Mar 7, 2024
0fa64a9
chore:#9 chore
frombozztoang Mar 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/components/organisms/modal/Modal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import ModalView from "../../molecules/modal/ModalView";
import { modalProps } from "@/types/Modal";
import React from "react";
import DefaultModal from "../../molecules/modal/ModalContent";

const Modal = ({ info, yesBtn, noBtn }: modalProps) => {
return (
<ModalView>
<DefaultModal info={info} yesBtn={yesBtn} noBtn={noBtn} />
</ModalView>
<div>d</div>
// <ModalView>
// <DefaultModal info={info} yesBtn={yesBtn} noBtn={noBtn} />
// </ModalView>
);
};

Expand Down
27 changes: 2 additions & 25 deletions src/components/organisms/navigation/navigation/Navigation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,15 @@ import Image from "next/image";
import React, { useEffect, useState } from "react";
import logo from "@public/icons/logo.png";
import menu from "@public/icons/menu.png";

import Link from "next/link";
import { useRouter, useSearchParams } from "next/navigation";
import { useSearchParams } from "next/navigation";
import NavigationList from "../navigationList/NavigationList";

import ModalPortal from "@/utils/ModalPortal";
import useDeviceType from "@/hooks/useDeviceType";

const Navigation = () => {
const [isOpened, setIsOpened] = useState(false);
const deviceType = useDeviceType();

const handleIsOpened = () => {
setIsOpened(!isOpened);
};
Expand Down Expand Up @@ -52,27 +50,6 @@ const Navigation = () => {
</div>
</div>
</div>
{/* {isOpened && (
<div className="relative">
<NavigationList isOpened={isOpened} setIsOpened={setIsOpened} />
</div>
)}
<div className="fixed z-header flex items-center w-360 justify-between h-56 py-12 px-16 bg-main-background box-border">
<Link href={"/"}>
<Image className="w-67 h-32" src={logo} alt="logo" />
</Link>
<div className="flex">
<Link href={"/notice"}>
<NoticeIcon isOn={false} />
</Link>
<Image
className="ml-12 w-24 h-24 cursor-pointer"
onClick={handleIsOpened}
src={menu}
alt="menu"
/>
</div>
</div> */}
</>
);
};
Expand Down