From f1bd76fc2b1845fd1808833011b5d632a2f427db Mon Sep 17 00:00:00 2001 From: toris Date: Fri, 21 Feb 2025 00:47:26 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=92=84=20=C2=A0[Style]=20:=20=20?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A1=A4=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/globals.css | 56 +++++++++++++++++++++++++++++++++++++ src/components/Provider.tsx | 2 +- 2 files changed, 57 insertions(+), 1 deletion(-) diff --git a/src/app/globals.css b/src/app/globals.css index 045b707..c05fbd3 100644 --- a/src/app/globals.css +++ b/src/app/globals.css @@ -9,3 +9,59 @@ font-weight: normal; font-style: normal; } + +:root { + --scrollbar-width: 16px; + --scrollbar-track-color: #e8f5e9; + --scrollbar-thumb-color: #4caf50; + --scrollbar-thumb-hover-color: #45a049; +} + +html { + scroll-behavior: smooth; +} + +/* Webkit-based browsers (Chrome, Safari, etc.) */ +::-webkit-scrollbar { + width: var(--scrollbar-width); +} + +::-webkit-scrollbar-track { + background: var(--scrollbar-track-color); + border-radius: var(--scrollbar-width); +} + +::-webkit-scrollbar-thumb { + background: var(--scrollbar-thumb-color); + border-radius: var(--scrollbar-width); + border: 4px solid var(--scrollbar-track-color); +} + +::-webkit-scrollbar-thumb:hover { + background: var(--scrollbar-thumb-hover-color); +} + +/* For Internet Explorer and Edge */ +body { + -ms-overflow-style: none; +} + +/* Hide scrollbar for Chrome, Safari and Opera */ +.hide-scrollbar::-webkit-scrollbar { + display: none; +} + +/* Hide scrollbar for IE, Edge and Firefox */ +.hide-scrollbar { + -ms-overflow-style: none; + scrollbar-width: none; +} + +/* Dark mode styles */ +@media (prefers-color-scheme: dark) { + :root { + --scrollbar-track-color: #1c2a1c; + --scrollbar-thumb-color: #2e7d32; + --scrollbar-thumb-hover-color: #388e3c; + } +} diff --git a/src/components/Provider.tsx b/src/components/Provider.tsx index 02dab3a..c433288 100644 --- a/src/components/Provider.tsx +++ b/src/components/Provider.tsx @@ -37,7 +37,7 @@ export const NextProvider = ({ children }: Props) => { }; export const NextLayout = ({ children }: Props) => { return ( -
+
{children}
From f0891552d05b8abec1ecb021fe6676b570a88ecd Mon Sep 17 00:00:00 2001 From: toris Date: Sat, 1 Mar 2025 10:19:27 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[Chore]:=20cloud=20front=20=EC=A3=BC?= =?UTF-8?q?=EC=9E=85=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/loading.tsx | 5 +++++ src/utils/next-auth.ts | 9 +++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 src/app/loading.tsx diff --git a/src/app/loading.tsx b/src/app/loading.tsx new file mode 100644 index 0000000..5989692 --- /dev/null +++ b/src/app/loading.tsx @@ -0,0 +1,5 @@ +import { FullPageLoader } from '@/components/Loader'; + +export default function Loading() { + return ; +} diff --git a/src/utils/next-auth.ts b/src/utils/next-auth.ts index 51740ff..7c81fad 100644 --- a/src/utils/next-auth.ts +++ b/src/utils/next-auth.ts @@ -84,10 +84,14 @@ export const authOptions: NextAuthOptions = { callbacks: { async signIn({ user, account, profile, credentials, email }) { + const baseURL = + process.env.NODE_ENV === 'development' + ? process.env.SERVER_URL + : process.env.CLOUD_FRONT_URL; const cookieStore = cookies(); if (account?.provider === 'google') { const res = await fetch( - `${process.env.SERVER_URL}/members/google-login?token=${account.access_token}`, + `${baseURL}/members/google-login?token=${account.access_token}`, { method: 'GET' } @@ -112,9 +116,10 @@ export const authOptions: NextAuthOptions = { user.refreshToken = refreshToken!; return true; } + if (account?.provider === 'kakao') { const res = await fetch( - `${process.env.SERVER_URL}/members/kakao-login?token=${account.access_token}`, + `${baseURL}/members/kakao-login?token=${account.access_token}`, { method: 'GET' }