diff --git a/devops/templates/Caddyfile b/devops/templates/Caddyfile
index fe2d1ecec..ec5a53952 100644
--- a/devops/templates/Caddyfile
+++ b/devops/templates/Caddyfile
@@ -4,29 +4,24 @@
(astro_url) {
# /event/:uid/ -> /event?event=
- @oldevent path_regexp eventp ^/(\w{2}/)?events/(.*)/?$/
- redir @oldevent /{re.eventp.1}events?event={re.eventp.2}
+ @oldevent path_regexp eventp ^/(\w{2}/)?events/([\w-]{36})/?$
+ redir @oldevent /{re.eventp.1}events?event={re.eventp.2} 302
# /loops/:uid/members -> /loops/members?chain=
- @oldmembers path_regexp membersp ^/(\w{2}/)?loops/(.*)/members/?$/
- redir @oldmembers /{re.membersp.1}loops/members?chain={re.membersp.2}
+ @oldmembers path_regexp membersp ^/(\w{2}/)?loops/([\w-]{36})/members/?$
+ redir @oldmembers /{re.membersp.1}loops/members?chain={re.membersp.2} 302
# /loops/:uid/users/signup -> /loops/users/signup?chain=
- @oldusersignup path_regexp userssignupp ^/(\w{2}/)?loops/(.*)/users/signup/?$/
- redir @oldusersignup /{re.userssignupp.1}loops/users/signup?chain={re.userssignupp.2}
+ @oldusersignup path_regexp userssignupp ^/(\w{2}/)?loops/([\w-]{36})/users/signup/?$
+ redir @oldusersignup /{re.userssignupp.1}loops/users/signup?chain={re.userssignupp.2} 302
# /loops/:uid/users/login -> /loops/users/login?chain=
- @olduserslogin path_regexp usersloginp ^/(\w{2}/)?loops/(.*)/users/login/?$/
- redir @olduserslogin /{re.usersloginp.1}loops/users/login?chain={re.usersloginp.2}
+ @olduserslogin path_regexp usersloginp ^/(\w{2}/)?loops/([\w-]{36})/users/login/?$
+ redir @olduserslogin /{re.usersloginp.1}loops/users/login?chain={re.usersloginp.2} 302
file_server
encode zstd gzip
try_files {path} {path}/ =404
-
- handle_errors {
- rewrite * /404.html
- file_server
- }
}
clothingloop.org, www.clothingloop.be, clothingloop.be {
@@ -156,6 +151,12 @@ acc.clothingloop.org {
import astro_url
root * /var/caddy/acc.clothingloop.org
}
+
+ handle_errors {
+ @err path_regexp errp ^/(\w{2}\/)?
+ rewrite * /{re.errp.1}404.html
+ file_server
+ }
}
acc.app.clothingloop.org {
diff --git a/frontend/astro.config.mjs b/frontend/astro.config.mjs
index 1469cf25a..bd0180eed 100644
--- a/frontend/astro.config.mjs
+++ b/frontend/astro.config.mjs
@@ -6,6 +6,7 @@ import tailwind from "@astrojs/tailwind";
// https://astro.build/config
export default defineConfig({
output: "static",
+ site: import.meta.env.PUBLIC_BASE_URL,
integrations: [react(), astroI18next(), tailwind()],
server: { port: 3000 },
outDir: "build",
diff --git a/frontend/src/layouts/Base.astro b/frontend/src/layouts/Base.astro
index 62ce7d8b6..d4c25249e 100644
--- a/frontend/src/layouts/Base.astro
+++ b/frontend/src/layouts/Base.astro
@@ -3,8 +3,8 @@ import Footer from "../components/react/components/Footer";
import Navbar from "../components/react/components/Navbar";
import i18next from "i18next";
import { getLanguageFlags } from "../languages";
-//@ts-ignore
-import { HeadHrefLangs } from "astro-i18next/components";
+// // @ts-ignore
+// import { HeadHrefLangs } from "astro-i18next/components";
import "../tailwind.css";
import "mapbox-gl/dist/mapbox-gl.css";
import "@mapbox/mapbox-gl-geocoder/dist/mapbox-gl-geocoder.css";
@@ -41,7 +41,7 @@ const { title } = Astro.props;
/>
-
+