50 lines
1.6 KiB
Python
50 lines
1.6 KiB
Python
from django.contrib import admin
|
|
from django.urls import path
|
|
from django.conf import settings
|
|
from django.conf.urls.static import static
|
|
from django.conf.urls import include
|
|
|
|
from tastypie.api import Api
|
|
|
|
from main import views
|
|
from main.feeds import LatestMoviesFeed
|
|
from main.api import ResourceMovies
|
|
|
|
|
|
v1_api = Api(api_name="v1")
|
|
v1_api.register(ResourceMovies())
|
|
|
|
|
|
urlpatterns = [
|
|
<<<<<<< HEAD
|
|
<<<<<<< HEAD
|
|
path("", views.home, name="home"),
|
|
path("search/", views.search, name="search"),
|
|
path("about/", views.about, name="about"),
|
|
path("bugs/", views.bugs, name="bugs"),
|
|
path("movies/<str:key>", views.movies, name="movies"),
|
|
path("movie/<int:id>", views.movie, name="movie"),
|
|
path("ultimas/rss/", LatestMoviesFeed()),
|
|
path("admin/", admin.site.urls),
|
|
# path('api/', include(v1_api.urls)),
|
|
=======
|
|
path('', views.home, name='home'),
|
|
path('search/', views.search, name='search'),
|
|
#path('movies/<str:args>', views.movies, name='movies'),
|
|
path('ultimas/rss/', LatestMoviesFeed()),
|
|
path('admin/', admin.site.urls),
|
|
#path('api/', include(v1_api.urls)),
|
|
>>>>>>> fb23014 (Inicio de diseño)
|
|
=======
|
|
path("", views.home, name="home"),
|
|
path("search/", views.search, name="search"),
|
|
path("about/", views.about, name="about"),
|
|
path("bugs/", views.bugs, name="bugs"),
|
|
path("movies/<str:key>", views.movies, name="movies"),
|
|
path("movie/<int:id>", views.movie, name="movie"),
|
|
path("ultimas/rss/", LatestMoviesFeed()),
|
|
path("admin/", admin.site.urls),
|
|
# path('api/', include(v1_api.urls)),
|
|
>>>>>>> a468c37 (Aplicación de 'black')
|
|
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
|