Skip to content
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
7 changes: 7 additions & 0 deletions Docker-pinhouse-file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,13 @@ RUN npm ci
FROM base AS builder
COPY --from=deps /pinhouse-fe/node_modules ./node_modules
COPY . .

# build-args로 전달받은 환경 변수 설정 (빌드 타임에 필요)
ARG NEXT_PUBLIC_API_URL
ARG NEXT_PUBLIC_OAUTH2
ENV NEXT_PUBLIC_API_URL=$NEXT_PUBLIC_API_URL
ENV NEXT_PUBLIC_OAUTH2=$NEXT_PUBLIC_OAUTH2

RUN npm run build

# =========================
Expand Down
4 changes: 2 additions & 2 deletions src/shared/ui/animation/pageTransition.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ export const PageTransition = ({ children }: { children: ReactNode }) => {
}, [pathname, address, isEmbed]);

return (
<div className="relative h-screen w-full overflow-hidden">
<div className="no-scrollbar h-full overflow-y-auto" ref={scrollRef} onScroll={handleScroll}>
<div className="relative h-full min-h-0 w-full overflow-hidden">
<div className="no-scrollbar h-full min-h-0 overflow-y-auto" ref={scrollRef} onScroll={handleScroll}>
<AnimatePresence mode="wait">
<motion.div
key={pathname}
Expand Down
6 changes: 2 additions & 4 deletions src/shared/ui/globalRender/globalRender.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,7 @@ export const HomeLandingRender = ({ children, bottom }: Props) => {

return (
<div className="relative h-screen w-full overflow-hidden bg-[#2F6BFF]">
{/* 최대 폭 컨테이너 */}
<div className="mx-auto flex h-full max-w-[1350px] px-20 sm:justify-center md:px-20 lg:justify-between lg:px-20">
{/* LEFT TEXT */}
<section className="z-10 hidden max-w-[600px] pt-10 text-white lg:block desktop:block">
<div className="mb-48 flex items-center gap-2">
<SecondaryLogoRender />
Expand Down Expand Up @@ -59,8 +57,8 @@ export const HomeLandingRender = ({ children, bottom }: Props) => {
</div>
</section>

<section className="relative z-10 flex h-full min-h-[812px] justify-center sm:p-5 md:pb-[90px] md:pt-16 lg:pb-[90px] lg:pt-16">
<div className="relative z-10 flex min-h-0 w-[375px] flex-col bg-white shadow-2xl sm:rounded-xl sm:p-0 md:rounded-2xl lg:rounded-2xl">
<section className="relative z-10 flex h-full min-h-[812px] justify-center sm:p-5 md:pb-[90px] md:pt-16 lg:pb-[90px] lg:pt-16 [@media(max-height:700px)]:min-h-0">
<div className="relative z-10 flex min-h-0 w-full max-w-[375px] flex-col bg-white shadow-2xl sm:rounded-xl sm:p-0 md:rounded-2xl lg:rounded-2xl [@media(min-width:375px)]:w-[340px]">
<div className="pointer-events-none absolute inset-0 rounded-2xl" />

<div
Expand Down