diff --git a/campics_/content/urls.py b/campics_/content/urls.py index eddfa34890108bb2510e16c7656f9fe744577902..c3de501dbbe73c8f6d16b6da7b760ea54a5f0447 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 953b6a2fe5a3871e210b1414384c146e868b2c85..faed557a00281c6fd09fe6877ad31490a0d6f469 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 413e24c3488e59324815285b06c1ad0c5392b73c..26a2eab24394526a2b04573f877c004678c2aa22 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 0000000000000000000000000000000000000000..d525f69511f4e8d9f8220c9100c27b9ac8733738 --- /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