Fishing

diaryProject/Account/static/index.css

@@ -0,0 +1,6 @@
+img {
+    max-width: 200px;
+    max-height: 200px;
+    margin: 0 auto;
+    border-radius: 50%;
+}

diaryProject/Account/static/signup.css

@@ -0,0 +1,30 @@
+
+
+.login_btn {
+    width: 100px;
+    height: 40px;
+    left: 68px;
+    top: 505px;
+    background: #896AC9;
+    border-radius: 12px;
+    border: 0px;
+    font-weight: bolder;
+    color: white;
+    font-size: 20px;
+}
+
+.signup_btn {
+    display: flex;
+    justify-content: center;
+}
+
+.signup {
+    text-decoration: underline;
+    text-underline-position: under;
+    text-decoration-color: #896AC9;
+    margin-left: -150px;
+}
+
+.login {
+    color: #A5ADB2;
+}

diaryProject/Account/templates/index.html

@@ -0,0 +1,28 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block style %}
+{% comment %} 여기에 연결할 css <link/> 추가 {% endcomment %}
+{% endblock style %}
+{% block js %}
+{% comment %} 여기에 연결할 js <script/> 추가 {% endcomment %}
+{% endblock js %}
+{% block content %}
+    <div class="navbar_container">
+        <li class="navbar_logo">
+            <img src="#">
+        </li>
+        {% if user.is_authenticated %}
+        <span class="navbar_menu_item">안녕하세요! {{user.username}} 님!</span>
+        <img class="profile_pic" src="{{request.user.profile.profile_pic.url}}">
+        <a href="{% url 'logout' %}">Logout</a>
+        {% else %}
+        <li class="navbar_menu_item">
+            <a href="{% url 'login' %}">Login</a>
+        </li>
+        <li class="navbar_menu_item">
+            <a href="{% url 'signup' %}">Sign Up</a>
+        </li>
+        {% endif %}
+    </div>
+
+{% endblock content %}

diaryProject/Account/templates/signup.html

@@ -0,0 +1,40 @@
+{% extends 'base.html' %}
+{% load static %}
+{% block style %}
+    <link rel="stylesheet" type="text/css" href="{% static 'signup.css' %}">
+{% endblock style %}
+{% block content %}
+    <div class="navbar">
+        <div class="logo">
+            <img src="../static/images/우주 일기.png">
+        </div>
+    </div>
+
+    <div class="container">
+        <div class="title">
+            <a class="login" href="{% url 'login' %}" style="margin-top: 30px;">Login</a>
+            <a href="{% url 'signup' %}" class="signup" style="margin-top: 30px;">Sign Up</a>
+        </div>
+        <section id="signup">
+            <form method="POST">
+                {% csrf_token %}
+                {% if error %}
+                <p class="error">{{error}}</p>
+                {% endif %}
+                <div class="signupbox">
+                    <!-- <p>Profile Picture</p>
+                    <input name="image" type="file"> -->
+                    <p>Username</p>
+                    <input type="text" name="username">
+                    <p>Password</p>
+                    <input type="password" name="password">
+                    <br>
+                    <br>
+                    <div class="signup_btn">
+                        <button>Sign Up</button>
+                    </div>
+                </div>
+            </form>
+        </section>
+    </div>
+{% endblock content %}

diaryProject/MyPage/static/calendar.css

@@ -12,11 +12,11 @@
 
 .day {
     padding-top: 8px;
-    padding-bottom: 3px;
-    width: calc(98%/7);
+    /* padding-bottom: 3px; */
+    width: calc(98% / 7);
     padding-left: 0.5px;
     text-align: center;
-    transition: all .3s;
+    transition: all 0.3s;
     color: white;
     font-weight: bold;
 }
@@ -36,7 +36,7 @@
     background-color: white;
     border: 1px solid black;
     border-radius: 5px;
-    transition: all .3s;
+    transition: all 0.3s;
     font-weight: bold;
 }
 
@@ -50,17 +50,19 @@
     width: 20px;
     height: 20px;
     border: none;
-    font-size: 16px; 
+    font-size: 16px;
     line-height: 15px;
     background-color: transparent;
     cursor: pointer;
 }
 
-.day:nth-child(7n+1), .date:nth-child(7n+1) {
+.day:nth-child(7n + 1),
+.date:nth-child(7n + 1) {
     color: #d13e3e;
 }
 
-.day:nth-child(7n), .date:nth-child(7n) {
+.day:nth-child(7n),
+.date:nth-child(7n) {
     color: #396ee2;
 }
 
@@ -89,4 +91,4 @@
 
 .event-itm {
     font-size: 0;
-}
+}

diaryProject/MyPage/static/mypage.css

@@ -13,10 +13,11 @@
 .profile {
     width: 100px;
     height: 100px;
-    border-radius: 100%; 
-    border: 10px solid #fadc72;   
+    border-radius: 100%;
+    border: 10px solid #fadc72;
     background-color: white;
     margin-left: 40px;
+    margin-top: 10%;
 }
 
 .name-wrap {
@@ -31,6 +32,7 @@
 }
 
 .level-name {
+    margin-top: 5%;
     background-color: #fadc72;
     padding: 4px 4px;
     border-radius: 10px;
@@ -44,18 +46,16 @@
     flex-direction: row;
 }
 
-
 .fishing-bag > img {
-    margin-top: 0%;
+    margin-top: 10%;
     margin-left: 20px;
-    width: 85%;
+    width: 50%;
     height: 90%;
 }
 
 .calendar {
     width: 90%;
-    margin: 0px auto;
-    height: 40%;
+    margin: 5% auto;
     background-color: rgba(255, 255, 255, 0.384);
     border-radius: 10px;
 }
@@ -85,10 +85,9 @@
     margin: 0px auto;
 }
 
-
 .main-btn img {
     position: absolute;
-    width: 100%; 
+    width: 100%;
     height: 140%;
     margin: 0px auto;
 }
@@ -99,7 +98,6 @@
     height: 140%;
     margin: 0px auto;
     opacity: 60%;
-
 }
 
 .flex-col {
@@ -115,7 +113,6 @@
 }
 
 .calendar_nav {
-
     display: flex;
     flex-direction: row;
     justify-content: center;
@@ -149,14 +146,16 @@
     font-size: 20px;
 }
 
-
 .monthly-total {
     position: relative;
-    margin-top: 5%;
-    width: 90%;
-    height: 60%;
+    width: 100%;
+    height: 55%;
     background-color: white;
     border-radius: 10px;
-    margin-right: 20px;
+    margin-right: 10%;
     position: relative;
 }
+
+.fishing-rod > img {
+    bottom: 30px;
+}