diff --git a/README.md b/README.md index d28dde2..3498b31 100644 --- a/README.md +++ b/README.md @@ -32,10 +32,17 @@ fileupload/models.py as commented in the file. Installation ============ -* pip install -r requirements.txt (will install django and pillow) -* python manage.py migrate -* python manage.py runserver -* go to localhost:8000/upload/new/ and upload some files +I recommend to install this within a virtualenv. + +```sh +virtualenv -p python3 venv +source venv/bin/activate +pip install -r requirements.txt +./manage.py migrate +./manage.py runserver +``` + +And then go to localhost:8000 and try to upload some files. License ======= diff --git a/django-jquery-file-upload/urls.py b/django-jquery-file-upload/urls.py index 53f314a..8f26ec4 100644 --- a/django-jquery-file-upload/urls.py +++ b/django-jquery-file-upload/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.urls import include, path from django.http import HttpResponseRedirect from django.conf import settings @@ -7,9 +7,9 @@ admin.autodiscover() urlpatterns = [ - url(r'^$', lambda x: HttpResponseRedirect('/upload/new/')), - url(r'^upload/', include('fileupload.urls')), - url(r'^admin/', include(admin.site.urls)), + path('', lambda x: HttpResponseRedirect('/upload/new/')), + path('upload/', include('fileupload.urls')), + path('admin/', admin.site.urls), ] if settings.DEBUG: diff --git a/fileupload/serialize.py b/fileupload/serialize.py index 4494e79..96749af 100644 --- a/fileupload/serialize.py +++ b/fileupload/serialize.py @@ -1,7 +1,7 @@ # encoding: utf-8 import mimetypes import re -from django.core.urlresolvers import reverse +from django.urls import reverse def order_name(name): diff --git a/fileupload/templates/fileupload/picture_basic_form.html b/fileupload/templates/fileupload/picture_basic_form.html index 69993d0..98ab055 100644 --- a/fileupload/templates/fileupload/picture_basic_form.html +++ b/fileupload/templates/fileupload/picture_basic_form.html @@ -38,11 +38,11 @@

Django jQuery File Upload Demo

Basic version


diff --git a/fileupload/templates/fileupload/picture_basicplus_form.html b/fileupload/templates/fileupload/picture_basicplus_form.html index 2d2069e..e52d1fd 100644 --- a/fileupload/templates/fileupload/picture_basicplus_form.html +++ b/fileupload/templates/fileupload/picture_basicplus_form.html @@ -38,11 +38,11 @@

Django jQuery File Upload Demo

Basic Plus version


diff --git a/fileupload/templates/fileupload/picture_form.html b/fileupload/templates/fileupload/picture_form.html index d77a925..1f352e8 100644 --- a/fileupload/templates/fileupload/picture_form.html +++ b/fileupload/templates/fileupload/picture_form.html @@ -6,11 +6,11 @@

Django jQuery File Upload Demo

Basic Plus UI version


diff --git a/fileupload/templates/fileupload/picture_jquery_form.html b/fileupload/templates/fileupload/picture_jquery_form.html index 0332c31..3de8b18 100644 --- a/fileupload/templates/fileupload/picture_jquery_form.html +++ b/fileupload/templates/fileupload/picture_jquery_form.html @@ -82,11 +82,11 @@

jQuery UI version

File Upload widget with multiple file selection, drag&drop support, progress bars, validation and preview images, audio and video for jQuery UI.
diff --git a/fileupload/urls.py b/fileupload/urls.py index 7a52c3a..1dbfa7b 100644 --- a/fileupload/urls.py +++ b/fileupload/urls.py @@ -1,5 +1,5 @@ # encoding: utf-8 -from django.conf.urls import url +from django.urls import path from fileupload.views import ( BasicVersionCreateView, BasicPlusVersionCreateView, jQueryVersionCreateView, AngularVersionCreateView, @@ -7,11 +7,11 @@ ) urlpatterns = [ - url(r'^basic/$', BasicVersionCreateView.as_view(), name='upload-basic'), - url(r'^basic/plus/$', BasicPlusVersionCreateView.as_view(), name='upload-basic-plus'), - url(r'^new/$', PictureCreateView.as_view(), name='upload-new'), - url(r'^angular/$', AngularVersionCreateView.as_view(), name='upload-angular'), - url(r'^jquery-ui/$', jQueryVersionCreateView.as_view(), name='upload-jquery'), - url(r'^delete/(?P\d+)$', PictureDeleteView.as_view(), name='upload-delete'), - url(r'^view/$', PictureListView.as_view(), name='upload-view'), + path('basic/', BasicVersionCreateView.as_view(), name='upload-basic'), + path('basic/plus/', BasicPlusVersionCreateView.as_view(), name='upload-basic-plus'), + path('new/', PictureCreateView.as_view(), name='upload-new'), + path('angular/', AngularVersionCreateView.as_view(), name='upload-angular'), + path('jquery-ui/', jQueryVersionCreateView.as_view(), name='upload-jquery'), + path('delete/', PictureDeleteView.as_view(), name='upload-delete'), + path('view/', PictureListView.as_view(), name='upload-view'), ] diff --git a/requirements.txt b/requirements.txt index 67a04d6..c87429b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,2 +1,2 @@ -django -pillow +django>=2.2.13,<2.0.99 +pillow>=7.1.0