Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified .DS_Store
Binary file not shown.
Binary file modified Backend/momment/accounts/__pycache__/models.cpython-39.pyc
Binary file not shown.
Binary file modified Backend/momment/accounts/__pycache__/views.cpython-39.pyc
Binary file not shown.
6 changes: 3 additions & 3 deletions Backend/momment/accounts/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.13 on 2023-01-06 07:00
# Generated by Django 3.2.13 on 2023-01-19 16:21

from django.db import migrations, models
import django.db.models.manager
Expand All @@ -16,11 +16,11 @@ class Migration(migrations.Migration):
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')),
('email', models.EmailField(max_length=60, unique=True, verbose_name='ID')),
('password', models.CharField(max_length=20)),
('name', models.CharField(max_length=20)),
('digit', models.CharField(max_length=11)),
('birth', models.DateField(verbose_name='생년월일')),
('birth', models.DateField(null=True, verbose_name='생년월일')),
('address', models.CharField(max_length=80)),
('is_admin', models.BooleanField(default=False)),
('is_active', models.BooleanField(default=True)),
Expand Down
18 changes: 18 additions & 0 deletions Backend/momment/accounts/migrations/0002_alter_user_birth.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.13 on 2023-01-19 16:23

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('accounts', '0001_initial'),
]

operations = [
migrations.AlterField(
model_name='user',
name='birth',
field=models.DateField(blank=True, null=True, verbose_name='생년월일'),
),
]
23 changes: 0 additions & 23 deletions Backend/momment/accounts/migrations/0002_auto_20230111_1443.py

This file was deleted.

18 changes: 18 additions & 0 deletions Backend/momment/accounts/migrations/0003_alter_user_managers.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# Generated by Django 3.2.13 on 2023-01-19 16:25

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('accounts', '0002_alter_user_birth'),
]

operations = [
migrations.AlterModelManagers(
name='user',
managers=[
],
),
]
Binary file not shown.
4 changes: 2 additions & 2 deletions Backend/momment/accounts/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class User(AbstractBaseUser):
email = models.EmailField(verbose_name='ID', max_length=60, unique=True, null=False, blank=False)
name = models.CharField(max_length=20, null=False, blank=False)
digit = models.CharField(max_length=11)
birth = models.DateField(verbose_name="생년월일", null=True)
birth = models.DateField(verbose_name="생년월일", null=True, blank=True)
address = models.CharField(max_length=80)
is_admin = models.BooleanField(default=False)
is_active = models.BooleanField(default=True)
Expand All @@ -48,7 +48,7 @@ class User(AbstractBaseUser):
create_at = models.DateTimeField(verbose_name='date joined', auto_now_add=True)
last_login = models.DateTimeField(verbose_name='last login', auto_now=True)

object = Account()
objects = Account()

USERNAME_FIELD = 'email'
REQUIRED_FIELDS = ['name', 'digit', 'address', 'birth']
Expand Down
10 changes: 6 additions & 4 deletions Backend/momment/accounts/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def signup(request):
birth = data['birth']
address = data['address']

if User.object.filter(email=email).exists():
if User.objects.filter(email=email).exists():
return JsonResponse({'message' : 'ALREADY_EXIST'}, status = 400)

regex_email = '^[a-zA-Z0-9+-_.]+@[a-zA-Z0-9_-]+\.[a-zA-Z0-9-.]+$'
Expand All @@ -47,7 +47,7 @@ def signup(request):
if not re.match(regex_password, password):
return JsonResponse({'message' : 'INVALID_PASSWORD'}, status = 400)

user = User.object.create_user(email=email, password=password, name=name, digit=digit, birth=birth, address=address)
user = User.objects.create_user(email=email, password=password, name=name, digit=digit, birth=birth, address=address)

token = Token.objects.create(user=user)
return JsonResponse({'message' : 'SUCCESS', 'token' : token.key}, status=200)
Expand All @@ -63,14 +63,16 @@ def login(request):
email = data['email']
password = data['password']

user = User.object.filter(email=email)
user = User.objects.filter(email=email)

if not check_password(password, user.get().password):
return JsonResponse({'message' : 'WRONG_PASSWORD'})

token = Token.objects.get(user=user.get())

is_seller = user.get().is_staff

return JsonResponse({'message' : 'LOGIN_SUCCESS', 'token' : token.key}, status=200)
return JsonResponse({'message' : 'LOGIN_SUCCESS', 'token' : token.key, 'is_seller' : is_seller}, status=200)
except:
return JsonResponse({'message' : 'LOGIN_FAILED'})

Expand Down
Empty file.
15 changes: 15 additions & 0 deletions Backend/momment/cake/admin.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from django.contrib import admin
from .models import *

class CakeAdmin(admin.ModelAdmin):
# 관리자 화면에 보여질 칼럼 지정
list_display = ('name', 'store', 'price')
search_fields = ()
readonly_fields = ()

filter_horizontal = ()
list_filter = ()
fieldsets = ()
ordering = ()

admin.site.register(Cake, CakeAdmin)
6 changes: 6 additions & 0 deletions Backend/momment/cake/apps.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
from django.apps import AppConfig


class CakeConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField'
name = 'cake'
124 changes: 124 additions & 0 deletions Backend/momment/cake/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
# Generated by Django 3.2.13 on 2023-01-19 16:21

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

initial = True

dependencies = [
('store', '0001_initial'),
]

operations = [
migrations.CreateModel(
name='Cake',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.CharField(max_length=40)),
('price', models.IntegerField()),
('store', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='store.store')),
],
),
migrations.CreateModel(
name='CakeSize',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('size', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakeSideDeco',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('side_deco', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakePicture',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('picture', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakePackage',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('package', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakeLettering',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('lettering', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakeFont',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('font', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakeFlavor',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('flavor', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakeDesign',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('design', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakeDeco',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('deco', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakeColor',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('color', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
migrations.CreateModel(
name='CakeCandle',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('candle', models.CharField(max_length=40)),
('price', models.IntegerField()),
('cake', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='cake.cake')),
],
),
]
Empty file.
78 changes: 78 additions & 0 deletions Backend/momment/cake/models.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
from django.db import models
from store.models import Store
# Create your models here.

class Cake(models.Model):
name = models.CharField(max_length=40)
price = models.IntegerField()
store = models.ForeignKey(Store, on_delete=models.CASCADE)

class CakeSize(models.Model):
size = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakeFlavor(models.Model):
flavor = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakeColor(models.Model):
color = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakeDesign(models.Model):
design = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakeSideDeco(models.Model):
side_deco = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakeDeco(models.Model):
deco = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakeLettering(models.Model):
lettering = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakeFont(models.Model):
font = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakePicture(models.Model):
picture = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakePackage(models.Model):
package = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)

class CakeCandle(models.Model):
candle = models.CharField(max_length=40)
price = models.IntegerField()
cake = models.ForeignKey(Cake, on_delete=models.CASCADE)


# class Cake(models.Model):
# name = models.CharField(max_length=40, unique=True)
# size = models.ForeignKey(CakeSize, on_delete=models.CASCADE)
# flavor = models.ForeignKey(CakeFlavor, on_delete=models.CASCADE)
# color = models.ForeignKey(CakeColor, on_delete=models.CASCADE)
# design = models.ForeignKey(CakeDesign, on_delete=models.CASCADE)
# side_deco = models.ForeignKey(CakeSideDeco, on_delete=models.CASCADE, null=True, blank=True)
# deco = models.ForeignKey(CakeDeco, on_delete=models.CASCADE, null=True, blank=True)
# lettering = models.ForeignKey(CakeLettering, on_delete=models.CASCADE, null=True, blank=True)
# font = models.ForeignKey(CakeFont, on_delete=models.CASCADE, null=True, blank=True)
# picture = models.ForeignKey(CakePicture, on_delete=models.CASCADE, null=True, blank=True)
# package = models.ForeignKey(CakePackage, on_delete=models.CASCADE)
# candle = models.ForeignKey(CakeCandle, on_delete=models.CASCADE, null=True, blank=True)
3 changes: 3 additions & 0 deletions Backend/momment/cake/tests.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
from django.test import TestCase

# Create your tests here.
9 changes: 9 additions & 0 deletions Backend/momment/cake/urls.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
from . import views
from django.urls import path

urlpatterns = [
path('update/', views.update),
path('delete_detail/', views.delete_detail),
path('delete_option/', views.delete_option),
path('delete_all/', views.delete_all),
]
Loading