Merge pull request #171 from Gosrock/dev

최종(포스터변경, alert 문구 변경)
Gosrock · Feb 23, 2022 · 6276f62 · 6276f62
2 parents 9ab08a9 + f5096a5
commit 6276f62
Show file tree

Hide file tree

Showing 14 changed files with 10 additions and 8 deletions.
diff --git a/public/images/Github.png b/public/images/Github.png
diff --git a/public/images/Instagram.png b/public/images/Instagram.png
diff --git a/public/images/Youtube.png b/public/images/Youtube.png
diff --git a/public/images/newposter.jpeg b/public/images/newposter.jpeg
diff --git a/public/images/poster.jpeg b/public/images/poster.jpeg
diff --git a/public/images/poster.png b/public/images/poster.png
diff --git a/public/images/with_us.png b/public/images/with_us.png
diff --git a/public/index.html b/public/index.html
@@ -25,7 +25,7 @@
       content="3월 10일 오후 7시, 합정 라디오 가가 라이브홀에서 만나요!"
     />
     <meta property="og:image" content="%PUBLIC_URL%/og.png" />
-    <link rel="apple-touch-icon" href="%PUBLIC_URL%/appleicon.png" />
+    <link rel="apple-touch-icon" href="%PUBLIC_URL%/logo.png" />
     <!--
       manifest.json provides metadata used when your web app is installed on a
       user's mobile device or desktop. See https://developers.google.com/web/fundamentals/web-app-manifest/

diff --git a/public/appleicon.png → public/logo.png b/public/appleicon.png → public/logo.png
diff --git a/src/components/LandingPage/HomePage.js b/src/components/LandingPage/HomePage.js
@@ -143,7 +143,7 @@ function HomePage({ ticketing, list }) {
                 목요일
               </span>
             </h2>
-            <img src="images/newposter.jpeg" className="poster" />
+            <img src="images/poster.jpeg" className="poster" />
           </div>
         </div>
 
@@ -162,7 +162,7 @@ function HomePage({ ticketing, list }) {
             <div className="line"></div>
             <h2 style={{ marginBottom: '30px' }}>
               오후&nbsp;
-              <span style={{ fontWeight: '700', color: '#bf94e4' }}>여섯</span>
+              <span style={{ fontWeight: '700', color: '#bf94e4' }}>일곱</span>
               시, <br />
               합정 라디오 가가
             </h2>

diff --git a/src/components/LandingPage/main.js b/src/components/LandingPage/main.js
@@ -166,7 +166,7 @@ function scrollLoop(
   }
   if (yOffset > prevScrollHeight + sceneInfo[currentScene].scrollHeight) {
     enterNewScene = true;
-    console.log(currentScene);
+    //console.log(currentScene);
     if (currentScene === 4) {
       return;
     }

diff --git a/src/components/ListProcess/TicketCodePage/TicketCodePage.js b/src/components/ListProcess/TicketCodePage/TicketCodePage.js
@@ -101,7 +101,7 @@ function TicketCodePage({ ...props }) {
   }, [ticketId]);
 
   useEffect(() => {
-    console.log(ticket, '티켓정보 바뀜!');
+    //console.log(ticket, '티켓정보 바뀜!');
   }, [ticket]);
 
   return (

diff --git a/src/components/ListProcess/TicketListPage/TicketListPage.js b/src/components/ListProcess/TicketListPage/TicketListPage.js
@@ -42,7 +42,7 @@ function TicketListPage({ ...props }) {
   const somoimRef = useRef();
 
   useEffect(() => {
-    console.log('action effect');
+    //console.log('action effect');
     setBottomLabel(
       `${phoneNumber.replace(/^(\d{2,3})(\d{3,4})(\d{4})$/, `$1-$2-$3`)} 님!`
     );
@@ -52,7 +52,7 @@ function TicketListPage({ ...props }) {
   useEffect(() => {
     const validateID = new RegExp('^C2');
     if (tickets.length) {
-      console.log(validateID.test(tickets[0].studentID));
+      //console.log(validateID.test(tickets[0].studentID));
       setIsnewbie(validateID.test(tickets[0].studentID));
     }
   }, [tickets]);

diff --git a/src/hoc/requireAuth.js b/src/hoc/requireAuth.js
@@ -23,7 +23,9 @@ const requireAuth =
       // 티켓팅 프로세스에선 인증도 된상태여야 하며, 티켓팅이 발급되어야합니다.
 
       if (authenticated === true && ticketingAvailable === false) {
-        alert('이미 발급된 티켓이 있습니다.');
+        alert(
+          '이미 발급된 티켓이 있습니다. 예매 내역 버튼을 눌러 발급한 티켓을 확인해주세요.'
+        );
         return <Navigate to="/" />;
       }
       if (authenticated === false) {