From d41e6eae8c877558b9f2cbad0ef4bef2e5e1365b Mon Sep 17 00:00:00 2001 From: "github-classroom[bot]" <66690702+github-classroom[bot]@users.noreply.github.com> Date: Wed, 1 Dec 2021 13:59:36 +0000 Subject: [PATCH 01/49] Setting up GitHub Classroom Feedback From a3c16ae98fb435e92867efbba987c212317be828 Mon Sep 17 00:00:00 2001 From: Ferby Date: Wed, 1 Dec 2021 18:01:49 +0000 Subject: [PATCH 02/49] Installing django --- .gitignore | 137 ++++++++++++++++++ .idea/.gitignore | 8 + .idea/AdvancedDevelopment.iml | 30 ++++ .idea/inspectionProfiles/Project_Default.xml | 12 ++ .../inspectionProfiles/profiles_settings.xml | 6 + .idea/misc.xml | 4 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + AdvancedDevelopment/__init__.py | 0 AdvancedDevelopment/asgi.py | 16 ++ AdvancedDevelopment/settings.py | 126 ++++++++++++++++ AdvancedDevelopment/urls.py | 21 +++ AdvancedDevelopment/wsgi.py | 16 ++ manage.py | 22 +++ 14 files changed, 412 insertions(+) create mode 100644 .gitignore create mode 100644 .idea/.gitignore create mode 100644 .idea/AdvancedDevelopment.iml create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 AdvancedDevelopment/__init__.py create mode 100644 AdvancedDevelopment/asgi.py create mode 100644 AdvancedDevelopment/settings.py create mode 100644 AdvancedDevelopment/urls.py create mode 100644 AdvancedDevelopment/wsgi.py create mode 100644 manage.py diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..fe7b0fd --- /dev/null +++ b/.gitignore @@ -0,0 +1,137 @@ +# Django # +*.log +*.pot +*.pyc +__pycache__ +db.sqlite3 +media + +# Backup files # +*.bak + +# If you are using PyCharm # +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# File-based project format +*.iws + +# IntelliJ +out/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Python # +*.py[cod] +*$py.class + +# Distribution / packaging +.Python build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +*.egg-info/ +.installed.cfg +*.egg +*.manifest +*.spec + +# Installer logs +pip-log.txt +pip-delete-this-directory.txt + +# Unit test / coverage reports +htmlcov/ +.tox/ +.coverage +.coverage.* +.cache +.pytest_cache/ +nosetests.xml +coverage.xml +*.cover +.hypothesis/ + +# Jupyter Notebook +.ipynb_checkpoints + +# pyenv +.python-version + +# celery +celerybeat-schedule.* + +# SageMath parsed files +*.sage.py + +# Environments +.env +.venv +env/ +venv/ +ENV/ +env.bak/ +venv.bak/ + +# mkdocs documentation +/site + +# mypy +.mypy_cache/ + +# Sublime Text # +*.tmlanguage.cache +*.tmPreferences.cache +*.stTheme.cache +*.sublime-workspace +*.sublime-project + +# sftp configuration file +sftp-config.json + +# Package control specific files Package +Control.last-run +Control.ca-list +Control.ca-bundle +Control.system-ca-bundle +GitHub.sublime-settings + +# Visual Studio Code # +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +.history \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/AdvancedDevelopment.iml b/.idea/AdvancedDevelopment.iml new file mode 100644 index 0000000..4423462 --- /dev/null +++ b/.idea/AdvancedDevelopment.iml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..feb03d1 --- /dev/null +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,12 @@ + + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..105ce2d --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,6 @@ + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..aad5bda --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..b4b7375 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/AdvancedDevelopment/__init__.py b/AdvancedDevelopment/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/AdvancedDevelopment/asgi.py b/AdvancedDevelopment/asgi.py new file mode 100644 index 0000000..a67586d --- /dev/null +++ b/AdvancedDevelopment/asgi.py @@ -0,0 +1,16 @@ +""" +ASGI config for AdvancedDevelopment project. + +It exposes the ASGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/ +""" + +import os + +from django.core.asgi import get_asgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AdvancedDevelopment.settings') + +application = get_asgi_application() diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py new file mode 100644 index 0000000..aa9470c --- /dev/null +++ b/AdvancedDevelopment/settings.py @@ -0,0 +1,126 @@ +""" +Django settings for AdvancedDevelopment project. + +Generated by 'django-admin startproject' using Django 3.2.9. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/topics/settings/ + +For the full list of settings and their values, see +https://docs.djangoproject.com/en/3.2/ref/settings/ +""" + +from pathlib import Path + +# Build paths inside the project like this: BASE_DIR / 'subdir'. +BASE_DIR = Path(__file__).resolve().parent.parent + + +# Quick-start development settings - unsuitable for production +# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ + +# SECURITY WARNING: keep the secret key used in production secret! +SECRET_KEY = 'django-insecure-8@ai$vzq04xi!oq#rl6z@8*h8h^7w8u(6n-g+9ptnvjf*#&o$7' + +# SECURITY WARNING: don't run with debug turned on in production! +DEBUG = True + +ALLOWED_HOSTS = [] + + +# Application definition + +INSTALLED_APPS = [ + 'django.contrib.admin', + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + 'django.contrib.messages', + 'django.contrib.staticfiles', +] + +MIDDLEWARE = [ + 'django.middleware.security.SecurityMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.common.CommonMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', + 'django.middleware.clickjacking.XFrameOptionsMiddleware', +] + +ROOT_URLCONF = 'AdvancedDevelopment.urls' + +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [BASE_DIR / 'templates'] + , + 'APP_DIRS': True, + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.debug', + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.contrib.messages.context_processors.messages', + ], + }, + }, +] + +WSGI_APPLICATION = 'AdvancedDevelopment.wsgi.application' + + +# Database +# https://docs.djangoproject.com/en/3.2/ref/settings/#databases + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': BASE_DIR / 'db.sqlite3', + } +} + + +# Password validation +# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators + +AUTH_PASSWORD_VALIDATORS = [ + { + 'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator', + }, + { + 'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator', + }, +] + + +# Internationalization +# https://docs.djangoproject.com/en/3.2/topics/i18n/ + +LANGUAGE_CODE = 'en-us' + +TIME_ZONE = 'UTC' + +USE_I18N = True + +USE_L10N = True + +USE_TZ = True + + +# Static files (CSS, JavaScript, Images) +# https://docs.djangoproject.com/en/3.2/howto/static-files/ + +STATIC_URL = '/static/' + +# Default primary key field type +# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field + +DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' diff --git a/AdvancedDevelopment/urls.py b/AdvancedDevelopment/urls.py new file mode 100644 index 0000000..810697c --- /dev/null +++ b/AdvancedDevelopment/urls.py @@ -0,0 +1,21 @@ +"""AdvancedDevelopment URL Configuration + +The `urlpatterns` list routes URLs to views. For more information please see: + https://docs.djangoproject.com/en/3.2/topics/http/urls/ +Examples: +Function views + 1. Add an import: from my_app import views + 2. Add a URL to urlpatterns: path('', views.home, name='home') +Class-based views + 1. Add an import: from other_app.views import Home + 2. Add a URL to urlpatterns: path('', Home.as_view(), name='home') +Including another URLconf + 1. Import the include() function: from django.urls import include, path + 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) +""" +from django.contrib import admin +from django.urls import path + +urlpatterns = [ + path('admin/', admin.site.urls), +] diff --git a/AdvancedDevelopment/wsgi.py b/AdvancedDevelopment/wsgi.py new file mode 100644 index 0000000..4616fae --- /dev/null +++ b/AdvancedDevelopment/wsgi.py @@ -0,0 +1,16 @@ +""" +WSGI config for AdvancedDevelopment project. + +It exposes the WSGI callable as a module-level variable named ``application``. + +For more information on this file, see +https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/ +""" + +import os + +from django.core.wsgi import get_wsgi_application + +os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AdvancedDevelopment.settings') + +application = get_wsgi_application() diff --git a/manage.py b/manage.py new file mode 100644 index 0000000..08898b4 --- /dev/null +++ b/manage.py @@ -0,0 +1,22 @@ +#!/usr/bin/env python +"""Django's command-line utility for administrative tasks.""" +import os +import sys + + +def main(): + """Run administrative tasks.""" + os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'AdvancedDevelopment.settings') + try: + from django.core.management import execute_from_command_line + except ImportError as exc: + raise ImportError( + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" + ) from exc + execute_from_command_line(sys.argv) + + +if __name__ == '__main__': + main() From 8997ea35ad2c4c2e9daf7057999111ee9e752e4c Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 2 Dec 2021 19:07:07 +0000 Subject: [PATCH 03/49] Linking with MongoDB, preparing for GCloud upload --- AdvancedDevelopment/__init__.py | 15 +++++++++++++++ blog/__init__.py | 0 blog/admin.py | 3 +++ blog/apps.py | 6 ++++++ blog/migrations/__init__.py | 0 blog/models.py | 3 +++ blog/tests.py | 3 +++ blog/views.py | 3 +++ 8 files changed, 33 insertions(+) create mode 100644 blog/__init__.py create mode 100644 blog/admin.py create mode 100644 blog/apps.py create mode 100644 blog/migrations/__init__.py create mode 100644 blog/models.py create mode 100644 blog/tests.py create mode 100644 blog/views.py diff --git a/AdvancedDevelopment/__init__.py b/AdvancedDevelopment/__init__.py index e69de29..b8b1e2e 100644 --- a/AdvancedDevelopment/__init__.py +++ b/AdvancedDevelopment/__init__.py @@ -0,0 +1,15 @@ +import pymongo +from pymongo import MongoClient +from pymongo.errors import BulkWriteError + +cluster = MongoClient("mongodb+srv://s5124723:UJZ6xxtNrnYwSNWowyz8@advanceddevelopment.aiiro.mongodb.net/test") +db = cluster["AdvancedDevelopment"] +collection = db["test"] + +try: + post1 = {"_id": 1, "name": "Lucas", "score": 5} + post2 = {"_id": 2, "name": "Daniel", "score": 5} + collection.insert_many([post1, post2]) +except BulkWriteError as bwe: + print(bwe) + diff --git a/blog/__init__.py b/blog/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/blog/admin.py b/blog/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/blog/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/blog/apps.py b/blog/apps.py new file mode 100644 index 0000000..94788a5 --- /dev/null +++ b/blog/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class BlogConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'blog' diff --git a/blog/migrations/__init__.py b/blog/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/blog/models.py b/blog/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/blog/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/blog/tests.py b/blog/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/blog/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/blog/views.py b/blog/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/blog/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. From c5709223c144e9c4c5ced543627cd46b8445af30 Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 2 Dec 2021 19:30:20 +0000 Subject: [PATCH 04/49] Deploying to GCloud --- app.yaml | 1 + 1 file changed, 1 insertion(+) create mode 100644 app.yaml diff --git a/app.yaml b/app.yaml new file mode 100644 index 0000000..6e9b9e4 --- /dev/null +++ b/app.yaml @@ -0,0 +1 @@ +runtime: python310 From 6da31dbc5983117dc05bb395489ce0b3064c50af Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 2 Dec 2021 19:42:43 +0000 Subject: [PATCH 05/49] Adjusting to Python3.9 --- .gcloudignore | 19 +++++++++++++++++++ app.yaml | 2 +- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 .gcloudignore diff --git a/.gcloudignore b/.gcloudignore new file mode 100644 index 0000000..603f0b6 --- /dev/null +++ b/.gcloudignore @@ -0,0 +1,19 @@ +# This file specifies files that are *not* uploaded to Google Cloud +# using gcloud. It follows the same syntax as .gitignore, with the addition of +# "#!include" directives (which insert the entries of the given .gitignore-style +# file at that point). +# +# For more information, run: +# $ gcloud topic gcloudignore +# +.gcloudignore +# If you would like to upload your .git directory, .gitignore file or files +# from your .gitignore file, remove the corresponding line +# below: +.git +.gitignore + +# Python pycache: +__pycache__/ +# Ignored by the build system +/setup.cfg \ No newline at end of file diff --git a/app.yaml b/app.yaml index 6e9b9e4..ca36be9 100644 --- a/app.yaml +++ b/app.yaml @@ -1 +1 @@ -runtime: python310 +runtime: python39 \ No newline at end of file From 33a7102ea17f93c81d073ae65b2e810aaf18f6ba Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 2 Dec 2021 20:33:33 +0000 Subject: [PATCH 06/49] Adding requirements --- requirements.txt | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..48d01db --- /dev/null +++ b/requirements.txt @@ -0,0 +1,6 @@ +asgiref==3.4.1 +Django==3.2.9 +dnspython==2.1.0 +pymongo==4.0 +pytz==2021.3 +sqlparse==0.4.2 From 26c6d5e1201af637b4124bcd61983b20447cc487 Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 2 Dec 2021 23:43:02 +0000 Subject: [PATCH 07/49] main.py to fix 502 error on gcloud --- app.yaml | 7 ++++++- main.py | 0 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 main.py diff --git a/app.yaml b/app.yaml index ca36be9..9015d64 100644 --- a/app.yaml +++ b/app.yaml @@ -1 +1,6 @@ -runtime: python39 \ No newline at end of file +runtime: python39 +env: flex +entrypoint: gunicorn -b :$PORT main:app + +runtime_config: + python_version: 3 \ No newline at end of file diff --git a/main.py b/main.py new file mode 100644 index 0000000..e69de29 From 8db5b26723ba052d6474fee90bd1ba318733fc33 Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 2 Dec 2021 23:53:01 +0000 Subject: [PATCH 08/49] adding main.py to fix gcloud 502 error --- app.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app.yaml b/app.yaml index 9015d64..ca36be9 100644 --- a/app.yaml +++ b/app.yaml @@ -1,6 +1 @@ -runtime: python39 -env: flex -entrypoint: gunicorn -b :$PORT main:app - -runtime_config: - python_version: 3 \ No newline at end of file +runtime: python39 \ No newline at end of file From ee2f73968e02156ccb4924ec86a17fdd10ef1349 Mon Sep 17 00:00:00 2001 From: Ferby Date: Sat, 4 Dec 2021 15:44:39 +0000 Subject: [PATCH 09/49] fix 502 error gcloud by importing wsgi --- main.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/main.py b/main.py index e69de29..87d8db1 100644 --- a/main.py +++ b/main.py @@ -0,0 +1,9 @@ +from AdvancedDevelopment.wsgi import application as app + +# App Engine by default looks for a main.py file at the root of the app +# directory with a WSGI-compatible object called app. +# This file imports the WSGI-compatible object of your Django app, +# application from mysite/wsgi.py and renames it app so it is discoverable by +# App Engine without additional configuration. +# Alternatively, you can add a custom entrypoint field in your app.yaml: +# entrypoint: gunicorn -b :$PORT mysite.wsgi From ba19e6682564c3a0428da1327cba927ea4913a20 Mon Sep 17 00:00:00 2001 From: Ferby Date: Sat, 4 Dec 2021 15:53:00 +0000 Subject: [PATCH 10/49] fix allowed host error gcloud --- AdvancedDevelopment/settings.py | 2 +- main.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index aa9470c..f25cb95 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -25,7 +25,7 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = [] +ALLOWED_HOSTS = ["localhost", "127.0.0.1", "advanced-development-333919.nw.r.appspot.com"] # Application definition diff --git a/main.py b/main.py index 87d8db1..fc2036b 100644 --- a/main.py +++ b/main.py @@ -7,3 +7,4 @@ # App Engine without additional configuration. # Alternatively, you can add a custom entrypoint field in your app.yaml: # entrypoint: gunicorn -b :$PORT mysite.wsgi +# https://stackoverflow.com/questions/52395695/modulenotfounderror-no-module-named-main-when-attempting-to-start-service From 161700c5a44d65752699683367cdac17f93abc67 Mon Sep 17 00:00:00 2001 From: Ferby Date: Sun, 5 Dec 2021 17:43:21 +0000 Subject: [PATCH 11/49] Remove MongoDB operations, set up for Firebase auth --- .gitignore | 1 + AdvancedDevelopment/__init__.py | 20 ++++++++++---------- requirements.txt | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index fe7b0fd..abe5c4e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,6 +31,7 @@ media .idea/**/dynamic.xml .idea/**/uiDesigner.xml .idea/**/dbnavigator.xml +secrets/* # Gradle .idea/**/gradle.xml diff --git a/AdvancedDevelopment/__init__.py b/AdvancedDevelopment/__init__.py index b8b1e2e..a7f7e3c 100644 --- a/AdvancedDevelopment/__init__.py +++ b/AdvancedDevelopment/__init__.py @@ -2,14 +2,14 @@ from pymongo import MongoClient from pymongo.errors import BulkWriteError -cluster = MongoClient("mongodb+srv://s5124723:UJZ6xxtNrnYwSNWowyz8@advanceddevelopment.aiiro.mongodb.net/test") -db = cluster["AdvancedDevelopment"] -collection = db["test"] - -try: - post1 = {"_id": 1, "name": "Lucas", "score": 5} - post2 = {"_id": 2, "name": "Daniel", "score": 5} - collection.insert_many([post1, post2]) -except BulkWriteError as bwe: - print(bwe) +# cluster = MongoClient("mongodb+srv://s5124723:UJZ6xxtNrnYwSNWowyz8@advanceddevelopment.aiiro.mongodb.net/test") +# db = cluster["AdvancedDevelopment"] +# collection = db["test"] +# try: +# post1 = {"_id": 1, "name": "Lucas", "score": 5} +# post2 = {"_id": 2, "name": "Daniel", "score": 5} +# collection.insert_many([post1, post2]) +# except BulkWriteError as bwe: +# print(bwe) +# diff --git a/requirements.txt b/requirements.txt index 48d01db..03dee9e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,3 +4,4 @@ dnspython==2.1.0 pymongo==4.0 pytz==2021.3 sqlparse==0.4.2 +djangorestframework~=3.12.4 \ No newline at end of file From 1251a0d5525e3c47ffc5ec47323f652a1406e4f4 Mon Sep 17 00:00:00 2001 From: Ferby Date: Sun, 5 Dec 2021 17:44:18 +0000 Subject: [PATCH 12/49] Implement Firebase authentication (untested) --- AdvancedDevelopment/settings.py | 13 ++++++++++++- FirebaseAuth/__init__.py | 0 FirebaseAuth/admin.py | 3 +++ FirebaseAuth/apps.py | 6 ++++++ FirebaseAuth/authentication.py | 27 +++++++++++++++++++++++++++ FirebaseAuth/migrations/__init__.py | 0 FirebaseAuth/models.py | 3 +++ FirebaseAuth/tests.py | 3 +++ FirebaseAuth/views.py | 3 +++ 9 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 FirebaseAuth/__init__.py create mode 100644 FirebaseAuth/admin.py create mode 100644 FirebaseAuth/apps.py create mode 100644 FirebaseAuth/authentication.py create mode 100644 FirebaseAuth/migrations/__init__.py create mode 100644 FirebaseAuth/models.py create mode 100644 FirebaseAuth/tests.py create mode 100644 FirebaseAuth/views.py diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index f25cb95..fd61f67 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -9,8 +9,10 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/3.2/ref/settings/ """ - +import os from pathlib import Path +import firebase_admin +from firebase_admin import credentials # Build paths inside the project like this: BASE_DIR / 'subdir'. BASE_DIR = Path(__file__).resolve().parent.parent @@ -49,6 +51,12 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] +REST_FRAMEWORK = { + 'DEFAULT_AUTHENTICATION_CLASSES': [ + 'FirebaseAuth.authentication.FirebaseAuthentication', + ] +} + ROOT_URLCONF = 'AdvancedDevelopment.urls' TEMPLATES = [ @@ -124,3 +132,6 @@ # https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' + +cred = credentials.Certificate(os.path.join(BASE_DIR, "secrets/advanced-development-333919-25398fb03356.json")) +firebase_admin.initialize_app(cred) diff --git a/FirebaseAuth/__init__.py b/FirebaseAuth/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/FirebaseAuth/admin.py b/FirebaseAuth/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/FirebaseAuth/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/FirebaseAuth/apps.py b/FirebaseAuth/apps.py new file mode 100644 index 0000000..0aadd47 --- /dev/null +++ b/FirebaseAuth/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class FirebaseauthConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'FirebaseAuth' diff --git a/FirebaseAuth/authentication.py b/FirebaseAuth/authentication.py new file mode 100644 index 0000000..c4daf8f --- /dev/null +++ b/FirebaseAuth/authentication.py @@ -0,0 +1,27 @@ +from django.contrib.auth.models import User +from django.core.exceptions import ObjectDoesNotExist +from rest_framework import authentication +from rest_framework import exceptions +import firebase_admin as admin +import firebase_admin.auth as auth + + +class FirebaseAuthentication(authentication.BaseAuthentication): + def authenticate(self, request): + + token = request.headers.get('Authorization') + if not token: + return None + + try: + decoded_token = auth.verify_id_token(token) + uid = decoded_token["uid"] + except: + return None + + try: + user = User.objects.get(username=uid) + return user, None + + except ObjectDoesNotExist: + return None diff --git a/FirebaseAuth/migrations/__init__.py b/FirebaseAuth/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/FirebaseAuth/models.py b/FirebaseAuth/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/FirebaseAuth/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/FirebaseAuth/tests.py b/FirebaseAuth/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/FirebaseAuth/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/FirebaseAuth/views.py b/FirebaseAuth/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/FirebaseAuth/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. From e866d35a986411522b9d7648e47442aadfc24dc2 Mon Sep 17 00:00:00 2001 From: Ferby Date: Sun, 5 Dec 2021 17:47:31 +0000 Subject: [PATCH 13/49] Add secret ignore --- .gcloudignore | 4 +++- .gitignore | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gcloudignore b/.gcloudignore index 603f0b6..56ce7b1 100644 --- a/.gcloudignore +++ b/.gcloudignore @@ -16,4 +16,6 @@ # Python pycache: __pycache__/ # Ignored by the build system -/setup.cfg \ No newline at end of file +/setup.cfg +# Secrets +/secrets \ No newline at end of file diff --git a/.gitignore b/.gitignore index abe5c4e..b6671f2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ media .idea/**/dynamic.xml .idea/**/uiDesigner.xml .idea/**/dbnavigator.xml -secrets/* +secrets/ # Gradle .idea/**/gradle.xml From 2c19c5932898ec635ea68dede99de59a7ad0aa73 Mon Sep 17 00:00:00 2001 From: Ferby Date: Sun, 5 Dec 2021 17:50:02 +0000 Subject: [PATCH 14/49] Add secrets ignore --- .gcloudignore | 4 +++- .gitignore | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.gcloudignore b/.gcloudignore index 603f0b6..56ce7b1 100644 --- a/.gcloudignore +++ b/.gcloudignore @@ -16,4 +16,6 @@ # Python pycache: __pycache__/ # Ignored by the build system -/setup.cfg \ No newline at end of file +/setup.cfg +# Secrets +/secrets \ No newline at end of file diff --git a/.gitignore b/.gitignore index abe5c4e..b6671f2 100644 --- a/.gitignore +++ b/.gitignore @@ -31,7 +31,7 @@ media .idea/**/dynamic.xml .idea/**/uiDesigner.xml .idea/**/dbnavigator.xml -secrets/* +secrets/ # Gradle .idea/**/gradle.xml From 169437b0ff655a71f720357c4be5ae64d91a4686 Mon Sep 17 00:00:00 2001 From: Ferby Date: Sun, 5 Dec 2021 17:53:04 +0000 Subject: [PATCH 15/49] Add reference to source material --- FirebaseAuth/authentication.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/FirebaseAuth/authentication.py b/FirebaseAuth/authentication.py index c4daf8f..3329b79 100644 --- a/FirebaseAuth/authentication.py +++ b/FirebaseAuth/authentication.py @@ -7,6 +7,9 @@ class FirebaseAuthentication(authentication.BaseAuthentication): + """ + https://jrizmal.medium.com/how-to-authenticate-firebase-users-in-django-rest-framework-c2d90f5a0a11 + """ def authenticate(self, request): token = request.headers.get('Authorization') From 6ffabadc8ad19e1f8047095019ee7207f4208a9a Mon Sep 17 00:00:00 2001 From: Ferby Date: Sun, 5 Dec 2021 18:31:04 +0000 Subject: [PATCH 16/49] Add users app from other project --- tsml_users/__init__.py | 0 tsml_users/admin.py | 9 +++ tsml_users/apps.py | 8 +++ tsml_users/forms.py | 26 +++++++ tsml_users/models.py | 39 +++++++++++ tsml_users/signals.py | 15 ++++ tsml_users/templates/tsml_users/login.html | 27 +++++++ tsml_users/templates/tsml_users/logout.html | 9 +++ .../templates/tsml_users/password_change.html | 20 ++++++ .../templates/tsml_users/password_reset.html | 19 +++++ .../tsml_users/password_reset_complete.html | 7 ++ .../tsml_users/password_reset_confirm.html | 19 +++++ .../tsml_users/password_reset_done.html | 6 ++ tsml_users/templates/tsml_users/profile.html | 45 ++++++++++++ .../profile_deactivate_confirm.html | 11 +++ tsml_users/templates/tsml_users/register.html | 24 +++++++ tsml_users/tests.py | 3 + tsml_users/views.py | 70 +++++++++++++++++++ 18 files changed, 357 insertions(+) create mode 100644 tsml_users/__init__.py create mode 100644 tsml_users/admin.py create mode 100644 tsml_users/apps.py create mode 100644 tsml_users/forms.py create mode 100644 tsml_users/models.py create mode 100644 tsml_users/signals.py create mode 100644 tsml_users/templates/tsml_users/login.html create mode 100644 tsml_users/templates/tsml_users/logout.html create mode 100644 tsml_users/templates/tsml_users/password_change.html create mode 100644 tsml_users/templates/tsml_users/password_reset.html create mode 100644 tsml_users/templates/tsml_users/password_reset_complete.html create mode 100644 tsml_users/templates/tsml_users/password_reset_confirm.html create mode 100644 tsml_users/templates/tsml_users/password_reset_done.html create mode 100644 tsml_users/templates/tsml_users/profile.html create mode 100644 tsml_users/templates/tsml_users/profile_deactivate_confirm.html create mode 100644 tsml_users/templates/tsml_users/register.html create mode 100644 tsml_users/tests.py create mode 100644 tsml_users/views.py diff --git a/tsml_users/__init__.py b/tsml_users/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tsml_users/admin.py b/tsml_users/admin.py new file mode 100644 index 0000000..dd57fa2 --- /dev/null +++ b/tsml_users/admin.py @@ -0,0 +1,9 @@ +from django.contrib import admin +from .models import Profile + + +class ProfileAdminConf(admin.ModelAdmin): + list_display = ["user"] + + +admin.site.register(Profile, ProfileAdminConf) diff --git a/tsml_users/apps.py b/tsml_users/apps.py new file mode 100644 index 0000000..68aca91 --- /dev/null +++ b/tsml_users/apps.py @@ -0,0 +1,8 @@ +from django.apps import AppConfig + + +class UsersConfig(AppConfig): + name = "tsml_users" + + def ready(self): + import tsml_users.signals diff --git a/tsml_users/forms.py b/tsml_users/forms.py new file mode 100644 index 0000000..38efcf6 --- /dev/null +++ b/tsml_users/forms.py @@ -0,0 +1,26 @@ +from django import forms +from django.contrib.auth.models import User +from django.contrib.auth.forms import UserCreationForm +from .models import Profile + + +class UserRegisterForm(UserCreationForm): + email = forms.EmailField() + + class Meta: + model = User + fields = ["username", "email", "password1", "password2"] + + +class UserUpdateForm(forms.ModelForm): + email = forms.EmailField() + + class Meta: + model = User + fields = ["username", "email"] + + +class ProfileUpdateForm(forms.ModelForm): + class Meta: + model = Profile + fields = ["avatar"] diff --git a/tsml_users/models.py b/tsml_users/models.py new file mode 100644 index 0000000..fd80ae5 --- /dev/null +++ b/tsml_users/models.py @@ -0,0 +1,39 @@ +from django.db import models +from django.contrib.auth.models import User +from PIL import Image + + +class Profile(models.Model): + user = models.OneToOneField(User, on_delete=models.CASCADE) + avatar = models.ImageField(default="default.jpg", upload_to="profile_pics") + karma = models.IntegerField(default=0) + + # def count_strikes(self): + # """ + # Returns + # :return: + # """ + # issued = Strike.objects.filter(user=self.user, strike_type="A").count() + # redacted = Strike.objects.filter(user=self.user, strike_type="R").count() + # return issued - redacted + + def __str__(self): + """ + @return: Human readable name for the model + @rtype: string + """ + return f"{self.user.username}'s profile" + + def save(self, *args, **kwargs): + """ + This overrides the default save function for profile so it can resize image to + 300px after saving. It first uploads the user's image, resizes and saves + """ + super().save() + + img = Image.open(self.avatar.path) + + if img.height > 300 or img.width > 300: + output_size = (300, 300) + img.thumbnail(output_size) + img.save(self.avatar.path) diff --git a/tsml_users/signals.py b/tsml_users/signals.py new file mode 100644 index 0000000..299e44a --- /dev/null +++ b/tsml_users/signals.py @@ -0,0 +1,15 @@ +from django.db.models.signals import post_save +from django.contrib.auth.models import User +from django.dispatch import receiver +from .models import Profile + + +@receiver(post_save, sender=User) +def create_profile(sender, instance, created, **kwargs): + if created: + Profile.objects.create(user=instance) + + +@receiver(post_save, sender=User) +def save_profile(sender, instance, **kwargs): + instance.profile.save() diff --git a/tsml_users/templates/tsml_users/login.html b/tsml_users/templates/tsml_users/login.html new file mode 100644 index 0000000..eb8b8ad --- /dev/null +++ b/tsml_users/templates/tsml_users/login.html @@ -0,0 +1,27 @@ +{% extends "submissions/base.html" %} +{% block content %} +
+
+ {% csrf_token %} +
+ + Log In + + {{ form }} +
+
+ + + Forgot password? + +
+
+
+ + Need an account? Register instead. + +
+
+{% endblock content %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/logout.html b/tsml_users/templates/tsml_users/logout.html new file mode 100644 index 0000000..425f7d7 --- /dev/null +++ b/tsml_users/templates/tsml_users/logout.html @@ -0,0 +1,9 @@ +{% extends "submissions/base.html" %} +{% block content %} +

You have been logged out

+
+ + Log in again. + +
+{% endblock content %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/password_change.html b/tsml_users/templates/tsml_users/password_change.html new file mode 100644 index 0000000..04280a8 --- /dev/null +++ b/tsml_users/templates/tsml_users/password_change.html @@ -0,0 +1,20 @@ +{% extends "submissions/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +
+
+ {% csrf_token %} +
+ + Change password + +
+ {{ form|crispy }} +
+ +
+
+
+{% endblock content %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/password_reset.html b/tsml_users/templates/tsml_users/password_reset.html new file mode 100644 index 0000000..c49a97d --- /dev/null +++ b/tsml_users/templates/tsml_users/password_reset.html @@ -0,0 +1,19 @@ +{% extends "submissions/base.html" %} +{% block content %} +
+
+ {% csrf_token %} + {{ form }} +
+ + Reset password + +
+
+ +
+
+
+{% endblock content %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/password_reset_complete.html b/tsml_users/templates/tsml_users/password_reset_complete.html new file mode 100644 index 0000000..9d2ede4 --- /dev/null +++ b/tsml_users/templates/tsml_users/password_reset_complete.html @@ -0,0 +1,7 @@ +{% extends "submissions/base.html" %} +{% block content %} +
+ Your password has been changed. +
+ Sign in again +{% endblock content %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/password_reset_confirm.html b/tsml_users/templates/tsml_users/password_reset_confirm.html new file mode 100644 index 0000000..56dcf0d --- /dev/null +++ b/tsml_users/templates/tsml_users/password_reset_confirm.html @@ -0,0 +1,19 @@ +{% extends "submissions/base.html" %} +{% block content %} +
+
+ {% csrf_token %} +
+ + Reset password + + {{ form }} +
+
+ +
+
+
+{% endblock content %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/password_reset_done.html b/tsml_users/templates/tsml_users/password_reset_done.html new file mode 100644 index 0000000..7d98a80 --- /dev/null +++ b/tsml_users/templates/tsml_users/password_reset_done.html @@ -0,0 +1,6 @@ +{% extends "submissions/base.html" %} +{% block content %} +
+ An email has been with instructions to reset your password +
+{% endblock content %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/profile.html b/tsml_users/templates/tsml_users/profile.html new file mode 100644 index 0000000..d73c436 --- /dev/null +++ b/tsml_users/templates/tsml_users/profile.html @@ -0,0 +1,45 @@ +{% extends "submissions/base.html" %} +{% block content %} +
+
+ +
+ +

{{ user.email }}

+
+
+ {% if ban %} +
+

Account suspended

+

{{ ban.get_ban_type_display|capfirst }} ban + issued {{ ban.issued_when|date:"jS F, Y" }}{% if ban.expires is None %}.{% else %},{% endif %} + {% if ban.expires %} + expires {{ ban.expires|date:"jS F, Y" }} at {{ ban.expires|date:"g:i a" }} + {% endif %} +

+ {% if ban.issued_message %} +

+ + {{ ban.issued_message }} + +

+ {% endif %} +
+ {% endif %} +
+ {% csrf_token %} +
+ + Change profile + + {{ u_form }} + {{ p_form }} +
+
+ +
+
+
+{% endblock content %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/profile_deactivate_confirm.html b/tsml_users/templates/tsml_users/profile_deactivate_confirm.html new file mode 100644 index 0000000..eee5411 --- /dev/null +++ b/tsml_users/templates/tsml_users/profile_deactivate_confirm.html @@ -0,0 +1,11 @@ +{% extends "submissions/base.html" %} +{% load crispy_forms_tags %} + +{% block content %} +
+ {% csrf_token %} + Are you sure you wish to deactivate your account? + + Cancel +
+{% endblock %} \ No newline at end of file diff --git a/tsml_users/templates/tsml_users/register.html b/tsml_users/templates/tsml_users/register.html new file mode 100644 index 0000000..c83fc89 --- /dev/null +++ b/tsml_users/templates/tsml_users/register.html @@ -0,0 +1,24 @@ +{% extends "submissions/base.html" %} +{% block content %} +
+
+ {% csrf_token %} +
+ + Join Today + + {{ form }} +
+
+ +
+
+
+ + Already registered? Sign in instead. + +
+
+{% endblock content %} \ No newline at end of file diff --git a/tsml_users/tests.py b/tsml_users/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/tsml_users/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/tsml_users/views.py b/tsml_users/views.py new file mode 100644 index 0000000..1e3c098 --- /dev/null +++ b/tsml_users/views.py @@ -0,0 +1,70 @@ +from django.contrib import messages +from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.models import User +from django.shortcuts import render, redirect +from django.contrib.auth.decorators import login_required +from django.views import View + +from moderation.models import Ban +from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm + + +def register(request): + """ + @param request: Required to set up the view + @return: Renders the form and redirects from register page to login on POST + """ + if request.method == "POST": + form = UserRegisterForm(request.POST) + if form.is_valid(): + form.save() + messages.success( + request, "Your account has been created! You can now log in." + ) + return redirect("login") + else: + form = UserRegisterForm() + return render(request, "tsml_users/register.html", {"form": form}) + + +class DeactivateUser(View): + def get(self, request): + return render(request, "tsml_users/profile_deactivate_confirm.html") + + def post(self, request): + try: + user = User.objects.get(username=request.user.username) + user.is_active = False + user.save() + messages.success(request, f"Account {user.username} has been disabled!") + except User.DoesNotExist: + messages.error(request, "Account does not exist") + except Exception as e: + messages.error(request, e.message) + + # return render(request, "tsml_users/profile_deactivate_confirm.html", context=context) + return redirect("/") + + +class ProfileView(LoginRequiredMixin, View): + def get(self, request, *args, **kwargs): + u_form = UserUpdateForm(instance=request.user) + p_form = ProfileUpdateForm(instance=request.user.profile) + ban = Ban.objects.filter(user=request.user).first() + + context = {"u_form": u_form, + "p_form": p_form, + "ban": ban + } + return render(request, "tsml_users/profile.html", context) + + def post(self, request, *args, **kwargs): + u_form = UserUpdateForm(request.POST, instance=request.user) + p_form = ProfileUpdateForm( + request.POST, request.FILES, instance=request.user.profile + ) + if u_form.is_valid() and p_form.is_valid(): + u_form.save() + p_form.save() + messages.success(request, "Your account has been updated!") + return redirect("profile") From 78b043acde2f77f8358bff2cb1d14040c5a94334 Mon Sep 17 00:00:00 2001 From: Ferby Date: Tue, 7 Dec 2021 19:28:09 +0000 Subject: [PATCH 17/49] Adding firebase registration --- AdvancedDevelopment/settings.py | 5 +- AdvancedDevelopment/urls.py | 53 ++++++++++++++++++- AdvancedDevelopment/utils/__init__.py | 0 .../utils/access_secret_version.py | 25 +++++++++ requirements.txt | 4 +- tsml_users/admin.py | 2 +- tsml_users/forms.py | 18 +++++++ tsml_users/views.py | 6 +-- 8 files changed, 103 insertions(+), 10 deletions(-) create mode 100644 AdvancedDevelopment/utils/__init__.py create mode 100644 AdvancedDevelopment/utils/access_secret_version.py diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index f25cb95..affcc5e 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -9,11 +9,11 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/3.2/ref/settings/ """ - +import os from pathlib import Path # Build paths inside the project like this: BASE_DIR / 'subdir'. -BASE_DIR = Path(__file__).resolve().parent.parent +BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) # Quick-start development settings - unsuitable for production @@ -37,6 +37,7 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'tsml_users.apps.UsersConfig', ] MIDDLEWARE = [ diff --git a/AdvancedDevelopment/urls.py b/AdvancedDevelopment/urls.py index 810697c..1cfd25d 100644 --- a/AdvancedDevelopment/urls.py +++ b/AdvancedDevelopment/urls.py @@ -14,8 +14,59 @@ 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin +from django.contrib.auth import views as auth_views from django.urls import path +from tsml_users import views as user_views# +from tsml_users.views import ProfileView, DeactivateUser urlpatterns = [ - path('admin/', admin.site.urls), + path("admin/", admin.site.urls), + path("register/", user_views.register, name="register"), + path("profile/", ProfileView.as_view(), name="profile"), + path("profile/deactivate", DeactivateUser.as_view(), name="delete-profile"), + path( + "login/", + auth_views.LoginView.as_view(template_name="tsml_users/login.html"), + name="login", + ), + path( + "logout/", + auth_views.LogoutView.as_view(template_name="tsml_users/logout.html"), + name="logout", + ), + path( + "change-password/", + auth_views.PasswordChangeView.as_view( + template_name="tsml_users/password_change.html", + success_url="/" + ), + name="password_change" + ), + path( + "password-reset/", + auth_views.PasswordResetView.as_view(template_name="tsml_users/password_reset.html"), + name="password_reset", + ), + path( + "password-reset/done", + auth_views.PasswordResetDoneView.as_view( + template_name="tsml_users/password_reset_done.html" + ), + name="password_reset_done", + ), + path( + "password-reset-confirm//", + auth_views.PasswordResetConfirmView.as_view( + template_name="tsml_users/password_reset_confirm.html" + ), + name="password_reset_confirm", + ), + path( + "password-reset-complete/", + auth_views.PasswordResetCompleteView.as_view( + template_name="tsml_users/password_reset_complete.html" + ), + name="password_reset_complete", + ) ] + diff --git a/AdvancedDevelopment/utils/__init__.py b/AdvancedDevelopment/utils/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/AdvancedDevelopment/utils/access_secret_version.py b/AdvancedDevelopment/utils/access_secret_version.py new file mode 100644 index 0000000..6384b30 --- /dev/null +++ b/AdvancedDevelopment/utils/access_secret_version.py @@ -0,0 +1,25 @@ +def access_secret_version(project_id, secret_id, version_id): + """ + Access the payload for the given secret version if one exists. The version + can be a version number as a string (e.g. "5") or an alias (e.g. "latest"). + """ + + # Import the Secret Manager client library. + from google.cloud import secretmanager + + # Create the Secret Manager client. + client = secretmanager.SecretManagerServiceClient() + + # Build the resource name of the secret version. + name = f"projects/{project_id}/secrets/{secret_id}/versions/{version_id}" + + # Access the secret version. + response = client.access_secret_version(request={"name": name}) + + # Print the secret payload. + # + # WARNING: Do not print the secret in a production environment - this + # snippet is showing how to access the secret material. + payload = response.payload.data.decode("UTF-8") + print("Plaintext: {}".format(payload)) + \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 03dee9e..1f2be9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,4 +4,6 @@ dnspython==2.1.0 pymongo==4.0 pytz==2021.3 sqlparse==0.4.2 -djangorestframework~=3.12.4 \ No newline at end of file +djangorestframework~=3.12.4 +Pillow~=8.4.0 +google-cloud-secret-manager==2.8.0 \ No newline at end of file diff --git a/tsml_users/admin.py b/tsml_users/admin.py index dd57fa2..6ef6fae 100644 --- a/tsml_users/admin.py +++ b/tsml_users/admin.py @@ -3,7 +3,7 @@ class ProfileAdminConf(admin.ModelAdmin): - list_display = ["user"] + list_display = ["tsml_users"] admin.site.register(Profile, ProfileAdminConf) diff --git a/tsml_users/forms.py b/tsml_users/forms.py index 38efcf6..555c13a 100644 --- a/tsml_users/forms.py +++ b/tsml_users/forms.py @@ -1,12 +1,30 @@ from django import forms from django.contrib.auth.models import User from django.contrib.auth.forms import UserCreationForm +from django.core.exceptions import ValidationError + from .models import Profile +from firebase_admin import auth class UserRegisterForm(UserCreationForm): email = forms.EmailField() + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + try: + user = auth.create_user( + email=self.email, + email_verified=False, + password=super().clean_password2(), + display_name='', + photo_url='', + disabled=False + ) + print('Successfully created new user: {0}'.format(user.uid)) + except ValidationError as error: + print(error.message) + class Meta: model = User fields = ["username", "email", "password1", "password2"] diff --git a/tsml_users/views.py b/tsml_users/views.py index 1e3c098..b89cd3d 100644 --- a/tsml_users/views.py +++ b/tsml_users/views.py @@ -4,8 +4,6 @@ from django.shortcuts import render, redirect from django.contrib.auth.decorators import login_required from django.views import View - -from moderation.models import Ban from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm @@ -50,11 +48,9 @@ class ProfileView(LoginRequiredMixin, View): def get(self, request, *args, **kwargs): u_form = UserUpdateForm(instance=request.user) p_form = ProfileUpdateForm(instance=request.user.profile) - ban = Ban.objects.filter(user=request.user).first() context = {"u_form": u_form, - "p_form": p_form, - "ban": ban + "p_form": p_form } return render(request, "tsml_users/profile.html", context) From 981e09dd0b1485bef3471a8d7c2c0086c7bf298c Mon Sep 17 00:00:00 2001 From: Ferby Date: Tue, 7 Dec 2021 19:59:03 +0000 Subject: [PATCH 18/49] Amend registration data, remove db setting --- AdvancedDevelopment/settings.py | 8 ++++---- tsml_users/forms.py | 12 ++++-------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index 1bfb991..b7450a5 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -84,10 +84,10 @@ # https://docs.djangoproject.com/en/3.2/ref/settings/#databases DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': BASE_DIR / 'db.sqlite3', - } + # 'default': { + # 'ENGINE': 'django.db.backends.sqlite3', + # 'NAME': BASE_DIR / 'db.sqlite3', + # } } diff --git a/tsml_users/forms.py b/tsml_users/forms.py index 555c13a..c96080c 100644 --- a/tsml_users/forms.py +++ b/tsml_users/forms.py @@ -8,19 +8,15 @@ class UserRegisterForm(UserCreationForm): + """ + Registers the user through django and firebase + """ email = forms.EmailField() def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) try: - user = auth.create_user( - email=self.email, - email_verified=False, - password=super().clean_password2(), - display_name='', - photo_url='', - disabled=False - ) + user = auth.create_user(self) print('Successfully created new user: {0}'.format(user.uid)) except ValidationError as error: print(error.message) From bc968a30032f125d3e93657c91d93cb75bbed397 Mon Sep 17 00:00:00 2001 From: Ferby Date: Mon, 13 Dec 2021 05:25:01 +0000 Subject: [PATCH 19/49] Parcel app --- AdvancedDevelopment/settings.py | 35 ++++---- AdvancedDevelopment/urls.py | 24 ++++-- {tsml_users => parcel}/__init__.py | 0 parcel/admin.py | 3 + parcel/apps.py | 6 ++ parcel/migrations/__init__.py | 0 parcel/models.py | 35 ++++++++ parcel/templates/parcel/base.html | 85 +++++++++++++++++++ parcel/templates/parcel/home.html | 4 + parcel/templates/parcel/parcel_detail.html | 12 +++ parcel/templates/parcel/parcel_form.html | 7 ++ parcel/templates/parcel/product_detail.html | 5 ++ {tsml_users => parcel}/tests.py | 0 parcel/views.py | 21 +++++ requirements.txt | 4 +- users/__init__.py | 0 {tsml_users => users}/admin.py | 2 +- {tsml_users => users}/apps.py | 4 +- {tsml_users => users}/forms.py | 9 +- {tsml_users => users}/models.py | 0 {tsml_users => users}/signals.py | 0 .../templates/users}/login.html | 2 +- .../templates/users}/logout.html | 2 +- .../templates/users}/password_change.html | 2 +- .../templates/users}/password_reset.html | 2 +- .../users}/password_reset_complete.html | 2 +- .../users}/password_reset_confirm.html | 2 +- .../templates/users}/password_reset_done.html | 2 +- .../templates/users}/profile.html | 2 +- .../users}/profile_deactivate_confirm.html | 2 +- .../templates/users}/register.html | 2 +- users/tests.py | 3 + {tsml_users => users}/views.py | 8 +- 33 files changed, 242 insertions(+), 45 deletions(-) rename {tsml_users => parcel}/__init__.py (100%) create mode 100644 parcel/admin.py create mode 100644 parcel/apps.py create mode 100644 parcel/migrations/__init__.py create mode 100644 parcel/models.py create mode 100644 parcel/templates/parcel/base.html create mode 100644 parcel/templates/parcel/home.html create mode 100644 parcel/templates/parcel/parcel_detail.html create mode 100644 parcel/templates/parcel/parcel_form.html create mode 100644 parcel/templates/parcel/product_detail.html rename {tsml_users => parcel}/tests.py (100%) create mode 100644 parcel/views.py create mode 100644 users/__init__.py rename {tsml_users => users}/admin.py (81%) rename {tsml_users => users}/apps.py (60%) rename {tsml_users => users}/forms.py (79%) rename {tsml_users => users}/models.py (100%) rename {tsml_users => users}/signals.py (100%) rename {tsml_users/templates/tsml_users => users/templates/users}/login.html (95%) rename {tsml_users/templates/tsml_users => users/templates/users}/logout.html (86%) rename {tsml_users/templates/tsml_users => users/templates/users}/password_change.html (94%) rename {tsml_users/templates/tsml_users => users/templates/users}/password_reset.html (93%) rename {tsml_users/templates/tsml_users => users/templates/users}/password_reset_complete.html (82%) rename {tsml_users/templates/tsml_users => users/templates/users}/password_reset_confirm.html (93%) rename {tsml_users/templates/tsml_users => users/templates/users}/password_reset_done.html (80%) rename {tsml_users/templates/tsml_users => users/templates/users}/profile.html (97%) rename {tsml_users/templates/tsml_users => users/templates/users}/profile_deactivate_confirm.html (89%) rename {tsml_users/templates/tsml_users => users/templates/users}/register.html (95%) create mode 100644 users/tests.py rename {tsml_users => users}/views.py (87%) diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index b7450a5..ddb2038 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -14,10 +14,9 @@ import firebase_admin from firebase_admin import credentials -# Build paths inside the project like this: BASE_DIR / 'subdir'. +# Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) - # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ @@ -33,13 +32,16 @@ # Application definition INSTALLED_APPS = [ + 'parcel.apps.ParcelConfig', + 'users.apps.UsersConfig', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'tsml_users.apps.UsersConfig', + 'address', + 'crispy_forms' ] MIDDLEWARE = [ @@ -52,19 +54,12 @@ 'django.middleware.clickjacking.XFrameOptionsMiddleware', ] -REST_FRAMEWORK = { - 'DEFAULT_AUTHENTICATION_CLASSES': [ - 'FirebaseAuth.authentication.FirebaseAuthentication', - ] -} - ROOT_URLCONF = 'AdvancedDevelopment.urls' TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', - 'DIRS': [BASE_DIR / 'templates'] - , + 'DIRS': [BASE_DIR + 'templates'], 'APP_DIRS': True, 'OPTIONS': { 'context_processors': [ @@ -84,10 +79,6 @@ # https://docs.djangoproject.com/en/3.2/ref/settings/#databases DATABASES = { - # 'default': { - # 'ENGINE': 'django.db.backends.sqlite3', - # 'NAME': BASE_DIR / 'db.sqlite3', - # } } @@ -134,5 +125,19 @@ DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField' +# Certifying Firebase credentials for Firebase integration +# https://jrizmal.medium.com/how-to-authenticate-firebase-users-in-django-rest-framework-c2d90f5a0a11 + +REST_FRAMEWORK = { + 'DEFAULT_AUTHENTICATION_CLASSES': [ + 'FirebaseAuth.authentication.FirebaseAuthentication', + ] +} cred = credentials.Certificate(os.path.join(BASE_DIR, "secrets/advanced-development-333919-25398fb03356.json")) firebase_admin.initialize_app(cred) + + +# Specify your Google API key as environment variable GOOGLE_API_KEY +# You may also specify it here, though be sure not to commit it to a repository +GOOGLE_API_KEY = 'AIzaSyBvikAKlkILoJTxKC5w0bgUAOOG_U8o4-U' # Specify your Google API key here +GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY', GOOGLE_API_KEY) diff --git a/AdvancedDevelopment/urls.py b/AdvancedDevelopment/urls.py index 1cfd25d..9eef7a3 100644 --- a/AdvancedDevelopment/urls.py +++ b/AdvancedDevelopment/urls.py @@ -16,55 +16,61 @@ from django.contrib import admin from django.contrib.auth import views as auth_views from django.urls import path -from tsml_users import views as user_views# -from tsml_users.views import ProfileView, DeactivateUser + +from parcel.views import ProductDetailView, ParcelDetailView +from users import views as user_views +from parcel import views as parcel_views +from users.views import ProfileView, DeactivateUser urlpatterns = [ + path("/", parcel_views.home, name="home"), path("admin/", admin.site.urls), + path("product//", ProductDetailView.as_view(), name="product"), + path("order//", ParcelDetailView.as_view(), name="parcel"), path("register/", user_views.register, name="register"), path("profile/", ProfileView.as_view(), name="profile"), path("profile/deactivate", DeactivateUser.as_view(), name="delete-profile"), path( "login/", - auth_views.LoginView.as_view(template_name="tsml_users/login.html"), + auth_views.LoginView.as_view(template_name="users/login.html"), name="login", ), path( "logout/", - auth_views.LogoutView.as_view(template_name="tsml_users/logout.html"), + auth_views.LogoutView.as_view(template_name="users/logout.html"), name="logout", ), path( "change-password/", auth_views.PasswordChangeView.as_view( - template_name="tsml_users/password_change.html", + template_name="users/password_change.html", success_url="/" ), name="password_change" ), path( "password-reset/", - auth_views.PasswordResetView.as_view(template_name="tsml_users/password_reset.html"), + auth_views.PasswordResetView.as_view(template_name="users/password_reset.html"), name="password_reset", ), path( "password-reset/done", auth_views.PasswordResetDoneView.as_view( - template_name="tsml_users/password_reset_done.html" + template_name="users/password_reset_done.html" ), name="password_reset_done", ), path( "password-reset-confirm//", auth_views.PasswordResetConfirmView.as_view( - template_name="tsml_users/password_reset_confirm.html" + template_name="users/password_reset_confirm.html" ), name="password_reset_confirm", ), path( "password-reset-complete/", auth_views.PasswordResetCompleteView.as_view( - template_name="tsml_users/password_reset_complete.html" + template_name="users/password_reset_complete.html" ), name="password_reset_complete", ) diff --git a/tsml_users/__init__.py b/parcel/__init__.py similarity index 100% rename from tsml_users/__init__.py rename to parcel/__init__.py diff --git a/parcel/admin.py b/parcel/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/parcel/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/parcel/apps.py b/parcel/apps.py new file mode 100644 index 0000000..46494c4 --- /dev/null +++ b/parcel/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ParcelConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'parcel' diff --git a/parcel/migrations/__init__.py b/parcel/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/parcel/models.py b/parcel/models.py new file mode 100644 index 0000000..ee89c29 --- /dev/null +++ b/parcel/models.py @@ -0,0 +1,35 @@ +from django.contrib.auth import get_user_model +from django.db import models +from address.models import AddressField # django-address + + +class Product(models.Model): + name = models.CharField(max_length=128) + desc = models.TextField(max_length=500) + # img # todo add through google cloud storage + price = models.FloatField() + + +STATUS_CHOICES = [ + ("1", "Order confirmed"), + ("2", "Awaiting dispatch"), + ("3", "Dispatched, awaiting courier"), + ("4", "With courier, awaiting delivery"), + ("5", "Out for delivery"), + ("6", "Order delivered and fulfilled") +] + + +class Shipping(models.Model): + address = AddressField() + status = models.CharField(max_length=1, choices=STATUS_CHOICES) + + def __str__(self): + return self.status + + +class Parcel(models.Model): + products = models.ManyToManyField(Product) + shipping = Shipping + customer = get_user_model() + diff --git a/parcel/templates/parcel/base.html b/parcel/templates/parcel/base.html new file mode 100644 index 0000000..ee31c6a --- /dev/null +++ b/parcel/templates/parcel/base.html @@ -0,0 +1,85 @@ +{% load static %} + + + + + + {% if title %} + {{ title }} + {% else %} + Advanced Development + {% endif %} + + {# scripts and styles #} + + + + + +{# #} +{# #} + + + + +
+ + + +
+ +
+ +
+ + Register +
+ +
+ +
+
+

Advanced Development assignment

+

Lorem ipsum

+
+ Register +
+
+
+ + + +
+ {% if messages %} +
    + {% for message in messages %} +
  • + {{ message }} +
    • + {% endfor %} +
+ {% endif %} + + {% block content %}{% endblock %} + +
+ + + \ No newline at end of file diff --git a/parcel/templates/parcel/home.html b/parcel/templates/parcel/home.html new file mode 100644 index 0000000..7acd6c2 --- /dev/null +++ b/parcel/templates/parcel/home.html @@ -0,0 +1,4 @@ +{% extends "parcel/base.html" %} +{% block content %} +

Hello world!

+{% endblock %} \ No newline at end of file diff --git a/parcel/templates/parcel/parcel_detail.html b/parcel/templates/parcel/parcel_detail.html new file mode 100644 index 0000000..ee1f433 --- /dev/null +++ b/parcel/templates/parcel/parcel_detail.html @@ -0,0 +1,12 @@ +{% extends "parcel/base.html" %} +{% block content %} +

Order #{{ parcel.id }} · {{ parcel.shipping.status }}

+

Shipping details

+

{{ parcel.shipping.status }}

+

{{ parcel.shipping.address }}

+
    + {% for product in parcel %} +
  • {{ product.name }} · £{{ product.price }}
    • + {% endfor %} +
+{% endblock %} \ No newline at end of file diff --git a/parcel/templates/parcel/parcel_form.html b/parcel/templates/parcel/parcel_form.html new file mode 100644 index 0000000..15a2b96 --- /dev/null +++ b/parcel/templates/parcel/parcel_form.html @@ -0,0 +1,7 @@ +{% extends "parcel/base.html" %} +{% block content %} +
{% csrf_token %} + {{ form.as_p }} + +
+{% endblock %} \ No newline at end of file diff --git a/parcel/templates/parcel/product_detail.html b/parcel/templates/parcel/product_detail.html new file mode 100644 index 0000000..9925a52 --- /dev/null +++ b/parcel/templates/parcel/product_detail.html @@ -0,0 +1,5 @@ +{% extends "parcel/base.html" %} +{% block content %} +

{{ product.name }}

+

{{ product.desc }}

+{% endblock %} \ No newline at end of file diff --git a/tsml_users/tests.py b/parcel/tests.py similarity index 100% rename from tsml_users/tests.py rename to parcel/tests.py diff --git a/parcel/views.py b/parcel/views.py new file mode 100644 index 0000000..a75be8c --- /dev/null +++ b/parcel/views.py @@ -0,0 +1,21 @@ +from django.shortcuts import render +from django.views.generic import DetailView, ListView, CreateView + +from parcel.models import Product, Parcel + + +def home(request): + return render(request, "parcel/home.html") + + +class ProductDetailView(DetailView): + model = Product + + +class ParcelDetailView(DetailView): + model = Parcel + + +class ParcelCreateView(CreateView): + model = Parcel + fields = ["products", "shipping"] diff --git a/requirements.txt b/requirements.txt index 1f2be9c..b7be77a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,4 +6,6 @@ pytz==2021.3 sqlparse==0.4.2 djangorestframework~=3.12.4 Pillow~=8.4.0 -google-cloud-secret-manager==2.8.0 \ No newline at end of file +google-cloud-secret-manager==2.8.0 +django-crispy-forms==1.13.0 +django-address==0.2.5 \ No newline at end of file diff --git a/users/__init__.py b/users/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/tsml_users/admin.py b/users/admin.py similarity index 81% rename from tsml_users/admin.py rename to users/admin.py index 6ef6fae..dd57fa2 100644 --- a/tsml_users/admin.py +++ b/users/admin.py @@ -3,7 +3,7 @@ class ProfileAdminConf(admin.ModelAdmin): - list_display = ["tsml_users"] + list_display = ["user"] admin.site.register(Profile, ProfileAdminConf) diff --git a/tsml_users/apps.py b/users/apps.py similarity index 60% rename from tsml_users/apps.py rename to users/apps.py index 68aca91..1322ac9 100644 --- a/tsml_users/apps.py +++ b/users/apps.py @@ -2,7 +2,7 @@ class UsersConfig(AppConfig): - name = "tsml_users" + name = "users" def ready(self): - import tsml_users.signals + import users.signals diff --git a/tsml_users/forms.py b/users/forms.py similarity index 79% rename from tsml_users/forms.py rename to users/forms.py index c96080c..f38d490 100644 --- a/tsml_users/forms.py +++ b/users/forms.py @@ -13,10 +13,13 @@ class UserRegisterForm(UserCreationForm): """ email = forms.EmailField() - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) + def save(self, *args, **kwargs): try: - user = auth.create_user(self) + user = auth.create_user( + email=self.email, + email_verified=False, + password=self.clean_password2()) + super().save(*args, **kwargs) print('Successfully created new user: {0}'.format(user.uid)) except ValidationError as error: print(error.message) diff --git a/tsml_users/models.py b/users/models.py similarity index 100% rename from tsml_users/models.py rename to users/models.py diff --git a/tsml_users/signals.py b/users/signals.py similarity index 100% rename from tsml_users/signals.py rename to users/signals.py diff --git a/tsml_users/templates/tsml_users/login.html b/users/templates/users/login.html similarity index 95% rename from tsml_users/templates/tsml_users/login.html rename to users/templates/users/login.html index eb8b8ad..57e7551 100644 --- a/tsml_users/templates/tsml_users/login.html +++ b/users/templates/users/login.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% block content %}
diff --git a/tsml_users/templates/tsml_users/logout.html b/users/templates/users/logout.html similarity index 86% rename from tsml_users/templates/tsml_users/logout.html rename to users/templates/users/logout.html index 425f7d7..3cd3640 100644 --- a/tsml_users/templates/tsml_users/logout.html +++ b/users/templates/users/logout.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% block content %}

You have been logged out

diff --git a/tsml_users/templates/tsml_users/password_change.html b/users/templates/users/password_change.html similarity index 94% rename from tsml_users/templates/tsml_users/password_change.html rename to users/templates/users/password_change.html index 04280a8..b12a3b5 100644 --- a/tsml_users/templates/tsml_users/password_change.html +++ b/users/templates/users/password_change.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% load crispy_forms_tags %} {% block content %}
diff --git a/tsml_users/templates/tsml_users/password_reset.html b/users/templates/users/password_reset.html similarity index 93% rename from tsml_users/templates/tsml_users/password_reset.html rename to users/templates/users/password_reset.html index c49a97d..882232d 100644 --- a/tsml_users/templates/tsml_users/password_reset.html +++ b/users/templates/users/password_reset.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% block content %}
diff --git a/tsml_users/templates/tsml_users/password_reset_complete.html b/users/templates/users/password_reset_complete.html similarity index 82% rename from tsml_users/templates/tsml_users/password_reset_complete.html rename to users/templates/users/password_reset_complete.html index 9d2ede4..92aed52 100644 --- a/tsml_users/templates/tsml_users/password_reset_complete.html +++ b/users/templates/users/password_reset_complete.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% block content %}
Your password has been changed. diff --git a/tsml_users/templates/tsml_users/password_reset_confirm.html b/users/templates/users/password_reset_confirm.html similarity index 93% rename from tsml_users/templates/tsml_users/password_reset_confirm.html rename to users/templates/users/password_reset_confirm.html index 56dcf0d..2c90e78 100644 --- a/tsml_users/templates/tsml_users/password_reset_confirm.html +++ b/users/templates/users/password_reset_confirm.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% block content %}
diff --git a/tsml_users/templates/tsml_users/password_reset_done.html b/users/templates/users/password_reset_done.html similarity index 80% rename from tsml_users/templates/tsml_users/password_reset_done.html rename to users/templates/users/password_reset_done.html index 7d98a80..2cf113b 100644 --- a/tsml_users/templates/tsml_users/password_reset_done.html +++ b/users/templates/users/password_reset_done.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% block content %}
An email has been with instructions to reset your password diff --git a/tsml_users/templates/tsml_users/profile.html b/users/templates/users/profile.html similarity index 97% rename from tsml_users/templates/tsml_users/profile.html rename to users/templates/users/profile.html index d73c436..c9eb3a6 100644 --- a/tsml_users/templates/tsml_users/profile.html +++ b/users/templates/users/profile.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% block content %}
diff --git a/tsml_users/templates/tsml_users/profile_deactivate_confirm.html b/users/templates/users/profile_deactivate_confirm.html similarity index 89% rename from tsml_users/templates/tsml_users/profile_deactivate_confirm.html rename to users/templates/users/profile_deactivate_confirm.html index eee5411..0a2b8f2 100644 --- a/tsml_users/templates/tsml_users/profile_deactivate_confirm.html +++ b/users/templates/users/profile_deactivate_confirm.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% load crispy_forms_tags %} {% block content %} diff --git a/tsml_users/templates/tsml_users/register.html b/users/templates/users/register.html similarity index 95% rename from tsml_users/templates/tsml_users/register.html rename to users/templates/users/register.html index c83fc89..3b45b86 100644 --- a/tsml_users/templates/tsml_users/register.html +++ b/users/templates/users/register.html @@ -1,4 +1,4 @@ -{% extends "submissions/base.html" %} +{% extends "parcel/base.html" %} {% block content %}
diff --git a/users/tests.py b/users/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/users/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/tsml_users/views.py b/users/views.py similarity index 87% rename from tsml_users/views.py rename to users/views.py index b89cd3d..ae60331 100644 --- a/tsml_users/views.py +++ b/users/views.py @@ -22,12 +22,12 @@ def register(request): return redirect("login") else: form = UserRegisterForm() - return render(request, "tsml_users/register.html", {"form": form}) + return render(request, "users/register.html", {"form": form}) class DeactivateUser(View): def get(self, request): - return render(request, "tsml_users/profile_deactivate_confirm.html") + return render(request, "users/profile_deactivate_confirm.html") def post(self, request): try: @@ -40,7 +40,7 @@ def post(self, request): except Exception as e: messages.error(request, e.message) - # return render(request, "tsml_users/profile_deactivate_confirm.html", context=context) + # return render(request, "users/profile_deactivate_confirm.html", context=context) return redirect("/") @@ -52,7 +52,7 @@ def get(self, request, *args, **kwargs): context = {"u_form": u_form, "p_form": p_form } - return render(request, "tsml_users/profile.html", context) + return render(request, "users/profile.html", context) def post(self, request, *args, **kwargs): u_form = UserUpdateForm(request.POST, instance=request.user) From e73e030f3b81fefb9637da35f67f5530f73faa5f Mon Sep 17 00:00:00 2001 From: Ferby Date: Mon, 13 Dec 2021 09:17:53 +0000 Subject: [PATCH 20/49] Refactoring, begin db integration, product and orders --- AdvancedDevelopment/settings.py | 12 ++++++- AdvancedDevelopment/urls.py | 9 ++--- parcel/models.py | 35 ------------------- parcel/views.py | 21 ----------- {parcel => products}/__init__.py | 0 {parcel => products}/admin.py | 0 {parcel => products}/apps.py | 2 +- {parcel => products}/migrations/__init__.py | 0 products/models.py | 35 +++++++++++++++++++ .../templates/products}/base.html | 1 - .../templates/products}/home.html | 2 +- .../templates/products/order_detail.html | 2 +- .../templates/products/order_form.html | 2 +- .../templates/products}/product_detail.html | 2 +- {parcel => products}/tests.py | 0 products/views.py | 26 ++++++++++++++ users/templates/users/login.html | 2 +- users/templates/users/logout.html | 2 +- users/templates/users/password_change.html | 2 +- users/templates/users/password_reset.html | 2 +- .../users/password_reset_complete.html | 2 +- .../users/password_reset_confirm.html | 2 +- .../templates/users/password_reset_done.html | 2 +- users/templates/users/profile.html | 2 +- .../users/profile_deactivate_confirm.html | 2 +- users/templates/users/register.html | 2 +- 26 files changed, 92 insertions(+), 77 deletions(-) delete mode 100644 parcel/models.py delete mode 100644 parcel/views.py rename {parcel => products}/__init__.py (100%) rename {parcel => products}/admin.py (100%) rename {parcel => products}/apps.py (84%) rename {parcel => products}/migrations/__init__.py (100%) create mode 100644 products/models.py rename {parcel/templates/parcel => products/templates/products}/base.html (97%) rename {parcel/templates/parcel => products/templates/products}/home.html (63%) rename parcel/templates/parcel/parcel_detail.html => products/templates/products/order_detail.html (90%) rename parcel/templates/parcel/parcel_form.html => products/templates/products/order_form.html (80%) rename {parcel/templates/parcel => products/templates/products}/product_detail.html (73%) rename {parcel => products}/tests.py (100%) create mode 100644 products/views.py diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index ddb2038..2adb24a 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -32,7 +32,7 @@ # Application definition INSTALLED_APPS = [ - 'parcel.apps.ParcelConfig', + 'products.apps.ParcelConfig', 'users.apps.UsersConfig', 'django.contrib.admin', 'django.contrib.auth', @@ -79,6 +79,15 @@ # https://docs.djangoproject.com/en/3.2/ref/settings/#databases DATABASES = { + "default": { + "engine": "djongo", + # "name": "db-name" # todo change this + "enforce_schema": False, + "client": { + # todo hide this in secrets + "host": "mongodb+srv://s5124723:UJZ6xxtNrnYwSNWowyz8@advanceddevelopment.aiiro.mongodb.net/test?authSource=admin&replicaSet=atlas-xtge2j-shard-0&readPreference=primary&appname=MongoDB%20Compass&ssl=true" + } + } } @@ -139,5 +148,6 @@ # Specify your Google API key as environment variable GOOGLE_API_KEY # You may also specify it here, though be sure not to commit it to a repository +# todo hide this in secrets GOOGLE_API_KEY = 'AIzaSyBvikAKlkILoJTxKC5w0bgUAOOG_U8o4-U' # Specify your Google API key here GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY', GOOGLE_API_KEY) diff --git a/AdvancedDevelopment/urls.py b/AdvancedDevelopment/urls.py index 9eef7a3..0813d73 100644 --- a/AdvancedDevelopment/urls.py +++ b/AdvancedDevelopment/urls.py @@ -17,16 +17,17 @@ from django.contrib.auth import views as auth_views from django.urls import path -from parcel.views import ProductDetailView, ParcelDetailView +from products.views import ProductDetailView, OrderDetailView, OrderCreateView from users import views as user_views -from parcel import views as parcel_views +from products import views as parcel_views from users.views import ProfileView, DeactivateUser urlpatterns = [ - path("/", parcel_views.home, name="home"), + path("", parcel_views.home, name="home"), path("admin/", admin.site.urls), path("product//", ProductDetailView.as_view(), name="product"), - path("order//", ParcelDetailView.as_view(), name="parcel"), + path("order//", OrderDetailView.as_view(), name="order"), + path("order/new/", OrderCreateView.as_view(), name="order-create"), path("register/", user_views.register, name="register"), path("profile/", ProfileView.as_view(), name="profile"), path("profile/deactivate", DeactivateUser.as_view(), name="delete-profile"), diff --git a/parcel/models.py b/parcel/models.py deleted file mode 100644 index ee89c29..0000000 --- a/parcel/models.py +++ /dev/null @@ -1,35 +0,0 @@ -from django.contrib.auth import get_user_model -from django.db import models -from address.models import AddressField # django-address - - -class Product(models.Model): - name = models.CharField(max_length=128) - desc = models.TextField(max_length=500) - # img # todo add through google cloud storage - price = models.FloatField() - - -STATUS_CHOICES = [ - ("1", "Order confirmed"), - ("2", "Awaiting dispatch"), - ("3", "Dispatched, awaiting courier"), - ("4", "With courier, awaiting delivery"), - ("5", "Out for delivery"), - ("6", "Order delivered and fulfilled") -] - - -class Shipping(models.Model): - address = AddressField() - status = models.CharField(max_length=1, choices=STATUS_CHOICES) - - def __str__(self): - return self.status - - -class Parcel(models.Model): - products = models.ManyToManyField(Product) - shipping = Shipping - customer = get_user_model() - diff --git a/parcel/views.py b/parcel/views.py deleted file mode 100644 index a75be8c..0000000 --- a/parcel/views.py +++ /dev/null @@ -1,21 +0,0 @@ -from django.shortcuts import render -from django.views.generic import DetailView, ListView, CreateView - -from parcel.models import Product, Parcel - - -def home(request): - return render(request, "parcel/home.html") - - -class ProductDetailView(DetailView): - model = Product - - -class ParcelDetailView(DetailView): - model = Parcel - - -class ParcelCreateView(CreateView): - model = Parcel - fields = ["products", "shipping"] diff --git a/parcel/__init__.py b/products/__init__.py similarity index 100% rename from parcel/__init__.py rename to products/__init__.py diff --git a/parcel/admin.py b/products/admin.py similarity index 100% rename from parcel/admin.py rename to products/admin.py diff --git a/parcel/apps.py b/products/apps.py similarity index 84% rename from parcel/apps.py rename to products/apps.py index 46494c4..0c61eb8 100644 --- a/parcel/apps.py +++ b/products/apps.py @@ -3,4 +3,4 @@ class ParcelConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' - name = 'parcel' + name = 'products' diff --git a/parcel/migrations/__init__.py b/products/migrations/__init__.py similarity index 100% rename from parcel/migrations/__init__.py rename to products/migrations/__init__.py diff --git a/products/models.py b/products/models.py new file mode 100644 index 0000000..18d6bd1 --- /dev/null +++ b/products/models.py @@ -0,0 +1,35 @@ +from django.contrib.auth import get_user_model +from django.db import models +from django.urls import reverse +from address.models import AddressField # django-address + + +class Product(models.Model): + name = models.CharField(max_length=128) + desc = models.TextField(max_length=512) + # img # todo add through google cloud storage + price = models.FloatField() + + def get_absolute_url(self): + return reverse("product", kwargs={"pk": self.pk}) + + +class Order(models.Model): + STATUS_CHOICES = [ + ("1", "Order confirmed"), + ("2", "Awaiting dispatch"), + ("3", "Dispatched, awaiting courier"), + ("4", "With courier, awaiting delivery"), + ("5", "Out for delivery"), + ("6", "Order delivered and fulfilled") + ] + + product = Product + quantity = models.IntegerField() + address = AddressField() + status = models.CharField(default="1", max_length=1, choices=STATUS_CHOICES) + customer = get_user_model() + + def get_absolute_url(self): + return reverse("order", kwargs={"pk": self.pk}) + diff --git a/parcel/templates/parcel/base.html b/products/templates/products/base.html similarity index 97% rename from parcel/templates/parcel/base.html rename to products/templates/products/base.html index ee31c6a..f809b11 100644 --- a/parcel/templates/parcel/base.html +++ b/products/templates/products/base.html @@ -17,7 +17,6 @@ {# #} -{# #} diff --git a/parcel/templates/parcel/home.html b/products/templates/products/home.html similarity index 63% rename from parcel/templates/parcel/home.html rename to products/templates/products/home.html index 7acd6c2..99e964a 100644 --- a/parcel/templates/parcel/home.html +++ b/products/templates/products/home.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}

Hello world!

{% endblock %} \ No newline at end of file diff --git a/parcel/templates/parcel/parcel_detail.html b/products/templates/products/order_detail.html similarity index 90% rename from parcel/templates/parcel/parcel_detail.html rename to products/templates/products/order_detail.html index ee1f433..f0218f0 100644 --- a/parcel/templates/parcel/parcel_detail.html +++ b/products/templates/products/order_detail.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}

Order #{{ parcel.id }} · {{ parcel.shipping.status }}

Shipping details

diff --git a/parcel/templates/parcel/parcel_form.html b/products/templates/products/order_form.html similarity index 80% rename from parcel/templates/parcel/parcel_form.html rename to products/templates/products/order_form.html index 15a2b96..d183e13 100644 --- a/parcel/templates/parcel/parcel_form.html +++ b/products/templates/products/order_form.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %} {% csrf_token %} {{ form.as_p }} diff --git a/parcel/templates/parcel/product_detail.html b/products/templates/products/product_detail.html similarity index 73% rename from parcel/templates/parcel/product_detail.html rename to products/templates/products/product_detail.html index 9925a52..ed67d82 100644 --- a/parcel/templates/parcel/product_detail.html +++ b/products/templates/products/product_detail.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}

{{ product.name }}

{{ product.desc }}

diff --git a/parcel/tests.py b/products/tests.py similarity index 100% rename from parcel/tests.py rename to products/tests.py diff --git a/products/views.py b/products/views.py new file mode 100644 index 0000000..c3f5272 --- /dev/null +++ b/products/views.py @@ -0,0 +1,26 @@ +from django.contrib.auth.mixins import LoginRequiredMixin +from django.shortcuts import render +from django.views.generic import DetailView, ListView, CreateView + +from products.models import Product, Order + + +def home(request): + return render(request, "products/home.html") + + +class ProductDetailView(DetailView): + model = Product + + +class OrderDetailView(DetailView): + model = Order + + +class OrderCreateView(LoginRequiredMixin, CreateView): + model = Order + fields = ["product", "quantity", "address"] + + def form_valid(self, form): + form.instance.customer = self.request.user + return super().form_valid(form) diff --git a/users/templates/users/login.html b/users/templates/users/login.html index 57e7551..53fec7b 100644 --- a/users/templates/users/login.html +++ b/users/templates/users/login.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}
diff --git a/users/templates/users/logout.html b/users/templates/users/logout.html index 3cd3640..fe31020 100644 --- a/users/templates/users/logout.html +++ b/users/templates/users/logout.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}

You have been logged out

diff --git a/users/templates/users/password_change.html b/users/templates/users/password_change.html index b12a3b5..a88856d 100644 --- a/users/templates/users/password_change.html +++ b/users/templates/users/password_change.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% load crispy_forms_tags %} {% block content %}
diff --git a/users/templates/users/password_reset.html b/users/templates/users/password_reset.html index 882232d..9d0a670 100644 --- a/users/templates/users/password_reset.html +++ b/users/templates/users/password_reset.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}
diff --git a/users/templates/users/password_reset_complete.html b/users/templates/users/password_reset_complete.html index 92aed52..16c972a 100644 --- a/users/templates/users/password_reset_complete.html +++ b/users/templates/users/password_reset_complete.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}
Your password has been changed. diff --git a/users/templates/users/password_reset_confirm.html b/users/templates/users/password_reset_confirm.html index 2c90e78..9111c5e 100644 --- a/users/templates/users/password_reset_confirm.html +++ b/users/templates/users/password_reset_confirm.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}
diff --git a/users/templates/users/password_reset_done.html b/users/templates/users/password_reset_done.html index 2cf113b..47f94ce 100644 --- a/users/templates/users/password_reset_done.html +++ b/users/templates/users/password_reset_done.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}
An email has been with instructions to reset your password diff --git a/users/templates/users/profile.html b/users/templates/users/profile.html index c9eb3a6..a5d0ffa 100644 --- a/users/templates/users/profile.html +++ b/users/templates/users/profile.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}
diff --git a/users/templates/users/profile_deactivate_confirm.html b/users/templates/users/profile_deactivate_confirm.html index 0a2b8f2..e2788cb 100644 --- a/users/templates/users/profile_deactivate_confirm.html +++ b/users/templates/users/profile_deactivate_confirm.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% load crispy_forms_tags %} {% block content %} diff --git a/users/templates/users/register.html b/users/templates/users/register.html index 3b45b86..22b58c6 100644 --- a/users/templates/users/register.html +++ b/users/templates/users/register.html @@ -1,4 +1,4 @@ -{% extends "parcel/base.html" %} +{% extends "products/base.html" %} {% block content %}
From 5d85bd3cea7478c9a6849d680ffcb930b3d4d7fa Mon Sep 17 00:00:00 2001 From: Ferby Date: Wed, 15 Dec 2021 07:12:07 +0000 Subject: [PATCH 21/49] Integrate MongoDB, test firebase auth and register --- AdvancedDevelopment/settings.py | 18 +++++++---------- FirebaseAuth/migrations/__init__.py | 0 blog/migrations/__init__.py | 0 products/migrations/0001_initial.py | 31 +++++++++++++++++++++++++++++ products/models.py | 2 +- requirements.txt | 6 +++--- users/forms.py | 14 +++++++++++-- 7 files changed, 54 insertions(+), 17 deletions(-) delete mode 100644 FirebaseAuth/migrations/__init__.py delete mode 100644 blog/migrations/__init__.py create mode 100644 products/migrations/0001_initial.py diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index 2adb24a..d1a08b3 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -13,6 +13,7 @@ from pathlib import Path import firebase_admin from firebase_admin import credentials +import djongo # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -32,6 +33,7 @@ # Application definition INSTALLED_APPS = [ + 'address', 'products.apps.ParcelConfig', 'users.apps.UsersConfig', 'django.contrib.admin', @@ -40,7 +42,6 @@ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', - 'address', 'crispy_forms' ] @@ -79,16 +80,11 @@ # https://docs.djangoproject.com/en/3.2/ref/settings/#databases DATABASES = { - "default": { - "engine": "djongo", - # "name": "db-name" # todo change this - "enforce_schema": False, - "client": { - # todo hide this in secrets - "host": "mongodb+srv://s5124723:UJZ6xxtNrnYwSNWowyz8@advanceddevelopment.aiiro.mongodb.net/test?authSource=admin&replicaSet=atlas-xtge2j-shard-0&readPreference=primary&appname=MongoDB%20Compass&ssl=true" - } - } -} + 'default': { + 'ENGINE': 'djongo', + 'NAME': 'AdvancedDevelopment', + } + } # Password validation diff --git a/FirebaseAuth/migrations/__init__.py b/FirebaseAuth/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/blog/migrations/__init__.py b/blog/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/products/migrations/0001_initial.py b/products/migrations/0001_initial.py new file mode 100644 index 0000000..b37b4bc --- /dev/null +++ b/products/migrations/0001_initial.py @@ -0,0 +1,31 @@ +# Generated by Django 3.2.9 on 2021-12-15 04:25 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Order', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('quantity', models.IntegerField()), + ('status', models.CharField(choices=[('1', 'Order confirmed'), ('2', 'Awaiting dispatch'), ('3', 'Dispatched, awaiting courier'), ('4', 'With courier, awaiting delivery'), ('5', 'Out for delivery'), ('6', 'Order delivered and fulfilled')], default='1', max_length=1)), + ], + ), + migrations.CreateModel( + name='Product', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=128)), + ('desc', models.TextField(max_length=512)), + ('price', models.FloatField()), + ], + ), + ] diff --git a/products/models.py b/products/models.py index 18d6bd1..1db6001 100644 --- a/products/models.py +++ b/products/models.py @@ -26,7 +26,7 @@ class Order(models.Model): product = Product quantity = models.IntegerField() - address = AddressField() + # address = AddressField() # todo needs default value as migrations have been made status = models.CharField(default="1", max_length=1, choices=STATUS_CHOICES) customer = get_user_model() diff --git a/requirements.txt b/requirements.txt index b7be77a..62ff3fe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,11 +1,11 @@ asgiref==3.4.1 Django==3.2.9 dnspython==2.1.0 -pymongo==4.0 +pymongo==3.12.1 pytz==2021.3 -sqlparse==0.4.2 djangorestframework~=3.12.4 Pillow~=8.4.0 google-cloud-secret-manager==2.8.0 django-crispy-forms==1.13.0 -django-address==0.2.5 \ No newline at end of file +django-address==0.2.5 +djongo~=1.3.6 \ No newline at end of file diff --git a/users/forms.py b/users/forms.py index f38d490..324841f 100644 --- a/users/forms.py +++ b/users/forms.py @@ -13,12 +13,22 @@ class UserRegisterForm(UserCreationForm): """ email = forms.EmailField() + def __init__(self, post=None, *args, **kwargs): + if post is not None: + self._email = post["email"] + self._password = post["password2"] + # self._password = password2 + super().__init__(*args, **kwargs) + def save(self, *args, **kwargs): + print(f"{self._email}") + email = self._email + clean_password = self._password try: user = auth.create_user( - email=self.email, + email=email, email_verified=False, - password=self.clean_password2()) + password=clean_password) super().save(*args, **kwargs) print('Successfully created new user: {0}'.format(user.uid)) except ValidationError as error: From ea36e99445f5f8a57d791151138ae37b8d18ceea Mon Sep 17 00:00:00 2001 From: nerdferby Date: Thu, 16 Dec 2021 03:10:21 +0000 Subject: [PATCH 22/49] GCloud config --- main.py => AdvancedDevelopment/main.py | 0 app.yaml | 3 ++- requirements.txt | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) rename main.py => AdvancedDevelopment/main.py (100%) diff --git a/main.py b/AdvancedDevelopment/main.py similarity index 100% rename from main.py rename to AdvancedDevelopment/main.py diff --git a/app.yaml b/app.yaml index ca36be9..e500e18 100644 --- a/app.yaml +++ b/app.yaml @@ -1 +1,2 @@ -runtime: python39 \ No newline at end of file +runtime: python39 +entrypoint: gunicorn -b :$PORT AdvancedDevelopment.wsgi \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 62ff3fe..9965530 100644 --- a/requirements.txt +++ b/requirements.txt @@ -8,4 +8,5 @@ Pillow~=8.4.0 google-cloud-secret-manager==2.8.0 django-crispy-forms==1.13.0 django-address==0.2.5 -djongo~=1.3.6 \ No newline at end of file +djongo~=1.3.6 +sqlparse==0.2.4 \ No newline at end of file From 984d4622a6037f39e88bb118ff9aec48497de842 Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 16 Dec 2021 15:24:54 +0000 Subject: [PATCH 23/49] Move firebase auth from form to view --- AdvancedDevelopment/urls.py | 3 ++- FirebaseAuth/apps.py | 2 +- users/forms.py | 22 ---------------------- users/views.py | 24 ++++++++++++++++++++---- 4 files changed, 23 insertions(+), 28 deletions(-) diff --git a/AdvancedDevelopment/urls.py b/AdvancedDevelopment/urls.py index 0813d73..aed9d4e 100644 --- a/AdvancedDevelopment/urls.py +++ b/AdvancedDevelopment/urls.py @@ -23,7 +23,8 @@ from users.views import ProfileView, DeactivateUser urlpatterns = [ - path("", parcel_views.home, name="home"), + # path("", parcel_views.home, name="home"), + path("", user_views.register, name="home"), path("admin/", admin.site.urls), path("product//", ProductDetailView.as_view(), name="product"), path("order//", OrderDetailView.as_view(), name="order"), diff --git a/FirebaseAuth/apps.py b/FirebaseAuth/apps.py index 0aadd47..156f9f2 100644 --- a/FirebaseAuth/apps.py +++ b/FirebaseAuth/apps.py @@ -1,6 +1,6 @@ from django.apps import AppConfig -class FirebaseauthConfig(AppConfig): +class FirebaseAuthConfig(AppConfig): default_auto_field = 'django.db.models.BigAutoField' name = 'FirebaseAuth' diff --git a/users/forms.py b/users/forms.py index 324841f..0a01f8e 100644 --- a/users/forms.py +++ b/users/forms.py @@ -4,7 +4,6 @@ from django.core.exceptions import ValidationError from .models import Profile -from firebase_admin import auth class UserRegisterForm(UserCreationForm): @@ -13,27 +12,6 @@ class UserRegisterForm(UserCreationForm): """ email = forms.EmailField() - def __init__(self, post=None, *args, **kwargs): - if post is not None: - self._email = post["email"] - self._password = post["password2"] - # self._password = password2 - super().__init__(*args, **kwargs) - - def save(self, *args, **kwargs): - print(f"{self._email}") - email = self._email - clean_password = self._password - try: - user = auth.create_user( - email=email, - email_verified=False, - password=clean_password) - super().save(*args, **kwargs) - print('Successfully created new user: {0}'.format(user.uid)) - except ValidationError as error: - print(error.message) - class Meta: model = User fields = ["username", "email", "password1", "password2"] diff --git a/users/views.py b/users/views.py index ae60331..ccfbc31 100644 --- a/users/views.py +++ b/users/views.py @@ -4,6 +4,9 @@ from django.shortcuts import render, redirect from django.contrib.auth.decorators import login_required from django.views import View +from django.core.exceptions import ValidationError +from firebase_admin import auth + from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm @@ -15,11 +18,24 @@ def register(request): if request.method == "POST": form = UserRegisterForm(request.POST) if form.is_valid(): - form.save() - messages.success( - request, "Your account has been created! You can now log in." - ) + email = form.cleaned_data["email"] + password = form.cleaned_data["password2"] + username = form.cleaned_data["username"] + try: + user = auth.create_user( + email=email, + email_verified=False, + password=password) + print('Successfully created new user: {0}'.format(user.uid)) + form.save() + messages.success( + request, "Your account has been created! You can now log in." + ) + except ValidationError as error: + print(error.message) return redirect("login") + else: + messages.error(request, "something went wrong") else: form = UserRegisterForm() return render(request, "users/register.html", {"form": form}) From 1ee49864d4e8e2992d058b8aefae5d6d8133d4c9 Mon Sep 17 00:00:00 2001 From: nerdferby Date: Thu, 16 Dec 2021 19:28:49 +0000 Subject: [PATCH 24/49] Configure gunicorn and firebase_admin requirements --- requirements.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 9965530..79e9864 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,6 @@ google-cloud-secret-manager==2.8.0 django-crispy-forms==1.13.0 django-address==0.2.5 djongo~=1.3.6 -sqlparse==0.2.4 \ No newline at end of file +sqlparse==0.2.4 +gunicorn>=20.1.0 +firebase_admin>=5.1.0 \ No newline at end of file From 9651932bc03272ba022040fd3b79721d34b7f7f9 Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 16 Dec 2021 19:30:17 +0000 Subject: [PATCH 25/49] Resolve merge conflict --- AdvancedDevelopment/urls.py | 4 ++-- users/views.py | 37 ++++++++++++++++++++----------------- 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/AdvancedDevelopment/urls.py b/AdvancedDevelopment/urls.py index aed9d4e..8509e76 100644 --- a/AdvancedDevelopment/urls.py +++ b/AdvancedDevelopment/urls.py @@ -20,7 +20,7 @@ from products.views import ProductDetailView, OrderDetailView, OrderCreateView from users import views as user_views from products import views as parcel_views -from users.views import ProfileView, DeactivateUser +from users.views import ProfileView urlpatterns = [ # path("", parcel_views.home, name="home"), @@ -31,7 +31,7 @@ path("order/new/", OrderCreateView.as_view(), name="order-create"), path("register/", user_views.register, name="register"), path("profile/", ProfileView.as_view(), name="profile"), - path("profile/deactivate", DeactivateUser.as_view(), name="delete-profile"), + # path("profile/deactivate", DeactivateUser.as_view(), name="delete-profile"), path( "login/", auth_views.LoginView.as_view(template_name="users/login.html"), diff --git a/users/views.py b/users/views.py index ccfbc31..b72bd14 100644 --- a/users/views.py +++ b/users/views.py @@ -6,6 +6,7 @@ from django.views import View from django.core.exceptions import ValidationError from firebase_admin import auth +from firebase_admin.exceptions import PermissionDeniedError from .forms import UserRegisterForm, UserUpdateForm, ProfileUpdateForm @@ -33,6 +34,8 @@ def register(request): ) except ValidationError as error: print(error.message) + except PermissionDeniedError as error: + messages.error(request, error.cause) return redirect("login") else: messages.error(request, "something went wrong") @@ -41,23 +44,23 @@ def register(request): return render(request, "users/register.html", {"form": form}) -class DeactivateUser(View): - def get(self, request): - return render(request, "users/profile_deactivate_confirm.html") - - def post(self, request): - try: - user = User.objects.get(username=request.user.username) - user.is_active = False - user.save() - messages.success(request, f"Account {user.username} has been disabled!") - except User.DoesNotExist: - messages.error(request, "Account does not exist") - except Exception as e: - messages.error(request, e.message) - - # return render(request, "users/profile_deactivate_confirm.html", context=context) - return redirect("/") +# class DeactivateUser(View): +# def get(self, request): +# return render(request, "users/profile_deactivate_confirm.html") +# +# def post(self, request): +# try: +# user = User.objects.get(username=request.user.username) +# user.is_active = False +# user.save() +# messages.success(request, f"Account {user.username} has been disabled!") +# except User.DoesNotExist: +# messages.error(request, "Account does not exist") +# except Exception as e: +# messages.error(request, e.message) +# +# # return render(request, "users/profile_deactivate_confirm.html", context=context) +# return redirect("/") class ProfileView(LoginRequiredMixin, View): From 9999e0750e6716903fdb78fc927e64fc09607091 Mon Sep 17 00:00:00 2001 From: Ferby Date: Thu, 16 Dec 2021 19:49:19 +0000 Subject: [PATCH 26/49] Reconfigure BASE_DIR --- AdvancedDevelopment/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index d1a08b3..b88f9b0 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -16,7 +16,7 @@ import djongo # Build paths inside the project like this: os.path.join(BASE_DIR, ...) -BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) +BASE_DIR = os.path.dirname(os.path.dirname(__file__)) # Quick-start development settings - unsuitable for production # See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/ From ed2de76cd7148be760153ef4adb29f3691db01a1 Mon Sep 17 00:00:00 2001 From: nerdferby Date: Sun, 19 Dec 2021 22:43:20 +0000 Subject: [PATCH 27/49] Working firebase intgeration --- AdvancedDevelopment/settings.py | 17 ++++++++++++----- requirements.txt | 6 +++--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/AdvancedDevelopment/settings.py b/AdvancedDevelopment/settings.py index b88f9b0..62447ea 100644 --- a/AdvancedDevelopment/settings.py +++ b/AdvancedDevelopment/settings.py @@ -14,6 +14,8 @@ import firebase_admin from firebase_admin import credentials import djongo +import requests +from google.cloud import secretmanager # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(__file__)) @@ -27,7 +29,7 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -ALLOWED_HOSTS = ["localhost", "127.0.0.1", "advanced-development-333919.nw.r.appspot.com"] +ALLOWED_HOSTS = ["localhost", "127.0.0.1", "idyllic-kit-328813.ew.r.appspot.com"] # Application definition @@ -138,12 +140,17 @@ 'FirebaseAuth.authentication.FirebaseAuthentication', ] } -cred = credentials.Certificate(os.path.join(BASE_DIR, "secrets/advanced-development-333919-25398fb03356.json")) -firebase_admin.initialize_app(cred) # Specify your Google API key as environment variable GOOGLE_API_KEY # You may also specify it here, though be sure not to commit it to a repository # todo hide this in secrets -GOOGLE_API_KEY = 'AIzaSyBvikAKlkILoJTxKC5w0bgUAOOG_U8o4-U' # Specify your Google API key here -GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY', GOOGLE_API_KEY) +# GOOGLE_API_KEY = 'AIzaSyBvikAKlkILoJTxKC5w0bgUAOOG_U8o4-U' # Specify your Google API key here +# GOOGLE_API_KEY = os.environ.get('GOOGLE_API_KEY', GOOGLE_API_KEY) + +secrets = secretmanager.SecretManagerServiceClient() +# fixme fetches secret successfully as string, needs to be file path +# response = secrets.access_secret_version(name="projects/idyllic-kit-328813/secrets/Firebase_Admin_SDK/versions/2") +# cred = credentials.Certificate(response) +cred = credentials.Certificate(os.path.join(BASE_DIR, "firebase_admin_sdk.json")) +firebase_admin.initialize_app(cred) diff --git a/requirements.txt b/requirements.txt index 79e9864..e818425 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,10 +5,10 @@ pymongo==3.12.1 pytz==2021.3 djangorestframework~=3.12.4 Pillow~=8.4.0 -google-cloud-secret-manager==2.8.0 django-crispy-forms==1.13.0 django-address==0.2.5 djongo~=1.3.6 -sqlparse==0.2.4 +sqlparse>=0.2.4 gunicorn>=20.1.0 -firebase_admin>=5.1.0 \ No newline at end of file +firebase_admin>=5.1.0 +google-cloud-secret-manager>=2.8.0 \ No newline at end of file From 57ad72a5f9c94cdf3c16153bc34ceefc152277b9 Mon Sep 17 00:00:00 2001 From: Ferby Date: Mon, 20 Dec 2021 18:36:41 +0000 Subject: [PATCH 28/49] User Interface and bootstrap --- .idea/AdvancedDevelopment.iml | 3 + .idea/jsLibraryMappings.xml | 6 ++ AdvancedDevelopment/settings.py | 28 ++++--- AdvancedDevelopment/urls.py | 4 +- blog/admin.py | 3 - blog/apps.py | 6 -- blog/models.py | 3 - blog/tests.py | 3 - blog/views.py | 3 - .../static/css/styling.css | 0 products/templates/products/base.html | 82 +++++++++---------- products/templates/products/home.html | 11 +++ users/templates/users/register.html | 3 +- 13 files changed, 78 insertions(+), 77 deletions(-) create mode 100644 .idea/jsLibraryMappings.xml delete mode 100644 blog/admin.py delete mode 100644 blog/apps.py delete mode 100644 blog/models.py delete mode 100644 blog/tests.py delete mode 100644 blog/views.py rename blog/__init__.py => products/static/css/styling.css (100%) diff --git a/.idea/AdvancedDevelopment.iml b/.idea/AdvancedDevelopment.iml index 4423462..92e2238 100644 --- a/.idea/AdvancedDevelopment.iml +++ b/.idea/AdvancedDevelopment.iml @@ -18,6 +18,9 @@ + + +