diff --git a/category/__pycache__/__init__.cpython-310.pyc b/category/__pycache__/__init__.cpython-310.pyc index 02598cd5..82a82a48 100644 Binary files a/category/__pycache__/__init__.cpython-310.pyc and b/category/__pycache__/__init__.cpython-310.pyc differ diff --git a/category/__pycache__/admin.cpython-310.pyc b/category/__pycache__/admin.cpython-310.pyc index 4e7e9743..6a00a4a6 100644 Binary files a/category/__pycache__/admin.cpython-310.pyc and b/category/__pycache__/admin.cpython-310.pyc differ diff --git a/category/__pycache__/apps.cpython-310.pyc b/category/__pycache__/apps.cpython-310.pyc index 553353f3..0c39a78d 100644 Binary files a/category/__pycache__/apps.cpython-310.pyc and b/category/__pycache__/apps.cpython-310.pyc differ diff --git a/category/__pycache__/models.cpython-310.pyc b/category/__pycache__/models.cpython-310.pyc index 33d39ed0..8e92637f 100644 Binary files a/category/__pycache__/models.cpython-310.pyc and b/category/__pycache__/models.cpython-310.pyc differ diff --git a/category/__pycache__/serializers.cpython-310.pyc b/category/__pycache__/serializers.cpython-310.pyc index afd6fcc7..ddb6f97e 100644 Binary files a/category/__pycache__/serializers.cpython-310.pyc and b/category/__pycache__/serializers.cpython-310.pyc differ diff --git a/category/__pycache__/urls.cpython-310.pyc b/category/__pycache__/urls.cpython-310.pyc index 199928a0..5f62a5a5 100644 Binary files a/category/__pycache__/urls.cpython-310.pyc and b/category/__pycache__/urls.cpython-310.pyc differ diff --git a/category/__pycache__/views.cpython-310.pyc b/category/__pycache__/views.cpython-310.pyc index 644b49a4..54d0bc5b 100644 Binary files a/category/__pycache__/views.cpython-310.pyc and b/category/__pycache__/views.cpython-310.pyc differ diff --git a/category/migrations/__pycache__/0001_initial.cpython-310.pyc b/category/migrations/__pycache__/0001_initial.cpython-310.pyc index e5154e1c..f1668071 100644 Binary files a/category/migrations/__pycache__/0001_initial.cpython-310.pyc and b/category/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/category/migrations/__pycache__/__init__.cpython-310.pyc b/category/migrations/__pycache__/__init__.cpython-310.pyc index 484fccef..cf85985e 100644 Binary files a/category/migrations/__pycache__/__init__.cpython-310.pyc and b/category/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/db.sqlite3 b/db.sqlite3 index 3278bea1..4c2facc0 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/db.sqlite3 b/db.sqlite3 new file mode 100644 index 00000000..e69de29b diff --git a/greenroute/__pycache__/__init__.cpython-310.pyc b/greenroute/__pycache__/__init__.cpython-310.pyc index c23f9b4d..8e564941 100644 Binary files a/greenroute/__pycache__/__init__.cpython-310.pyc and b/greenroute/__pycache__/__init__.cpython-310.pyc differ diff --git a/greenroute/__pycache__/settings.cpython-310.pyc b/greenroute/__pycache__/settings.cpython-310.pyc index abc37a5f..e357425f 100644 Binary files a/greenroute/__pycache__/settings.cpython-310.pyc and b/greenroute/__pycache__/settings.cpython-310.pyc differ diff --git a/greenroute/__pycache__/urls.cpython-310.pyc b/greenroute/__pycache__/urls.cpython-310.pyc index 39b2341b..75e097d2 100644 Binary files a/greenroute/__pycache__/urls.cpython-310.pyc and b/greenroute/__pycache__/urls.cpython-310.pyc differ diff --git a/greenroute/__pycache__/wsgi.cpython-310.pyc b/greenroute/__pycache__/wsgi.cpython-310.pyc index db062dba..19ea7f32 100644 Binary files a/greenroute/__pycache__/wsgi.cpython-310.pyc and b/greenroute/__pycache__/wsgi.cpython-310.pyc differ diff --git a/greenroute/urls.py b/greenroute/urls.py index 62bf52fa..2512ac2b 100644 --- a/greenroute/urls.py +++ b/greenroute/urls.py @@ -20,7 +20,7 @@ urlpatterns = [ path('admin/', admin.site.urls), path('users/', include('users.urls')), - path('users/', include('route.urls')), + path('route/', include('route.urls')), path('category/', include('category.urls')), - path('users/', include('hashtag.urls')) + path('hashtag/', include('hashtag.urls')) ] \ No newline at end of file diff --git a/hashtag/__pycache__/__init__.cpython-310.pyc b/hashtag/__pycache__/__init__.cpython-310.pyc index 370d01ef..7c14c109 100644 Binary files a/hashtag/__pycache__/__init__.cpython-310.pyc and b/hashtag/__pycache__/__init__.cpython-310.pyc differ diff --git a/hashtag/__pycache__/admin.cpython-310.pyc b/hashtag/__pycache__/admin.cpython-310.pyc index 02f20e00..d82497bd 100644 Binary files a/hashtag/__pycache__/admin.cpython-310.pyc and b/hashtag/__pycache__/admin.cpython-310.pyc differ diff --git a/hashtag/__pycache__/apps.cpython-310.pyc b/hashtag/__pycache__/apps.cpython-310.pyc index 28a5f48e..318eb1dd 100644 Binary files a/hashtag/__pycache__/apps.cpython-310.pyc and b/hashtag/__pycache__/apps.cpython-310.pyc differ diff --git a/hashtag/__pycache__/models.cpython-310.pyc b/hashtag/__pycache__/models.cpython-310.pyc index a9ee0adf..ff8d1eaa 100644 Binary files a/hashtag/__pycache__/models.cpython-310.pyc and b/hashtag/__pycache__/models.cpython-310.pyc differ diff --git a/hashtag/__pycache__/serializers.cpython-310.pyc b/hashtag/__pycache__/serializers.cpython-310.pyc index cb1a649d..3388d564 100644 Binary files a/hashtag/__pycache__/serializers.cpython-310.pyc and b/hashtag/__pycache__/serializers.cpython-310.pyc differ diff --git a/hashtag/__pycache__/urls.cpython-310.pyc b/hashtag/__pycache__/urls.cpython-310.pyc index 5262a757..7490ab39 100644 Binary files a/hashtag/__pycache__/urls.cpython-310.pyc and b/hashtag/__pycache__/urls.cpython-310.pyc differ diff --git a/hashtag/__pycache__/views.cpython-310.pyc b/hashtag/__pycache__/views.cpython-310.pyc index 8797c4a9..06e65857 100644 Binary files a/hashtag/__pycache__/views.cpython-310.pyc and b/hashtag/__pycache__/views.cpython-310.pyc differ diff --git a/hashtag/migrations/__pycache__/0001_initial.cpython-310.pyc b/hashtag/migrations/__pycache__/0001_initial.cpython-310.pyc index 7932f363..e4e1a02d 100644 Binary files a/hashtag/migrations/__pycache__/0001_initial.cpython-310.pyc and b/hashtag/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/hashtag/migrations/__pycache__/0002_initial.cpython-310.pyc b/hashtag/migrations/__pycache__/0002_initial.cpython-310.pyc index 69397217..37fdde37 100644 Binary files a/hashtag/migrations/__pycache__/0002_initial.cpython-310.pyc and b/hashtag/migrations/__pycache__/0002_initial.cpython-310.pyc differ diff --git a/hashtag/migrations/__pycache__/__init__.cpython-310.pyc b/hashtag/migrations/__pycache__/__init__.cpython-310.pyc index 33efc23a..b4a3ea43 100644 Binary files a/hashtag/migrations/__pycache__/__init__.cpython-310.pyc and b/hashtag/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/hashtag/urls.py b/hashtag/urls.py index 9ec9a9db..ae9433cc 100644 --- a/hashtag/urls.py +++ b/hashtag/urls.py @@ -2,6 +2,6 @@ from .views import * urlpatterns = [ - path('hashtagList', HashtagView.as_view()), + path('hashtagList/', HashtagView.as_view()), path('routes//hashtag/', RouteHashtag.as_view()) ] \ No newline at end of file diff --git a/route/__pycache__/__init__.cpython-310.pyc b/route/__pycache__/__init__.cpython-310.pyc index 1199cc5a..880645d2 100644 Binary files a/route/__pycache__/__init__.cpython-310.pyc and b/route/__pycache__/__init__.cpython-310.pyc differ diff --git a/route/__pycache__/admin.cpython-310.pyc b/route/__pycache__/admin.cpython-310.pyc index 9790a918..45ca0767 100644 Binary files a/route/__pycache__/admin.cpython-310.pyc and b/route/__pycache__/admin.cpython-310.pyc differ diff --git a/route/__pycache__/apps.cpython-310.pyc b/route/__pycache__/apps.cpython-310.pyc index 630f4c10..1b194b9d 100644 Binary files a/route/__pycache__/apps.cpython-310.pyc and b/route/__pycache__/apps.cpython-310.pyc differ diff --git a/route/__pycache__/models.cpython-310.pyc b/route/__pycache__/models.cpython-310.pyc index 4ba4850a..e0360a0c 100644 Binary files a/route/__pycache__/models.cpython-310.pyc and b/route/__pycache__/models.cpython-310.pyc differ diff --git a/route/__pycache__/serializers.cpython-310.pyc b/route/__pycache__/serializers.cpython-310.pyc index f9f89f19..9416177d 100644 Binary files a/route/__pycache__/serializers.cpython-310.pyc and b/route/__pycache__/serializers.cpython-310.pyc differ diff --git a/route/__pycache__/urls.cpython-310.pyc b/route/__pycache__/urls.cpython-310.pyc index 2559e99c..062dc461 100644 Binary files a/route/__pycache__/urls.cpython-310.pyc and b/route/__pycache__/urls.cpython-310.pyc differ diff --git a/route/__pycache__/views.cpython-310.pyc b/route/__pycache__/views.cpython-310.pyc index 5780f5bd..c375613a 100644 Binary files a/route/__pycache__/views.cpython-310.pyc and b/route/__pycache__/views.cpython-310.pyc differ diff --git a/route/migrations/__pycache__/0001_initial.cpython-310.pyc b/route/migrations/__pycache__/0001_initial.cpython-310.pyc index ccbd9348..9665fe96 100644 Binary files a/route/migrations/__pycache__/0001_initial.cpython-310.pyc and b/route/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/route/migrations/__pycache__/0002_initial.cpython-310.pyc b/route/migrations/__pycache__/0002_initial.cpython-310.pyc index fd68e02a..506382cb 100644 Binary files a/route/migrations/__pycache__/0002_initial.cpython-310.pyc and b/route/migrations/__pycache__/0002_initial.cpython-310.pyc differ diff --git a/route/migrations/__pycache__/__init__.cpython-310.pyc b/route/migrations/__pycache__/__init__.cpython-310.pyc index bb8a3e39..a37f4602 100644 Binary files a/route/migrations/__pycache__/__init__.cpython-310.pyc and b/route/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/route/urls.py b/route/urls.py index ee39a7cb..8b4114ec 100644 --- a/route/urls.py +++ b/route/urls.py @@ -4,9 +4,9 @@ urlpatterns = [ path('recommendations/', PlaceRecommendationAPIView.as_view(), name='place-recommendations'), - path('routeplaces/', RemovePlaceFromRouteAPIView.as_view(), name='remove-place-from-route'), + path('?route_id=&place_id=', RemovePlaceFromRouteAPIView.as_view(), name='remove-place-from-route'), path('top_recommended_places/', views.top_recommended_places, name='top_recommended_places'), path('routes/', RouteDetail.as_view(), name='routes'), - path('routes', RouteList.as_view(), name='routes'), + path('routes/', RouteList.as_view(), name='routes'), path('routes//place//recommend', PlaceLike.as_view()) ] \ No newline at end of file diff --git a/users/__pycache__/__init__.cpython-310.pyc b/users/__pycache__/__init__.cpython-310.pyc index 0b969e47..d4e271cb 100644 Binary files a/users/__pycache__/__init__.cpython-310.pyc and b/users/__pycache__/__init__.cpython-310.pyc differ diff --git a/users/__pycache__/admin.cpython-310.pyc b/users/__pycache__/admin.cpython-310.pyc index 4162477a..eac46f00 100644 Binary files a/users/__pycache__/admin.cpython-310.pyc and b/users/__pycache__/admin.cpython-310.pyc differ diff --git a/users/__pycache__/apps.cpython-310.pyc b/users/__pycache__/apps.cpython-310.pyc index 402961bb..b5879a47 100644 Binary files a/users/__pycache__/apps.cpython-310.pyc and b/users/__pycache__/apps.cpython-310.pyc differ diff --git a/users/__pycache__/models.cpython-310.pyc b/users/__pycache__/models.cpython-310.pyc index 0797459f..77aa2aa0 100644 Binary files a/users/__pycache__/models.cpython-310.pyc and b/users/__pycache__/models.cpython-310.pyc differ diff --git a/users/__pycache__/serializers.cpython-310.pyc b/users/__pycache__/serializers.cpython-310.pyc index 78e70ef6..8e957ccf 100644 Binary files a/users/__pycache__/serializers.cpython-310.pyc and b/users/__pycache__/serializers.cpython-310.pyc differ diff --git a/users/__pycache__/urls.cpython-310.pyc b/users/__pycache__/urls.cpython-310.pyc index bd74c166..4be86a9f 100644 Binary files a/users/__pycache__/urls.cpython-310.pyc and b/users/__pycache__/urls.cpython-310.pyc differ diff --git a/users/__pycache__/views.cpython-310.pyc b/users/__pycache__/views.cpython-310.pyc index 777fe56a..d4cd5e56 100644 Binary files a/users/__pycache__/views.cpython-310.pyc and b/users/__pycache__/views.cpython-310.pyc differ diff --git a/users/migrations/__pycache__/0001_initial.cpython-310.pyc b/users/migrations/__pycache__/0001_initial.cpython-310.pyc index 10653e8b..08aad358 100644 Binary files a/users/migrations/__pycache__/0001_initial.cpython-310.pyc and b/users/migrations/__pycache__/0001_initial.cpython-310.pyc differ diff --git a/users/migrations/__pycache__/__init__.cpython-310.pyc b/users/migrations/__pycache__/__init__.cpython-310.pyc index b16e4c96..2330a983 100644 Binary files a/users/migrations/__pycache__/__init__.cpython-310.pyc and b/users/migrations/__pycache__/__init__.cpython-310.pyc differ diff --git a/users/urls.py b/users/urls.py index 535dec0e..dd369e78 100644 --- a/users/urls.py +++ b/users/urls.py @@ -4,7 +4,7 @@ urlpatterns = [ path('', views.index, name='index'), - path('api/token/', TokenObtainPairView.as_view(), name='token_obtain_pair'), + path('token/', TokenObtainPairView.as_view(), name='token_obtain_pair'), path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'), path('signup/', views.UserSignupView.as_view(), name='signup'), path('profile/', views.UserProfileView.as_view(), name='profile'),