diff --git a/env/bin/django-admin b/env/bin/django-admin old mode 100755 new mode 100644 diff --git a/env/bin/django-admin.py b/env/bin/django-admin.py old mode 100755 new mode 100644 diff --git a/env/bin/easy_install b/env/bin/easy_install old mode 100755 new mode 100644 diff --git a/env/bin/easy_install-3.5 b/env/bin/easy_install-3.5 old mode 100755 new mode 100644 diff --git a/env/bin/pip b/env/bin/pip old mode 100755 new mode 100644 diff --git a/env/bin/pip3 b/env/bin/pip3 old mode 100755 new mode 100644 diff --git a/env/bin/pip3.5 b/env/bin/pip3.5 old mode 100755 new mode 100644 diff --git a/env/lib/python3.5/site-packages/django/bin/django-admin.py b/env/lib/python3.5/site-packages/django/bin/django-admin.py old mode 100755 new mode 100644 diff --git a/env/lib/python3.5/site-packages/django/conf/project_template/manage.py-tpl b/env/lib/python3.5/site-packages/django/conf/project_template/manage.py-tpl old mode 100755 new mode 100644 diff --git a/env/lib/python3.5/site-packages/django/contrib/admin/static/admin/js/vendor/xregexp/xregexp.js b/env/lib/python3.5/site-packages/django/contrib/admin/static/admin/js/vendor/xregexp/xregexp.js old mode 100755 new mode 100644 diff --git a/hotel/db.sqlite3 b/hotel/db.sqlite3 index 78aa818..abcf312 100644 Binary files a/hotel/db.sqlite3 and b/hotel/db.sqlite3 differ diff --git a/hotel/hotel/__pycache__/__init__.cpython-36.pyc b/hotel/hotel/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..4dd30a7 Binary files /dev/null and b/hotel/hotel/__pycache__/__init__.cpython-36.pyc differ diff --git a/hotel/hotel/__pycache__/settings.cpython-36.pyc b/hotel/hotel/__pycache__/settings.cpython-36.pyc new file mode 100644 index 0000000..69bb412 Binary files /dev/null and b/hotel/hotel/__pycache__/settings.cpython-36.pyc differ diff --git a/hotel/hotel/__pycache__/urls.cpython-36.pyc b/hotel/hotel/__pycache__/urls.cpython-36.pyc new file mode 100644 index 0000000..ade8833 Binary files /dev/null and b/hotel/hotel/__pycache__/urls.cpython-36.pyc differ diff --git a/hotel/hotel/__pycache__/wsgi.cpython-36.pyc b/hotel/hotel/__pycache__/wsgi.cpython-36.pyc new file mode 100644 index 0000000..536fcfe Binary files /dev/null and b/hotel/hotel/__pycache__/wsgi.cpython-36.pyc differ diff --git a/hotel/hotel/settings.py b/hotel/hotel/settings.py index 3c67c20..36ab1ae 100644 --- a/hotel/hotel/settings.py +++ b/hotel/hotel/settings.py @@ -37,7 +37,6 @@ INSTALLED_APPS = [ 'django.contrib.contenttypes', 'django.contrib.sessions', 'django.contrib.messages', - 'django.contrib.staticfiles', ] MIDDLEWARE = [ diff --git a/hotel/manage.py b/hotel/manage.py old mode 100755 new mode 100644 diff --git a/hotel/rooms/__pycache__/__init__.cpython-36.pyc b/hotel/rooms/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..1ba7ddb Binary files /dev/null and b/hotel/rooms/__pycache__/__init__.cpython-36.pyc differ diff --git a/hotel/rooms/__pycache__/admin.cpython-36.pyc b/hotel/rooms/__pycache__/admin.cpython-36.pyc new file mode 100644 index 0000000..e1f84ff Binary files /dev/null and b/hotel/rooms/__pycache__/admin.cpython-36.pyc differ diff --git a/hotel/rooms/__pycache__/apps.cpython-36.pyc b/hotel/rooms/__pycache__/apps.cpython-36.pyc new file mode 100644 index 0000000..df43df9 Binary files /dev/null and b/hotel/rooms/__pycache__/apps.cpython-36.pyc differ diff --git a/hotel/rooms/__pycache__/models.cpython-36.pyc b/hotel/rooms/__pycache__/models.cpython-36.pyc new file mode 100644 index 0000000..1550250 Binary files /dev/null and b/hotel/rooms/__pycache__/models.cpython-36.pyc differ diff --git a/hotel/rooms/__pycache__/urls.cpython-36.pyc b/hotel/rooms/__pycache__/urls.cpython-36.pyc new file mode 100644 index 0000000..133b3a7 Binary files /dev/null and b/hotel/rooms/__pycache__/urls.cpython-36.pyc differ diff --git a/hotel/rooms/__pycache__/views.cpython-36.pyc b/hotel/rooms/__pycache__/views.cpython-36.pyc new file mode 100644 index 0000000..4658c51 Binary files /dev/null and b/hotel/rooms/__pycache__/views.cpython-36.pyc differ diff --git a/hotel/rooms/migrations/__pycache__/0001_initial.cpython-36.pyc b/hotel/rooms/migrations/__pycache__/0001_initial.cpython-36.pyc new file mode 100644 index 0000000..3fe40cf Binary files /dev/null and b/hotel/rooms/migrations/__pycache__/0001_initial.cpython-36.pyc differ diff --git a/hotel/rooms/migrations/__pycache__/0002_room_reserved.cpython-36.pyc b/hotel/rooms/migrations/__pycache__/0002_room_reserved.cpython-36.pyc new file mode 100644 index 0000000..0371a29 Binary files /dev/null and b/hotel/rooms/migrations/__pycache__/0002_room_reserved.cpython-36.pyc differ diff --git a/hotel/rooms/migrations/__pycache__/0003_auto_20190112_2306.cpython-36.pyc b/hotel/rooms/migrations/__pycache__/0003_auto_20190112_2306.cpython-36.pyc new file mode 100644 index 0000000..3412386 Binary files /dev/null and b/hotel/rooms/migrations/__pycache__/0003_auto_20190112_2306.cpython-36.pyc differ diff --git a/hotel/rooms/migrations/__pycache__/0004_auto_20190112_2307.cpython-36.pyc b/hotel/rooms/migrations/__pycache__/0004_auto_20190112_2307.cpython-36.pyc new file mode 100644 index 0000000..bd0e4ac Binary files /dev/null and b/hotel/rooms/migrations/__pycache__/0004_auto_20190112_2307.cpython-36.pyc differ diff --git a/hotel/rooms/migrations/__pycache__/__init__.cpython-36.pyc b/hotel/rooms/migrations/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..cc6113c Binary files /dev/null and b/hotel/rooms/migrations/__pycache__/__init__.cpython-36.pyc differ diff --git a/hotel/rooms/static/style.css b/hotel/rooms/static/style.css new file mode 100644 index 0000000..817c1a3 --- /dev/null +++ b/hotel/rooms/static/style.css @@ -0,0 +1,22 @@ +#hotels { + font-family: "Trebuchet MS", Arial, Helvetica, sans-serif; + border-collapse: collapse; + width: 60%; + margin-left: 20%; + margin-right: 20%; +} + +#hotels td, #hotels th { + border: 1px solid #ddd; + padding: 8px; + text-align: center; +} + +#hotels tr:hover {background-color: #f2f2f2;} + +#hotels th { + padding-top: 12px; + padding-bottom: 12px; + background-color: #000000; + color: white; +} diff --git a/hotel/rooms/templates/index.html b/hotel/rooms/templates/index.html index 1084978..7717b53 100644 --- a/hotel/rooms/templates/index.html +++ b/hotel/rooms/templates/index.html @@ -1,16 +1,18 @@ +{% load static %} + - Title + Hotel INO Scrum - +
- + {% for room in rooms %} @@ -20,7 +22,7 @@ {% if room.reserved %} ZAREZERWOWANE {% else %} - Miejsce na przycisk + MIEJSCE NA PRZYCISK {% endif %} @@ -28,4 +30,4 @@
Numer pokoju Typ pokoju Cena Rezerwacja
{{ room.room_number }}
- \ No newline at end of file +