Skip to content

Update #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Oct 26, 2020
15 changes: 11 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
=======
Expand Down
8 changes: 4 additions & 4 deletions django-jquery-file-upload/urls.py
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion fileupload/serialize.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
10 changes: 5 additions & 5 deletions fileupload/templates/fileupload/picture_basic_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
<h1>Django jQuery File Upload Demo</h1>
<h2 class="lead">Basic version</h2>
<ul class="nav nav-tabs">
<li class="active"><a href="/upload/basic">Basic</a></li>
<li><a href="/upload/basic/plus">Basic Plus</a></li>
<li><a href="/upload/new">Basic Plus UI</a></li>
<li><a href="/upload/angular">AngularJS</a></li>
<li><a href="/upload/jquery-ui">jQuery UI</a></li>
<li class="active"><a href="/upload/basic/">Basic</a></li>
<li><a href="/upload/basic/plus/">Basic Plus</a></li>
<li><a href="/upload/new/">Basic Plus UI</a></li>
<li><a href="/upload/angular/">AngularJS</a></li>
<li><a href="/upload/jquery-ui/">jQuery UI</a></li>
</ul>
<br>
<blockquote>
Expand Down
10 changes: 5 additions & 5 deletions fileupload/templates/fileupload/picture_basicplus_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,11 @@
<h1>Django jQuery File Upload Demo</h1>
<h2 class="lead">Basic Plus version</h2>
<ul class="nav nav-tabs">
<li><a href="/upload/basic">Basic</a></li>
<li class="active"><a href="/upload/basic/plus">Basic Plus</a></li>
<li><a href="/upload/new">Basic Plus UI</a></li>
<li><a href="/upload/angular">AngularJS</a></li>
<li><a href="/upload/jquery-ui">jQuery UI</a></li>
<li><a href="/upload/basic/">Basic</a></li>
<li class="active"><a href="/upload/basic/plus/">Basic Plus</a></li>
<li><a href="/upload/new/">Basic Plus UI</a></li>
<li><a href="/upload/angular/">AngularJS</a></li>
<li><a href="/upload/jquery-ui/">jQuery UI</a></li>
</ul>
<br>
<blockquote>
Expand Down
8 changes: 4 additions & 4 deletions fileupload/templates/fileupload/picture_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
<h1>Django jQuery File Upload Demo</h1>
<h2 class="lead">Basic Plus UI version</h2>
<ul class="nav nav-tabs">
<li><a href="/upload/basic">Basic</a></li>
<li><a href="/upload/basic/plus">Basic Plus</a></li>
<li><a href="/upload/basic/">Basic</a></li>
<li><a href="/upload/basic/plus/">Basic Plus</a></li>
<li class="active"><a href="/upload/new/">Basic Plus UI</a></li>
<li><a href="/upload/angular">AngularJS</a></li>
<li><a href="/upload/jquery-ui">jQuery UI</a></li>
<li><a href="/upload/angular/">AngularJS</a></li>
<li><a href="/upload/jquery-ui/">jQuery UI</a></li>
</ul>
<br>
<blockquote>
Expand Down
10 changes: 5 additions & 5 deletions fileupload/templates/fileupload/picture_jquery_form.html
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ <h2>jQuery UI version</h2>
</select>
</form>
<ul class="navigation">
<li><a href="/upload/basic">Basic</a></li>
<li><a href="/upload/basic/plus">Basic Plus</a></li>
<li><a href="/upload/new">Basic Plus UI</a></li>
<li><a href="/upload/angular">AngularJS</a></li>
<li class="active"><a href="/upload/jquery-ui">jQuery UI</a></li>
<li><a href="/upload/basic/">Basic</a></li>
<li><a href="/upload/basic/plus/">Basic Plus</a></li>
<li><a href="/upload/new/">Basic Plus UI</a></li>
<li><a href="/upload/angular/">AngularJS</a></li>
<li class="active"><a href="/upload/jquery-ui/">jQuery UI</a></li>
</ul>
<blockquote>
<p>File Upload widget with multiple file selection, drag&amp;drop support, progress bars, validation and preview images, audio and video for jQuery UI.<br>
Expand Down
16 changes: 8 additions & 8 deletions fileupload/urls.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
# encoding: utf-8
from django.conf.urls import url
from django.urls import path
from fileupload.views import (
BasicVersionCreateView, BasicPlusVersionCreateView,
jQueryVersionCreateView, AngularVersionCreateView,
PictureCreateView, PictureDeleteView, PictureListView,
)

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<pk>\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/<int:pk>', PictureDeleteView.as_view(), name='upload-delete'),
path('view/', PictureListView.as_view(), name='upload-view'),
]
4 changes: 2 additions & 2 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
django
pillow
django>=2.2.13,<2.0.99
pillow>=7.1.0