From 7fcfb0026498f2a8f3e664414303e6aaa7c7eb32 Mon Sep 17 00:00:00 2001 From: hongggy Date: Sat, 14 Dec 2024 11:58:40 +0900 Subject: [PATCH 01/15] =?UTF-8?q?refactor:=20searchSection=20=ED=86=B5?= =?UTF-8?q?=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/albaTalk/page.tsx | 2 +- .../components/layout/posts/SearchSection.tsx | 44 ------------------- 2 files changed, 1 insertion(+), 45 deletions(-) delete mode 100644 src/app/components/layout/posts/SearchSection.tsx diff --git a/src/app/(pages)/albaTalk/page.tsx b/src/app/(pages)/albaTalk/page.tsx index dd430b97..24cceee5 100644 --- a/src/app/(pages)/albaTalk/page.tsx +++ b/src/app/(pages)/albaTalk/page.tsx @@ -5,7 +5,7 @@ import { useInView } from "react-intersection-observer"; import { usePosts } from "@/hooks/queries/post/usePosts"; import { usePathname, useSearchParams } from "next/navigation"; import SortSection from "@/app/components/layout/posts/SortSection"; -import SearchSection from "@/app/components/layout/posts/SearchSection"; +import SearchSection from "@/app/components/layout/forms/SearchSection"; import { useUser } from "@/hooks/queries/user/me/useUser"; import Link from "next/link"; import { RiEdit2Fill } from "react-icons/ri"; diff --git a/src/app/components/layout/posts/SearchSection.tsx b/src/app/components/layout/posts/SearchSection.tsx deleted file mode 100644 index 8d18f71c..00000000 --- a/src/app/components/layout/posts/SearchSection.tsx +++ /dev/null @@ -1,44 +0,0 @@ -"use client"; - -import { useRouter, useSearchParams } from "next/navigation"; -import { useState } from "react"; -import SearchInput from "@/app/components/input/text/SearchInput"; - -export default function SearchSection() { - const router = useRouter(); - const searchParams = useSearchParams(); - const [keyword, setKeyword] = useState(searchParams.get("keyword") || ""); - - const handleSubmit = (e: React.FormEvent) => { - e.preventDefault(); - const params = new URLSearchParams(searchParams); - - if (keyword.trim()) { - params.set("keyword", keyword); - } else { - params.delete("keyword"); - } - - router.push(`/albatalk?${params.toString()}`); - }; - - return ( -
-
-
- ) => setKeyword(e.target.value)} - className="h-10 w-full bg-background-200 hover:bg-background-300" - /> -
- -
-
- ); -} From 401ace4f13723ece01f66cc84bae4930c75cecc3 Mon Sep 17 00:00:00 2001 From: hongggy Date: Sat, 14 Dec 2024 12:06:57 +0900 Subject: [PATCH 02/15] =?UTF-8?q?fix:=20=EC=B5=9C=EC=A0=80=EC=8B=9C?= =?UTF-8?q?=EA=B8=89=20=EA=B0=95=EC=A0=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../(albaform)/addform/section/WorkConditionSection.tsx | 9 --------- src/app/(pages)/albaTalk/page.tsx | 4 ++-- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/app/(pages)/(albaform)/addform/section/WorkConditionSection.tsx b/src/app/(pages)/(albaform)/addform/section/WorkConditionSection.tsx index 4b5c2ea9..ad343bba 100644 --- a/src/app/(pages)/(albaform)/addform/section/WorkConditionSection.tsx +++ b/src/app/(pages)/(albaform)/addform/section/WorkConditionSection.tsx @@ -74,15 +74,6 @@ export default function WorkConditionSection() { const handleWageChange = (e: ChangeEvent) => { const value = e.target.value.replace(/,/g, ""); const numericValue = Number(value); - - // 최저시급 미만으로 설정 시도할 경우 - if (numericValue < MINIMUM_WAGE) { - toast.error(`최저시급(${formatMoney(MINIMUM_WAGE.toString())}원) 이상을 입력해주세요.`); - setDisplayWage(formatMoney(MINIMUM_WAGE.toString())); - setValue("hourlyWage", MINIMUM_WAGE); - return; - } - setValue("hourlyWage", numericValue); setDisplayWage(formatMoney(value)); }; diff --git a/src/app/(pages)/albaTalk/page.tsx b/src/app/(pages)/albaTalk/page.tsx index 24cceee5..1691c238 100644 --- a/src/app/(pages)/albaTalk/page.tsx +++ b/src/app/(pages)/albaTalk/page.tsx @@ -70,7 +70,7 @@ export default function AlbaTalk() { {/* 검색 섹션과 정렬 옵션을 고정 위치로 설정 */}
{/* 검색 섹션 */} -
+
@@ -79,7 +79,7 @@ export default function AlbaTalk() {
{/* 정렬 옵션 섹션 */} -
+
From 331f4802f2b1f60d186f777daa86eb848e85b7d7 Mon Sep 17 00:00:00 2001 From: hongggy Date: Sat, 14 Dec 2024 13:14:39 +0900 Subject: [PATCH 03/15] =?UTF-8?q?refactor:=20searchSection=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/albaList/page.tsx | 2 +- src/app/(pages)/albaTalk/page.tsx | 2 +- .../myAlbaform/(role)/applicant/page.tsx | 2 +- .../(pages)/myAlbaform/(role)/owner/page.tsx | 2 +- .../components/sections/ScrapsSection.tsx | 2 +- .../components/layout/forms/SearchSection.tsx | 22 ++++++++----------- 6 files changed, 14 insertions(+), 18 deletions(-) diff --git a/src/app/(pages)/albaList/page.tsx b/src/app/(pages)/albaList/page.tsx index bb6d5f08..cde442a2 100644 --- a/src/app/(pages)/albaList/page.tsx +++ b/src/app/(pages)/albaList/page.tsx @@ -144,7 +144,7 @@ export default function AlbaList() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((form) => ( diff --git a/src/app/(pages)/albaTalk/page.tsx b/src/app/(pages)/albaTalk/page.tsx index 1691c238..b31a8f75 100644 --- a/src/app/(pages)/albaTalk/page.tsx +++ b/src/app/(pages)/albaTalk/page.tsx @@ -103,7 +103,7 @@ export default function AlbaTalk() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((post) => ( diff --git a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx index 03a18567..81223e7a 100644 --- a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx @@ -106,7 +106,7 @@ export default function ApplicantPage() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((application) => ( diff --git a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx index da14e064..0fd17944 100644 --- a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx @@ -201,7 +201,7 @@ export default function AlbaList() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((form) => ( diff --git a/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx b/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx index f3bcceb2..6b94ce07 100644 --- a/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx +++ b/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx @@ -153,7 +153,7 @@ export default function ScrapsSection() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((scrap: FormListType) => ( diff --git a/src/app/components/layout/forms/SearchSection.tsx b/src/app/components/layout/forms/SearchSection.tsx index e5d790bb..77ed9476 100644 --- a/src/app/components/layout/forms/SearchSection.tsx +++ b/src/app/components/layout/forms/SearchSection.tsx @@ -3,6 +3,7 @@ import { useRouter, useSearchParams } from "next/navigation"; import { useState } from "react"; import SearchInput from "@/app/components/input/text/SearchInput"; +import Button from "../../button/default/Button"; export default function SearchSection() { const router = useRouter(); @@ -24,20 +25,15 @@ export default function SearchSection() { return (
-
-
- ) => setKeyword(e.target.value)} - className="h-10 w-full bg-background-200 hover:bg-background-300" - /> -
- +
); From b7fdbde174703cf884e04a963fdf5f4fd6280160 Mon Sep 17 00:00:00 2001 From: hongggy Date: Sat, 14 Dec 2024 13:17:07 +0900 Subject: [PATCH 04/15] =?UTF-8?q?fix:=20=EC=95=84=EC=9D=B4=ED=85=9C=20?= =?UTF-8?q?=EB=B0=B0=EC=97=B4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/albaList/page.tsx | 2 +- src/app/(pages)/albaTalk/page.tsx | 2 +- src/app/(pages)/myAlbaform/(role)/applicant/page.tsx | 2 +- src/app/(pages)/myAlbaform/(role)/owner/page.tsx | 2 +- src/app/(pages)/mypage/components/sections/ScrapsSection.tsx | 2 +- src/app/stories/design-system/pages/albaList/page.tsx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/app/(pages)/albaList/page.tsx b/src/app/(pages)/albaList/page.tsx index cde442a2..f14b5ca2 100644 --- a/src/app/(pages)/albaList/page.tsx +++ b/src/app/(pages)/albaList/page.tsx @@ -144,7 +144,7 @@ export default function AlbaList() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((form) => ( diff --git a/src/app/(pages)/albaTalk/page.tsx b/src/app/(pages)/albaTalk/page.tsx index b31a8f75..f14f3906 100644 --- a/src/app/(pages)/albaTalk/page.tsx +++ b/src/app/(pages)/albaTalk/page.tsx @@ -103,7 +103,7 @@ export default function AlbaTalk() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((post) => ( diff --git a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx index 81223e7a..c0e09256 100644 --- a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx @@ -106,7 +106,7 @@ export default function ApplicantPage() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((application) => ( diff --git a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx index 0fd17944..be821ac4 100644 --- a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx @@ -201,7 +201,7 @@ export default function AlbaList() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((form) => ( diff --git a/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx b/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx index 6b94ce07..7d27b593 100644 --- a/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx +++ b/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx @@ -153,7 +153,7 @@ export default function ScrapsSection() {
) : (
-
+
{data?.pages.map((page) => ( {page.data.map((scrap: FormListType) => ( diff --git a/src/app/stories/design-system/pages/albaList/page.tsx b/src/app/stories/design-system/pages/albaList/page.tsx index 22cc756f..e1d99eba 100644 --- a/src/app/stories/design-system/pages/albaList/page.tsx +++ b/src/app/stories/design-system/pages/albaList/page.tsx @@ -121,7 +121,7 @@ const AlbaList: React.FC = () => {
) : (
-
+
{items.map((form) => (
From cfcf0347b255caa9693d9658766aaa5be92fea87 Mon Sep 17 00:00:00 2001 From: hongggy Date: Sat, 14 Dec 2024 13:23:31 +0900 Subject: [PATCH 05/15] =?UTF-8?q?refactor:=20ContentSection=20=EC=BB=B4?= =?UTF-8?q?=ED=8F=AC=EB=84=8C=ED=8A=B8=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/albaList/page.tsx | 5 +++-- src/app/(pages)/albaTalk/page.tsx | 5 +++-- src/app/(pages)/myAlbaform/(role)/applicant/page.tsx | 5 +++-- src/app/(pages)/myAlbaform/(role)/owner/page.tsx | 5 +++-- src/app/(pages)/mypage/components/sections/ScrapsSection.tsx | 5 +++-- src/app/components/layout/ContentSection.tsx | 4 ++++ src/app/stories/design-system/pages/albaList/page.tsx | 5 +++-- 7 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 src/app/components/layout/ContentSection.tsx diff --git a/src/app/(pages)/albaList/page.tsx b/src/app/(pages)/albaList/page.tsx index f14b5ca2..6f4ab297 100644 --- a/src/app/(pages)/albaList/page.tsx +++ b/src/app/(pages)/albaList/page.tsx @@ -15,6 +15,7 @@ import { IoAdd } from "react-icons/io5"; import { userRoles } from "@/constants/userRoles"; import FloatingBtn from "@/app/components/button/default/FloatingBtn"; import LoadingSpinner from "@/app/components/loading-spinner/LoadingSpinner"; +import ContentSection from "@/app/components/layout/ContentSection"; const FORMS_PER_PAGE = 10; @@ -144,7 +145,7 @@ export default function AlbaList() {
) : (
-
+ {data?.pages.map((page) => ( {page.data.map((form) => ( @@ -156,7 +157,7 @@ export default function AlbaList() { ))} ))} -
+ {/* 무한 스크롤 트리거 영역 */}
diff --git a/src/app/(pages)/albaTalk/page.tsx b/src/app/(pages)/albaTalk/page.tsx index f14f3906..214a460c 100644 --- a/src/app/(pages)/albaTalk/page.tsx +++ b/src/app/(pages)/albaTalk/page.tsx @@ -13,6 +13,7 @@ import FloatingBtn from "@/app/components/button/default/FloatingBtn"; import CardBoard from "@/app/components/card/board/CardBoard"; import LoadingSpinner from "@/app/components/loading-spinner/LoadingSpinner"; import { useRouter } from "next/navigation"; +import ContentSection from "@/app/components/layout/ContentSection"; const POSTS_PER_PAGE = 10; @@ -103,7 +104,7 @@ export default function AlbaTalk() {
) : (
-
+ {data?.pages.map((page) => ( {page.data.map((post) => ( @@ -122,7 +123,7 @@ export default function AlbaTalk() { ))} ))} -
+ {/* 무한 스크롤 트리거 영역 */}
diff --git a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx index c0e09256..6d37adb9 100644 --- a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx @@ -11,6 +11,7 @@ import MyApplicationListItem from "@/app/components/card/cardList/MyApplicationL import { useMyApplications } from "@/hooks/queries/user/me/useMyApplications"; import ApplicantSortSection from "./components/ApplicantSortSection"; import LoadingSpinner from "@/app/components/loading-spinner/LoadingSpinner"; +import ContentSection from "@/app/components/layout/ContentSection"; const APPLICATIONS_PER_PAGE = 10; @@ -106,7 +107,7 @@ export default function ApplicantPage() {
) : (
-
+ {data?.pages.map((page) => ( {page.data.map((application) => ( @@ -124,7 +125,7 @@ export default function ApplicantPage() { ))} ))} -
+ {/* 무한 스크롤 트리거 영역 */}
diff --git a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx index be821ac4..3275b37a 100644 --- a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx @@ -15,6 +15,7 @@ import { IoAdd } from "react-icons/io5"; import { userRoles } from "@/constants/userRoles"; import FloatingBtn from "@/app/components/button/default/FloatingBtn"; import LoadingSpinner from "@/app/components/loading-spinner/LoadingSpinner"; +import ContentSection from "@/app/components/layout/ContentSection"; const FORMS_PER_PAGE = 10; @@ -201,7 +202,7 @@ export default function AlbaList() {
) : (
-
+ {data?.pages.map((page) => ( {page.data.map((form) => ( @@ -213,7 +214,7 @@ export default function AlbaList() { ))} ))} -
+ {/* 무한 스크롤 트리거 영역 */}
diff --git a/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx b/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx index 7d27b593..c098e464 100644 --- a/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx +++ b/src/app/(pages)/mypage/components/sections/ScrapsSection.tsx @@ -11,6 +11,7 @@ import { useRouter, usePathname, useSearchParams } from "next/navigation"; import AlbaListItem from "@/app/components/card/cardList/AlbaListItem"; import LoadingSpinner from "@/app/components/loading-spinner/LoadingSpinner"; import Link from "next/link"; +import ContentSection from "@/app/components/layout/ContentSection"; const SCRAPS_PER_PAGE = 10; @@ -153,7 +154,7 @@ export default function ScrapsSection() {
) : (
-
+ {data?.pages.map((page) => ( {page.data.map((scrap: FormListType) => ( @@ -165,7 +166,7 @@ export default function ScrapsSection() { ))} ))} -
+ {/* 무한 스크롤 트리거 영역 */}
diff --git a/src/app/components/layout/ContentSection.tsx b/src/app/components/layout/ContentSection.tsx new file mode 100644 index 00000000..732aa663 --- /dev/null +++ b/src/app/components/layout/ContentSection.tsx @@ -0,0 +1,4 @@ +const ContentSection = ({ children }: { children: React.ReactNode }) => { + return
{children}
; +}; +export default ContentSection; diff --git a/src/app/stories/design-system/pages/albaList/page.tsx b/src/app/stories/design-system/pages/albaList/page.tsx index e1d99eba..25f303b7 100644 --- a/src/app/stories/design-system/pages/albaList/page.tsx +++ b/src/app/stories/design-system/pages/albaList/page.tsx @@ -14,6 +14,7 @@ import Link from "next/link"; import { IoAdd } from "react-icons/io5"; import FloatingBtn from "@/app/components/button/default/FloatingBtn"; import LoadingSpinner from "@/app/components/loading-spinner/LoadingSpinner"; +import ContentSection from "@/app/components/layout/ContentSection"; interface AlbaListProps { mockData?: FormListType[][]; @@ -121,13 +122,13 @@ const AlbaList: React.FC = () => {
) : (
-
+ {items.map((form) => (
))} -
+ {/* 무한 스크롤 트리거 영역 */}
From be89b9b6fc84bbe9d07e22e807866571563a9030 Mon Sep 17 00:00:00 2001 From: hongggy Date: Sat, 14 Dec 2024 13:36:30 +0900 Subject: [PATCH 06/15] =?UTF-8?q?fix:=20z-index=20=EC=A1=B0=EC=A0=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/albaList/page.tsx | 8 ++++---- src/app/(pages)/albaTalk/page.tsx | 4 ++-- src/app/(pages)/myAlbaform/(role)/applicant/page.tsx | 6 +++--- src/app/(pages)/myAlbaform/(role)/owner/page.tsx | 2 +- src/app/components/layout/Header.tsx | 2 +- src/app/stories/design-system/pages/albaList/page.tsx | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/app/(pages)/albaList/page.tsx b/src/app/(pages)/albaList/page.tsx index 6f4ab297..1c2135ba 100644 --- a/src/app/(pages)/albaList/page.tsx +++ b/src/app/(pages)/albaList/page.tsx @@ -103,9 +103,9 @@ export default function AlbaList() { return (
{/* 검색 섹션과 필터 드롭다운을 고정 위치로 설정 */} -
+
{/* 검색 섹션 */} -
+
@@ -114,7 +114,7 @@ export default function AlbaList() {
{/* 필터 드롭다운 섹션 */} -
+
option.label)} @@ -132,7 +132,7 @@ export default function AlbaList() {
{/* 폼 만들기 버튼 - 고정 위치 */} {isOwner && ( - + } variant="orange"> 폼 만들기 diff --git a/src/app/(pages)/albaTalk/page.tsx b/src/app/(pages)/albaTalk/page.tsx index 214a460c..8b2cdd11 100644 --- a/src/app/(pages)/albaTalk/page.tsx +++ b/src/app/(pages)/albaTalk/page.tsx @@ -69,7 +69,7 @@ export default function AlbaTalk() { return (
{/* 검색 섹션과 정렬 옵션을 고정 위치로 설정 */} -
+
{/* 검색 섹션 */}
@@ -93,7 +93,7 @@ export default function AlbaTalk() {
{/* 글쓰기 버튼 - 고정 위치 수정 */} {user && ( - + } variant="orange" /> )} diff --git a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx index 6d37adb9..36c9e1b6 100644 --- a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx @@ -83,16 +83,16 @@ export default function ApplicantPage() { return (
{/* 검색 섹션과 필터를 고정 위치로 설정 */} -
+
{/* 검색 섹션 */} -
+
{/* 필터 섹션 */} -
+
diff --git a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx index 3275b37a..8c567057 100644 --- a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx @@ -153,7 +153,7 @@ export default function AlbaList() { return (
{/* 검색 섹션과 필터 드롭다운을 고정 위치로 설정 */} -
+
{/* 검색 섹션 */}
diff --git a/src/app/components/layout/Header.tsx b/src/app/components/layout/Header.tsx index 631d346c..e9c200d6 100644 --- a/src/app/components/layout/Header.tsx +++ b/src/app/components/layout/Header.tsx @@ -36,7 +36,7 @@ export default function Header() { const headerStyle = "fixed left-0 right-0 top-0 z-40 border-b border-b-line-100 bg-lime-100 -tracking-widest md:tracking-normal"; const navStyle = - "mx-auto flex h-16 min-w-[327px] items-center justify-between px-6 md:max-w-[600px] lg:max-w-[1480px]"; + "mx-auto flex h-16 min-w-[327px] items-center justify-between px-6 md:max-w-[920px] lg:max-w-[1480px]"; const menuStyle = "ml-4 flex h-16 items-center gap-4 md:ml-8 md:gap-6 lg:ml-[46px]"; const buttonStyle = "rounded-lg border-2 px-2 py-1 text-sm md:px-3 md:py-1.5 md:text-base lg:px-4 lg:py-2"; const skeletonStyle = "w-16 animate-pulse bg-lime-200"; diff --git a/src/app/stories/design-system/pages/albaList/page.tsx b/src/app/stories/design-system/pages/albaList/page.tsx index 25f303b7..8337dd0a 100644 --- a/src/app/stories/design-system/pages/albaList/page.tsx +++ b/src/app/stories/design-system/pages/albaList/page.tsx @@ -77,7 +77,7 @@ const AlbaList: React.FC = () => {
{/* 검색 섹션과 필터 드롭다운을 고정 위치로 설 */} -
+
{/* 검색 섹션 */}
From 67cb6c6beb7b06055f64fae1d16a5a91892cc943 Mon Sep 17 00:00:00 2001 From: hongggy Date: Sat, 14 Dec 2024 14:01:49 +0900 Subject: [PATCH 07/15] =?UTF-8?q?fix:=20=EC=82=AC=EC=9E=A5=EB=8B=98=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EB=AA=A8=EB=8B=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modals/form/EditOwnerProfileModal.tsx | 24 +++++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/app/components/modal/modals/form/EditOwnerProfileModal.tsx b/src/app/components/modal/modals/form/EditOwnerProfileModal.tsx index 3258bdfe..556f5897 100644 --- a/src/app/components/modal/modals/form/EditOwnerProfileModal.tsx +++ b/src/app/components/modal/modals/form/EditOwnerProfileModal.tsx @@ -131,18 +131,16 @@ const EditOwnerProfileModal = ({ isOpen, onClose, className }: EditOwnerProfileM return (
-
-

사장님 정보 관리

-
- -
-
-
-
+

사장님 정보 관리

+ + +
+
+
-
-
+
+
-
From 80ecf563848733b43a223010c273db41865bbbd6 Mon Sep 17 00:00:00 2001 From: hongggy Date: Sat, 14 Dec 2024 14:20:31 +0900 Subject: [PATCH 08/15] =?UTF-8?q?chore:=20=EB=A0=88=EC=9D=B4=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/(pages)/(albaform)/layout.tsx | 2 +- src/app/(pages)/albaList/page.tsx | 4 ++-- src/app/(pages)/albaTalk/page.tsx | 4 ++-- src/app/(pages)/albaform-support-detail/layout.tsx | 2 +- src/app/(pages)/myAlbaform/(role)/applicant/page.tsx | 4 ++-- src/app/(pages)/myAlbaform/(role)/owner/page.tsx | 4 ++-- src/app/(pages)/mypage/components/FilterBar/index.tsx | 2 +- src/app/(pages)/mypage/components/sections/ScrapsSection.tsx | 2 +- src/app/(pages)/mypage/layout.tsx | 2 +- src/app/components/layout/Header.tsx | 3 +-- src/app/layout.tsx | 2 +- src/app/stories/design-system/pages/albaList/page.tsx | 4 ++-- 12 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/app/(pages)/(albaform)/layout.tsx b/src/app/(pages)/(albaform)/layout.tsx index fb541e0a..fc018f1f 100644 --- a/src/app/(pages)/(albaform)/layout.tsx +++ b/src/app/(pages)/(albaform)/layout.tsx @@ -25,7 +25,7 @@ export default function Layout({ children }: { children: ReactNode }) { ); // 상세 페이지 레이아웃 - const DetailStyle = "mx-auto max-w-screen-2xl px-4 py-4 sm:px-6 md:py-8"; + const DetailStyle = "mx-auto max-w-screen-xl px-4 py-4 sm:px-6 md:py-8"; return (
diff --git a/src/app/(pages)/albaList/page.tsx b/src/app/(pages)/albaList/page.tsx index 1c2135ba..1f7ea4aa 100644 --- a/src/app/(pages)/albaList/page.tsx +++ b/src/app/(pages)/albaList/page.tsx @@ -106,7 +106,7 @@ export default function AlbaList() {
{/* 검색 섹션 */}
-
+
@@ -115,7 +115,7 @@ export default function AlbaList() { {/* 필터 드롭다운 섹션 */}
-
+
option.label)} initialValue={getInitialRecruitingValue(isRecruiting)} diff --git a/src/app/(pages)/albaTalk/page.tsx b/src/app/(pages)/albaTalk/page.tsx index 8b2cdd11..15f93ca0 100644 --- a/src/app/(pages)/albaTalk/page.tsx +++ b/src/app/(pages)/albaTalk/page.tsx @@ -72,7 +72,7 @@ export default function AlbaTalk() {
{/* 검색 섹션 */}
-
+
@@ -81,7 +81,7 @@ export default function AlbaTalk() { {/* 정렬 옵션 섹션 */}
-
+
diff --git a/src/app/(pages)/albaform-support-detail/layout.tsx b/src/app/(pages)/albaform-support-detail/layout.tsx index de4fc447..ab630b7f 100644 --- a/src/app/(pages)/albaform-support-detail/layout.tsx +++ b/src/app/(pages)/albaform-support-detail/layout.tsx @@ -3,7 +3,7 @@ import React, { Suspense } from "react"; export default function AlbaFormDetailLayout({ children }: { children: React.ReactNode }) { return ( -
+
diff --git a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx index 36c9e1b6..06ddb049 100644 --- a/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/applicant/page.tsx @@ -86,14 +86,14 @@ export default function ApplicantPage() {
{/* 검색 섹션 */}
-
+
{/* 필터 섹션 */}
-
+
diff --git a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx index 8c567057..0f5f15f8 100644 --- a/src/app/(pages)/myAlbaform/(role)/owner/page.tsx +++ b/src/app/(pages)/myAlbaform/(role)/owner/page.tsx @@ -156,7 +156,7 @@ export default function AlbaList() {
{/* 검색 섹션 */}
-
+
@@ -165,7 +165,7 @@ export default function AlbaList() { {/* 필터 드롭다운 섹션 */}
-
+
option.label)} diff --git a/src/app/(pages)/mypage/components/FilterBar/index.tsx b/src/app/(pages)/mypage/components/FilterBar/index.tsx index 87f66c0c..13e0bd74 100644 --- a/src/app/(pages)/mypage/components/FilterBar/index.tsx +++ b/src/app/(pages)/mypage/components/FilterBar/index.tsx @@ -69,7 +69,7 @@ export default function FilterBar() { {/* 탭 메뉴 섹션 */}