diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..6e000ff --- /dev/null +++ b/.gitignore @@ -0,0 +1,212 @@ + +# Created by https://www.gitignore.io/api/python,django,virtualenv +# Edit at https://www.gitignore.io/?templates=python,django,virtualenv + +*.env +*env +env +/env +env/ + +### Django ### +*.log +*.pot +*.pyc +__pycache__/ +local_settings.py +db.sqlite3 +media + +# If your build process includes running collectstatic, then you probably don't need or want to include staticfiles/ +# in your Git repository. Update and uncomment the following line accordingly. +# /staticfiles/ + +### Django.Python Stack ### +# Byte-compiled / optimized / DLL files +*.py[cod] +*$py.class + +# C extensions +*.so + +# Distribution / packaging +.Python +build/ +develop-eggs/ +dist/ +downloads/ +eggs/ +.eggs/ +lib/ +lib64/ +parts/ +sdist/ +var/ +wheels/ +pip-wheel-metadata/ +share/python-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/ +.nox/ +.coverage +.coverage.* +.cache +nosetests.xml +coverage.xml +*.cover +.hypothesis/ +.pytest_cache/ + +# Translations +*.mo + +# Django stuff: +db.sqlite3-journal + +# Flask stuff: +instance/ +.webassets-cache + +# Scrapy stuff: +.scrapy + +# Sphinx documentation +docs/_build/ + +# PyBuilder +target/ + +# Jupyter Notebook +.ipynb_checkpoints + +# IPython +profile_default/ +ipython_config.py + +# pyenv +.python-version + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. +#Pipfile.lock + +# 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/ +.dmypy.json +dmypy.json + +# Pyre type checker +.pyre/ + +### Python ### +# Byte-compiled / optimized / DLL files + +# C extensions + +# Distribution / packaging + +# 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. + +# Installer logs + +# Unit test / coverage reports + +# Translations + +# Django stuff: + +# Flask stuff: + +# Scrapy stuff: + +# Sphinx documentation + +# PyBuilder + +# Jupyter Notebook + +# IPython + +# pyenv + +# pipenv +# According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control. +# However, in case of collaboration, if having platform-specific dependencies or dependencies +# having no cross-platform support, pipenv may install dependencies that don't work, or not +# install all needed dependencies. + +# celery beat schedule file + +# SageMath parsed files + +# Environments + +# Spyder project settings + +# Rope project settings + +# mkdocs documentation + +# mypy + +# Pyre type checker + +### VirtualEnv ### +# Virtualenv +# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/ +[Bb]in +[Ii]nclude +[Ll]ib +[Ll]ib64 +[Ll]ocal +[Ss]cripts +pyvenv.cfg +pip-selfcheck.json + +# End of https://www.gitignore.io/api/python,django,virtualenv diff --git a/db.sqlite3 b/db.sqlite3 index 500673c..22b1205 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/diary_app/templates/diary_app/signin.html b/diary_app/templates/diary_app/signin.html index 3abb300..82a55fb 100644 --- a/diary_app/templates/diary_app/signin.html +++ b/diary_app/templates/diary_app/signin.html @@ -33,9 +33,9 @@

Daily Bytes

Sign in with

- - - + + +
or
diff --git a/diary_app/templates/users/signup.html b/diary_app/templates/users/signup.html index 51cedaa..db459bf 100644 --- a/diary_app/templates/users/signup.html +++ b/diary_app/templates/users/signup.html @@ -35,9 +35,9 @@

Daily Bytes

Sign up with

- - - + + +
or
diff --git a/diary_proj/__pycache__/settings.cpython-36.pyc b/diary_proj/__pycache__/settings.cpython-36.pyc index 925d780..e152a18 100644 Binary files a/diary_proj/__pycache__/settings.cpython-36.pyc and b/diary_proj/__pycache__/settings.cpython-36.pyc differ diff --git a/diary_proj/settings.py b/diary_proj/settings.py index ba6e8ec..ad2bc1f 100644 --- a/diary_proj/settings.py +++ b/diary_proj/settings.py @@ -12,6 +12,8 @@ import os import django_heroku +from decouple import config + # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -183,5 +185,4 @@ 'social_core.pipeline.social_auth.associate_by_email', ) - django_heroku.settings(locals()) \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index 3ea3464..944ea13 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,6 +11,7 @@ idna==2.8 oauthlib==3.1.0 psycopg2==2.8.3 PyJWT==1.7.1 +python-decouple==3.1 python3-openid==3.1.0 pytz==2019.2 requests==2.22.0