Skip to content

Commit 3740c19

Browse files
committed
Merge remote-tracking branch 'origin/dev' into fix/main
2 parents ca90fe3 + 52e82c3 commit 3740c19

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1238
-1195
lines changed

next.config.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
import type { NextConfig } from 'next';
22

33
const nextConfig: NextConfig = {
4+
experimental: {
5+
scrollRestoration: false,
6+
},
47
images: {
58
domains: ['team2-app-s3-bucket.s3.ap-northeast-2.amazonaws.com'],
69
remotePatterns: [
@@ -9,6 +12,7 @@ const nextConfig: NextConfig = {
912
hostname: 'www.thecocktaildb.com',
1013
},
1114
],
15+
qualities: [25, 50, 75, 90, 100],
1216
},
1317
env: {
1418
NPUBLIC_API_URL: process.env.NEXT_PUBLIC_API_URL,

public/1Stars.webp

-13.5 KB
Binary file not shown.

public/1star.webp

1.26 KB
Loading

public/2Stars.webp

-14.5 KB
Binary file not shown.

public/2star.webp

1.94 KB
Loading

public/CocktailDrop.webp

38.2 KB
Loading

public/CocktailDrop_4x.webp

-666 KB
Binary file not shown.

src/app/(no-layout)/layout.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1+
import FooterWrapper from '@/shared/components/footer/FooterWrapper';
2+
import Header from '@/shared/components/header/Header';
3+
14
function NoLayout({ children }: { children: React.ReactNode }) {
2-
return <main className="flex flex-1">{children}</main>;
5+
return (
6+
<>
7+
<Header className="bg-transparent w-full h-[44px] md:h-[60px] flex items-center justify-between px-[12px] fixed top-0 left-0 z-50 transition-transform duration-200 ease-in-ou" />
8+
<main className="flex flex-1">{children}</main>
9+
<FooterWrapper />
10+
</>
11+
);
312
}
413
export default NoLayout;

src/app/(no-layout)/page.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import FinalLanding from '@/domains/main/components/FinalLanding';
22

33
export default function Home() {
44
return (
5-
<div className="page-layout max-w-full">
5+
<div className="max-w-full flex-1">
66
<FinalLanding />
77
</div>
88
);

src/app/(with-layout)/community/[id]/page.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ export async function generateMetadata({
1414
cache: 'no-store',
1515
});
1616
const post = await res.json();
17-
console.log(post);
1817
return {
1918
title: post.title,
2019
description: post.content?.slice(0, 80),

0 commit comments

Comments
 (0)