diff --git a/FlaskWebProject/FlaskWebProject/__init__.py b/FlaskWebProject/FlaskWebProject/__init__.py index e416d79..24c3a4e 100644 --- a/FlaskWebProject/FlaskWebProject/__init__.py +++ b/FlaskWebProject/FlaskWebProject/__init__.py @@ -17,7 +17,7 @@ def index(): } return render_template('index.html', goals=stats['goals'], assists=stats['assists'], matches=stats['matches'], matches_list=stats['matches_list'], - commit=lewy_globals.getCommit()) + commit_in_html=lewy_globals.getCommitInFormattedHTML()) @app.route('/mecze') def mecze(): diff --git a/FlaskWebProject/FlaskWebProject/lewy_globals.py b/FlaskWebProject/FlaskWebProject/lewy_globals.py index 6075d25..66fe5a8 100644 --- a/FlaskWebProject/FlaskWebProject/lewy_globals.py +++ b/FlaskWebProject/FlaskWebProject/lewy_globals.py @@ -1,10 +1,16 @@ from git import Repo # hash ostatniego commitu def getCommit(): - repo = "

Brak informacji o wersji skryptu

" try: - repo = Repo(search_parent_directories=True).head.object.hexsha - repo = f"

Commit: {repo[:11]}

" + return Repo(search_parent_directories=True).head.object.hexsha except: - pass + return None + +def getCommitInFormattedHTML(): + repo = "

Brak informacji o wersji skryptu

" + commit = getCommit() + + if commit is not None: + repo = f"

Commit: {commit[:11]}

" + return repo \ No newline at end of file diff --git a/FlaskWebProject/FlaskWebProject/routes.py b/FlaskWebProject/FlaskWebProject/routes.py index effc2cf..b6a478d 100644 --- a/FlaskWebProject/FlaskWebProject/routes.py +++ b/FlaskWebProject/FlaskWebProject/routes.py @@ -3,13 +3,13 @@ from FlaskWebProject import app @app.route('/') def index(): - # Odczyt ciasteczka "darkMode" – domyślnie "disabled" + # Odczyt ciasteczka "darkMode" – domyĹ›lnie "disabled" dark_mode = request.cookies.get('darkMode', 'disabled') return render_template('index.html', dark_mode=dark_mode) @app.route('/toggle_dark_mode') def toggle_dark_mode(): - # Przełącz tryb i zapisz w ciasteczku + # Przełącz tryb i zapisz w ciasteczku dark_mode = request.cookies.get('darkMode', 'disabled') new_mode = 'enabled' if dark_mode == 'disabled' else 'disabled' response = make_response("OK") diff --git a/FlaskWebProject/FlaskWebProject/templates/index.html b/FlaskWebProject/FlaskWebProject/templates/index.html index 8914e51..f9b07db 100644 --- a/FlaskWebProject/FlaskWebProject/templates/index.html +++ b/FlaskWebProject/FlaskWebProject/templates/index.html @@ -14,5 +14,5 @@ {% endblock %} {% block footer %} -{{ commit | safe }} +{{ commit_in_html | safe }} {% endblock %} \ No newline at end of file