From 36796a3c5e9349fe6f0f9364f80aa8a4cb6cf6b8 Mon Sep 17 00:00:00 2001 From: Seoyoung Date: Wed, 7 Feb 2024 14:05:20 +0900 Subject: [PATCH 1/7] =?UTF-8?q?Chore:=20url=20=EB=B3=80=EA=B2=BD=EC=97=90?= =?UTF-8?q?=20=EB=94=B0=EB=A5=B8=20app=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC?= =?UTF-8?q?=EC=A1=B0=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/[userNickname]/[listId]/page.tsx | 15 --------------- .../create/_components/CreateItem.css.ts | 0 .../{ => list}/create/_components/CreateItem.tsx | 0 .../create/_components/CreateList.css.ts | 0 .../{ => list}/create/_components/CreateList.tsx | 0 .../create/_components/item/AddItemButton.css.ts | 0 .../create/_components/item/AddItemButton.tsx | 0 .../create/_components/item/Header.css.ts | 0 .../create/_components/item/Header.tsx | 0 .../create/_components/item/ImageUploader.css.ts | 0 .../create/_components/item/ImageUploader.tsx | 0 .../create/_components/item/ItemLayout.css.ts | 0 .../create/_components/item/ItemLayout.tsx | 0 .../create/_components/item/Items.css.ts | 0 .../{ => list}/create/_components/item/Items.tsx | 0 .../create/_components/item/LinkModal.tsx | 0 .../create/_components/item/LinkPreview.css.ts | 0 .../create/_components/item/LinkPreview.tsx | 0 .../create/_components/item/Preview.css.ts | 0 .../create/_components/item/Preview.tsx | 0 .../_components/list/ButtonSelector.css.ts | 0 .../create/_components/list/ButtonSelector.tsx | 0 .../create/_components/list/ColorSelector.css.ts | 0 .../create/_components/list/ColorSelector.tsx | 0 .../create/_components/list/CreateListMock.ts | 0 .../create/_components/list/Header.css.ts | 0 .../create/_components/list/Header.tsx | 0 .../create/_components/list/LabelInput.css.ts | 0 .../create/_components/list/LabelInput.tsx | 0 .../_components/list/MemberSelector.css.ts | 0 .../create/_components/list/MemberSelector.tsx | 0 .../create/_components/list/RadioInput.css.ts | 0 .../create/_components/list/RadioInput.tsx | 0 .../create/_components/list/Section.css.ts | 0 .../create/_components/list/Section.tsx | 0 .../create/_components/list/SimpleInput.css.ts | 0 .../create/_components/list/SimpleInput.tsx | 0 src/app/{ => list}/create/page.tsx | 14 +++++++++----- .../[userId]}/_components/Action.css.ts | 0 .../[userId]}/_components/Action.tsx | 0 .../[userId]}/_components/Card.css.ts | 0 .../[userId]}/_components/Card.tsx | 0 .../[userId]}/_components/CardItem.css.ts | 0 .../[userId]}/_components/CardItem.tsx | 0 .../[userId]}/_components/Categories.css.ts | 0 .../[userId]}/_components/Categories.tsx | 0 .../[userId]}/_components/Content.css.ts | 0 .../[userId]}/_components/Content.tsx | 0 .../[userId]}/_components/Profile.css.ts | 0 .../[userId]}/_components/Profile.tsx | 0 .../[userId]}/collabolist/page.tsx | 0 .../[userId]/list}/[listId]/ListDetail.css.ts | 0 .../_components/BottomSheet/BottomSheet.css.ts | 0 .../_components/BottomSheet/BottomSheet.css.tsx | 0 .../_components/BottomSheet/BottomSheet.tsx | 0 .../_components/ListDetailInner/Footer.css.ts | 0 .../_components/ListDetailInner/Footer.tsx | 2 +- .../_components/ListDetailInner/Header.css.ts | 0 .../_components/ListDetailInner/Header.tsx | 0 .../_components/ListDetailInner/RankList.css.ts | 0 .../_components/ListDetailInner/RankList.tsx | 0 .../_components/ListDetailInner/index.css.ts | 0 .../_components/ListDetailInner/index.tsx | 6 +++--- .../ListDetailOuter/Collaborators.css.ts | 0 .../ListDetailOuter/Collaborators.tsx | 2 +- .../ListDetailOuter/CollaboratorsPopOver.css.ts | 0 .../ListDetailOuter/CollaboratorsPopOver.tsx | 0 .../_components/ListDetailOuter/Comment.css.ts | 0 .../_components/ListDetailOuter/Comment.tsx | 4 ++-- .../_components/ListDetailOuter/Comments.css.ts | 0 .../_components/ListDetailOuter/Comments.tsx | 0 .../ListDetailOuter/DeleteModalButton.tsx | 0 .../_components/ListDetailOuter/Header.css.ts | 0 .../_components/ListDetailOuter/Header.tsx | 0 .../ListDetailOuter/ListInformation.css.ts | 0 .../ListDetailOuter/ListInformation.tsx | 2 +- .../ListDetailOuter/ModalButtonStyle.css.ts | 0 .../ListDetailOuter/OpenBottomSheetButton.tsx | 2 +- .../ListDetailOuter/PopOverMenu.css.ts | 0 .../_components/ListDetailOuter/PopOverMenu.tsx | 0 .../_components/ListDetailOuter/Replies.css.ts | 0 .../_components/ListDetailOuter/Replies.tsx | 2 +- .../[userId]/list}/[listId]/mockData/mockdata.ts | 0 .../list}/[listId]/mockData/mockdataType.ts | 0 src/app/user/[userId]/list/[listId]/page.tsx | 16 ++++++++++++++-- .../[userId]}/mockData/categories.ts | 0 .../[userId]}/mockData/items.ts | 0 .../[userId]}/mockData/lists.ts | 0 .../[userId]}/mockData/mockDataTypes.ts | 0 .../[userId]}/mockData/user.ts | 0 .../[userId]}/mylist/page.tsx | 0 src/lib/constants/init.ts | 2 -- 92 files changed, 33 insertions(+), 34 deletions(-) delete mode 100644 src/app/[userNickname]/[listId]/page.tsx rename src/app/{ => list}/create/_components/CreateItem.css.ts (100%) rename src/app/{ => list}/create/_components/CreateItem.tsx (100%) rename src/app/{ => list}/create/_components/CreateList.css.ts (100%) rename src/app/{ => list}/create/_components/CreateList.tsx (100%) rename src/app/{ => list}/create/_components/item/AddItemButton.css.ts (100%) rename src/app/{ => list}/create/_components/item/AddItemButton.tsx (100%) rename src/app/{ => list}/create/_components/item/Header.css.ts (100%) rename src/app/{ => list}/create/_components/item/Header.tsx (100%) rename src/app/{ => list}/create/_components/item/ImageUploader.css.ts (100%) rename src/app/{ => list}/create/_components/item/ImageUploader.tsx (100%) rename src/app/{ => list}/create/_components/item/ItemLayout.css.ts (100%) rename src/app/{ => list}/create/_components/item/ItemLayout.tsx (100%) rename src/app/{ => list}/create/_components/item/Items.css.ts (100%) rename src/app/{ => list}/create/_components/item/Items.tsx (100%) rename src/app/{ => list}/create/_components/item/LinkModal.tsx (100%) rename src/app/{ => list}/create/_components/item/LinkPreview.css.ts (100%) rename src/app/{ => list}/create/_components/item/LinkPreview.tsx (100%) rename src/app/{ => list}/create/_components/item/Preview.css.ts (100%) rename src/app/{ => list}/create/_components/item/Preview.tsx (100%) rename src/app/{ => list}/create/_components/list/ButtonSelector.css.ts (100%) rename src/app/{ => list}/create/_components/list/ButtonSelector.tsx (100%) rename src/app/{ => list}/create/_components/list/ColorSelector.css.ts (100%) rename src/app/{ => list}/create/_components/list/ColorSelector.tsx (100%) rename src/app/{ => list}/create/_components/list/CreateListMock.ts (100%) rename src/app/{ => list}/create/_components/list/Header.css.ts (100%) rename src/app/{ => list}/create/_components/list/Header.tsx (100%) rename src/app/{ => list}/create/_components/list/LabelInput.css.ts (100%) rename src/app/{ => list}/create/_components/list/LabelInput.tsx (100%) rename src/app/{ => list}/create/_components/list/MemberSelector.css.ts (100%) rename src/app/{ => list}/create/_components/list/MemberSelector.tsx (100%) rename src/app/{ => list}/create/_components/list/RadioInput.css.ts (100%) rename src/app/{ => list}/create/_components/list/RadioInput.tsx (100%) rename src/app/{ => list}/create/_components/list/Section.css.ts (100%) rename src/app/{ => list}/create/_components/list/Section.tsx (100%) rename src/app/{ => list}/create/_components/list/SimpleInput.css.ts (100%) rename src/app/{ => list}/create/_components/list/SimpleInput.tsx (100%) rename src/app/{ => list}/create/page.tsx (91%) rename src/app/{[userNickname] => user/[userId]}/_components/Action.css.ts (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Action.tsx (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Card.css.ts (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Card.tsx (100%) rename src/app/{[userNickname] => user/[userId]}/_components/CardItem.css.ts (100%) rename src/app/{[userNickname] => user/[userId]}/_components/CardItem.tsx (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Categories.css.ts (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Categories.tsx (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Content.css.ts (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Content.tsx (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Profile.css.ts (100%) rename src/app/{[userNickname] => user/[userId]}/_components/Profile.tsx (100%) rename src/app/{[userNickname] => user/[userId]}/collabolist/page.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/ListDetail.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/BottomSheet/BottomSheet.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/BottomSheet/BottomSheet.css.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/BottomSheet/BottomSheet.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailInner/Footer.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailInner/Footer.tsx (97%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailInner/Header.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailInner/Header.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailInner/RankList.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailInner/RankList.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailInner/index.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailInner/index.tsx (84%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Collaborators.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Collaborators.tsx (94%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Comment.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Comment.tsx (89%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Comments.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Comments.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/DeleteModalButton.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Header.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Header.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/ListInformation.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/ListInformation.tsx (94%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/ModalButtonStyle.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/OpenBottomSheetButton.tsx (92%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/PopOverMenu.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/PopOverMenu.tsx (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Replies.css.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/_components/ListDetailOuter/Replies.tsx (94%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/mockData/mockdata.ts (100%) rename src/app/{[userNickname] => user/[userId]/list}/[listId]/mockData/mockdataType.ts (100%) rename src/app/{[userNickname] => user/[userId]}/mockData/categories.ts (100%) rename src/app/{[userNickname] => user/[userId]}/mockData/items.ts (100%) rename src/app/{[userNickname] => user/[userId]}/mockData/lists.ts (100%) rename src/app/{[userNickname] => user/[userId]}/mockData/mockDataTypes.ts (100%) rename src/app/{[userNickname] => user/[userId]}/mockData/user.ts (100%) rename src/app/{[userNickname] => user/[userId]}/mylist/page.tsx (100%) delete mode 100644 src/lib/constants/init.ts diff --git a/src/app/[userNickname]/[listId]/page.tsx b/src/app/[userNickname]/[listId]/page.tsx deleted file mode 100644 index e499e160..00000000 --- a/src/app/[userNickname]/[listId]/page.tsx +++ /dev/null @@ -1,15 +0,0 @@ -'use client'; -import * as styles from './ListDetail.css'; -import Comments from '@/app/[userNickname]/[listId]/_components/ListDetailOuter/Comments'; -import Header from '@/app/[userNickname]/[listId]/_components/ListDetailOuter/Header'; -import ListInformation from '@/app/[userNickname]/[listId]/_components/ListDetailOuter/ListInformation'; - -export default function ListDetail() { - return ( -
-
- - -
- ); -} diff --git a/src/app/create/_components/CreateItem.css.ts b/src/app/list/create/_components/CreateItem.css.ts similarity index 100% rename from src/app/create/_components/CreateItem.css.ts rename to src/app/list/create/_components/CreateItem.css.ts diff --git a/src/app/create/_components/CreateItem.tsx b/src/app/list/create/_components/CreateItem.tsx similarity index 100% rename from src/app/create/_components/CreateItem.tsx rename to src/app/list/create/_components/CreateItem.tsx diff --git a/src/app/create/_components/CreateList.css.ts b/src/app/list/create/_components/CreateList.css.ts similarity index 100% rename from src/app/create/_components/CreateList.css.ts rename to src/app/list/create/_components/CreateList.css.ts diff --git a/src/app/create/_components/CreateList.tsx b/src/app/list/create/_components/CreateList.tsx similarity index 100% rename from src/app/create/_components/CreateList.tsx rename to src/app/list/create/_components/CreateList.tsx diff --git a/src/app/create/_components/item/AddItemButton.css.ts b/src/app/list/create/_components/item/AddItemButton.css.ts similarity index 100% rename from src/app/create/_components/item/AddItemButton.css.ts rename to src/app/list/create/_components/item/AddItemButton.css.ts diff --git a/src/app/create/_components/item/AddItemButton.tsx b/src/app/list/create/_components/item/AddItemButton.tsx similarity index 100% rename from src/app/create/_components/item/AddItemButton.tsx rename to src/app/list/create/_components/item/AddItemButton.tsx diff --git a/src/app/create/_components/item/Header.css.ts b/src/app/list/create/_components/item/Header.css.ts similarity index 100% rename from src/app/create/_components/item/Header.css.ts rename to src/app/list/create/_components/item/Header.css.ts diff --git a/src/app/create/_components/item/Header.tsx b/src/app/list/create/_components/item/Header.tsx similarity index 100% rename from src/app/create/_components/item/Header.tsx rename to src/app/list/create/_components/item/Header.tsx diff --git a/src/app/create/_components/item/ImageUploader.css.ts b/src/app/list/create/_components/item/ImageUploader.css.ts similarity index 100% rename from src/app/create/_components/item/ImageUploader.css.ts rename to src/app/list/create/_components/item/ImageUploader.css.ts diff --git a/src/app/create/_components/item/ImageUploader.tsx b/src/app/list/create/_components/item/ImageUploader.tsx similarity index 100% rename from src/app/create/_components/item/ImageUploader.tsx rename to src/app/list/create/_components/item/ImageUploader.tsx diff --git a/src/app/create/_components/item/ItemLayout.css.ts b/src/app/list/create/_components/item/ItemLayout.css.ts similarity index 100% rename from src/app/create/_components/item/ItemLayout.css.ts rename to src/app/list/create/_components/item/ItemLayout.css.ts diff --git a/src/app/create/_components/item/ItemLayout.tsx b/src/app/list/create/_components/item/ItemLayout.tsx similarity index 100% rename from src/app/create/_components/item/ItemLayout.tsx rename to src/app/list/create/_components/item/ItemLayout.tsx diff --git a/src/app/create/_components/item/Items.css.ts b/src/app/list/create/_components/item/Items.css.ts similarity index 100% rename from src/app/create/_components/item/Items.css.ts rename to src/app/list/create/_components/item/Items.css.ts diff --git a/src/app/create/_components/item/Items.tsx b/src/app/list/create/_components/item/Items.tsx similarity index 100% rename from src/app/create/_components/item/Items.tsx rename to src/app/list/create/_components/item/Items.tsx diff --git a/src/app/create/_components/item/LinkModal.tsx b/src/app/list/create/_components/item/LinkModal.tsx similarity index 100% rename from src/app/create/_components/item/LinkModal.tsx rename to src/app/list/create/_components/item/LinkModal.tsx diff --git a/src/app/create/_components/item/LinkPreview.css.ts b/src/app/list/create/_components/item/LinkPreview.css.ts similarity index 100% rename from src/app/create/_components/item/LinkPreview.css.ts rename to src/app/list/create/_components/item/LinkPreview.css.ts diff --git a/src/app/create/_components/item/LinkPreview.tsx b/src/app/list/create/_components/item/LinkPreview.tsx similarity index 100% rename from src/app/create/_components/item/LinkPreview.tsx rename to src/app/list/create/_components/item/LinkPreview.tsx diff --git a/src/app/create/_components/item/Preview.css.ts b/src/app/list/create/_components/item/Preview.css.ts similarity index 100% rename from src/app/create/_components/item/Preview.css.ts rename to src/app/list/create/_components/item/Preview.css.ts diff --git a/src/app/create/_components/item/Preview.tsx b/src/app/list/create/_components/item/Preview.tsx similarity index 100% rename from src/app/create/_components/item/Preview.tsx rename to src/app/list/create/_components/item/Preview.tsx diff --git a/src/app/create/_components/list/ButtonSelector.css.ts b/src/app/list/create/_components/list/ButtonSelector.css.ts similarity index 100% rename from src/app/create/_components/list/ButtonSelector.css.ts rename to src/app/list/create/_components/list/ButtonSelector.css.ts diff --git a/src/app/create/_components/list/ButtonSelector.tsx b/src/app/list/create/_components/list/ButtonSelector.tsx similarity index 100% rename from src/app/create/_components/list/ButtonSelector.tsx rename to src/app/list/create/_components/list/ButtonSelector.tsx diff --git a/src/app/create/_components/list/ColorSelector.css.ts b/src/app/list/create/_components/list/ColorSelector.css.ts similarity index 100% rename from src/app/create/_components/list/ColorSelector.css.ts rename to src/app/list/create/_components/list/ColorSelector.css.ts diff --git a/src/app/create/_components/list/ColorSelector.tsx b/src/app/list/create/_components/list/ColorSelector.tsx similarity index 100% rename from src/app/create/_components/list/ColorSelector.tsx rename to src/app/list/create/_components/list/ColorSelector.tsx diff --git a/src/app/create/_components/list/CreateListMock.ts b/src/app/list/create/_components/list/CreateListMock.ts similarity index 100% rename from src/app/create/_components/list/CreateListMock.ts rename to src/app/list/create/_components/list/CreateListMock.ts diff --git a/src/app/create/_components/list/Header.css.ts b/src/app/list/create/_components/list/Header.css.ts similarity index 100% rename from src/app/create/_components/list/Header.css.ts rename to src/app/list/create/_components/list/Header.css.ts diff --git a/src/app/create/_components/list/Header.tsx b/src/app/list/create/_components/list/Header.tsx similarity index 100% rename from src/app/create/_components/list/Header.tsx rename to src/app/list/create/_components/list/Header.tsx diff --git a/src/app/create/_components/list/LabelInput.css.ts b/src/app/list/create/_components/list/LabelInput.css.ts similarity index 100% rename from src/app/create/_components/list/LabelInput.css.ts rename to src/app/list/create/_components/list/LabelInput.css.ts diff --git a/src/app/create/_components/list/LabelInput.tsx b/src/app/list/create/_components/list/LabelInput.tsx similarity index 100% rename from src/app/create/_components/list/LabelInput.tsx rename to src/app/list/create/_components/list/LabelInput.tsx diff --git a/src/app/create/_components/list/MemberSelector.css.ts b/src/app/list/create/_components/list/MemberSelector.css.ts similarity index 100% rename from src/app/create/_components/list/MemberSelector.css.ts rename to src/app/list/create/_components/list/MemberSelector.css.ts diff --git a/src/app/create/_components/list/MemberSelector.tsx b/src/app/list/create/_components/list/MemberSelector.tsx similarity index 100% rename from src/app/create/_components/list/MemberSelector.tsx rename to src/app/list/create/_components/list/MemberSelector.tsx diff --git a/src/app/create/_components/list/RadioInput.css.ts b/src/app/list/create/_components/list/RadioInput.css.ts similarity index 100% rename from src/app/create/_components/list/RadioInput.css.ts rename to src/app/list/create/_components/list/RadioInput.css.ts diff --git a/src/app/create/_components/list/RadioInput.tsx b/src/app/list/create/_components/list/RadioInput.tsx similarity index 100% rename from src/app/create/_components/list/RadioInput.tsx rename to src/app/list/create/_components/list/RadioInput.tsx diff --git a/src/app/create/_components/list/Section.css.ts b/src/app/list/create/_components/list/Section.css.ts similarity index 100% rename from src/app/create/_components/list/Section.css.ts rename to src/app/list/create/_components/list/Section.css.ts diff --git a/src/app/create/_components/list/Section.tsx b/src/app/list/create/_components/list/Section.tsx similarity index 100% rename from src/app/create/_components/list/Section.tsx rename to src/app/list/create/_components/list/Section.tsx diff --git a/src/app/create/_components/list/SimpleInput.css.ts b/src/app/list/create/_components/list/SimpleInput.css.ts similarity index 100% rename from src/app/create/_components/list/SimpleInput.css.ts rename to src/app/list/create/_components/list/SimpleInput.css.ts diff --git a/src/app/create/_components/list/SimpleInput.tsx b/src/app/list/create/_components/list/SimpleInput.tsx similarity index 100% rename from src/app/create/_components/list/SimpleInput.tsx rename to src/app/list/create/_components/list/SimpleInput.tsx diff --git a/src/app/create/page.tsx b/src/app/list/create/page.tsx similarity index 91% rename from src/app/create/page.tsx rename to src/app/list/create/page.tsx index 8deb794f..3e1f3973 100644 --- a/src/app/create/page.tsx +++ b/src/app/list/create/page.tsx @@ -4,12 +4,12 @@ import { useState } from 'react'; import { FieldErrors, FormProvider, useForm } from 'react-hook-form'; import { useMutation } from '@tanstack/react-query'; -import CreateItem from '@/app/create/_components/CreateItem'; -import CreateList from '@/app/create/_components/CreateList'; +import CreateItem from '@/app/list/create/_components/CreateItem'; +import CreateList from '@/app/list/create/_components/CreateList'; import { ItemImagesType, ListCreateType } from '@/lib/types/listType'; import toasting from '@/lib/utils/toasting'; -import { createList } from '../_api/list/createList'; -import { uploadItemImages } from '../_api/list/uploadItemImages'; +import { createList } from '../../_api/list/createList'; +import { uploadItemImages } from '../../_api/list/uploadItemImages'; import { useRouter } from 'next/navigation'; export type FormErrors = FieldErrors; @@ -116,7 +116,11 @@ export default function CreatePage() { }, }); - const { mutate: createListMutate, isPending: isCreatingList, isSuccess } = useMutation({ + const { + mutate: createListMutate, + isPending: isCreatingList, + isSuccess, + } = useMutation({ mutationFn: createList, onSuccess: (data) => { setNewListId(data.listId); diff --git a/src/app/[userNickname]/_components/Action.css.ts b/src/app/user/[userId]/_components/Action.css.ts similarity index 100% rename from src/app/[userNickname]/_components/Action.css.ts rename to src/app/user/[userId]/_components/Action.css.ts diff --git a/src/app/[userNickname]/_components/Action.tsx b/src/app/user/[userId]/_components/Action.tsx similarity index 100% rename from src/app/[userNickname]/_components/Action.tsx rename to src/app/user/[userId]/_components/Action.tsx diff --git a/src/app/[userNickname]/_components/Card.css.ts b/src/app/user/[userId]/_components/Card.css.ts similarity index 100% rename from src/app/[userNickname]/_components/Card.css.ts rename to src/app/user/[userId]/_components/Card.css.ts diff --git a/src/app/[userNickname]/_components/Card.tsx b/src/app/user/[userId]/_components/Card.tsx similarity index 100% rename from src/app/[userNickname]/_components/Card.tsx rename to src/app/user/[userId]/_components/Card.tsx diff --git a/src/app/[userNickname]/_components/CardItem.css.ts b/src/app/user/[userId]/_components/CardItem.css.ts similarity index 100% rename from src/app/[userNickname]/_components/CardItem.css.ts rename to src/app/user/[userId]/_components/CardItem.css.ts diff --git a/src/app/[userNickname]/_components/CardItem.tsx b/src/app/user/[userId]/_components/CardItem.tsx similarity index 100% rename from src/app/[userNickname]/_components/CardItem.tsx rename to src/app/user/[userId]/_components/CardItem.tsx diff --git a/src/app/[userNickname]/_components/Categories.css.ts b/src/app/user/[userId]/_components/Categories.css.ts similarity index 100% rename from src/app/[userNickname]/_components/Categories.css.ts rename to src/app/user/[userId]/_components/Categories.css.ts diff --git a/src/app/[userNickname]/_components/Categories.tsx b/src/app/user/[userId]/_components/Categories.tsx similarity index 100% rename from src/app/[userNickname]/_components/Categories.tsx rename to src/app/user/[userId]/_components/Categories.tsx diff --git a/src/app/[userNickname]/_components/Content.css.ts b/src/app/user/[userId]/_components/Content.css.ts similarity index 100% rename from src/app/[userNickname]/_components/Content.css.ts rename to src/app/user/[userId]/_components/Content.css.ts diff --git a/src/app/[userNickname]/_components/Content.tsx b/src/app/user/[userId]/_components/Content.tsx similarity index 100% rename from src/app/[userNickname]/_components/Content.tsx rename to src/app/user/[userId]/_components/Content.tsx diff --git a/src/app/[userNickname]/_components/Profile.css.ts b/src/app/user/[userId]/_components/Profile.css.ts similarity index 100% rename from src/app/[userNickname]/_components/Profile.css.ts rename to src/app/user/[userId]/_components/Profile.css.ts diff --git a/src/app/[userNickname]/_components/Profile.tsx b/src/app/user/[userId]/_components/Profile.tsx similarity index 100% rename from src/app/[userNickname]/_components/Profile.tsx rename to src/app/user/[userId]/_components/Profile.tsx diff --git a/src/app/[userNickname]/collabolist/page.tsx b/src/app/user/[userId]/collabolist/page.tsx similarity index 100% rename from src/app/[userNickname]/collabolist/page.tsx rename to src/app/user/[userId]/collabolist/page.tsx diff --git a/src/app/[userNickname]/[listId]/ListDetail.css.ts b/src/app/user/[userId]/list/[listId]/ListDetail.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/ListDetail.css.ts rename to src/app/user/[userId]/list/[listId]/ListDetail.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/BottomSheet/BottomSheet.css.ts b/src/app/user/[userId]/list/[listId]/_components/BottomSheet/BottomSheet.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/BottomSheet/BottomSheet.css.ts rename to src/app/user/[userId]/list/[listId]/_components/BottomSheet/BottomSheet.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/BottomSheet/BottomSheet.css.tsx b/src/app/user/[userId]/list/[listId]/_components/BottomSheet/BottomSheet.css.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/BottomSheet/BottomSheet.css.tsx rename to src/app/user/[userId]/list/[listId]/_components/BottomSheet/BottomSheet.css.tsx diff --git a/src/app/[userNickname]/[listId]/_components/BottomSheet/BottomSheet.tsx b/src/app/user/[userId]/list/[listId]/_components/BottomSheet/BottomSheet.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/BottomSheet/BottomSheet.tsx rename to src/app/user/[userId]/list/[listId]/_components/BottomSheet/BottomSheet.tsx diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailInner/Footer.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Footer.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailInner/Footer.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Footer.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailInner/Footer.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Footer.tsx similarity index 97% rename from src/app/[userNickname]/[listId]/_components/ListDetailInner/Footer.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Footer.tsx index 9efa9ce8..940db7b2 100644 --- a/src/app/[userNickname]/[listId]/_components/ListDetailInner/Footer.tsx +++ b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Footer.tsx @@ -2,7 +2,7 @@ import { useParams, useRouter } from 'next/navigation'; import { MouseEvent, useState } from 'react'; -import BottomSheet from '@/app/[userNickname]/[listId]/_components/BottomSheet/BottomSheet'; +import BottomSheet from '@/app/user/[userId]/list/[listId]/_components/BottomSheet/BottomSheet'; import ModalPortal from '@/components/ModalPortal'; import saveImageFromHtml from '@/lib/utils/saveImageFromHtml'; import copyUrl from '@/lib/utils/copyUrl'; diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailInner/Header.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Header.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailInner/Header.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Header.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailInner/Header.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Header.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailInner/Header.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailInner/Header.tsx diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailInner/RankList.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/RankList.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailInner/RankList.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailInner/RankList.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailInner/RankList.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/RankList.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailInner/RankList.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailInner/RankList.tsx diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailInner/index.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/index.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailInner/index.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailInner/index.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailInner/index.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/index.tsx similarity index 84% rename from src/app/[userNickname]/[listId]/_components/ListDetailInner/index.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailInner/index.tsx index 44b3a6b6..230f51f9 100644 --- a/src/app/[userNickname]/[listId]/_components/ListDetailInner/index.tsx +++ b/src/app/user/[userId]/list/[listId]/_components/ListDetailInner/index.tsx @@ -1,9 +1,9 @@ 'use client'; import { useState } from 'react'; -import Header from '@/app/[userNickname]/[listId]/_components/ListDetailInner/Header'; -import RankList from '@/app/[userNickname]/[listId]/_components/ListDetailInner/RankList'; -import Footer from '@/app/[userNickname]/[listId]/_components/ListDetailInner/Footer'; +import Header from '@/app/user/[userId]/list/[listId]/_components/ListDetailInner/Header'; +import RankList from '@/app/user/[userId]/list/[listId]/_components/ListDetailInner/RankList'; +import Footer from '@/app/user/[userId]/list/[listId]/_components/ListDetailInner/Footer'; import * as styles from './index.css'; export interface ListItemProps { diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Collaborators.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Collaborators.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Collaborators.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Collaborators.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Collaborators.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Collaborators.tsx similarity index 94% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Collaborators.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Collaborators.tsx index a302edfb..06957edb 100644 --- a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Collaborators.tsx +++ b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Collaborators.tsx @@ -1,5 +1,5 @@ import Image from 'next/image'; -import CollaboratorsPopOver from '@/app/[userNickname]/[listId]/_components/ListDetailOuter/CollaboratorsPopOver'; +import CollaboratorsPopOver from '@/app/user/[userId]/list/[listId]/_components/ListDetailOuter/CollaboratorsPopOver'; import * as styles from './Collaborators.css'; import DefaultProfile from '/public/icons/default_profile_temporary.svg'; import PlusIcon from '/public/icons/collaborators_plus.svg'; diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/CollaboratorsPopOver.tsx diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comment.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comment.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comment.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comment.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comment.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comment.tsx similarity index 89% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comment.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comment.tsx index 577b39a9..e45c76cc 100644 --- a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comment.tsx +++ b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comment.tsx @@ -1,7 +1,7 @@ 'use client'; import Image from 'next/image'; -import Replies from '@/app/[userNickname]/[listId]/_components/ListDetailOuter/Replies'; -import DeleteModalButton from '@/app/[userNickname]/[listId]/_components/ListDetailOuter/DeleteModalButton'; +import Replies from '@/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Replies'; +import DeleteModalButton from '@/app/user/[userId]/list/[listId]/_components/ListDetailOuter/DeleteModalButton'; import timeDiff from '@/lib/utils/timeDiff'; import * as styles from './Comment.css'; import DefaultProfile from '/public/icons/default_profile_temporary.svg'; diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comments.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comments.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comments.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comments.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comments.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comments.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Comments.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comments.tsx diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/DeleteModalButton.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/DeleteModalButton.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/DeleteModalButton.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/DeleteModalButton.tsx diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Header.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Header.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Header.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Header.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Header.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Header.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Header.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Header.tsx diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/ListInformation.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/ListInformation.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/ListInformation.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/ListInformation.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/ListInformation.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/ListInformation.tsx similarity index 94% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/ListInformation.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/ListInformation.tsx index 4df16726..c5e387a5 100644 --- a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/ListInformation.tsx +++ b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/ListInformation.tsx @@ -1,6 +1,6 @@ import Image from 'next/image'; import Label from '@/components/Label/Label'; -import Collaborators from '@/app/[userNickname]/[listId]/_components/ListDetailOuter/Collaborators'; +import Collaborators from '@/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Collaborators'; import timeDiff from '@/lib/utils/timeDiff'; import * as styles from './ListInformation.css'; import { MOCKDATA_LIST } from '../../mockData/mockdata'; diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/ModalButtonStyle.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/ModalButtonStyle.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/ModalButtonStyle.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/ModalButtonStyle.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/OpenBottomSheetButton.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/OpenBottomSheetButton.tsx similarity index 92% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/OpenBottomSheetButton.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/OpenBottomSheetButton.tsx index 29f03497..fee12414 100644 --- a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/OpenBottomSheetButton.tsx +++ b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/OpenBottomSheetButton.tsx @@ -1,5 +1,5 @@ import useBooleanOutput from '@/hooks/useBooleanOutput'; -import BottomSheet from '@/app/[userNickname]/[listId]/_components/BottomSheet/BottomSheet'; +import BottomSheet from '@/app/user/[userId]/list/[listId]/_components/BottomSheet/BottomSheet'; import KebabButton from '/public/icons/vertical_kebab_button.svg'; import * as styles from './ModalButtonStyle.css'; diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/PopOverMenu.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/PopOverMenu.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/PopOverMenu.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/PopOverMenu.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/PopOverMenu.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/PopOverMenu.tsx similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/PopOverMenu.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/PopOverMenu.tsx diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Replies.css.ts b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Replies.css.ts similarity index 100% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Replies.css.ts rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Replies.css.ts diff --git a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Replies.tsx b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Replies.tsx similarity index 94% rename from src/app/[userNickname]/[listId]/_components/ListDetailOuter/Replies.tsx rename to src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Replies.tsx index e2683188..f403682d 100644 --- a/src/app/[userNickname]/[listId]/_components/ListDetailOuter/Replies.tsx +++ b/src/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Replies.tsx @@ -2,7 +2,7 @@ import { useState } from 'react'; import Image from 'next/image'; import timeDiff from '@/lib/utils/timeDiff'; -import DeleteModalButton from '@/app/[userNickname]/[listId]/_components/ListDetailOuter/DeleteModalButton'; +import DeleteModalButton from '@/app/user/[userId]/list/[listId]/_components/ListDetailOuter/DeleteModalButton'; import * as styles from './Replies.css'; import Line from '/public/icons/horizontal_line.svg'; import { ReplyType } from '../../mockData/mockdataType'; diff --git a/src/app/[userNickname]/[listId]/mockData/mockdata.ts b/src/app/user/[userId]/list/[listId]/mockData/mockdata.ts similarity index 100% rename from src/app/[userNickname]/[listId]/mockData/mockdata.ts rename to src/app/user/[userId]/list/[listId]/mockData/mockdata.ts diff --git a/src/app/[userNickname]/[listId]/mockData/mockdataType.ts b/src/app/user/[userId]/list/[listId]/mockData/mockdataType.ts similarity index 100% rename from src/app/[userNickname]/[listId]/mockData/mockdataType.ts rename to src/app/user/[userId]/list/[listId]/mockData/mockdataType.ts diff --git a/src/app/user/[userId]/list/[listId]/page.tsx b/src/app/user/[userId]/list/[listId]/page.tsx index 0b2b5630..dbe4fd7e 100644 --- a/src/app/user/[userId]/list/[listId]/page.tsx +++ b/src/app/user/[userId]/list/[listId]/page.tsx @@ -1,3 +1,15 @@ -export default function ListPage() { - return
리스트페이지
; +'use client'; +import * as styles from './ListDetail.css'; +import Comments from '@/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Comments'; +import Header from '@/app/user/[userId]/list/[listId]/_components/ListDetailOuter/Header'; +import ListInformation from '@/app/user/[userId]/list/[listId]/_components/ListDetailOuter/ListInformation'; + +export default function ListDetail() { + return ( +
+
+ + +
+ ); } diff --git a/src/app/[userNickname]/mockData/categories.ts b/src/app/user/[userId]/mockData/categories.ts similarity index 100% rename from src/app/[userNickname]/mockData/categories.ts rename to src/app/user/[userId]/mockData/categories.ts diff --git a/src/app/[userNickname]/mockData/items.ts b/src/app/user/[userId]/mockData/items.ts similarity index 100% rename from src/app/[userNickname]/mockData/items.ts rename to src/app/user/[userId]/mockData/items.ts diff --git a/src/app/[userNickname]/mockData/lists.ts b/src/app/user/[userId]/mockData/lists.ts similarity index 100% rename from src/app/[userNickname]/mockData/lists.ts rename to src/app/user/[userId]/mockData/lists.ts diff --git a/src/app/[userNickname]/mockData/mockDataTypes.ts b/src/app/user/[userId]/mockData/mockDataTypes.ts similarity index 100% rename from src/app/[userNickname]/mockData/mockDataTypes.ts rename to src/app/user/[userId]/mockData/mockDataTypes.ts diff --git a/src/app/[userNickname]/mockData/user.ts b/src/app/user/[userId]/mockData/user.ts similarity index 100% rename from src/app/[userNickname]/mockData/user.ts rename to src/app/user/[userId]/mockData/user.ts diff --git a/src/app/[userNickname]/mylist/page.tsx b/src/app/user/[userId]/mylist/page.tsx similarity index 100% rename from src/app/[userNickname]/mylist/page.tsx rename to src/app/user/[userId]/mylist/page.tsx diff --git a/src/lib/constants/init.ts b/src/lib/constants/init.ts deleted file mode 100644 index e099ee9f..00000000 --- a/src/lib/constants/init.ts +++ /dev/null @@ -1,2 +0,0 @@ -// 보일러플레이트용 임시 파일 -// 추후 이 파일은 지워주세요 From 3f39a2cee9fa004ae7d63aece12bec45912a0dc9 Mon Sep 17 00:00:00 2001 From: Seoyoung Date: Wed, 7 Feb 2024 17:38:48 +0900 Subject: [PATCH 2/7] =?UTF-8?q?Fix:=20imageUrl=20=ED=83=80=EC=9E=85?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=ED=85=9C=20=EC=B6=94=EA=B0=80=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/list/create/_components/item/Preview.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/list/create/_components/item/Preview.tsx b/src/app/list/create/_components/item/Preview.tsx index f162a770..c897018d 100644 --- a/src/app/list/create/_components/item/Preview.tsx +++ b/src/app/list/create/_components/item/Preview.tsx @@ -18,7 +18,7 @@ type LinkProps = PreviewBaseProps & { type ImageProps = PreviewBaseProps & { type: 'image'; - imageFile: Blob; + imageFile: File; }; type PreviewProps = LinkProps | ImageProps; @@ -31,7 +31,7 @@ export default function Preview(props: PreviewProps) { props.handleClearButtonClick(); }; - if (props.type === 'image') { + if (props.type === 'image' && props.imageFile) { const reader = new FileReader(); reader.onloadend = () => { setPreview(reader.result as string); From bc02ea154bc24d95d8a4ac1d02032f4b5ea189e4 Mon Sep 17 00:00:00 2001 From: Seoyoung Date: Wed, 7 Feb 2024 19:46:00 +0900 Subject: [PATCH 3/7] =?UTF-8?q?Style:=20pretendard=20=EB=A1=9C=EC=BB=AC=20?= =?UTF-8?q?=ED=8F=B0=ED=8A=B8=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fonts}/Pretendard-Black.woff2 | Bin .../fonts}/Pretendard-Bold.woff2 | Bin .../fonts}/Pretendard-ExtraBold.woff2 | Bin .../fonts}/Pretendard-ExtraLight.woff2 | Bin .../fonts}/Pretendard-Light.woff2 | Bin .../fonts}/Pretendard-Medium.woff2 | Bin .../fonts}/Pretendard-Regular.woff2 | Bin .../fonts}/Pretendard-SemiBold.woff2 | Bin .../fonts}/Pretendard-Thin.woff2 | Bin src/styles/GlobalStyles.css.ts | 10 ++-- src/styles/pretendardFont.css.ts | 48 ++++++++++++++++++ 11 files changed, 52 insertions(+), 6 deletions(-) rename {src/styles => public/fonts}/Pretendard-Black.woff2 (100%) rename {src/styles => public/fonts}/Pretendard-Bold.woff2 (100%) rename {src/styles => public/fonts}/Pretendard-ExtraBold.woff2 (100%) rename {src/styles => public/fonts}/Pretendard-ExtraLight.woff2 (100%) rename {src/styles => public/fonts}/Pretendard-Light.woff2 (100%) rename {src/styles => public/fonts}/Pretendard-Medium.woff2 (100%) rename {src/styles => public/fonts}/Pretendard-Regular.woff2 (100%) rename {src/styles => public/fonts}/Pretendard-SemiBold.woff2 (100%) rename {src/styles => public/fonts}/Pretendard-Thin.woff2 (100%) create mode 100644 src/styles/pretendardFont.css.ts diff --git a/src/styles/Pretendard-Black.woff2 b/public/fonts/Pretendard-Black.woff2 similarity index 100% rename from src/styles/Pretendard-Black.woff2 rename to public/fonts/Pretendard-Black.woff2 diff --git a/src/styles/Pretendard-Bold.woff2 b/public/fonts/Pretendard-Bold.woff2 similarity index 100% rename from src/styles/Pretendard-Bold.woff2 rename to public/fonts/Pretendard-Bold.woff2 diff --git a/src/styles/Pretendard-ExtraBold.woff2 b/public/fonts/Pretendard-ExtraBold.woff2 similarity index 100% rename from src/styles/Pretendard-ExtraBold.woff2 rename to public/fonts/Pretendard-ExtraBold.woff2 diff --git a/src/styles/Pretendard-ExtraLight.woff2 b/public/fonts/Pretendard-ExtraLight.woff2 similarity index 100% rename from src/styles/Pretendard-ExtraLight.woff2 rename to public/fonts/Pretendard-ExtraLight.woff2 diff --git a/src/styles/Pretendard-Light.woff2 b/public/fonts/Pretendard-Light.woff2 similarity index 100% rename from src/styles/Pretendard-Light.woff2 rename to public/fonts/Pretendard-Light.woff2 diff --git a/src/styles/Pretendard-Medium.woff2 b/public/fonts/Pretendard-Medium.woff2 similarity index 100% rename from src/styles/Pretendard-Medium.woff2 rename to public/fonts/Pretendard-Medium.woff2 diff --git a/src/styles/Pretendard-Regular.woff2 b/public/fonts/Pretendard-Regular.woff2 similarity index 100% rename from src/styles/Pretendard-Regular.woff2 rename to public/fonts/Pretendard-Regular.woff2 diff --git a/src/styles/Pretendard-SemiBold.woff2 b/public/fonts/Pretendard-SemiBold.woff2 similarity index 100% rename from src/styles/Pretendard-SemiBold.woff2 rename to public/fonts/Pretendard-SemiBold.woff2 diff --git a/src/styles/Pretendard-Thin.woff2 b/public/fonts/Pretendard-Thin.woff2 similarity index 100% rename from src/styles/Pretendard-Thin.woff2 rename to public/fonts/Pretendard-Thin.woff2 diff --git a/src/styles/GlobalStyles.css.ts b/src/styles/GlobalStyles.css.ts index 97534501..15a89451 100644 --- a/src/styles/GlobalStyles.css.ts +++ b/src/styles/GlobalStyles.css.ts @@ -1,13 +1,11 @@ import { globalStyle } from '@vanilla-extract/css'; +import { Pretendard } from './pretendardFont.css'; -globalStyle('html', { - fontSize: '62.5%', - color: '#19191B', //글자기본색 -}); +globalStyle('html', { fontSize: '62.5%', color: '#19191B' }); -globalStyle('*', { +globalStyle('body *', { boxSizing: 'border-box', - fontFamily: 'Pretendard', + fontFamily: Pretendard, }); globalStyle('html, body, div, span, h1, h2, h3, h4, h5, h6, p, a, dl, dt, dd, ol, ul, li, form, label, table, button', { diff --git a/src/styles/pretendardFont.css.ts b/src/styles/pretendardFont.css.ts new file mode 100644 index 00000000..33035b35 --- /dev/null +++ b/src/styles/pretendardFont.css.ts @@ -0,0 +1,48 @@ +import { globalFontFace } from '@vanilla-extract/css'; + +export const Pretendard = 'GlobalPretendard'; + +globalFontFace(Pretendard, { + fontWeight: 900, + src: `url('/fonts/Pretendard-Black.woff2') format('woff2')`, +}); + +globalFontFace(Pretendard, { + fontWeight: 800, + src: `url('/fonts/Pretendard-ExtraBold.woff2') format('woff2')`, +}); + +globalFontFace(Pretendard, { + fontWeight: 700, + src: `url('/fonts/Pretendard-Bold.woff2') format('woff2')`, +}); + +globalFontFace(Pretendard, { + fontWeight: 600, + src: `url('/fonts/Pretendard-SemiBold.woff2') format('woff2')`, +}); + +globalFontFace(Pretendard, { + fontWeight: 500, + src: `url('/fonts/Pretendard-Medium.woff2') format('woff2')`, +}); + +globalFontFace(Pretendard, { + fontWeight: 400, + src: `url('/fonts/Pretendard-Regular.woff2') format('woff2')`, +}); + +globalFontFace(Pretendard, { + fontWeight: 300, + src: `url('/fonts/Pretendard-Light.woff2') format('woff2')`, +}); + +globalFontFace(Pretendard, { + fontWeight: 200, + src: `url('/fonts/Pretendard-ExtraLight.woff2') format('woff2')`, +}); + +globalFontFace(Pretendard, { + fontWeight: 100, + src: `url('/fonts/Pretendard-Thin.woff2') format('woff2')`, +}); From 00b3740f1a5475784737ef5959b386da0209b86b Mon Sep 17 00:00:00 2001 From: Seoyoung Date: Wed, 7 Feb 2024 19:46:38 +0900 Subject: [PATCH 4/7] =?UTF-8?q?Style:=20=EC=83=89=EC=83=81=20=ED=85=8C?= =?UTF-8?q?=EB=A7=88=20=EC=84=A4=EC=A0=95=20=EB=B0=8F=20=EA=B3=B5=EC=9A=A9?= =?UTF-8?q?=20font=20style=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/styles/font.css.ts | 74 +++++++++++++++++++++++++++++++++++++++++ src/styles/theme.css.ts | 33 ++++++++++++++++++ 2 files changed, 107 insertions(+) create mode 100644 src/styles/font.css.ts create mode 100644 src/styles/theme.css.ts diff --git a/src/styles/font.css.ts b/src/styles/font.css.ts new file mode 100644 index 00000000..9d3fc10b --- /dev/null +++ b/src/styles/font.css.ts @@ -0,0 +1,74 @@ +import { style } from '@vanilla-extract/css'; + +export const largeTitle = style({ + fontSize: '3.4rem', + fontWeight: '800', + letterSpacing: '-0.102rem', +}); + +export const title1 = style({ + fontSize: '2.8rem', + fontWeight: '700', + letterSpacing: '-0.084rem', +}); + +export const title2 = style({ + fontSize: '2.2rem', + fontWeight: '600', + lineHeight: '2.5rem', + letterSpacing: '-0.066rem', +}); + +export const title3 = style({ + fontSize: '2rem', + fontWeight: '600', + lineHeight: '2.5rem', + letterSpacing: '-0.06rem', +}); + +export const headline = style({ + fontSize: '1.7rem', + fontWeight: '600', + letterSpacing: '-0.051rem', +}); + +export const body1 = style({ + fontSize: '1.6rem', + fontWeight: '400', + lineHeight: '1.6rem', + letterSpacing: '-0.48px', +}); + +export const body2 = style({ + fontSize: '1.5rem', + fontWeight: '400', + lineHeight: '2.5rem', + letterSpacing: '-0.045rem', +}); + +export const body3 = style({ + fontSize: '1.4rem', + fontWeight: '400', + lineHeight: '2.5rem', + letterSpacing: '-0.042rem', +}); + +export const footnote = style({ + fontSize: '1.3rem', + fontWeight: '400', + lineHeight: '1.6rem', +}); + +export const caption1 = style({ + fontSize: '1.2rem', + fontWeight: '400', + lineHeight: '2.5rem', + letterSpacing: '-0.036rem', +}); + +export const caption2 = style({ + fontSize: '1.1rem', + fontWeight: '400', + lineHeight: '2.5rem', + letterSpacing: '-0.033rem', +}); diff --git a/src/styles/theme.css.ts b/src/styles/theme.css.ts new file mode 100644 index 00000000..e820289e --- /dev/null +++ b/src/styles/theme.css.ts @@ -0,0 +1,33 @@ +import { createThemeContract, createGlobalTheme } from '@vanilla-extract/css'; + +export const vars = createThemeContract({ + color: { + black: 'color-black', + white: 'color-white', + gray9: 'color-gray9', + gray7: 'color-gray7', + gray5: 'color-gray5', + gray3: 'color-gray3', + blue: 'color-blue', + skyblue: 'color-skyblue', + lightblue: 'color-lightblue', + yellow: 'color-yellow', + red: 'color-red', + }, +}); + +createGlobalTheme(':root', vars, { + color: { + black: '#19191B', + white: '#fff', + gray9: '#61646B', + gray7: '#AFB1B6', + gray5: '#EFEFF0', + gray3: '#FAFAFA', + blue: '#0047FF', + skyblue: '#82C3FF', + lightblue: '#EBF4FF', + yellow: '#FFF6A5', + red: '#FF5454', + }, +}); From c96f47d54adfd26c0a3e5dcb43e2ade6520fd7e8 Mon Sep 17 00:00:00 2001 From: Seoyoung Date: Wed, 7 Feb 2024 19:49:06 +0900 Subject: [PATCH 5/7] =?UTF-8?q?Style:=20=EA=B3=B5=EC=9A=A9=20=EC=83=89?= =?UTF-8?q?=EC=83=81,=20=ED=8F=B0=ED=8A=B8=20=ED=99=9C=EC=9A=A9=ED=95=98?= =?UTF-8?q?=EC=97=AC=20css=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/layout.tsx | 5 +- .../list/create/_components/CreateItem.css.ts | 45 ++++---- .../_components/item/AddItemButton.css.ts | 34 +++--- .../create/_components/item/Header.css.ts | 21 ++-- .../list/create/_components/item/Header.tsx | 2 +- .../create/_components/item/ItemLayout.css.ts | 23 ---- .../list/create/_components/item/Items.css.ts | 101 ++++++++---------- .../_components/item/LinkPreview.css.ts | 3 +- .../create/_components/item/Preview.css.ts | 5 +- src/components/Label/Label.css.ts | 34 +++--- .../{style.css.ts => LinkPreview.css.ts} | 5 +- src/components/Modal/Modal.css.ts | 3 +- src/components/Modal/ModalButton.css.ts | 73 ++++++------- src/components/Modal/ModalButton.tsx | 4 +- src/components/Modal/ModalTitle.css.ts | 13 +-- .../{style.css.ts => VideoEmbed.css.ts} | 3 +- .../floatingButton/FloatingContainer.css.ts | 3 +- 17 files changed, 176 insertions(+), 201 deletions(-) rename src/components/LinkPreview/{style.css.ts => LinkPreview.css.ts} (89%) rename src/components/VideoEmbed/{style.css.ts => VideoEmbed.css.ts} (76%) diff --git a/src/app/layout.tsx b/src/app/layout.tsx index ca44e808..173904db 100644 --- a/src/app/layout.tsx +++ b/src/app/layout.tsx @@ -1,10 +1,11 @@ 'use client'; import { ReactNode } from 'react'; +import { ToastContainer } from 'react-toastify'; +import Script from 'next/script'; + import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import '@/styles/GlobalStyles.css'; -import Script from 'next/script'; -import { ToastContainer } from 'react-toastify'; const queryClient = new QueryClient(); declare global { diff --git a/src/app/list/create/_components/CreateItem.css.ts b/src/app/list/create/_components/CreateItem.css.ts index 0a25cda4..d272219d 100644 --- a/src/app/list/create/_components/CreateItem.css.ts +++ b/src/app/list/create/_components/CreateItem.css.ts @@ -1,34 +1,35 @@ import { style } from '@vanilla-extract/css'; +import { body1, body3 } from '@/styles/font.css'; +import { vars } from '@/styles/theme.css'; export const article = style({ padding: '16px 20px 30px', }); //body1 -export const label = style({ - marginBottom: '1.6rem', +export const label = style([ + body1, + { + marginBottom: '1.6rem', + }, +]); - fontSize: '1.6rem', - fontWeight: '600', - letterSpacing: '-0.048rem', -}); - -export const required = style({ - marginLeft: '6px', +export const required = style([ + body1, + { + marginLeft: '6px', - fontSize: '1.6rem', - fontWeight: '500', - letterSpacing: '-0.048rem', - color: '#FF5454', -}); + fontWeight: '500', + color: vars.color.red, + }, +]); //body3 -export const description = style({ - marginBottom: '1.6rem', +export const description = style([ + body3, + { + marginBottom: '1.6rem', - fontSize: '1.4rem', - color: '#8A8A8E', - fontWeight: '400', - lineHeight: '2.5rem', - letterSpacing: '-0.042rem', -}); + color: vars.color.gray9, + }, +]); diff --git a/src/app/list/create/_components/item/AddItemButton.css.ts b/src/app/list/create/_components/item/AddItemButton.css.ts index e28b7a6f..06eb0733 100644 --- a/src/app/list/create/_components/item/AddItemButton.css.ts +++ b/src/app/list/create/_components/item/AddItemButton.css.ts @@ -1,23 +1,23 @@ import { style } from '@vanilla-extract/css'; +import { vars } from '@/styles/theme.css'; +import { body1 } from '@/styles/font.css'; -export const addButton = style({ - width: '100%', - height: '60px', +export const addButton = style([ + body1, + { + width: '100%', + height: '60px', - display: 'flex', - justifyContent: 'center', - alignItems: 'center', - gap: '12px', + display: 'flex', + justifyContent: 'center', + alignItems: 'center', + gap: '12px', - //body1 - fontSize: '1.6rem', - fontWeight: '400', - lineHeight: '1.6rem', - letterSpacing: '-0.48px', - color: '#61646B', + color: vars.color.gray9, - backgroundColor: '#FFF', + backgroundColor: '#FFF', - border: 'solid 1px #AFB1B6 ', - borderRadius: '15px', -}); + border: 'solid 1px #AFB1B6 ', + borderRadius: '15px', + }, +]); diff --git a/src/app/list/create/_components/item/Header.css.ts b/src/app/list/create/_components/item/Header.css.ts index 15cc5595..6899135b 100644 --- a/src/app/list/create/_components/item/Header.css.ts +++ b/src/app/list/create/_components/item/Header.css.ts @@ -1,4 +1,6 @@ -import { style } from '@vanilla-extract/css'; +import { style, styleVariants } from '@vanilla-extract/css'; +import { vars } from '@/styles/theme.css'; +import { title3, body1 } from '@/styles/font.css'; export const header = style({ width: '100%', @@ -16,21 +18,16 @@ export const header = style({ alignItems: 'center', justifyContent: 'space-between', - backgroundColor: '#fff', + backgroundColor: vars.color.white, borderBottom: '1px solid rgba(0, 0, 0, 0.10)', }); -export const headerTitle = style({ - fontSize: '2rem', -}); +export const headerTitle = style([title3]); -export const headerNextButton = style({ - fontSize: '1.6rem', - color: '#AFB1B6', - cursor: 'default', -}); +export const baseButton = style([body1]); -export const headerNextButtonActive = style({ - fontSize: '1.6rem', +export const headerNextButton = styleVariants({ + active: [baseButton], + inactive: [baseButton, { color: vars.color.gray7, cursor: 'default' }], }); diff --git a/src/app/list/create/_components/item/Header.tsx b/src/app/list/create/_components/item/Header.tsx index b4044a6b..3912271a 100644 --- a/src/app/list/create/_components/item/Header.tsx +++ b/src/app/list/create/_components/item/Header.tsx @@ -15,7 +15,7 @@ function Header({ onBackClick, isSubmitActive, onSubmitClick }: HeaderProps) {

리스트 생성

- - ); -}