diff --git a/myproject/myapp/models.py b/myproject/myapp/models.py index 3921a6ba5ce7346b7124042e9add912e83544618..b8208e7a9976a067aa04bcd3a464dd3f9218e6c9 100644 --- a/myproject/myapp/models.py +++ b/myproject/myapp/models.py @@ -1,13 +1,13 @@ -from django.db import models +# from django.db import models -# Usertypes -# --------- -# 0 - Basic User -# 1 - Admin -# 2 - ML Engineer -# 3 - Accountant +# # Usertypes +# # --------- +# # 0 - Basic User +# # 1 - Admin +# # 2 - ML Engineer +# # 3 - Accountant -# Create your models here. +# # Create your models here. # class User(models.Model): # """ # * User model @@ -15,7 +15,7 @@ from django.db import models # username = models.CharField(max_length=150) # password = models.CharField(max_length=16) # email = models.EmailField(max_length=200) -# #usertype = models.ForeignKey("UserType") +# usertype = models.ForeignKey("UserType", on_delete=models.DO_NOTHING) # class UserType(models.Model): # """ @@ -23,19 +23,20 @@ from django.db import models # """ # usertype = models.CharField(max_length=15) + # class Logs(models.Model): # """ # * Logs model # """ -# content = models.CharField(max_length=2000) -# #user_id = models.ForeignKey("User") +# user_id = models.ForeignKey("User", on_delete=models.CASCADE) +# error_id = models.IntegerField() # date = models.DateTimeField() # class Feedback(models.Model): # """ # * Feedback Model # """ -# #user_id = models.ForeignKey("User") +# user_id = models.ForeignKey("User", on_delete=models.CASCADE) # content = models.CharField(max_length=2000) # date = models.DateTimeField() @@ -43,7 +44,17 @@ from django.db import models # """ # * Bill/receipts Model # """ -# #user_id = models.ForeignKey("User") +# user_id = models.ForeignKey("User", on_delete=models.CASCADE) # date = models.DateTimeField() # paid = models.BooleanField(default=False) + +# class Files(models.Model): +# """ +# * Uploaded files +# """ +# date = models.DateTimeField() +# data = models.CharField(max_length=2000) +# uploader = models.ForeignKey("User", on_delete=models.CASCADE) + + diff --git a/myproject/myapp/templates/_base.html b/myproject/myapp/templates/_base.html index ce00d7cbfec0f754119980890e7498d486a96efe..6a601ecad45602a64414dcf5eb8c49ca88c8631b 100644 --- a/myproject/myapp/templates/_base.html +++ b/myproject/myapp/templates/_base.html @@ -72,14 +72,14 @@ </li> <li> <a - href="#" + href="{% url 'pricing' %}" class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent" >Pricing</a > </li> <li> <a - href="{% url 'user' %}" + href="{% url 'users' %}" class="block py-2 px-3 text-gray-900 rounded hover:bg-gray-100 md:hover:bg-transparent md:border-0 md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent" >Dashboard</a > diff --git a/myproject/myapp/templates/pricing.html b/myproject/myapp/templates/pricing.html new file mode 100644 index 0000000000000000000000000000000000000000..cc7b60b27275a82b97ffbfdfa226a58dd58ce253 --- /dev/null +++ b/myproject/myapp/templates/pricing.html @@ -0,0 +1,3 @@ +{% extends "_base.html" %}{% block content %} +<h1>Pricing page</h1> +{% endblock content %} \ No newline at end of file diff --git a/myproject/myapp/urls.py b/myproject/myapp/urls.py index 3edce4a923e518be1ee8bb715f21e50e5a5fb38d..3580dadcbce8c54e96968963b43507604105855c 100644 --- a/myproject/myapp/urls.py +++ b/myproject/myapp/urls.py @@ -6,16 +6,17 @@ from .views import handler404 from .views import handler500 from .views import register from .views import login - +from .views import pricing urlpatterns = [ # path('', index, name='index'), <- uncomment when index/main page will be ready path('', index), - path('user/',users, name='user'), + path('user/', users, name='users'), path('404/', handler404), path('500/', handler500), path('maintenance/', maintenance), path('register/', register, name='register'), path('login/', login, name='login'), + path('pricing/', pricing, name='pricing') ] diff --git a/myproject/myapp/views.py b/myproject/myapp/views.py index 3c8d3d964e9d26260f88da816e6868bbb2cf6325..51acc362e4467509ec2ec3f6f3fd21bf810b491e 100644 --- a/myproject/myapp/views.py +++ b/myproject/myapp/views.py @@ -24,4 +24,7 @@ def login(request): return render(request, 'login.html') def register(request): - return render(request, 'register.html') \ No newline at end of file + return render(request, 'register.html') + +def pricing(request): + return render(request, 'pricing.html') \ No newline at end of file