From e0afc1765ba2dfbf5dac063cabf5448b2bded36e Mon Sep 17 00:00:00 2001 From: Rushil Umaretiya Date: Sat, 30 Jan 2021 15:31:06 -0500 Subject: [PATCH] feat(backend): created api models and deps --- .gitignore | 6 +-- backend/.gitignore | 6 +-- backend/Pipfile | 3 ++ backend/Pipfile.lock | 85 +++++++++++++++++++++++++++++- backend/api/__init__.py | 0 backend/api/admin.py | 8 +++ backend/api/apps.py | 5 ++ backend/api/migrations/__init__.py | 0 backend/api/models.py | 44 ++++++++++++++++ backend/api/serializers.py | 7 +++ backend/api/urls.py | 8 +++ backend/api/views.py | 3 ++ backend/config/.env | 4 ++ backend/config/settings.py | 55 +++++++++++++++---- backend/config/urls.py | 1 + backend/config/wsgi.py | 3 ++ website/.gitignore | 1 + 17 files changed, 218 insertions(+), 21 deletions(-) create mode 100644 backend/api/__init__.py create mode 100644 backend/api/admin.py create mode 100644 backend/api/apps.py create mode 100644 backend/api/migrations/__init__.py create mode 100644 backend/api/models.py create mode 100644 backend/api/serializers.py create mode 100644 backend/api/urls.py create mode 100644 backend/api/views.py create mode 100644 backend/config/.env create mode 100644 website/.gitignore diff --git a/.gitignore b/.gitignore index 768b34a..162f8eb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,3 @@ ### vscode ### -.vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json +*.vscode/* *.code-workspace diff --git a/backend/.gitignore b/backend/.gitignore index f868a33..c268877 100644 --- a/backend/.gitignore +++ b/backend/.gitignore @@ -114,7 +114,7 @@ celerybeat.pid *.sage.py # Environments -.env +#.env .venv env/ venv/ @@ -149,9 +149,5 @@ dmypy.json ### vscode ### .vscode/* -!.vscode/settings.json -!.vscode/tasks.json -!.vscode/launch.json -!.vscode/extensions.json *.code-workspace diff --git a/backend/Pipfile b/backend/Pipfile index de709a2..f732aeb 100644 --- a/backend/Pipfile +++ b/backend/Pipfile @@ -8,6 +8,9 @@ verify_ssl = true [packages] django = "*" djangorestframework = "*" +python-dotenv = "*" +psycopg2 = "*" +robin-stocks = "*" [requires] python_version = "3.8" diff --git a/backend/Pipfile.lock b/backend/Pipfile.lock index bf7cd5d..b2a439b 100644 --- a/backend/Pipfile.lock +++ b/backend/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "b890b2061eb6fc1d8bf94ed78d77990ac519683b06b3819184b0effc5cedbd47" + "sha256": "512cec129202578daefb819a6bf109831ef31164fad71ade999b9699e8c59402" }, "pipfile-spec": 6, "requires": { @@ -24,6 +24,21 @@ "markers": "python_version >= '3.5'", "version": "==3.3.1" }, + "certifi": { + "hashes": [ + "sha256:1a4995114262bffbc2413b159f2a1a480c969de6e6eb13ee966d470af86af59c", + "sha256:719a74fb9e33b9bd44cc7f3a8d94bc35e4049deebe19ba7d8e108280cfd59830" + ], + "version": "==2020.12.5" + }, + "chardet": { + "hashes": [ + "sha256:0d6f53a15db4120f2b08c94f11e7d93d2c911ee118b6b30a04ec3ee8310179fa", + "sha256:f864054d66fd9118f2e67044ac8981a54775ec5b67aed0441892edb553d21da5" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==4.0.0" + }, "django": { "hashes": [ "sha256:2d78425ba74c7a1a74b196058b261b9733a8570782f4e2828974777ccca7edf7", @@ -40,6 +55,50 @@ "index": "pypi", "version": "==3.12.2" }, + "idna": { + "hashes": [ + "sha256:b307872f855b18632ce0c21c5e45be78c0ea7ae4c15c828c20788b26921eb3f6", + "sha256:b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", + "version": "==2.10" + }, + "psycopg2": { + "hashes": [ + "sha256:00195b5f6832dbf2876b8bf77f12bdce648224c89c880719c745b90515233301", + "sha256:068115e13c70dc5982dfc00c5d70437fe37c014c808acce119b5448361c03725", + "sha256:26e7fd115a6db75267b325de0fba089b911a4a12ebd3d0b5e7acb7028bc46821", + "sha256:2c93d4d16933fea5bbacbe1aaf8fa8c1348740b2e50b3735d1b0bf8154cbf0f3", + "sha256:56007a226b8e95aa980ada7abdea6b40b75ce62a433bd27cec7a8178d57f4051", + "sha256:56fee7f818d032f802b8eed81ef0c1232b8b42390df189cab9cfa87573fe52c5", + "sha256:6a3d9efb6f36f1fe6aa8dbb5af55e067db802502c55a9defa47c5a1dad41df84", + "sha256:a49833abfdede8985ba3f3ec641f771cca215479f41523e99dace96d5b8cce2a", + "sha256:ad2fe8a37be669082e61fb001c185ffb58867fdbb3e7a6b0b0d2ffe232353a3e", + "sha256:b8cae8b2f022efa1f011cc753adb9cbadfa5a184431d09b273fb49b4167561ad", + "sha256:d160744652e81c80627a909a0e808f3c6653a40af435744de037e3172cf277f5", + "sha256:d5062ae50b222da28253059880a871dc87e099c25cb68acf613d9d227413d6f7", + "sha256:f22ea9b67aea4f4a1718300908a2fb62b3e4276cf00bd829a97ab5894af42ea3", + "sha256:f974c96fca34ae9e4f49839ba6b78addf0346777b46c4da27a7bf54f48d3057d", + "sha256:fb23f6c71107c37fd667cb4ea363ddeb936b348bbd6449278eb92c189699f543" + ], + "index": "pypi", + "version": "==2.8.6" + }, + "pyotp": { + "hashes": [ + "sha256:2a54d393aff3a244b566d78d597c9cb42e91b3b12f3169cec89d9dfff1c9c5bc", + "sha256:3540a2b4bbd0c13f691aa789d2605b2d0095608e87b016bb31d50afd9849f827" + ], + "version": "==2.5.1" + }, + "python-dotenv": { + "hashes": [ + "sha256:0c8d1b80d1a1e91717ea7d526178e3882732420b03f08afea0406db6402e220e", + "sha256:587825ed60b1711daea4832cf37524dfd404325b7db5e25ebe88c495c9f807a0" + ], + "index": "pypi", + "version": "==0.15.0" + }, "pytz": { "hashes": [ "sha256:16962c5fb8db4a8f63a26646d8886e9d769b6c511543557bc84e9569fb9a9cb4", @@ -47,6 +106,22 @@ ], "version": "==2020.5" }, + "requests": { + "hashes": [ + "sha256:27973dd4a904a4f13b263a19c866c13b92a39ed1c964655f025f3f8d3d75b804", + "sha256:c210084e36a42ae6b9219e00e48287def368a26d03a048ddad7bfee44f75871e" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4'", + "version": "==2.25.1" + }, + "robin-stocks": { + "hashes": [ + "sha256:a784a44fe871057b731f3de91f6153cc3ea440ec614ed184032d30e68de7774b", + "sha256:c7f68978b3ee7db380e302a80655a0c72b2e25fbd26cf2418f1ce8e5e7653ffb" + ], + "index": "pypi", + "version": "==1.7.0" + }, "sqlparse": { "hashes": [ "sha256:017cde379adbd6a1f15a61873f43e8274179378e95ef3fede90b5aa64d304ed0", @@ -54,6 +129,14 @@ ], "markers": "python_version >= '3.5'", "version": "==0.4.1" + }, + "urllib3": { + "hashes": [ + "sha256:1b465e494e3e0d8939b50680403e3aedaa2bc434b7d5af64dfd3c958d7f5ae80", + "sha256:de3eedaad74a2683334e282005cd8d7f22f4d55fa690a2a1020a416cb0a47e73" + ], + "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4' and python_version < '4'", + "version": "==1.26.3" } }, "develop": {} diff --git a/backend/api/__init__.py b/backend/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/api/admin.py b/backend/api/admin.py new file mode 100644 index 0000000..c1accf3 --- /dev/null +++ b/backend/api/admin.py @@ -0,0 +1,8 @@ +from django.contrib import admin +from . import models + +# Register your models here. + +admin.site.register(models.Profile) +admin.site.register(models.Charity) +admin.site.register(models.Stock) \ No newline at end of file diff --git a/backend/api/apps.py b/backend/api/apps.py new file mode 100644 index 0000000..d87006d --- /dev/null +++ b/backend/api/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ApiConfig(AppConfig): + name = 'api' diff --git a/backend/api/migrations/__init__.py b/backend/api/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/backend/api/models.py b/backend/api/models.py new file mode 100644 index 0000000..49b02d5 --- /dev/null +++ b/backend/api/models.py @@ -0,0 +1,44 @@ +from django.db import models + +# Create your models here. + +class Profile (models.Model): + user = models.OneToOneField(User, on_delete=models.CASCADE) + nickname = models.CharField(max_length=20, blank=True, null=True) + profile_pic = models.ImageField(default='default.jpg', upload_to='profile_pics') + charity = models.OneToOneField(Charity, blank=True, null=True) + percentage = models.DecimalField(max_digits=3, decimal_places=2) + + def __str__(self): + return f'{self.user.username}\'s profile' + + def save(self, *args, **kwargs): + super().save(*args, **kwargs) + + img = Image.open(self.profile_pic.path) + + if img.height > 300 or img.width > 300: + size = (300, 300) + img.thumbnail(size) + img.save(self.profile_pic.path) + +class Charity (models.Model): + ein = models.CharField(max_length=50, blank=True, null=True) + name = models.CharField(max_length=50, blank=True, null=True) + sub_name = models.CharField(max_length=50, blank=True, null=True) + city = models.CharField(max_length=20, blank=True, null=True) + state = models.CharField(max_length=2, blank=True, null=True) + + def __str__(self): + return self.name + +class Stock (models.Model): + user = models.ForeignKey(Profile, related_name='stock', on_delete=models.CASCADE) + ticker = models.CharField(max_length=5, blank=True, null=True) + buy_price = models.DecimalField(max_digits=9, decimal_places=2) + quantity = models.DecimalField(max_digits=9, decimal_places=2) + uuid = models.UUIDField(editable=False, unique=True) + + def __str__(self): + return f'{self.user.user.username}\'s Stock: {self.ticker} @ {self.buy_price}' + diff --git a/backend/api/serializers.py b/backend/api/serializers.py new file mode 100644 index 0000000..82197b8 --- /dev/null +++ b/backend/api/serializers.py @@ -0,0 +1,7 @@ +from rest_framework import serializers +from . import models + +class UserSerializer(serializers.ModelSerializer): + class Meta: + model = User + fields = ('username', 'email', 'first_name', 'last_name') \ No newline at end of file diff --git a/backend/api/urls.py b/backend/api/urls.py new file mode 100644 index 0000000..d9d8136 --- /dev/null +++ b/backend/api/urls.py @@ -0,0 +1,8 @@ +from rest_framework_jwt.views import obtain_jwt_token + +from django.urls import path +from . import views + +urlpatterns = [ + path('token/', obtain_jwt_token) +] diff --git a/backend/api/views.py b/backend/api/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/backend/api/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/backend/config/.env b/backend/config/.env new file mode 100644 index 0000000..30d4393 --- /dev/null +++ b/backend/config/.env @@ -0,0 +1,4 @@ +DEBUG= +SECRET_KEY= +DATABASE_USER= +DATABASE_PASSWORD= \ No newline at end of file diff --git a/backend/config/settings.py b/backend/config/settings.py index a8d7567..1bd9a1b 100644 --- a/backend/config/settings.py +++ b/backend/config/settings.py @@ -11,6 +11,10 @@ https://docs.djangoproject.com/en/3.1/ref/settings/ """ from pathlib import Path +import os + +from dotenv import load_dotenv +load_dotenv() # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -20,26 +24,35 @@ BASE_DIR = Path(__file__).resolve().parent.parent # See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/ # SECURITY WARNING: keep the secret key used in production secret! -SECRET_KEY = 'b)&dw@&49l!o@g#f)9*23bi2iqe48+kmm4v7(&xc)+07jjdns%' +SECRET_KEY = os.getenv("SECRET_KEY") # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = True - -ALLOWED_HOSTS = [] +DEBUG = os.getenv("DEBUG") +if DEBUG: + ALLOWED_HOSTS = ["*"] +else: + ALLOWED_HOSTS = ["reinvest.online"] # Application definition INSTALLED_APPS = [ + 'api', + 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + + 'corsheaders', + 'rest_framework' ] MIDDLEWARE = [ + 'corsheaders.middleware.CorsMiddleware', + 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', @@ -49,6 +62,17 @@ MIDDLEWARE = [ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] +REST_FRAMEWORK = { + 'DEFAULT_PERMISSION_CLASSES': ( + 'rest_framework.permissions.IsAuthenticated', + ), + 'DEFAULT_AUTHENTICATION_CLASSES': ( + 'rest_framework_jwt.authentication.JSONWebTokenAuthentication', + 'rest_framework.authentication.SessionAuthentication', + 'rest_framework.authentication.BasicAuthentication', + ), +} + ROOT_URLCONF = 'config.urls' TEMPLATES = [ @@ -73,13 +97,24 @@ WSGI_APPLICATION = 'config.wsgi.application' # Database # https://docs.djangoproject.com/en/3.1/ref/settings/#databases -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', +if DEBUG: + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } + } +else: + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'reinvest', + 'USER': 'reinvest', + 'PASSWORD': 'reinvest', + 'HOST': 'localhost', + 'PORT': '5432', + } } -} - # Password validation # https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators diff --git a/backend/config/urls.py b/backend/config/urls.py index d15c2c2..e36fd86 100644 --- a/backend/config/urls.py +++ b/backend/config/urls.py @@ -17,5 +17,6 @@ from django.contrib import admin from django.urls import path urlpatterns = [ + path('', include('api.urls')) path('admin/', admin.site.urls), ] diff --git a/backend/config/wsgi.py b/backend/config/wsgi.py index 94fcaf1..01fafc1 100644 --- a/backend/config/wsgi.py +++ b/backend/config/wsgi.py @@ -11,6 +11,9 @@ import os from django.core.wsgi import get_wsgi_application +from dotenv import load_dotenv +load_dotenv() + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings') application = get_wsgi_application() diff --git a/website/.gitignore b/website/.gitignore new file mode 100644 index 0000000..a3062be --- /dev/null +++ b/website/.gitignore @@ -0,0 +1 @@ +.vscode/*