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

필터링, 검색, 좋아요, 삭제 부분 체크 필요

parent cb863f2f
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 317 additions and 100 deletions
campics_/content/migrations/0013_rename_views_feed_view_count_feedview_is_view_and_more.py 0 → 100644
+ 37
− 0
View file @ 59e2e590
# Generated by Django 4.0.4 on 2022-06-04 06:57
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('content', '0012_feedview_feed_type_feed_views_and_more'),
]
operations = [
migrations.RenameField(
model_name='feed',
old_name='views',
new_name='view_count',
),
migrations.AddField(
model_name='feedview',
name='is_view',
field=models.BooleanField(default=False),
),
migrations.AlterField(
model_name='feed',
name='like_count',
field=models.IntegerField(default=0),
),
migrations.AlterField(
model_name='feedview',
name='email',
field=models.CharField(blank=True, max_length=30, null=True),
),
migrations.AddIndex(
model_name='feedview',
index=models.Index(fields=['feed_id'], name='content_fee_feed_id_0b2735_idx'),
),
]
campics_/content/views.py
+ 8
− 8
View file @ 59e2e590
...@@ -170,14 +170,14 @@ class DeleteFeed(APIView): ...@@ -170,14 +170,14 @@ class DeleteFeed(APIView):
class searchUniv(APIView): class searchUniv(APIView):
def get(self, request): def get(self, request):
# search_word = request.data.get('univ') # search_word = request.data.get('univ')
search_word = '대학' # search_word = '대학'
# univ_list = Univ.objects.filter(univ__contains=search_word).values('univ')
univ_list = Univ.objects.filter(univ__contains=search_word).values('univ')
# if univ_list.count() == 0:
if univ_list.count() == 0: # return Response(status=404, data=dict(message='대학이 없습니다.'))
return Response(status=404, data=dict(message='대학이 없습니다.')) # else:
else: # return Response(status=200, data=dict(univ=univ_list))
return Response(status=200, data=dict(univ=univ_list)) return render(request, "jinstagram/search_result.html")
class searchUser(APIView): class searchUser(APIView):
def get(self, request): def get(self, request):
......
campics_/jinstagram/views.py
+ 14
− 8
View file @ 59e2e590
...@@ -25,6 +25,8 @@ class Main(APIView): ...@@ -25,6 +25,8 @@ class Main(APIView):
if order_condition == 'likesCount': if order_condition == 'likesCount':
feed_object_list.order_by('-like_count') feed_object_list.order_by('-like_count')
print(order_condition)
print(feed_object_list)
#################### ####################
row_feed_list = [] row_feed_list = []
...@@ -62,7 +64,9 @@ class Post(APIView): ...@@ -62,7 +64,9 @@ class Post(APIView):
if user is None: if user is None:
return render(request, 'user/login.html') return render(request, 'user/login.html')
id=request.data.get('id') if request.method == 'GET':
id=request.GET.get('id')
feed = Feed.objects.get(id=id) feed = Feed.objects.get(id=id)
like_count = FeedLike.objects.filter(feed_id=feed.id, is_like=True).count() like_count = FeedLike.objects.filter(feed_id=feed.id, is_like=True).count()
feed.like_count=like_count feed.like_count=like_count
...@@ -73,12 +77,14 @@ class Post(APIView): ...@@ -73,12 +77,14 @@ class Post(APIView):
feed.save() feed.save()
profile_image = User.objects.filter(email=feed.email).first().thumbnail or 'default_profile.jpg' profile_image = User.objects.filter(email=feed.email).first().thumbnail or 'default_profile.jpg'
print(like_count) # print(like_count)
return render(request, return render(request,
'jinstagram/post.html', 'jinstagram/post.html',
context=dict(id=feed.id, context=dict(id=feed.id,
profile_image=profile_image, profile_image=profile_image,
user_id=feed.user_id, feed_user_id=feed.user_id,
user_email=user.email,
user_id=user.user_id,
image=feed.image, image=feed.image,
content=feed.content, content=feed.content,
like_count=like_count, like_count=like_count,
...@@ -92,12 +98,12 @@ class Ranking(APIView): ...@@ -92,12 +98,12 @@ class Ranking(APIView):
def get(self, request): def get(self, request):
univ_list = Feed.objects.values('univ')\ univ_list = Feed.objects.values('univ')\
.annotate(score=Count('univ') + Sum('views') + Sum('like_count'))\ .annotate(score=Count('univ') + Sum('view_count') + Sum('like_count'))\
.order_by('-score') .order_by('-score')
print(univ_list) # print(univ_list)
for i in range(len(univ_list)): # for i in range(len(univ_list)):
print(i, univ_list[i]['univ']) # print(i, univ_list[i]['univ'])
return render(request, return render(request,
'jinstagram/ranking.html', 'jinstagram/ranking.html',
context=dict(univ_list=univ_list)) context=dict(univ_list=univ_list))
......
campics_/templates/jinstagram/imgboard.html
+ 46
− 17
View file @ 59e2e590
...@@ -11,7 +11,8 @@ ...@@ -11,7 +11,8 @@
<link rel="stylesheet" href="{% static '/bootstrap-icons-1.8.2/bootstrap-icons.css' %}"> <link rel="stylesheet" href="{% static '/bootstrap-icons-1.8.2/bootstrap-icons.css' %}">
<!-- <script src="{% static '/jquery/jquery.min.js' %}"></script> --> <!-- <script src="{% static '/jquery/jquery.min.js' %}"></script> -->
<script src="{% static '/js/bootstrap.min.js' %}"></script> <script src="{% static '/js/bootstrap.min.js' %}"></script>
<script src="{% static '/js/bootstrap.bundle.min.js' %}"></script>
<script src="{% static '/js/popper.js' %}"></script>
<!-- 요기에 구글 머티리얼 아이콘 --> <!-- 요기에 구글 머티리얼 아이콘 -->
<link <link
href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp" href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp"
...@@ -259,12 +260,16 @@ ...@@ -259,12 +260,16 @@
<span class="fs-3 fw-normal align-middle" >{{ user.univ }}</span> <span class="fs-3 fw-normal align-middle" >{{ user.univ }}</span>
</div> </div>
<div class="col col-2 text-end" > <div class="col col-2 text-end" >
<a href="#" class="btn btn-sm fs-4 fw-bold text-light "> <!-- 정렬 버튼-->
<i class="bi bi-filter fs"></i> <div class="dropdown">
</a> <button class="btn btn-primary dropdown-toggle" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
<a href="#" class="btn btn-sm fs-4 fw-bold text-light "> <!-- 정렬 버튼-->
<i class="bi bi-filter fs"></i> </button>
</a> <ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
<li><a class="dropdown-item" href="/?order=recent">최신순</a></li>
<li><a class="dropdown-item" href="/?order=likesCount">추천순</a></li>
</ul>
</div>
</div> </div>
</div> </div>
...@@ -276,8 +281,8 @@ ...@@ -276,8 +281,8 @@
{% for feed in feed_list %} {% for feed in feed_list %}
<div class="row " style="display: flex; flex-direction: row"> <div class="row " style="display: flex; flex-direction: row">
{% for row_feed in feed.row_feed_list %} {% for row_feed in feed.row_feed_list %}
<div class="col col-4 g-1"> <div class="col col-4 g-1 mt-2 ">
<img class="row_feed" src="{% get_media_prefix %}{{ row_feed.image }}" width="400px" height="300px"> <img class="row_feed img-fluid img-thumbnail" id="{{ row_feed.id}}" src="{% get_media_prefix %}{{ row_feed.image }}" >
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
...@@ -310,18 +315,12 @@ ...@@ -310,18 +315,12 @@
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<!-- <span id="add_feed" class="btn btn-sm fs-3 fw-bold text-light" alt="등록">
<i class="bi bi-plus-circle fs"></i>
</span> -->
<span id="add_feed" class="btn btn-sm fs-3 fw-bold text-light " alt="등록"> <span id="add_feed" class="btn btn-sm fs-3 fw-bold text-light " alt="등록">
<i class="bi bi-plus-circle fs"></i> <i class="bi bi-plus-circle fs"></i>
</span> </span>
<!-- <a href="add.html" id="add_feed" class="btn btn-sm fs-3 fw-bold text-light " alt="등록">
<i class="bi bi-plus-circle fs"></i>
</a> -->
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="univserach.html" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색"> <a href="/content/searchUniv" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색">
<i class="bi bi-search fs"></i> <i class="bi bi-search fs"></i>
</a> </a>
</div> </div>
...@@ -374,6 +373,7 @@ ...@@ -374,6 +373,7 @@
</div> </div>
<span id="input_user_id" class="feed_name_txt"> {{ user.user_id }} </span> <span id="input_user_id" class="feed_name_txt"> {{ user.user_id }} </span>
<span id="input_email" style="display: none"> {{ user.email }} </span> <span id="input_email" style="display: none"> {{ user.email }} </span>
<span id="input_univ" style="display: none"> {{ user.univ }} </span>
</div> </div>
<div style="height: 440px"> <div style="height: 440px">
<textarea id="input_content" class="feed_content_textarea form-control col-sm-5" rows="10" <textarea id="input_content" class="feed_content_textarea form-control col-sm-5" rows="10"
...@@ -389,7 +389,36 @@ ...@@ -389,7 +389,36 @@
</div> </div>
</div> </div>
<script>
// 조회수
$('.row_feed').click(function(){
console.log("클릭했다");
let feed_id = $(this).attr('id');
// let feed_id = 1;
let email = "{{ user.email }}";
let is_view = true;
console.log(feed_id);
console.log(email);
$.ajax({
url: "/content/view",
data: {
feed_id: feed_id,
email: email,
is_view: is_view
},
method: "POST",
dataType: "json",
success: function (data){
location.replace("{% url 'post'%}?id=" + feed_id);
},
error:function (request, status, error){
let data = JSON.parse(request.responseText);
console.log(data.message);
alert(data.message);
}
});
});
</script>
<!-- Optional JavaScript; choose one of the two! --> <!-- Optional JavaScript; choose one of the two! -->
<script> <script>
......
campics_/templates/jinstagram/boarddetail.html → campics_/templates/jinstagram/post.html
+ 162
− 0
View file @ 59e2e590
...@@ -9,8 +9,10 @@ ...@@ -9,8 +9,10 @@
<title>게시물 상세보기</title> <title>게시물 상세보기</title>
<link href="{% static '/css/bootstrap.css' %}" rel="stylesheet" > <link href="{% static '/css/bootstrap.css' %}" rel="stylesheet" >
<link rel="stylesheet" href="{% static '/bootstrap-icons-1.8.2/bootstrap-icons.css' %}"> <link rel="stylesheet" href="{% static '/bootstrap-icons-1.8.2/bootstrap-icons.css' %}">
<script src="{% static '/jquery/jquery.min.js' %}"></script> <!-- <script src="{% static '/jquery/jquery.min.js' %}"></script> -->
<script src="{% static '/js/bootstrap.min.js' %}"></script> <script src="{% static '/js/bootstrap.min.js' %}"></script>
<!-- jquery 사용하기 위해 -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
</head> </head>
<body> <body>
...@@ -20,12 +22,12 @@ ...@@ -20,12 +22,12 @@
<div class="text-bg-primary py-1" > <div class="text-bg-primary py-1" >
<div class="row align-middle"> <div class="row align-middle">
<div class="col col-2 text-start"> <div class="col col-2 text-start">
<a href="javascript:history.back()" class="btn btn-sm fs-4 fw-bold text-light "> <a href="{% url 'main' %}" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-arrow-bar-left fs"></i> <i class="bi bi-arrow-bar-left fs"></i>
</a> </a>
</div> </div>
<div class="col col-8 text-center "> <div class="col col-8 text-center ">
<span class="fs-3 fw-normal align-middle" >아주대학교 게시물 상세보기</span> <span class="fs-3 fw-normal align-middle" >게시글 상세보기</span>
</div> </div>
<div class="col col-2 text-end" ></div> <div class="col col-2 text-end" ></div>
</div> </div>
...@@ -35,19 +37,29 @@ ...@@ -35,19 +37,29 @@
<!-- Page Content Start --> <!-- Page Content Start -->
<div class="mt-5 py-4"> <div class="mt-5 py-4">
<div class="row text-center"> <div class="row text-center">
<label class="col col-form-label"><i class="bi bi-person-circle fs-5"></i> 아주대사랑꾼 님의 게시글</label> <label class="col col-form-label"><i class="bi bi-person-circle fs-5"></i> {{feed_user_id}} 님의 게시글</label>
</div> </div>
<div class="text-center mb-3 "> <div class="text-center mb-3 ">
<img src="{% static '/img/empty.png' %}" class="rounded img-fluid " alt="..."> <img src="{% get_media_prefix %}{{ image }}" class="rounded img-fluid" alt="...">
</div> </div>
<div class="row text-center"> <div class="row text-center">
<label class="col col-form-label"><i class="bi bi-hand-thumbs-up fs-5"></i>123 조회수 : 123</label> <label class="col col-form-label"><i class="like bi bi-hand-thumbs-up fs-5"></i>{{like_count}} 조회수 : {{view_count}}</label>
</div> </div>
<div class="row text-center"> <div class="row text-center">
<div class="col"> <div class="col">
<textarea class="form-control" id="inputText" rows="5">내용을 입력해 주세요</textarea> <textarea class="form-control" id="inputText" rows="5">{{content}}</textarea>
</div> </div>
</div> </div>
{% if user_id == feed_user_id %}
<div class="row justify-content-end text-center mt-3">
<div class="col col-2">
<a href="" class="btn btn-danger" id="delete"> 삭제</a>
</div>
</div>
{% endif %}
</div> </div>
<!-- Page Content end --> <!-- Page Content end -->
<!-- Page bottom Start --> <!-- Page bottom Start -->
...@@ -55,29 +67,29 @@ ...@@ -55,29 +67,29 @@
<div class="text-bg-primary py-1" > <div class="text-bg-primary py-1" >
<div class="row align-middle"> <div class="row align-middle">
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="imgboard.html" class="btn btn-sm fs-3 fw-bold text-light" alt="my univ"> <a href="{% url 'main' %}" class="btn btn-sm fs-3 fw-bold text-light" alt="my univ">
<i class="bi bi-view-list fs"></i> <i class="bi bi-view-list fs"></i>
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="imgboard.html" class="btn btn-sm fs-3 fw-bold text-light" alt="all"> <a href="{% url 'main' %}" class="btn btn-sm fs-3 fw-bold text-light" alt="all">
<i class="bi bi-view-stacked fs"></i> <i class="bi bi-view-stacked fs"></i>
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="ranking.html" class="btn btn-sm fs-3 fw-bold text-light " alt="ranking"> <a href="{% url 'ranking' %}" class="btn btn-sm fs-3 fw-bold text-light " alt="ranking">
<i class="bi bi-list-ol fs"></i> <i class="bi bi-list-ol fs"></i>
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="imgboard.html" class="btn btn-sm fs-3 fw-bold text-light " alt="my list"> <a href="{% url 'profile' %}" class="btn btn-sm fs-3 fw-bold text-light " alt="my list">
<i class="bi bi-tags fs"></i> <i class="bi bi-tags fs"></i>
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="add.html" class="btn btn-sm fs-3 fw-bold text-light " alt="등록"> <span id="add_feed" class="btn btn-sm fs-3 fw-bold text-light " alt="등록">
<i class="bi bi-plus-circle fs"></i> <i class="bi bi-plus-circle fs"></i>
</a> </span>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="univserach.html" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색"> <a href="univserach.html" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색">
...@@ -87,7 +99,64 @@ ...@@ -87,7 +99,64 @@
</div> </div>
</div> </div>
</div> </div>
<!-- Page bottom End -->
</div> </div>
<script>
// 삭제
$('#delete').click(function(){
console.log("클릭했다");
let feed_id = "{{id}}"
let email = "{{ user_email }}";
console.log(feed_id);
console.log(email);
$.ajax({
url: "/content/delete",
data: {
feed_id: feed_id,
email: email,
},
method: "POST",
dataType: "json",
success: function (data){
alert(data.message);
location.replace("{% url 'main'%}?id=" + feed_id);
},
error:function (request, status, error){
let data = JSON.parse(request.responseText);
console.log(data.message);
alert(data.message);
}
});
});
// 추천
$('.like').click(function(){
console.log("클릭했다");
let feed_id = "{{id}}"
let email = "{{ user_email }}";
let is_like = true;
console.log(feed_id);
console.log(email);
$.ajax({
url: "/content/like",
data: {
feed_id: feed_id,
email: email,
is_like: is_like
},
method: "POST",
dataType: "json",
success: function (data){
location.replace("{% url 'post'%}?id=" + feed_id);
},
error:function (request, status, error){
let data = JSON.parse(request.responseText);
console.log(data.message);
alert(data.message);
}
});
});
</script>
</body> </body>
</html> </html>
\ No newline at end of file
campics_/templates/jinstagram/profile.html
+ 20
− 38
View file @ 59e2e590
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
</head> </head>
<body> <body>
<div class="container"> <div class="container">
<!-- Page Top Start --> <!-- Page Top Start -->
<div class="fixed-top"> <div class="fixed-top">
...@@ -35,15 +36,6 @@ ...@@ -35,15 +36,6 @@
<div class="col col-8 text-center "> <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> </div>
<div class="col col-2 text-end" >
<a href="#" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-filter fs"></i>
</a>
<a href="#" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-filter fs"></i>
</a>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -53,8 +45,9 @@ ...@@ -53,8 +45,9 @@
{% for feed in feed_list %} {% for feed in feed_list %}
<div class="row " style="display: flex; flex-direction: row"> <div class="row " style="display: flex; flex-direction: row">
{% for row_feed in feed.row_feed_list %} {% for row_feed in feed.row_feed_list %}
<div class="col col-4 g-1"> <div class="col col-4 g-1 mt-2 ">
<a href="boarddetail.html"><img class="row_feed" src="{% get_media_prefix %}{{ row_feed.image }}" width="400px" height="300px"></a> <img class="row_feed img-fluid img-thumbnail" id="{{ row_feed.id}}" src="{% get_media_prefix %}{{ row_feed.image }}" >
<!-- <a href="{% url 'post' %}?id={{ row_feed.id}}"><img class="row_feed" id="{{ row_feed.id}}" src="{% get_media_prefix %}{{ row_feed.image }}" width="400px" height="300px"></a> -->
</div> </div>
{% endfor %} {% endfor %}
</div> </div>
...@@ -88,18 +81,12 @@ ...@@ -88,18 +81,12 @@
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<!-- <span id="add_feed" class="btn btn-sm fs-3 fw-bold text-light" alt="등록">
<i class="bi bi-plus-circle fs"></i>
</span> -->
<span id="add_feed" class="btn btn-sm fs-3 fw-bold text-light " alt="등록"> <span id="add_feed" class="btn btn-sm fs-3 fw-bold text-light " alt="등록">
<i class="bi bi-plus-circle fs"></i> <i class="bi bi-plus-circle fs"></i>
</span> </span>
<!-- <a href="add.html" id="add_feed" class="btn btn-sm fs-3 fw-bold text-light " alt="등록">
<i class="bi bi-plus-circle fs"></i>
</a> -->
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="univserach.html" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색"> <a href="/content/searchUniv" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색">
<i class="bi bi-search fs"></i> <i class="bi bi-search fs"></i>
</a> </a>
</div> </div>
...@@ -109,33 +96,27 @@ ...@@ -109,33 +96,27 @@
<!-- Page bottom End --> <!-- Page bottom End -->
</div> </div>
<script> <script>
// 상세페이지 이동 코드 // 조회수
$('#button_join').on('click',()=>{ $('.row_feed').click(function(){
console.log('클릭했다.'); console.log("클릭했다");
let user_id = $('#user_id').val(); let feed_id = $(this).attr('id');
let password = $('#password').val(); // let feed_id = 1;
let nickname = $('#nicknickname').val(); let email = "{{ user.email }}";
let univname = $('#univname').val(); let is_view = true;
console.log(feed_id);
console.log('아이디 :' + user_id + ', 비밀번호 :' + password + ', 닉네임 :' + nickname + ', 학교이름 :' + univname); console.log(email);
$.ajax({ $.ajax({
url: "/user/join", url: "/content/view",
data: { data: {
user_id: user_id, feed_id: feed_id,
password: password, email: email,
nickname: nickname, is_view: is_view
univname: univname
}, },
method: "POST", method: "POST",
dataType: "json", dataType: "json",
success: function (data){ success: function (data){
alert(data.message); location.replace("{% url 'post'%}?id=" + feed_id);
location.replace("{% url 'login'%}");
}, },
error:function (request, status, error){ error:function (request, status, error){
let data = JSON.parse(request.responseText); let data = JSON.parse(request.responseText);
...@@ -145,5 +126,6 @@ ...@@ -145,5 +126,6 @@
}); });
}); });
</script> </script>
</body> </body>
</html> </html>
\ No newline at end of file
campics_/templates/jinstagram/ranking.html
+ 4
− 9
View file @ 59e2e590
...@@ -22,18 +22,13 @@ ...@@ -22,18 +22,13 @@
<div class="text-bg-primary py-1" > <div class="text-bg-primary py-1" >
<div class="row align-middle"> <div class="row align-middle">
<div class="col col-2 text-start"> <div class="col col-2 text-start">
<!-- <a href="javascript:history.back()" class="btn fs-3 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> <i class="bi bi-arrow-bar-left fs"></i>
</a> --> </a>
</div> </div>
<div class="col col-8 text-center "> <div class="col col-8 text-center ">
<span class="fs-2 fw-semibold align-middle" >순위</span> <span class="fs-2 fw-semibold align-middle" >순위</span>
</div> </div>
<div class="col col-2 text-end" >
<a href="#" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-filter fs"></i>
</a>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -53,7 +48,7 @@ ...@@ -53,7 +48,7 @@
<tbody> <tbody>
{% for univ in univ_list %} {% for univ in univ_list %}
<tr> <tr>
<td class="align-middle">1</td> <td class="align-middle">{{forloop.counter}}</td>
<td class="align-middle">{{univ.univ}}</td> <td class="align-middle">{{univ.univ}}</td>
<td class="align-middle">{{univ.score}}</td> <td class="align-middle">{{univ.score}}</td>
</tr> </tr>
...@@ -93,7 +88,7 @@ ...@@ -93,7 +88,7 @@
</span> </span>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="univserach.html" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색"> <a href="/content/searchUniv" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색">
<i class="bi bi-search fs"></i> <i class="bi bi-search fs"></i>
</a> </a>
</div> </div>
......
campics_/templates/jinstagram/univsearch.html → campics_/templates/jinstagram/search_result.html
+ 26
− 20
View file @ 59e2e590
<!-- static 로딩 -->
{% load static %}
<!doctype html> <!doctype html>
<html lang="ko"> <html lang="ko">
<head> <head>
<meta charset="utf-8"> <meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1"> <meta name="viewport" content="width=device-width, initial-scale=1">
<title>검색</title> <title>포토존</title>
<link href="static/css/bootstrap.css" rel="stylesheet" > <link href="{% static '/css/bootstrap.css' %}" rel="stylesheet" >
<link rel="stylesheet" href="static/bootstrap-icons-1.8.2/bootstrap-icons.css"> <link rel="stylesheet" href="{% static '/bootstrap-icons-1.8.2/bootstrap-icons.css' %}">
<script src="static/jquery/jquery.min.js"></script> <!-- <script src="{% static '/jquery/jquery.min.js' %}"></script> -->
<script src="static/js/bootstrap.min.js"></script> <script src="{% static '/js/bootstrap.min.js' %}"></script>
<script src="{% static '/js/bootstrap.bundle.min.js' %}"></script>
<script src="{% static '/js/popper.js' %}"></script>
<!-- 요기에 구글 머티리얼 아이콘 -->
<link
href="https://fonts.googleapis.com/css?family=Material+Icons|Material+Icons+Outlined|Material+Icons+Two+Tone|Material+Icons+Round|Material+Icons+Sharp"
rel="stylesheet">
<!-- jquery 사용하기 위해 -->
<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
</head> </head>
<body> <body>
<div class="container"> <div class="container">
...@@ -17,18 +28,13 @@ ...@@ -17,18 +28,13 @@
<div class="text-bg-primary py-1" > <div class="text-bg-primary py-1" >
<div class="row align-middle"> <div class="row align-middle">
<div class="col col-2 text-start"> <div class="col col-2 text-start">
<!-- <a href="javascript:history.back()" class="btn fs-3 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> <i class="bi bi-arrow-bar-left fs"></i>
</a> --> </a>
</div> </div>
<div class="col col-8 text-center "> <div class="col col-8 text-center ">
<span class="fs-2 fw-semibold align-middle" >검색</span> <span class="fs-2 fw-semibold align-middle" >검색</span>
</div> </div>
<div class="col col-2 text-end" >
<a href="#" class="btn btn-sm fs-4 fw-bold text-light ">
<i class="bi bi-filter fs"></i>
</a>
</div>
</div> </div>
</div> </div>
</div> </div>
...@@ -57,32 +63,32 @@ ...@@ -57,32 +63,32 @@
<div class="text-bg-primary py-1" > <div class="text-bg-primary py-1" >
<div class="row align-middle"> <div class="row align-middle">
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="imgboard.html" class="btn btn-sm fs-3 fw-bold text-light" alt="my univ"> <a href="{% url 'main' %}" class="btn btn-sm fs-3 fw-bold text-light" alt="my univ">
<i class="bi bi-view-list fs"></i> <i class="bi bi-view-list fs"></i>
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="imgboard.html" class="btn btn-sm fs-3 fw-bold text-light" alt="all"> <a href="{% url 'main' %}" class="btn btn-sm fs-3 fw-bold text-light" alt="all">
<i class="bi bi-view-stacked fs"></i> <i class="bi bi-view-stacked fs"></i>
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="ranking.html" class="btn btn-sm fs-3 fw-bold text-light " alt="ranking"> <a href="{% url 'ranking' %}" class="btn btn-sm fs-3 fw-bold text-light " alt="ranking">
<i class="bi bi-list-ol fs"></i> <i class="bi bi-list-ol fs"></i>
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="imgboard.html" class="btn btn-sm fs-3 fw-bold text-light " alt="my list"> <a href="{% url 'profile' %}" class="btn btn-sm fs-3 fw-bold text-light " alt="my list">
<i class="bi bi-tags fs"></i> <i class="bi bi-tags fs"></i>
</a> </a>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="add.html" class="btn btn-sm fs-3 fw-bold text-light " alt="등록"> <span id="add_feed" class="btn btn-sm fs-3 fw-bold text-light " alt="등록">
<i class="bi bi-plus-circle fs"></i> <i class="bi bi-plus-circle fs"></i>
</a> </span>
</div> </div>
<div class="col col-2 text-center"> <div class="col col-2 text-center">
<a href="univserach.html" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색"> <a href="/content/searchUniv" class="btn btn-sm fs-3 fw-bold text-light " alt="대학검색">
<i class="bi bi-search fs"></i> <i class="bi bi-search fs"></i>
</a> </a>
</div> </div>
......
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