| # | +Product | +Status | +Controls | +
|---|---|---|---|
| {{ order.id }} | +{{ order.product_name }} | +{{ order.status }} | +Cancel + +1 | +
Order #{{ order.id }} · {{ order.shipping.status }}
+Shipping details
+{{ order.shipping.status }}
+{{ order.shipping.address }}
+-
+ {% for product in parcel %}
+
- {{ product.name }} · £{{ product.price }} + {% endfor %} +
{{ product.name }}
+{{ product.desc }}
++ Order now +
+{% endblock %} \ No newline at end of file diff --git a/products/templates/products/product_form.html b/products/templates/products/product_form.html new file mode 100644 index 0000000..d183e13 --- /dev/null +++ b/products/templates/products/product_form.html @@ -0,0 +1,7 @@ +{% extends "products/base.html" %} +{% block content %} + +{% endblock %} \ No newline at end of file diff --git a/products/tests.py b/products/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/products/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/products/utils.py b/products/utils.py new file mode 100644 index 0000000..f8df90e --- /dev/null +++ b/products/utils.py @@ -0,0 +1,34 @@ +import random +import string + +from AdvancedDevelopment.firebase import FirebaseClient + + +def gen_ran(size=16): + """e.g. mqPssj5bbYDOSoy5""" + return ''.join([random.choice(string.ascii_letters + string.digits) for n in range(size)]) + + +def generate_id(client: FirebaseClient): + """Generate ID using gen_ran and rotate it until it's unique in the client""" + id_gen = gen_ran() + while client.get_by_id(id_gen) is not False: # if id is taken, find another until one is free + id_gen = gen_ran() + + return id_gen + + +def read_login_session(request): + try: + return request.session["login"] + except KeyError: + return "" + + +def logged_in(session_ref): + login = False + if session_ref: + get_user = FirebaseClient("users").get_by_id(session_ref) + if get_user: # if user is logged in + login = True + return login diff --git a/products/views.py b/products/views.py new file mode 100644 index 0000000..f0c8fa3 --- /dev/null +++ b/products/views.py @@ -0,0 +1,154 @@ +from django.contrib import messages +from django.http import HttpResponseNotFound +from django.shortcuts import render, redirect +from django.views.generic import CreateView + +import users.views +from AdvancedDevelopment.firebase import FirebaseClient +from products.models import Product +from .utils import generate_id, read_login_session, logged_in + +client_products = FirebaseClient("products") + +ORDER_STATUS_TEXT = [ + ("1", "Order pending"), + ("2", "Order confirmed, awaiting dispatch"), + ("3", "Dispatched, awaiting courier"), + ("4", "With courier, awaiting delivery"), + ("5", "Out for delivery"), + ("6", "Order delivered and fulfilled") +] + + +def home(request): + """Renders homepage. Context: all products (obj) and if user logged-in (bool)""" + # session = request.session["login"] + session = read_login_session(request) + auth = logged_in(session) + + all_products = client_products.all() + return render(request, "products/home.html", {"products": all_products, + "logged_in": auth}) + + +class ProductCreateView(CreateView): + model = Product + fields = ["name", "desc"] + + +def product_detail_view(request, pk): + product_doc = client_products.get_by_id(pk) + + if product_doc is not False: + return render(request, "products/product_detail.html", {"product": product_doc}) + else: + return HttpResponseNotFound('Page not found
') + + +def progress_order(request, pk): + """ + Progresses an order's status, e.g. dispatch to delivery + :param request + :param pk: Order ID + :return: Redirects to login page if not logged in, otherwise to My Orders + """ + session = read_login_session(request) + auth = logged_in(session) + if not auth: # redirect non-logged-in to login page + return redirect(users.views.login) + + client_orders = FirebaseClient("orders") + order_ref = client_orders.get_by_id(pk) + + status = int(order_ref["status"]) + 1 + new_data = order_ref + new_data["status"] = status + client_orders.update(pk, new_data) + messages.success(request, "Order progressed to: " + str(status)) + return redirect(my_orders) + + +def my_orders(request): + """ + My Orders page for logged in user, containing all pending orders and their status + :param request + :return: Redirects to login if user not logged in, to my orders if logged in + """ + session = read_login_session(request) + auth = logged_in(session) + get_user = FirebaseClient("users").get_by_id(session) + if not auth: + return redirect(users.views.login) + else: + all_my_orders = FirebaseClient("orders").filter("uid", "==", get_user["username"]) # find all orders for user + all_products = FirebaseClient("products").all() + admin = False + if get_user["username"] == "admin": + admin = True + for _order in all_my_orders: + try: + _order["status"] = ORDER_STATUS_TEXT[_order["status"]][1] # change status enum to text + except IndexError: + _order["status"] = ORDER_STATUS_TEXT[5][1] + context = {"my_orders": all_my_orders, + "products": all_products, + "admin": admin} + return render(request, "products/my_orders.html", context) + + +# def order_detail_view(request, pk): +# order = FirebaseClient("orders").get_by_id(pk) +# return render(request, "products/order_detail.html") + + +def cancel_order(request, pk): + """ + Cancels an order and removes it from the db, requires logged-in user + :param request: + :param pk: Order ID + :return: Redirects to home if not logged-in, to my orders if logged in + """ + client = FirebaseClient("orders") + order = client.get_by_id(pk) + session = read_login_session(request) + auth = logged_in(session) + + if not auth: # if not logged-in, redirect to login + return redirect(users.views.login) + else: + get_user = FirebaseClient("users").get_by_id(session) + if order["uid"] != get_user["username"]: # checks if order matches to logged-in user + return redirect(home) + else: # delete order + client.delete_by_id(pk) # delete order from db + messages.success(request, "Order successfully cancelled") + return redirect(my_orders) + + +def order(request, pk): + """ + Place order, add to db, requires user logged-in + :param request: + :param pk: Product ID + :return: + """ + session = read_login_session(request) + auth = logged_in(session) + + if auth: # if user is logged-in + user_ref = FirebaseClient("users").get_by_id(session) # get user info + product_doc = client_products.get_by_id(pk) # product + if not product_doc: # if product doesn't exist, redirect to home + return redirect(home) + client_orders = FirebaseClient("orders") + gen_id = generate_id(client_orders) # generate order id + address = f"{user_ref['address1']} {user_ref['address2']} {user_ref['address3']} {user_ref['post_code']}" + data = {"uid": user_ref["id"], "id": gen_id, + "status": 0, "address": address, + "product_name": client_products.get_by_id(pk)["name"]} + client_orders.create(document=gen_id, data=data) # create order in db + messages.success(request, f"{product_doc['name']} successfully ordered!") + return redirect(my_orders) + else: + session = request.session["login"] + raise Exception("User not found") diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..e818425 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,14 @@ +asgiref==3.4.1 +Django==3.2.9 +dnspython==2.1.0 +pymongo==3.12.1 +pytz==2021.3 +djangorestframework~=3.12.4 +Pillow~=8.4.0 +django-crispy-forms==1.13.0 +django-address==0.2.5 +djongo~=1.3.6 +sqlparse>=0.2.4 +gunicorn>=20.1.0 +firebase_admin>=5.1.0 +google-cloud-secret-manager>=2.8.0 \ 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/users/admin.py b/users/admin.py new file mode 100644 index 0000000..dd57fa2 --- /dev/null +++ b/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/users/apps.py b/users/apps.py new file mode 100644 index 0000000..1322ac9 --- /dev/null +++ b/users/apps.py @@ -0,0 +1,8 @@ +from django.apps import AppConfig + + +class UsersConfig(AppConfig): + name = "users" + + def ready(self): + import users.signals diff --git a/users/forms.py b/users/forms.py new file mode 100644 index 0000000..62e0c3b --- /dev/null +++ b/users/forms.py @@ -0,0 +1,61 @@ +from django import forms +from django.contrib.auth import password_validation +from django.contrib.auth.models import User + +from .models import Profile + + +class CustomLoginForm(forms.Form): + email = forms.EmailField() + password1 = forms.CharField( + label="Password", + strip=False, + widget=forms.PasswordInput(attrs={'autocomplete': 'new-password'}), + ) + + class Meta: + fields = ["email", "password1"] + + +class UserRegisterForm(forms.Form): + """ + Registers the user through django and firebase + """ + username = forms.CharField(max_length=64) + email = forms.EmailField() + password1 = forms.CharField( + label="Password", + strip=False, + widget=forms.PasswordInput(attrs={'autocomplete': 'new-password'}), + help_text=password_validation.password_validators_help_text_html(), + ) + password2 = forms.CharField( + label="Password confirmation", + widget=forms.PasswordInput(attrs={'autocomplete': 'new-password'}), + strip=False, + help_text="Enter the same password as before, for verification.", + ) + address1 = forms.CharField(max_length=128, label="Address line 1") + address2 = forms.CharField(max_length=128, required=False, label="Address line 2") + address3 = forms.CharField(max_length=128, required=False, label="Address line 3") + post_code = forms.CharField(max_length=128, label="Postal code") + + def save(self): + pass + + class Meta: + 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/users/migrations/0001_initial.py b/users/migrations/0001_initial.py new file mode 100644 index 0000000..7b4d633 --- /dev/null +++ b/users/migrations/0001_initial.py @@ -0,0 +1,26 @@ +# Generated by Django 3.2.9 on 2021-12-20 23:54 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Profile', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('avatar', models.ImageField(default='default.jpg', upload_to='profile_pics')), + ('karma', models.IntegerField(default=0)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/users/migrations/__init__.py b/users/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/users/models.py b/users/models.py new file mode 100644 index 0000000..fd80ae5 --- /dev/null +++ b/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/users/signals.py b/users/signals.py new file mode 100644 index 0000000..299e44a --- /dev/null +++ b/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/users/templates/users/login.html b/users/templates/users/login.html new file mode 100644 index 0000000..53fec7b --- /dev/null +++ b/users/templates/users/login.html @@ -0,0 +1,27 @@ +{% extends "products/base.html" %} +{% block content %} +
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/logout.html b/users/templates/users/logout.html
new file mode 100644
index 0000000..fe31020
--- /dev/null
+++ b/users/templates/users/logout.html
@@ -0,0 +1,9 @@
+{% extends "products/base.html" %}
+{% block content %}
+
+
+ Need an account? Register instead.
+
+
+ You have been logged out
+
+
+ Log in again.
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/password_change.html b/users/templates/users/password_change.html
new file mode 100644
index 0000000..a88856d
--- /dev/null
+++ b/users/templates/users/password_change.html
@@ -0,0 +1,20 @@
+{% extends "products/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/password_reset.html b/users/templates/users/password_reset.html
new file mode 100644
index 0000000..9d0a670
--- /dev/null
+++ b/users/templates/users/password_reset.html
@@ -0,0 +1,19 @@
+{% extends "products/base.html" %}
+{% block content %}
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/password_reset_complete.html b/users/templates/users/password_reset_complete.html
new file mode 100644
index 0000000..16c972a
--- /dev/null
+++ b/users/templates/users/password_reset_complete.html
@@ -0,0 +1,7 @@
+{% extends "products/base.html" %}
+{% block content %}
+
+ Your password has been changed.
+
+ Sign in again
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/password_reset_confirm.html b/users/templates/users/password_reset_confirm.html
new file mode 100644
index 0000000..9111c5e
--- /dev/null
+++ b/users/templates/users/password_reset_confirm.html
@@ -0,0 +1,19 @@
+{% extends "products/base.html" %}
+{% block content %}
+
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/password_reset_done.html b/users/templates/users/password_reset_done.html
new file mode 100644
index 0000000..47f94ce
--- /dev/null
+++ b/users/templates/users/password_reset_done.html
@@ -0,0 +1,6 @@
+{% extends "products/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/users/templates/users/profile.html b/users/templates/users/profile.html
new file mode 100644
index 0000000..a5d0ffa
--- /dev/null
+++ b/users/templates/users/profile.html
@@ -0,0 +1,45 @@
+{% extends "products/base.html" %}
+{% block content %}
+
+
+{% endblock content %}
\ No newline at end of file
diff --git a/users/templates/users/profile_deactivate_confirm.html b/users/templates/users/profile_deactivate_confirm.html
new file mode 100644
index 0000000..e2788cb
--- /dev/null
+++ b/users/templates/users/profile_deactivate_confirm.html
@@ -0,0 +1,11 @@
+{% extends "products/base.html" %}
+{% load crispy_forms_tags %}
+
+{% block content %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/users/templates/users/register.html b/users/templates/users/register.html
new file mode 100644
index 0000000..b91ba94
--- /dev/null
+++ b/users/templates/users/register.html
@@ -0,0 +1,25 @@
+{% extends "products/base.html" %}
+{% load crispy_forms_tags %}
+{% block content %}
+
+ 
+
+ {% if ban %}
+
+
+
+ {{ user.username }}
+{{ user.email }}
+
+
+ {% endif %}
+
+ 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 %} +
+
+
+{% endblock content %}
\ No newline at end of file
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/users/views.py b/users/views.py
new file mode 100644
index 0000000..5b86db8
--- /dev/null
+++ b/users/views.py
@@ -0,0 +1,75 @@
+from django.contrib import messages
+from django.shortcuts import render, redirect
+
+from AdvancedDevelopment.firebase import FirebaseClient
+from .forms import UserRegisterForm, CustomLoginForm
+
+
+def register(request):
+ """Registration page, any user can access"""
+ if request.method == "POST":
+ form = UserRegisterForm(request.POST)
+ if form.is_valid():
+ data = form.cleaned_data
+ firebase = FirebaseClient("users")
+ firebase.create(document=str(data["username"]), data=data)
+ messages.success(
+ request, f"Successfully registered {data['username']}! You may now login"
+ )
+ else:
+ form = UserRegisterForm()
+ return render(request, "users/register.html", {"form": form})
+
+
+def _login_validation(firebase_client: FirebaseClient, form: CustomLoginForm):
+ """
+ Checks the entered login details against the database user records
+ :param firebase_client: Firebase client connecting to users collection
+ :param form: the custom login form containing login information
+ :return: if password entered matches stored password, the result of the query to find the user
+ """
+ if form.is_valid():
+ query = firebase_client.filter("email", "==", form.cleaned_data["email"])
+ user_found = False
+ try:
+ user_found = query[0]
+ except IndexError: # Invalid login, user does not exist
+ return False, user_found
+ password_match = user_found["password2"] == form.cleaned_data["password1"]
+ return password_match, user_found
+ else:
+ return False, False
+
+
+def login(request):
+ """Login page, any user can access but warning displays"""
+ try:
+ messages.warning(request, f"You are already logged in as, {request.session['login']}")
+ except KeyError:
+ pass
+ if request.method == "POST":
+ form = CustomLoginForm(request.POST)
+ if form.is_valid():
+ client = FirebaseClient("users")
+ password_match, user_found = _login_validation(client, form)
+ if password_match:
+ request.session["login"] = user_found["username"]
+ messages.success(request, f"Successful login as, {form.cleaned_data['email']}")
+ else:
+ messages.error(request, "You have entered the wrong login credentials!")
+ else:
+ messages.error(request, "Failed to login!")
+ else:
+ form = CustomLoginForm()
+ return render(request, "users/login.html", {"form": form})
+
+
+def logout(request):
+ """Logs the user out and redirects them to login page"""
+ session: str
+ try:
+ request.session.pop("login")
+ messages.success(request, "You have been successfully logged out")
+ return redirect(login)
+ except KeyError: # user is not logged in, redirect to login page
+ return redirect(login)
+
+ Already registered? Sign in instead.
+
+
+