From 66b78b581698ff937984826883ebc5c6c1a814d6 Mon Sep 17 00:00:00 2001 From: lawsonredeye Date: Sun, 5 May 2024 22:25:40 +0100 Subject: [PATCH 1/4] updated readme --- .gitignore | 3 +++ README.md | 2 ++ 2 files changed, 5 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000000..316ac1f1fb4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +v4/ +installer.sh + diff --git a/README.md b/README.md index ae0c24c98f4..9648b8ba35c 100644 --- a/README.md +++ b/README.md @@ -158,6 +158,8 @@ Alexa Orrico - [Github](https://github.com/alexaorrico) / [Twitter](https://twit Jennifer Huang - [Github](https://github.com/jhuang10123) / [Twitter](https://twitter.com/earthtojhuang) Jhoan Zamora - [Github](https://github.com/jzamora5) / [Twitter](https://twitter.com/JhoanZamora10) David Ovalle - [Github](https://github.com/Nukemenonai) / [Twitter](https://twitter.com/disartDave) +Lawson Omoregbee - [Github](https://github.com/Lawsonredeye) / [Twitter](https://twitter.com/LawsonRedeye) +Justin Ebedi - [Github](https://github.com/La-Programmer) Second part of Airbnb: Joann Vuong ## License From bbc27d0c91dcd56b3538500f10783569440467e9 Mon Sep 17 00:00:00 2001 From: lawsonredeye Date: Sun, 5 May 2024 23:19:23 +0100 Subject: [PATCH 2/4] implemented a script to handle automation of moving files and renaming the route to /0-hbnb/ --- set.sh | 9 ++ web_dynamic/0-hbnb.py | 46 ++++++++ web_dynamic/__init__.py | 0 web_dynamic/static/images/icon.png | Bin 0 -> 2962 bytes web_dynamic/static/images/icon_bath.png | Bin 0 -> 704 bytes web_dynamic/static/images/icon_bed.png | Bin 0 -> 447 bytes web_dynamic/static/images/icon_group.png | Bin 0 -> 1051 bytes web_dynamic/static/images/logo.png | Bin 0 -> 9876 bytes web_dynamic/static/styles/3-footer.css | 16 +++ web_dynamic/static/styles/3-header.css | 11 ++ web_dynamic/static/styles/4-common.css | 11 ++ web_dynamic/static/styles/6-filters.css | 103 +++++++++++++++++ web_dynamic/static/styles/8-places.css | 101 +++++++++++++++++ web_dynamic/static/styles/w3c_validator.py | 123 +++++++++++++++++++++ web_dynamic/templates/0-hbnb.html | 78 +++++++++++++ 15 files changed, 498 insertions(+) create mode 100644 set.sh create mode 100755 web_dynamic/0-hbnb.py create mode 100755 web_dynamic/__init__.py create mode 100644 web_dynamic/static/images/icon.png create mode 100644 web_dynamic/static/images/icon_bath.png create mode 100644 web_dynamic/static/images/icon_bed.png create mode 100644 web_dynamic/static/images/icon_group.png create mode 100644 web_dynamic/static/images/logo.png create mode 100644 web_dynamic/static/styles/3-footer.css create mode 100644 web_dynamic/static/styles/3-header.css create mode 100644 web_dynamic/static/styles/4-common.css create mode 100644 web_dynamic/static/styles/6-filters.css create mode 100644 web_dynamic/static/styles/8-places.css create mode 100755 web_dynamic/static/styles/w3c_validator.py create mode 100644 web_dynamic/templates/0-hbnb.html diff --git a/set.sh b/set.sh new file mode 100644 index 00000000000..7d10f676b68 --- /dev/null +++ b/set.sh @@ -0,0 +1,9 @@ +#!/usr/bin/bash +# - used for setting up flask web dynamics + +mkdir -p web_dynamic +cp -r web_flask/static web_flask/templates/100-hbnb.html web_flask/__init__.py web_flask/100-hbnb.py web_dynamic +mv web_dynamic/100-hbnb.py web_dynamic/0-hbnb.py +mv web_dynamic/100-hbnb.html web_dynamic/0-hbnb.html + +sed -i "s#/hbnb#/0-hbnb/#g" web_dynamic/0-hbnb.py \ No newline at end of file diff --git a/web_dynamic/0-hbnb.py b/web_dynamic/0-hbnb.py new file mode 100755 index 00000000000..77842e2e115 --- /dev/null +++ b/web_dynamic/0-hbnb.py @@ -0,0 +1,46 @@ +#!/usr/bin/python3 +""" Starts a Flash Web Application """ +from models import storage +from models.state import State +from models.city import City +from models.amenity import Amenity +from models.place import Place +from os import environ +from flask import Flask, render_template +from uuid import uuid4 +app = Flask(__name__) +# app.jinja_env.trim_blocks = True +# app.jinja_env.lstrip_blocks = True + + +@app.teardown_appcontext +def close_db(error): + """ Remove the current SQLAlchemy Session """ + storage.close() + + +@app.route('/0-hbnb/', strict_slashes=False) +def hbnb(): + """ HBNB is alive! """ + states = storage.all(State).values() + states = sorted(states, key=lambda k: k.name) + st_ct = [] + + for state in states: + st_ct.append([state, sorted(state.cities, key=lambda k: k.name)]) + + amenities = storage.all(Amenity).values() + amenities = sorted(amenities, key=lambda k: k.name) + + places = storage.all(Place).values() + places = sorted(places, key=lambda k: k.name) + + return render_template('100-hbnb.html', + states=st_ct, + amenities=amenities, + places=places, cache_id=uuid4) + + +if __name__ == "__main__": + """ Main Function """ + app.run(host='0.0.0.0', port=5000) diff --git a/web_dynamic/__init__.py b/web_dynamic/__init__.py new file mode 100755 index 00000000000..e69de29bb2d diff --git a/web_dynamic/static/images/icon.png b/web_dynamic/static/images/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..93492bb8df2ec8408a935db7d4352e70e297d48d GIT binary patch literal 2962 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 UVsdFeFj^QqUHx3vIVCg!0N#=_Pyhe` literal 0 HcmV?d00001 diff --git a/web_dynamic/static/images/icon_bed.png b/web_dynamic/static/images/icon_bed.png new file mode 100644 index 0000000000000000000000000000000000000000..2a63284877067dcb61b769fd59e8ee373587b0be GIT binary patch literal 447 zcmeAS@N?(olHy`uVBq!ia0vp^Mj*_=3?wxlRx|^t$pJngu0XnMkb%!ndUAozGAIf1 z3ua(sX64}I;^CE*Q#3F%wXpN{i-=9nD6gz;XziFdWA5TjTelxSb?*G-JNG_+|M~mx zviF&$K)tIyT^vI^j=#O^&UeT_#Pwo+)q9mM_a;x+{r{?=!!(C77B>!oQ*-yt>6GnW zvb0u7U+vo+51u1=EDhnF`&QiX_{);$Z#jXF;fza^;C9#FjyJu$eswQfV=yaSXUXd8 zOV{`w(o3GyDaWjxm?#vV?{2*?Yr?E~e^`u+I&Q^G-!Q>}@0sHBZ48dCLMLt(OVPgg&ebxsLQ E03-gv2mk;8 literal 0 HcmV?d00001 diff --git a/web_dynamic/static/images/icon_group.png b/web_dynamic/static/images/icon_group.png new file mode 100644 index 0000000000000000000000000000000000000000..3e012ab4d5cdc2146782461b475b2a81ce0fea4d GIT binary patch literal 1051 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 z zi0}T0D~7O}@L0X`3Pv)RPH}_2ZUE=!qvloQ?k+KPX$s@PXzG|r@A0>dJd+*?&BN+y z&L=xzr$JO&Eu=D>KzjsM*d>odr7MmB{z(S~;&KYKii2K#hw3@RoY2rvH&$5>fEj^i z8|2^H%FM!pMEseLaW(}DW1ou6HW%F4>>=PnhM z&)Lu5_-JT|QQ+v7Q`}m{h-ECldHsfAX6!g8(_t-X-IkkcAUu<*3S7QL}O9GcV6!K@ZgeQ_F8K?G?+3lhvc*W zH2m)ClKEJg^+_$HRGW0rCj_ej$=~az7jIvL?}N+RGt|T)%l6#x}?n7h^wgxWk}s$!loc7caoRiwp7TgH(-Q`Ob33ybmILXlbWxz)h#UqAm5( zq>pZI8Sk07m9?)0AltyNV|hY88!+{r6$k@4Jm@0?l|CcM)G$szjGk|%jCyEW-ue<7 zX*LrdALvldTi1s|{?;8;Ol-FMqm+h*hAgKal=o`o(t$#$nVFCHDTbVRPky*{aHz|G z%A4&hF5AiOT%l4DxsLrj9~yLG{u^9qWok?WRD4z{ZtgoZf@Cn{)%u_YP<{^@HUrT0 zUv4J9{`^D-QW$M>JLbk>#mNFpC2Z-_R|R0&jI>4EQV3ioF73au^zb!pJ zHCmR*2heE5FR`#Ygeiv{mkJ<4uO4(@8r+>1qT5usfH%(BvBMm(^zv7?87n3PHDU~O zbOWg7R>aS=`GK9-T^u{WH>yoK$_mS}O@H)W$%$a{X3BnhxCN_jX^{eI7eLl4;*aJe zxKe?GGl#S&b+^@g)`t&OjBrLPFh*2G9ZteiaZ@f(gCS1YgaCqU@0)qFtN_F5)_|xr z{WB}|J>c0ke0+OL&<@aHvn7U*_w4HJ$4fN;1^|a9@@e^3ZS3Fg#AGBDC8|Ce1^*w{ C(Z%)v literal 0 HcmV?d00001 diff --git a/web_dynamic/static/styles/3-footer.css b/web_dynamic/static/styles/3-footer.css new file mode 100644 index 00000000000..2cd4ff05d90 --- /dev/null +++ b/web_dynamic/static/styles/3-footer.css @@ -0,0 +1,16 @@ +footer { + position: fixed; + background: white; + height: 60px; + width: 100%; + bottom: 0; + border-top: 1px solid #CCCCCC; +} +footer p { + position: absolute; + text-align: center; + top: 10%; + bottom: 0; + right: 0; + left: 0; +} diff --git a/web_dynamic/static/styles/3-header.css b/web_dynamic/static/styles/3-header.css new file mode 100644 index 00000000000..245cac7c980 --- /dev/null +++ b/web_dynamic/static/styles/3-header.css @@ -0,0 +1,11 @@ +header { + background: white; + height: 70px; + width: 100%; + border-bottom: 1px solid #CCCCCC; +} +header .logo { + background: url("../images/logo.png") no-repeat; + left: 20px; + height: 100%; +} diff --git a/web_dynamic/static/styles/4-common.css b/web_dynamic/static/styles/4-common.css new file mode 100644 index 00000000000..46cfc19d1c1 --- /dev/null +++ b/web_dynamic/static/styles/4-common.css @@ -0,0 +1,11 @@ +body { + margin: 0; + padding: 0; + color: #484848; + font-size: 14px; + font-family: Circular,"Helvetica Neue",Helvetica,Arial,sans-serif; +} +body .container { + max-width: 1000px; + margin: 30px auto; +} diff --git a/web_dynamic/static/styles/6-filters.css b/web_dynamic/static/styles/6-filters.css new file mode 100644 index 00000000000..d47107732aa --- /dev/null +++ b/web_dynamic/static/styles/6-filters.css @@ -0,0 +1,103 @@ +.container .filters { + position: relative; + background: white; + height: 70px; + width: 100%; + border: 1px solid #DDDDDD; + border-radius: 4px; +} +button { + position: absolute; + font-size: 18px; + background: #FF5A5F; + color: #FFFFFF; + height: 48px; + width: 20%; + border-style: none; + border-radius: 4px; + top: 15%; + right: 30px; +} +button:hover { + opacity: 0.9; +} +.filters div { + display: inline-grid; +} +.filters h2 { + margin-left: 15%; + margin-top: 0; + margin-bottom: 0; + font-weight: 600; +} +.filters h3 { + margin-left: 15%; + margin-bottom: 0; + font-weight: 600; +} +.filters h4 { + margin-left: 15%; + margin-top: 0; + font-weight: 400; + font-size: 14px; +} +.locations { + height: 100%; + width: 25%; + border-right: 1px solid #DDDDDD; +} +.amenities { + height: 100%; + width: 25%; +} + +.popover { + visibility: hidden; + width: 100%; + border: 1px solid #DDDDDD; + border-radius: 4px; + background: #FAFAFA; + padding-bottom: 15px; + height: 300px; + overflow-y: scroll; + scrollbar-width: none; + max-height: 300px; +} + +.popover::-webkit-scrollbar{ + width: 0px; +} + +.amenities .popover { + padding: 10px 0; + margin-left: -5px; + margin-top: 0%; +} + +.amenities .popover ul{ + margin: 0px; +} + +.locations .popover { + margin-top: 0%; +} +.popover ul { + list-style-type: none; + padding-bottom: 10px; + padding-left: 10px; +} +.popover ul li{ + padding: 4px; + padding-left: 10px; +} + +.popover ul h2{ + margin-top: 1.5%; + margin-bottom: 5%; + margin-left: 0px; +} + +.amenities:hover .popover, +.locations:hover .popover { + visibility: visible; +} diff --git a/web_dynamic/static/styles/8-places.css b/web_dynamic/static/styles/8-places.css new file mode 100644 index 00000000000..9dac66c0d7f --- /dev/null +++ b/web_dynamic/static/styles/8-places.css @@ -0,0 +1,101 @@ +.places { + column-count: 2; + columns: 30em; + justify-content: center; + padding: 0 20px; + margin-top: 1%; + margin-bottom: 8%; +} +@media only screen and (max-width: 920px) +{ + .places { + display: flex; + flex-wrap: wrap; + } +} + +.placesh1 h1 { + width: 100%; + margin-right: 400px; + text-align: left; + font-size: 35px; +} + +.places article { + -webkit-column-break-inside: avoid; + page-break-inside: avoid; + display: inline-block; + width: 390px; + height: 100%; + padding: 20px; + margin: 20px; + border: 1px solid #FF5A5F; + border-radius: 4px; +} +.places h2 { + font-size: 30px; + text-align: center; + margin-top: 0; +} +.title_box { + display: flex; + justify-content: space-between; + margin-top: -2%; +} + +.title_box h2 { + text-align: left; + margin: 25px 3% 40px 2%; + max-width: 75%; + word-wrap: break-word; +} +.price_by_night { + display: flex; + height: 60px; + min-width: 60px; + font-size: 30px; + justify-content: center; + align-items: center; + color: #FF5A5F; + border: 4px solid #FF5A5F; + border-radius: 50%; + align-items: center; + padding: 2.3%; +} + +.information { + display: flex; + justify-content: center; + align-items: center; + height: 80px; + border-top: 1px solid #DDDDDD; + border-bottom: 1px solid #DDDDDD; + margin-bottom: 5%; +} + +.information div { + display: flex; + justify-content: flex-end; + align-items: center; + flex-direction: column; + height: 65px; +} + +.information .max_guest { + background: url("../images/icon_group.png") no-repeat top center; + width: 100px; +} + +.information .number_rooms { + background: url("../images/icon_bed.png") no-repeat top center; + width: 100px; +} + +.information .number_bathrooms { + background: url("../images/icon_bath.png") no-repeat top center; + width: 100px; +} + +.user { + margin-bottom: 1.5%; +} diff --git a/web_dynamic/static/styles/w3c_validator.py b/web_dynamic/static/styles/w3c_validator.py new file mode 100755 index 00000000000..ee9593fce40 --- /dev/null +++ b/web_dynamic/static/styles/w3c_validator.py @@ -0,0 +1,123 @@ +#!/usr/bin/python3 +""" +W3C validator for Holberton School + +For HTML and CSS files. + +Based on 2 APIs: + +- https://validator.w3.org/nu/ +- http://jigsaw.w3.org/css-validator/validator + + +Usage: + +Simple file: + +``` +./w3c_validator.py index.html +``` + +Multiple files: + +``` +./w3c_validator.py index.html header.html styles/common.css +``` + +All errors are printed in `STDERR` + +Return: +Exit status is the # of errors, 0 on Success + +References + +https://developer.mozilla.org/en-US/ + +""" +import sys +import requests + + +def __print_stdout(msg): + """Print message in STDOUT + """ + sys.stdout.write(msg) + + +def __print_stderr(msg): + """Print message in STDERR + """ + sys.stderr.write(msg) + + +def __analyse_html(file_path): + """Start analyse of HTML file + """ + h = {'Content-Type': "text/html; charset=utf-8"} + d = open(file_path, "rb").read() + u = "https://validator.w3.org/nu/?out=json" + r = requests.post(u, headers=h, data=d) + res = [] + messages = r.json().get('messages', []) + for m in messages: + res.append("[{}:{}] {}".format(file_path, m['lastLine'], m['message'])) + return res + + +def __analyse_css(file_path): + """Start analyse of CSS file + """ + d = {'output': "json"} + f = {'file': (file_path, open(file_path, 'rb'), 'text/css')} + u = "http://jigsaw.w3.org/css-validator/validator" + r = requests.post(u, data=d, files=f) + res = [] + errors = r.json().get('cssvalidation', {}).get('errors', []) + for e in errors: + res.append("[{}:{}] {}".format(file_path, e['line'], e['message'])) + return res + + +def __analyse(file_path): + """Start analyse of a file and print the result + """ + nb_errors = 0 + try: + result = None + if file_path.endswith('.css'): + result = __analyse_css(file_path) + else: + result = __analyse_html(file_path) + + if len(result) > 0: + for msg in result: + __print_stderr("{}\n".format(msg)) + nb_errors += 1 + else: + __print_stdout("{}: OK\n".format(file_path)) + + except Exception as e: + __print_stderr("[{}] {}\n".format(e.__class__.__name__, e)) + return nb_errors + + +def __files_loop(): + """Loop that analyses for each file from input arguments + """ + nb_errors = 0 + for file_path in sys.argv[1:]: + nb_errors += __analyse(file_path) + + return nb_errors + + +if __name__ == "__main__": + """Main + """ + if len(sys.argv) < 2: + __print_stderr("usage: w3c_validator.py file1 file2 ...\n") + exit(1) + + """execute tests, then exit. Exit status = # of errors (0 on success) + """ + sys.exit(__files_loop()) diff --git a/web_dynamic/templates/0-hbnb.html b/web_dynamic/templates/0-hbnb.html new file mode 100644 index 00000000000..afa4622833f --- /dev/null +++ b/web_dynamic/templates/0-hbnb.html @@ -0,0 +1,78 @@ + + + + + + + + + + + HBnB + + +
+ +
+
+
+
+

States

+

 

+
+
    + {% for state in states %} +
  • +

    {{ state[0].name }}:

    +
      + {% for city in state[1] %} +
    • {{ city.name }}
      • + {% endfor %} +
    +
    • + {% endfor %} +
+
+
+
+

Amenities

+

 

+
+
    + {% for amenity in amenities %} +
  • {{ amenity.name }}
    • + {% endfor %} +
+
+
+ +
+

Places

+
+ + {% for place in places %} +
+
+

{{ place.name }}

+
${{ place.price_by_night }}
+
+
+
{{ place.max_guest }} Guest{% if place.max_guest != 1 %}s{% endif %}
+
{{ place.number_rooms }} Bedroom{% if place.number_rooms != 1 %}s{% endif %}
+
{{ place.number_bathrooms }} Bathroom{% if place.number_bathrooms != 1 %}s{% endif %}
+
+
+ Owner: {{ place.user.first_name }} {{ place.user.last_name }} +
+
+ {{ place.description | safe }} +
+
+ {% endfor %} +
+
+
+

Holberton School

+
+ + From d34fcd6f034c6a33e95198d457026678ee8f1a01 Mon Sep 17 00:00:00 2001 From: La-Programmer Date: Tue, 7 May 2024 08:54:43 +0100 Subject: [PATCH 3/4] Add feature to select amenities and update amenity list --- web_dynamic/1-hbnb.py | 46 ++++++++++++++++ web_dynamic/static/scripts/1-hbnb.js | 29 ++++++++++ web_dynamic/templates/1-hbnb.html | 80 ++++++++++++++++++++++++++++ 3 files changed, 155 insertions(+) create mode 100755 web_dynamic/1-hbnb.py create mode 100644 web_dynamic/static/scripts/1-hbnb.js create mode 100644 web_dynamic/templates/1-hbnb.html diff --git a/web_dynamic/1-hbnb.py b/web_dynamic/1-hbnb.py new file mode 100755 index 00000000000..6dd7bd437fe --- /dev/null +++ b/web_dynamic/1-hbnb.py @@ -0,0 +1,46 @@ +#!/usr/bin/python3 +""" Starts a Flash Web Application """ +from models import storage +from models.state import State +from models.city import City +from models.amenity import Amenity +from models.place import Place +from os import environ +from flask import Flask, render_template +from uuid import uuid4 +app = Flask(__name__) +# app.jinja_env.trim_blocks = True +# app.jinja_env.lstrip_blocks = True + + +@app.teardown_appcontext +def close_db(error): + """ Remove the current SQLAlchemy Session """ + storage.close() + + +@app.route('/1-hbnb/', strict_slashes=False) +def hbnb(): + """ HBNB is alive! """ + states = storage.all(State).values() + states = sorted(states, key=lambda k: k.name) + st_ct = [] + + for state in states: + st_ct.append([state, sorted(state.cities, key=lambda k: k.name)]) + + amenities = storage.all(Amenity).values() + amenities = sorted(amenities, key=lambda k: k.name) + + places = storage.all(Place).values() + places = sorted(places, key=lambda k: k.name) + + return render_template('1-hbnb.html', + states=st_ct, + amenities=amenities, + places=places, cache_id=uuid4()) + + +if __name__ == "__main__": + """ Main Function """ + app.run(debug=True, host='0.0.0.0', port=5000) diff --git a/web_dynamic/static/scripts/1-hbnb.js b/web_dynamic/static/scripts/1-hbnb.js new file mode 100644 index 00000000000..4e3c55974aa --- /dev/null +++ b/web_dynamic/static/scripts/1-hbnb.js @@ -0,0 +1,29 @@ +$(document).ready(function () { + const listElement = $('.amenities div.popover ul li input'); + let amenityList = []; + let amenityListName = []; + listElement.click(function() { + if ($(this).is(':checked')) { + console.log(amenityList); // DEBUG PRINT + amenityList.push($(this).attr("data-id")); + amenityListName.push($(this).attr("data-name")) + console.log(amenityListName); // DEBUG PRINT + updateH4(amenityListName); + } else { + console.log(amenityList); // DEBUG PRINT + const elementAttr = listElement.attr("data-id"); + const elementIndex = amenityList.indexOf(elementAttr); + console.log(elementIndex); // DEBUG PRINT + amenityList.splice(elementIndex, 1); + console.log(amenityList); // DEBUG PRINT + updateH4(amenityList); + } + }); + + function updateH4(list) { + const headerElement = $(".amenities h4"); + amenityListString = list.join(", "); + console.log(amenityListString); + headerElement.text(amenityListString); + }; +}); \ No newline at end of file diff --git a/web_dynamic/templates/1-hbnb.html b/web_dynamic/templates/1-hbnb.html new file mode 100644 index 00000000000..83be770838e --- /dev/null +++ b/web_dynamic/templates/1-hbnb.html @@ -0,0 +1,80 @@ + + + + + + + + + + + + + HBnB + + +
+ +
+
+
+
+

States

+

 

+
+
    + {% for state in states %} +
  • +

    {{ state[0].name }}:

    +
      + {% for city in state[1] %} +
    • {{ city.name }}
      • + {% endfor %} +
    +
    • + {% endfor %} +
+
+
+
+

Amenities

+

 

+
+
    + {% for amenity in amenities %} +
  • {{ amenity.name }}
    • + {% endfor %} +
+
+
+ +
+

Places

+
+ + {% for place in places %} +
+
+

{{ place.name }}

+
${{ place.price_by_night }}
+
+
+
{{ place.max_guest }} Guest{% if place.max_guest != 1 %}s{% endif %}
+
{{ place.number_rooms }} Bedroom{% if place.number_rooms != 1 %}s{% endif %}
+
{{ place.number_bathrooms }} Bathroom{% if place.number_bathrooms != 1 %}s{% endif %}
+
+
+ Owner: {{ place.user.first_name }} {{ place.user.last_name }} +
+
+ {{ place.description | safe }} +
+
+ {% endfor %} +
+
+
+

Holberton School

+
+ + From dffafe4d4739037d1f2173967955805e0ab88194 Mon Sep 17 00:00:00 2001 From: La-Programmer Date: Wed, 15 May 2024 12:26:39 +0100 Subject: [PATCH 4/4] Push all updates --- web_dynamic/0-hbnb.py | 4 +- web_dynamic/2-hbnb.py | 46 ++++++++++ web_dynamic/__pycache__/0-hbnb.cpython-38.pyc | Bin 0 -> 1658 bytes web_dynamic/__pycache__/1-hbnb.cpython-38.pyc | Bin 0 -> 1668 bytes web_dynamic/__pycache__/2-hbnb.cpython-38.pyc | Bin 0 -> 1668 bytes .../__pycache__/__init__.cpython-38.pyc | Bin 0 -> 143 bytes web_dynamic/static/scripts/1-hbnb.js | 2 +- web_dynamic/static/scripts/2-hbnb.js | 41 +++++++++ web_dynamic/static/styles/3-header.css | 16 ++++ web_dynamic/static/styles/6-filters.css | 13 ++- web_dynamic/templates/2-hbnb.html | 81 ++++++++++++++++++ 11 files changed, 199 insertions(+), 4 deletions(-) create mode 100755 web_dynamic/2-hbnb.py create mode 100644 web_dynamic/__pycache__/0-hbnb.cpython-38.pyc create mode 100644 web_dynamic/__pycache__/1-hbnb.cpython-38.pyc create mode 100644 web_dynamic/__pycache__/2-hbnb.cpython-38.pyc create mode 100644 web_dynamic/__pycache__/__init__.cpython-38.pyc create mode 100644 web_dynamic/static/scripts/2-hbnb.js create mode 100644 web_dynamic/templates/2-hbnb.html diff --git a/web_dynamic/0-hbnb.py b/web_dynamic/0-hbnb.py index 77842e2e115..cc169aef498 100755 --- a/web_dynamic/0-hbnb.py +++ b/web_dynamic/0-hbnb.py @@ -35,10 +35,10 @@ def hbnb(): places = storage.all(Place).values() places = sorted(places, key=lambda k: k.name) - return render_template('100-hbnb.html', + return render_template('0-hbnb.html', states=st_ct, amenities=amenities, - places=places, cache_id=uuid4) + places=places, cache_id=uuid4()) if __name__ == "__main__": diff --git a/web_dynamic/2-hbnb.py b/web_dynamic/2-hbnb.py new file mode 100755 index 00000000000..6bb3ccc43b6 --- /dev/null +++ b/web_dynamic/2-hbnb.py @@ -0,0 +1,46 @@ +#!/usr/bin/python3 +""" Starts a Flash Web Application """ +from models import storage +from models.state import State +from models.city import City +from models.amenity import Amenity +from models.place import Place +from os import environ +from flask import Flask, render_template +from uuid import uuid4 +app = Flask(__name__) +# app.jinja_env.trim_blocks = True +# app.jinja_env.lstrip_blocks = True + + +@app.teardown_appcontext +def close_db(error): + """ Remove the current SQLAlchemy Session """ + storage.close() + + +@app.route('/2-hbnb/', strict_slashes=False) +def hbnb(): + """ HBNB is alive! """ + states = storage.all(State).values() + states = sorted(states, key=lambda k: k.name) + st_ct = [] + + for state in states: + st_ct.append([state, sorted(state.cities, key=lambda k: k.name)]) + + amenities = storage.all(Amenity).values() + amenities = sorted(amenities, key=lambda k: k.name) + + places = storage.all(Place).values() + places = sorted(places, key=lambda k: k.name) + + return render_template('2-hbnb.html', + states=st_ct, + amenities=amenities, + places=places, cache_id=uuid4()) + + +if __name__ == "__main__": + """ Main Function """ + app.run(debug=True, host='0.0.0.0', port=5000) diff --git a/web_dynamic/__pycache__/0-hbnb.cpython-38.pyc b/web_dynamic/__pycache__/0-hbnb.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..50e88301e8aa0a04d4b864c6e507494f6f61555b GIT binary patch literal 1658 zcmb_cF>f0;6efAR(@B0OTldRNu}O*Qsjb&kY^&|ld$J?f-Vl&>K-!gExh{K`Om4`& zUwuz)$;~rneg^G*xh1#dy-SR2=a>w3=SgzxGUIHLB`_h<@!WM@Ne_ps5>JCa(E!pr(o#m)&sp`Bibv0m3h@Q`y4WlZlOzKoQ z(Mt#6bXv%#ImI(p19=AXIZWFH;>Z=fCYU}1%;p~^U#qe{SBV>|B%c~^>XPHHzBthN zSe3KnSXqm49}Sp6KTVkH+WN4SF}1lNW*wIQ{CGI7OEo;5T31xVgTfqEhbfp=Dm{NX ze5FRIoK;y_(k8zO^Cc0o?a1znKO$al#FThOa;!N7u@Mv_am zv^jyjlzji#`)RHG1Yi}&@Yd!c@Y;B#<)GyG=b5(qd$$JAM8TPw{hvb(7Q}2K*+zmD{^v}y1L8wm+6D5C{5^Wd{yw<% zH(y&d+}M?Rz?;b8ZL>`q5QR%t02{&m$(0pxof?q zX)27!ze#hPtteMaA?M@Gy&$?l?H7(o_zQo7L z;GOhP2##-(2LuDgK88R7fKO~Yl^I#Ts#1{hx^n6V=dZsAO+5vy5^&N4W?J3B%D3XG e^C7mWR{QvHc+fcQ-ue2#$04VkuuD5TG5Z_2UTwwz literal 0 HcmV?d00001 diff --git a/web_dynamic/__pycache__/1-hbnb.cpython-38.pyc b/web_dynamic/__pycache__/1-hbnb.cpython-38.pyc new file mode 100644 index 0000000000000000000000000000000000000000..d11dcd4625c20adb773fe52ae52c075672ab9636 GIT binary patch literal 1668 zcmb_cy>Hw$6elH0r#s)5?bt~=1PV~3xS_r_$j~7$YNrS~6h>ROC_tbPbRy%EO-UD$ z=kyMDQ!;e%-q9Wnbm-rswNvK~1qu}Cd%SaMv`dFj;M042kB{&D-Xp*5bXo*P_{S$N zdI2H7qHue_8u=8a`2~m|oCqpBMGKF66nS6y1>?-|Oa(>AL&pcIQA9j)e5jg5i?^~{Hr3$N#>ZcM zaiFrXEN1bsGzQ~78h9H0)Ip{yBWL8JcRU$@x3=X{$U-y8{qqWuW`GE4Su{zIeVh~Vi zGPJuH*e?-Gm)=jnV0zZOqL=;^SrW?@u7lnX;a_-5azd7LK|Ukj$4hTPFN1{#7T#$n znDACMC$N{2myevE#@de$R=x;sY?i*$Mr$ntEfe8eEwfG0SkQ&PV7B#|i0C2!sGIYC z{Q2S0VVpyAsQg?$jQ>+8EY>kh69QR~QxLA{(KU1iKqui(&m7t-(gmYBdaBZ5B+~u& zK>8gfneRG$pQQ{iS2DsG}q)(!5NPZ|04U_S~2M2=yBHbs*$udcxVbGM2Lm z#C$ZkUpJCOR9TYnu&9Jo#wE$yD`9UHA7;xp)=QAwOfy{Ru2)u|&0M~3cRKi7_O(|T z-M|gO3w)$B-c1JyXZSWbU@&m(X9&ax82Pr9sTS3%G65;8N-KY`?it{LuBL!l3{Gla mPs>}Fxt3ht0Elg>Hw$6elH0r~5wJv6FNN6rgBvLw!Y%B|u=*P7!n{jJ9r3fIuPWM8+qZk}f3A z=^f5fGIa6Y(H;$S=>O79Yp2fbRG>iLfMm~XQeg+~4CxQx3(Zb^%Mc!9_!8mg~Q$Z2((D8w46cLXcAF5{2;w{HF zRJ-W#j^iWMEqc6H^m*UOO*JSs_y#4iCpTYHz9qL#?ueFXzab!PgR~<$qAPkAp6H8# zTfHkc#m1?pe**12u_?C19kG4kgTI|4GQ7Kp<0G4DYvMG1u2M6Jzm?;7e>zopmfE~3 z_t*u7Shm`k>)p=$UgMdnt zq20~Eeu-eZ^nL^e)3e?cz4WihIk9Z%I_M1%{)Kl=j>$P)l26HZ@wvC8m%-8l3-2Tp zOn57sW7tc{%MYBN#@de$R=x;sY|eeBjn-NQS|-A`T4tM~v7}3X$!zO25z$2eP&XHY z__KqwY!)xdafKI}no;tKwqz6WI^i-wASfqRJ zf%H2}veK2=qgDzmqHV*pL$pUV0FIaFgo^aheGBv|2p&eYo=KES0NAn(ZE!*}fO z{TqLa_PXIFwopS>hX!w(shfZ(T(TV45bjSV4Ue)Enm)fO-x6IuLR^JLYUs8Ozxe zVm=(+uNz4ssw_!(SX4qPt53}X%^%5jE*9=#B>y;H~bC>Vioen;ieeG37 zH*iDn0v{=jchf<_8NN*p7z`Zy83OSEM!scbszvpxOhC%2(#r3xdj@!*s~KPxgOl3V mv+@>Zt|iwu0AiadxrYyk1CPg`k0!Jr{G!Xq5L?8o3AjbiSi&=m~3PUi1CZpd2KczG$ M)edCZXCP((0Jf1I>;M1& literal 0 HcmV?d00001 diff --git a/web_dynamic/static/scripts/1-hbnb.js b/web_dynamic/static/scripts/1-hbnb.js index 4e3c55974aa..9496b44ed20 100644 --- a/web_dynamic/static/scripts/1-hbnb.js +++ b/web_dynamic/static/scripts/1-hbnb.js @@ -26,4 +26,4 @@ $(document).ready(function () { console.log(amenityListString); headerElement.text(amenityListString); }; -}); \ No newline at end of file +}); diff --git a/web_dynamic/static/scripts/2-hbnb.js b/web_dynamic/static/scripts/2-hbnb.js new file mode 100644 index 00000000000..f3567d05b7d --- /dev/null +++ b/web_dynamic/static/scripts/2-hbnb.js @@ -0,0 +1,41 @@ +$(document).ready(function () { + const listElement = $('.amenities div.popover ul li input'); + let amenityList = []; + let amenityListName = []; + listElement.click(function() { + if ($(this).is(':checked')) { + console.log(amenityList); // DEBUG PRINT + amenityList.push($(this).attr("data-id")); + amenityListName.push($(this).attr("data-name")) + console.log(amenityListName); // DEBUG PRINT + updateH4(amenityListName); + } else { + console.log(amenityList); // DEBUG PRINT + const elementAttr = listElement.attr("data-id"); + const elementIndex = amenityList.indexOf(elementAttr); + console.log(elementIndex); // DEBUG PRINT + amenityList.splice(elementIndex, 1); + console.log(amenityList); // DEBUG PRINT + updateH4(amenityList); + } + }); + + function updateH4(list) { + const headerElement = $(".amenities h4"); + amenityListString = list.join(", "); + console.log(amenityListString); + headerElement.text(amenityListString); + }; + + $.ajax({ + url: 'http://0.0.0.0:5001/api/v1/status/', + success: function (data) { + indicator = $('#api_status'); + if (data.status == "OK") { + indicator.addClass("available"); + } else { + indicator.removeClass("available"); + } + } + }); + }); diff --git a/web_dynamic/static/styles/3-header.css b/web_dynamic/static/styles/3-header.css index 245cac7c980..4667a2c3cfd 100644 --- a/web_dynamic/static/styles/3-header.css +++ b/web_dynamic/static/styles/3-header.css @@ -2,10 +2,26 @@ header { background: white; height: 70px; width: 100%; + display: grid; + grid-template-columns: 95% 5%; border-bottom: 1px solid #CCCCCC; } + header .logo { background: url("../images/logo.png") no-repeat; left: 20px; height: 100%; } + +header #api_status { + border-radius: 100%; + height: 40px; + margin-top: 22%; + width: 40px; + margin-right: 30px; + background-color: #CCCCCC; +} + +.available { + background-color: #ff545f; +} diff --git a/web_dynamic/static/styles/6-filters.css b/web_dynamic/static/styles/6-filters.css index d47107732aa..0383e702dfe 100644 --- a/web_dynamic/static/styles/6-filters.css +++ b/web_dynamic/static/styles/6-filters.css @@ -70,14 +70,25 @@ button:hover { .amenities .popover { padding: 10px 0; + width: 300px; + position: absolute; margin-left: -5px; - margin-top: 0%; + margin-top: 70px; } .amenities .popover ul{ margin: 0px; } +.amenities h4 { + margin-top: 5px; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + height: fit-content; + width: 150%; +} + .locations .popover { margin-top: 0%; } diff --git a/web_dynamic/templates/2-hbnb.html b/web_dynamic/templates/2-hbnb.html new file mode 100644 index 00000000000..fa00ffbacb6 --- /dev/null +++ b/web_dynamic/templates/2-hbnb.html @@ -0,0 +1,81 @@ + + + + + + + + + + + + + HBnB + + +
+ +
+
+
+
+
+

States

+

 

+
+
    + {% for state in states %} +
  • +

    {{ state[0].name }}:

    +
      + {% for city in state[1] %} +
    • {{ city.name }}
      • + {% endfor %} +
    +
    • + {% endfor %} +
+
+
+
+

Amenities

+

 

+
+
    + {% for amenity in amenities %} +
  • {{ amenity.name }}
    • + {% endfor %} +
+
+
+ +
+

Places

+
+ + {% for place in places %} +
+
+

{{ place.name }}

+
${{ place.price_by_night }}
+
+
+
{{ place.max_guest }} Guest{% if place.max_guest != 1 %}s{% endif %}
+
{{ place.number_rooms }} Bedroom{% if place.number_rooms != 1 %}s{% endif %}
+
{{ place.number_bathrooms }} Bathroom{% if place.number_bathrooms != 1 %}s{% endif %}
+
+
+ Owner: {{ place.user.first_name }} {{ place.user.last_name }} +
+
+ {{ place.description | safe }} +
+
+ {% endfor %} +
+
+ + +