Merge branch 'master' into frontend

ShopAssistant/.gitignore

@@ -0,0 +1,112 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+
+__pycache__/
+*.py[cod]
+*$py.class
+
+# IntelliJ files
+.idea/
+*.iml

ShopAssistant/ShopAssistant/settings.py

@@ -42,6 +42,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'frontend',
+    'database',
 ]
 
 MIDDLEWARE = [
@@ -80,8 +81,12 @@
 
 DATABASES = {
     'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'NAME': 'dat5dojcg4ptlb',
+        'USER': 'xwbkkmlauwebgd',
+        'PASSWORD': 'aaf6916a61e45ccc92d0f785952e1b8cfbc31cf1167646ae00afb3d1cad4a225',
+        'HOST': 'ec2-50-19-222-129.compute-1.amazonaws.com',
+        'PORT': '5432',
     }
 }
 

ShopAssistant/database/admin.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

ShopAssistant/database/apps.py

@@ -0,0 +1,5 @@
+from django.apps import AppConfig
+
+
+class DatabaseConfig(AppConfig):
+    name = 'database'

ShopAssistant/database/migrations/0001_initial.py

@@ -0,0 +1,50 @@
+# Generated by Django 2.2.6 on 2019-10-26 00:26
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Interests',
+            fields=[
+                ('name', models.CharField(max_length=50, primary_key=True, serialize=False)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Users',
+            fields=[
+                ('email', models.CharField(max_length=50, primary_key=True, serialize=False)),
+                ('password', models.CharField(max_length=50)),
+                ('name', models.CharField(max_length=50)),
+                ('age', models.PositiveSmallIntegerField()),
+                ('gender', models.BooleanField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='UsersInterests',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('email', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='database.Users')),
+                ('interest', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='database.Interests')),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Shops',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=100)),
+                ('start_time', models.TimeField(auto_now_add=True)),
+                ('duration', models.PositiveIntegerField()),
+                ('start', models.PositiveSmallIntegerField(null=True)),
+                ('email', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='database.Users')),
+            ],
+        ),
+    ]

ShopAssistant/database/models.py

@@ -0,0 +1,29 @@
+from django.db import models
+
+
+class Users(models.Model):
+    email = models.CharField(max_length=50, primary_key=True)
+    password = models.CharField(max_length=50)
+    name = models.CharField(max_length=50)
+    age = models.PositiveSmallIntegerField()
+    gender = models.BooleanField()
+
+
+class Interests(models.Model):
+    name = models.CharField(max_length=50, primary_key=True)
+
+
+class UsersInterests(models.Model):
+    email = models.ForeignKey(Users, on_delete=models.CASCADE)
+    interest = models.ForeignKey(Interests, on_delete=models.CASCADE)
+
+
+class Shops(models.Model):
+    name = models.CharField(max_length=100)
+    email = models.ForeignKey(Users, on_delete=models.CASCADE)
+    start_time = models.TimeField(auto_now_add=True)
+    duration = models.PositiveIntegerField()
+    start = models.PositiveSmallIntegerField(null=True)
+
+
+

ShopAssistant/database/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

ShopAssistant/database/views.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.

ShopAssistant/requirements.txt

@@ -1,13 +1,4 @@
-asn1crypto==0.24.0
-cryptography==2.1.4
-enum34==1.1.6
-gyp==0.1
-idna==2.6
-ipaddress==1.0.17
-keyring==10.6.0
-keyrings.alt==3.0
-pycrypto==2.6.1
-pygobject==3.26.1
-pyxdg==0.25
-SecretStorage==2.3.1
-six==1.11.0
+Django==2.2.6
+psycopg2-binary==2.8.4
+pytz==2019.3
+sqlparse==0.3.0