diff --git a/search.py b/search.py index d4025b9..d934bf0 100644 --- a/search.py +++ b/search.py @@ -1,7 +1,7 @@ import sqlite3 from flask import Flask, render_template, request, request, jsonify, session -import os import random +import json app = Flask(__name__) @@ -10,6 +10,9 @@ SEARCH_DB_NAME = 'search.db' search_db = sqlite3.connect(SEARCH_DB_NAME, check_same_thread=False) search_db.row_factory = sqlite3.Row +with open("app_config.json", 'r') as file: + app_config = json.load(file) + def searchcommand(): query = request.form.get("query", "").strip() category = request.form.get("category", "").strip() @@ -90,7 +93,18 @@ def searchcommand(): return jsonify(results=results) def search(): - title_short = os.environ.get('TITLE_SHORT', 'Default Title') - title_long = os.environ.get('TITLE_LONG', 'Default Title') - return render_template("search.html", title_short=title_short, title_long=title_long) + title_short = app_config.get('TITLE_SHORT', 'Default Title') + title_long = app_config.get('TITLE_LONG' , 'Default Title') + header_color = app_config.get('header_color' , '#000') + header_text_color = app_config.get('header_text_color', '#fff') + background_color = app_config.get('background_color', '#fff') + main_text_color = app_config.get('main_text_color', '#000') + return render_template("search.html", + title_short=title_short, + title_long=title_long, + header_color=header_color, + header_text_color=header_text_color, + main_text_color=main_text_color, + background_color=background_color, + ) diff --git a/templates/app.html b/templates/app.html index 3181e86..1a65dd3 100644 --- a/templates/app.html +++ b/templates/app.html @@ -40,7 +40,7 @@ background-color: {{ header_color }}; color: {{ header_text_color }}; } - +
diff --git a/templates/search.html b/templates/search.html index 701fdae..589e427 100644 --- a/templates/search.html +++ b/templates/search.html @@ -3,15 +3,14 @@ - + - - + {{ title_short }} - + @@ -19,7 +18,7 @@ - + @@ -35,9 +34,17 @@