diff --git a/app.py b/app.py index 5760375..41a505f 100644 --- a/app.py +++ b/app.py @@ -23,7 +23,7 @@ else: CACHE_TYPE = "NullCache" # Create a Flask WSGI app and configure it using values from the module. -app = Flask(__name__,static_folder='web/dist/assets/',static_url_path='/assets/') +app = Flask(__name__,static_folder='dist/assets/',static_url_path='/assets/') app.config.from_object(__name__) cache = Cache(app) flask_db = FlaskDB(app) diff --git a/ssr.py b/ssr.py index e8e132e..447cb48 100644 --- a/ssr.py +++ b/ssr.py @@ -16,7 +16,7 @@ from models import Episode, Series ssr_routes = Blueprint("ssr_routes", __name__, template_folder="templates") -with open("./web/dist/index.html") as f: +with open("./dist/index.html") as f: index_html = f.read() placeholder_token = 'CR Search' @@ -28,7 +28,7 @@ def draw_image(text: str, description: str, subtitle=None) -> BytesIO: if subtitle: text += "\n" + subtitle width, height = (1200, 600) - img = Image.open("./web/src/assets/background_small.png") + img = Image.open("./src/assets/background_small.png") mr_eves = ImageFont.truetype("web/fonts/Mr Eaves/Mr Eaves Small Caps.otf", 50) title_font = ImageFont.truetype("web/fonts/Nodesto Caps Condensed/Nodesto Caps Condensed.otf", 120) diff --git a/upload.sh b/upload.sh index b77b600..3db1b94 100755 --- a/upload.sh +++ b/upload.sh @@ -1,2 +1,2 @@ #!/bin/bash -rsync -rvzP web/dist/ lukas@lw1.at:/srv/server/crsearch/dist/ --fuzzy --delete-after -v +rsync -rvzP dist/ lukas@lw1.at:/srv/server/crsearch/dist/ --fuzzy --delete-after -v diff --git a/web/vue.config.js b/web/vue.config.js index 0c1b6c9..f2d9a68 100644 --- a/web/vue.config.js +++ b/web/vue.config.js @@ -2,5 +2,6 @@ * @type {import('@vue/cli-service').ProjectOptions} */ module.exports = { - assetsDir: "assets/" + assetsDir: "assets/", + outputDir: "../dist/" }