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

검색 제외 완료

parent 55c1d6ef
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
campics_/content/migrations/0002_feedreport_feed_report_count_and_more.py 0 → 100644
+ 35
− 0
View file @ 09232ee5
# Generated by Django 4.0.4 on 2022-06-09 11:47
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('content', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='FeedReport',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('feed_id', models.IntegerField()),
('email', models.CharField(blank=True, max_length=30, null=True)),
('is_report', models.BooleanField(default=False)),
],
),
migrations.AddField(
model_name='feed',
name='report_count',
field=models.IntegerField(default=0),
),
migrations.AddIndex(
model_name='feedreport',
index=models.Index(fields=['feed_id'], name='content_fee_feed_id_bfcf36_idx'),
),
migrations.AddIndex(
model_name='feedreport',
index=models.Index(fields=['email'], name='content_fee_email_2ca3d9_idx'),
),
]
campics_/content/views.py
+ 18
− 2
View file @ 09232ee5
...@@ -90,7 +90,6 @@ class ReportFeed(APIView): ...@@ -90,7 +90,6 @@ class ReportFeed(APIView):
feed_id = request.data.get('feed_id') feed_id = request.data.get('feed_id')
email = request.data.get('email') email = request.data.get('email')
is_report = request.data.get('is_report', 'True') is_report = request.data.get('is_report', 'True')
if is_report.lower() == 'false': if is_report.lower() == 'false':
is_report = False is_report = False
else: else:
...@@ -171,3 +170,20 @@ class searchUser(APIView): ...@@ -171,3 +170,20 @@ class searchUser(APIView):
return render(request, return render(request,
'jinstagram/search.html', 'jinstagram/search.html',
context=dict(univ_list=univ_list, user_list=user_list, message=message)) 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
campics_/templates/jinstagram/post.html
+ 32
− 37
View file @ 09232ee5
...@@ -53,16 +53,22 @@ ...@@ -53,16 +53,22 @@
<div class="row text-center"> <div class="row text-center">
{% if is_like %} {% 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}} <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> 신고 : <i class="report bi bi-exclamation-circle"></i></label>
{% else %}
신고 : <i class="report bi bi-exclamation-circle-fill"></i></label>
{% endif %}
{% else %} {% else %}
<label class="col col-form-label"><i class="like bi bi-hand-thumbs-up fs-5"></i> : {{like_count}} 조회수 : {{view_count}} <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> 신고 : <i class="report bi bi-exclamation-circle"></i></label>
{% else %}
신고 : <i class="report bi bi-exclamation-circle-fill"></i></label>
{% endif %}
{% endif %} {% endif %}
</div> </div>
<!-- <i class="bi bi-exclamation-circle-fill"></i> -->
<div class="row text-center"> <div class="row text-center">
<div class="col"> <div class="col">
<textarea class="form-control" id="inputText" rows="5">{{content}}</textarea> <textarea class="form-control" id="inputText" rows="5">{{content}}</textarea>
...@@ -139,7 +145,12 @@ ...@@ -139,7 +145,12 @@
dataType: "json", dataType: "json",
success: function (data){ success: function (data){
alert(data.message); alert(data.message);
location.replace("{% url 'profile'%}"); if ( '{{feed_type}}') {
location.replace("{% url 'main'%}?type=photozone");
}
else {
location.replace("{% url 'main'%}?type=scene");
}
}, },
error:function (request, status, error){ error:function (request, status, error){
let data = JSON.parse(request.responseText); let data = JSON.parse(request.responseText);
...@@ -188,25 +199,34 @@ ...@@ -188,25 +199,34 @@
let feed_id = "{{id}}" let feed_id = "{{id}}"
let email = "{{ user_email }}"; let email = "{{ user_email }}";
let is_report = false; let is_report = false;
console.log('{{is_report}}');
if ('{{is_report}}'=='False') { if ('{{is_report}}'=='False') {
is_report = true; is_report = true;
console.log('{{is_report}}');
} }
console.log(is_report);
$.ajax({ $.ajax({
url: "/content/report", url: "/content/report",
data: { data: {
feed_id: feed_id, feed_id: feed_id,
email: email, email: email,
is_report: is_report is_report: is_report,
}, },
method: "POST", method: "POST",
dataType: "json", dataType: "json",
success: function (data){ success: function (data){
//location.replace("{% url 'post'%}?id=" + feed_id); if (data.message == '신고 5회 누적 게시글 삭제 완료') {
location.replace("{% url 'main'%}"); console.log(data.message)
if ( '{{feed_type}}') {
location.replace("{% url 'main'%}?type=photozone");
}
else {
location.replace("{% url 'main'%}?type=scene");
}
alert(data.message);
}
else {
console.log(data.message)
location.replace("{% url 'post'%}?id=" + feed_id);
}
}, },
error:function (request, status, error){ error:function (request, status, error){
let data = JSON.parse(request.responseText); let data = JSON.parse(request.responseText);
...@@ -215,31 +235,6 @@ ...@@ -215,31 +235,6 @@
} }
}); });
}); });
// 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 'profile'%}");
// },
// error:function (request, status, error){
// let data = JSON.parse(request.responseText);
// console.log(data.message);
// alert(data.message);
// }
// });
});
</script> </script>
</body> </body>
</html> </html>
campics_/templates/jinstagram/search.html
+ 25
− 5
View file @ 09232ee5
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<ul class="list-group mt-5" id = "univlist"> <ul class="list-group mt-5" id = "univlist">
{% for univ in univ_list %} {% for univ in univ_list %}
<li class="list-group-item list-group-item-action" onclick="moveUnivBoard()">{{univ.univ}}</li> <li class="univboard list-group-item list-group-item-action" id="{{ univ.univ }}">{{univ.univ}}</li>
{% endfor %} {% endfor %}
</ul> </ul>
...@@ -122,9 +122,30 @@ ...@@ -122,9 +122,30 @@
<!-- Page bottom End --> <!-- Page bottom End -->
</div> </div>
<script> <script>
function moveUnivBoard(){ // 학교 게시글 리스트 조회
location.href = "/?type=photozone"; $('.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);
} }
});
});
function frmSubmit(){ function frmSubmit(){
if ( $("#condition").val() == 1) frm.action = "/content/searchUniv"; if ( $("#condition").val() == 1) frm.action = "/content/searchUniv";
if ( $("#condition").val() == 2) frm.action = "/content/searchUser"; if ( $("#condition").val() == 2) frm.action = "/content/searchUser";
...@@ -144,7 +165,6 @@ ...@@ -144,7 +165,6 @@
$('.row_feed').click(function(){ $('.row_feed').click(function(){
console.log("클릭했다"); console.log("클릭했다");
let feed_id = $(this).attr('id'); let feed_id = $(this).attr('id');
// let feed_id = 1;
let email = "{{ user.email }}"; let email = "{{ user.email }}";
let is_view = true; let is_view = true;
$.ajax({ $.ajax({
......
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