Skip to content
Snippets Groups Projects
Commit d518eb84 authored by BinBin's avatar BinBin
Browse files

전체 기능 구현 완료

parent 76e11210
Branches
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 85 additions and 53 deletions
campics_/content/urls.py
+ 2
− 1
View file @ d518eb84
from django.urls import path
from .views import UploadFeed, LikeFeed, ViewFeed, ReportFeed, DeleteFeed, searchUniv, searchUser
from .views import UploadFeed, LikeFeed, ViewFeed, ReportFeed, DeleteFeed, searchUniv, searchUser, ShowUnivFeed
urlpatterns = [
......@@ -12,5 +12,6 @@ urlpatterns = [
path('delete', DeleteFeed.as_view(), name='delete_feed'),
path('searchUniv', searchUniv.as_view(), name='seacrh_univ'),
path('searchUser', searchUser.as_view(), name='search_user'),
path('showUnivFeed', ShowUnivFeed.as_view(), name='showUnivFeed'),
]
campics_/content/views.py
+ 21
− 19
View file @ d518eb84
......@@ -146,13 +146,14 @@ class searchUniv(APIView):
univ_list = Univ.objects.filter(univ__contains=search_word).values('univ').order_by('univ')
user_list = None
feed_list = None
message = None
if univ_list.count() == 0:
message = '검색한 정보가 없습니다.'
return render(request,
'jinstagram/search.html',
context=dict(univ_list=univ_list, user_list=user_list, message=message))
context=dict(feed_list=feed_list, univ_list=univ_list, user_list=user_list, message=message))
class searchUser(APIView):
......@@ -163,27 +164,28 @@ class searchUser(APIView):
print(user_list)
univ_list = None
feed_list = None
message = None
if user_list.count() == 0:
message = '검색한 정보가 없습니다.'
return render(request,
'jinstagram/search.html',
context=dict(univ_list=univ_list, user_list=user_list, message=message))
# class showUnivPost(APIView):
# def get(self, request):
# univ = request.data.get('univ')
# # search_word = 's1'
# post_list = Feed.objects.filter(univ__contains=univ) # .values() 뭐 필요?
# post_list = None
# user_list = None
# univ_list = None
# message = None
# if post_list.count() == 0:
# message = '검색한 정보가 없습니다.'
# return render(request,
# 'jinstagram/search.html',
# context=dict(post_list=post_list, message=message))
\ No newline at end of file
context=dict(feed_list=feed_list, univ_list=univ_list, user_list=user_list, message=message))
class ShowUnivFeed(APIView):
def get(self, request):
univ = request.GET.get('univ')
print(univ)
feed_list = Feed.objects.filter(univ=univ) # .values() 뭐 필요?
print(feed_list)
user_list = None
univ_list = None
message = None
if feed_list.count() == 0:
message = '검색한 정보가 없습니다.'
return render(request,
'jinstagram/search.html',
context=dict(feed_list=feed_list, univ_list=univ_list, user_list=user_list, message=message))
\ No newline at end of file
campics_/templates/jinstagram/imgboard.html
+ 6
− 2
View file @ d518eb84
......@@ -252,7 +252,10 @@
<div class="text-bg-primary py-1" >
<div class="row align-middle">
<div class="col col-2 text-start">
<a href="{% url 'login' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<!-- <a href="{% url 'login' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a> -->
<a href="javascript:history.back();" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a>
</div>
......@@ -405,6 +408,7 @@
let is_view = true;
console.log(feed_id);
console.log(email);
$.ajax({
url: "/content/view",
data: {
......@@ -415,7 +419,7 @@
method: "POST",
dataType: "json",
success: function (data){
location.replace("{% url 'post'%}?id=" + feed_id);
location.href = "{% url 'post'%}?id=" + feed_id;
},
error:function (request, status, error){
let data = JSON.parse(request.responseText);
......
campics_/templates/jinstagram/post.html
+ 5
− 2
View file @ d518eb84
......@@ -22,7 +22,10 @@
<div class="text-bg-primary py-1" >
<div class="row align-middle">
<div class="col col-2 text-start">
{% if not feed_type %}
<a href="javascript:history.go(-1);" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a>
<!-- {% if not feed_type %}
<a href="{% url 'main' %}?type=photozone" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a>
......@@ -30,7 +33,7 @@
<a href="{% url 'main' %}?type=scene" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a>
{% endif %}
{% endif %} -->
</div>
<div class="col col-8 text-center ">
<span class="fs-3 fw-normal align-middle" >게시글 상세보기</span>
......
campics_/templates/jinstagram/profile.html
+ 5
− 2
View file @ d518eb84
......@@ -29,7 +29,10 @@
<div class="text-bg-primary py-1" >
<div class="row align-middle">
<div class="col col-2 text-start">
<a href="{% url 'login' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<!-- <a href="{% url 'login' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a> -->
<a href="javascript:history.back();" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a>
</div>
......@@ -115,7 +118,7 @@
method: "POST",
dataType: "json",
success: function (data){
location.replace("{% url 'post'%}?id=" + feed_id);
location.href = "{% url 'post'%}?id=" + feed_id;
},
error:function (request, status, error){
let data = JSON.parse(request.responseText);
......
campics_/templates/jinstagram/ranking.html
+ 5
− 2
View file @ d518eb84
......@@ -22,9 +22,12 @@
<div class="text-bg-primary py-1" >
<div class="row align-middle">
<div class="col col-2 text-start">
<a href="{% url 'login' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<a href="javascript:history.back();" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a>
<!-- <a href="{% url 'login' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a> -->
</div>
<div class="col col-8 text-center ">
<span class="fs-2 fw-semibold align-middle" >순위</span>
......@@ -49,7 +52,7 @@
{% for univ in univ_list %}
<tr>
<td class="align-middle">{{forloop.counter}}</td>
<td class="align-middle">{{univ.univ}}</td>
<td class="align-middle"> <a href="/content/showUnivFeed?univ={{univ.univ}}"> {{univ.univ}}</a></td>
<td class="align-middle">{{univ.score}}</td>
</tr>
{% endfor %}
......
campics_/templates/jinstagram/search.html
+ 41
− 25
View file @ d518eb84
......@@ -28,7 +28,10 @@
<div class="text-bg-primary py-1" >
<div class="row align-middle">
<div class="col col-2 text-start">
<a href="{% url 'login' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<!-- <a href="{% url 'login' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a> -->
<a href="javascript:history.back();" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i>
</a>
</div>
......@@ -58,6 +61,12 @@
</div>
</form>
{% if message == '검색한 정보가 없습니다.' %}
<div class="alert alert-danger col-11 align-self-center mt-5" role="alert">
{{message}}
</div>
{% endif %}
<ul class="list-group mt-5" id = "univlist">
{% for univ in univ_list %}
<li class="univboard list-group-item list-group-item-action" id="{{ univ.univ }}">{{univ.univ}}</li>
......@@ -73,11 +82,18 @@
{% endfor %}
</div>
</div>
{% if message == '검색한 정보가 없습니다.' %}
<div class="alert alert-danger col-11 align-self-center" role="alert">
{{message}}
<div class="mt-5" id="feedlist">
<div class="row " style="display: flex; flex-direction: row">
{% for feed in feed_list %}
<div class="col col-4 g-1 mt-2 ">
<img class="row_feed img-fluid img-thumbnail" id="{{ feed.id}}" src="{% get_media_prefix %}{{ feed.image }}" >
</div>
{% endfor %}
</div>
{% endif %}
</div>
</div>
</div>
......@@ -122,27 +138,25 @@
<!-- Page bottom End -->
</div>
<script>
$(document).ready(function(){
if( '{{feed_list|length }}' > 0 ) {
$("#univlist").hide();
$("#writerlist").hide();
}
else if( '{{feed_list|length }}' == 0 ) {
$("#feedlist").hide();
}
});
// 학교 게시글 리스트 조회
$('.univboard').click(function(){
console.log("클릭했다");
let univ = $(this).attr('id');
console.log(univ);
$.ajax({
url: "/content/view",
data: {
univ : univ
},
method: "POST",
dataType: "json",
success: function (data){
},
error:function (request, status, error){
let data = JSON.parse(request.responseText);
console.log(data.message);
alert(data.message);
}
});
location.href="/content/showUnivFeed?univ=" + univ;
});
......@@ -155,9 +169,11 @@
if ( $("#condition").val() == 1) {
$("#univlist").show();
$("#writerlist").hide();
$("#feedlist").hide();
}else if ( $("#condition").val() == 2) {
$("#univlist").hide();
$("#writerlist").show();
$("#feedlist").hide();
}
}
......@@ -177,7 +193,7 @@
method: "POST",
dataType: "json",
success: function (data){
location.replace("{% url 'post'%}?id=" + feed_id);
location.href = "{% url 'post'%}?id=" + feed_id;
},
error:function (request, status, error){
let data = JSON.parse(request.responseText);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment

feedback to tooltime@ajou.ac.kr or hwan@ajou.ac.kr