Merge branch 'dev' of https://github.com/boostcampwm-2024/web16-JuGa …

…into dev
boostcampwm-2024 · Dec 4, 2024 · 955aa50 · 955aa50
2 parents 7f55d61 + 8fefde2
commit 955aa50
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 32 deletions.
diff --git a/BE/src/common/redis/redis.domain-service.ts b/BE/src/common/redis/redis.domain-service.ts
@@ -77,9 +77,9 @@ export class RedisDomainService implements OnModuleInit {
     await this.subscriber.subscribe(channel);
   }
 
-  on(callback: (message: string) => void) {
-    this.subscriber.on('message', (message) => {
-      callback(message);
+  on(callback: (channel: string, message: string) => void) {
+    this.subscriber.on('message', (channel, message) => {
+      callback(channel, message);
     });
   }
 

diff --git a/BE/src/common/websocket/base-socket.domain-service.ts b/BE/src/common/websocket/base-socket.domain-service.ts
@@ -83,7 +83,7 @@ export class BaseSocketDomainService implements OnModuleInit {
       }, 60000);
     };
 
-    this.redisDomainService.on((message) => {
+    this.redisDomainService.on((channel, message) => {
       const dataList = message.split('^');
       this.socketDataHandlers.H0STCNT0(dataList);
     });

diff --git a/FE/index.html b/FE/index.html
@@ -2,6 +2,31 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
+    <meta
+      name='description'
+      content='실시간 주식 데이터를 활용한 모의투자 경험을 통해 주식 투자에 대해 배울 수 있는 서비스.'
+    />
+    <meta
+      property='og:description'
+      content='실시간 주식 데이터를 활용한 모의투자 경험을 통해 주식 투자에 대해 배울 수 있는 서비스.'
+    />
+    <meta property='og:title' content='JuGa' />
+    <meta property='og:url' content='https://juga.kro.kr' />
+    <meta property='og:type' content='website' />
+    <meta property='og:image:type' content='image/webp' />
+    <meta property='og:site_name' content='JuGa' />
+    <meta property='og:image:width' content='600' />
+    <meta property='og:image:height' content='640' />
+    <meta
+      property='og:image'
+      content='https://juga.kro.kr/assets/logo-BUoSezEL.webp'
+    />
+    <meta property='og:image:alt' content='JuGa Logo' />
+    <meta
+      name='keywords'
+      content='JuGa, 주식, PC, 모의투자, Web Trading Simulation System'
+    />
+    <title>JuGa</title>
     <link rel="icon" href="src/assets/favicon.ico" type="image/x-icon" />
     <link
       rel="stylesheet"

diff --git a/FE/src/App.tsx b/FE/src/App.tsx
@@ -14,7 +14,6 @@ import MyPage from 'page/MyPage';
 import Rank from 'page/Rank.tsx';
 import { ToastContainer } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
-import { Helmet } from 'react-helmet-async';
 import { Suspense } from 'react';
 import { RankingSkeleton } from './components/Rank/RankingSkeleton.tsx';
 
@@ -45,25 +44,6 @@ export default App;
 function Layout() {
   return (
     <>
-      <Helmet>
-        <meta charSet='utf-8' />
-        <meta
-          name='description'
-          content='실시간 주식 데이터를 활용한 모의투자 경험을 통해 주식 투자에 대해 배울 수 있는 서비스.'
-        />
-        <meta property='og:title' content='JuGa' />
-        <meta property='og:url' content='https://juga.kro.kr/' />
-        <meta
-          property='og:image'
-          content='https://juga.kro.kr/assets/logo-BUoSezEL.webp'
-        />
-        <meta property='og:image:alt' content='JuGa Logo' />
-        <meta
-          property='og:description'
-          content='실시간 주식 데이터를 활용한 모의투자 경험을 통해 주식 투자에 대해 배울 수 있는 서비스.'
-        />
-        <title>JuGa</title>
-      </Helmet>
       <Header />
       <main className='mt-[60px] flex flex-col gap-4'>
         <Outlet />

diff --git a/FE/src/assets/favicon.ico b/FE/src/assets/favicon.ico
diff --git a/FE/src/components/Header.tsx b/FE/src/components/Header.tsx
@@ -63,33 +63,35 @@ export default function Header() {
           <nav className='flex items-center gap-6 text-sm font-bold text-juga-grayscale-500'>
             <div
               onClick={() => handleLink('/')}
-              className='px-1 py-2 cursor-pointer'
+              className='cursor-pointer px-1 py-2'
             >
               홈
             </div>
             <div
               onClick={() => handleLink('/rank')}
-              className='px-1 py-2 cursor-pointer'
+              className='cursor-pointer px-1 py-2'
             >
               랭킹
             </div>
             {isLogin && (
               <div
                 onClick={() => handleLink('/mypage')}
-                className='px-1 py-2 cursor-pointer'
+                className='cursor-pointer px-1 py-2'
               >
                 마이페이지
               </div>
             )}
           </nav>
           <div className='relative'>
-            <input
-              type='text'
-              placeholder='Search...'
+            <button
               defaultValue={searchInput}
-              className='h-[36px] w-[280px] rounded-lg bg-juga-grayscale-50 px-4 py-2'
+              className='flex h-[36px] w-[280px] items-center rounded-lg bg-juga-grayscale-50 px-4 py-2'
               onClick={toggleSearchModal}
-            />
+            >
+              <div className={'text-juga-grayscale-200'}>
+                {searchInput ? searchInput : 'Search...'}
+              </div>
+            </button>
           </div>
         </div>
         <div className='flex items-center gap-4'>