Merge pull request #28 from hyeon0697/main

🎨(hyeon/feature/random-playlist-crud/#11) url통합, id값을통해 ud구현, 플레이리스트 get, post 통합

backend/plinic/urls.py

@@ -6,6 +6,10 @@
 router = SimpleRouter()
 
 urlpatterns = [
+    #cr - get/post
+    path('playlist/', views.random_play_list_create),
+    #rud - get/put/delete
+    #detail 미구현, get요청처리 작성필요
     path('playlist/', views.random_play_list_create),
     path('playlist/<int:id>/', views.play_list_detail),
     path("", include(router.urls)),

backend/plinic/views.py

@@ -1,8 +1,3 @@
-<<<<<<< HEAD
-from django.shortcuts import render
-
-# Create your views here.
-=======
 import profile
 import sys
 sys.path.append("..")
@@ -179,6 +174,3 @@ def delete(self, request, **kwargs):
 
 #                 return ResponseData
 #         # watch_videos?video_ids=
-
-# random_play_list_view = RandomPlayListView.as_view()
->>>>>>> 63a35369120da09976ee8458f7bae0a1645104d4