Skip to content

Commit 518260a

Browse files
committed
lint code
1 parent fe74204 commit 518260a

10 files changed

Lines changed: 65 additions & 42 deletions

File tree

.flake8

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
[flake8]
2+
exclude =
3+
migrations,
4+
venv,
5+
env,
6+
__pycache__,
7+
.git,
8+
.github,
9+
10+
max-line-length = 88
11+
ignore = E203, E266, E501, W503
12+
select = B,C,E,F,W

app/__init__.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
from flask import Flask
22

3-
from app.config import config
43
from app.extensions import db, migrate, login_manager, mail
54
from app.admin.admin_setup import setup_admin
65
from app.context_processor import setup_context_processor
76
from app.seo_optimization import setup_seo_optimization
87
from app.commands import create_admin
9-
8+
109

1110
def create_app(config_path: str = "app.config.config") -> Flask:
1211
app = Flask(__name__)

app/admin/views.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@ class MyAdminIndexView(AdminIndexView):
2020
Admin home page
2121
"""
2222

23-
@expose('/')
23+
@expose("/")
2424
def index(self):
25-
return self.render('admin/index.html')
26-
25+
return self.render("admin/index.html")
26+
2727
def is_accessible(self):
2828
return current_user.is_authenticated and current_user.is_admin
2929

app/config.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,4 +33,5 @@ class ProductionConfig(BaseConfig):
3333
DEBUG = False
3434
SQLALCHEMY_DATABASE_URI = os.getenv("DATABASE_URL")
3535

36+
3637
config = DevelopmentConfig()

app/context_processor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ def inject_global_functions():
1616
return dict(
1717
socials=socials,
1818
is_htmx=is_hx_request,
19-
)
19+
)

app/routes/auth.py

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
from flask import Blueprint, render_template, flash, redirect, url_for, request, session
2-
from flask_login import login_user, logout_user, login_required, current_user
3-
from werkzeug.security import generate_password_hash, check_password_hash
4-
from app.forms import LoginForm, RegistrationForm
1+
from flask import Blueprint, render_template, flash, redirect, url_for, request
2+
from flask_login import login_user, logout_user, login_required
3+
from werkzeug.security import check_password_hash
4+
from app.forms import LoginForm
55
from app.models import User
66
from app.utils import get_htmx_context
7-
from app import login_manager, db
7+
from app import login_manager
88

99

1010
dp = Blueprint("auth", __name__)
@@ -20,26 +20,30 @@ def login():
2020

2121
form = LoginForm()
2222

23-
if request.method == 'POST':
23+
if request.method == "POST":
2424
if form.validate_on_submit():
2525
user = User.query.filter_by(username=form.username.data).first()
2626

2727
if user and check_password_hash(user.password, form.password.data):
2828
login_user(user, remember=True)
2929

3030
next_page = request.args.get("next")
31-
31+
3232
flash(f"Successfully sign in {user}", "success")
3333

34-
return redirect(next_page) if next_page else redirect(url_for("site.index"))
35-
36-
flash(f"Invalid Login. Pleace check username or password", "danger")
37-
34+
return (
35+
redirect(next_page)
36+
if next_page
37+
else redirect(url_for("site.index"))
38+
)
39+
40+
flash("Invalid Login. Pleace check username or password", "danger")
41+
3842
template_name, context = get_htmx_context("auth/login.html")
3943

40-
context['form'] = form
41-
context['template_title'] = "Authorization"
42-
context['template_body_class_name'] = "login"
44+
context["form"] = form
45+
context["template_title"] = "Authorization"
46+
context["template_body_class_name"] = "login"
4347

4448
return render_template(template_name, **context)
4549

app/routes/site.py

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010

1111
dp = Blueprint("site", __name__)
1212

13+
1314
@dp.route("/uploads/<filename>")
1415
def uploaded_file(filename):
1516
return send_from_directory(config.UPLOAD_FOLDER, filename)
@@ -25,7 +26,7 @@ def index():
2526
"template_name": "site/index.html",
2627
"template_title": "Rustamov Akrom",
2728
"template_body_class_name": "index",
28-
"resume": resume_data
29+
"resume": resume_data,
2930
}
3031
return context
3132

@@ -81,16 +82,16 @@ def contact():
8182
else:
8283
print("Invalid fields.")
8384

84-
except Exception as e:
85+
except Exception:
8586
pass
8687

8788
context = {
8889
"template_name": "site/contact.html",
8990
"template_title": "Contacts",
9091
"template_body_class_name": "contact",
91-
"about": about_data
92+
"about": about_data,
9293
}
93-
94+
9495
return context
9596

9697

@@ -103,8 +104,8 @@ def portfolio():
103104
"template_name": "site/portfolio.html",
104105
"template_title": "Portfolio",
105106
"template_body_class_name": "portfolio",
106-
"projects": projects_data,
107-
"categories": categories_data
107+
"projects": projects_data,
108+
"categories": categories_data,
108109
}
109110
return context
110111

@@ -117,7 +118,7 @@ def portfolio_details(portfolio_id):
117118
"template_name": "site/portfolio_detail.html",
118119
"template_title": project_data.name,
119120
"template_body_class_name": "portfolio-details",
120-
"project": project_data
121+
"project": project_data,
121122
}
122123
return context
123124

@@ -136,7 +137,7 @@ def resume():
136137
"template_title": "Resume",
137138
"template_body_class_name": "resume",
138139
"resume_html": resume_html,
139-
"resume":resume_,
140+
"resume": resume_,
140141
}
141142
return context
142143

@@ -160,7 +161,7 @@ def services():
160161
"template_name": "site/services.html",
161162
"template_title": "Services",
162163
"template_body_class_name": "contact",
163-
"services": services_data
164+
"services": services_data,
164165
}
165166
return context
166167

@@ -172,7 +173,7 @@ def service_detail(service_id):
172173
context = {
173174
"template_name": "site/service_detail.html",
174175
"template_title": service_data.name,
175-
"template_body_class_name": "services-detail",
176+
"template_body_class_name": "services-detail",
176177
}
177178
return context
178179

app/seo_optimization.py

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,22 @@
33

44

55
def setup_seo_optimization(app: Flask):
6-
@app.route('/sitemap.xml', methods=['GET'])
6+
@app.route("/sitemap.xml", methods=["GET"])
77
def sitemap():
88
pages = []
9-
ten_days_ago = (datetime.datetime.now() - datetime.timedelta(days=10)).date().isoformat()
9+
ten_days_ago = (
10+
(datetime.datetime.now() - datetime.timedelta(days=10)).date().isoformat()
11+
)
1012

1113
# Собираем все маршруты (URL) сайта
1214
for rule in app.url_map.iter_rules():
13-
if "GET" in rule.methods and rule.defaults is not None and len(rule.defaults) >= len(rule.arguments):
15+
if (
16+
"GET" in rule.methods
17+
and rule.defaults is not None
18+
and len(rule.defaults) >= len(rule.arguments)
19+
):
1420
pages.append([rule.rule, ten_days_ago])
1521

16-
sitemap_xml = render_template('sitemap_template.xml', pages=pages)
17-
response = Response(sitemap_xml, mimetype='application/xml')
22+
sitemap_xml = render_template("sitemap_template.xml", pages=pages)
23+
response = Response(sitemap_xml, mimetype="application/xml")
1824
return response

app/utils.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from functools import wraps
22

3-
from flask import render_template, redirect, url_for, request
4-
from flask_login import current_user
3+
from flask import render_template, request
54

65

76
def htmx_route():
@@ -11,25 +10,26 @@ def decorator(func):
1110
def wrapper(*args, **kwargs):
1211
context = func(*args, **kwargs)
1312

14-
template_htmx = context['template_name']
13+
template_htmx = context["template_name"]
1514

1615
if not request.headers.get("HX-Request"):
17-
context['template_htmx'] = template_htmx
16+
context["template_htmx"] = template_htmx
1817
template_name = "include_content.html"
1918

2019
return render_template(template_name, **context)
2120
return render_template(template_htmx, **context)
21+
2222
return wrapper
23+
2324
return decorator
2425

2526

26-
def get_htmx_context(template_name = None) -> tuple[str, dict]:
27+
def get_htmx_context(template_name=None) -> tuple[str, dict]:
2728
context = {}
2829
template_htmx = template_name
2930

3031
if not request.headers.get("HX-Request"):
31-
context['template_htmx'] = template_htmx
32+
context["template_htmx"] = template_htmx
3233
template_name = "include_content.html"
3334

3435
return template_name, context
35-

0 commit comments

Comments
 (0)