Merge branch 'development'

Author: winverse

infrastructure/src/lib/ecsOptions.ts

@@ -2,7 +2,7 @@ import { ENV } from '../env'
 
 const serverEcsOption: EcsOption = {
   desiredCount: ENV.isProduction ? 2 : 1,
-  cpu: 512,
+  cpu: ENV.isProduction ? 1024 * 0.75 : 512,
   memory: 1024,
   maxCapacity: 12,
   minCapacity: ENV.isProduction ? 2 : 1,

packages/velog-server/src/common/plugins/global/ipaddrPlugin.ts

@@ -4,8 +4,13 @@ const ipaddrPlugin: FastifyPluginAsync = async (fastify) => {
   fastify.decorateRequest('ipaddr', null)
   fastify.addHook('preHandler', (request, reply, done) => {
     const fromCdnIp = request.headers['gcdn-client-ip']
+    const xForwardedIp = request.headers['X-Forwarded-For']
+
     const graphCdnAddress = Array.isArray(fromCdnIp) ? fromCdnIp[0] : fromCdnIp
-    const ipaddr = graphCdnAddress || request.ips?.slice(-1)[0] || request.ip
+    const xForwardedForAddress = Array.isArray(xForwardedIp) ? xForwardedIp[0] : xForwardedIp
+
+    const ipaddr =
+      xForwardedForAddress ?? graphCdnAddress ?? request.ips?.slice(-1)[0] ?? request.ip
     request.ipaddr = ipaddr
     done()
   })

packages/velog-web/src/features/home/components/FloatingHeader/FloatingHeader.tsx

@@ -21,6 +21,8 @@ function FloatingHeader({ header }: Props) {
   const [height, setHeight] = useState(0)
   const [marginTop, setMarginTop] = useState(0)
 
+  const isHome = checkIsHome(pathname)
+
   useEffect(() => {
     if (!blockRef.current) return
     setHeight(blockRef.current.clientHeight)
@@ -56,11 +58,19 @@ function FloatingHeader({ header }: Props) {
       setVisible(false)
     }
 
-    setMarginTop(Math.min(0, -1 * height + transitionPoint.current - scrollTop))
+    const marginTopMax = 0
+    const marginTopMin = isHome ? -112 : -64
+
+    const calculatedMarginTop = Math.min(
+      marginTopMax,
+      -1 * height + transitionPoint.current - scrollTop,
+    )
+
+    setMarginTop(Math.max(calculatedMarginTop, marginTopMin))
 
     direction.current = nextDirection
     prevScrollTop.current = scrollTop
-  }, [height])
+  }, [height, isHome])
 
   useEffect(() => {
     document.addEventListener('scroll', onScroll)
@@ -69,7 +79,6 @@ function FloatingHeader({ header }: Props) {
     }
   }, [onScroll])
 
-  const isHome = checkIsHome(pathname)
   return (
     <div
       className={cx('block')}