Merge pull request #371 from ssu-student-union/feat/#370_temp_data

Feat/#370 temp data
ssu-student-union · Dec 29, 2024 · 5839595 · 5839595
2 parents ac0b862 + 694397c
commit 5839595
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -51,7 +51,7 @@
     "slick-carousel": "^1.8.1",
     "sonner": "^1.4.41",
     "tailwind-merge": "^2.2.2",
-    "tailwind-scrollbar-hide": "^1.1.7",
+    "tailwind-scrollbar-hide": "^2.0.0",
     "tailwindcss-animate": "^1.0.7",
     "vaul": "^0.9.0",
     "zod": "^3.23.8"

diff --git a/src/containers/common/Header/component/HeaderSheet.tsx b/src/containers/common/Header/component/HeaderSheet.tsx
@@ -91,13 +91,13 @@ export function HeaderSheet({ trigger, state: initialState = State.Logout }: Hea
                 )}
               </div>
             ))}
-            {/*자료집 임시 제거*/}
-            {/* <div
-              onClick={() => handleLinkClick(dataPath)}
-              className={`flex h-[64px] cursor-pointer items-center border-b border-[#E5E7EB] pl-10 text-gray-800`}
-            >
-              자료집
-            </div> */}
+            {/*임시 자료집(구글 드라이브 링크)*/}
+            <div
+  onClick={() => window.open(import.meta.env.VITE_TEMP_DATA_URL, '_blank')}
+  className={`flex h-[64px] cursor-pointer items-center border-b border-[#E5E7EB] pl-10 text-gray-800`}
+>
+  자료집
+</div>
             <a
               href={`https://ssuketch60.cafe24.com/`}
               className={`flex h-[64px] cursor-pointer items-center border-b border-[#E5E7EB] pl-10 text-gray-800`}

diff --git a/src/containers/common/Header/component/Navigation.tsx b/src/containers/common/Header/component/Navigation.tsx
@@ -34,11 +34,15 @@ export function Navigation({ state = State.Onboarding }: NavigationProps) {
           </NavigationMenuItem>
         ))}
         {/*자료집 임시 제거*/}
-        {/* <NavigationMenuItem className="relative h-full min-w-fit text-[20px]">
+        <NavigationMenuItem className="relative h-full min-w-fit text-[20px]" onClick={() => window.open(import.meta.env.VITE_TEMP_DATA_URL, '_blank')}>
           <NavigationMenuTrigger isData={true} className={cn(styles.headerItemStyle)}>
-            <Link to={dataPath}>자료집</Link>
+          <p
+
+>
+  자료집
+</p>
           </NavigationMenuTrigger>
-        </NavigationMenuItem> */}
+        </NavigationMenuItem>
         <NavigationMenuItem className="relative h-full min-w-fit text-[20px]">
           <NavigationMenuTrigger isData={true} className={cn(styles.headerItemStyle)}>
             <a href={`https://ssuketch60.cafe24.com/`}>이전 홈페이지</a>

diff --git a/tailwind.config.cjs b/tailwind.config.cjs
@@ -17,6 +17,15 @@ module.exports = {
       padding: '2rem',
     },
     extend: {
+      scrollbar: {
+        hide: {
+          'scrollbar-width': 'none',
+          '-ms-overflow-style': 'none',
+          '&::-webkit-scrollbar': {
+            display: 'none',
+          },
+        },
+      },
       colors: {
         border: 'hsl(var(--border))',
         input: 'hsl(var(--input))',

diff --git a/yarn.lock b/yarn.lock
@@ -3195,7 +3195,7 @@ __metadata:
     slick-carousel: "npm:^1.8.1"
     sonner: "npm:^1.4.41"
     tailwind-merge: "npm:^2.2.2"
-    tailwind-scrollbar-hide: "npm:^1.1.7"
+    tailwind-scrollbar-hide: "npm:^2.0.0"
     tailwindcss: "npm:^3.4.3"
     tailwindcss-animate: "npm:^1.0.7"
     typescript: "npm:^5.2.2"
@@ -4934,10 +4934,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"tailwind-scrollbar-hide@npm:^1.1.7":
-  version: 1.1.7
-  resolution: "tailwind-scrollbar-hide@npm:1.1.7"
-  checksum: 10c0/1027ca724c51a43da9a9a9f730f707652bcaded6f94d82fd445e349ee19bd34d8c1312e3e075193ec89c0524d824e716a06d646ca757913f4df0f4f5faec8fe4
+"tailwind-scrollbar-hide@npm:^2.0.0":
+  version: 2.0.0
+  resolution: "tailwind-scrollbar-hide@npm:2.0.0"
+  peerDependencies:
+    tailwindcss: ">=3.0.0 || >= 4.0.0 || >= 4.0.0-beta.8 || >= 4.0.0-alpha.20"
+  checksum: 10c0/eb320b8fbb4d558fb025420fb21f291201781599b36ef5ff7be500f44daa04e41ff161a484180a180c8a6e38ac863d4f05ecaa73c1c8a58668bcc821fc2725fe
   languageName: node
   linkType: hard