Merge pull request #107 from yaena1223/main

로그아웃 버튼 모든 페이지에 뜨도록
LikeLion-at-DGU · Jul 10, 2022 · a7edf37 · a7edf37
2 parents 64c7537 + 22b198d
commit a7edf37
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 4 deletions.
diff --git a/runningmate/mateapp/__pycache__/views.cpython-310.pyc b/runningmate/mateapp/__pycache__/views.cpython-310.pyc
diff --git a/runningmate/mateapp/templates/mateapp/calendar.html b/runningmate/mateapp/templates/mateapp/calendar.html
@@ -298,7 +298,7 @@
   <!-- 리스트에 담긴 걸 포문 두개로 나눠서 투두 하나씩 불러와서 if문으로
   불러온 하나의 투두랑 연결된 하나의 프로젝트가 투두 모델에서 외래 -->
 </div>
-<a href="{% url 'account_logout' %}"><img id = "logout_button" src =  "{% static 'images/logout.png' %}"/></a>
+<a href="{% url 'account_logout' %}"><img id = "logout_button" src =  "{% static 'images/logout.png' %}" style="position: fixed;"/></a>
 
 
 <script>

diff --git a/runningmate/mateapp/templates/mateapp/create_schedule.html b/runningmate/mateapp/templates/mateapp/create_schedule.html
@@ -86,5 +86,5 @@ <h2>할 일이 있나요? 일정을 추가해주세요!</h2>
         </form>
     </div>    
 </div>
-
+<a href="{% url 'account_logout' %}"><img id = "logout_button" src =  "{% static 'images/logout.png' %}" style="position: fixed;"/></a>
 {% endblock %}
diff --git a/runningmate/mateapp/templates/mateapp/project.html b/runningmate/mateapp/templates/mateapp/project.html
@@ -172,4 +172,5 @@ <h3>{{project.summary}}</h3>
             </div>
 
 </div> 
+<a href="{% url 'account_logout' %}"><img id = "logout_button" src =  "{% static 'images/logout.png' %}" style="position: fixed;"/></a>
 {% endblock %}
diff --git a/runningmate/mateapp/templates/mateapp/project_post.html b/runningmate/mateapp/templates/mateapp/project_post.html
@@ -109,7 +109,7 @@ <h3>{{project.summary}}</h3>
         {% for comment in boards %}
         <div class = "item3" id = "{{comment.id}}">
             <div id = "mimoji_place" >
-                <section id = "mimoji" style="width: 70px; height:70px; border-radius: 50%; background:{{project.color}}; ;margin:10px;">
+                <section id = "mimoji" style="width: 70px; height:70px; border-radius: 50%; background:{{project.color}}; ;margin:10px;background-image: url({{ user.profile.profile.url }})">
 
                 </section>
             </div>
@@ -137,7 +137,8 @@ <h3>{{project.summary}}</h3>
                         {% endif %}
 
                         <li class = "page-item active">
-                            <a class = "page-link"border: none;>{{boards.number}}/{{boards.paginator.num_pages}}</a>
+                            <a class = "page-link"border: none;>
+                                {{boards.number}}/{{boards.paginator.num_pages}}</a>
                         </li>
 
                         {% if boards.has_next %}
@@ -161,4 +162,5 @@ <h3>{{project.summary}}</h3>
     </div>
 
 </div>
+<a href="{% url 'account_logout' %}"><img id = "logout_button" src =  "{% static 'images/logout.png' %}" style="position: fixed;"/></a>
 {% endblock %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -86,5 +86,5 @@ <h2>할 일이 있나요? 일정을 추가해주세요!</h2> @@
             </form>
         </div>
     </div>
+    <a href="{% url 'account_logout' %}"><img id = "logout_button" src =  "{% static 'images/logout.png' %}" style="position: fixed;"/></a>
     {% endblock %}