Skip to content

Commit

Permalink
I had the wrong version. This should be more correct.
Browse files Browse the repository at this point in the history
  • Loading branch information
Z-inator committed Dec 8, 2020
1 parent 6e0213e commit 2802a59
Show file tree
Hide file tree
Showing 28 changed files with 235 additions and 869 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
'django.contrib.staticfiles',
'accounts',
'django_filters',

]

MIDDLEWARE = [
Expand Down Expand Up @@ -92,9 +91,6 @@
4 - Create database on AWS
5 - Connect to live AWS Database with PG admin & Django
'''

'''
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql',
Expand Down Expand Up @@ -192,4 +188,4 @@
</CORSRule>
</CORSConfiguration>
'''
'''
1 change: 0 additions & 1 deletion DjangoManagementAppClone/accounts/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,4 @@

admin.site.register(Customer)
admin.site.register(Product)
admin.site.register(Tag)
admin.site.register(Order)
3 changes: 0 additions & 3 deletions DjangoManagementAppClone/accounts/apps.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,3 @@

class AccountsConfig(AppConfig):
name = 'accounts'

def ready(self):
import accounts.signals
40 changes: 0 additions & 40 deletions DjangoManagementAppClone/accounts/decorators.py

This file was deleted.

14 changes: 5 additions & 9 deletions DjangoManagementAppClone/accounts/filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,8 @@
from .models import *

class OrderFilter(django_filters.FilterSet):
start_date = DateFilter(field_name="date_created", lookup_expr='gte')
end_date = DateFilter(field_name="date_created", lookup_expr='lte')
note = CharFilter(field_name='note', lookup_expr='icontains')


class Meta:
model = Order
fields = '__all__'
exclude = ['customer', 'date_created']
class Meta:
model = Order
fields = '__all__'
exclude = ['customer', 'date_created']

21 changes: 3 additions & 18 deletions DjangoManagementAppClone/accounts/forms.py
Original file line number Diff line number Diff line change
@@ -1,24 +1,9 @@
from django.forms import ModelForm
from django.contrib.auth.forms import UserCreationForm
from django.contrib.auth.models import User
from django import forms

from .models import *

class CustomerForm(ModelForm):
class Meta:
model = Customer
fields = '__all__'
exclude = ['user']

class OrderForm(ModelForm):
class Meta:
model = Order
fields = '__all__'


class CreateUserForm(UserCreationForm):
class Meta:
model = User
fields = ['username', 'email', 'password1', 'password2']

class Meta:
model = Order
fields = '__all__'
74 changes: 37 additions & 37 deletions DjangoManagementAppClone/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,51 @@
# Create your models here.

class Customer(models.Model):
user = models.OneToOneField(User, null=True, blank=True, on_delete=models.CASCADE)
name = models.CharField(max_length=200, null=True)
phone = models.CharField(max_length=200, null=True)
email = models.CharField(max_length=200, null=True)
profile_pic = models.ImageField(default="profile1.png", null=True, blank=True)
date_created = models.DateTimeField(auto_now_add=True, null=True)
user = models.OneToOneField(User, null=True, blank=True, on_delete=models.CASCADE)
name = models.CharField(max_length=200, null=True)
phone = models.CharField(max_length=200, null=True)
email = models.CharField(max_length=200, null=True)
profile_pic = models.ImageField(default="profile1.png", null=True, blank=True)
date_created = models.DateTimeField(auto_now_add=True, null=True)

def __str__(self):
return self.name
def __str__(self):
return self.name


class Tag(models.Model):
name = models.CharField(max_length=200, null=True)
name = models.CharField(max_length=200, null=True)

def __str__(self):
return self.name
def __str__(self):
return self.name

class Product(models.Model):
CATEGORY = (
('Indoor', 'Indoor'),
('Out Door', 'Out Door'),
)
CATEGORY = (
('Indoor', 'Indoor'),
('Out Door', 'Out Door'),
)

name = models.CharField(max_length=200, null=True)
price = models.FloatField(null=True)
category = models.CharField(max_length=200, null=True, choices=CATEGORY)
description = models.CharField(max_length=200, null=True, blank=True)
date_created = models.DateTimeField(auto_now_add=True, null=True)
tags = models.ManyToManyField(Tag)
name = models.CharField(max_length=200, null=True)
price = models.FloatField(null=True)
category = models.CharField(max_length=200, null=True, choices=CATEGORY)
description = models.CharField(max_length=200, null=True, blank=True)
date_created = models.DateTimeField(auto_now_add=True, null=True)
tags = models.ManyToManyField(Tag)

def __str__(self):
return self.name
def __str__(self):
return self.name

class Order(models.Model):
STATUS = (
('Pending', 'Pending'),
('Out for delivery', 'Out for delivery'),
('Delivered', 'Delivered'),
)

customer = models.ForeignKey(Customer, null=True, on_delete= models.SET_NULL)
product = models.ForeignKey(Product, null=True, on_delete= models.SET_NULL)
date_created = models.DateTimeField(auto_now_add=True, null=True)
status = models.CharField(max_length=200, null=True, choices=STATUS)
note = models.CharField(max_length=1000, null=True)

def __str__(self):
return self.product.name
STATUS = (
('Pending', 'Pending'),
('Out for delivery', 'Out for delivery'),
('Delivered', 'Delivered'),
)

customer = models.ForeignKey(Customer, null=True, on_delete= models.SET_NULL)
product = models.ForeignKey(Product, null=True, on_delete= models.SET_NULL)
date_created = models.DateTimeField(auto_now_add=True, null=True)
status = models.CharField(max_length=200, null=True, choices=STATUS)
note = models.CharField(max_length=1000, null=True)

def __str__(self):
return self.product.name
69 changes: 0 additions & 69 deletions DjangoManagementAppClone/accounts/queryDemos.py

This file was deleted.

18 changes: 0 additions & 18 deletions DjangoManagementAppClone/accounts/signals.py

This file was deleted.

This file was deleted.

Loading

0 comments on commit 2802a59

Please sign in to comment.