Merge branch 'main' into feat-feedback-section

sopt-makers · Jul 25, 2023 · 4faae9c · 4faae9c
2 parents 0ece5eb + 3151219
commit 4faae9c
Show file tree

Hide file tree

Showing 18 changed files with 582 additions and 355 deletions.
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -19,7 +19,7 @@
     "axios": "^1.4.0",
     "clsx": "^2.0.0",
     "date-fns": "^2.30.0",
-    "framer-motion": "^10.13.0",
+    "framer-motion": "10.12.23",
     "next": "^13.4.8",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

diff --git a/apps/web/src/app/page.tsx b/apps/web/src/app/page.tsx
@@ -2,27 +2,21 @@
 
 import { ReactLenis } from '@studio-freight/react-lenis';
 
-import MakersLogo3D from '@/components/common/MakersLogo3D';
-import Archive from '@/components/mainpage/Archive';
-import CoreValue from '@/components/mainpage/CoreValue';
 import FeedbackSection from '@/components/mainpage/feedback/FeedbackSection';
-import Greeting from '@/components/mainpage/Greeting';
-import MakersIntodution from '@/components/mainpage/MakersIntodution';
-import Product from '@/components/mainpage/Product';
-import RecruitBanner from '@/components/mainpage/RecruitBanner';
+import GreetingSection from '@/components/mainpage/greeting/GreetingSection';
+import ProductSection from '@/components/mainpage/ProductSection';
+import Recruit from '@/components/mainpage/Recruit';
 
 export default function Page() {
   return (
     <ReactLenis root>
       <div>
-        <Greeting />
+        {/* <Header /> */}
+        <GreetingSection />
+        <ProductSection className='sticky top-0' />
+        {/* <CoreValue /> */}
         <FeedbackSection />
-        <MakersLogo3D />
-        <MakersIntodution />
-        <CoreValue />
-        <Product />
-        <Archive />
-        <RecruitBanner />
+        <Recruit />
       </div>
     </ReactLenis>
   );

diff --git a/apps/web/src/components/common/MakersLogo3D/index.tsx b/apps/web/src/components/common/MakersLogo3D/index.tsx
@@ -30,7 +30,7 @@ const MakersLogo3D: FC<MakersLogo3DProps> = ({ className }) => {
       const dx = clientX - elementX;
       const dy = clientY - elementY;
 
-      console.log(dx, dy);
+      // console.log(dx, dy);
 
       posX.set(dx);
       posY.set(dy);

diff --git a/apps/web/src/components/header/Header.tsx b/apps/web/src/components/header/Header.tsx
@@ -1,9 +1,14 @@
-import React from 'react';
-
 const Header = () => {
   return (
-    <header className='fixed w-full flex justify-center bg-black100 px-[2.25rem] py-[1.125rem] z-10'>
+    <header className='fixed w-full flex justify-between pl-[3.75rem] pr-[2.38rem] py-[2.5rem] z-10'>
       <MakersLogo />
+      <nav className='flex flex-col items-end gap-[0.38rem] text-16-regular'>
+        <p>OUR MISSION</p>
+        <p>SERVICE</p>
+        <p>CORE VALUE</p>
+        <p>MEMBERS</p>
+        <p>RECRUIT</p>
+      </nav>
     </header>
   );
 };
@@ -12,36 +17,32 @@ export default Header;
 
 function MakersLogo(props: React.SVGProps<SVGSVGElement>) {
   return (
-    <svg width={118} height={33} fill='none' xmlns='http://www.w3.org/2000/svg' {...props}>
+    <svg width={216} height={30} fill='none' xmlns='http://www.w3.org/2000/svg' {...props}>
       <path
-        d='M18.304 30.583V23.08c0-1.025.454-1.999 1.238-2.66L43.36.377c.95-.8 2.4-.124 2.4 1.117v7.612c.001 1.03-.455 2.006-1.244 2.666L20.702 31.703c-.95.796-2.398.12-2.398-1.12zM38.07 32.046a1.46 1.46 0 01-1.461-1.46v-6.231c0-.807.654-1.461 1.46-1.461h6.23c.808 0 1.462.654 1.462 1.46v6.231a1.46 1.46 0 01-1.461 1.461h-6.23z'
+        d='M13.523 22.643v-5.559c0-.76.335-1.482.915-1.971L32.034.256c.702-.592 1.774-.092 1.774.829v5.641a2.58 2.58 0 01-.92 1.976L15.295 23.474c-.702.59-1.772.088-1.772-.83zM28.125 23.728c-.596 0-1.08-.485-1.08-1.083v-4.617c0-.598.484-1.083 1.08-1.083h4.603c.596 0 1.08.485 1.08 1.083v4.617c0 .598-.484 1.083-1.08 1.083h-4.603z'
         fill='#fff'
       />
       <path
         fillRule='evenodd'
         clipRule='evenodd'
-        d='M.124 31.167c-.08-.18-.124-.38-.124-.59v-6.229c0-.043.002-.085.005-.127v-1.14c0-1.025.453-1.999 1.238-2.66L25.056.377c.95-.8 2.4-.124 2.4 1.117v7.612c0 1.03-.455 2.006-1.244 2.666L9.148 26.056v4.522a1.46 1.46 0 01-1.46 1.46H1.62a1.477 1.477 0 01-1.497-.87z'
-        fill='#fff'
-      />
-      <path
-        d='M58.501 13.093h-4.047a2.302 2.302 0 01-2.302-2.301v-.167c0-.092.075-.167.167-.167h1.662c.092 0 .166.075.166.167 0 .262.213.475.476.475h3.976c.44 0 .798-.357.798-.798V9.69a.637.637 0 00-.637-.637h-4.03a2.75 2.75 0 01-2.751-2.75V5.66a2.889 2.889 0 012.889-2.888h3.805a2.544 2.544 0 012.544 2.543.167.167 0 01-.167.166h-1.716a.112.112 0 01-.111-.112v-.072a.532.532 0 00-.533-.532h-3.935a.782.782 0 00-.782.782v.642c0 .481.39.87.87.87h4.122a2.424 2.424 0 012.425 2.424v.721a2.889 2.889 0 01-2.889 2.888zM115.11 31.924h-4.047a2.302 2.302 0 01-2.302-2.301v-.168c0-.091.075-.166.166-.166h1.663c.092 0 .166.074.166.166 0 .263.213.475.475.475h3.977c.44 0 .798-.357.798-.797v-.613a.638.638 0 00-.638-.637h-4.029a2.75 2.75 0 01-2.751-2.749v-.644a2.889 2.889 0 012.89-2.887h3.804a2.544 2.544 0 012.545 2.542.167.167 0 01-.167.167h-1.716a.112.112 0 01-.112-.112v-.072a.532.532 0 00-.532-.532h-3.935a.782.782 0 00-.782.782v.642c0 .48.39.87.87.87h4.122A2.425 2.425 0 01118 28.314v.721a2.889 2.889 0 01-2.889 2.888h-.001zM68.869 4.809a.93.93 0 01.928.928v4.468a.929.929 0 01-.928.928h-3.515a.929.929 0 01-.928-.928V5.737a.93.93 0 01.928-.928h3.515zm0-1.993h-3.515a2.92 2.92 0 00-2.921 2.92v4.469a2.92 2.92 0 002.92 2.92h3.516a2.92 2.92 0 002.92-2.92V5.737a2.92 2.92 0 00-2.92-2.921zM74.909 2.816h-1.458a.268.268 0 00-.268.268v14.025c0 .148.12.268.268.268h1.458c.148 0 .268-.12.268-.268V3.084a.268.268 0 00-.268-.268zM81.238 17.395h-1.474a.26.26 0 00-.26.26v14.041c0 .144.117.26.26.26h1.474a.26.26 0 00.26-.26v-14.04a.26.26 0 00-.26-.26zM107.964 21.863a.26.26 0 00-.26-.26h-3.286c-.963 0-1.397.476-1.657 1.343v-1.127a.26.26 0 00-.26-.26h-1.475a.26.26 0 00-.26.26v9.878c0 .143.116.26.26.26h1.475a.26.26 0 00.26-.26v-6.67c0-.791.641-1.431 1.432-1.431h3.51a.26.26 0 00.26-.26v-1.474h.001z'
+        d='M.091 23.077A1.082 1.082 0 010 22.64v-4.617a1.1 1.1 0 01.004-.094v-.845c0-.76.335-1.482.914-1.971L18.511.256c.702-.592 1.774-.092 1.774.829v5.641a2.58 2.58 0 01-.92 1.976L6.758 19.289v3.35a1.08 1.08 0 01-1.078 1.083H1.198c-.459.048-.92-.21-1.107-.645z'
         fill='#fff'
       />
-      <path d='M83.755 27.366v-1.994H79.59v1.994h4.164z' fill='#fff' />
       <path
-        d='M86.847 21.471h2.047c.127 0 .2.148.12.248L85.224 26.5h-2.599l3.839-4.844a.488.488 0 01.383-.185h-.001z'
+        d='M52.186 23.211h-6.392a3.642 3.642 0 01-3.637-3.646V19.3c0-.146.118-.264.263-.264h2.626c.145 0 .263.118.263.264 0 .416.335.753.75.753h6.282c.696 0 1.26-.566 1.26-1.264v-.97c0-.558-.45-1.01-1.007-1.01h-6.366a4.35 4.35 0 01-4.345-4.357v-1.02a4.57 4.57 0 014.564-4.576h6.01a4.025 4.025 0 014.02 4.03.263.263 0 01-.264.263h-2.71a.177.177 0 01-.177-.177v-.114a.842.842 0 00-.841-.843h-6.216c-.682 0-1.236.554-1.236 1.239v1.017c0 .762.617 1.379 1.375 1.379h6.511a3.836 3.836 0 013.831 3.841v1.143a4.57 4.57 0 01-4.564 4.576v.001zM209.989 23.023h-6.392a3.642 3.642 0 01-3.637-3.647v-.265c0-.145.118-.263.263-.263h2.626c.145 0 .263.118.263.263a.75.75 0 00.751.753h6.281c.696 0 1.26-.566 1.26-1.264v-.97c0-.558-.45-1.01-1.006-1.01h-6.366a4.35 4.35 0 01-4.344-4.356v-1.02a4.57 4.57 0 014.564-4.577h6.01a4.025 4.025 0 014.019 4.03.264.264 0 01-.263.263h-2.711a.178.178 0 01-.177-.177v-.114a.842.842 0 00-.841-.843h-6.216c-.682 0-1.235.555-1.235 1.239v1.017c0 .763.616 1.38 1.375 1.38h6.511a3.836 3.836 0 013.831 3.84v1.143a4.57 4.57 0 01-4.564 4.576l-.002.002zM68.564 10.083c.81 0 1.466.66 1.466 1.471v7.08a1.47 1.47 0 01-1.466 1.471h-5.553a1.47 1.47 0 01-1.466-1.47v-7.081c0-.812.659-1.47 1.466-1.47h5.553zm0-3.158h-5.553a4.62 4.62 0 00-4.614 4.629v7.08a4.62 4.62 0 004.614 4.63h5.553a4.62 4.62 0 004.614-4.63v-7.08a4.62 4.62 0 00-4.614-4.629zM78.106 6.925h-2.304a.424.424 0 00-.423.425v22.226c0 .234.19.424.423.424h2.304c.234 0 .423-.19.423-.424V7.35a.424.424 0 00-.423-.425zM156.482 0h-2.328a.412.412 0 00-.411.412v22.25c0 .228.184.413.411.413h2.328a.412.412 0 00.411-.412V.412a.412.412 0 00-.411-.412zM198.701 7.08a.41.41 0 00-.411-.412h-5.191c-1.521 0-2.206.755-2.617 2.128V7.01a.411.411 0 00-.411-.412h-2.33a.411.411 0 00-.411.412v15.653c0 .228.184.412.411.412h2.33a.411.411 0 00.411-.412v-10.57a2.264 2.264 0 012.261-2.268h5.546a.411.411 0 00.411-.411V7.078l.001.002z'
         fill='#fff'
       />
+      <path d='M160.458 15.8v-3.16h-6.577v3.16h6.577z' fill='#fff' />
       <path
-        d='M87.197 32.044h2.048a.153.153 0 00.12-.247l-4.14-5.297h-2.599l4.186 5.356a.489.489 0 00.385.188zM68.701 21.818v1.474c0 .144.116.26.26.26h6.017c.46 0 .833.372.833.832v7.313c0 .143.116.26.26.26h1.475a.26.26 0 00.26-.26v-7.972a2.173 2.173 0 00-2.168-2.166h-6.676a.26.26 0 00-.26.26v-.001zM79.836 2.86h-3.2c-.903 0-1.634.731-1.634 1.633v6.794a1.85 1.85 0 001.851 1.85h2.984a2.582 2.582 0 002.582-2.58V5.44a2.582 2.582 0 00-2.582-2.58l-.001-.001zm.63 7.248c0 .566-.459 1.025-1.025 1.025h-3.115a1.15 1.15 0 01-1.15-1.15v-3.94c0-.636.514-1.151 1.15-1.151h3.115c.566 0 1.025.458 1.025 1.024v4.193-.001zM87.496 11.1a1.216 1.216 0 01-1.217-1.216v-5.08h3.555a.26.26 0 00.26-.26V3.07a.26.26 0 00-.26-.26h-3.555V.26a.26.26 0 00-.26-.26h-1.301a.26.26 0 00-.26.26v1.954c0 .33-.268.596-.597.596h-.27a.26.26 0 00-.26.26v1.475c0 .143.115.26.26.26h.693v5.079a3.21 3.21 0 003.21 3.209h2.358a.26.26 0 00.26-.26v-1.474a.26.26 0 00-.26-.26h-2.357zM64.004 21.44h-1.766c-.876 0-1.657.409-2.161 1.045a2.627 2.627 0 00-2.1-1.045h-1.68c-.976 0-1.833.508-2.323 1.273V21.7a.26.26 0 00-.26-.26H52.24a.26.26 0 00-.26.26v9.997c0 .143.116.26.26.26h1.475a.26.26 0 00.26-.26v-7.212c0-.581.472-1.052 1.054-1.052h2.19c.604 0 1.093.488 1.093 1.091v7.172c0 .144.116.26.26.26h1.445a.26.26 0 00.26-.26v-7.21c0-.581.472-1.052 1.054-1.052h2.19c.603 0 1.092.488 1.092 1.091v7.17c0 .144.117.26.26.26h1.506a.26.26 0 00.26-.26v-7.627a2.63 2.63 0 00-2.63-2.629l-.004.001z'
+        d='M165.343 6.459h3.233c.202 0 .315.233.189.393l-5.984 7.576h-4.105l6.063-7.676a.772.772 0 01.605-.293h-.001zM165.895 23.214h3.235a.242.242 0 00.191-.391l-6.539-8.395h-4.106l6.611 8.488a.772.772 0 00.608.298zM136.678 7.008v2.336a.41.41 0 00.411.412h9.504c.727 0 1.316.59 1.316 1.32v11.587a.41.41 0 00.411.412h2.33a.411.411 0 00.411-.412V10.03a3.439 3.439 0 00-3.425-3.432H137.09a.411.411 0 00-.411.412l-.001-.002zM85.888 6.995h-5.054a2.585 2.585 0 00-2.582 2.588V20.35a2.928 2.928 0 002.925 2.932h4.712a4.085 4.085 0 004.08-4.09v-8.105a4.085 4.085 0 00-4.08-4.09zm.996 11.486c0 .897-.725 1.624-1.62 1.624h-4.92a1.82 1.82 0 01-1.818-1.823v-6.244a1.82 1.82 0 011.819-1.823h4.92c.894 0 1.62.727 1.62 1.624v6.644-.002zM97.988 20.053a1.924 1.924 0 01-1.922-1.927v-8.049h5.616a.411.411 0 00.411-.412V7.329a.411.411 0 00-.411-.412h-5.616V2.875a.41.41 0 00-.41-.412H93.6a.41.41 0 00-.411.412v3.097a.944.944 0 01-.943.945h-.427a.41.41 0 00-.41.412v2.336a.41.41 0 00.41.412h1.096v8.049a5.079 5.079 0 005.072 5.085h3.724a.411.411 0 00.411-.412v-2.336a.411.411 0 00-.411-.412h-3.724l.001.002zM129.257 6.41h-2.789a4.344 4.344 0 00-3.414 1.655 4.145 4.145 0 00-3.317-1.655h-2.652a4.348 4.348 0 00-3.671 2.016V6.821a.41.41 0 00-.411-.411h-2.33a.41.41 0 00-.411.411v15.842a.41.41 0 00.411.412h2.33a.41.41 0 00.411-.412V11.235c0-.921.745-1.668 1.665-1.668h3.459c.954 0 1.726.774 1.726 1.73V22.66c0 .228.184.412.411.412h2.283a.411.411 0 00.411-.412V11.236c0-.92.745-1.668 1.665-1.668h3.459c.953 0 1.726.775 1.726 1.73V22.66c0 .228.184.412.411.412h2.379a.411.411 0 00.411-.412V10.573a4.16 4.16 0 00-4.157-4.165l-.006.002z'
         fill='#fff'
       />
       <path
-        d='M70.14 26.082a2.095 2.095 0 00-2.096 2.095v1.685c0 1.156.938 2.095 2.096 2.095h3.268c2.104 0 2.919-1.705 2.919-3.808v-2.69l-6.187.623zm5.667 2.174c0 1.047-.666 1.722-1.713 1.722H71.08c-.576 0-1.043-.294-1.043-.869v-.319c0-.575.467-.869 1.043-.869l4.726-.483v.819zM91.57 27.994v-.979h-1.994v1.344a3.685 3.685 0 003.684 3.685h4.898a.26.26 0 00.26-.26V30.31a.26.26 0 00-.26-.26h-4.533a2.055 2.055 0 01-2.055-2.056v.001z'
+        d='M138.951 13.766a3.315 3.315 0 00-3.311 3.32v2.67a3.315 3.315 0 003.311 3.319h5.163c3.323 0 4.61-2.702 4.61-6.034V12.78l-9.773.987zm8.952 3.445c0 1.659-1.052 2.728-2.706 2.728h-4.76c-.91 0-1.648-.465-1.648-1.377v-.505c0-.912.738-1.377 1.648-1.377l7.466-.766v1.297zM172.803 16.796v-1.552h-3.15v2.13c0 3.225 2.606 5.84 5.82 5.84h7.737a.411.411 0 00.411-.413v-2.337a.411.411 0 00-.411-.412h-7.16a3.252 3.252 0 01-3.247-3.258v.002z'
         fill='#fff'
       />
       <path
-        d='M89.576 24.422v3.031h9.355a.264.264 0 00.265-.264v-2.766a2.864 2.864 0 00-2.864-2.864H92.44a2.864 2.864 0 00-2.863 2.864h-.001zm7.626 1.037h-5.447a.186.186 0 01-.186-.185V24.26c0-.39.317-.708.708-.708h4.216c.391 0 .709.317.709.708v1.2-.002z'
+        d='M169.653 11.136v4.803h14.779a.419.419 0 00.418-.42v-4.382a4.531 4.531 0 00-4.524-4.54h-6.148a4.53 4.53 0 00-4.523 4.54l-.002-.001zm12.048 1.643h-8.606a.294.294 0 01-.293-.294V10.88c0-.62.501-1.122 1.119-1.122h6.66a1.12 1.12 0 011.118 1.122v1.9l.002-.001z'
         fill='#fff'
       />
     </svg>