diff --git a/reValuate/api/__init__.py b/reValuate/api/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/reValuate/api/__pycache__/__init__.cpython-38.pyc b/reValuate/api/__pycache__/__init__.cpython-38.pyc new file mode 100644 index 00000000..71833e21 Binary files /dev/null and b/reValuate/api/__pycache__/__init__.cpython-38.pyc differ diff --git a/reValuate/api/__pycache__/models.cpython-38.pyc b/reValuate/api/__pycache__/models.cpython-38.pyc new file mode 100644 index 00000000..8533f700 Binary files /dev/null and b/reValuate/api/__pycache__/models.cpython-38.pyc differ diff --git a/reValuate/api/__pycache__/serializers.cpython-38.pyc b/reValuate/api/__pycache__/serializers.cpython-38.pyc new file mode 100644 index 00000000..07bb8787 Binary files /dev/null and b/reValuate/api/__pycache__/serializers.cpython-38.pyc differ diff --git a/reValuate/api/__pycache__/validators.cpython-38.pyc b/reValuate/api/__pycache__/validators.cpython-38.pyc new file mode 100644 index 00000000..cb87410b Binary files /dev/null and b/reValuate/api/__pycache__/validators.cpython-38.pyc differ diff --git a/reValuate/api/__pycache__/views.cpython-38.pyc b/reValuate/api/__pycache__/views.cpython-38.pyc new file mode 100644 index 00000000..5b4a555f Binary files /dev/null and b/reValuate/api/__pycache__/views.cpython-38.pyc differ diff --git a/reValuate/api/admin.py b/reValuate/api/admin.py new file mode 100644 index 00000000..8c38f3f3 --- /dev/null +++ b/reValuate/api/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/reValuate/api/apps.py b/reValuate/api/apps.py new file mode 100644 index 00000000..d87006dd --- /dev/null +++ b/reValuate/api/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ApiConfig(AppConfig): + name = 'api' diff --git a/reValuate/api/migrations/__init__.py b/reValuate/api/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/reValuate/api/models.py b/reValuate/api/models.py new file mode 100644 index 00000000..71a83623 --- /dev/null +++ b/reValuate/api/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/reValuate/api/serializers.py b/reValuate/api/serializers.py new file mode 100644 index 00000000..e64a3c0f --- /dev/null +++ b/reValuate/api/serializers.py @@ -0,0 +1,15 @@ +from rest_framework import serializers +from users.models import Balance +from upload.models import Media + + +class BalanceSerializer(serializers.ModelSerializer): + class Meta: + model = Balance + fields = ("user", "balanceValue") + +class ImageSerializer(serializers.ModelSerializer): + class Meta: + model = Media + fields = ("user", "image", "tokenized", "reason", "date", "managed_by") + diff --git a/reValuate/api/tests.py b/reValuate/api/tests.py new file mode 100644 index 00000000..7ce503c2 --- /dev/null +++ b/reValuate/api/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/reValuate/api/views.py b/reValuate/api/views.py new file mode 100644 index 00000000..1abd34cf --- /dev/null +++ b/reValuate/api/views.py @@ -0,0 +1,15 @@ +from rest_framework import status, viewsets +from rest_framework.decorators import api_view +from rest_framework.response import Response +from users.models import Balance +from upload.models import Media +from .serializers import BalanceSerializer, ImageSerializer + +class BalanceView(viewsets.ModelViewSet): + queryset = Balance.objects.all() + serializer_class = BalanceSerializer + +class ImageView(viewsets.ModelViewSet): + queryset = Media.objects.all() + serializer_class = ImageSerializer + diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index 46f001c2..1572e8ab 100644 Binary files a/reValuate/db.sqlite3 and b/reValuate/db.sqlite3 differ diff --git a/reValuate/home/__pycache__/admin.cpython-38.pyc b/reValuate/home/__pycache__/admin.cpython-38.pyc index d0656146..d6dae063 100644 Binary files a/reValuate/home/__pycache__/admin.cpython-38.pyc and b/reValuate/home/__pycache__/admin.cpython-38.pyc differ diff --git a/reValuate/home/__pycache__/models.cpython-38.pyc b/reValuate/home/__pycache__/models.cpython-38.pyc index b0a7243b..736c79f0 100644 Binary files a/reValuate/home/__pycache__/models.cpython-38.pyc and b/reValuate/home/__pycache__/models.cpython-38.pyc differ diff --git a/reValuate/home/__pycache__/views.cpython-38.pyc b/reValuate/home/__pycache__/views.cpython-38.pyc index 850f8438..7589d1ed 100644 Binary files a/reValuate/home/__pycache__/views.cpython-38.pyc and b/reValuate/home/__pycache__/views.cpython-38.pyc differ diff --git a/reValuate/upload/__pycache__/__init__.cpython-38.pyc b/reValuate/upload/__pycache__/__init__.cpython-38.pyc index b725d5f2..ff15da55 100644 Binary files a/reValuate/upload/__pycache__/__init__.cpython-38.pyc and b/reValuate/upload/__pycache__/__init__.cpython-38.pyc differ diff --git a/reValuate/upload/__pycache__/admin.cpython-38.pyc b/reValuate/upload/__pycache__/admin.cpython-38.pyc index 5a307e96..ffb227fe 100644 Binary files a/reValuate/upload/__pycache__/admin.cpython-38.pyc and b/reValuate/upload/__pycache__/admin.cpython-38.pyc differ diff --git a/reValuate/upload/__pycache__/forms.cpython-38.pyc b/reValuate/upload/__pycache__/forms.cpython-38.pyc index bc78f4bb..0f99d15a 100644 Binary files a/reValuate/upload/__pycache__/forms.cpython-38.pyc and b/reValuate/upload/__pycache__/forms.cpython-38.pyc differ diff --git a/reValuate/upload/__pycache__/models.cpython-38.pyc b/reValuate/upload/__pycache__/models.cpython-38.pyc index a46fa3ef..e5b75115 100644 Binary files a/reValuate/upload/__pycache__/models.cpython-38.pyc and b/reValuate/upload/__pycache__/models.cpython-38.pyc differ diff --git a/reValuate/upload/__pycache__/validators.cpython-38.pyc b/reValuate/upload/__pycache__/validators.cpython-38.pyc index 37b77655..229f326e 100644 Binary files a/reValuate/upload/__pycache__/validators.cpython-38.pyc and b/reValuate/upload/__pycache__/validators.cpython-38.pyc differ diff --git a/reValuate/upload/__pycache__/views.cpython-38.pyc b/reValuate/upload/__pycache__/views.cpython-38.pyc index a4624d33..121b6a6c 100644 Binary files a/reValuate/upload/__pycache__/views.cpython-38.pyc and b/reValuate/upload/__pycache__/views.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-38.pyc index a04e3a4b..e85f3787 100644 Binary files a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0002_balance.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0002_balance.cpython-38.pyc index 39103f96..dd48a902 100644 Binary files a/reValuate/upload/migrations/__pycache__/0002_balance.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0002_balance.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-38.pyc index 65e24aa4..cbc0d88b 100644 Binary files a/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-38.pyc index 3c2e819c..aa16ab1c 100644 Binary files a/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-38.pyc index ff71d162..4f78db15 100644 Binary files a/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-38.pyc index 5c3b97ed..a84dd848 100644 Binary files a/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-38.pyc index bf2ee7e8..775ed413 100644 Binary files a/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-38.pyc index 2124b608..a131898e 100644 Binary files a/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-38.pyc index d078e92d..1f5bec52 100644 Binary files a/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-38.pyc index 1de884c6..ff68805b 100644 Binary files a/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-38.pyc index c78859dd..f25a4db1 100644 Binary files a/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-38.pyc index 5fb27de9..a9a68819 100644 Binary files a/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-38.pyc index 036a243e..fbbe870e 100644 Binary files a/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-38.pyc index 39c6d528..78da5418 100644 Binary files a/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-38.pyc index 3890cbf2..b100998f 100644 Binary files a/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0016_videos.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0016_videos.cpython-38.pyc index 505fed67..1f3dbda5 100644 Binary files a/reValuate/upload/migrations/__pycache__/0016_videos.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0016_videos.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-38.pyc index 3cf4a9b2..01809b5a 100644 Binary files a/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-38.pyc index 031e25df..35837f5e 100644 Binary files a/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-38.pyc index fd7cb99a..91b32f80 100644 Binary files a/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-38.pyc index 429a237f..f8a175e3 100644 Binary files a/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-38.pyc index cfa33ac6..ddad6980 100644 Binary files a/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-38.pyc index 1392c0af..0e33498a 100644 Binary files a/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-38.pyc index d7485c1a..b4f8d11d 100644 Binary files a/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-38.pyc index 375224ca..1aacdd3a 100644 Binary files a/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-38.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/__init__.cpython-38.pyc b/reValuate/upload/migrations/__pycache__/__init__.cpython-38.pyc index f69c53f5..80fed9a1 100644 Binary files a/reValuate/upload/migrations/__pycache__/__init__.cpython-38.pyc and b/reValuate/upload/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/reValuate/upload/models.py b/reValuate/upload/models.py index 7a4df2b5..eaca90f4 100644 --- a/reValuate/upload/models.py +++ b/reValuate/upload/models.py @@ -3,14 +3,6 @@ from .validators import videoValidate, imageValidate from django.contrib.auth.models import User from datetime import date - -# def user_directory._path(instance, filename): - # print(request.user.id) - # return 'user_{0}/{1}'.format(instance.user.id, filename) -# Ok i got hella angry, so pleaSE fix this bullshit -# 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 imagesPath(instance, filename): # file will be uploaded to MEDIA_ROOT/user_/ return '{0}/{1}'.format(instance.user.id, filename) @@ -33,16 +25,3 @@ class Media(models.Model): verbose_name = 'image' verbose_name_plural = 'images' - -# class Videos(models.Model): -# user = models.ForeignKey(User, on_delete=models.CASCADE, blank=True, null=True) -# video = models.FileField(upload_to=videosPath, validators=[videoValidate]) -# tokenized = models.BooleanField(blank=True, null=True, default=None, max_length=3) -# reason = models.CharField(max_length=120) -# date = models.DateField(default=date.today) -# time = models.TimeField(auto_now=True) - - -# class Meta: -# verbose_name = 'video' -# verbose_name_plural = 'videos' diff --git a/reValuate/users/__pycache__/admin.cpython-38.pyc b/reValuate/users/__pycache__/admin.cpython-38.pyc index e2023137..ed8c2ec4 100644 Binary files a/reValuate/users/__pycache__/admin.cpython-38.pyc and b/reValuate/users/__pycache__/admin.cpython-38.pyc differ diff --git a/reValuate/users/__pycache__/models.cpython-38.pyc b/reValuate/users/__pycache__/models.cpython-38.pyc index 93aa6b28..118c65f7 100644 Binary files a/reValuate/users/__pycache__/models.cpython-38.pyc and b/reValuate/users/__pycache__/models.cpython-38.pyc differ diff --git a/reValuate/users/__pycache__/serializers.cpython-38.pyc b/reValuate/users/__pycache__/serializers.cpython-38.pyc new file mode 100644 index 00000000..c46902d1 Binary files /dev/null and b/reValuate/users/__pycache__/serializers.cpython-38.pyc differ diff --git a/reValuate/users/__pycache__/urls.cpython-38.pyc b/reValuate/users/__pycache__/urls.cpython-38.pyc index 030ad776..5f4679cf 100644 Binary files a/reValuate/users/__pycache__/urls.cpython-38.pyc and b/reValuate/users/__pycache__/urls.cpython-38.pyc differ diff --git a/reValuate/users/__pycache__/views.cpython-38.pyc b/reValuate/users/__pycache__/views.cpython-38.pyc index cdda4933..c750e0a8 100644 Binary files a/reValuate/users/__pycache__/views.cpython-38.pyc and b/reValuate/users/__pycache__/views.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0001_initial.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0001_initial.cpython-38.pyc index 43de1be2..094f0b3a 100644 Binary files a/reValuate/users/migrations/__pycache__/0001_initial.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0001_initial.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-38.pyc index 9263fa7a..4d546801 100644 Binary files a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-38.pyc index 1378c1eb..e7ea75a5 100644 Binary files a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-38.pyc index 51fcbf05..857a7a23 100644 Binary files a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-38.pyc index e4f7abe0..c7a5df34 100644 Binary files a/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-38.pyc index b53259be..46670049 100644 Binary files a/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0007_balance.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0007_balance.cpython-38.pyc index a75cb27f..762ca539 100644 Binary files a/reValuate/users/migrations/__pycache__/0007_balance.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0007_balance.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0008_transaction.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-38.pyc index 9c80343e..2814f63c 100644 Binary files a/reValuate/users/migrations/__pycache__/0008_transaction.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-38.pyc index ab25c326..7308ddf9 100644 Binary files a/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-38.pyc index 2ae9e450..cce7f5b3 100644 Binary files a/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-38.pyc index afce42d2..134801ce 100644 Binary files a/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-38.pyc b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-38.pyc index 8e37a349..ff909eaa 100644 Binary files a/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-38.pyc differ diff --git a/reValuate/users/migrations/__pycache__/__init__.cpython-38.pyc b/reValuate/users/migrations/__pycache__/__init__.cpython-38.pyc index 262caa41..0d0450b5 100644 Binary files a/reValuate/users/migrations/__pycache__/__init__.cpython-38.pyc and b/reValuate/users/migrations/__pycache__/__init__.cpython-38.pyc differ diff --git a/reValuate/website/__pycache__/settings.cpython-38.pyc b/reValuate/website/__pycache__/settings.cpython-38.pyc index 8971fe48..54e105ea 100644 Binary files a/reValuate/website/__pycache__/settings.cpython-38.pyc and b/reValuate/website/__pycache__/settings.cpython-38.pyc differ diff --git a/reValuate/website/__pycache__/urls.cpython-38.pyc b/reValuate/website/__pycache__/urls.cpython-38.pyc index d56cf275..ab85efda 100644 Binary files a/reValuate/website/__pycache__/urls.cpython-38.pyc and b/reValuate/website/__pycache__/urls.cpython-38.pyc differ diff --git a/reValuate/website/__pycache__/wsgi.cpython-38.pyc b/reValuate/website/__pycache__/wsgi.cpython-38.pyc index a146093c..013a3e9e 100644 Binary files a/reValuate/website/__pycache__/wsgi.cpython-38.pyc and b/reValuate/website/__pycache__/wsgi.cpython-38.pyc differ diff --git a/reValuate/website/settings.py b/reValuate/website/settings.py index 8b4044c9..9b5ac8f2 100644 --- a/reValuate/website/settings.py +++ b/reValuate/website/settings.py @@ -48,7 +48,8 @@ INSTALLED_APPS = [ 'users', 'upload', 'qr_code', - + 'rest_framework', + 'rest_framework.authtoken', ] MIDDLEWARE = [ @@ -145,4 +146,18 @@ ALL_COINS = 1000000 MEDIA_URL = '/media/' MEDIA_ROOT = os.path.join(BASE_DIR, 'media/') -os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true" \ No newline at end of file +os.environ["DJANGO_ALLOW_ASYNC_UNSAFE"] = "true" + +REST_FRAMEWORK = { + + 'DEFAULT_PERMISSION_CLASSES': [ + 'rest_framework.permissions.IsAuthenticated', + ], + + 'DEFAULT_AUTHENTICATION_CLASSES': [ + 'rest_framework.authentication.BasicAuthentication', + 'rest_framework.authentication.SessionAuthentication', + 'rest_framework.authentication.TokenAuthentication', + + ] +} diff --git a/reValuate/website/urls.py b/reValuate/website/urls.py index 0ac8a86a..1cf2e41c 100644 --- a/reValuate/website/urls.py +++ b/reValuate/website/urls.py @@ -16,15 +16,23 @@ Including another URLconf from django.contrib import admin from django.urls import path, include from home.views import homePage +from rest_framework import routers, urls +from api.views import BalanceView, ImageView from django.conf import settings 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, viewMedia from users.views import getBalance, addToBalance, adminView, removeBalance + + +router = routers.DefaultRouter() +router.register("balance", BalanceView) +router.register("images", ImageView) + urlpatterns = [ + path("", homePage, name='home'), - path("users/", include('django.contrib.auth.urls')), path('users/', include('users.urls')), # path("upload/", uploadContent, name="Upload"), @@ -34,7 +42,9 @@ urlpatterns = [ path("get_balance/",getBalance, name="Balance" ), path("add_balance/", addToBalance, name="Add"), path("remove_balance/", removeBalance, name="Add"), - path("admin/", adminView, name="admin") + path("admin/", adminView, name="admin"), + path('api/', include(router.urls)) + ] if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL,