You are not logged in
Log In {% endif %} diff --git a/website/upload/__pycache__/__init__.cpython-36.pyc b/website/upload/__pycache__/__init__.cpython-36.pyc index fb5f5ec8..e15fe25b 100644 Binary files a/website/upload/__pycache__/__init__.cpython-36.pyc and b/website/upload/__pycache__/__init__.cpython-36.pyc differ diff --git a/website/upload/__pycache__/admin.cpython-36.pyc b/website/upload/__pycache__/admin.cpython-36.pyc index 882cca75..ffba15ac 100644 Binary files a/website/upload/__pycache__/admin.cpython-36.pyc and b/website/upload/__pycache__/admin.cpython-36.pyc differ diff --git a/website/upload/__pycache__/forms.cpython-36.pyc b/website/upload/__pycache__/forms.cpython-36.pyc new file mode 100644 index 00000000..0be45d49 Binary files /dev/null and b/website/upload/__pycache__/forms.cpython-36.pyc differ diff --git a/website/upload/__pycache__/models.cpython-36.pyc b/website/upload/__pycache__/models.cpython-36.pyc index 7895cdc3..9353ccf6 100644 Binary files a/website/upload/__pycache__/models.cpython-36.pyc and b/website/upload/__pycache__/models.cpython-36.pyc differ diff --git a/website/upload/__pycache__/views.cpython-36.pyc b/website/upload/__pycache__/views.cpython-36.pyc index 53f1b077..eb4edbdc 100644 Binary files a/website/upload/__pycache__/views.cpython-36.pyc and b/website/upload/__pycache__/views.cpython-36.pyc differ diff --git a/website/upload/forms.py b/website/upload/forms.py index 45c3ffa9..d168e15a 100644 --- a/website/upload/forms.py +++ b/website/upload/forms.py @@ -6,4 +6,4 @@ class ImageForm(forms.ModelForm): """Form for the image model""" class Meta: model = Image - fields = ('title', 'image') + fields = ('image',) diff --git a/website/upload/migrations/0001_initial.py b/website/upload/migrations/0001_initial.py new file mode 100644 index 00000000..57ab43e2 --- /dev/null +++ b/website/upload/migrations/0001_initial.py @@ -0,0 +1,21 @@ +# Generated by Django 3.1.6 on 2021-02-09 15:56 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Image', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('image', models.ImageField(blank=True, upload_to='static/%Y/%m/%d/')), + ], + ), + ] diff --git a/website/upload/migrations/0002_auto_20210209_1803.py b/website/upload/migrations/0002_auto_20210209_1803.py new file mode 100644 index 00000000..08f4eb47 --- /dev/null +++ b/website/upload/migrations/0002_auto_20210209_1803.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-02-09 16:03 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('upload', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='image', + name='image', + field=models.FileField(upload_to='../static/%Y/%m/%d/'), + ), + ] diff --git a/website/upload/migrations/0003_auto_20210209_1806.py b/website/upload/migrations/0003_auto_20210209_1806.py new file mode 100644 index 00000000..b98e07f5 --- /dev/null +++ b/website/upload/migrations/0003_auto_20210209_1806.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-02-09 16:06 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('upload', '0002_auto_20210209_1803'), + ] + + operations = [ + migrations.AlterField( + model_name='image', + name='image', + field=models.FileField(upload_to='static/'), + ), + ] diff --git a/website/upload/migrations/__pycache__/0001_initial.cpython-36.pyc b/website/upload/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 00000000..34be35d2 Binary files /dev/null and b/website/upload/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/website/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-36.pyc b/website/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-36.pyc new file mode 100644 index 00000000..40318a1f Binary files /dev/null and b/website/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-36.pyc differ diff --git a/website/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-36.pyc b/website/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-36.pyc new file mode 100644 index 00000000..2b1a0ad5 Binary files /dev/null and b/website/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-36.pyc differ diff --git a/website/upload/migrations/__pycache__/__init__.cpython-36.pyc b/website/upload/migrations/__pycache__/__init__.cpython-36.pyc index 192f30b7..a402309e 100644 Binary files a/website/upload/migrations/__pycache__/__init__.cpython-36.pyc and b/website/upload/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/website/upload/models.py b/website/upload/models.py index de4eca9b..a187bdad 100644 --- a/website/upload/models.py +++ b/website/upload/models.py @@ -1,4 +1,4 @@ from django.db import models class Image(models.Model): - image = models.ImageField(upload_to='static/%Y/%m/%d/', blank=True) + image = models.FileField(upload_to='static/') diff --git a/website/upload/views.py b/website/upload/views.py index 335201ac..9d6bd330 100644 --- a/website/upload/views.py +++ b/website/upload/views.py @@ -1,5 +1,7 @@ from django.shortcuts import render, redirect import os.path +from .forms import ImageForm +from django.core.files.storage import FileSystemStorage def uploadContent(request): if request.method == "GET": @@ -15,16 +17,22 @@ def uploadContent(request): else: return +# Please fix the fact that this shit gets uploaded literally everywhere + def imageUpload(request): - if request.method == "GET": - return render(request, "uploadImage.html") - elif request.method == "POST": - image = request.POST["image"] - # add the id of the user, after you add in users - savingImage = open(f"static/{image}","wb") - for i in image: - savingImage.write(i) - savingImage.close() - return redirect(f"/static/{image}") + """Process images uploaded by users""" + if request.method == 'POST': + form = ImageForm(request.POST, request.FILES) + if form.is_valid(): + myfile = request.FILES['image'] + fs = FileSystemStorage(location="./static/") #defaults to MEDIA_ROOT + filename = fs.save(myfile.name, myfile) + file_url = fs.url(filename) + + return render(request, 'uploadImage.html', { + 'file_url': file_url, + 'file_name': myfile.name, + }) + else: - return + form = ImageForm() diff --git a/website/users/__pycache__/admin.cpython-36.pyc b/website/users/__pycache__/admin.cpython-36.pyc index 8573692b..a674ac5c 100644 Binary files a/website/users/__pycache__/admin.cpython-36.pyc and b/website/users/__pycache__/admin.cpython-36.pyc differ diff --git a/website/users/__pycache__/models.cpython-36.pyc b/website/users/__pycache__/models.cpython-36.pyc index 813ec63e..57c22ba9 100644 Binary files a/website/users/__pycache__/models.cpython-36.pyc and b/website/users/__pycache__/models.cpython-36.pyc differ diff --git a/website/users/__pycache__/urls.cpython-36.pyc b/website/users/__pycache__/urls.cpython-36.pyc index 4bf10ac2..0c22a4f3 100644 Binary files a/website/users/__pycache__/urls.cpython-36.pyc and b/website/users/__pycache__/urls.cpython-36.pyc differ diff --git a/website/users/__pycache__/views.cpython-36.pyc b/website/users/__pycache__/views.cpython-36.pyc index f6c59961..1d60bb74 100644 Binary files a/website/users/__pycache__/views.cpython-36.pyc and b/website/users/__pycache__/views.cpython-36.pyc differ diff --git a/website/website/__pycache__/settings.cpython-36.pyc b/website/website/__pycache__/settings.cpython-36.pyc index c6a04d2d..08f8fbbc 100644 Binary files a/website/website/__pycache__/settings.cpython-36.pyc and b/website/website/__pycache__/settings.cpython-36.pyc differ diff --git a/website/website/__pycache__/urls.cpython-36.pyc b/website/website/__pycache__/urls.cpython-36.pyc index e493a111..70a52e20 100644 Binary files a/website/website/__pycache__/urls.cpython-36.pyc and b/website/website/__pycache__/urls.cpython-36.pyc differ diff --git a/website/website/__pycache__/wsgi.cpython-36.pyc b/website/website/__pycache__/wsgi.cpython-36.pyc index b1ac2cfa..f5deabd1 100644 Binary files a/website/website/__pycache__/wsgi.cpython-36.pyc and b/website/website/__pycache__/wsgi.cpython-36.pyc differ diff --git a/website/website/settings.py b/website/website/settings.py index c199d45b..6e862f68 100644 --- a/website/website/settings.py +++ b/website/website/settings.py @@ -124,8 +124,6 @@ USE_TZ = True STATIC_URL = '/static/' STATIC_ROOT= str(BASE_DIR.joinpath('static')) -MEDIA_URL = '/media/' -MEDIA_ROOT = str(BASE_DIR.joinpath('media')) LOGIN_REDIRECT_URL = "/" LOGOUT_REDIRECT_URL = "/" diff --git a/website/website/urls.py b/website/website/urls.py index bc6ddbc1..c296003c 100644 --- a/website/website/urls.py +++ b/website/website/urls.py @@ -29,4 +29,7 @@ urlpatterns = [ path('users/', include('users.urls')), path("upload/", uploadContent, name="Upload"), path("upload_image/", imageUpload, name="Image") -] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) +] +if settings.DEBUG: + urlpatterns += static(settings.STATIC_URL, + document_root=settings.STATIC_ROOT)