diff --git a/lecture1/atributte.html b/lecture1/atributte.html new file mode 100644 index 0000000..c57cc81 --- /dev/null +++ b/lecture1/atributte.html @@ -0,0 +1,21 @@ + + + + My Web page + + + +
+ + + +
+ + diff --git a/lecture1/hover.html b/lecture1/hover.html new file mode 100644 index 0000000..7b43e57 --- /dev/null +++ b/lecture1/hover.html @@ -0,0 +1,20 @@ + + + + My Web page + + + + + diff --git a/lecture1/index.html b/lecture1/index.html index 0001671..cd3a11c 100644 --- a/lecture1/index.html +++ b/lecture1/index.html @@ -6,5 +6,6 @@ Hello Here is a new feature + New Branch diff --git a/lecture1/multiple.html b/lecture1/multiple.html new file mode 100644 index 0000000..f95fd4f --- /dev/null +++ b/lecture1/multiple.html @@ -0,0 +1,15 @@ + + + + My Web page + + + +

Big Headline

+

Small Headline

+ + diff --git a/project1/.gitignore b/project1/.gitignore new file mode 100644 index 0000000..8b54a23 --- /dev/null +++ b/project1/.gitignore @@ -0,0 +1,124 @@ +# 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/ +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 +*.pot + +# Django stuff: +*.log +local_settings.py +db.sqlite3 +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/ \ No newline at end of file diff --git a/project3/Procfile b/project3/Procfile new file mode 100644 index 0000000..c495d6e --- /dev/null +++ b/project3/Procfile @@ -0,0 +1 @@ +web: gunicorn deployProject.wsgi --log-file - diff --git a/project3/db.sqlite3 b/project3/db.sqlite3 index 38e7e00..a529ad6 100644 Binary files a/project3/db.sqlite3 and b/project3/db.sqlite3 differ diff --git a/project3/pizza/__pycache__/settings.cpython-37.pyc b/project3/pizza/__pycache__/settings.cpython-37.pyc index be398dd..23dded0 100644 Binary files a/project3/pizza/__pycache__/settings.cpython-37.pyc and b/project3/pizza/__pycache__/settings.cpython-37.pyc differ diff --git a/project3/pizza/__pycache__/wsgi.cpython-37.pyc b/project3/pizza/__pycache__/wsgi.cpython-37.pyc index 55ba790..849ff6d 100644 Binary files a/project3/pizza/__pycache__/wsgi.cpython-37.pyc and b/project3/pizza/__pycache__/wsgi.cpython-37.pyc differ diff --git a/project3/pizza/settings.py b/project3/pizza/settings.py index f2ebcb0..458d137 100644 --- a/project3/pizza/settings.py +++ b/project3/pizza/settings.py @@ -119,3 +119,7 @@ # https://docs.djangoproject.com/en/2.0/howto/static-files/ STATIC_URL = '/static/' +STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles') +import dj_database_url +db_from_env = dj_database_url.config() +DATABASES['default'].update(db_from_env) diff --git a/project3/pizza/wsgi.py b/project3/pizza/wsgi.py index 4314a59..99f2ebf 100644 --- a/project3/pizza/wsgi.py +++ b/project3/pizza/wsgi.py @@ -14,3 +14,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pizza.settings") application = get_wsgi_application() + +# Use whitenoise package to serve static files on Heroku +from whitenoise.django import DjangoWhiteNoise +application = DjangoWhiteNoise(application) diff --git a/project3/requirements.txt b/project3/requirements.txt index 8cb962d..eb94c35 100644 --- a/project3/requirements.txt +++ b/project3/requirements.txt @@ -1 +1,6 @@ Django==2.0.3 +python-3.7.0 +whitenoise==3.2.1 +gunicorn==19.6.0 +dj-database-url==0.5.0 +psycopg2==2.7.1 diff --git a/project3/runtime.txt b/project3/runtime.txt new file mode 100644 index 0000000..881a2db --- /dev/null +++ b/project3/runtime.txt @@ -0,0 +1 @@ +python-3.7.0