diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/__init__.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/__init__.cpython-38.pyc index dde6f9a2531aeae090d2ae5a026c1a3be1bfda02..d0dd502fcce6340c6c8c8df97c4e33c162522893 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/__init__.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/__init__.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/__main__.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/__main__.cpython-38.pyc index d58a2eb9b643399a3a263e79f36d063d74fe82b9..bad8115f15a6eef5f8bded0f10b0a7e7a07234ec 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/__main__.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/__main__.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/app.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/app.cpython-38.pyc index b3365c6c04c49770ed8d1319c4328c6b9455f903..fdf036bf165c80dc14a0f2b50815ca81d46480f2 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/app.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/app.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/blueprints.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/blueprints.cpython-38.pyc index 466a0f01cf4e379eea8bb6bdba9ea4fd05fe1281..29c400a4f68f95e7538c70be12c965e4870a311c 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/blueprints.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/blueprints.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/cli.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/cli.cpython-38.pyc index d5efb9365bd25436ec5d883f7dda8541e6d9ce4e..971a650048aef309f37e51cda2cfc74aaa086cc4 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/cli.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/cli.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/config.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/config.cpython-38.pyc index 95e34328253b5e37260922494fce00a96eac1a79..cf49bdae9dbb98b5f05b310f7bd437cc5703d322 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/config.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/config.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/ctx.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/ctx.cpython-38.pyc index a9367c6b106b1d5169617bdde72c9161f41999ca..bbcac16b6d66bdc3ff6b3af8a441a2f040055f3b 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/ctx.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/ctx.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/debughelpers.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/debughelpers.cpython-38.pyc index 2d7e3dd9d2a60af8d5f95108e2112de4b0981589..faaec9edf4832ca051f205737396ea1f8abd4d5f 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/debughelpers.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/debughelpers.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/globals.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/globals.cpython-38.pyc index 89b75c4425333cdd1b6ab9b5f6100de2a58088a5..3db0958544bff6219ac87284335ec6684aa00492 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/globals.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/globals.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/helpers.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/helpers.cpython-38.pyc index b4d434ce8fcb8fac153d92c6467e4ee8da7b9d5f..8324d38bdab6e19e692262f3177567dd6073685d 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/helpers.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/helpers.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/logging.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/logging.cpython-38.pyc index 284ad9fc9c96e395d73cbeb5d172b5829085a5b0..2fec6c605d4083931e37b85241a190bd1c0b8def 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/logging.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/logging.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/sessions.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/sessions.cpython-38.pyc index 543e67609ea41e939d716675c0e259d6698e6d10..68ac2a19ff4f280f88ace362fd0d523231d93816 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/sessions.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/sessions.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/signals.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/signals.cpython-38.pyc index e93763eed086da3414caa34d59b091154ea598a9..5450e05dd2749338447f1afc97ae4fd64b51e3f7 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/signals.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/signals.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/templating.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/templating.cpython-38.pyc index 0e0593092ef2b494917a2466a220f047a9ae84be..3af40211d658e10ec88b02cd202c9565175ae3b1 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/templating.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/templating.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/testing.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/testing.cpython-38.pyc index 565ab64e7bb056e3f40d4b5cbfc8ad95bb8b5b3a..b40c69faf51bf02a01554f4cbdb5978172704b5a 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/testing.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/testing.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/typing.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/typing.cpython-38.pyc index 124309488c90aacfd752dcb28d356ed19c565496..b41fbb33d61b896c55495e3f29a651c57b856244 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/typing.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/typing.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/views.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/views.cpython-38.pyc index bfb08e70aa9a8c7a16d554ae76676b2287cf5c36..32cf451915b4a8fdb8f3d1bc06092bce9d859f9b 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/views.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/views.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/__pycache__/wrappers.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/__pycache__/wrappers.cpython-38.pyc index 5850e7680f9a521eeec0457f6407912cc61b6128..565343630b6a15a02f1bb8cee0404a63aa75f69e 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/__pycache__/wrappers.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/__pycache__/wrappers.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/json/__pycache__/__init__.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/json/__pycache__/__init__.cpython-38.pyc index 4cdd74d0eceb782ed3dab0633c1f5b5717f843eb..c37939c2f5ca670e687611e9516981f3a3c59c20 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/json/__pycache__/__init__.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/json/__pycache__/__init__.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/json/__pycache__/provider.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/json/__pycache__/provider.cpython-38.pyc index 2748f199e7dc7eff664456e325e3d4ae5c0c8847..7c6230b9e932724ebb9be2a0dad26b05c930631c 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/json/__pycache__/provider.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/json/__pycache__/provider.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/json/__pycache__/tag.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/json/__pycache__/tag.cpython-38.pyc index c7387a09b9af6feb0a283c2229b09e464cc67339..d818580403daa4d0c9e3e13fbb27b529bdfcdfd3 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/json/__pycache__/tag.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/json/__pycache__/tag.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/app.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/app.cpython-38.pyc index c5982983b1d6955d676427f6e7863fb844cf47eb..67f32584bab97763d0ade584bcee2cb0c783e3ea 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/app.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/app.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/blueprints.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/blueprints.cpython-38.pyc index 5ba71f1dad319438d4e4d3c97b1827a060841508..3c928a8b942f76be1a8837c3c307db7e4e2ba12e 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/blueprints.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/blueprints.cpython-38.pyc differ diff --git a/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/scaffold.cpython-38.pyc b/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/scaffold.cpython-38.pyc index a616058770bcfa837c242f1fbd9dffec26f90c4a..71b1773d5d0d6894eeb4cf00d4e3fdbc589892c1 100644 Binary files a/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/scaffold.cpython-38.pyc and b/.venv/lib/python3.8/site-packages/flask/sansio/__pycache__/scaffold.cpython-38.pyc differ diff --git a/app/__init__.py b/app/__init__.py index 50c8aaeb99ccd60f77a04eb5cd1d7b01447cfc25..8b60638ce0b01b2e12041db657c6f5b421644790 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -14,8 +14,8 @@ def create_app(config_class=Config): from app.main import bp as main_bp app.register_blueprint(main_bp) - from app.posts import bp as posts_bp - app.register_blueprint(posts_bp, url_prefix='/posts') + from app.bookings import bp as bookings_bp + app.register_blueprint(bookings_bp, url_prefix='/bookings') @app.route('/test/') def test_page(): diff --git a/app/__pycache__/__init__.cpython-38.pyc b/app/__pycache__/__init__.cpython-38.pyc index 0ee55363136ae5fd881a76cf1026f4326fee8c09..ba6e4f839384b94fe5e798434c441f1f5eda512f 100644 Binary files a/app/__pycache__/__init__.cpython-38.pyc and b/app/__pycache__/__init__.cpython-38.pyc differ diff --git a/app/bookings/__init__.py b/app/bookings/__init__.py new file mode 100644 index 0000000000000000000000000000000000000000..1c569db7815640a0b7fa3fe5937cc6d02696fccf --- /dev/null +++ b/app/bookings/__init__.py @@ -0,0 +1,5 @@ +from flask import Blueprint + +bp = Blueprint('bookings', __name__) + +from app.bookings import routes \ No newline at end of file diff --git a/app/bookings/routes.py b/app/bookings/routes.py new file mode 100644 index 0000000000000000000000000000000000000000..e68d45fb936ba61d33e51d967862190876d5ab31 --- /dev/null +++ b/app/bookings/routes.py @@ -0,0 +1,6 @@ +from flask import render_template +from app.bookings import bp + +@bp.route('/') +def index(): + return render_template('bookings/index.html') diff --git a/app/main/__pycache__/routes.cpython-38.pyc b/app/main/__pycache__/routes.cpython-38.pyc index a8a49a225f7c9581974ad5ae76d43a0cd13d061b..0c13488dc05aa40a79b2d12379a20a916b702b7b 100644 Binary files a/app/main/__pycache__/routes.cpython-38.pyc and b/app/main/__pycache__/routes.cpython-38.pyc differ diff --git a/app/main/routes.py b/app/main/routes.py index 81fa7a7ededa9c3dbe88a6b5863e0f903afe74ad..c6235a13466e7678a6c27a4a27f3b42225963dc8 100644 --- a/app/main/routes.py +++ b/app/main/routes.py @@ -1,6 +1,9 @@ from flask import render_template from app.main import bp +import datetime @bp.route('/') def index(): - return render_template('index.html') \ No newline at end of file + date=datetime.datetime.now() + tomorrow_object = date + datetime.timedelta(days=1) + return render_template('index.html', today = date.strftime('%Y-%m-%d'), tomorrow = tomorrow_object.strftime('%Y-%m-%d')) \ No newline at end of file diff --git a/app/posts/__init__.py b/app/posts/__init__.py deleted file mode 100644 index 1b2c0d783cf76afe155c4ab76c01a2ea92413d9f..0000000000000000000000000000000000000000 --- a/app/posts/__init__.py +++ /dev/null @@ -1,5 +0,0 @@ -from flask import Blueprint - -bp = Blueprint('posts', __name__) - -from app.posts import routes \ No newline at end of file diff --git a/app/posts/__pycache__/__init__.cpython-38.pyc b/app/posts/__pycache__/__init__.cpython-38.pyc deleted file mode 100644 index 515ccdf6896ca63e8f65686047a57f4eeaf91c77..0000000000000000000000000000000000000000 Binary files a/app/posts/__pycache__/__init__.cpython-38.pyc and /dev/null differ diff --git a/app/posts/__pycache__/routes.cpython-38.pyc b/app/posts/__pycache__/routes.cpython-38.pyc deleted file mode 100644 index b418aec72a8ba5ddade836c9160f461f37f2efbe..0000000000000000000000000000000000000000 Binary files a/app/posts/__pycache__/routes.cpython-38.pyc and /dev/null differ diff --git a/app/posts/routes.py b/app/posts/routes.py deleted file mode 100644 index 95e1be7c9b239d96d24a801b0eea9eae25ac0fdc..0000000000000000000000000000000000000000 --- a/app/posts/routes.py +++ /dev/null @@ -1,6 +0,0 @@ -from flask import render_template -from app.posts import bp - -@bp.route('/') -def index(): - return render_template('posts/index.html') diff --git a/app/static/navigation.css b/app/static/base.css similarity index 57% rename from app/static/navigation.css rename to app/static/base.css index fd139a88a50d78b751818c90c3d15207d9bbd1dd..d38e6129a5a7720b79665dd0bc3c573def5bf65b 100644 --- a/app/static/navigation.css +++ b/app/static/base.css @@ -1,28 +1,36 @@ -.nav_div img { +.navigation img { height: 70px; margin-left: 35px; } -.nav_div .navbar ul li { +.navigation .navbar ul li { list-style-type: none; display: inherit; flex-direction: row; padding: 5px 0; + color: #EBC815; } -.nav_div .navbar { +.nav_list_item:hover { + background-color: black; +} + +.navigation .navbar { display: flex; align-items: center; justify-content: center; height:70px; + width:100%; } -.nav_div .navbar ul { +.navigation .navbar ul { display: flex; justify-content: space-evenly; width:100%; + font-style: ; } -.nav_div { +.navigation { display: flex; + background-color: #AEEB15; } diff --git a/app/templates/base.html b/app/templates/base.html new file mode 100644 index 0000000000000000000000000000000000000000..12c034ec6e70eaa013dd7fd0ffa361d2b361fbb5 --- /dev/null +++ b/app/templates/base.html @@ -0,0 +1,35 @@ +<!-- Core HTML page which includes navigation bar and footer and determines the order in which items are loaded, all other templates should extend this base template --> + +<!DOCTYPE html> +<html> + <head> + <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='base.css')}}"> + </head> + <body> + {% block navigation %} + <div class="navigation"> + <!-- https://images.ctfassets.net/hrltx12pl8hq/7JnR6tVVwDyUM8Cbci3GtJ/bf74366cff2ba271471725d0b0ef418c/shutterstock_376532611-og.jpg --> + <img src="{{ url_for('static', filename='images/nav_icon.jpeg')}}"> + <nav class="navbar"> + <ul> + <li class="nav_list_item"><a href="#">Home</a></li> + <li class="nav_list_item"><a href="#">About</a></li> + <li class="nav_list_item"><a href="#">Pricing</a></li> + <li class="nav_list_item"><a href="#">Terms of use</a></li> + <li class="nav_list_item"><a href="#">Contact</a></li> + </ul> + </nav> + </div> + {% endblock %} + + <div class="content"> + {% block content %} {% endblock %} + </div> + + {% block footer %} + <div class="footer"> + <h3>Footer content</h3> + </div> + {% endblock %} + </body> +</html> \ No newline at end of file diff --git a/app/templates/posts/index.html b/app/templates/bookings/index.html similarity index 72% rename from app/templates/posts/index.html rename to app/templates/bookings/index.html index 6b98693b8558913b0bbc58a9275882c5ed30039b..9942207230c2dda46d6f2e1050ef8770e077f063 100644 --- a/app/templates/posts/index.html +++ b/app/templates/bookings/index.html @@ -2,6 +2,6 @@ {% block content %} <div class="content"> - <h2>Index of posts.html</h2> + <h2>Index of bookings.html</h2> </div> {% endblock %} \ No newline at end of file diff --git a/app/templates/index.html b/app/templates/index.html index 290671ea2f51d627e8bb0339712071561615aef5..5678f1f6171e76308c589b337efb1e62dc38b75b 100644 --- a/app/templates/index.html +++ b/app/templates/index.html @@ -1,7 +1,15 @@ -{% extends 'navigation.html' %} +{% extends 'base.html' %} {% block content %} - <div class="content"> - <h2>Index.html</h2> + <div class="date_selector"> + <h2>Date selector</h2> + <input type="date" id="start" name="trip-start" value="{{today}}" min="{{today}}" max="2018-12-31" /> + <input type="date" id="start" name="trip-end" value="{{tomorrow}}" min="{{tomorrow}}" max="2099-12-31" /> + </div> + <div> + <h3>Guarantees</h3> + </div> + <div> + <h3>Example Pricing</h3> </div> {% endblock %} \ No newline at end of file diff --git a/app/templates/navigation.html b/app/templates/navigation.html deleted file mode 100644 index b02c72d0b173acaf7b3aed7c77221cff394fa52a..0000000000000000000000000000000000000000 --- a/app/templates/navigation.html +++ /dev/null @@ -1,28 +0,0 @@ -<!DOCTYPE html> -<html> - <head> - <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='navigation.css')}}"> - </head> - <body> - <div class="nav_div"> - <!-- https://images.ctfassets.net/hrltx12pl8hq/7JnR6tVVwDyUM8Cbci3GtJ/bf74366cff2ba271471725d0b0ef418c/shutterstock_376532611-og.jpg --> - <img src="{{ url_for('static', filename='images/nav_icon.jpeg')}}"> - <nav class="navbar"> - <ul> - <li><a href="#">Home</a></li> - <li><a href="#">About</a></li> - <li><a href="#">Pricing</a></li> - <li><a href="#">Terms of use</a></li> - <li><a href="#">Contact</a></li> - </ul> - </nav> - </div> - - <hr> - - <h1>Content</h1> - <div class="content"> - {% block content %} {% endblock %} - </div> - </body> -</html> \ No newline at end of file