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.

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

[refactor] 폴더 및 파일 구조, 네이밍 수정 #432

Merged
merged 3 commits into from
Nov 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/stories/bookGroup/BookGroupStatus.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import BookGroupStatus from '@/ui/bookgroup/BookGroupStatus';
import BookGroupStatus from '@/v1/bookGroup/BookGroupStatus';
import { Meta, StoryObj } from '@storybook/react';

const meta: Meta<typeof BookGroupStatus> = {
Expand Down
2 changes: 1 addition & 1 deletion src/stories/bookGroup/DetailBookGroupCard.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';

import DetailBookGroupCard from '@/v1/bookgroup/DetailBookGroupCard';
import DetailBookGroupCard from '@/v1/bookGroup/DetailBookGroupCard';

const meta: Meta<typeof DetailBookGroupCard> = {
title: 'bookgroup/DetailBookGroupCard',
Expand Down
2 changes: 1 addition & 1 deletion src/stories/bookGroup/SearchGroup.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
import SearchGroup from '@/ui/Base/bookgroup/SearchGroup';
import SearchGroup from '@/v1/bookGroup/SearchGroup';

const meta: Meta<typeof SearchGroup> = {
title: 'Base/SearchGroup',
Expand Down
2 changes: 1 addition & 1 deletion src/stories/bookGroup/SimpleBookGroupCard.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { Meta, StoryObj } from '@storybook/react';
import SimpleBookGroupCard from '@/v1/bookgroup/SimpleBookGroupCard';
import SimpleBookGroupCard from '@/v1/bookGroup/SimpleBookGroupCard';

const meta: Meta<typeof SimpleBookGroupCard> = {
title: 'BookGroup/SimpleBookGroupCard',
Expand Down
2 changes: 1 addition & 1 deletion src/stories/bookGroup/detail/BookGroupInfo.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';

import BookGroupInfo from '@/ui/bookgroup/detail/BookGroupInfo';
import BookGroupInfo from '@/v1/bookGroup/detail/BookGroupInfo';

const meta: Meta<typeof BookGroupInfo> = {
title: 'bookgroup/detail/BookGroupInfo',
Expand Down
2 changes: 1 addition & 1 deletion src/stories/bookGroup/detail/CommentList.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';

import CommentList from '@/ui/bookgroup/detail/CommentList';
import CommentList from '@/v1/bookGroup/detail/CommentList';

const meta: Meta<typeof CommentList> = {
title: 'bookgroup/detail/CommentList',
Expand Down
2 changes: 1 addition & 1 deletion src/stories/bookGroup/detail/MemberItem.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';

import MemberItem from '@/ui/bookgroup/detail/MemberItem';
import MemberItem from '@/v1/bookGroup/detail/MemberItem';

const meta: Meta<typeof MemberItem> = {
title: 'bookgroup/detail/MemberItem',
Expand Down
2 changes: 1 addition & 1 deletion src/stories/bookGroup/detail/ShortMemberInfo.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Meta, StoryObj } from '@storybook/react';

import ShortMemberInfo from '@/ui/bookgroup/detail/ShortMemberInfo';
import ShortMemberInfo from '@/v1/bookGroup/detail/ShortMemberInfo';

const meta: Meta<typeof ShortMemberInfo> = {
title: 'bookgroup/detail/ShortMemberInfo',
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
import Bookshelf from '@/ui/Bookshelf';
import BookShelf from '@/v1/bookShelf/BookShelf';
import { Meta, StoryObj } from '@storybook/react';

const meta: Meta<typeof Bookshelf> = {
title: 'Bookshelf/Bookshelf',
component: Bookshelf,
const meta: Meta<typeof BookShelf> = {
title: 'bookShelf/BookShelf',
component: BookShelf,
tags: ['autodocs'],
};

export default meta;

type Story = StoryObj<typeof Bookshelf>;
type Story = StoryObj<typeof BookShelf>;

// TODO: 스토리북에서 이미지를 불러올 때 발생하는 CORS 이슈 해결
export const Default: Story = {
Expand Down
2 changes: 1 addition & 1 deletion src/stories/layout/Layout.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Layout from '@/v1/layout';
import Layout from '@/v1/layout/Layout';
import { Meta, StoryObj } from '@storybook/react';

const meta: Meta<typeof Layout> = {
Expand Down
2 changes: 1 addition & 1 deletion src/ui/BookArchive/BookArchiveForUnAuth.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import useUnAuthRecommendedBookshelfQuery from '@/queries/recommend/useUnAuthRecommendedBookshelfQuery';
import { Skeleton, VStack } from '@chakra-ui/react';
import Bookshelf from '../Bookshelf';
import Bookshelf from '@/v1/bookShelf/BookShelf';

const BookArchiveForUnAuth = () => {
const { data, isSuccess, isLoading } = useUnAuthRecommendedBookshelfQuery();
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import Image from 'next/image';

import Badge from '@/ui/Base/Badge';
import BookCover from '@/ui/book/BookCover';
import BookGroupStatus from '@/ui/bookgroup/BookGroupStatus';
import BookGroupStatus from '@/v1/bookGroup/BookGroupStatus';
import { IconArrowLeft, IconCalendar, IconMembers } from '@public/icons';
import { DATA_URL } from '@/constants/dataUrl';

Expand Down
4 changes: 2 additions & 2 deletions src/ui/Bookshelf/Book.tsx → src/v1/bookShelf/Book.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Image from 'next/image';
import Link from 'next/link';
import { useState } from 'react';

const BookInBookshelf = ({
const Book = ({
imageUrl,
bookId,
}: Pick<APIBook, 'bookId' | 'title' | 'imageUrl'>) => {
Expand Down Expand Up @@ -64,4 +64,4 @@ const BookInBookshelf = ({
);
};

export default BookInBookshelf;
export default Book;
10 changes: 5 additions & 5 deletions src/ui/Bookshelf/index.tsx → src/v1/bookShelf/BookShelf.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import { APIBookshelf } from '@/types/bookshelf';
import { IconArrowRight, IconHeart } from '@public/icons';
import Link from 'next/link';
import Badge from '../Base/Badge';
import BookInBookshelf from './Book';
import Badge from '@/ui/Base/Badge';
import Book from './Book';

const Bookshelf = ({
const BookShelf = ({
bookshelfId,
bookshelfName,
books,
Expand Down Expand Up @@ -33,12 +33,12 @@ const Bookshelf = ({
</div>
<div className="flex justify-between px-[0.5rem]">
{books.map(book => (
<BookInBookshelf key={book.bookId} {...book} />
<Book key={book.bookId} {...book} />
))}
</div>
</div>
</div>
);
};

export default Bookshelf;
export default BookShelf;
File renamed without changes.