Merge pull request #13 from cocktail-Ohzu/dev

🔨 fix(ui): 피드백 반영
cocktail-Ohzu · Aug 22, 2022 · 35cac6e · 35cac6e
2 parents b0239bb + 68f89e0
commit 35cac6e
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 109 deletions.
diff --git a/public/index.html b/public/index.html
@@ -2,17 +2,25 @@
 <html lang="ko">
   <head>
     <meta charset="utf-8" />
-    <link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
+    <link rel="icon" href="%PUBLIC_URL%/ohzu.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
     <meta
       name="description"
       content="칵테일 추천 어플리케이션 오쥬 랜딩페이지"
     />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/ohzu192.png" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
     <title>Ohzu</title>
   </head>
+  <script async src="https://www.googletagmanager.com/gtag/js?id=G-961TELXK7N"></script>
+  <script>
+    window.dataLayer = window.dataLayer || [];
+    function gtag(){dataLayer.push(arguments);}
+    gtag('js', new Date());
+
+    gtag('config', 'G-961TELXK7N');
+  </script>  
   <body>
     <div id="root"></div>
   </body>

diff --git a/public/manifest.json b/public/manifest.json
@@ -3,17 +3,17 @@
   "name": "칵테일 추천 어플리케이션 오쥬 랜딩페이지",
   "icons": [
     {
-      "src": "favicon.ico",
+      "src": "ohzu.ico",
       "sizes": "64x64 32x32 24x24 16x16",
       "type": "image/x-icon"
     },
     {
-      "src": "logo192.png",
+      "src": "ohzu192.png",
       "type": "image/png",
       "sizes": "192x192"
     },
     {
-      "src": "logo512.png",
+      "src": "ohzu512.png",
       "type": "image/png",
       "sizes": "512x512"
     }

diff --git a/public/logo192.png → public/ohzu192.png b/public/logo192.png → public/ohzu192.png
diff --git a/public/logo512.png → public/ohzu512.png b/public/logo512.png → public/ohzu512.png
diff --git a/public/favicon.ico → public/ozhu.ico b/public/favicon.ico → public/ozhu.ico
diff --git a/src/App.tsx b/src/App.tsx
@@ -4,11 +4,6 @@ import Result from './pages/question/Result';
 import Question from './pages/question/Question';
 import NotFound from './pages/common/NotFound';
 import { AnimatePresence } from 'framer-motion';
-import {
-  ToastsContainer,
-  ToastsContainerPosition,
-  ToastsStore,
-} from 'react-toasts';
 import CustomToastContainer from './components/common/CustomToastContainer';
 
 function App() {

diff --git a/src/images/logo.png → src/assets/images/logo.png b/src/images/logo.png → src/assets/images/logo.png
diff --git a/src/components/button/Button.tsx b/src/components/button/Button.tsx
@@ -58,6 +58,7 @@ const Wrapper = styled.div`
   display: flex;
   justify-content: center;
   align-items: center;
+  user-select: none;
 
   button {
     transition: ${({ theme }) => theme.transition.onHover};

diff --git a/src/components/button/SelectButton.tsx b/src/components/button/SelectButton.tsx
@@ -25,6 +25,7 @@ const Wrapper = styled.div<{
   display: flex;
   justify-content: center;
   align-items: center;
+  user-select: none;
 
   button {
     transition: ${({ theme }) => theme.transition.onSelect};

diff --git a/src/components/common/CustomToastContainer.tsx b/src/components/common/CustomToastContainer.tsx
@@ -20,6 +20,7 @@ const CustomToastContainer = () => {
           line-height: 53px !important;
           font-family: 'Pretendard' !important;
           font-size: 16px !important;
+          user-select: none; !important;
         }
       `}</style>
       <ToastsContainer

diff --git a/src/components/question/QuestionBox.tsx b/src/components/question/QuestionBox.tsx
@@ -45,13 +45,13 @@ function QuestionBox({
         </Title>
         <ButtonWrapper>
           <SelectButton
-            label={'예'}
+            label={'그렇다'}
             onClick={() => handleState(true)}
             isSelected={answer}
           ></SelectButton>
           <SizedBox />
           <SelectButton
-            label={'아니오'}
+            label={'아니다'}
             onClick={() => handleState(false)}
             isSelected={answer == null ? null : !answer}
           ></SelectButton>

diff --git a/src/components/toast/toast.tsx b/src/components/toast/toast.tsx
diff --git a/src/index.tsx b/src/index.tsx
@@ -1,8 +1,8 @@
+import App from './App';
 import ReactDOM from 'react-dom/client';
+import reportWebVitals from './reportWebVitals';
 import { ThemeProvider } from 'styled-components';
 import { theme } from './common/theme';
-import App from './App';
-import reportWebVitals from './reportWebVitals';
 import { GlobalStyle } from './common/global-theme';
 import { BrowserRouter } from 'react-router-dom';
 

diff --git a/src/pages/question/Home.tsx b/src/pages/question/Home.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 import Button from '../../components/button/Button';
 import AnimatedPage from '../../components/common/AnimatedPage';
 import Template from '../../components/common/Template';
-import logo from '../../images/logo.png';
+import logo from '../../assets/images/logo.png';
 
 function Home() {
   const navigate = useNavigate();

diff --git a/src/pages/question/Question.tsx b/src/pages/question/Question.tsx
@@ -46,7 +46,7 @@ function Question() {
       .map((elem, index) => {
         /* 선택 안함 */
         if (elem == -1) {
-          console.log('아직 선택 하지 않은 항목이 있음');
+          // console.log('아직 선택 하지 않은 항목이 있음');
         } else if (elem == 1) {
           /* 예 선택 */
           return questions[index].attribute[0] ?? 'X';
@@ -61,7 +61,7 @@ function Question() {
 
     // console.log(data);
     if (data.indexOf('X') > -1) {
-      console.log('잘못된 요청');
+      // console.log('잘못된 요청');
       useToast();
       return;
     }

diff --git a/src/pages/question/Result.tsx b/src/pages/question/Result.tsx
@@ -47,7 +47,7 @@ function Result() {
       <Template variant="홈">
         <Wrapper>
           <Title>
-            <p>당신과 가장 일치하는 칵테일은</p>
+            <p>당신과 가장 잘 어울리는 칵테일은</p>
             <p>{result?.cocktail} 입니다~!</p>
           </Title>
           <ResultImage>