Compare commits

...
Sign in to create a new pull request.

4 commits

Author SHA1 Message Date
395dd6cf9b
fix: layout preview not working with a non-default baseurl
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
2025-08-09 12:42:33 +02:00
307969ffe5 Merge pull request 'Implement method for checking member permissions' (#68) from permissions-management into main
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
Reviewed-on: #68
Reviewed-by: Twig <git@beaver.mom>
2025-08-07 20:14:07 +00:00
62156a1049
Merge branch 'main' into permissions-management
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
ci/woodpecker/pr/build-and-publish Pipeline was successful
ci/woodpecker/pull_request_closed/build-and-publish Pipeline was successful
2025-08-07 22:12:47 +02:00
76f77f7bfe
fix: invite link generation not accounting for baseURL
All checks were successful
ci/woodpecker/push/build-and-publish Pipeline was successful
2025-08-07 09:07:46 +02:00
2 changed files with 7 additions and 4 deletions

View file

@ -40,7 +40,8 @@ function copyInvite(type: "link" | "code") {
if (!invite.value) return;
if (type == "link") {
const inviteUrl = URL.parse(`invite/${invite.value}`, `${window.location.protocol}//${window.location.host}`);
const runtimeConfig = useRuntimeConfig();
const inviteUrl = URL.parse(`invite/${invite.value}`, `${window.location.protocol}//${window.location.host}${runtimeConfig.app.baseURL}`);
if (inviteUrl) {
navigator.clipboard.writeText(inviteUrl.href);
}

View file

@ -34,7 +34,8 @@
<span class="theme-title" :style="{color:`${layout.complementaryColor}`}">
{{ layout.displayName }}
</span>
<NuxtImg class="layout-preview" :src="layout.previewImageUrl"></NuxtImg>
<!-- this breaks if it's a nuxtimg, i don't know why -->
<img class="layout-preview" :src="layout.previewImageUrl"></img>
</div>
</div>
</div>
@ -60,8 +61,8 @@ import { settingSave, settingsLoad } from '#imports';
const runtimeConfig = useRuntimeConfig()
const baseURL = runtimeConfig.app.baseURL;
const styleFolder = `${baseURL}themes/style`
const layoutFolder = `${baseURL}themes/layout`
const styleFolder = `${baseURL}/themes/style`
const layoutFolder = `${baseURL}/themes/layout`
const timeFormatTextStrings = ["Auto", "12-Hour", "24-Hour"]
@ -115,6 +116,7 @@ async function parseTheme(url: string): Promise<Theme | void> {
break
case "previewImageUrl":
previewImageUrl = `${layoutFolder}/${lineArray[1].trim()}`
console.log(previewImageUrl)
break
}
}