diff --git a/website/db.sqlite3 b/website/db.sqlite3 index 862d5b37..292a5a32 100644 Binary files a/website/db.sqlite3 and b/website/db.sqlite3 differ diff --git a/website/home/__pycache__/admin.cpython-38.pyc b/website/home/__pycache__/admin.cpython-38.pyc new file mode 100644 index 00000000..433fa607 Binary files /dev/null and b/website/home/__pycache__/admin.cpython-38.pyc differ diff --git a/website/home/__pycache__/models.cpython-38.pyc b/website/home/__pycache__/models.cpython-38.pyc new file mode 100644 index 00000000..6b8d2909 Binary files /dev/null and b/website/home/__pycache__/models.cpython-38.pyc differ diff --git a/website/home/__pycache__/views.cpython-38.pyc b/website/home/__pycache__/views.cpython-38.pyc new file mode 100644 index 00000000..1048ab2a Binary files /dev/null and b/website/home/__pycache__/views.cpython-38.pyc differ diff --git a/website/media/images/Firefox_wallpaper.png b/website/media/images/Firefox_wallpaper.png new file mode 100644 index 00000000..e2f23fcc Binary files /dev/null and b/website/media/images/Firefox_wallpaper.png differ diff --git a/website/media/images/Firefox_wallpaper_DWC6NUM.png b/website/media/images/Firefox_wallpaper_DWC6NUM.png new file mode 100644 index 00000000..e2f23fcc Binary files /dev/null and b/website/media/images/Firefox_wallpaper_DWC6NUM.png differ diff --git a/website/media/images/Firefox_wallpaper_K3hB2TP.png b/website/media/images/Firefox_wallpaper_K3hB2TP.png new file mode 100644 index 00000000..e2f23fcc Binary files /dev/null and b/website/media/images/Firefox_wallpaper_K3hB2TP.png differ diff --git a/website/media/images/Firefox_wallpaper_SdWEpTL.png b/website/media/images/Firefox_wallpaper_SdWEpTL.png new file mode 100644 index 00000000..e2f23fcc Binary files /dev/null and b/website/media/images/Firefox_wallpaper_SdWEpTL.png differ diff --git a/website/media/images/Screenshot_from_2020-03-06_10-58-51.png b/website/media/images/Screenshot_from_2020-03-06_10-58-51.png new file mode 100644 index 00000000..317e95b7 Binary files /dev/null and b/website/media/images/Screenshot_from_2020-03-06_10-58-51.png differ diff --git a/website/templates/uploadImage.html b/website/templates/uploadImage.html index 68c26c7e..44e97ee0 100644 --- a/website/templates/uploadImage.html +++ b/website/templates/uploadImage.html @@ -4,13 +4,13 @@ {% block content %} {% if user.is_authenticated %} - Hi {{ user.username }}!
+ Hi {{ user.username }} {{ user.id }}!
{% csrf_token %} {{ form.as_p }}
- + {% if img_obj %}

Succesfully uploaded : {{img_obj.title}}

connect diff --git a/website/upload/__pycache__/__init__.cpython-38.pyc b/website/upload/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..ff108a72 Binary files /dev/null and b/website/upload/__pycache__/__init__.cpython-38.pyc differ diff --git a/website/upload/__pycache__/admin.cpython-38.pyc b/website/upload/__pycache__/admin.cpython-38.pyc new file mode 100644 index 00000000..88387572 Binary files /dev/null and b/website/upload/__pycache__/admin.cpython-38.pyc differ diff --git a/website/upload/__pycache__/forms.cpython-38.pyc b/website/upload/__pycache__/forms.cpython-38.pyc new file mode 100644 index 00000000..7cddc7fc Binary files /dev/null and b/website/upload/__pycache__/forms.cpython-38.pyc differ diff --git a/website/upload/__pycache__/models.cpython-38.pyc b/website/upload/__pycache__/models.cpython-38.pyc new file mode 100644 index 00000000..f2c1cbc6 Binary files /dev/null and b/website/upload/__pycache__/models.cpython-38.pyc differ diff --git a/website/upload/__pycache__/validators.cpython-38.pyc b/website/upload/__pycache__/validators.cpython-38.pyc new file mode 100644 index 00000000..14e5d874 Binary files /dev/null and b/website/upload/__pycache__/validators.cpython-38.pyc differ diff --git a/website/upload/__pycache__/views.cpython-38.pyc b/website/upload/__pycache__/views.cpython-38.pyc new file mode 100644 index 00000000..cb018fcc Binary files /dev/null and b/website/upload/__pycache__/views.cpython-38.pyc differ diff --git a/website/upload/forms.py b/website/upload/forms.py index 0235a029..4f6b2190 100644 --- a/website/upload/forms.py +++ b/website/upload/forms.py @@ -7,7 +7,7 @@ class ImageForm(forms.ModelForm): class Meta: model = Image fields = ('title', 'image') - + class VideoForm(forms.ModelForm): """Form for the image model""" class Meta: diff --git a/website/upload/migrations/0006_auto_20210218_0008.py b/website/upload/migrations/0006_auto_20210218_0008.py new file mode 100644 index 00000000..dfd8ba61 --- /dev/null +++ b/website/upload/migrations/0006_auto_20210218_0008.py @@ -0,0 +1,32 @@ +# Generated by Django 3.1.6 on 2021-02-17 22:08 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import upload.validators + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('upload', '0005_videos'), + ] + + operations = [ + migrations.AddField( + model_name='image', + name='user', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='image', + name='image', + field=models.ImageField(upload_to='images/', validators=[upload.validators.imageValidate]), + ), + migrations.AlterField( + model_name='videos', + name='video', + field=models.FileField(upload_to='videos/', validators=[upload.validators.videoValidate]), + ), + ] diff --git a/website/upload/migrations/__pycache__/0001_initial.cpython-38.pyc b/website/upload/migrations/__pycache__/0001_initial.cpython-38.pyc new file mode 100644 index 00000000..24e5e6a5 Binary files /dev/null and b/website/upload/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/website/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-38.pyc b/website/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-38.pyc new file mode 100644 index 00000000..810d8f96 Binary files /dev/null and b/website/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-38.pyc differ diff --git a/website/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-38.pyc b/website/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-38.pyc new file mode 100644 index 00000000..0a601279 Binary files /dev/null and b/website/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-38.pyc differ diff --git a/website/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-38.pyc b/website/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-38.pyc new file mode 100644 index 00000000..4032d6ae Binary files /dev/null and b/website/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-38.pyc differ diff --git a/website/upload/migrations/__pycache__/0005_videos.cpython-38.pyc b/website/upload/migrations/__pycache__/0005_videos.cpython-38.pyc new file mode 100644 index 00000000..fa538e66 Binary files /dev/null and b/website/upload/migrations/__pycache__/0005_videos.cpython-38.pyc differ diff --git a/website/upload/migrations/__pycache__/0006_auto_20210218_0008.cpython-38.pyc b/website/upload/migrations/__pycache__/0006_auto_20210218_0008.cpython-38.pyc new file mode 100644 index 00000000..eedf8ab2 Binary files /dev/null and b/website/upload/migrations/__pycache__/0006_auto_20210218_0008.cpython-38.pyc differ diff --git a/website/upload/migrations/__pycache__/__init__.cpython-38.pyc b/website/upload/migrations/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..5a4daf7f Binary files /dev/null and b/website/upload/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/website/upload/models.py b/website/upload/models.py index dfaddbdc..e7b8c550 100644 --- a/website/upload/models.py +++ b/website/upload/models.py @@ -1,5 +1,6 @@ from django.db import models from .validators import videoValidate, imageValidate +from django.contrib.auth.models import User # def user_directory._path(instance, filename): # print(request.user.id) @@ -10,18 +11,19 @@ from .validators import videoValidate, imageValidate class Image(models.Model): title = models.CharField(max_length=200) - image = models.ImageField(upload_to=f"images/{upload_to}",validators=[imageValidate]) - + image = models.ImageField(upload_to=f"images/",validators=[imageValidate]) + user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True) + def __str__(self): return self.title - + class Videos(models.Model): title = models.CharField(max_length=100) video = models.FileField(upload_to=f'videos/', validators=[videoValidate]) - + class Meta: verbose_name = 'video' verbose_name_plural = 'videos' - + def __str__(self): return self.title diff --git a/website/upload/views.py b/website/upload/views.py index 20fac144..d15b2221 100644 --- a/website/upload/views.py +++ b/website/upload/views.py @@ -22,14 +22,17 @@ def uploadContent(request): def imageUpload(request): """Process images uploaded by users""" + + print(request.user.id) if request.method == 'POST': form = ImageForm(request.POST, request.FILES) if form.is_valid(): - form.save() # Get the current instance object to display in the template img_obj = form.instance + img_obj.user = request.user + form.save() return render(request, 'uploadImage.html', {'form': form, 'img_obj': img_obj}) - + else: form = ImageForm() return render(request, 'uploadImage.html', {'form': form}) @@ -42,8 +45,7 @@ def videoUpload(request): form.save() img_obj = form.instance return render(request, 'uploadVideo.html', {'form': form, 'img_obj': img_obj}) - + else: form = VideoForm() return render(request, 'uploadVideo.html', {'form': form}) - diff --git a/website/users/__pycache__/admin.cpython-38.pyc b/website/users/__pycache__/admin.cpython-38.pyc new file mode 100644 index 00000000..5bdb4be6 Binary files /dev/null and b/website/users/__pycache__/admin.cpython-38.pyc differ diff --git a/website/users/__pycache__/models.cpython-38.pyc b/website/users/__pycache__/models.cpython-38.pyc new file mode 100644 index 00000000..695c7650 Binary files /dev/null and b/website/users/__pycache__/models.cpython-38.pyc differ diff --git a/website/users/__pycache__/urls.cpython-38.pyc b/website/users/__pycache__/urls.cpython-38.pyc new file mode 100644 index 00000000..b8c9e4cf Binary files /dev/null and b/website/users/__pycache__/urls.cpython-38.pyc differ diff --git a/website/users/__pycache__/views.cpython-38.pyc b/website/users/__pycache__/views.cpython-38.pyc new file mode 100644 index 00000000..0995e4e2 Binary files /dev/null and b/website/users/__pycache__/views.cpython-38.pyc differ diff --git a/website/website/__pycache__/settings.cpython-37.pyc b/website/website/__pycache__/settings.cpython-37.pyc new file mode 100644 index 00000000..e5778783 Binary files /dev/null and b/website/website/__pycache__/settings.cpython-37.pyc differ diff --git a/website/website/__pycache__/settings.cpython-38.pyc b/website/website/__pycache__/settings.cpython-38.pyc new file mode 100644 index 00000000..b909fa7f Binary files /dev/null and b/website/website/__pycache__/settings.cpython-38.pyc differ diff --git a/website/website/__pycache__/urls.cpython-38.pyc b/website/website/__pycache__/urls.cpython-38.pyc new file mode 100644 index 00000000..86276fca Binary files /dev/null and b/website/website/__pycache__/urls.cpython-38.pyc differ diff --git a/website/website/__pycache__/wsgi.cpython-38.pyc b/website/website/__pycache__/wsgi.cpython-38.pyc new file mode 100644 index 00000000..958214ce Binary files /dev/null and b/website/website/__pycache__/wsgi.cpython-38.pyc differ