Merge pull request #7 from Blackraven93/develop

v1에 대한 마지막 업데이트 입니다. 메타테그 및 구조 부분에 대해 리팩터링을 진행했습니다.
Async-Swift · Oct 16, 2022 · 539fc9e · 539fc9e
2 parents a348f0a + 07638fd
commit 539fc9e
Show file tree

Hide file tree

Showing 34 changed files with 8,170 additions and 5,827 deletions.
diff --git a/.gitignore b/.gitignore
@@ -79,4 +79,8 @@ package.tgz
 
 .idea
 
-coverage
+coverage
+
+.env
+
+*.env
diff --git a/.pnp.cjs b/.pnp.cjs
diff --git a/...ejs3-npm-7.19.1-b2dd8d7c1e-38a1e8fcd2.zip → ...ejs3-npm-7.19.4-0547036932-3418534964.zip b/...ejs3-npm-7.19.1-b2dd8d7c1e-38a1e8fcd2.zip → ...ejs3-npm-7.19.4-0547036932-3418534964.zip
diff --git a/.yarn/cache/@babel-runtime-npm-7.19.0-86b37fbb72-fa69c351bb.zip b/.yarn/cache/@babel-runtime-npm-7.19.0-86b37fbb72-fa69c351bb.zip
diff --git a/.yarn/cache/@babel-runtime-npm-7.19.4-9f106cb4dd-66b7e3c13e.zip b/.yarn/cache/@babel-runtime-npm-7.19.4-9f106cb4dd-66b7e3c13e.zip
diff --git a/...intrc-npm-1.3.2-fd8de37609-2074dca47d.zip → ...intrc-npm-1.3.3-9e3a462140-f03e9d6727.zip b/...intrc-npm-1.3.2-fd8de37609-2074dca47d.zip → ...intrc-npm-1.3.3-9e3a462140-f03e9d6727.zip
diff --git a/.yarn/cache/@typescript-eslint-parser-npm-5.40.0-36cbbd9048-a8d02950dd.zip b/.yarn/cache/@typescript-eslint-parser-npm-5.40.0-36cbbd9048-a8d02950dd.zip
diff --git a/.yarn/cache/@typescript-eslint-scope-manager-npm-5.40.0-86f5f7a2d0-48dfb2f1a7.zip b/.yarn/cache/@typescript-eslint-scope-manager-npm-5.40.0-86f5f7a2d0-48dfb2f1a7.zip
diff --git a/.yarn/cache/@typescript-eslint-types-npm-5.40.0-032e3ccf3b-892ff16217.zip b/.yarn/cache/@typescript-eslint-types-npm-5.40.0-032e3ccf3b-892ff16217.zip
diff --git a/.yarn/cache/@typescript-eslint-typescript-estree-npm-5.40.0-6f9c0e3909-8b67b8c427.zip b/.yarn/cache/@typescript-eslint-typescript-estree-npm-5.40.0-6f9c0e3909-8b67b8c427.zip
diff --git a/.yarn/cache/@typescript-eslint-visitor-keys-npm-5.40.0-0b6573a5a2-a11787f7e6.zip b/.yarn/cache/@typescript-eslint-visitor-keys-npm-5.40.0-0b6573a5a2-a11787f7e6.zip
diff --git a/.yarn/cache/caniuse-lite-npm-1.0.30001420-f322909669-dfa5027b2a.zip b/.yarn/cache/caniuse-lite-npm-1.0.30001420-f322909669-dfa5027b2a.zip
diff --git a/...ract-npm-1.20.3-716a6119bf-225f24966e.zip → ...ract-npm-1.20.4-543318afab-89297cc785.zip b/...ract-npm-1.20.3-716a6119bf-225f24966e.zip → ...ract-npm-1.20.4-543318afab-89297cc785.zip
diff --git a/...eact-npm-7.31.8-54babab916-0683e2a624.zip → ...act-npm-7.31.10-d43fb4c6e9-f013669c29.zip b/...eact-npm-7.31.8-54babab916-0683e2a624.zip → ...act-npm-7.31.10-d43fb4c6e9-f013669c29.zip
diff --git a/.yarn/cache/minimist-npm-1.2.6-f4cee4b4af-d15428cd1e.zip b/.yarn/cache/minimist-npm-1.2.6-f4cee4b4af-d15428cd1e.zip
diff --git a/.yarn/cache/minimist-npm-1.2.7-51d33b1371-7346574a10.zip b/.yarn/cache/minimist-npm-1.2.7-51d33b1371-7346574a10.zip
diff --git a/.yarn/cache/regenerator-runtime-npm-0.13.10-57e3c1406b-09893f5a9e.zip b/.yarn/cache/regenerator-runtime-npm-0.13.10-57e3c1406b-09893f5a9e.zip
diff --git a/.yarn/cache/regenerator-runtime-npm-0.13.9-6d02340eec-65ed455fe5.zip b/.yarn/cache/regenerator-runtime-npm-0.13.9-6d02340eec-65ed455fe5.zip
diff --git a/...emver-npm-7.3.7-3bfe704194-2fa3e87756.zip → ...emver-npm-7.3.8-25a996cb4f-ba9c7cbbf2.zip b/...emver-npm-7.3.7-3bfe704194-2fa3e87756.zip → ...emver-npm-7.3.8-25a996cb4f-ba9c7cbbf2.zip
diff --git a/.yarn/install-state.gz b/.yarn/install-state.gz
diff --git a/lib/gtag.js b/lib/gtag.js
@@ -0,0 +1,13 @@
+export const pageview = (url) => {
+  window.gtag("config", process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS, {
+    page_path: url,
+  });
+};
+
+export const event = ({ action, category, label, value }) => {
+  window.gtag("event", action, {
+    event_category: category,
+    event_label: label,
+    value,
+  });
+};
diff --git a/pages/404.js b/pages/404.js
@@ -0,0 +1,18 @@
+import HeadMeta from "./components/HeadMeta";
+import styles from "../styles/modules/error.module.css";
+
+const Custom404 = () => {
+  return (
+    <div className={styles.error}>
+      <HeadMeta />
+      <h1>404 | 페이지가 없습니다 😂</h1>
+    </div>
+  );
+};
+
+Error.getInitialProps = ({ res, err }) => {
+  const statusCode = res ? res.statusCode : err ? err.statusCode : 404;
+  return { statusCode };
+};
+
+export default Custom404;
diff --git a/pages/_app.js b/pages/_app.js
@@ -1,8 +1,46 @@
 import reset from "../styles/global.css";
 
+import Script from "next/script";
+import { useRouter } from "next/router";
+import { useEffect } from "react";
+
+import * as gtag from "../lib/gtag";
+
 const App = ({ Component, pageProps }) => {
+  const router = useRouter();
+
+  useEffect(() => {
+    const handleRouteChange = (url) => {
+      gtag.pageview(url);
+    };
+
+    router.events.on("routeChangeComplete", handleRouteChange);
+
+    return () => {
+      router.events.off("routeChangeComplete", handleRouteChange);
+    };
+  }, [router.events]);
+
   return (
     <>
+      <Script
+        strategy="afterInteractive"
+        src={`https://www.googletagmanager.com/gtag/js?id=${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}`}
+      />
+      <Script
+        id="google-analytics"
+        strategy="afterInteractive"
+        dangerouslySetInnerHTML={{
+          __html: `
+          window.dataLayer = window.dataLayer || [];
+          function gtag(){dataLayer.push(arguments);}
+          gtag('js', new Date());
+          gtag('config', '${process.env.NEXT_PUBLIC_GOOGLE_ANALYTICS}', {
+            page_path: window.location.pathname,
+          });
+        `,
+        }}
+      />
       <Component {...pageProps} />
     </>
   );

diff --git a/pages/components/Description.js b/pages/components/Description.js
@@ -11,11 +11,6 @@ const Description = () => {
           <h2>11월 12일 (토)</h2>
           <h2 className={styles.location}>
             <div>체인지업 그라운드 포항</div>
-            {/* <Link href="https://www.changeupground.com/">
-              <span style={{ cursor: "pointer" }}>
-                자세히 알아보기 &#10132;
-              </span>
-            </Link> */}
           </h2>
         </div>
       </main>

diff --git a/pages/components/HeadMeta.js b/pages/components/HeadMeta.js
@@ -0,0 +1,122 @@
+import Head from "next/head";
+
+const HeadMeta = () => {
+  return (
+    <Head>
+      <meta http-equiv="Title" content="SyncSwift 2022" />
+      <meta name="og:title" content="SyncSwift 2022" />
+      <meta property="twitter:title" content="SyncSwift 2022" />
+      <meta name="og:type" content="website" />
+      <meta name="og:url" content="https://www.asyncswift.com/" />
+      <meta name="og:image" content="/favicons/apple-icon.png" />
+      <meta property="twitter:image" content="/favicons/apple-icon.png" />
+      <meta property="twitter:card" content="/favicons/apple-icon.png" />
+      <meta name="viewport" content="width=device-width, initial-scale=1" />
+      <meta charset="UTF - 8" />
+      <meta http-equiv="Author" content="AsyncSwift Organizar" />
+      <meta http-equiv="publisher" content="AsyncSwift" />
+      <meta http-equiv="Reply-To" content="asyncswift@gmail.com" />
+      <meta http-equiv="Email" content="asyncswift@gmail.com" />
+      <meta http-equiv="Distribution" content="Raven" />
+      <meta http-equiv="Copyright" content="AsyncSwift" />
+      <meta http-equiv="Build" content="Wed, 05 Oct 2022 20:00:00" />
+      <meta name="og:site_name" content="SyncSwift 2022" />
+      <meta
+        name="description"
+        content="Apple 생태계 속에서 헤엄치는 사람들의 커뮤니티. AsyncSwift 입니다."
+      />
+      <meta
+        name="og:description"
+        content="Apple 생태계 속에서 헤엄치는 사람들의 커뮤니티. AsyncSwift 입니다."
+      />
+      <meta
+        property="twitter:description"
+        content="Apple 생태계 속에서 헤엄치는 사람들의 커뮤니티. AsyncSwift 입니다."
+      />
+      <meta http-equiv="Subject" content="Swift Conference" />
+      <meta name="Keywords" content="AsyncSwift" />
+      <meta name="keywords" content="Swift Conference" />
+      <meta name="keywords" content="SyncSwift 2022" />
+      <link rel="icon" href="/favicons/favicon.ico" />
+      <link
+        rel="apple-touch-icon"
+        sizes="57x57"
+        href="/favicons/apple-icon-57x57.png"
+      />
+      <link
+        rel="apple-touch-icon"
+        sizes="60x60"
+        href="/favicons/apple-icon-60x60.png"
+      />
+      <link
+        rel="apple-touch-icon"
+        sizes="72x72"
+        href="/favicons/apple-icon-72x72.png"
+      />
+      <link
+        rel="apple-touch-icon"
+        sizes="76x76"
+        href="/favicons/apple-icon-76x76.png"
+      />
+      <link
+        rel="apple-touch-icon"
+        sizes="114x114"
+        href="/favicons/apple-icon-114x114.png"
+      />
+      <link
+        rel="apple-touch-icon"
+        sizes="120x120"
+        href="/favicons/apple-icon-120x120.png"
+      />
+      <link
+        rel="apple-touch-icon"
+        sizes="144x144"
+        href="/favicons/apple-icon-144x144.png"
+      />
+      <link
+        rel="apple-touch-icon"
+        sizes="152x152"
+        href="/favicons/apple-icon-152x152.png"
+      />
+      <link
+        rel="apple-touch-icon"
+        sizes="180x180"
+        href="/favicons/apple-icon-180x180.png"
+      />
+      <link
+        rel="icon"
+        type="image/png"
+        sizes="192x192"
+        href="/favicons/android-icon-192x192.png"
+      />
+      <link
+        rel="icon"
+        type="image/png"
+        sizes="32x32"
+        href="/favicons/favicon-32x32.png"
+      />
+      <link
+        rel="icon"
+        type="image/png"
+        sizes="96x96"
+        href="/favicons/favicon-96x96.png"
+      />
+      <link
+        rel="icon"
+        type="image/png"
+        sizes="16x16"
+        href="/favicons/favicon-16x16.png"
+      />
+      <link rel="manifest" href="/favicons/manifest.json" />
+      <meta name="msapplication-TileColor" content="#ffffff" />
+      <meta
+        name="msapplication-TileImage"
+        content="/favicons/ms-icon-144x144.png"
+      />
+      <meta name="theme-color" content="#ffffff" />
+      <title>SyncSwift 2022</title>
+    </Head>
+  );
+};
+
+export default HeadMeta;
diff --git a/pages/components/Header.js b/pages/components/Header.js
@@ -1,17 +1,23 @@
 import Image from "next/image";
-import logoFile from "../../public/AsyncLogo.svg";
+import Link from "next/link";
+
+import LogoFile from "../../public/AsyncLogo.svg";
 
 import style from "../../styles/modules/Header.module.css";
 
 const Header = () => {
   return (
     <header className={style.header}>
-      <Image
-        src={logoFile}
-        alt="AsyncSwift Community Logo"
-        width={62}
-        height={60}
-      />
+      <Link href="/">
+        <a>
+          <Image
+            src={LogoFile}
+            alt="AsyncSwift Community Logo"
+            width={62}
+            height={60}
+          />
+        </a>
+      </Link>
     </header>
   );
 };

diff --git a/pages/components/SNS.js b/pages/components/SNS.js
@@ -1,45 +1,37 @@
 import Image from "next/image";
-import Link from "next/link";
 
 import notion from "../../public/notion.svg";
 import twitter from "../../public/twitter.svg";
 import instagram from "../../public/instagram.svg";
+import linkedIn from "../../public/linkedIn.svg";
 
 import style from "../../styles/modules/Info.module.css";
+
 const SNS = () => {
+  const conferenceInfoUrl = {
+    notion:
+      "https://unnnyong.notion.site/AsyncSwift-9baba57eb8f8416d877bd5d2aba4a62d",
+    instagram: "https://www.instagram.com/asyncswift/",
+    twitter: "https://twitter.com/AsyncSwift",
+    linkedIn: "https://www.linkedin.com/company/async-swift/",
+  };
+
   return (
     <div className={style.getInfo}>
       <h4>To get latest information</h4>
       <div className={style.SNSContainer}>
-        <Link href="https://unnnyong.notion.site/AsyncSwift-9baba57eb8f8416d877bd5d2aba4a62d">
-          <Image
-            style={{ cursor: "pointer" }}
-            alt="Notion logo"
-            src={notion}
-            width={32}
-            height={32}
-          />
-        </Link>
-
-        <Link href="https://twitter.com/AsyncSwift">
-          <Image
-            style={{ cursor: "pointer" }}
-            alt="Twitter logo"
-            src={twitter}
-            width={32}
-            height={32}
-          />
-        </Link>
-
-        <Link href="https://www.instagram.com/asyncswift/">
-          <Image
-            style={{ cursor: "pointer" }}
-            alt="Instagram logo"
-            src={instagram}
-            width={32}
-            height={32}
-          />
-        </Link>
+        <a target="_blank" href={conferenceInfoUrl.notion} rel="noreferrer">
+          <Image alt="Notion logo" src={notion} width={32} height={32} />
+        </a>
+        <a target="_blank" href={conferenceInfoUrl.twitter} rel="noreferrer">
+          <Image alt="Twitter logo" src={twitter} width={32} height={32} />
+        </a>
+        <a target="_blank" href={conferenceInfoUrl.instagram} rel="noreferrer">
+          <Image alt="Instagram logo" src={instagram} width={32} height={32} />
+        </a>
+        <a target="_blank" href={conferenceInfoUrl.linkedIn} rel="noreferrer">
+          <Image alt="LinkedIn logo" src={linkedIn} width={32} height={32} />
+        </a>
       </div>
     </div>
   );

diff --git a/pages/components/Ticket.js b/pages/components/Ticket.js
@@ -3,9 +3,15 @@ import style from "../../styles/modules/Info.module.css";
 const Ticket = () => {
   return (
     <div className={style.ticketInfo}>
-      <h3>티켓 오픈</h3>
-      <div>10월 12일</div>
-      <div>이벤트브라이트</div>
+      <a
+        target="_blank"
+        href="https://festa.io/events/ndCognG2SC4ZEj44osqurB"
+        rel="noreferrer"
+      >
+        <h3>티켓 오픈 &#10132; </h3>
+      </a>
+      <div>10월 19일</div>
+      <div>페스타</div>
     </div>
   );
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,4 +79,8 @@ package.tgz @@
     .idea
-    coverage
+    coverage
+    .env
+    *.env