Skip to content

Commit f98c205

Browse files
committed
Resolve longstanding style issues.
1 parent fd52118 commit f98c205

File tree

13 files changed

+34
-574
lines changed

13 files changed

+34
-574
lines changed

flask_blueprint_tutorial/__init__.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ def create_app():
1414
# Import parts of our application
1515
from .assets import compile_static_assets
1616
from .home import home
17-
from .products import products
17+
from .product import product
1818
from .profile import profile
1919

2020
# Register Blueprints
2121
app.register_blueprint(profile.profile_blueprint)
2222
app.register_blueprint(home.home_blueprint)
23-
app.register_blueprint(products.product_bp)
23+
app.register_blueprint(product.product_blueprint)
2424

2525
# Compile static assets
2626
compile_static_assets(assets)

flask_blueprint_tutorial/assets.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ def compile_static_assets(assets: Bundle) -> Bundle:
3232
extra={"rel": "stylesheet/less"},
3333
)
3434
product_style_bundle = Bundle(
35-
"products_blueprint/less/products.less",
35+
"product_blueprint/less/product.less",
3636
filters="less,cssmin",
37-
output="dist/css/products.css",
37+
output="dist/css/product.css",
3838
extra={"rel": "stylesheet/less"},
3939
)
4040
assets.register("common_style_bundle", common_style_bundle)

flask_blueprint_tutorial/products/products.py renamed to flask_blueprint_tutorial/product/product.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
from flask_blueprint_tutorial.api import fetch_products
77

88
# Blueprint Configuration
9-
product_bp = Blueprint("products_blueprint", __name__, template_folder="templates", static_folder="static")
9+
product_blueprint = Blueprint("product_blueprint", __name__, template_folder="templates", static_folder="static")
1010

1111

12-
@product_bp.route("/products/<int:product_id>/", methods=["GET"])
12+
@product_blueprint.route("/products/<int:product_id>/", methods=["GET"])
1313
def product_page(product_id: int) -> str:
1414
"""
1515
Product detail page for a given product ID.
@@ -20,8 +20,8 @@ def product_page(product_id: int) -> str:
2020
"""
2121
product = fetch_products(app)[product_id]
2222
return render_template(
23-
"products.jinja2",
23+
"product.jinja2",
2424
title=product["name"],
2525
product=product,
26-
template="profile-template",
26+
template="product-template",
2727
)

flask_blueprint_tutorial/products/static/less/products.less renamed to flask_blueprint_tutorial/product/static/less/product.less

+14-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
@import 'vars.less';
22

3-
.profile-template {
3+
.product-template {
44
.product-name {
55
font-size: 1.9em;
66
margin-bottom: 30px !important;
@@ -9,13 +9,20 @@
99

1010
.product-image {
1111
height: 250px;
12+
max-width: 30vw;
1213
margin-right: 40px;
1314
border-radius: 3px;
1415
}
1516

16-
.product-flex {
17-
display: flex;
18-
justify-content: space-between;
17+
.product-details {
18+
display: grid;
19+
grid-template-columns: 1fr 2fr;
20+
21+
.product-info {
22+
display: flex;
23+
justify-content: space-between;
24+
flex-direction: column;
25+
}
1926
}
2027

2128
.meta {
@@ -41,8 +48,10 @@
4148
font-weight: 400;
4249
border: 1px solid @theme-color;
4350
transition: @transition;
44-
padding: 8px 14px;
51+
padding: 10px;
4552
font-size: 1em;
53+
font-weight: bold;
54+
max-width: 283px;
4655

4756
&:hover {
4857
cursor: pointer;

flask_blueprint_tutorial/products/templates/products.jinja2 renamed to flask_blueprint_tutorial/product/templates/product.jinja2

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "layout.jinja2" %}
22

33
{% block pagestyles %}
4-
{% assets "product_less_bundle" %}
4+
{% assets "product_style_bundle" %}
55
<link href="{{ ASSET_URL }}" rel="stylesheet" type="text/css">
66
{% endassets %}
77
{% endblock %}
@@ -11,9 +11,9 @@
1111

1212
<div class="container">
1313
<h1 class="product-name">{{ product.name }}</h1>
14-
<div class="product-flex">
15-
<img class="product-image" src="{{ product.image }}" alt="profile">
16-
<div class="product-details">
14+
<div class="product-details">
15+
<img class="product-image" src="{{ product.image }}" alt="{{ product.name }}">
16+
<div class="product-info">
1717
<div class="product-price meta"><span class="meta-name">Price:</span> <span>${{ product.salePrice }}</span></div>
1818
<div class="product-review-average meta"><span class="meta-name">Rating:</span> <span>{{ product.customerReviewAverage }}/5</span></div>
1919
<div class="product-review-count meta"><span class="meta-name"># Reviews:</span> <span>{{ product.customerReviewCount }}</span></div>

flask_blueprint_tutorial/profile/templates/profile.jinja2

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{% extends "layout.jinja2" %}
22

33
{% block pagestyles %}
4-
{% assets "profile_less_bundle" %}
4+
{% assets "profile_style_bundle" %}
55
<link href="{{ ASSET_URL }}" rel="stylesheet" type="text/css">
66
{% endassets %}
77
{% endblock %}

flask_blueprint_tutorial/static/dist/css/product.css

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flask_blueprint_tutorial/static/dist/css/products.css

-1
This file was deleted.

flask_blueprint_tutorial/static/dist/css/style.css

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flask_blueprint_tutorial/static/src/less/nav.less

+4-5
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22

33
nav {
44
background: #fff;
5-
padding: 30px;
6-
width: auto;
5+
padding: 20px 0;
76
margin-bottom: 40px;
87
box-shadow: 0 0 5px #bec6cf;
98

109
.nav-wrapper {
11-
max-width: 1014px !important;
10+
width: 985px !important;
11+
max-width: 88% !important;
1212
display: flex;
1313
justify-content: space-between;
1414
align-items: center;
15-
width: auto;
16-
margin: 0 auto;
15+
margin: 0 !important;
1716

1817
.left-nav {
1918
display: flex;

flask_blueprint_tutorial/static/src/less/style.less

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ html {
2525
}
2626

2727
h1 {
28-
line-height: 1;
28+
line-height: 1.5;
2929
margin: 0 0 5px;
3030
}
3131

0 commit comments

Comments
 (0)