diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index dc1bd954..099412b5 100644 Binary files a/reValuate/db.sqlite3 and b/reValuate/db.sqlite3 differ diff --git a/reValuate/home/__pycache__/admin.cpython-36.pyc b/reValuate/home/__pycache__/admin.cpython-36.pyc index 6a1beeb2..29ae08c6 100644 Binary files a/reValuate/home/__pycache__/admin.cpython-36.pyc and b/reValuate/home/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/home/__pycache__/models.cpython-36.pyc b/reValuate/home/__pycache__/models.cpython-36.pyc index e80a12af..6c3f8440 100644 Binary files a/reValuate/home/__pycache__/models.cpython-36.pyc and b/reValuate/home/__pycache__/models.cpython-36.pyc differ diff --git a/reValuate/home/__pycache__/views.cpython-36.pyc b/reValuate/home/__pycache__/views.cpython-36.pyc index c7e2c6b7..2199e235 100644 Binary files a/reValuate/home/__pycache__/views.cpython-36.pyc and b/reValuate/home/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/media/images/1/1604-lubuntu-default-wallpaper-neutral.png b/reValuate/media/images/1/1604-lubuntu-default-wallpaper-neutral.png new file mode 100644 index 00000000..9d2029e8 Binary files /dev/null and b/reValuate/media/images/1/1604-lubuntu-default-wallpaper-neutral.png differ diff --git a/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4 b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4 new file mode 100644 index 00000000..1eabf40a Binary files /dev/null and b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4 differ diff --git a/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_7x9g4Ll.mp4 b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_7x9g4Ll.mp4 new file mode 100644 index 00000000..1eabf40a Binary files /dev/null and b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_7x9g4Ll.mp4 differ diff --git a/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_F54umwM.mp4 b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_F54umwM.mp4 new file mode 100644 index 00000000..1eabf40a Binary files /dev/null and b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_F54umwM.mp4 differ diff --git a/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_WgdBT3K.mp4 b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_WgdBT3K.mp4 new file mode 100644 index 00000000..1eabf40a Binary files /dev/null and b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_WgdBT3K.mp4 differ diff --git a/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_kFN2Ziy.mp4 b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_kFN2Ziy.mp4 new file mode 100644 index 00000000..1eabf40a Binary files /dev/null and b/reValuate/media/videos/1/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_kFN2Ziy.mp4 differ diff --git a/reValuate/media/videos/2/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4 b/reValuate/media/videos/2/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4 new file mode 100644 index 00000000..1eabf40a Binary files /dev/null and b/reValuate/media/videos/2/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video.mp4 differ diff --git a/reValuate/media/videos/2/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_BzkKMHx.mp4 b/reValuate/media/videos/2/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_BzkKMHx.mp4 new file mode 100644 index 00000000..1eabf40a Binary files /dev/null and b/reValuate/media/videos/2/RiceGum_-_Nae_Nae_Nigga_Official_FULL_Music_Video_BzkKMHx.mp4 differ diff --git a/reValuate/templates/getBalance.html b/reValuate/templates/getBalance.html new file mode 100644 index 00000000..b8cc7635 --- /dev/null +++ b/reValuate/templates/getBalance.html @@ -0,0 +1,16 @@ + +{% extends 'base.html' %} + +{% block title %}Home{% endblock %} + +{% block content %} + +{% if user.is_authenticated %} + Hi {{ user.username }}! + {{ userBalance }} +{% else %} +

You are not logged in

+ Log In +{% endif %} + +{% endblock %} diff --git a/reValuate/upload/__pycache__/__init__.cpython-36.pyc b/reValuate/upload/__pycache__/__init__.cpython-36.pyc index 49b605ea..298a4506 100644 Binary files a/reValuate/upload/__pycache__/__init__.cpython-36.pyc and b/reValuate/upload/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/admin.cpython-36.pyc b/reValuate/upload/__pycache__/admin.cpython-36.pyc index b44cbe26..b5c094ff 100644 Binary files a/reValuate/upload/__pycache__/admin.cpython-36.pyc and b/reValuate/upload/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/forms.cpython-36.pyc b/reValuate/upload/__pycache__/forms.cpython-36.pyc index 6c148c01..50f56b32 100644 Binary files a/reValuate/upload/__pycache__/forms.cpython-36.pyc and b/reValuate/upload/__pycache__/forms.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/models.cpython-36.pyc b/reValuate/upload/__pycache__/models.cpython-36.pyc index 17a7d67c..a685ada1 100644 Binary files a/reValuate/upload/__pycache__/models.cpython-36.pyc and b/reValuate/upload/__pycache__/models.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/validators.cpython-36.pyc b/reValuate/upload/__pycache__/validators.cpython-36.pyc index b40e8bc6..9486779e 100644 Binary files a/reValuate/upload/__pycache__/validators.cpython-36.pyc and b/reValuate/upload/__pycache__/validators.cpython-36.pyc differ diff --git a/reValuate/upload/__pycache__/views.cpython-36.pyc b/reValuate/upload/__pycache__/views.cpython-36.pyc index 49f28d75..35b4eafa 100644 Binary files a/reValuate/upload/__pycache__/views.cpython-36.pyc and b/reValuate/upload/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/0001_initial.py b/reValuate/upload/migrations/0001_initial.py deleted file mode 100644 index 57ab43e2..00000000 --- a/reValuate/upload/migrations/0001_initial.py +++ /dev/null @@ -1,21 +0,0 @@ -# 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/reValuate/upload/migrations/0002_auto_20210209_1803.py b/reValuate/upload/migrations/0002_auto_20210209_1803.py deleted file mode 100644 index 08f4eb47..00000000 --- a/reValuate/upload/migrations/0002_auto_20210209_1803.py +++ /dev/null @@ -1,18 +0,0 @@ -# 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/reValuate/upload/migrations/0003_auto_20210209_1806.py b/reValuate/upload/migrations/0003_auto_20210209_1806.py deleted file mode 100644 index b98e07f5..00000000 --- a/reValuate/upload/migrations/0003_auto_20210209_1806.py +++ /dev/null @@ -1,18 +0,0 @@ -# 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/reValuate/upload/migrations/0004_auto_20210217_0041.py b/reValuate/upload/migrations/0004_auto_20210217_0041.py deleted file mode 100644 index 8ca66b80..00000000 --- a/reValuate/upload/migrations/0004_auto_20210217_0041.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.1.6 on 2021-02-16 22:41 - -from django.db import migrations, models -import django.utils.timezone - - -class Migration(migrations.Migration): - - dependencies = [ - ('upload', '0003_auto_20210209_1806'), - ] - - operations = [ - migrations.AddField( - model_name='image', - name='title', - field=models.CharField(default=django.utils.timezone.now, max_length=200), - preserve_default=False, - ), - migrations.AlterField( - model_name='image', - name='image', - field=models.ImageField(upload_to='images'), - ), - ] diff --git a/reValuate/upload/migrations/0005_videos.py b/reValuate/upload/migrations/0005_videos.py deleted file mode 100644 index 38e798f8..00000000 --- a/reValuate/upload/migrations/0005_videos.py +++ /dev/null @@ -1,25 +0,0 @@ -# Generated by Django 3.1.6 on 2021-02-16 22:52 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('upload', '0004_auto_20210217_0041'), - ] - - operations = [ - migrations.CreateModel( - name='Videos', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('title', models.CharField(max_length=100)), - ('video', models.FileField(upload_to='videos/')), - ], - options={ - 'verbose_name': 'video', - 'verbose_name_plural': 'videos', - }, - ), - ] diff --git a/reValuate/upload/migrations/0006_auto_20210218_0008.py b/reValuate/upload/migrations/0006_auto_20210218_0008.py deleted file mode 100644 index dfd8ba61..00000000 --- a/reValuate/upload/migrations/0006_auto_20210218_0008.py +++ /dev/null @@ -1,32 +0,0 @@ -# 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/reValuate/upload/migrations/0007_auto_20210219_1419.py b/reValuate/upload/migrations/0007_auto_20210219_1419.py deleted file mode 100644 index caa800c3..00000000 --- a/reValuate/upload/migrations/0007_auto_20210219_1419.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1.6 on 2021-02-19 12:19 - -from django.db import migrations, models -import upload.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ('upload', '0006_auto_20210218_0008'), - ] - - operations = [ - migrations.AlterField( - model_name='image', - name='image', - field=models.ImageField(upload_to='images/', validators=[upload.validators.imageValidate]), - ), - ] diff --git a/reValuate/upload/migrations/0008_auto_20210219_1424.py b/reValuate/upload/migrations/0008_auto_20210219_1424.py deleted file mode 100644 index b7a7987e..00000000 --- a/reValuate/upload/migrations/0008_auto_20210219_1424.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 3.1.6 on 2021-02-19 12:24 - -from django.db import migrations, models -import upload.validators - - -class Migration(migrations.Migration): - - dependencies = [ - ('upload', '0007_auto_20210219_1419'), - ] - - operations = [ - migrations.AlterField( - model_name='image', - name='image', - field=models.ImageField(upload_to='images/None/', validators=[upload.validators.imageValidate]), - ), - ] diff --git a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc deleted file mode 100644 index 217b0afc..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-38.pyc deleted file mode 100644 index 24e5e6a5..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-36.pyc deleted file mode 100644 index 9da3b562..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-36.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-38.pyc deleted file mode 100644 index 810d8f96..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0002_auto_20210209_1803.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-36.pyc deleted file mode 100644 index b7fd6b74..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-36.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-38.pyc deleted file mode 100644 index 0a601279..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0003_auto_20210209_1806.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-36.pyc deleted file mode 100644 index a116769a..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-36.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-38.pyc deleted file mode 100644 index 4032d6ae..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0004_auto_20210217_0041.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0005_videos.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0005_videos.cpython-36.pyc deleted file mode 100644 index c8b39ea9..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0005_videos.cpython-36.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0005_videos.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0005_videos.cpython-38.pyc deleted file mode 100644 index fa538e66..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0005_videos.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0006_auto_20210218_0008.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0006_auto_20210218_0008.cpython-38.pyc deleted file mode 100644 index eedf8ab2..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0006_auto_20210218_0008.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0007_auto_20210219_1419.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0007_auto_20210219_1419.cpython-38.pyc deleted file mode 100644 index 25cbf30e..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0007_auto_20210219_1419.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/0008_auto_20210219_1424.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0008_auto_20210219_1424.cpython-38.pyc deleted file mode 100644 index 5b9962b5..00000000 Binary files a/reValuate/upload/migrations/__pycache__/0008_auto_20210219_1424.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc deleted file mode 100644 index e84bbe68..00000000 Binary files a/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc and /dev/null differ diff --git a/reValuate/upload/migrations/__pycache__/__init__.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 5a4daf7f..00000000 Binary files a/reValuate/upload/migrations/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/reValuate/upload/models.py b/reValuate/upload/models.py index 01a49806..3e1b3dca 100644 --- a/reValuate/upload/models.py +++ b/reValuate/upload/models.py @@ -9,21 +9,25 @@ from django.contrib.auth.models import User # I want to be able to store each and every user's files in a separate folder, based on their id # I CANT GET A FUCKING LOGGED IN USER ID FROM THE MODELS THINGY IM FUCKING PISSED -def user_directory_path(instance, filename): +def imagesPath(instance, filename): # file will be uploaded to MEDIA_ROOT/user_/ return 'images/{0}/{1}'.format(instance.user.id, filename) +def videosPath(instance,filename): + return f"videos/{instance.user.id}/{filename}" + class Image(models.Model): - user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True) + user = models.OneToOneField(User, on_delete=models.CASCADE, blank=True, null=True) title = models.CharField(max_length=200) - image = models.ImageField(upload_to=user_directory_path,validators=[imageValidate]) + image = models.ImageField(upload_to=imagesPath,validators=[imageValidate]) def __str__(self): return self.title class Videos(models.Model): + user = models.OneToOneField(User, on_delete=models.CASCADE, blank=True, null=True) title = models.CharField(max_length=100) - video = models.FileField(upload_to=f'videos/', validators=[videoValidate]) + video = models.FileField(upload_to=videosPath, validators=[videoValidate]) class Meta: verbose_name = 'video' diff --git a/reValuate/upload/views.py b/reValuate/upload/views.py index 32797e2a..562fc081 100644 --- a/reValuate/upload/views.py +++ b/reValuate/upload/views.py @@ -3,7 +3,7 @@ import os.path import os from .forms import ImageForm, VideoForm from django.core.files.storage import FileSystemStorage -from .models import Image +from .models import Image, Videos from django.conf import settings def uploadContent(request): @@ -29,7 +29,6 @@ def imageUpload(request): if request.method == 'POST': form = ImageForm(request.POST, request.FILES) if form.is_valid(): - # Get the current instance object to display in the template userIdModel = Image.objects.filter(user=request.user.id) img_obj = form.instance img_obj.user = request.user @@ -45,8 +44,10 @@ def videoUpload(request): if request.method == 'POST': form = VideoForm(request.POST, request.FILES) if form.is_valid(): - form.save() + userIdModel = Videos.objects.filter(user=request.user.id) img_obj = form.instance + img_obj.user = request.user + form.save() return render(request, 'uploadVideo.html', {'form': form, 'img_obj': img_obj}) else: diff --git a/reValuate/users/__pycache__/admin.cpython-36.pyc b/reValuate/users/__pycache__/admin.cpython-36.pyc index e8b35c30..9ca3057a 100644 Binary files a/reValuate/users/__pycache__/admin.cpython-36.pyc and b/reValuate/users/__pycache__/admin.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/models.cpython-36.pyc b/reValuate/users/__pycache__/models.cpython-36.pyc index 0d1a6c4c..4df54188 100644 Binary files a/reValuate/users/__pycache__/models.cpython-36.pyc and b/reValuate/users/__pycache__/models.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/urls.cpython-36.pyc b/reValuate/users/__pycache__/urls.cpython-36.pyc index f319fee5..6b23ced0 100644 Binary files a/reValuate/users/__pycache__/urls.cpython-36.pyc and b/reValuate/users/__pycache__/urls.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/views.cpython-36.pyc b/reValuate/users/__pycache__/views.cpython-36.pyc index 267606ac..6d313470 100644 Binary files a/reValuate/users/__pycache__/views.cpython-36.pyc and b/reValuate/users/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/users/migrations/0001_initial.py b/reValuate/users/migrations/0001_initial.py new file mode 100644 index 00000000..a0f3dedd --- /dev/null +++ b/reValuate/users/migrations/0001_initial.py @@ -0,0 +1,25 @@ +# Generated by Django 3.1.6 on 2021-02-20 19:15 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Balance', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('balance', models.IntegerField(default=0)), + ('user', models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/reValuate/users/migrations/0002_auto_20210220_2131.py b/reValuate/users/migrations/0002_auto_20210220_2131.py new file mode 100644 index 00000000..9b77bc54 --- /dev/null +++ b/reValuate/users/migrations/0002_auto_20210220_2131.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-02-20 19:31 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0001_initial'), + ] + + operations = [ + migrations.RenameField( + model_name='balance', + old_name='balance', + new_name='balanceValue', + ), + ] diff --git a/reValuate/users/migrations/0003_auto_20210220_2142.py b/reValuate/users/migrations/0003_auto_20210220_2142.py new file mode 100644 index 00000000..53973169 --- /dev/null +++ b/reValuate/users/migrations/0003_auto_20210220_2142.py @@ -0,0 +1,18 @@ +# Generated by Django 3.1.6 on 2021-02-20 19:42 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0002_auto_20210220_2131'), + ] + + operations = [ + migrations.AlterField( + model_name='balance', + name='user', + field=models.CharField(max_length=120), + ), + ] diff --git a/reValuate/users/migrations/0004_auto_20210220_2143.py b/reValuate/users/migrations/0004_auto_20210220_2143.py new file mode 100644 index 00000000..ff7db778 --- /dev/null +++ b/reValuate/users/migrations/0004_auto_20210220_2143.py @@ -0,0 +1,21 @@ +# Generated by Django 3.1.6 on 2021-02-20 19:43 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('users', '0003_auto_20210220_2142'), + ] + + operations = [ + migrations.AlterField( + model_name='balance', + name='user', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/reValuate/upload/migrations/__init__.py b/reValuate/users/migrations/__init__.py similarity index 100% rename from reValuate/upload/migrations/__init__.py rename to reValuate/users/migrations/__init__.py diff --git a/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 00000000..e1f0ed3c Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc new file mode 100644 index 00000000..0fcb5230 Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc new file mode 100644 index 00000000..171809b3 Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc new file mode 100644 index 00000000..f4203236 Binary files /dev/null and b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc b/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 00000000..1858911a Binary files /dev/null and b/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/users/models.py b/reValuate/users/models.py index 71a83623..90fced5b 100644 --- a/reValuate/users/models.py +++ b/reValuate/users/models.py @@ -1,3 +1,11 @@ from django.db import models +from django.contrib.auth.models import User -# Create your models here. + +class Balance(models.Model): + user = models.OneToOneField(User, on_delete=models.CASCADE, blank=True, null=True) + balanceValue = models.IntegerField(default=0) + + def balanceReturn(self): + print(f"Pederas 123 {self.balance}") + return self.balance diff --git a/reValuate/users/views.py b/reValuate/users/views.py index c4214a4d..370619c9 100644 --- a/reValuate/users/views.py +++ b/reValuate/users/views.py @@ -1,7 +1,8 @@ from django.contrib.auth.forms import UserCreationForm from django.urls import reverse_lazy from django.views import generic - +from .models import Balance +from django.shortcuts import render, redirect # need to make oauth facebook login class SignUpView(generic.CreateView): @@ -9,3 +10,18 @@ class SignUpView(generic.CreateView): success_url = reverse_lazy('login') template_name = 'registration/signup.html' +def addToBalance(request): + testVar = 5 + balAdd = Balance.objects.create(balanceValue=testVar, user=request.user.id) + balAdd.save() + print(balAdd) + + return render(request,"getBalance.html", {"userBalance":balAdd}) + +def getBalance(request): + balObject = Balance.objects.filter(user=request.user.id) + print(dir(balObject)) + userBalance = balObject.values + + return render(request,"getBalance.html", {"userBalance":userBalance} ) + diff --git a/reValuate/website/__pycache__/settings.cpython-36.pyc b/reValuate/website/__pycache__/settings.cpython-36.pyc index cbe3a40e..db3d894b 100644 Binary files a/reValuate/website/__pycache__/settings.cpython-36.pyc and b/reValuate/website/__pycache__/settings.cpython-36.pyc differ diff --git a/reValuate/website/__pycache__/urls.cpython-36.pyc b/reValuate/website/__pycache__/urls.cpython-36.pyc index 73cb738e..2b9a34b6 100644 Binary files a/reValuate/website/__pycache__/urls.cpython-36.pyc and b/reValuate/website/__pycache__/urls.cpython-36.pyc differ diff --git a/reValuate/website/__pycache__/wsgi.cpython-36.pyc b/reValuate/website/__pycache__/wsgi.cpython-36.pyc index a4bb207d..3b417e3b 100644 Binary files a/reValuate/website/__pycache__/wsgi.cpython-36.pyc and b/reValuate/website/__pycache__/wsgi.cpython-36.pyc differ diff --git a/reValuate/website/urls.py b/reValuate/website/urls.py index 294c3152..db81d06f 100644 --- a/reValuate/website/urls.py +++ b/reValuate/website/urls.py @@ -21,7 +21,7 @@ from django.conf.urls.static import static from django.contrib.auth import views from django.views.generic.base import TemplateView from upload.views import uploadContent, imageUpload, videoUpload, viewMedia - +from users.views import getBalance, addToBalance urlpatterns = [ path("", homePage, name='home'), path('admin/', admin.site.urls), @@ -31,6 +31,8 @@ urlpatterns = [ path("upload_image/", imageUpload, name="Image"), path("upload_video/", videoUpload, name="Video"), path("view_media/", viewMedia, name="All Media"), + path("get_balance/",getBalance, name="Balance" ), + path("add_balance/", addToBalance, name="Add") ] if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL,