From 3c4e3de3776a847bac752739ff2d8041589cf4cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=ED=95=9C=EA=B7=9C=EC=A7=84?=
<55226431+9yujin@users.noreply.github.com>
Date: Sun, 10 Nov 2024 23:30:25 +0900
Subject: [PATCH] =?UTF-8?q?[Ticket-v1.3.0]=20=EC=83=81=EB=8B=A8=EB=B0=94?=
=?UTF-8?q?=20=EB=94=94=EC=9E=90=EC=9D=B8=20=EA=B0=9C=EC=84=A0,=20g=20ads?=
=?UTF-8?q?=20(#319)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* 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>
---
Dockerfile.admin | 7 +-
Dockerfile.ticket | 2 +-
apps/admin/index.html | 1 +
apps/ticket/next.config.js | 2 +-
apps/ticket/package.json | 1 +
apps/ticket/pages/_app.tsx | 4 +
.../home/Landing/ImpressionStartSetHeader.tsx | 18 ----
.../home/Landing/feature/Feature.PC.tsx | 5 +-
.../src/components/home/Landing/index.tsx | 52 +++-------
.../home/Landing/special/Special.Mobile.tsx | 5 +-
.../home/Landing/special/Special.PC.tsx | 5 +-
.../home/Landing/title/Title.Mobile.tsx | 13 ++-
.../components/shared/Layout/HeaderLayout.tsx | 30 ++----
.../shared/Layout/HeaderProfileElement.tsx | 22 +----
.../components/shared/Layout/MobileHeader.tsx | 99 ++++++++++++-------
.../src/components/shared/Layout/index.tsx | 7 +-
.../src/components/shared/Shortcuts.tsx | 2 +-
shared/ui/src/components/Header/index.tsx | 18 +---
.../Header/useHeaderColorContext.tsx | 40 --------
shared/utils/src/hooks/index.ts | 1 +
shared/utils/src/hooks/useScrollEffect.ts | 25 +++++
yarn.lock | 1 +
22 files changed, 149 insertions(+), 211 deletions(-)
delete mode 100644 apps/ticket/src/components/home/Landing/ImpressionStartSetHeader.tsx
delete mode 100644 shared/ui/src/components/Header/useHeaderColorContext.tsx
create mode 100644 shared/utils/src/hooks/useScrollEffect.ts
diff --git a/Dockerfile.admin b/Dockerfile.admin
index 805813fe..b7255f1d 100644
--- 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
index 922403d6..449bb478 100644
--- 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
diff --git a/apps/admin/index.html b/apps/admin/index.html
index f10f2927..3246b9d1 100644
--- a/apps/admin/index.html
+++ b/apps/admin/index.html
@@ -16,6 +16,7 @@
/>
+
두둥! - 어드민
diff --git a/apps/ticket/next.config.js b/apps/ticket/next.config.js
index 66ec609c..3f19e3ed 100644
--- a/apps/ticket/next.config.js
+++ b/apps/ticket/next.config.js
@@ -32,7 +32,7 @@ module.exports = withBundleAnalyzer(
},
images: {
domains: ['asset.dudoong.com'],
- minimumCacheTTL: 86400,
+ minimumCacheTTL: 5184000,
},
rewrites: async () => [
{
diff --git a/apps/ticket/package.json b/apps/ticket/package.json
index 7ae3a300..82b2abfe 100644
--- a/apps/ticket/package.json
+++ b/apps/ticket/package.json
@@ -31,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
index 2209e955..bf404a3c 100644
--- a/apps/ticket/pages/_app.tsx
+++ b/apps/ticket/pages/_app.tsx
@@ -58,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"
/>
+
{/* Global Site Tag (gtag.js) - Google Analytics */}