Merge branch 'master' of ssh://khuhub.khu.ac.kr:12959/2020-1-capstone-design1/Triz_Project1

@@ -9,7 +9,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 
-ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "120s" ]
+ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "10s" ]
 
 
 COPY package*.json ./
 COPY package*.json ./
 COPY prisma ./prisma/
 COPY prisma ./prisma/

@@ -9,7 +9,7 @@ RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSI
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && tar -C /usr/local/bin -xzvf dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
     && rm dockerize-alpine-linux-amd64-$DOCKERIZE_VERSION.tar.gz
 
 
-ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "120s" ]
+ENTRYPOINT [ "dockerize", "-wait", "tcp://root:prisma@mysql:3306/prisma:3306", "-timeout", "10s" ]
 
 
 COPY ./ ./prisma/
 COPY ./ ./prisma/
 
 

@@ -11,6 +11,7 @@ import {
 import useInput from "../../Hooks/useInput";
 import useInput from "../../Hooks/useInput";
 import { toast } from "react-toastify";
 import { toast } from "react-toastify";
 
 
+
 export default withRouter(({ location }) => {
 export default withRouter(({ location }) => {
   const [messageArr, setMessageArr] = useState([]);
   const [messageArr, setMessageArr] = useState([]);
   const { pathname } = location;
   const { pathname } = location;

+
+a:visited{color:black;}
+a:active {color: black;}
+a:hover {color:black;}
+a:link {color:black;}
+a{text-decoration: none;color: black;}
+
+.banner{
+  display:block;
+}
+
+#khu-logo{
+  font-size: 0;
+  padding: 0;
+  border:none;
+
+}
+
+#khu-logo-font{
+  font-family: 'Black Han Sans', sans-serif;
+  align-content: center;
+  font-size:20px;
+  line-height: inherit;
+  display: inline-block;
+  padding: 5;
+  border:none;
+}
+
+.khu-nav{
+  padding:20px;
+  height:center;
+  background-color: white;
+  border-bottom: 1px solid #ebeaeb;
+}
+.khu-nav-row{
+  height: 100%;
+  display:flex;
+  justify-content: space-between;
+  padding-left: 200px;
+  padding-right: 200px;
+}
+
+
+#khu-start-button{
+  font-family: 'Black Han Sans', sans-serif;
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  background: 0 0;
+  border: none;
+  cursor: pointer;
+  border-radius: 4px;
+  text-align: center;
+  background-color: #611f69;
+  color: #fff;
+  fill: #fff;
+  padding: 10px;
+
+}
+
+@media screen and (min-width:0) and (max-width:767px)
+{
+  .khu-nav-row{padding:0 4vw;}
+}
\ No newline at end of file

+import ChatContainer_CSS from ChatContainer_CSS.css