From 5d8107cb28727996daed016b0c79a9346f864d2b Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Sun, 10 May 2026 17:17:46 +0300 Subject: [PATCH] static path fix --- .github/workflows/ci.yml | 12 ++++++------ .gitignore | 2 +- README.md | 2 +- build.vsh | 9 ++------- gitly.v | 12 ++---------- .../{static => }/assets/circular_progress_bar.gif | Bin static/{static => }/assets/default_avatar.png | Bin static/{static => }/assets/favicon.svg | 0 static/{static => }/assets/version | 0 static/{static => }/css/admin.scss | 0 static/{static => }/css/blob.scss | 0 static/{static => }/css/branches.scss | 0 static/{static => }/css/ci.scss | 0 static/{static => }/css/commits.scss | 0 static/{static => }/css/contributors.scss | 0 static/{static => }/css/feed.scss | 0 static/{static => }/css/files.scss | 0 static/{static => }/css/gitly.scss | 0 static/{static => }/css/hl_table.scss | 0 static/{static => }/css/issues.scss | 0 static/{static => }/css/langs.scss | 0 static/{static => }/css/releases.scss | 0 static/{static => }/css/search.scss | 0 static/{static => }/css/tree.scss | 0 static/{static => }/css/user.scss | 0 static/{static => }/js/block-form.js | 0 static/{static => }/js/footer.js | 0 static/{static => }/js/gitly.js | 0 static/{static => }/js/ssh-list.js | 0 static/{static => }/js/tree.js | 0 static/{static => }/js/user.js | 0 static/{static => }/js/users.js | 0 static/{static => }/robots.txt | 0 33 files changed, 12 insertions(+), 25 deletions(-) rename static/{static => }/assets/circular_progress_bar.gif (100%) rename static/{static => }/assets/default_avatar.png (100%) rename static/{static => }/assets/favicon.svg (100%) rename static/{static => }/assets/version (100%) rename static/{static => }/css/admin.scss (100%) rename static/{static => }/css/blob.scss (100%) rename static/{static => }/css/branches.scss (100%) rename static/{static => }/css/ci.scss (100%) rename static/{static => }/css/commits.scss (100%) rename static/{static => }/css/contributors.scss (100%) rename static/{static => }/css/feed.scss (100%) rename static/{static => }/css/files.scss (100%) rename static/{static => }/css/gitly.scss (100%) rename static/{static => }/css/hl_table.scss (100%) rename static/{static => }/css/issues.scss (100%) rename static/{static => }/css/langs.scss (100%) rename static/{static => }/css/releases.scss (100%) rename static/{static => }/css/search.scss (100%) rename static/{static => }/css/tree.scss (100%) rename static/{static => }/css/user.scss (100%) rename static/{static => }/js/block-form.js (100%) rename static/{static => }/js/footer.js (100%) rename static/{static => }/js/gitly.js (100%) rename static/{static => }/js/ssh-list.js (100%) rename static/{static => }/js/tree.js (100%) rename static/{static => }/js/user.js (100%) rename static/{static => }/js/users.js (100%) rename static/{static => }/robots.txt (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c69b621..380ef0a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,8 +49,8 @@ jobs: - name: Compile CSS from SCSS files uses: gha-utilities/sass-build@v0.4.11 with: - source: gitly/src/static/css/gitly.scss - destination: gitly/src/static/css/gitly.css + source: gitly/static/css/gitly.scss + destination: gitly/static/css/gitly.css - name: Run all tests run: | @@ -104,8 +104,8 @@ jobs: - name: Compile CSS from SCSS files uses: gha-utilities/sass-build@v0.4.11 with: - source: gitly/src/static/css/gitly.scss - destination: gitly/src/static/css/gitly.css + source: gitly/static/css/gitly.scss + destination: gitly/static/css/gitly.css - name: Run all tests run: | cd gitly @@ -244,8 +244,8 @@ jobs: - name: Compile CSS from SCSS files uses: gha-utilities/sass-build@v0.4.11 with: - source: gitly/src/static/css/gitly.scss - destination: gitly/src/static/css/gitly.css + source: gitly/static/css/gitly.scss + destination: gitly/static/css/gitly.css - name: Run all tests run: | diff --git a/.gitignore b/.gitignore index 7bebb13..a123ead 100644 --- a/.gitignore +++ b/.gitignore @@ -6,7 +6,7 @@ bin/ *.css.map .sass-cache/ .lite_workspace.lua -src/static/assets/version +static/assets/version logs/ repos/ archives/ diff --git a/README.md b/README.md index 365f5bc..b0a9aa8 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ The SQLite database path defaults to `gitly.sqlite` and can be changed with `sql If you don't want to install `sassc`, you can simply run ``` -curl https://gitly.org/css/gitly.css --output static/static/css/gitly.css +curl https://gitly.org/css/gitly.css --output static/css/gitly.css ``` diff --git a/build.vsh b/build.vsh index 7327224..5cf1802 100644 --- a/build.vsh +++ b/build.vsh @@ -1,13 +1,8 @@ import net.http -static_root := if exists('static/static') && !exists('static/assets') { - 'static/static' -} else { - 'static' -} -path := '${static_root}/css/gitly.css' +path := 'static/css/gitly.css' if !exists(path) { - ret := system('sassc ${static_root}/css/gitly.scss > ${path}') + ret := system('sassc static/css/gitly.scss > ${path}') if ret != 0 { http.download_file('https://gitly.org/css/gitly.css', path)! println('No sassc detected on this system, gitly.css has been downloaded from gitly.org.') diff --git a/gitly.v b/gitly.v index 80c1017..db2ebcc 100644 --- a/gitly.v +++ b/gitly.v @@ -19,13 +19,6 @@ const max_repo_name_len = 100 const max_namechanges = 3 const namechange_period = time.hour * 24 -fn static_root_path() string { - if os.exists(os.join_path('static', 'static')) && !os.exists(os.join_path('static', 'assets')) { - return os.join_path('static', 'static') - } - return 'static' -} - @[heap] pub struct App { veb.StaticHandler @@ -77,8 +70,7 @@ fn new_app() !&App { app.setup_logger() - static_root := static_root_path() - version_path := os.join_path(static_root, 'assets', 'version') + version_path := os.join_path('static', 'assets', 'version') create_directory_if_not_exists(os.dir(version_path)) stored_version := os.read_file(version_path) or { 'unknown' } @@ -95,7 +87,7 @@ fn new_app() !&App { app.version = version - app.handle_static(static_root, true)! + app.handle_static('static', true)! if !os.exists('avatars') { os.mkdir('avatars')! } diff --git a/static/static/assets/circular_progress_bar.gif b/static/assets/circular_progress_bar.gif similarity index 100% rename from static/static/assets/circular_progress_bar.gif rename to static/assets/circular_progress_bar.gif diff --git a/static/static/assets/default_avatar.png b/static/assets/default_avatar.png similarity index 100% rename from static/static/assets/default_avatar.png rename to static/assets/default_avatar.png diff --git a/static/static/assets/favicon.svg b/static/assets/favicon.svg similarity index 100% rename from static/static/assets/favicon.svg rename to static/assets/favicon.svg diff --git a/static/static/assets/version b/static/assets/version similarity index 100% rename from static/static/assets/version rename to static/assets/version diff --git a/static/static/css/admin.scss b/static/css/admin.scss similarity index 100% rename from static/static/css/admin.scss rename to static/css/admin.scss diff --git a/static/static/css/blob.scss b/static/css/blob.scss similarity index 100% rename from static/static/css/blob.scss rename to static/css/blob.scss diff --git a/static/static/css/branches.scss b/static/css/branches.scss similarity index 100% rename from static/static/css/branches.scss rename to static/css/branches.scss diff --git a/static/static/css/ci.scss b/static/css/ci.scss similarity index 100% rename from static/static/css/ci.scss rename to static/css/ci.scss diff --git a/static/static/css/commits.scss b/static/css/commits.scss similarity index 100% rename from static/static/css/commits.scss rename to static/css/commits.scss diff --git a/static/static/css/contributors.scss b/static/css/contributors.scss similarity index 100% rename from static/static/css/contributors.scss rename to static/css/contributors.scss diff --git a/static/static/css/feed.scss b/static/css/feed.scss similarity index 100% rename from static/static/css/feed.scss rename to static/css/feed.scss diff --git a/static/static/css/files.scss b/static/css/files.scss similarity index 100% rename from static/static/css/files.scss rename to static/css/files.scss diff --git a/static/static/css/gitly.scss b/static/css/gitly.scss similarity index 100% rename from static/static/css/gitly.scss rename to static/css/gitly.scss diff --git a/static/static/css/hl_table.scss b/static/css/hl_table.scss similarity index 100% rename from static/static/css/hl_table.scss rename to static/css/hl_table.scss diff --git a/static/static/css/issues.scss b/static/css/issues.scss similarity index 100% rename from static/static/css/issues.scss rename to static/css/issues.scss diff --git a/static/static/css/langs.scss b/static/css/langs.scss similarity index 100% rename from static/static/css/langs.scss rename to static/css/langs.scss diff --git a/static/static/css/releases.scss b/static/css/releases.scss similarity index 100% rename from static/static/css/releases.scss rename to static/css/releases.scss diff --git a/static/static/css/search.scss b/static/css/search.scss similarity index 100% rename from static/static/css/search.scss rename to static/css/search.scss diff --git a/static/static/css/tree.scss b/static/css/tree.scss similarity index 100% rename from static/static/css/tree.scss rename to static/css/tree.scss diff --git a/static/static/css/user.scss b/static/css/user.scss similarity index 100% rename from static/static/css/user.scss rename to static/css/user.scss diff --git a/static/static/js/block-form.js b/static/js/block-form.js similarity index 100% rename from static/static/js/block-form.js rename to static/js/block-form.js diff --git a/static/static/js/footer.js b/static/js/footer.js similarity index 100% rename from static/static/js/footer.js rename to static/js/footer.js diff --git a/static/static/js/gitly.js b/static/js/gitly.js similarity index 100% rename from static/static/js/gitly.js rename to static/js/gitly.js diff --git a/static/static/js/ssh-list.js b/static/js/ssh-list.js similarity index 100% rename from static/static/js/ssh-list.js rename to static/js/ssh-list.js diff --git a/static/static/js/tree.js b/static/js/tree.js similarity index 100% rename from static/static/js/tree.js rename to static/js/tree.js diff --git a/static/static/js/user.js b/static/js/user.js similarity index 100% rename from static/static/js/user.js rename to static/js/user.js diff --git a/static/static/js/users.js b/static/js/users.js similarity index 100% rename from static/static/js/users.js rename to static/js/users.js diff --git a/static/static/robots.txt b/static/robots.txt similarity index 100% rename from static/static/robots.txt rename to static/robots.txt -- 2.39.5