diff --git a/campics_/templates/jinstagram/imgboard.html b/campics_/templates/jinstagram/imgboard.html index dadb4de4ffaf00543062f83188cf3d4264107abb..f73302064990183e0bdd445ce138bb7a36640b54 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 722c81321bf1f8184ee2da205b7644a179ce2744..76830d0cf48a63d42c4212dc4c0d560d6e9e3061 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 9f96dd84d12eb34d68dd92a379098be2dd34ec0f..155b846b40bd87997c3d15901485376a23b4abc1 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);