diff --git a/reValuate/api/__pycache__/__init__.cpython-36.pyc b/reValuate/api/__pycache__/__init__.cpython-36.pyc index df580b04..2172937b 100644 Binary files a/reValuate/api/__pycache__/__init__.cpython-36.pyc and b/reValuate/api/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/api/__pycache__/serializers.cpython-36.pyc b/reValuate/api/__pycache__/serializers.cpython-36.pyc index 365b6a44..dd55b975 100644 Binary files a/reValuate/api/__pycache__/serializers.cpython-36.pyc and b/reValuate/api/__pycache__/serializers.cpython-36.pyc differ diff --git a/reValuate/api/__pycache__/views.cpython-36.pyc b/reValuate/api/__pycache__/views.cpython-36.pyc index 895a91bb..e1bfe324 100644 Binary files a/reValuate/api/__pycache__/views.cpython-36.pyc and b/reValuate/api/__pycache__/views.cpython-36.pyc differ diff --git a/reValuate/api/views.py b/reValuate/api/views.py index 4e76f3ff..ca34be0e 100644 --- a/reValuate/api/views.py +++ b/reValuate/api/views.py @@ -6,8 +6,15 @@ from users.models import Balance from upload.models import Media from .serializers import BalanceSerializer, ImageSerializer +class AllBalance(viewsets.ModelViewSet): + serializer_class = BalanceSerializer + http_method_names = ['get'] + + def get_queryset(self): + return Balance.objects.all() + + class BalanceView(viewsets.ModelViewSet): - permission_classes = [permissions.IsAuthenticated] serializer_class = BalanceSerializer http_method_names = ['get'] @@ -16,7 +23,6 @@ class BalanceView(viewsets.ModelViewSet): class ImageView(viewsets.ModelViewSet): - permission_classes = [permissions.IsAuthenticated] serializer_class = ImageSerializer http_method_names = ['get','post'] diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index bd917c24..d2b846b3 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 9225c2e2..6e21981d 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 91a5d5e2..d1179c14 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 87587749..c353f29d 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/1/2_yOCc0qG.jpg b/reValuate/media/1/2_yOCc0qG.jpg new file mode 100644 index 00000000..0eb7cfab Binary files /dev/null and b/reValuate/media/1/2_yOCc0qG.jpg differ diff --git a/reValuate/static/home/css/gallery.css b/reValuate/static/home/css/gallery.css new file mode 100644 index 00000000..6949c614 --- /dev/null +++ b/reValuate/static/home/css/gallery.css @@ -0,0 +1,134 @@ +.popup{ + width: 900px; + margin: auto; + text-align: center +} +.popup img{ + width: 200px; + height: 200px; + cursor: pointer +} +.show{ + z-index: 999; + display: none; +} +.show .overlay{ + width: 100%; + height: 100%; + background: rgba(0,0,0,.66); + position: absolute; + top: 0; + left: 0; +} +.show .img-show{ + width: 600px; + height: 400px; + background: #FFF; + position: absolute; + top: 50%; + left: 50%; + transform: translate(-50%,-50%); + overflow: hidden +} +.img-show span{ + position: absolute; + top: 10px; + right: 10px; + z-index: 99; + cursor: pointer; +} +.img-show img{ + width: 100%; + height: 100%; + position: absolute; + top: 0; + left: 0; +} + +* { + box-sizing: border-box; + margin: 0; + padding: 0; + } + + body { + font-family: Raleway; + background-color: #202125; + } + + .heading { + text-align: center; + font-size: 2.0em; + letter-spacing: 1px; + padding: 40px; + color: white; + } + + .gallery-image { + padding: 20px; + display: flex; + flex-wrap: wrap; + justify-content: center; + } + + .gallery-image img { + height: 250px; + width: 350px; + transform: scale(1.0); + transition: transform 0.4s ease; + } + + .img-box { + box-sizing: content-box; + margin: 10px; + height: 250px; + width: 350px; + overflow: hidden; + display: inline-block; + color: white; + position: relative; + background-color: white; + } + + .caption { + position: absolute; + bottom: 5px; + left: 20px; + opacity: 0.0; + transition: transform 0.3s ease, opacity 0.3s ease; + } + + .transparent-box { + height: 250px; + width: 350px; + background-color:rgba(0, 0, 0, 0); + position: absolute; + top: 0; + left: 0; + transition: background-color 0.3s ease; + } + + .img-box:hover img { + transform: scale(1.1); + } + + .img-box:hover .transparent-box { + background-color:rgba(0, 0, 0, 0.5); + } + + .img-box:hover .caption { + transform: translateY(-20px); + opacity: 1.0; + } + + .img-box:hover { + cursor: pointer; + } + + .caption > p:nth-child(2) { + font-size: 0.8em; + } + + .opacity-low { + opacity: 0.5; + } diff --git a/reValuate/upload/__pycache__/__init__.cpython-36.pyc b/reValuate/upload/__pycache__/__init__.cpython-36.pyc index ca701b71..8129991f 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 c0ab1054..f8eb74c3 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 a66a3783..51aa408f 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 886b6f3b..2a3f977f 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 d9477779..b78faa4d 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 0b281283..6d0901ea 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/__pycache__/0001_initial.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc index 643af804..8fea9fe7 100644 Binary files a/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0002_balance.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0002_balance.cpython-36.pyc index 28fae97a..ded383c3 100644 Binary files a/reValuate/upload/migrations/__pycache__/0002_balance.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0002_balance.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-36.pyc index 148ad043..74afd144 100644 Binary files a/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0003_delete_balance.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-36.pyc index 716e0b67..f25db0ad 100644 Binary files a/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0004_auto_20210311_1702.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-36.pyc index d2f78647..c16908a9 100644 Binary files a/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0005_auto_20210311_1833.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-36.pyc index 9995e56d..86367484 100644 Binary files a/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0006_auto_20210311_1833.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-36.pyc index b63e4bb4..ff19e4d4 100644 Binary files a/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0007_auto_20210311_1834.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-36.pyc index f1d586de..5ae2e8fa 100644 Binary files a/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0008_auto_20210311_1838.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-36.pyc index 9b85df90..82659271 100644 Binary files a/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0009_auto_20210311_1910.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-36.pyc index 75ffc16d..b99ff4b3 100644 Binary files a/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0010_auto_20210312_2339.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-36.pyc index b646eba9..d0d5065d 100644 Binary files a/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0011_auto_20210312_2341.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-36.pyc index 03e92fb5..6c005f23 100644 Binary files a/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0012_auto_20210312_2347.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-36.pyc index 5d495f7a..036837c9 100644 Binary files a/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0013_auto_20210315_0340.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-36.pyc index 607f73c8..17a65bfb 100644 Binary files a/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0014_image_time.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-36.pyc index 60494556..e3e11306 100644 Binary files a/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0015_auto_20210315_1745.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0016_videos.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0016_videos.cpython-36.pyc index 76cdf843..37d75bbc 100644 Binary files a/reValuate/upload/migrations/__pycache__/0016_videos.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0016_videos.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-36.pyc index 8e344f85..5ed889b2 100644 Binary files a/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0017_auto_20210315_1838.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-36.pyc index 5bc28457..5dd96037 100644 Binary files a/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0018_auto_20210315_1839.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-36.pyc index 8d30f705..777a303e 100644 Binary files a/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0019_auto_20210315_1841.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-36.pyc index 9cb39fd4..bc60252f 100644 Binary files a/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0020_auto_20210315_1847.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-36.pyc index 90acd6fa..29eb2809 100644 Binary files a/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0021_auto_20210315_1848.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-36.pyc index 79a456d8..e9a41dc7 100644 Binary files a/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0022_auto_20210315_1852.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-36.pyc index 5da1e914..77693192 100644 Binary files a/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0023_auto_20210315_1901.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-36.pyc index 88eec68d..95987500 100644 Binary files a/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/0024_media_managed_by.cpython-36.pyc differ diff --git a/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc b/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc index e1f0bdfc..3b86eb99 100644 Binary files a/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc and b/reValuate/upload/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/users/__pycache__/admin.cpython-36.pyc b/reValuate/users/__pycache__/admin.cpython-36.pyc index b5bfcb18..fedbaaca 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 a5c0a0a6..a50f0b58 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 7529e110..911b0a36 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 3a1fbe21..f07343e9 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/__pycache__/0001_initial.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc index c53818b5..8c8404c1 100644 Binary files a/reValuate/users/migrations/__pycache__/0001_initial.cpython-36.pyc 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 index ee5215ef..1557492e 100644 Binary files a/reValuate/users/migrations/__pycache__/0002_auto_20210220_2131.cpython-36.pyc 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 index 18006e3e..1b222b1e 100644 Binary files a/reValuate/users/migrations/__pycache__/0003_auto_20210220_2142.cpython-36.pyc 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 index 4038994d..38a0eca0 100644 Binary files a/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0004_auto_20210220_2143.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-36.pyc index 4d49a514..a67775bc 100644 Binary files a/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0005_auto_20210307_1544.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-36.pyc index a4c73e28..63a169aa 100644 Binary files a/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0006_delete_balance.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0007_balance.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0007_balance.cpython-36.pyc index f22c1604..f03ff7f8 100644 Binary files a/reValuate/users/migrations/__pycache__/0007_balance.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0007_balance.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0008_transaction.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-36.pyc index e8da62f7..8afee7f5 100644 Binary files a/reValuate/users/migrations/__pycache__/0008_transaction.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0008_transaction.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-36.pyc index 0e71b14f..e296b885 100644 Binary files a/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0009_auto_20210316_1408.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-36.pyc index efa2ee8e..78b32f1f 100644 Binary files a/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0010_auto_20210316_1415.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-36.pyc index 2ab21ea9..acd7a2f9 100644 Binary files a/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0011_auto_20210316_1420.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-36.pyc b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-36.pyc index 3f17701d..a5071146 100644 Binary files a/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/0012_auto_20210316_1421.cpython-36.pyc differ diff --git a/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc b/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc index 9af5fb78..bb919e86 100644 Binary files a/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc and b/reValuate/users/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/reValuate/website/__pycache__/settings.cpython-36.pyc b/reValuate/website/__pycache__/settings.cpython-36.pyc index bb71d029..800de90c 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 099371eb..6779820c 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 c7c7953e..3af2ef1a 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/settings.py b/reValuate/website/settings.py index 19c55ba0..22f12fb4 100644 --- a/reValuate/website/settings.py +++ b/reValuate/website/settings.py @@ -26,7 +26,7 @@ BASE_DIR = Path(__file__).resolve().parent.parent SECRET_KEY = '&(v*@m-bz2n9kki!2y)qo5ipp-v+!vfpb4cj=l6n93y&18jht*' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True +DEBUG = False ALLOWED_HOSTS = [ "cleener.xyz", @@ -150,13 +150,7 @@ 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 26dc3461..c6f5e151 100644 --- a/reValuate/website/urls.py +++ b/reValuate/website/urls.py @@ -17,7 +17,7 @@ from django.contrib import admin from django.urls import path, include from home.views import homePage, leaderboard from rest_framework import routers, urls -from api.views import BalanceView, ImageView +from api.views import BalanceView, ImageView, AllBalance from django.conf import settings from django.conf.urls.static import static from django.contrib.auth import views @@ -29,7 +29,7 @@ from users.views import getBalance, addToBalance, adminView, removeBalance router = routers.DefaultRouter() router.register("balance", BalanceView, basename="balance") router.register("images", ImageView, basename="image") - +router.register("every_balance", AllBalance, basename="all_balance") urlpatterns = [ path("", homePage, name='home'), diff --git a/requirements.txt b/requirements.txt index f0568c26..cb3859ac 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,5 @@ asgiref==3.3.1 Django==3.1.6 -django-menus==1.1.2 django-qr-code==2.2.0 djangorestframework==3.12.4 Pillow==8.1.0