Skip to content

fix: Fixed UI redirects if TEMPORAL_UI_PUBLIC_PATH is provided for home button and /render. (#2846) #2976

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

fix: Fixed UI redirects if TEMPORAL_UI_PUBLIC_PATH is provided for home button and /render. (#2846) #2976

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/lib/holocene/markdown-editor/preview.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script lang="ts">
import { type ClassNameValue, twMerge } from 'tailwind-merge';

import { base } from '$app/paths';
import { page } from '$app/state';

import { useDarkMode } from '$lib/utilities/dark-mode';
Expand Down Expand Up @@ -50,7 +51,7 @@
const templatedContent = $derived(replaceTemplate(content));
const previewTheme = $derived($useDarkMode ? 'dark' : 'light');
const previewPath = $derived(
`/render?content=${encodeURIComponent(templatedContent)}&theme=${previewTheme}&overrideTheme=${overrideTheme}`,
`${base}/render?content=${encodeURIComponent(templatedContent)}&theme=${previewTheme}&overrideTheme=${overrideTheme}`,
);
</script>

Expand Down
4 changes: 3 additions & 1 deletion src/lib/holocene/navigation/navigation-container.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<script lang="ts">
import { twMerge as merge } from 'tailwind-merge';

import { base } from '$app/paths';
import { page } from '$app/stores';

import Icon from '$lib/holocene/icon/icon.svelte';
Expand All @@ -13,6 +14,7 @@
const toggle = () => ($navOpen = !$navOpen);

$: version = $page.data?.settings?.version ?? '';
$: baseUrl = base === '' ? '/' : base;
</script>

<nav
Expand All @@ -30,7 +32,7 @@
<div
class="flex items-center justify-between pb-4 group-data-[nav=closed]:flex-col group-data-[nav=closed]:gap-2"
>
<a href="/" class="flex w-fit items-center gap-1 text-nowrap">
<a href={baseUrl} class="flex w-fit items-center gap-1 text-nowrap">
<Logo height={24} width={24} class="m-1" />
<p class="text-base font-medium group-data-[nav=closed]:hidden">
{isCloud ? 'Cloud' : 'Self-Hosted'}
Expand Down