From 64ff948f01ba0c25c4a8f5fbbb86e8a431a5aa7c Mon Sep 17 00:00:00 2001 From: "Ethan Clay (Student)" <ethan2.clay@live.uwe.ac.uk@csctcloud.prxhn32zsyjupl12zde3wlfkch.cwx.internal.cloudapp.net> Date: Tue, 15 Oct 2024 11:43:39 +0100 Subject: [PATCH] Fix python and create base html template. Begin working on fully working nav bar and slight changes to index.html --- .../flask/__pycache__/__init__.cpython-38.pyc | Bin 2246 -> 2246 bytes .../flask/__pycache__/__main__.cpython-38.pyc | Bin 181 -> 181 bytes .../flask/__pycache__/app.cpython-38.pyc | Bin 49198 -> 49198 bytes .../__pycache__/blueprints.cpython-38.pyc | Bin 3976 -> 3976 bytes .../flask/__pycache__/cli.cpython-38.pyc | Bin 28276 -> 28276 bytes .../flask/__pycache__/config.cpython-38.pyc | Bin 13091 -> 13091 bytes .../flask/__pycache__/ctx.cpython-38.pyc | Bin 14463 -> 14463 bytes .../__pycache__/debughelpers.cpython-38.pyc | Bin 6462 -> 6462 bytes .../flask/__pycache__/globals.cpython-38.pyc | Bin 1571 -> 1571 bytes .../flask/__pycache__/helpers.cpython-38.pyc | Bin 21164 -> 21164 bytes .../flask/__pycache__/logging.cpython-38.pyc | Bin 2480 -> 2480 bytes .../flask/__pycache__/sessions.cpython-38.pyc | Bin 13470 -> 13470 bytes .../flask/__pycache__/signals.cpython-38.pyc | Bin 779 -> 779 bytes .../__pycache__/templating.cpython-38.pyc | Bin 6982 -> 6982 bytes .../flask/__pycache__/testing.cpython-38.pyc | Bin 9467 -> 9467 bytes .../flask/__pycache__/typing.cpython-38.pyc | Bin 1803 -> 1803 bytes .../flask/__pycache__/views.cpython-38.pyc | Bin 5423 -> 5423 bytes .../flask/__pycache__/wrappers.cpython-38.pyc | Bin 5156 -> 5156 bytes .../json/__pycache__/__init__.cpython-38.pyc | Bin 5899 -> 5899 bytes .../json/__pycache__/provider.cpython-38.pyc | Bin 7517 -> 7517 bytes .../flask/json/__pycache__/tag.cpython-38.pyc | Bin 11945 -> 11945 bytes .../sansio/__pycache__/app.cpython-38.pyc | Bin 28186 -> 28186 bytes .../__pycache__/blueprints.cpython-38.pyc | Bin 22782 -> 22782 bytes .../__pycache__/scaffold.cpython-38.pyc | Bin 23862 -> 23862 bytes app/__init__.py | 4 +- app/__pycache__/__init__.cpython-38.pyc | Bin 748 -> 757 bytes app/bookings/__init__.py | 5 +++ app/bookings/routes.py | 6 +++ app/main/__pycache__/routes.cpython-38.pyc | Bin 351 -> 514 bytes app/main/routes.py | 5 ++- app/posts/__init__.py | 5 --- app/posts/__pycache__/__init__.cpython-38.pyc | Bin 248 -> 0 bytes app/posts/__pycache__/routes.cpython-38.pyc | Bin 359 -> 0 bytes app/posts/routes.py | 6 --- app/static/{navigation.css => base.css} | 18 ++++++--- app/templates/base.html | 35 ++++++++++++++++++ app/templates/{posts => bookings}/index.html | 2 +- app/templates/index.html | 14 +++++-- app/templates/navigation.html | 28 -------------- 39 files changed, 77 insertions(+), 51 deletions(-) create mode 100644 app/bookings/__init__.py create mode 100644 app/bookings/routes.py delete mode 100644 app/posts/__init__.py delete mode 100644 app/posts/__pycache__/__init__.cpython-38.pyc delete mode 100644 app/posts/__pycache__/routes.cpython-38.pyc delete mode 100644 app/posts/routes.py rename app/static/{navigation.css => base.css} (57%) create mode 100644 app/templates/base.html rename app/templates/{posts => bookings}/index.html (72%) delete mode 100644 app/templates/navigation.html 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 GIT binary patch delta 34 qcmX>mcubHxl$V!_fq{Xc(SmOy_aQcp;$+JzOQX`X%~#nzG6DdT;0e_L delta 34 qcmX>mcubHxl$V!_fq{Wx%L9&$+=tjW(#*0AjSNaMH(zD@$Or(T018q7 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 GIT binary patch delta 31 mcmdnWxRsGRl$V!_fq{Xc(SmOxcQr?GvSpQ}QEA%5K6L<XhX?Ec delta 31 mcmdnWxRsGRl$V!_fq{Wx%L9&y+|?XuX4!^D1|^vj`_ut=*a&F= 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 GIT binary patch delta 68 zcmZ42z`U-3nLCu1my3acfuYfYZzFdWJ4bP{WtF8-Y1-ymc5fqLcK?77Pk+DQTg>jR YA-7mOTpe9D-?oe~W}Ls-BKKPm0C|2C?*IS* delta 68 zcmZ42z`U-3nLCu1my3acfnm!7j*Z+|>>O!k*@i|2C7GLR*}aW~Sv*`FU2d`a2ZVU~ Y`vu=(c6SZgeA_a{m~p{oi`;KP0F<Z|Z2$lO 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 GIT binary patch delta 34 pcmeB>?~vyX<>lpKU|?WqwBXywy_A`wIN7qw(x^0T^A6?<+yI2K2_66d delta 34 qcmeB>?~vyX<>lpKU|?X_@_=I__flq#G_!0&BZHF6%{!Pca0395(g~XY 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 GIT binary patch delta 36 scmexzhw;lDM($8vUM>a(28KopzKz@;*f@%lEvqbzO4BwovlpfV0M{@J3;+NC delta 36 scmexzhw;lDM($8vUM>a(28JyUI5u*BVB<(L%QiGJD9PN+%wCud0OU{$i2wiq 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 GIT binary patch delta 34 pcmZ3Swm6MDl$V!_fq{Xc(SmOycMTIqak6EVrBP|x=6<Fr1^}7Q33mVh delta 34 qcmZ3Swm6MDl$V!_fq{Wx%L9&$+%-%bX=d4mMg}FBoBNrj7ytmK?+Nq( 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 GIT binary patch delta 34 pcmexg@V|gNl$V!_fq{Xc(SmOycP}ePak6EVrBP|x<^`<xjR3YO3b+6O delta 34 qcmexg@V|gNl$V!_fq{Wx%L9&$+`X(EX=d4mMg}FBn-{R&Hv#~|NeeXq 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 GIT binary patch delta 34 pcmdmIw9kk;l$V!_fq{Xc(SmOycO4T)ak6EVrBP|x=7~&e#Q>BA2}l3{ delta 34 qcmdmIw9kk;l$V!_fq{Wx%L9&$+;vPGX=d4mMg}FBn<p}@6$1dFB?-j< 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 GIT binary patch delta 33 ocmZ3?vzUiFl$V!_fq{Xc(SmOy_cT_H;$+JzOQX`X$tzi_0DJZblK=n! delta 33 pcmZ3?vzUiFl$V!_fq{Wx%L9&$+|yV&(#*0AjSNaMC$D6!0sx4a2@n7P 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 GIT binary patch delta 36 rcmZ3plyS{cM($8vUM>a(28KopzKz^YEF8tjmQ|KUrD>Z(S;GAQt5*qn delta 36 scmZ3plyS{cM($8vUM>a(28JyUI5u)Sv2diBWg8k9lw@uWWeN8K0JwJv_W%F@ 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 GIT binary patch delta 34 pcmdlWyg`^dl$V!_fq{Xc(SmOyw>~pRak6EVrBP|xW+&!6HUNSF2m=5B delta 34 pcmdlWyg`^dl$V!_fq{Wx%L9&$-1^KMX=d4mMg}FBo1K{R*Z_|q2!H?p 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 GIT binary patch delta 34 pcmbQ2IWLntl$V!_fq{Xc(SmOyw;eM_ak6EVrBP|x=0Ij&LjaTV2(thH delta 34 pcmbQ2IWLntl$V!_fq{Wx%L9&$+;+?yX=d4mMg}FBn**7B4FRDN2`~Tv 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 GIT binary patch delta 33 ocmeBX>t^E)<>lpKU|?WqwBXywy@!dTIN7qw(x^0T@_8m30CvC#UjP6A delta 33 ocmeBX>t^E)<>lpKU|?X_@_=I__Z}vWG_!0&BZHF6$>*7D0E1%)+yDRo 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 GIT binary patch delta 34 pcmX?RcFc@Bl$V!_fq{Xc(SmOy_bz6R;$+JzOQX`X&1ab_#Q~de38w%6 delta 34 qcmX?RcFc@Bl$V!_fq{Wx%L9&$+`E`L(#*0AjSNaMH=kv$6bAsPkP0LK 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 GIT binary patch delta 34 pcmezE`P-8_l$V!_fq{Xc(SmOyw<ae?ak6EVrBP|xW*g4^(g34^32OiV delta 34 qcmezE`P-8_l$V!_fq{Wx%L9&$+?t#mX=d4mMg}FBn{7DvO9KF~q6z2# 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 GIT binary patch delta 33 ocmeC?>*nJQ<>lpKU|?WqwBXyw?aaneoNQTTX;hjvIgD*90C49A{r~^~ delta 33 ocmeC?>*nJQ<>lpKU|?X_@_=I_w=)|@npw7?kwHo3<S@3a0DX!GdjJ3c 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 GIT binary patch delta 34 pcmZ3lwO)%ml$V!_fq{Xc(SmOy_gQw1;$+JzOQX`X%@5f9c>$B?30nXF delta 34 qcmZ3lwO)%ml$V!_fq{Wx%L9&$+-KQ2(#*0AjSNaMH$Pza=LG<v2npB# 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 GIT binary patch delta 34 pcmZ3Yu|$JAl$V!_fq{Xc(SmOyw=*k8ak6EVrBP|x<}lWCd;o@}2&n)7 delta 34 qcmZ3Yu|$JAl$V!_fq{Wx%L9&$+|H~VX=d4mMg}FBo5NVo@c{sn#R(<= 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 GIT binary patch delta 34 pcmeCy>(=8A<>lpKU|?WqwBXywt<TC)oNQTTX;hlF*@^X}AOL_I2w4CC delta 34 pcmeCy>(=8A<>lpKU|?X_@_=I_w>~RJnpw7?kwHo3W+&E@f&h&?2-W}q 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 GIT binary patch delta 34 pcmca>b=QhJl$V!_fq{Xc(SmOyw;C%)ak6EVrBP|xW=mET2>_N!2xR~O delta 34 pcmca>b=QhJl$V!_fq{Wx%L9&$+-j^GX=d4mMg}FBn=M&YBmkpn2;u+$ 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 GIT binary patch delta 34 pcmZ1(yE2wLl$V!_fq{Xc(SmOycQ*$|ak6EVrBP|x=6M|4Y5<v+2?ziH delta 34 qcmZ1(yE2wLl$V!_fq{Wx%L9&$+}#`;X=d4mMg}FBo9A(Gs{sI}w+V#+ 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 GIT binary patch delta 36 scmbPrhjG>&M($8vUM>a(28KopzKz^2tQ^J3mQ|KUrD>bPSr2Cb0JaVaPyhe` delta 36 scmbPrhjG>&M($8vUM>a(28JyUI5u*-uyUlCWg8k9lw@uWXFZ$&0K+Z{%>V!Z 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 GIT binary patch delta 36 scmeyjk@4R~M($8vUM>a(28KopzKz_DY#hbOmQ|KUrD>Z(*j5Dr0L4!Vj{pDw delta 36 scmeyjk@4R~M($8vUM>a(28JyUI5u)SvT>xDWg8k9lw@uWVOtdh0Mc&@3;+NC 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 GIT binary patch delta 36 scmdnCi*eg7M($8vUM>a(28KopzKz_iEF8tjmQ|KUrD>aIu*{190J&TWj{pDw delta 36 scmdnCi*eg7M($8vUM>a(28JyUI5u*(vT&rCWg8k9lw@w6!7?ub0LFX^3;+NC diff --git a/app/__init__.py b/app/__init__.py index 50c8aae..8b60638 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 GIT binary patch delta 65 zcmaFE`jwS8l$V!_fq{WxqBURo`H8%*I63u`^7FGZ^U^o|)n(-2Nh~PPg9=PGW>V+i JhH>JVdI67n6zl*1 delta 56 zcmey$`i7M^l$V!_fq{YH{#%ap!xMR5v9akF<QJE0V$@~i<V-9m&;#)%TQaG$a)4PG GOuYc-MiFxW diff --git a/app/bookings/__init__.py b/app/bookings/__init__.py new file mode 100644 index 0000000..1c569db --- /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 0000000..e68d45f --- /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 GIT binary patch delta 424 zcmcc5)WpIU%FD~ez`($8$B{4HhH)aF45QgZZRz?Hh7{%;mME4~<^`-NEDIS^SX0<q z7@8TQ*ix8-88q2ng7j!I-r_Gx%}YrwiZ4mcEyzhMN!4V$#gtUw_lr?K8KeS+nHU%t z*cccXoEaDxicJ_87)ltj7#1)tWT<7R0kN4<7*m*f8O0fD8B3T`m}}}87O;S<tzm@F zDXhI9YuWr>GBPkQXfobnNlC0MuHwqfOG&NJ%P7gssp3$L)K$&ZRZY=ky2V<OpORP^ z#Zi)<n_pCvU#`h|iz6kmB()?nH}w{CUViy4P7pICHK!!82;{a~9K|I?X&^C8CXm_U zC8<&TFx~O_Nm;4MB`X<<cqbk*D`W-v0puA5CN4$+#v*=@i`Z|mrsX6SXG2X(EGW>+ zP0Y+IVrF1qDB@sXV7SFvlwVqs3RYdj3lc>Td?0xao80`A(wtN~kPnMNT6h?F7&(|Y F7y-ALX$b%T delta 240 zcmZo-xzEHG%FD~ez`($;;0;H5J;Ovk8AiQ{+R}2V%nMjjm=`jpu%xiIFf=npv8J#E zGib8E1gTv)F-OAf7o&bMh=Yuo7#J9w85kIfIT#oiN*GcYn;C-{G@1OWxH9unQY-W_ zN^*0GK#Eo}6tOWdFch&(j%GAVX8~ye2{SMifpq$5vfW}$%SkNGE@Eb2V7SGRSWuvs wo0yqb1X6j6wJ5)|Bo(X@Y6{pW5Wx;sZj+mzQks)$#|SbPWDgG`4-*F?0BkERDF6Tf diff --git a/app/main/routes.py b/app/main/routes.py index 81fa7a7..c6235a1 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 1b2c0d7..0000000 --- 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 GIT binary patch literal 0 HcmV?d00001 literal 248 zcmWIL<>g{vU|?{5%aI<#z`*br#6iZ)3=9ko3=9m#Y77hvDGVu$ISjdsQH+cXsf;O1 zsZ7mGQOqd}Da<)6xvWvFj0`C(!3>(LFF__~GT!2J$|+4PD9X$$iDE6tFD@z8WW2>z zlwVqsTI{FEc8fJFC$TuYh>3xL;TA`Hd|qO1YJB`Hrlf*foQVYmdSD$zAP1~uDB@sX zfDpfQ^)vEwQ}t6zG7|HQ^pbNDEA_$V=qDBw=!5m>$H!;pWtPOp>lIYq;;_lhPbtkw RwPOVNf`x&Bfrp8U2>_p9J)r;q 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 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmWIL<>g{vU|=}=mLt8Lfq~&Mh=Yuo85kHG7#J9e^%xi!QW#Pga~N_NqZk=MY^EHh zT;?cdMut@81uQAd3mH>bQdnCUni->5Q`mwTG}&K*Oj^l!i@zu}FD11oz9cobASbaT zRg>`+Q&Pb%M*U=v0%Xj@z`)=PvW|m+fuV#Ug|V42m_d`tuS%dGzqq7WKQk{SwL&kW zBsZrBq;w@i5gP*og!rYcpOK%Ns-Ietk(g(smz<MWsh^gUSe&h&SWuu3(O#5aT9R6< zS5SG26>Jg<$SROQ3`|8J8~rrdZn1(j6@ff{i!-sHKo6|72&D8DE7$<AQiR127CQq2 b!z~V*-29Z%oK!nTkij6Q@i6i*aWDb^@jFf| diff --git a/app/posts/routes.py b/app/posts/routes.py deleted file mode 100644 index 95e1be7..0000000 --- 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 fd139a8..d38e612 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 0000000..12c034e --- /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 6b98693..9942207 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 290671e..5678f1f 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 b02c72d..0000000 --- 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 -- GitLab