diff --git a/app/urls.py b/app/urls.py
index a194d07..2ff65c2 100644
--- a/app/urls.py
+++ b/app/urls.py
@@ -16,7 +16,7 @@ Including another URLconf
from django.contrib import admin
from django.urls import include, path
-from core.views import Home, Profile, Signup
+from core.views import Drilldown, Home, Profile, Signup
urlpatterns = [
path("", Home.as_view(), name="home"),
@@ -24,4 +24,5 @@ urlpatterns = [
path("admin/", admin.site.urls),
path("accounts/", include("django.contrib.auth.urls")),
path("accounts/signup/", Signup.as_view(), name="signup"),
+ path("ui/drilldown/", Drilldown.as_view(), name="drilldown"),
]
diff --git a/core/admin.py b/core/admin.py
index 905eff4..efc893c 100644
--- a/core/admin.py
+++ b/core/admin.py
@@ -2,7 +2,7 @@ from django.contrib import admin
from django.contrib.auth.admin import UserAdmin
from .forms import CustomUserCreationForm
-from .models import Product, User
+from .models import Plan, User
# Register your models here.
@@ -36,4 +36,4 @@ class CustomUserAdmin(UserAdmin):
admin.site.register(User, CustomUserAdmin)
-admin.site.register(Product)
+admin.site.register(Plan)
diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py
index fdeb481..957f785 100644
--- a/core/migrations/0001_initial.py
+++ b/core/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 4.0.6 on 2022-07-05 12:45
+# Generated by Django 4.0.6 on 2022-07-05 15:55
import django.contrib.auth.models
import django.contrib.auth.validators
@@ -11,147 +11,51 @@ class Migration(migrations.Migration):
initial = True
dependencies = [
- ("auth", "0012_alter_user_first_name_max_length"),
+ ('auth', '0012_alter_user_first_name_max_length'),
]
operations = [
migrations.CreateModel(
- name="Product",
+ name='Plan',
fields=[
- (
- "id",
- models.BigAutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name="ID",
- ),
- ),
- ("name", models.CharField(max_length=255)),
- ("description", models.CharField(max_length=1024, null=True)),
- ("cost", models.IntegerField()),
- ("product_id", models.UUIDField(null=True)),
- ("image", models.CharField(max_length=1024, null=True)),
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=255, unique=True)),
+ ('description', models.CharField(blank=True, max_length=1024, null=True)),
+ ('cost', models.IntegerField()),
+ ('product_id', models.UUIDField(blank=True, null=True)),
+ ('image', models.CharField(blank=True, max_length=1024, null=True)),
],
),
migrations.CreateModel(
- name="User",
+ name='User',
fields=[
- (
- "id",
- models.BigAutoField(
- auto_created=True,
- primary_key=True,
- serialize=False,
- verbose_name="ID",
- ),
- ),
- ("password", models.CharField(max_length=128, verbose_name="password")),
- (
- "last_login",
- models.DateTimeField(
- blank=True, null=True, verbose_name="last login"
- ),
- ),
- (
- "is_superuser",
- models.BooleanField(
- default=False,
- help_text="Designates that this user has all permissions without explicitly assigning them.",
- verbose_name="superuser status",
- ),
- ),
- (
- "username",
- models.CharField(
- error_messages={
- "unique": "A user with that username already exists."
- },
- help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
- max_length=150,
- unique=True,
- validators=[
- django.contrib.auth.validators.UnicodeUsernameValidator()
- ],
- verbose_name="username",
- ),
- ),
- (
- "first_name",
- models.CharField(
- blank=True, max_length=150, verbose_name="first name"
- ),
- ),
- (
- "last_name",
- models.CharField(
- blank=True, max_length=150, verbose_name="last name"
- ),
- ),
- (
- "email",
- models.EmailField(
- blank=True, max_length=254, verbose_name="email address"
- ),
- ),
- (
- "is_staff",
- models.BooleanField(
- default=False,
- help_text="Designates whether the user can log into this admin site.",
- verbose_name="staff status",
- ),
- ),
- (
- "is_active",
- models.BooleanField(
- default=True,
- help_text="Designates whether this user should be treated as active. Unselect this instead of deleting accounts.",
- verbose_name="active",
- ),
- ),
- (
- "date_joined",
- models.DateTimeField(
- default=django.utils.timezone.now, verbose_name="date joined"
- ),
- ),
- ("stripe_id", models.CharField(max_length=255, null=True)),
- ("subscription_id", models.CharField(max_length=255, null=True)),
- ("subscription_active", models.BooleanField(null=True)),
- ("last_payment", models.DateTimeField(null=True)),
- ("paid", models.BooleanField(null=True)),
- (
- "groups",
- models.ManyToManyField(
- blank=True,
- help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
- related_name="user_set",
- related_query_name="user",
- to="auth.group",
- verbose_name="groups",
- ),
- ),
- ("plans", models.ManyToManyField(to="core.product")),
- (
- "user_permissions",
- models.ManyToManyField(
- blank=True,
- help_text="Specific permissions for this user.",
- related_name="user_set",
- related_query_name="user",
- to="auth.permission",
- verbose_name="user permissions",
- ),
- ),
+ ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('password', models.CharField(max_length=128, verbose_name='password')),
+ ('last_login', models.DateTimeField(blank=True, null=True, verbose_name='last login')),
+ ('is_superuser', models.BooleanField(default=False, help_text='Designates that this user has all permissions without explicitly assigning them.', verbose_name='superuser status')),
+ ('username', models.CharField(error_messages={'unique': 'A user with that username already exists.'}, help_text='Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.', max_length=150, unique=True, validators=[django.contrib.auth.validators.UnicodeUsernameValidator()], verbose_name='username')),
+ ('first_name', models.CharField(blank=True, max_length=150, verbose_name='first name')),
+ ('last_name', models.CharField(blank=True, max_length=150, verbose_name='last name')),
+ ('email', models.EmailField(blank=True, max_length=254, verbose_name='email address')),
+ ('is_staff', models.BooleanField(default=False, help_text='Designates whether the user can log into this admin site.', verbose_name='staff status')),
+ ('is_active', models.BooleanField(default=True, help_text='Designates whether this user should be treated as active. Unselect this instead of deleting accounts.', verbose_name='active')),
+ ('date_joined', models.DateTimeField(default=django.utils.timezone.now, verbose_name='date joined')),
+ ('stripe_id', models.CharField(blank=True, max_length=255, null=True)),
+ ('subscription_id', models.CharField(blank=True, max_length=255, null=True)),
+ ('subscription_active', models.BooleanField(blank=True, null=True)),
+ ('last_payment', models.DateTimeField(blank=True, null=True)),
+ ('paid', models.BooleanField(blank=True, null=True)),
+ ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
+ ('plans', models.ManyToManyField(blank=True, to='core.plan')),
+ ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
],
options={
- "verbose_name": "user",
- "verbose_name_plural": "users",
- "abstract": False,
+ 'verbose_name': 'user',
+ 'verbose_name_plural': 'users',
+ 'abstract': False,
},
managers=[
- ("objects", django.contrib.auth.models.UserManager()),
+ ('objects', django.contrib.auth.models.UserManager()),
],
),
]
diff --git a/core/models.py b/core/models.py
index f938102..4cdf95b 100644
--- a/core/models.py
+++ b/core/models.py
@@ -4,12 +4,12 @@ from django.db import models
# Create your models here.
-class Product(models.Model):
- name = models.CharField(max_length=255)
- description = models.CharField(max_length=1024)
+class Plan(models.Model):
+ name = models.CharField(max_length=255, unique=True)
+ description = models.CharField(max_length=1024, null=True, blank=True)
cost = models.IntegerField()
- product_id = models.UUIDField(blank=True)
- image = models.CharField(max_length=1024, blank=True)
+ product_id = models.UUIDField(null=True, blank=True)
+ image = models.CharField(max_length=1024, null=True, blank=True)
def __str__(self):
return f"{self.name} (£{self.cost})"
@@ -17,12 +17,12 @@ class Product(models.Model):
class User(AbstractUser):
# Stripe customer ID
- stripe_id = models.CharField(max_length=255, blank=True)
- subscription_id = models.CharField(max_length=255, blank=True)
- subscription_active = models.BooleanField(blank=True)
- last_payment = models.DateTimeField(blank=True)
- paid = models.BooleanField(blank=True)
- plans = models.ManyToManyField(Product, blank=True)
+ stripe_id = models.CharField(max_length=255, null=True, blank=True)
+ subscription_id = models.CharField(max_length=255, null=True, blank=True)
+ subscription_active = models.BooleanField(null=True, blank=True)
+ last_payment = models.DateTimeField(null=True, blank=True)
+ paid = models.BooleanField(null=True, blank=True)
+ plans = models.ManyToManyField(Plan, blank=True)
def has_plan(self, plan):
plan_list = [plan.name for plan in self.plans.all()]
diff --git a/core/templates/base.html b/core/templates/base.html
index 16861b6..c8c6ed8 100644
--- a/core/templates/base.html
+++ b/core/templates/base.html
@@ -4,9 +4,9 @@
-
+ s
- Pathogen - Login
+ Pathogen - {{ request.path_info }}
diff --git a/core/templates/denied.html b/core/templates/denied.html
new file mode 100644
index 0000000..66d3e01
--- /dev/null
+++ b/core/templates/denied.html
@@ -0,0 +1,18 @@
+{% extends "base.html" %}
+
+{% block content %}
+
+ Access denied
+
+
+ Sorry, you do not have the necessary permissions to view this page.
+
+
+ {% if user.subscription_active %}
+ {% include 'checkout.html' %}
+ {% else %}
+
Please setup a payment mandate in the profile page to view products
+ {% endif %}
+
+
+{% endblock %}
diff --git a/core/views.py b/core/views.py
index 1185288..d5e8ce8 100644
--- a/core/views.py
+++ b/core/views.py
@@ -9,7 +9,16 @@ from core.forms import NewUserForm
# Create your views here
-class Home(LoginRequiredMixin, View):
+class Drilldown(LoginRequiredMixin, View):
+ template_name = "ui/drilldown.html"
+
+ def get(self, request, *args, **kwargs):
+ if not request.user.has_plan("drilldown"):
+ return render(request, "denied.html")
+ return render(request, self.template_name)
+
+
+class Home(View):
template_name = "index.html"
def get(self, request, *args, **kwargs):