Merge pull request #163 from Lee-Na-eun/dev

[Client] / #61 / SearchMore.js : fix css
codestates · Sep 1, 2021 · 69e9856 · 69e9856
2 parents 954bcf0 + 710fbe6
commit 69e9856
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 77 deletions.
diff --git a/client/src/comp/Modal.js b/client/src/comp/Modal.js
@@ -4,10 +4,7 @@ import logo from "../jurimma_logo.png";
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome";
 import { faChevronDown, faComment } from "@fortawesome/free-solid-svg-icons";
 import { useHistory } from "react-router";
-import KaKaoLogin from "react-kakao-login";
 import axios from "axios";
-import { KAKAO_AUTH_URL } from "./oauth";
-const { Kakao } = window;
 
 const checkModule = require("../checkModule");
 axios.defaults.withCredentials = true;
@@ -485,21 +482,10 @@ function Modal({ setOnModal, setisLogin, setUserInfo, setAccToken, accToken }) {
             </WelcomeBox>
 
             <KakaoWrap>
-              <KaKaoLogin
-                jsKey="1e2b4e1cf49e438a572407555898e7b1"
-                onSuccess={(res) => kakaoLoginHandler(res)}
-                onFailure={(res) => console.log(res)}
-                getProfile={true}
-                onLogout={console.info}
-                style={{
-                  width: "100%",
-                }}
-              >
-                <KakaoLogin>
-                  <FontAwesomeIcon icon={faComment} id="socialLogin" />
-                  <p>카카오 로그인</p>
-                </KakaoLogin>
-              </KaKaoLogin>
+              <KakaoLogin>
+                <FontAwesomeIcon icon={faComment} id="socialLogin" />
+                <p>카카오 로그인</p>
+              </KakaoLogin>
             </KakaoWrap>
           </BoxOne>
 

diff --git a/client/src/comp/SearchResult.js b/client/src/comp/SearchResult.js
@@ -2,7 +2,6 @@ import React, { useEffect } from "react";
 import styled from "styled-components";
 import thumbs_up_icon from "../thumbs_up_icon.png";
 import { Link, Redirect } from "react-router-dom";
-import thumbs_up_icon from "../thumbs_up_icon.png";
 import empty from "../empty.png";
 
 function SearchResult({

diff --git a/client/src/pages/SearchMore.js b/client/src/pages/SearchMore.js
@@ -49,74 +49,45 @@ const ResultList = styled.ul`
     height: 8vh;
     margin: 2vh auto 0;
     border: 2px solid #000;
-    border-radius: 5vh;
-    margin: 0 auto 2vw;
-    font-size: max(12px, 0.8vw);
-    color: #fff;
-    transition: 0.3s;
+    border-radius: 40px;
+    text-align: center;
+    line-height: 8vh;
+    background-color: rgba(210, 248, 224, 0.9);
     cursor: pointer;
-    :hover {
-      background-color: #fff;
-      color: #000;
-      background-color: rgba(255, 255, 255, 0.5);
-      color: black;
+    transition: 0.3s;
+    p:first-child {
       font-weight: bold;
-      border: 2px solid black;
+      font-size: max(16px, 1vw);
     }
-  `;
-  const ResultList = styled.ul`
-    margin-top: 20px;
-    width: 100%;
-    margin: 0 auto;
-    li {
-      display: flex;
-      width: 75%;
-      height: 8vh;
-      margin: 2vh auto 0;
-      border: 2px solid #000;
-      border-radius: 40px;
-      text-align: center;
-      line-height: 8vh;
-      background-color: rgba(210, 248, 224, 0.9);
-      cursor: pointer;
-      transition: 0.3s;
-      p:first-child {
-        font-weight: bold;
-        font-size: max(16px, 1vw);
-      }
-      p {
-        flex: 1 1 auto;
-        font-size: max(14px, 1vw);
-      }
-      p:nth-child(2) {
-        flex: 3 1 auto;
-      }
-      .imgWrap {
-        position: relative;
-        right: 0.5vw;
-        padding: 0.35vw;
-        background-color: rgba(210, 248, 224, 0.9);
-        border-radius: 50px;
-      }
-      .imgWrap img {
-        position: relative;
-        top: 0.2vw;
-        width: max(1.1vw, 18px);
-        height: max(1.1vw, 18px);
-      }
+    p {
+      flex: 1 1 auto;
+      font-size: max(14px, 1vw);
+    }
+    p:nth-child(2) {
+      flex: 3 1 auto;
     }
     .imgWrap {
       position: relative;
       right: 0.5vw;
+      padding: 0.35vw;
+      background-color: rgba(210, 248, 224, 0.9);
+      border-radius: 50px;
     }
-    li:hover {
-      background-color: rgba(0, 0, 0, 0.8);
-      color: #fff;
-      p {
-        font-weight: bold;
-      }
+    .imgWrap img {
+      position: relative;
+      top: 0.2vw;
+      width: max(1.1vw, 18px);
+      height: max(1.1vw, 18px);
     }
   }
+  li:hover {
+    background-color: rgba(0, 0, 0, 0.8);
+    color: #fff;
+    p {
+      font-weight: bold;
+    }
+  }
+
   li:nth-child(1) {
     margin-top: 0px;
   }