diff --git a/Assign_Management/__pycache__/__init__.cpython-37.pyc b/Assign_Management/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 00000000..27271231 Binary files /dev/null and b/Assign_Management/__pycache__/__init__.cpython-37.pyc differ diff --git a/Assign_Management/__pycache__/admin.cpython-37.pyc b/Assign_Management/__pycache__/admin.cpython-37.pyc new file mode 100644 index 00000000..036a9cf1 Binary files /dev/null and b/Assign_Management/__pycache__/admin.cpython-37.pyc differ diff --git a/Assign_Management/__pycache__/apps.cpython-37.pyc b/Assign_Management/__pycache__/apps.cpython-37.pyc new file mode 100644 index 00000000..dedb0516 Binary files /dev/null and b/Assign_Management/__pycache__/apps.cpython-37.pyc differ diff --git a/Assign_Management/__pycache__/models.cpython-37.pyc b/Assign_Management/__pycache__/models.cpython-37.pyc new file mode 100644 index 00000000..e7f2be9d Binary files /dev/null and b/Assign_Management/__pycache__/models.cpython-37.pyc differ diff --git a/Assign_Management/__pycache__/storage.cpython-37.pyc b/Assign_Management/__pycache__/storage.cpython-37.pyc new file mode 100644 index 00000000..cf55a375 Binary files /dev/null and b/Assign_Management/__pycache__/storage.cpython-37.pyc differ diff --git a/Assign_Management/__pycache__/urls.cpython-37.pyc b/Assign_Management/__pycache__/urls.cpython-37.pyc new file mode 100644 index 00000000..0cbb8179 Binary files /dev/null and b/Assign_Management/__pycache__/urls.cpython-37.pyc differ diff --git a/Assign_Management/__pycache__/views.cpython-37.pyc b/Assign_Management/__pycache__/views.cpython-37.pyc new file mode 100644 index 00000000..ae82de60 Binary files /dev/null and b/Assign_Management/__pycache__/views.cpython-37.pyc differ diff --git a/Assign_Management/migrations/__pycache__/0001_initial.cpython-37.pyc b/Assign_Management/migrations/__pycache__/0001_initial.cpython-37.pyc new file mode 100644 index 00000000..fd47eba8 Binary files /dev/null and b/Assign_Management/migrations/__pycache__/0001_initial.cpython-37.pyc differ diff --git a/Assign_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc b/Assign_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc new file mode 100644 index 00000000..f84a4391 Binary files /dev/null and b/Assign_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc differ diff --git a/Assign_Management/migrations/__pycache__/0003_upload_user.cpython-37.pyc b/Assign_Management/migrations/__pycache__/0003_upload_user.cpython-37.pyc new file mode 100644 index 00000000..60f5aef4 Binary files /dev/null and b/Assign_Management/migrations/__pycache__/0003_upload_user.cpython-37.pyc differ diff --git a/Assign_Management/migrations/__pycache__/__init__.cpython-37.pyc b/Assign_Management/migrations/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 00000000..ee7246c9 Binary files /dev/null and b/Assign_Management/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/Class_Management/Template/EditClassroom.html b/Class_Management/Template/EditClassroom.html index 7a612629..2d6dfac7 100644 --- a/Class_Management/Template/EditClassroom.html +++ b/Class_Management/Template/EditClassroom.html @@ -51,11 +51,8 @@

Edit Classroom

{% endfor %} -<<<<<<< HEAD -======= ->>>>>>> b12993777cc60f0e693458acf21e87aec969b9e1 diff --git a/Class_Management/__pycache__/__init__.cpython-37.pyc b/Class_Management/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 00000000..230534f7 Binary files /dev/null and b/Class_Management/__pycache__/__init__.cpython-37.pyc differ diff --git a/Class_Management/__pycache__/admin.cpython-37.pyc b/Class_Management/__pycache__/admin.cpython-37.pyc new file mode 100644 index 00000000..8c19ccf8 Binary files /dev/null and b/Class_Management/__pycache__/admin.cpython-37.pyc differ diff --git a/Class_Management/__pycache__/apps.cpython-37.pyc b/Class_Management/__pycache__/apps.cpython-37.pyc new file mode 100644 index 00000000..77985508 Binary files /dev/null and b/Class_Management/__pycache__/apps.cpython-37.pyc differ diff --git a/Class_Management/__pycache__/models.cpython-37.pyc b/Class_Management/__pycache__/models.cpython-37.pyc new file mode 100644 index 00000000..b3effe7c Binary files /dev/null and b/Class_Management/__pycache__/models.cpython-37.pyc differ diff --git a/Class_Management/__pycache__/urls.cpython-37.pyc b/Class_Management/__pycache__/urls.cpython-37.pyc new file mode 100644 index 00000000..3389006f Binary files /dev/null and b/Class_Management/__pycache__/urls.cpython-37.pyc differ diff --git a/Class_Management/__pycache__/views.cpython-37.pyc b/Class_Management/__pycache__/views.cpython-37.pyc new file mode 100644 index 00000000..2f6384f1 Binary files /dev/null and b/Class_Management/__pycache__/views.cpython-37.pyc differ diff --git a/Class_Management/migrations/__pycache__/0001_initial.cpython-37.pyc b/Class_Management/migrations/__pycache__/0001_initial.cpython-37.pyc new file mode 100644 index 00000000..a5ddd7ec Binary files /dev/null and b/Class_Management/migrations/__pycache__/0001_initial.cpython-37.pyc differ diff --git a/Class_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc b/Class_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc new file mode 100644 index 00000000..ea99515e Binary files /dev/null and b/Class_Management/migrations/__pycache__/0002_auto_20180717_1656.cpython-37.pyc differ diff --git a/Class_Management/migrations/__pycache__/__init__.cpython-37.pyc b/Class_Management/migrations/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 00000000..032410d7 Binary files /dev/null and b/Class_Management/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/Class_Management/templatetags/__pycache__/__init__.cpython-37.pyc b/Class_Management/templatetags/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 00000000..bd96cbe3 Binary files /dev/null and b/Class_Management/templatetags/__pycache__/__init__.cpython-37.pyc differ diff --git a/Class_Management/templatetags/__pycache__/group_tags.cpython-37.pyc b/Class_Management/templatetags/__pycache__/group_tags.cpython-37.pyc new file mode 100644 index 00000000..c44cba7f Binary files /dev/null and b/Class_Management/templatetags/__pycache__/group_tags.cpython-37.pyc differ diff --git a/Class_Management/templatetags/__pycache__/prgress_tags.cpython-37.pyc b/Class_Management/templatetags/__pycache__/prgress_tags.cpython-37.pyc new file mode 100644 index 00000000..b23f20ab Binary files /dev/null and b/Class_Management/templatetags/__pycache__/prgress_tags.cpython-37.pyc differ diff --git a/Class_Management/templatetags/__pycache__/score_tags.cpython-37.pyc b/Class_Management/templatetags/__pycache__/score_tags.cpython-37.pyc new file mode 100644 index 00000000..731bc41a Binary files /dev/null and b/Class_Management/templatetags/__pycache__/score_tags.cpython-37.pyc differ diff --git a/LogIn_Management/__pycache__/__init__.cpython-37.pyc b/LogIn_Management/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 00000000..3408469e Binary files /dev/null and b/LogIn_Management/__pycache__/__init__.cpython-37.pyc differ diff --git a/LogIn_Management/__pycache__/admin.cpython-37.pyc b/LogIn_Management/__pycache__/admin.cpython-37.pyc new file mode 100644 index 00000000..acbae996 Binary files /dev/null and b/LogIn_Management/__pycache__/admin.cpython-37.pyc differ diff --git a/LogIn_Management/__pycache__/apps.cpython-37.pyc b/LogIn_Management/__pycache__/apps.cpython-37.pyc new file mode 100644 index 00000000..9cbc4cb7 Binary files /dev/null and b/LogIn_Management/__pycache__/apps.cpython-37.pyc differ diff --git a/LogIn_Management/__pycache__/forms.cpython-37.pyc b/LogIn_Management/__pycache__/forms.cpython-37.pyc new file mode 100644 index 00000000..62347265 Binary files /dev/null and b/LogIn_Management/__pycache__/forms.cpython-37.pyc differ diff --git a/LogIn_Management/__pycache__/models.cpython-37.pyc b/LogIn_Management/__pycache__/models.cpython-37.pyc new file mode 100644 index 00000000..efd06a9c Binary files /dev/null and b/LogIn_Management/__pycache__/models.cpython-37.pyc differ diff --git a/LogIn_Management/__pycache__/views.cpython-37.pyc b/LogIn_Management/__pycache__/views.cpython-37.pyc new file mode 100644 index 00000000..3e05b765 Binary files /dev/null and b/LogIn_Management/__pycache__/views.cpython-37.pyc differ diff --git a/LogIn_Management/migrations/__pycache__/0001_initial.cpython-37.pyc b/LogIn_Management/migrations/__pycache__/0001_initial.cpython-37.pyc new file mode 100644 index 00000000..b679f5e1 Binary files /dev/null and b/LogIn_Management/migrations/__pycache__/0001_initial.cpython-37.pyc differ diff --git a/LogIn_Management/migrations/__pycache__/__init__.cpython-37.pyc b/LogIn_Management/migrations/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 00000000..a0d61a34 Binary files /dev/null and b/LogIn_Management/migrations/__pycache__/__init__.cpython-37.pyc differ diff --git a/SamingDev/__pycache__/__init__.cpython-37.pyc b/SamingDev/__pycache__/__init__.cpython-37.pyc new file mode 100644 index 00000000..e1a1babc Binary files /dev/null and b/SamingDev/__pycache__/__init__.cpython-37.pyc differ diff --git a/SamingDev/__pycache__/settings.cpython-37.pyc b/SamingDev/__pycache__/settings.cpython-37.pyc new file mode 100644 index 00000000..dbd2d407 Binary files /dev/null and b/SamingDev/__pycache__/settings.cpython-37.pyc differ diff --git a/SamingDev/__pycache__/urls.cpython-37.pyc b/SamingDev/__pycache__/urls.cpython-37.pyc new file mode 100644 index 00000000..9848399e Binary files /dev/null and b/SamingDev/__pycache__/urls.cpython-37.pyc differ diff --git a/SamingDev/__pycache__/wsgi.cpython-37.pyc b/SamingDev/__pycache__/wsgi.cpython-37.pyc new file mode 100644 index 00000000..4ad07317 Binary files /dev/null and b/SamingDev/__pycache__/wsgi.cpython-37.pyc differ diff --git a/SamingDev/settings.py b/SamingDev/settings.py index 21352b60..d007788c 100644 --- a/SamingDev/settings.py +++ b/SamingDev/settings.py @@ -23,7 +23,7 @@ SECRET_KEY = '$(dz!yau&t9ct!opo59%5m4(egv(vz&avl4=pu!qq+&$-o-jjm' # SECURITY WARNING: don't run with debug turned on in production! -DEBUG = False +DEBUG = True ALLOWED_HOSTS = ['localhost', '127.0.0.1', 'web'] @@ -88,18 +88,18 @@ # https://docs.djangoproject.com/en/1.11/ref/settings/#databases DATABASES = { + # 'default': { + # 'ENGINE': 'django.db.backends.postgresql', + # 'NAME': 'postgres', + # 'USER': 'postgres', + # 'PASSWORD': 'pengza78', + # 'HOST': 'db', + # 'PORT': 5432 + #} 'default': { - 'ENGINE': 'django.db.backends.postgresql', - 'NAME': 'postgres', - 'USER': 'postgres', - 'PASSWORD': 'pengza78', - 'HOST': 'db', - 'PORT': 5432 + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), } - #'default': { - # 'ENGINE': 'django.db.backends.sqlite3', - # 'NAME': os.path.join(BASE_DIR, 'db.sqlite3'), - #} } diff --git a/db.sqlite3 b/db.sqlite3 index 8006397a..59d730d6 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/requirements.txt b/requirements.txt index a7ee4a05..b9914eaa 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,5 +9,5 @@ timeout-decorator #docker #redis #autograder-sandbox -psycopg2-binary +psycopg2 mosspy