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

sdy
Commit 365d2d4480c76b5a09f7978871e8eb88e97dd1b0 365d2d44 2 parents ca6053ca e44550b0
Showing 9 changed files with 49 additions and 41 deletions
front/web/validation.js → front/web/JS/validation.js
front/web/afterlogin.html
front/web/loginmain.html
front/web/main.html
front/web/question.html
front/web/whatiskhuchat.html → front/web/service/whatiskhuchat.html
front/web/signinmain.html
front/web/style.css → front/web/style/style.css
front/web/test.md
--- a/front/web/validation.js → front/web/JS/validation.js
View file @365d2d4
+++ b/front/web/validation.js → front/web/JS/validation.js
View file @365d2d4
@@ -4,7 +4,7 @@ var Email={
         var regExp = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
         if(regExp.test(email)){
           return true;
-        }else if(email===NULL){
+        }else if(email===""){
           alert("이메일을 입력해주세요!");
           return false;
         }
@@ -19,21 +19,19 @@ var Password={
     checkPassword:function(self){
       var fpassword=document.getElementById('fValidation').value;
       var spassword= document.getElementById('sValidation').value;
-      if(fpassword===spassword){
+      if(fpassword==="" || spassword===""){
-        return true;
-      }else if(fpassword===NULL || spassword===NULL){
         alert("비밀번호를 입력해주세요!");
         return false;
-      }else {
+      }else if(fpassword===spassword){
-        alert("작성한 비밀번호들이 다릅니다!");
+        return true;
+      }else{
+        alert("입력하신 비밀번호들이 다릅니다!");
         return false;
       }
     }
 }
 function checkValidation(self){
-    Email.checkmail();
-    Password.checkPassword();
     if(Email.checkEmail() && Password.checkPassword() ){
       return true;
     }else return false;
--- a/front/web/afterlogin.html
View file @365d2d4
+++ b/front/web/afterlogin.html
View file @365d2d4
@@ -3,7 +3,7 @@
 <head>
 <title>KHU KHU Chat</title>
 <meta charset="utf-8">
-<link rel="stylesheet" href="style.css">
+<link rel="stylesheet" href="style/style.css">
 <style>
 </style>
@@ -16,14 +16,14 @@
 <div id="grid">
   <div id="category">
     <ol class="center">
-      <li><a href="whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
+      <li><a href="service/whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
       <li><a href="loginmain.html" class="saw">로그인</a></li>
       <li><a href="signinmain.html" class="saw">회원가입</a></li>
       <li><a href="question.html" class="saw">문의사항</a></li>
       <li><a href="afterlogin.html" class="saw">로그인이후</a></li>
     </ol>
   </div>
-      <div id="service">
+      <div id="article">
         <h2>로그인후 접속되는 페이지로 만들기</h2>
         <form action="service/chatservice.html" id="chat">
           <label for="chatservice">친구와 채팅하기</label>
@@ -36,12 +36,12 @@
         </form>
         <form action="service/addfriend.html" id="addfriend">
-          <label for="makefriend">친구추가하기:</label>
+          <label for="makefriend">친구추가하기</label>
           <input type="submit" value="친구추가하기">
         </form>
         <form action="randomchat.html" id="randomchat">
-          <label for="randomchat">랜덤채팅:</label>
+          <label for="randomchat">랜덤채팅</label>
           <input type="submit" value="랜덤채팅">
         </form>
       </div>
--- a/front/web/loginmain.html
View file @365d2d4
+++ b/front/web/loginmain.html
View file @365d2d4
@@ -3,7 +3,7 @@
 <head>
 <title>KHU KHU Chat</title>
 <meta charset="utf-8">
-<link rel="stylesheet" href="style.css">
+<link rel="stylesheet" href="style/style.css">
 </head>
 <body>
@@ -12,7 +12,7 @@
 <div class="media" id="grid">
   <div id="category">
     <ol class="center">
-      <li><a href="whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
+      <li><a href="service/whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
       <li><a href="loginmain.html" class="saw">로그인</a></li>
       <li><a href="signinmain.html" class="saw">회원가입</a></li>
       <li><a href="question.html" class="saw">문의사항</a></li>
--- a/front/web/main.html
View file @365d2d4
+++ b/front/web/main.html
View file @365d2d4
@@ -3,8 +3,8 @@
 <head>
 <title>KHU KHU Chat</title>
 <meta charset="utf-8">
-<link rel="stylesheet" href="style.css">
+<link rel="stylesheet" href="style/style.css">
-<script src="validation.js"></script>
+
 </head>
 <body>
@@ -14,7 +14,7 @@
 <div id="grid">
   <div id="category">
     <ol class="center">
-      <li><a href="whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
+      <li><a href="service/whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
       <li><a href="loginmain.html" class="saw">로그인</a></li>
       <li><a href="signinmain.html" class="saw">회원가입</a></li>
       <li><a href="question.html" class="saw">문의사항</a></li>
@@ -27,7 +27,7 @@
         <p>This is chating application which chats with your frineds, coworkers and anyone do you want <br>
           so enjoy it out sevice.
         </p>
-      <h2><a href=whatiskhuchat.html title="what is KHU chat">
+      <h2><a href=service/whatiskhuchat.html title="what is KHU chat">
            1.What is KHU chat ?</a></h2>
            <p>
              KHU chat service는 무엇인가요?
--- a/front/web/question.html
View file @365d2d4
+++ b/front/web/question.html
View file @365d2d4
@@ -3,7 +3,7 @@
 <head>
 <title>KHU KHU Chat</title>
 <meta charset="utf-8">
-<link rel="stylesheet" href="style.css">
+<link rel="stylesheet" href="style/style.css">
 </head>
 <body>
@@ -13,10 +13,11 @@
 <div id="grid">
   <div id="category">
     <ol class="center">
-      <li><a href="whatiskhuchat.html" class="saw">What is KHU chat?</a></li>
+      <li><a href="service/whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
       <li><a href="loginmain.html" class="saw">로그인</a></li>
       <li><a href="signinmain.html" class="saw">회원가입</a></li>
       <li><a href="question.html" class="saw">문의사항</a></li>
+      <li><a href="afterlogin.html" class="saw">로그인이후</a></li>
     </ol>
   </div>
       <div id="article">
--- a/front/web/whatiskhuchat.html → front/web/service/whatiskhuchat.html
View file @365d2d4
+++ b/front/web/whatiskhuchat.html → front/web/service/whatiskhuchat.html
View file @365d2d4
@@ -3,20 +3,20 @@
 <head>
 <title>KHU KHU Chat</title>
 <meta charset="utf-8">
-<link rel="stylesheet" href="style.css">
+<link rel="stylesheet" href="../style/style.css">
 </head>
 <body>
-  <h1><a href="main.html" color:black>KHU Chatting service</a></h1>
+  <h1><a href="../main.html" color:black>KHU Chatting service</a></h1>
-  <img src="image/main2.jpg" class="image">
+  <img src="../image/main2.jpg" class="image">
 <div id="grid">
   <div id="category">
     <ol>
       <li><a href="whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
-      <li><a href="loginmain.html" class="saw">로그인</a></li>
+      <li><a href="../loginmain.html" class="saw">로그인</a></li>
-      <li><a href="signinmain.html" class="saw">회원가입</a></li>
+      <li><a href="../signinmain.html" class="saw">회원가입</a></li>
-      <li><a href="signinmain.html" class="saw">문의사항</a></li>
+      <li><a href="../signinmain.html" class="saw">문의사항</a></li>
-      <li><a href="afterlogin.html" class="saw">로그인이후</a></li>
+      <li><a href="../afterlogin.html" class="saw">로그인이후</a></li>
     </ol>
   </div>
       <div id="article">
--- a/front/web/signinmain.html
View file @365d2d4
+++ b/front/web/signinmain.html
View file @365d2d4
@@ -3,8 +3,8 @@
 <head>
 <title>KHU KHU Chat</title>
 <meta charset="utf-8">
-<link rel="stylesheet" href="style.css">
+<link rel="stylesheet" href="style/style.css">
-<script src="validation.js"></script>
+<script src="JS/validation.js"></script>
 </head>
 <body>
@@ -14,7 +14,7 @@
 <div class="media" id="grid">
   <div id="category">
     <ol class="center">
-      <li><a href="whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
+      <li><a href="service/whatiskhuchat.html" class="saw">What is KHU chat? </a></li>
       <li><a href="loginmain.html" class="saw">로그인</a></li>
       <li><a href="signinmain.html" class="saw">회원가입</a></li>
       <li><a href="question.html" class="saw">문의사항</a></li>
@@ -26,20 +26,20 @@
         <div id="inputset">
         <form class="signinform" action="loginmain.html" onsubmit="return checkValidation()"  method="post">
           <label for="email">이메일:</label><br>
-          <input id="eValidation"type="text" name="email" placeholder="이메일을 입력하세요." required><br>
+          <input id="eValidation"type="text" name="email" placeholder="이메일을 입력하세요." ><br>
           <label for="password">비밀번호:</label><br>
-          <input id="fValidation" type="password" name="password" placeholder="비밀번호를 입력하세요." required><br>
+          <input id="fValidation" type="password" name="password" placeholder="비밀번호를 입력하세요." ><br>
           <label for="password">비밀번호 확인:</label><br>
-          <input id="sValidation" type="password" name="checkpassword" placeholder="비밀번호를 입력하세요." required><br>
+          <input id="sValidation" type="password" name="checkpassword" placeholder="비밀번호를 입력하세요." ><br>
           <label for="name">이름:</label><br>
-          <input type="text" name="name"placeholder="이름을 입력하세요." required><br>
+          <input type="text" name="name"placeholder="이름을 입력하세요." ><br>
           <label for="age">나이:</label><br>
-          <input type="text" name="age" placeholder="나이를 입력하세요." required><br><br>
+          <input type="text" name="age" placeholder="나이를 입력하세요." ><br><br>
           <label for="sex">성별:</label><br>
           <input type="radio" value="man" name="sex">남자<br>
@@ -57,7 +57,10 @@
           <input type="checkbox" value="study" name="interesting">공부<br>
           <input type="checkbox" value="coding" name="interesting">코딩<br><br>
-          <input type="submit" value="회원가입신청">
+          <input type="submit" value="회원가입신청" >
+
+
+
         </form>
         </div>
   </div>
--- a/front/web/style.css → front/web/style/style.css
View file @365d2d4
+++ b/front/web/style.css → front/web/style/style.css
View file @365d2d4
 <style>
+  title{
+
+  }
   body
   {
     margin:0;
@@ -17,7 +20,7 @@
     }
   ol
   {
-      border-right:1px solid gray;
+
       width:150px;
       margin:50px;
       padding:20px;
@@ -62,7 +65,8 @@
   {
       padding-top: 10px;
       padding-bottom: 10px;
-      padding-left: 20px;
+      padding-left: 130px;
+      border-left:1px solid gray;
       /*grid안에 #article */
   }
@@ -109,7 +113,7 @@
               padding-top: 10px;
               padding-bottom: 10px;
               padding-left: 20px;
-
+              display: inline-block;
               /*grid안에 #article */
           }
   }
--- a/front/web/test.md
View file @365d2d4
+++ b/front/web/test.md
View file @365d2d4
 # Capstone design
-test
+# function을 만들어서 html 페이지 입력 받아오기
+
+#html 이름을 수정할때마다 메인페이지의 모든 이름을 수정해야해서 까다롭다