Skip to content

Commit

Permalink
Merge pull request #11 from MJU-Letter/1st-QA-fix
Browse files Browse the repository at this point in the history
chore:#9 폴더명 및 구조 정리
  • Loading branch information
frombozztoang authored Feb 19, 2024
2 parents bb6b5fc + fe31580 commit 60dda1b
Show file tree
Hide file tree
Showing 20 changed files with 29 additions and 27 deletions.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import MainDetail from "@/components/templates/social/mainDetail/MainDetail";
import React from "react";
import MainDetail from "../../../components/templates/main/MainDetail";

const page = () => {
return (
Expand Down
3 changes: 1 addition & 2 deletions src/app/layout.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
import MainDetail from "../components/templates/main/MainDetail";
import type { Metadata } from "next";
import { Inter } from "next/font/google";
import Image from "next/image";
import logo from "../../public/icons/logo.png";
import "../styles/globals.css";
import Navigation from "@/components/organisms/navigation/Navigation";
import Navigation from "@/components/organisms/navigation/navigation/Navigation";

export const metadata: Metadata = {
title: "Create Next App",
Expand Down
2 changes: 1 addition & 1 deletion src/app/login/auth/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use client";
import Auth from "@/components/templates/login/Auth";
import Auth from "@/components/templates/login/auth/Auth";
import React from "react";

const page = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"use client";
import Main from "@/components/templates/login/Main";
import Main from "@/components/templates/login/main/Main";
import React from "react";

const page = () => {
Expand Down
2 changes: 1 addition & 1 deletion src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Main from "@/components/templates/main/Main";
import Main from "@/components/templates/social/main/Main";
import Image from "next/image";
import React from "react";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { Meta, StoryObj } from "@storybook/react";
import WriteModal from "./WriteModal";
const meta: Meta<typeof WriteModal> = {
title: "components/organisms/modal/WriteModal",
title: "components/organisms/modal/writeModal/WriteModal",
component: WriteModal,
tags: ["autodocs"],
argTypes: {},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
"use client";
import NoticeIcon from "../../atoms/notice/noticeIcon/NoticeIcon";
import NoticeIcon from "../../../atoms/notice/noticeIcon/NoticeIcon";
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 NavigationList from "./NavigationList";
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 NavigationList from "../navigationList/NavigationList";

const Navigation = () => {
const [isOpened, setIsOpened] = useState(false);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import Image from "next/image";
import Link from "next/link";
import React from "react";
import close from "../../../../public/icons/close.png";
import openLink from "../../../../public/icons/openLink.png";
import close from "../../../../../public/icons/close.png";
import openLink from "../../../../../public/icons/openLink.png";

interface navigationListProps {
user?: {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use client";
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 logo from "../../../../../public/icons/logo.png";
import check from "../../../../../public/icons/check.png";
import { AuthModalProps } from "@/types/Modal";
import AuthModal from "@/components/organisms/modal/auth/AuthModal";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
"use client";
import Image from "next/image";
import React from "react";
import logo from "../../../../public/icons/logo.png";
import loginImg from "../../../../public/icons/loginImg.png";
import logo from "../../../../../public/icons/logo.png";
import loginImg from "../../../../../public/icons/loginImg.png";
import Link from "next/link";

const Main = () => {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
"use client";
import MainProfile from "../../atoms/profile/mainProfile/MainProfile";
import SearchBar from "../../organisms/searchBar/SearchBar";

import React, { useState } from "react";
import test from "../../../../public/icons/testProfile.png";
import SearchResult from "../../organisms/searchBar/SearchResult";
import Search from "../search/Search";
import test from "../../../../../public/icons/testProfile.png";
import Link from "next/link";
import MainProfile from "@/components/atoms/profile/mainProfile/MainProfile";
import SearchBar from "@/components/organisms/searchBar/SearchBar";
import SearchResult from "@/components/organisms/searchBar/SearchResult";
import Search from "../../search/Search";

const Main = () => {
const [searchValue, setSearchValue] = useState("");
Expand Down Expand Up @@ -34,23 +35,23 @@ const Main = () => {
<Search />
) : (
<div className="grid grid-cols-2 gap-16">
<Link href="/test">
<Link href="/detail">
<MainProfile
profileImg={test}
name={"이보현"}
major={"경영학과"}
studentId={"21"}
/>
</Link>
<Link href="/test">
<Link href="/detail">
<MainProfile
profileImg={test}
name={"이보현"}
major={"경영학과"}
studentId={"21"}
/>{" "}
</Link>
<Link href="/test">
<Link href="/detail">
<MainProfile
profileImg={test}
name={"이보현"}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
"use client";
import React, { useState } from "react";
import test from "../../../../public/icons/testProfile.png";
import WriteModal from "@/components/organisms/modal/letter/WriteModal";
import test from "../../../../../public/icons/testProfile.png";

import { useDisclosure } from "@nextui-org/react";
import ModalView from "@/components/molecules/modal/ModalView";
import BottomFixedBtn from "@/components/atoms/button/bottomFixed/BottomFixed";
import Letter from "@/components/atoms/letter/Letter";
import DetailProfile from "@/components/atoms/profile/detailProfile/DetailProfile";
import WriteModal from "@/components/organisms/modal/letter/writeModal/WriteModal";

const MainDetail = () => {
const { isOpen, onOpen, onOpenChange } = useDisclosure();
Expand Down

0 comments on commit 60dda1b

Please sign in to comment.