Merge branch 'develop' of https://github.com/MaeumgaGym/MaeumGaGym_Fr…

…ontend into feature/#34-auth

package.json

@@ -9,7 +9,9 @@
   ],
   "scripts": {
     "build": "turbo run build",
-    "build:user": "yarn workspace @service/user build"
+    "build:user": "yarn workspace @service/user build",
+    "build:main": "yarn workspace @service/main build",
+    "build:admin": "yarn workspace @service/admin build"
   },
   "devDependencies": {
     "prettier": "^3.2.2",

packages/ui/components/Footer.tsx

@@ -1,3 +1,5 @@
+import Link from 'next/link'
+
 export const Footer = () => {
   return (
     <footer className="transition-all w-full lg:h-[360px] h-[440px] bg-gray800 lg:px-[360px] md:px-[120px] sm:px-[40px] py-[48px] flex flex-col justify-between">
@@ -19,7 +21,7 @@ export const Footer = () => {
         <div className="flex flex-col gap-[18px]">
           <ul className="flex items-center gap-2 text-labelSmall text-gray300 [&_li]:flex [&_li]:items-center [&_li]:gap-2 [&_li]:after:content-[''] [&_li]:after:inline-block [&_li]:after:h-[16px] [&_li]:after:w-[1px] [&_li]:after:rounded-full [&_li]:after:bg-gray300 [&_li:last-child]:after:hidden">
             <li className="text-[20px] font-bold text-gray100 leading-6">마음가짐</li>
-            <li className="cursor-pointer">개인정보처리방침</li>
+            <li className="cursor-pointer"><Link href="/privacy">개인정보처리방침</Link></li>
             <li className="cursor-pointer">이용약관</li>
           </ul>
           <p className="text-bodySmall text-gray500">

packages/ui/components/Header.tsx

@@ -16,7 +16,7 @@ export const Header = () => {
   }, [pathName])
 
   return (
-    <header className="transition-all flex w-full h-[60px] items-center justify-between lg:px-[170px] md:px-[64px] sm:px-[20px] bg-white dark:bg-gray900 border-b border-gray100 fixed z-10">
+    <header className="transition-all flex w-full h-[60px] items-center justify-between lg:px-[170px] md:px-[64px] sm:px-[20px] bg-white dark:bg-gray900 border-b border-gray100 fixed z-50">
       <div className="flex items-center gap-8">
         <div className="flex items-center gap-[2px] cursor-pointer" onClick={() => router.push('/')}>
           <Image src={HeaderLogo} alt="logo image" width={42} height={42} priority />

service/admin/src/app/privacy/page.tsx

@@ -0,0 +1,12 @@
+import PrivacySection from "./PrivacySection"
+
+
+const PrivacyPage = () => {
+    return (
+        <div className="w-full h-full flex justify-center px-2.5 py-20">
+            <PrivacySection />
+        </div>
+    )
+}
+
+export default PrivacyPage

service/main/src/app/privacy/page.tsx

@@ -0,0 +1,12 @@
+import PrivacySection from "./PrivacySection"
+
+
+const PrivacyPage = () => {
+    return (
+        <div className="w-full h-full flex justify-center px-2.5 py-20">
+            <PrivacySection />
+        </div>
+    )
+}
+
+export default PrivacyPage

service/user/src/app/privacy/page.tsx

@@ -0,0 +1,12 @@
+import PrivacySection from "./PrivacySection"
+
+
+const PrivacyPage = () => {
+    return (
+        <div className="w-full h-full flex justify-center px-2.5 py-20">
+            <PrivacySection />
+        </div>
+    )
+}
+
+export default PrivacyPage

yarn.lock

@@ -2699,9 +2699,9 @@ __metadata:
   linkType: hard
 
 "ip@npm:^2.0.0":
-  version: 2.0.0
-  resolution: "ip@npm:2.0.0"
-  checksum: cfcfac6b873b701996d71ec82a7dd27ba92450afdb421e356f44044ed688df04567344c36cbacea7d01b1c39a4c732dc012570ebe9bebfb06f27314bca625349
+  version: 2.0.1
+  resolution: "ip@npm:2.0.1"
+  checksum: d765c9fd212b8a99023a4cde6a558a054c298d640fec1020567494d257afd78ca77e37126b1a3ef0e053646ced79a816bf50621d38d5e768cdde0431fa3b0d35
   languageName: node
   linkType: hard