Merge pull request #2 from Akshen/develop

Develop

1 files changed, 16 insertions, 2 deletions

diff --git a/fossee_manim/urls.py b/fossee_manim/urls.py
index 7bc7740..6181b67 100644
--- a/fossee_manim/urls.py
+++ b/fossee_manim/urls.py
@@ -1,5 +1,8 @@
 from django.conf.urls import url
 from fossee_manim import views
+from django.conf import settings
+from django.conf.urls.static import static
+
 
 urlpatterns = [
     url(r'^$', views.index, name='index'),
@@ -11,8 +14,19 @@ urlpatterns = [
     url(r'^send_proposal/$', views.send_proposal, name='send_proposal'),
     url(r'^edit_proposal/([1-9][0-9]*)$', views.edit_proposal,
         name='edit_proposal'),
+    url(r'^upload_animation/([1-9][0-9]*)$', views.upload_animation,
+        name='upload_animation'),
     url(r'^proposal_status/$', views.proposal_status, name='proposal_status'),
     url(r'^search/$', views.search, name='search'),
+    url(r'^how_to/$', views.how_to, name='how_to'),
     url(r'^view_profile/$', views.view_profile, name='view_profile'),
-    url(r'^edit_profile/$', views.edit_profile, name='edit_profile')
-]
\ No newline at end of file
+    url(r'^edit_profile/$', views.edit_profile, name='edit_profile'),
+    url(r'^video/([1-9][0-9]*)$', views.video, name='video'),
+    url(r'^search_category/(?P<cat>.+)$', views.search_category,
+        name='search_category')
+]
+
+urlpatterns += static(
+                    settings.MEDIA_URL,
+                    document_root=settings.MEDIA_ROOT
+)