Skip to content

Commit

Permalink
chore:#9 파일 정리
Browse files Browse the repository at this point in the history
  • Loading branch information
frombozztoang committed Feb 19, 2024
1 parent a884def commit 328eaa9
Show file tree
Hide file tree
Showing 18 changed files with 44 additions and 264 deletions.
2 changes: 1 addition & 1 deletion src/app/setting/profile/page.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"use client";
import ProfileSetting from "@/components/organisms/profileSetting/ProfileSetting";
import React from "react";
import testProfile from "../../../../public/icons/testProfile.png";
import testProfile '../../../'

const page = () => {
const test = () => {
Expand Down
35 changes: 0 additions & 35 deletions src/components/molecules/modal/ModalContent.stories.tsx

This file was deleted.

41 changes: 0 additions & 41 deletions src/components/molecules/modal/ModalContent.tsx

This file was deleted.

33 changes: 0 additions & 33 deletions src/components/organisms/modal/AuthCheckingModalContent.tsx

This file was deleted.

18 changes: 0 additions & 18 deletions src/components/organisms/modal/AuthModal.stories.tsx

This file was deleted.

45 changes: 0 additions & 45 deletions src/components/organisms/modal/AuthModal.tsx

This file was deleted.

18 changes: 0 additions & 18 deletions src/components/organisms/modal/LetterModal.stories.tsx

This file was deleted.

51 changes: 0 additions & 51 deletions src/components/organisms/modal/LetterModal.tsx

This file was deleted.

27 changes: 24 additions & 3 deletions src/components/organisms/navigation/Navigation.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,33 @@ const Navigation = () => {

return (
<>
{isOpened && (
<div className="relative z-header box-border">
{isOpened && (
<NavigationList isOpened={isOpened} setIsOpened={setIsOpened} />
)}
<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>
</div>
{/* {isOpened && (
<div className="relative">
<NavigationList isOpened={isOpened} setIsOpened={setIsOpened} />
</div>
)}
<div className="flex items-center tablet:w-360 justify-between h-56 py-12 px-16 bg-main-background box-border">
<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>
Expand All @@ -43,7 +64,7 @@ const Navigation = () => {
alt="menu"
/>
</div>
</div>
</div> */}
</>
);
};
Expand Down
5 changes: 3 additions & 2 deletions src/components/organisms/navigation/NavigationList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import React from "react";
import close from "../../../../public/icons/close.png";
import openLink from "../../../../public/icons/openLink.png";

interface NavigationListProps {
interface navigationListProps {
user?: {
major: string;
studentId: string;
Expand All @@ -18,7 +18,7 @@ const NavigationList = ({
user,
isOpened,
setIsOpened,
}: NavigationListProps) => {
}: navigationListProps) => {
return (
<div className="fixed z-navigatoinList bg-[#00000030] top-0 right-0 w-full h-full ">
<div className="absolute right-0 flex flex-col w-240 h-screen bg-main-point">
Expand All @@ -28,6 +28,7 @@ const NavigationList = ({
>
<Image className="ml-auto w-24 h-24 m-16" src={close} alt="close" />
</div>

{user ? (
<div className="mx-auto w-191 h-40 rounded-8 bg-white text-gray-dark-text-1 gangwon-xl flex items-center justify-center pt-6">
{user?.major} {user?.studentId} {user?.name}
Expand Down
3 changes: 1 addition & 2 deletions src/components/templates/login/Auth.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,8 @@ import Image from "next/image";
import React, { useState } from "react";
import logo from "../../../../public/icons/logo.png";
import check from "../../../../public/icons/check.png";
import Modal from "@/components/organisms/modal/Modal";
import AuthModal from "@/components/organisms/modal/AuthModal";
import { AuthModalProps } from "@/types/Modal";
import AuthModal from "@/components/organisms/modal/auth/AuthModal";

interface AuthTemplateProps {
isUploaded: boolean;
Expand Down
1 change: 0 additions & 1 deletion src/components/templates/login/Main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ const Main = () => {
명지인들과 롤링페이퍼로 마음을 나눠요
</h1>
<Link href={"/login/auth"}>
{" "}
<button>
<Image src={loginImg} alt="loginImg" />
</button>
Expand Down
2 changes: 1 addition & 1 deletion src/components/templates/main/Main.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const Main = () => {
const [selectedOption, setSelectedOption] = useState("이름");

return (
<div className="mt-16 w-360 flex flex-col items-center">
<div className="w-360 flex flex-col items-center">
<div className="ml-auto">
<SearchBar
searchValue={searchValue}
Expand Down
12 changes: 2 additions & 10 deletions src/components/templates/mypage/MyPage.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,8 @@ const MyPage = () => {

{selectedOption === "received" ? (
<div className="grid grid-cols-2 gap-16">
<Letter
letterText={"안녕"}
backgroundColor={"#F39889"}
isMine={true}
/>
<Letter
letterText={"안녕"}
backgroundColor={"#F39889"}
isMine={true}
/>
<Letter letterText={"안녕"} backgroundColor="red" isMine={true} />
<Letter letterText={"안녕"} backgroundColor="blue" isMine={true} />
</div>
) : (
<div></div>
Expand Down
2 changes: 1 addition & 1 deletion src/components/templates/notice/Notice.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import React from "react";

const Notice = () => {
return (
<div className="mt-16 w-360 flex flex-col items-center justify-center">
<div className=" w-360 flex flex-col items-center justify-start">
<div className="text-point large-bold mb-32">알림</div>
<div className="grid grid-flow-row gap-12 ">
<NoticeList name={"김뎁스"} isChecked={false} />
Expand Down
2 changes: 1 addition & 1 deletion src/components/templates/setting/Setting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import Link from "next/link";
const Setting = () => {
const [isOn, setIsOn] = useState(false);
return (
<div className="text-main-point flex flex-col items-center w-360 min-h-584 mt-16 ">
<div className="text-main-point flex flex-col items-center w-360 min-h-584">
<h1 className="large-bold mb-28 text-center">설정</h1>
<div className="pl-24 pr-20 flex flex-col justify-center items-center w-360">
<div className="w-full h-54 mb-4 flex items-center justify-between">
Expand Down
Loading

0 comments on commit 328eaa9

Please sign in to comment.