모든 페이지 연결

kimyenida · Apr 13, 2023 · d44ba8b · d44ba8b
1 parent 3ec4d98
commit d44ba8b
Show file tree

Hide file tree

Showing 16 changed files with 262 additions and 37 deletions.
diff --git a/Challenge.html b/Challenge.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <link href="https://fonts.googleapis.com/css2?family=Song+Myung&display=swap" rel="stylesheet">
     <title>Challenge</title>
     <style>
         .display {
@@ -77,7 +78,7 @@
     width: 286px;
     height: 306px;
     left: 54px;
-    top: 250px;" src="C:\git_hub\Comma\img\challenge.png" />
+    top: 250px;" src="img/challenge.png" />
 
     <h1 style="position: absolute;
     width: 200px;
@@ -99,7 +100,8 @@
         font-weight: 400;
         font-size: 20px;
         line-height: 24px;
-        color: #FFFFFF;">돈으로 받을래요</h1>
+        color: #FFFFFF;"
+        onclick="location.href='MyPage.html'">돈으로 받을래요</h1>
     </div>
 
     <div class="donate">

diff --git a/MyPage.html b/MyPage.html
@@ -3,6 +3,7 @@
 
 <head>
     <meta charset="UTF-8">
+    <link href="https://fonts.googleapis.com/css2?family=Song+Myung&display=swap" rel="stylesheet">
     <title>MyPage</title>
     <style>
         .display {
@@ -132,15 +133,28 @@
         <img style="float: left; position: relative; width: 11px; height: 17px; left: 60px; top: 20px;"
             src="img/Chevron.png" />
     </div>
+    <div>
+        <button
+        style="position: absolute;
+        width: 321px;
+        height: 55px;
+        left: 34px;
+        top: 676px;
+        
+        background: #FA9953;
+        border-radius: 10px; border: none;"
+        type="button"
+        onclick="location.href='Challenge.html'">챌린지 달성</button>
+    </div>
     <div class="bottom_menu">
         <div>
             <img style="float: left" src="img/menu_write.png" onclick="location.href='save_result.html'">
         </div>
         <div>
-            <img style="float: left" src="img/menu_book.png">
+            <img style="float: left" src="img/menu_book.png" onclick="location.href='today_recommend.html'">
         </div>
         <div>
-            <img style="float: left" src="img/menu_home.png">
+            <img style="float: left" src="img/menu_home.png"onclick="location.href='chatgpt.html'">
         </div>
         <div>
             <img style="float: left" src="img/menu_mypage.png" onclick="location.href='MyPage.html'">

diff --git a/assets/css/main.css b/assets/css/main.css
@@ -1589,4 +1589,18 @@ input, select, textarea {
 				max-width: 100%;
 			}
 
-		}
+		}
+		.bottom_menu {
+            position: fixed;
+            width: 390px;
+            height: 90px;
+            bottom: 0px;
+            background-color: white
+        }
+        .bottom_menu>div {
+            float: left;
+            width: 20%;
+            height: 100%;
+            text-align: center;
+            padding-top: 20px;
+        }
diff --git a/chatgpt.html b/chatgpt.html
@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" integrity="sha384-zCbKRCUGaJDkqS1kPbPd7TveP5iyJE0EjAuZQTgFLD2ylzuqKfdKlfG/eSrtxUkn" crossorigin="anonymous">
     <link rel="stylesheet" href="style.css">
+    <link href="https://fonts.googleapis.com/css2?family=Song+Myung&display=swap" rel="stylesheet">
     <title>'Chat GPT'</title>
 </head>
 <body>
@@ -22,7 +23,24 @@ <h3 class="keyword">키워드</h3>
         <p class="white_box">
             오늘 힘들었겠지만, 스스로를 비판하는건 자신만 힘들게 할 뿐이에요. 그럴수록 스스로를 격려하고 사랑해주세요
         </p>
-        <button class="save_btn">저장</button>
+        <button class="save_btn" onclick="location.href='gotest.html'">저장</button>
     </article>
+    <div class="bottom_menu">
+        <div>
+            <img style="float: left" src="img/menu_write.png" onclick="location.href='save_result.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_book.png" onclick="location.href='today_recommend.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_home.png"onclick="location.href='chatgpt.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_mypage.png" onclick="location.href='MyPage.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_setting.png">
+        </div>
+    </div>
 </body>
 </html>
diff --git a/consult.html b/consult.html
@@ -5,6 +5,7 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="style_consult.css">
+    <link href="https://fonts.googleapis.com/css2?family=Song+Myung&display=swap" rel="stylesheet">
 
 </head>
 
@@ -15,6 +16,23 @@ <h1>상담사 매칭</h1>
     <div class="boxthree" style="cursor:pointer;" onclick="location.href='https://insungtherapy.modoo.at/';">인성심리상담센터 바로가기</div>
     <div class="boxfour" style="cursor:pointer;" onclick="location.href='https://www.moe.go.kr/main.do?s=moe';">교육부 바로가기</div>
 
+    <div class="bottom_menu">
+        <div>
+            <img style="float: left" src="img/menu_write.png" onclick="location.href='save_result.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_book.png" onclick="location.href='today_recommend.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_home.png"onclick="location.href='chatgpt.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_mypage.png" onclick="location.href='MyPage.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_setting.png">
+        </div>
+    </div>
 </body>
 
 </html>
diff --git a/gotest.html b/gotest.html
@@ -5,14 +5,32 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <link rel="stylesheet" href="style_gotest.css">
+    <link href="https://fonts.googleapis.com/css2?family=Song+Myung&display=swap" rel="stylesheet">
 
 </head>
 
 <body>
     <h1> 인성 테스트 바로 가기</h1>
     <div class="boxone" style="cursor:pointer;" onclick="location.href='https://www.idrlabs.com/kr/multiphasic-personality/test.php';">다면적 인성 테스트</div>
     <div class="boxtwo" style="cursor:pointer;" onclick="location.href='http://www.idk.co.kr/freetest/ft_info.asp';">무료 인성 검사</div>
-
+    <button type="button" id="toconsult" onclick="location.href='consult.html'">상담사한테 상담받고 싶다면?</button>
+    <div class="bottom_menu">
+        <div>
+            <img style="float: left" src="img/menu_write.png" onclick="location.href='save_result.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_book.png" onclick="location.href='today_recommend.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_home.png"onclick="location.href='chatgpt.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_mypage.png" onclick="location.href='MyPage.html'">
+        </div>
+        <div>
+            <img style="float: left" src="img/menu_setting.png">
+        </div>
+    </div>
 </body>
 
 </html>
diff --git a/more_recommend.html b/more_recommend.html
@@ -140,6 +140,23 @@ <h2>❝김창옥 교수 #05 | <br/>밝은 사람이 되고 싶다면?<br/> 단
 
 
 					</div>
+					<div class="bottom_menu">
+						<div>
+							<img style="float: left" src="img/menu_write.png" onclick="location.href='save_result.html'">
+						</div>
+						<div>
+							<img style="float: left" src="img/menu_book.png" onclick="location.href='today_recommend.html'">
+						</div>
+						<div>
+							<img style="float: left" src="img/menu_home.png"onclick="location.href='chatgpt.html'">
+						</div>
+						<div>
+							<img style="float: left" src="img/menu_mypage.png" onclick="location.href='MyPage.html'">
+						</div>
+						<div>
+							<img style="float: left" src="img/menu_setting.png">
+						</div>
+					</div>
 
 				<!-- Footer -->
 					<footer id="footer">

diff --git a/save_result.html b/save_result.html
@@ -14,9 +14,10 @@
         .box {
             position: absolute;
             width: 300px;
-            height: 1418px;
+            height: fit-content;
             left: 39px;
             top: 173px;
+            margin-bottom: 200px;
 
             background: #FFDAAF;
             box-shadow: inset 0px 4px 4px rgba(0, 0, 0, 0.25);
@@ -26,18 +27,19 @@
             text-align: center;
         }
         .result_box {
-            width: 267px;
-            height: 134px;
-
+            position: relative;
+            width: 280px;
+            height: fit-content;
+            padding: 5px 10px;
             background: rgba(255, 255, 255, 0.5);
             border-radius: 10px;
             vertical-align: middle;
         }
         .bottom_menu {
             position: fixed;
             width: 390px;
-            height: 90.5px;
-            top: 761px;
+            height: 70px;
+            bottom: 0px;
             background-color: white
         }
         .bottom_menu>div {
@@ -47,10 +49,26 @@
             text-align: center;
             padding-top: 20px;
         }
+        .answer_box {
+            position: relative;
+            width: 280px;
+            padding: 5px 10px;
+            margin-bottom: 40px;
+
+            height: fit-content;
+            vertical-align: middle;
+
+            background: #FFC672;
+            border-radius: 10px;
+        }
+        #footer {
+            bottom: 60px;
+            margin: 3em;
+        }
     </style>
 </head>
 <body>
-    <div class=".display">
+    <div class="display">
     <h2 style="position: absolute;
     width: 212px;
     height: 40px;
@@ -70,40 +88,56 @@
     font-size: 15px;
     line-height: 18px;
     color: #5E5E5E;">2023년 4월 11일</p>
+    <div class="container">
     <div class="box">
         <div>
             <p>"오늘 기분은 어떤가요?"</p>
-            <p>기록</p>
+            <div class="answer_box">
+            <p>오늘은 힘들어요,,, 시험기간이라 공부해야 되는데 날씨가 너무 좋아서 놀고 싶어요. 근데 피곤해서 그냥 누워서 자고 싶어요.</p>
+        </div>
         </div>
         <div>
             <p>"오늘 가장 기뻤던 일은<br/>무엇인가요?"</p>
-            <p>기록</p>
+            <div class="answer_box">
+            <p>떡볶이 먹을 때요. 너무 맛있었어요,,</p>
+            </div>
         </div>
         <div>
             <p>"오늘 가장 보람찼던 일은<br/>무엇인가요?"</p>
-            <p>기록</p>
+            <div class="answer_box">
+            <p>길 가다가 쓰레기를 주웠어요. 저 좀 멋지지 않나요</p>
+        </div>
         </div>
         <div>
-            <p>"오늘 후회되는 일이<br/>있나요?"</p>
-            <p>기록</p>
+            <p>"오늘 후회되는 일이 있나요?"</p>
+            <div class="answer_box">
+            <p>아 어제 좀 더 잘걸</p>
+        </div>
         </div>
         <div>
-            <p>"내일은 무엇을 <br/>하고 싶나요?"</p>
-            <p>기록</p>
+            <p>"내일은 무엇을 하고 싶나요?"</p>
+            <div class="answer_box">
+            <p>아무것도 안할래요 그냥,,</p>
+        </div>
         </div>
         <div class="result_box">
-            분석 내용
+            <분석 내용>
+            <p style="text-align: center; line-height: 140%;">
+                시험공부에 대한 스트레스와 놀고 싶은 욕구가 충돌한 상황인데, 중요한 것은 시험공부를 잘 마무리하면 더 많은 자유 시간을 가질 수 있다는 것입니다. 집중력을 높이기 위해 작은 목표를 세우고 계획을 세우는 것이 좋습니다. 그리고 산책이나 기분 전환을 할 때는 스마트폰이나 인터넷을 이용하는 것보다는 책을 읽거나 문화생활을 하는 것이 좋습니다.
+            </p>
         </div>
     </div>
+    </div>
+
     <div class="bottom_menu">
         <div>
             <img style="float: left" src="img/menu_write.png" onclick="location.href='save_result.html'">
         </div>
         <div>
-            <img style="float: left" src="img/menu_book.png">
+            <img style="float: left" src="img/menu_book.png" onclick="location.href='today_recommend.html'">
         </div>
         <div>
-            <img style="float: left" src="img/menu_home.png">
+            <img style="float: left" src="img/menu_home.png"onclick="location.href='chatgpt.html'">
         </div>
         <div>
             <img style="float: left" src="img/menu_mypage.png" onclick="location.href='MyPage.html'">

diff --git a/signin.html b/signin.html
@@ -4,6 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="https://fonts.googleapis.com/css2?family=Song+Myung&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="style_signin.css">
 
 </head>
@@ -24,7 +25,7 @@ <h1>오늘의 쉼표</h1>
                 <label for="pw">비밀번호를 입력하세요</label>
             </div>
             <div class="btn-area">
-                <button type="submit">로그인</button>
+                <button type="submit" onclick="location.href='save_result.html'">로그인</button>
             </div>
         </form>
     </section>

diff --git a/signup.html b/signup.html
@@ -4,6 +4,7 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link href="https://fonts.googleapis.com/css2?family=Song+Myung&display=swap" rel="stylesheet">
     <link rel="stylesheet" href="style_signup.css">
 
 </head>

diff --git a/style.css b/style.css
@@ -56,4 +56,23 @@ article {
     border: none;
     border-radius: 10px;
     font-size: 20px;
+}
+
+.bottom_menu {
+    position: fixed;
+    width: 390px;
+    height: 90px;
+    bottom: 0px;
+    background-color: white;
+}
+.bottom_menu>div {
+    float: left;
+    width: 20%;
+    height: 100%;
+    text-align: center;
+    padding-top: 20px;
+}
+
+* {
+    font-family: 'Song Myung', serif;
 }