From 57758efd15e977461ef00b845e3b43a82406ec1c Mon Sep 17 00:00:00 2001
From: kimsihwan <ksshhses@ajou.ac.kr>
Date: Mon, 6 Jun 2022 21:19:29 +0900
Subject: [PATCH] add search page
---
campics_/content/urls.py | 6 ++++--
campics_/content/views.py | 17 +++++++++++++----
campics_/jinstagram/settings.py | 22 +++++++++++-----------
campics_/templates/jinstagram/sample.html | 4 ++++
4 files changed, 32 insertions(+), 17 deletions(-)
create mode 100644 campics_/templates/jinstagram/sample.html
diff --git a/campics_/content/urls.py b/campics_/content/urls.py
index eddfa34..c3de501 100644
--- a/campics_/content/urls.py
+++ b/campics_/content/urls.py
@@ -1,6 +1,7 @@
from django.urls import path
-from .views import UploadFeed, LikeFeed, ViewFeed, DeleteFeed, searchUniv, searchUser
+from .views import UploadFeed, LikeFeed, ViewFeed, DeleteFeed, searchUniv, searchUser, searchPage
+app_name = 'content'
urlpatterns = [
path('upload', UploadFeed.as_view(), name='upload_feed'),
@@ -9,7 +10,8 @@ urlpatterns = [
path('view', ViewFeed.as_view(), name='view'),
## 시환님꺼
path('delete', DeleteFeed.as_view(), name='delete_feed'),
- path('searchUniv', searchUniv.as_view(), name='seacrh_univ'),
+ path('searchUniv', searchUniv.as_view(), name='search_univ'),
path('searchUser', searchUser.as_view(), name='search_user'),
+ path('searchPage', searchPage.as_view(), name='search_page'),
]
diff --git a/campics_/content/views.py b/campics_/content/views.py
index 953b6a2..faed557 100644
--- a/campics_/content/views.py
+++ b/campics_/content/views.py
@@ -1,4 +1,4 @@
-from django.shortcuts import render
+from django.shortcuts import render, redirect
from rest_framework.views import APIView
from content.models import Feed, FeedLike, FeedView
from rest_framework.response import Response
@@ -100,10 +100,11 @@ class DeleteFeed(APIView):
def post(self, request):
feed_id = request.data.get('feed_id')
email = request.data.get('email')
-
# feed_id = 1
# email = "ksshhses@ajou.ac.kr"
+ return redirect('main', permanent=True)
+ print("안 나오지?")
feed = Feed.objects.filter(id=feed_id).first()
if feed is None:
@@ -111,7 +112,8 @@ class DeleteFeed(APIView):
if feed.email == email:
feed.delete()
- return render(request, "jinstagram/main.html") #프로필페이지
+ print("here?")
+ return redirect('profile') #프로필페이지
else:
return Response(status=500, data=dict(message='삭제 실패'))
@@ -138,4 +140,11 @@ class searchUser(APIView):
if user_list.count() == 0:
return Response(status=404, data=dict(message='유저가 없습니다.'))
else:
- return Response(status=200, data=dict(user=user_list))
\ No newline at end of file
+ return Response(status=200, data=dict(user=user_list))
+
+class searchPage(APIView):
+ def get(self, request):
+ univ_list = Univ.objects.all().order_by('univ')
+
+ univ_list = {'univ_list':univ_list}
+ return render(request, 'jinstagram/sample.html', univ_list)
\ No newline at end of file
diff --git a/campics_/jinstagram/settings.py b/campics_/jinstagram/settings.py
index 413e24c..26a2eab 100644
--- a/campics_/jinstagram/settings.py
+++ b/campics_/jinstagram/settings.py
@@ -77,18 +77,18 @@ WSGI_APPLICATION = 'jinstagram.wsgi.application'
# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
DATABASES = {
- # 'default': {
- # 'ENGINE': 'django.db.backends.mysql',
- # 'NAME': 'campics',
- # 'USER': 'root',
- # 'PASSWORD': '1101',
- # 'HOST': 'localhost',
- # 'PORT': '3306',
- # }
'default': {
- 'ENGINE': 'django.db.backends.sqlite3',
- 'NAME': BASE_DIR / 'db.sqlite3',
- }
+ 'ENGINE': 'django.db.backends.mysql',
+ 'NAME': 'campics',
+ 'USER': 'root',
+ 'PASSWORD': '1101',
+ 'HOST': 'localhost',
+ 'PORT': '3306',
+ }
+ # 'default': {
+ # 'ENGINE': 'django.db.backends.sqlite3',
+ # 'NAME': BASE_DIR / 'db.sqlite3',
+ # }
}
diff --git a/campics_/templates/jinstagram/sample.html b/campics_/templates/jinstagram/sample.html
new file mode 100644
index 0000000..d525f69
--- /dev/null
+++ b/campics_/templates/jinstagram/sample.html
@@ -0,0 +1,4 @@
+{% for univ in univ_list %}
+ {{ univ.id }}
+ {{ univ.univ }}
+{% endfor %}
\ No newline at end of file
--
GitLab