Merge pull request #28 from Team-INSERT/chore/retouch

리터치 작업 완료
Team-INSERT · Aug 26, 2023 · 722b7e0 · 722b7e0
2 parents aa5ef2a + 0651c7d
commit 722b7e0
Show file tree

Hide file tree

Showing 19 changed files with 123 additions and 294 deletions.
diff --git a/public/index.html b/public/index.html
@@ -3,16 +3,32 @@
   <head>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <meta property="og:url" content="https://team-insert.com">
-    <meta property="og:title" content="Insert">
-    <meta property="og:image" content="images/meta-img.png">
-    <meta property="og:description" content="부산소프트웨어마이스터고등학교 플랫폼 개발 동아리 INSERT">
+    <meta property="og:url" content="https://team-insert.com" />
+    <meta property="og:title" content="Insert" />
+    <meta property="og:image" content="images/meta-img.png" />
+    <meta
+      property="og:description"
+      content="부산소프트웨어마이스터고등학교 플랫폼 개발 동아리 INSERT"
+    />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <link href="images/icon.ico" rel="shortcut icon" type="image/x-icon">
+    <link href="images/icon.ico" rel="shortcut icon" type="image/x-icon" />
     <title>INSERT</title>
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>
     <div id="root"></div>
+    <script
+      async
+      src="https://www.googletagmanager.com/gtag/js?id=G-0Y5CLYVNJY"
+    ></script>
+    <script>
+      window.dataLayer = window.dataLayer || [];
+      function gtag() {
+        dataLayer.push(arguments);
+      }
+      gtag("js", new Date());
+
+      gtag("config", "G-0Y5CLYVNJY");
+    </script>
   </body>
 </html>
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,5 +1,5 @@
 import { BrowserRouter as Router, Route, Routes } from "react-router-dom";
-import Home from "./pages/home";
+import Home from "./pages";
 
 function App() {
   return (

diff --git a/src/pages/home/index.tsx b/src/pages/home/index.tsx
diff --git a/src/pages/home/layouts/TimeLine/data.json b/src/pages/home/layouts/TimeLine/data.json
diff --git a/src/pages/home/layouts/TimeLine/index.tsx b/src/pages/home/layouts/TimeLine/index.tsx
diff --git a/src/pages/home/layouts/TimeLine/style.ts b/src/pages/home/layouts/TimeLine/style.ts
diff --git a/src/pages/home/layouts/index.tsx b/src/pages/home/layouts/index.tsx
diff --git a/src/pages/index.tsx b/src/pages/index.tsx
@@ -0,0 +1,21 @@
+import Header from "components/Header";
+import Footer from "components/Footer";
+import History from "pages/layouts/History";
+import HomePage from "pages/layouts/HomePage";
+import Member from "pages/layouts/Member";
+import Service from "pages/layouts/Service";
+
+function Home() {
+  return (
+    <>
+      <Header />
+      <HomePage />
+      <History />
+      <Service />
+      <Member />
+      <Footer />
+    </>
+  );
+}
+
+export default Home;
diff --git a/src/pages/home/layouts/Blog/index.tsx → src/pages/layouts/Blog/index.tsx b/src/pages/home/layouts/Blog/index.tsx → src/pages/layouts/Blog/index.tsx
diff --git a/src/pages/home/layouts/Blog/style.ts → src/pages/layouts/Blog/style.ts b/src/pages/home/layouts/Blog/style.ts → src/pages/layouts/Blog/style.ts
diff --git a/src/pages/home/layouts/History/index.tsx → src/pages/layouts/History/index.tsx b/src/pages/home/layouts/History/index.tsx → src/pages/layouts/History/index.tsx
@@ -3,9 +3,10 @@ import * as S from "./style";
 function HistoryPage() {
   const { title, introduce1, introduce2 } = {
     title: "학교와 함께 역사를 써내려갑니다.",
-    introduce1: "INSERT는 2023년 3월에 만들어진 부산 소마고 전공동아리 입니다.",
+    introduce1:
+      "INSERT는 2023년 3월에 만들어진 부산소프트웨어마이스터고등학교의 전공동아리입니다.",
     introduce2:
-      "저희는 학교 플랫폼 개발 동아리로 학교 커뮤니티를 발전시키는 프로젝트를 진행합니다.",
+      "학생들의 편리한 학교 생활을 위해, 교내 학생들과 관련된 모든 서비스들을 제공합니다.",
   };
 
   return (

diff --git a/src/pages/home/layouts/History/style.ts → src/pages/layouts/History/style.ts b/src/pages/home/layouts/History/style.ts → src/pages/layouts/History/style.ts
diff --git a/src/pages/home/layouts/HomePage/index.tsx → src/pages/layouts/HomePage/index.tsx b/src/pages/home/layouts/HomePage/index.tsx → src/pages/layouts/HomePage/index.tsx
@@ -6,8 +6,8 @@ function HomePage() {
   const middle = [
     { id: 1, title: "작성한 코드 라인", value: 168257 },
     { id: 2, title: "웹 페이지 조회수", value: 560257 },
-    { id: 3, title: "총 커밋 횟수", value: 2358 },
-    { id: 4, title: "함께한 시간", value: 2650 },
+    { id: 3, title: "총 커밋 횟수", value: 3658 },
+    { id: 4, title: "함께한 시간", value: 5652 },
   ];
 
   return (

diff --git a/src/pages/home/layouts/HomePage/style.ts → src/pages/layouts/HomePage/style.ts b/src/pages/home/layouts/HomePage/style.ts → src/pages/layouts/HomePage/style.ts
diff --git a/src/pages/home/layouts/Member/index.tsx → src/pages/layouts/Member/index.tsx b/src/pages/home/layouts/Member/index.tsx → src/pages/layouts/Member/index.tsx
@@ -1,14 +1,17 @@
 import { useEffect, useState } from "react";
 import { requestMember } from "apis/getGithubMember";
 import MemberType from "types/MemberType";
+import { changeGenString } from "utils/changeGenString";
 import * as S from "./style";
 
 function Member() {
   type Tech = string[];
   type Gen = string[];
 
   const techs = ["Frontend", "Backend"];
-  const gens = ["1st", "2nd", "3rd", "4th", "5th"];
+  const gens = Array.from({ length: new Date().getFullYear() - 2020 }).map(
+    (_, i) => changeGenString(i + 1),
+  );
 
   const [tech, setTech] = useState<Tech>([]);
   const [gen, setGen] = useState<Gen>([]);
@@ -33,11 +36,6 @@ function Member() {
     getMember();
   }, []);
 
-  const clearFilter = () => {
-    setTech([]);
-    setGen([]);
-  };
-
   const active = (filter: Tech | Gen, item: string) => {
     if (filter.includes(item)) {
       const notActive = filter.filter((activeItem) => activeItem !== item);
@@ -71,16 +69,10 @@ function Member() {
   return (
     <S.MemberLayout id="member">
       <S.MemberContainer>
-        <S.MemberTitle>멤버</S.MemberTitle>
+        <S.MemberTitle>인서트의 멤버들을 소개합니다</S.MemberTitle>
         <S.MemberHr />
         <S.MemberMain>
           <S.MemberFilter>
-            <S.FilterButton
-              isActive={!tech.length && !gen.length}
-              onClick={() => clearFilter()}
-            >
-              All
-            </S.FilterButton>
             <S.FilterTitle>Tech</S.FilterTitle>
             {techs.map((techItem) => (
               <S.FilterButton
@@ -90,7 +82,7 @@ function Member() {
                 {techItem.replace("Developer", "")}
               </S.FilterButton>
             ))}
-            <S.FilterTitle>Gen</S.FilterTitle>
+            <S.FilterTitle>Generation</S.FilterTitle>
             {gens.map((genItem) => (
               <S.FilterButton
                 isActive={gen.includes(genItem)}
@@ -132,7 +124,6 @@ function Member() {
                   </S.MemberProfile>
                 </S.MemberMiddle>
               ))}
-            {loadingError && <S.Error>{loadingError}</S.Error>}
           </S.Member>
         </S.MemberMain>
       </S.MemberContainer>

diff --git a/src/pages/home/layouts/Member/style.ts → src/pages/layouts/Member/style.ts b/src/pages/home/layouts/Member/style.ts → src/pages/layouts/Member/style.ts
@@ -52,7 +52,7 @@ export const MemberFilter = styled.div`
 `;
 
 export const FilterTitle = styled.div`
-  ${font.H2};
+  ${font.H4};
   color: ${color.black};
   margin-top: 30%;
 `;
@@ -64,6 +64,8 @@ export const FilterButton = styled.div<{ isActive: boolean }>`
   padding: 3px 6px;
   ${font.H4};
   margin-top: 25%;
+  margin-right: auto;
+  margin-left: 8%;
   color: #ced4da;
   &:first-child {
     margin-top: 50%;