Merge pull request #4 from yerin719/master

Fix minor bugs
NexClipper · Dec 10, 2020 · b03d3a5 · b03d3a5
2 parents 4f1c451 + b5a0e26
commit b03d3a5
Show file tree

Hide file tree

Showing 7 changed files with 232 additions and 205 deletions.
diff --git a/api/hub/management/commands/scheduler.py b/api/hub/management/commands/scheduler.py
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,6 +9,8 @@ services:
   maria_db:
     image: mariadb:10.4.17
     command: --default-authentication-plugin=mysql_native_password
+    command: --max-allowed-packet=67108864
+    command: --wait_timeout=28800
     restart: always
     environment:
       MYSQL_ROOT_PASSWORD: secret

diff --git a/src/components/Content/CardExporter.js b/src/components/Content/CardExporter.js
@@ -1,6 +1,7 @@
 import React from "react";
 import { withRouter } from "react-router-dom";
 import styled from "styled-components";
+import { AiFillStar } from "react-icons/ai";
 
 const CardExporter = ({ exporter, cardClick }) => {
   const {
@@ -16,7 +17,13 @@ const CardExporter = ({ exporter, cardClick }) => {
   return (
     <Div onClick={() => cardClick(exporter_id)}>
       <header>
-        <span>★{stars}</span>
+        <span>
+          <Icon>
+            <AiFillStar />
+          </Icon>
+          {stars}
+        </span>
+        {/* <span>★{stars}</span> */}
       </header>
       <Article>
         <div>
@@ -132,4 +139,8 @@ const Section = styled.section`
   }
 `;
 
+const Icon = styled.span`
+  vertical-align: middle;
+`;
+
 export default withRouter(CardExporter);
diff --git a/src/components/ContentDetail/ContentDetail.js b/src/components/ContentDetail/ContentDetail.js
@@ -143,7 +143,7 @@ const ReadmeTitle = styled.h4`
 
 const MarkdownBody = styled.div`
   * {
-    line-height: 1.5;
+    line-height: 1.8;
   }
 
   code {

diff --git a/src/components/Modal/EditModal.js b/src/components/Modal/EditModal.js
@@ -43,10 +43,7 @@ const EditModal = ({ cancleModal, exporterId }) => {
             <button onClick={deleteExporter}>Remove</button>
           </ButtonContainer>
         </Container>
-
-        <Back onClick={cancleModal}>
-          <button>Back</button>
-        </Back>
+        <Back onClick={cancleModal}>Back</Back>
       </Div>
     </ModalContainer>
   );
@@ -84,7 +81,6 @@ const Container = styled.div`
   align-items: center;
   padding-top: 50px;
   margin-bottom: 50px;
-  display: ${props => (props.modalStatus === "default" ? "block" : "none")};
   select {
     ${({ theme }) => theme.ModalButton}
   }
@@ -110,8 +106,7 @@ const Back = styled.div`
   color: #ffffff;
   font-size: 13px;
   font-weight: 400;
-  display: flex;
-  justify-content: center;
+  ${({ theme }) => theme.flexCenter};
   cursor: pointer;
 `;
 

diff --git a/src/components/Modal/RegisterModal.js b/src/components/Modal/RegisterModal.js
@@ -52,9 +52,7 @@ const RegisterModal = ({ cancleModal }) => {
             Register
           </button>
         </Container>
-        <Back onClick={cancleModal}>
-          <button>Back</button>
-        </Back>
+        <Back onClick={cancleModal}>Back</Back>
       </Div>
     </ModalContainer>
   );
@@ -121,8 +119,7 @@ const Back = styled.div`
   color: #ffffff;
   font-size: 13px;
   font-weight: 400;
-  display: flex;
-  justify-content: center;
+  ${({ theme }) => theme.flexCenter};
   cursor: pointer;
 `;
 

diff --git a/src/components/Modal/TokenModal.js b/src/components/Modal/TokenModal.js
@@ -42,23 +42,35 @@ const TokenModal = () => {
             <span>Please wait few minutes</span>
           </Loader>
         ) : (
-          <Container>
-            <FailMessage>{failMessage}</FailMessage>
-            <input
-              className="inputDiv"
-              onChange={inputTokenKey}
-              placeholder="Github Personal Access Token"
-            ></input>
-            <span
-              onClick={() =>
-                window.open("https://github.com/settings/tokens/new", "_blank")
-              }
+          <>
+            <Container>
+              <FailMessage>{failMessage}</FailMessage>
+              <input
+                className="inputDiv"
+                onChange={inputTokenKey}
+                placeholder="Github Personal Access Token"
+              ></input>
+              <span
+                onClick={() =>
+                  window.open(
+                    "https://github.com/settings/tokens/new",
+                    "_blank"
+                  )
+                }
+              >
+                Get token here!!!
+              </span>
+            </Container>
+            <button onClick={forwardToken}>Submit</button>
+            <button
+              onClick={() => {
+                dispatch(getTokenState(true));
+              }}
             >
-              Get token here!!!
-            </span>
-          </Container>
+              Back
+            </button>
+          </>
         )}
-        <button onClick={forwardToken}>Submit</button>
       </Div>
     </ModalContainer>
   );