From 9a8a33382386b92885f03867d7e48be7cf895a4a Mon Sep 17 00:00:00 2001 From: thiloho <123883702+thiloho@users.noreply.github.com> Date: Sat, 7 Sep 2024 18:22:58 +0200 Subject: [PATCH] Serve routes without .html file extension --- nix/dev-vm.nix | 2 +- nix/module.nix | 4 ++-- web-app/src/lib/templates/blog/BlogArticle.svelte | 2 +- web-app/src/lib/templates/blog/BlogIndex.svelte | 2 +- web-app/src/lib/templates/common/Head.svelte | 2 +- web-app/src/lib/templates/common/Nav.svelte | 4 ++-- .../website/[websiteId]/publish/+page.server.ts | 6 +++--- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/nix/dev-vm.nix b/nix/dev-vm.nix index 2254fa9..773664a 100644 --- a/nix/dev-vm.nix +++ b/nix/dev-vm.nix @@ -70,7 +70,7 @@ "/" = { root = "/var/www/archtika-websites"; index = "index.html"; - tryFiles = "$uri $uri/ $uri/index.html =404"; + tryFiles = "$uri $uri/ $uri.html $uri/index.html index.html =404"; extraConfig = '' autoindex on; ''; diff --git a/nix/module.nix b/nix/module.nix index 1750d82..15f84f4 100644 --- a/nix/module.nix +++ b/nix/module.nix @@ -169,7 +169,7 @@ in "/previews/" = { alias = "/var/www/archtika-websites/previews/"; index = "index.html"; - tryFiles = "$uri $uri/ $uri/index.html =404"; + tryFiles = "$uri $uri/ $uri.html $uri/index.html index.html =404"; }; "/api/" = { proxyPass = "http://localhost:${toString cfg.apiPort}/"; @@ -190,7 +190,7 @@ in "/" = { alias = "/var/www/archtika-websites/$subdomain/"; index = "index.html"; - tryFiles = "$uri $uri/ $uri/index.html =404"; + tryFiles = "$uri $uri/ $uri.html $uri/index.html index.html =404"; }; }; }; diff --git a/web-app/src/lib/templates/blog/BlogArticle.svelte b/web-app/src/lib/templates/blog/BlogArticle.svelte index 6e375c4..e3a8adb 100644 --- a/web-app/src/lib/templates/blog/BlogArticle.svelte +++ b/web-app/src/lib/templates/blog/BlogArticle.svelte @@ -28,7 +28,7 @@ -