diff --git a/campics_/content/migrations/0002_feedreport_feed_report_count_and_more.py b/campics_/content/migrations/0002_feedreport_feed_report_count_and_more.py new file mode 100644 index 0000000000000000000000000000000000000000..42d4f94cc03909221f5281175d6d6b7b8d05ce54 --- /dev/null +++ b/campics_/content/migrations/0002_feedreport_feed_report_count_and_more.py @@ -0,0 +1,35 @@ +# 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'), + ), + ] diff --git a/campics_/content/views.py b/campics_/content/views.py index 166e3ec0f7bc272d987791ca6dbb31bc95e42445..3a1a93f5bdfc011e919e6b125784b6a008804068 100644 --- a/campics_/content/views.py +++ b/campics_/content/views.py @@ -90,7 +90,6 @@ class ReportFeed(APIView): feed_id = request.data.get('feed_id') email = request.data.get('email') is_report = request.data.get('is_report', 'True') - if is_report.lower() == 'false': is_report = False else: @@ -111,7 +110,7 @@ class ReportFeed(APIView): if report_count>=5: #5회 이상 신고 게시글 삭제 feed.delete() return Response(status=200, data=dict(message='신고 5회 누적 게시글 삭제 완료')) - + return Response(status=200, data=dict(message='피드 신고 완료.')) @@ -171,3 +170,20 @@ class searchUser(APIView): 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 diff --git a/campics_/templates/jinstagram/post.html b/campics_/templates/jinstagram/post.html index 36094bd6f7daadf53c3f7e2b323b72b8f35f244a..7672f33aca2f57b7965a0f52c8100157c5f4293d 100644 --- a/campics_/templates/jinstagram/post.html +++ b/campics_/templates/jinstagram/post.html @@ -53,16 +53,22 @@ <div class="row text-center"> {% 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}} - 신고 : <i class="report bi bi-exclamation-circle"></i></label> + {% if is_report %} + 신고 : <i class="report bi bi-exclamation-circle"></i></label> + {% else %} + 신고 : <i class="report bi bi-exclamation-circle-fill"></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}} - 신고 : <i class="report bi bi-exclamation-circle"></i></label> - - + {% if is_report %} + 신고 : <i class="report bi bi-exclamation-circle"></i></label> + {% else %} + 신고 : <i class="report bi bi-exclamation-circle-fill"></i></label> + {% endif %} {% endif %} </div> - <!-- <i class="bi bi-exclamation-circle-fill"></i> --> <div class="row text-center"> <div class="col"> <textarea class="form-control" id="inputText" rows="5">{{content}}</textarea> @@ -139,7 +145,12 @@ dataType: "json", success: function (data){ 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){ let data = JSON.parse(request.responseText); @@ -188,25 +199,34 @@ let feed_id = "{{id}}" let email = "{{ user_email }}"; let is_report = false; - console.log('{{is_report}}'); if ('{{is_report}}'=='False') { is_report = true; - console.log('{{is_report}}'); } - console.log(is_report); $.ajax({ url: "/content/report", data: { feed_id: feed_id, email: email, - is_report: is_report + is_report: is_report, }, method: "POST", dataType: "json", success: function (data){ - //location.replace("{% url 'post'%}?id=" + feed_id); - location.replace("{% url 'main'%}"); + if (data.message == '신고 5회 누적 게시글 삭제 완료') { + 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){ let data = JSON.parse(request.responseText); @@ -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> </body> </html> diff --git a/campics_/templates/jinstagram/search.html b/campics_/templates/jinstagram/search.html index a4d0660ff089a88ec6633fcb7a286f75cc984cf7..255b3f6e603227bcbf37c0bb2f3d179b9e75c708 100644 --- a/campics_/templates/jinstagram/search.html +++ b/campics_/templates/jinstagram/search.html @@ -60,7 +60,7 @@ <ul class="list-group mt-5" id = "univlist"> {% 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 %} </ul> @@ -122,9 +122,30 @@ <!-- Page bottom End --> </div> <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(){ if ( $("#condition").val() == 1) frm.action = "/content/searchUniv"; if ( $("#condition").val() == 2) frm.action = "/content/searchUser"; @@ -144,7 +165,6 @@ $('.row_feed').click(function(){ console.log("클릭했다"); let feed_id = $(this).attr('id'); - // let feed_id = 1; let email = "{{ user.email }}"; let is_view = true; $.ajax({