[Admin-v1.3.0] (#320)

* refactor : nextimage로 변경 (#314) * admin(1.1.1) : 폰트 최적화 * refactor : nextimage로 변경 * refactor : 랜딩 섹션 레이지로딩 * fix : 포스터 준비중 * fix : eventLink fallback image * fix : eventLink fallback image * fix : 상세페이지 이미지 fallback * refactor : 롤백? * refactor : 지마켓산즈 다이나믹 서브셋 * feat : 메인 페이지 스켈레톤 * Update README.md * chore : next image 캐시 하루로 올림 * fix : qr코드 여러개일때 색상 초기화 안되는 문제 * feat : 랜딩페이지 리뉴얼 (#315) * feat : 랜딩페이지 리뉴얼 title * feat : 헤더 색상 컨텍스트 관리 * feat: 랜딩페이지 리뉴얼 --------- Co-authored-by: 9yujin <9yujin@toss.im> * feat: 도커파일 수정 (#316) * feat : 랜딩페이지 리뉴얼 title * feat : 헤더 색상 컨텍스트 관리 * feat: 랜딩페이지 리뉴얼 * feat: 도커파일 수정 --------- Co-authored-by: 9yujin <9yujin@toss.im> * feat : yarn set version berry * feat: yarn 3.3.0 도커에 설치 * feat: yarn 3.3.0 도커에서 업데이트 * fix : 버튼 색깔 * feat : 모바일 상단바 디자인 개선 (#317) Co-authored-by: 9yujin <9yujin@toss.im> * ci : 도커파일 버전 18로 올림 (#318) Co-authored-by: 9yujin <9yujin@toss.im> * fix : build error * fix : build error * fix : build error(admin immutable) * fix : build error * fix : build error * fix : build error * feat : 구글애즈 메타태그 --------- Co-authored-by: 9yujin <9yujin@toss.im>
Gosrock · Nov 10, 2024 · 3373286 · 3373286
1 parent b6e897e
commit 3373286
Show file tree

Hide file tree

Showing 80 changed files with 3,173 additions and 421 deletions.
diff --git a/Dockerfile.admin b/Dockerfile.admin
@@ -1,4 +1,4 @@
-FROM node:16 AS builder
+FROM node:18-alpine AS builder
 # set working directory
 WORKDIR /app
 # install app dependencies
@@ -8,8 +8,9 @@ COPY package.json ./
 COPY yarn.lock ./
 # Installs all node packages
 # RUN npm ci 
-RUN npm install yarn --global --force
-RUN yarn install --immutable --immutable-cache --check-cache
+RUN yarn set version 3.3.0
+RUN yarn install 
+# --immutable --immutable-cache --check-cache
 
 
 # Copies everything over to Docker environment

diff --git a/Dockerfile.ticket b/Dockerfile.ticket
@@ -1,4 +1,4 @@
-FROM node:16-alpine AS builder
+FROM node:18-alpine AS builder
 # set working directory
 WORKDIR /app
 # install app dependencies
@@ -8,8 +8,7 @@ COPY package.json ./
 COPY yarn.lock ./
 # Installs all node packages
 # RUN npm ci 
-RUN npm install yarn --global --force
-RUN yarn install --immutable --immutable-cache --check-cache
+RUN yarn set version 3.3.0
 
 
 # Copies everything over to Docker environment
@@ -35,4 +34,4 @@ RUN rm -rf apps/ticket/.next/cache
 # COPY --from=builder /app/build /usr/share/nginx/html/
 # Containers run nginx with global directives and daemon off
 EXPOSE 3000
-CMD ["yarn", "ticket:start"]
+CMD ["yarn", "ticket:start"]
diff --git a/README.md b/README.md
@@ -108,7 +108,7 @@ yarn admin
 - [프론트엔드 모노레포 구축 삽질기 (3) - CICD 배포, Docker, Github Actions](https://9yujin.tistory.com/102?category=1013884)
 - [서버 사이드 렌더링(SSR)과 cookie 로그인 정보 다루기](https://www.9yujin.site/devlog/frontend/ssr-230122)
 - [선언적인 코드 작성하기](https://9yujin.tistory.com/109)
-
+-[웹 성능 최적화](https://9yujin.tistory.com/116)
 
 <br/><br/>
 

diff --git a/apps/admin/index.html b/apps/admin/index.html
@@ -6,10 +6,17 @@
     <link
       rel="stylesheet preconnect"
       crossorigin
-      href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard-dynamic-subset.css"
+      href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard.css"
+    />
+    <link
+      rel="stylesheet"
+      type="text/css"
+      crossorigin="anonymous"
+      href="https://cdn.jsdelivr.net/gh/leetaewook/gmarket-sans-dynamic-subset/GmarketSans.css"
     />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta name="theme-color" content="#F8F8FA" />
+    <meta name="google-adsense-account" content="ca-pub-6683895022461371" />
     <title>두둥! - 어드민</title>
   </head>
   <body>

diff --git a/apps/admin/src/components/shared/overlay/GlobalOverlay.tsx b/apps/admin/src/components/shared/overlay/GlobalOverlay.tsx
@@ -1,8 +1,8 @@
 import { Modal } from '@dudoong/ui';
 import useGlobalOverlay from '@lib/hooks/useGlobalOverlay';
 import { overlayState } from '@store/globalOverlay';
-import { ReactNode } from 'react';
 import { useRecoilValue } from 'recoil';
+
 import Approve from './content/Approve';
 import DeleteEvent from './content/DeleteEvent';
 import Invitation from './content/Invitation';

diff --git a/apps/ticket/next.config.js b/apps/ticket/next.config.js
@@ -2,42 +2,49 @@
 // eslint-disable-next-line no-undef
 const withInterceptStdout = require('next-intercept-stdout');
 
+const withBundleAnalyzer = require('@next/bundle-analyzer')({
+  enabled: process.env.ANALYZE === 'true',
+});
+
 const withTM = require('next-transpile-modules')([
   '@dudoong/ui',
   '@dudoong/utils',
   'date-fns',
 ]);
 
-module.exports = withInterceptStdout(
-  withTM({
-    // Any additional config for next goes in here
-    swcMinify: true,
-    webpack: (config, options) => {
-      config.module.rules.push({
-        test: /\.svg$/,
-        use: [
-          options.defaultLoaders.babel,
-          {
-            loader: '@svgr/webpack',
-            options: { babel: false },
-          },
-        ],
-      });
-      return config;
-    },
-    images: {
-      domains: ['asset.dudoong.com'],
-    },
-    rewrites: async () => [
-      {
-        source: '/meta/term',
-        destination: '/term.html',
+module.exports = withBundleAnalyzer(
+  withInterceptStdout(
+    withTM({
+      // Any additional config for next goes in here
+      swcMinify: true,
+      webpack: (config, options) => {
+        config.module.rules.push({
+          test: /\.svg$/,
+          use: [
+            options.defaultLoaders.babel,
+            {
+              loader: '@svgr/webpack',
+              options: { babel: false },
+            },
+          ],
+        });
+        return config;
       },
-      {
-        source: '/meta/privacy',
-        destination: '/privacy.html',
+      images: {
+        domains: ['asset.dudoong.com'],
+        minimumCacheTTL: 5184000,
       },
-    ],
-  }),
-  (text) => (text.includes('Duplicate atom key') ? '' : text),
+      rewrites: async () => [
+        {
+          source: '/meta/term',
+          destination: '/term.html',
+        },
+        {
+          source: '/meta/privacy',
+          destination: '/privacy.html',
+        },
+      ],
+    }),
+    (text) => (text.includes('Duplicate atom key') ? '' : text),
+  ),
 );
diff --git a/apps/ticket/package.json b/apps/ticket/package.json
@@ -15,6 +15,7 @@
     "@emotion/styled": "^11.10.5",
     "@next/font": "13.0.7",
     "@toast-ui/react-editor": "^3.2.2",
+    "@toss/impression-area": "^1.3.1",
     "@tosspayments/payment-widget-sdk": "^0.5.2",
     "@types/node": "18.11.16",
     "@types/react": "18.0.26",
@@ -30,6 +31,7 @@
     "react-dom": "18.2.0",
     "react-spring-bottom-sheet": "^3.4.1",
     "recoil": "^0.7.6",
+    "sharp": "^0.32.1",
     "swiper": "^9.0.5",
     "typescript": "4.9.4"
   },

diff --git a/apps/ticket/pages/_app.tsx b/apps/ticket/pages/_app.tsx
@@ -10,7 +10,8 @@ import type { AppProps, AppContext } from 'next/app';
 import { useEffect, useState } from 'react';
 import { MutableSnapshot, RecoilRoot } from 'recoil';
 import 'react-spring-bottom-sheet/dist/style.css';
-import GlobalOverlay from '@components/shared/overlay/GlobalOverlay';
+import dynamic from 'next/dynamic';
+//import GlobalOverlay from '@components/shared/overlay/GlobalOverlay';
 import { OauthLoginResponse } from '@dudoong/utils';
 import { authState } from '@store/auth';
 import { setCredentials } from '@lib/utils/setCredentials';
@@ -22,6 +23,11 @@ import { axiosPrivate } from '@lib/apis/axios';
 import Script from 'next/script';
 import { GA_TRACKING_ID } from '@lib/utils/gtag';
 
+const GlobalOverlay = dynamic(
+  () => import('@components/shared/overlay/GlobalOverlay'),
+  { ssr: false },
+);
+
 interface MyAppProps extends AppProps {
   loginData: OauthLoginResponse | null;
 }
@@ -52,6 +58,10 @@ function MyApp({ Component, pageProps, loginData }: MyAppProps) {
           name="viewport"
           content="initial-scale=1.0,user-scalable=no,maximum-scale=1,width=device-width"
         />
+        <meta
+          name="google-adsense-account"
+          content="ca-pub-6683895022461371"
+        ></meta>
       </Head>
       {/* Global Site Tag (gtag.js) - Google Analytics */}
       <Script

diff --git a/apps/ticket/pages/_document.tsx b/apps/ticket/pages/_document.tsx
@@ -17,9 +17,16 @@ export default function Document() {
         ></link> */}
         <link
           rel="stylesheet preconnect"
+          type="text/css"
           crossOrigin="anonymous"
           href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.6/dist/web/static/pretendard-dynamic-subset.css"
         />
+        <link
+          rel="stylesheet"
+          type="text/css"
+          crossOrigin="anonymous"
+          href="https://cdn.jsdelivr.net/gh/leetaewook/gmarket-sans-dynamic-subset/GmarketSans.css"
+        />
         <script
           type="text/javascript"
           src="//dapi.kakao.com/v2/maps/sdk.js?appkey=9c08b495df2ecbc09bd453fb53701551&libraries=services,clusterer"

diff --git a/apps/ticket/public/no-poster.png b/apps/ticket/public/no-poster.png
diff --git a/apps/ticket/src/assets/landing-renewal/feature-mobile.svg b/apps/ticket/src/assets/landing-renewal/feature-mobile.svg
diff --git a/apps/ticket/src/assets/landing-renewal/feature-pc.svg b/apps/ticket/src/assets/landing-renewal/feature-pc.svg
diff --git a/apps/ticket/src/assets/landing-renewal/intro-title-mobile.svg b/apps/ticket/src/assets/landing-renewal/intro-title-mobile.svg