From 367c15235866dd7cc43a8850a97773d520dd63cc Mon Sep 17 00:00:00 2001
From: BinBin <puding2564@gmail.com>
Date: Sat, 11 Jun 2022 21:55:02 +0900
Subject: [PATCH] =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20?=
=?UTF-8?q?=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
campics_/templates/jinstagram/imgboard.html | 4 ++--
campics_/templates/jinstagram/post.html | 17 ++++++++---------
campics_/templates/user/login.html | 3 ++-
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/campics_/templates/jinstagram/imgboard.html b/campics_/templates/jinstagram/imgboard.html
index dadb4de..f733020 100644
--- a/campics_/templates/jinstagram/imgboard.html
+++ b/campics_/templates/jinstagram/imgboard.html
@@ -261,11 +261,11 @@
</div>
{% if type == 'photozone' %}
<div class="col col-8 text-center ">
- <span class="fs-3 fw-normal align-middle" >{{ user.univ }} 전경 게시판</span>
+ <span class="fs-3 fw-normal align-middle" >{{ user.univ }} 포토존 게시판</span>
</div>
{% else %}
<div class="col col-8 text-center ">
- <span class="fs-3 fw-normal align-middle" >{{ user.univ }} 풍경 게시판</span>
+ <span class="fs-3 fw-normal align-middle" >{{ user.univ }} 전경 게시판</span>
</div>
{% endif %}
<div class="col col-2 text-end" >
diff --git a/campics_/templates/jinstagram/post.html b/campics_/templates/jinstagram/post.html
index 722c813..76830d0 100644
--- a/campics_/templates/jinstagram/post.html
+++ b/campics_/templates/jinstagram/post.html
@@ -55,17 +55,17 @@
{% if is_like %}
<label class="col col-form-label"><i class="like bi bi-hand-thumbs-up-fill fs-5"></i> : {{like_count}} 조회수 : {{view_count}}
{% if is_report %}
- 신고 : <i class="report bi bi-exclamation-circle"></i></label>
- {% else %}
신고 : <i class="report bi bi-exclamation-circle-fill"></i></label>
+ {% else %}
+ 신고 : <i class="report bi bi-exclamation-circle"></i></label>
{% endif %}
{% else %}
<label class="col col-form-label"><i class="like bi bi-hand-thumbs-up fs-5"></i> : {{like_count}} 조회수 : {{view_count}}
{% if is_report %}
- 신고 : <i class="report bi bi-exclamation-circle"></i></label>
- {% else %}
신고 : <i class="report bi bi-exclamation-circle-fill"></i></label>
+ {% else %}
+ 신고 : <i class="report bi bi-exclamation-circle"></i></label>
{% endif %}
{% endif %}
@@ -133,8 +133,7 @@
console.log("클릭했다");
let feed_id = "{{id}}"
let email = "{{ user_email }}";
- console.log(feed_id);
- console.log(email);
+ console.log('{{feed_type}}');
$.ajax({
url: "/content/delete",
@@ -146,7 +145,7 @@
dataType: "json",
success: function (data){
alert(data.message);
- if ( '{{feed_type}}') {
+ if ( '{{feed_type}}'=='False') {
location.replace("{% url 'main'%}?type=photozone");
}
else {
@@ -203,7 +202,7 @@
if ('{{is_report}}'=='False') {
is_report = true;
}
-
+
$.ajax({
url: "/content/report",
data: {
@@ -216,7 +215,7 @@
success: function (data){
if (data.message == '신고 5회 누적 게시글 삭제 완료') {
console.log(data.message)
- if ( '{{feed_type}}') {
+ if ( '{{feed_type}}'=='False') {
location.replace("{% url 'main'%}?type=photozone");
}
else {
diff --git a/campics_/templates/user/login.html b/campics_/templates/user/login.html
index 9f96dd8..155b846 100644
--- a/campics_/templates/user/login.html
+++ b/campics_/templates/user/login.html
@@ -61,7 +61,8 @@
method: "POST",
dataType: "json",
success: function (data){
- location.replace("{% url 'main' %}?type=photozone");
+ // location.replace("{% url 'main' %}?type=photozone");
+ location.href = "{% url 'main' %}?type=photozone";
},
error:function (request, status, error){
let data = JSON.parse(request.responseText);
--
GitLab