studiocms 0.1.0-beta.24 → 0.1.0-beta.26

package/src/routes/api/sdk/update-latest-version-cache.ts

@@ -1,38 +1,36 @@
 import logger from 'studiocms:logger';
 import { SDKCore } from 'studiocms:sdk';
-import type { APIRoute } from 'astro';
-import { convertToVanilla, genLogger } from '../../../lib/effects/index.js';
-import { AllResponse, OptionsResponse } from '../../../lib/endpointResponses.js';
+import {
+	AllResponse,
+	createEffectAPIRoutes,
+	createJsonResponse,
+	Effect,
+	genLogger,
+	OptionsResponse,
+} from '../../../effect.js';
 
-const createJsonResponse = (data: unknown, status = 200) =>
-	new Response(JSON.stringify(data), {
-		status,
-		headers: {
-			'Content-Type': 'application/json',
-			Date: new Date().toUTCString(),
-		},
-	});
-
-export const GET: APIRoute = async (): Promise<Response> =>
-	await convertToVanilla(
-		genLogger('routes/sdk/update-latest-version-cache/GET')(function* () {
-			logger.info('Updating latest version cache');
-			const sdk = yield* SDKCore;
-			const latestVersion = yield* sdk.UPDATE.latestVersion();
-			logger.info('Latest version cache updated');
-			return createJsonResponse({ success: true, latestVersion });
-		})
-	).catch((error) => {
-		logger.error(`Error updating latest version cache: ${error.message}`);
-		return createJsonResponse(
-			{
-				success: false,
-				error: `Error updating latest version cache: ${error.message}`,
-			},
-			500
-		);
-	});
+export const { ALL, OPTIONS, GET } = createEffectAPIRoutes(
+	{
+		GET: () =>
+			genLogger('routes/sdk/update-latest-version-cache/GET')(function* () {
+				const sdk = yield* SDKCore;
+				const latestVersion = yield* sdk.UPDATE.latestVersion();
 
-export const OPTIONS: APIRoute = async () => OptionsResponse(['GET']);
-
-export const ALL: APIRoute = async () => AllResponse();
+				return createJsonResponse({ success: true, latestVersion });
+			}),
+		OPTIONS: () => Effect.try(() => OptionsResponse({ allowedMethods: ['GET'] })),
+		ALL: () => Effect.try(() => AllResponse()),
+	},
+	{
+		cors: { methods: ['GET', 'OPTIONS'] },
+		onError: (error) => {
+			logger.error(`API Error: ${(error as Error).message}`);
+			return createJsonResponse(
+				{ error: 'Something went wrong' },
+				{
+					status: 500,
+				}
+			);
+		},
+	}
+);

package/src/routes/api/sdk/utils/changelog.ts

@@ -1,175 +1,34 @@
-import { FetchHttpClient, HttpClient, HttpClientRequest } from '@effect/platform';
+import { loadChangelog, semverCategories } from '@withstudiocms/internal_helpers/utils';
 import type { APIContext } from 'astro';
-import { Effect, Schedule } from 'effect';
 import type { List, Root } from 'mdast';
-import { fromMarkdown } from 'mdast-util-from-markdown';
 import { toMarkdown } from 'mdast-util-to-markdown';
-import { toString as ToString } from 'mdast-util-to-string';
-import { visit } from 'unist-util-visit';
-import { genLogger } from '../../../../lib/effects/index.js';
-
-export type ParserState = 'packageName' | 'version' | 'semverCategory' | 'changes';
-
-export const semverCategories = ['major', 'minor', 'patch'] as const;
-export type SemverCategory = (typeof semverCategories)[number];
-
-export type Version = {
-	version: string;
-	changes: { [key in SemverCategory]: List };
-	includes: Set<string>;
-};
-
-export type Changelog = {
-	packageName: string;
-	versions: Version[];
-};
-
-function parsePackageReference(str: string) {
-	const matches = str.match(/^([@/a-z0-9-]+)@([0-9.]+)$/);
-	if (!matches) return;
-	const [, packageName, version] = matches;
-	return { packageName, version };
-}
+import { Effect, genLogger, HTTPClient, Platform, readAPIContextJson } from '../../../../effect.js';
 
 export class ProcessChangelog extends Effect.Service<ProcessChangelog>()('ProcessChangelog', {
 	effect: genLogger('routes/sdk/utils/changelog/ProcessChangelog/effect')(function* () {
-		const httpClient = (yield* HttpClient.HttpClient).pipe(
-			HttpClient.retryTransient({
-				times: 3,
-				schedule: Schedule.spaced('1 second'),
-			})
-		);
-
-		const getRawChangelog = genLogger(
-			'routes/sdk/utils/changelog/ProcessChangelog/effect.getRawChangelog'
-		)(function* () {
-			return yield* httpClient
-				.get(
-					'https://raw.githubusercontent.com/withstudiocms/studiocms/refs/heads/main/packages/studiocms/CHANGELOG.md'
-				)
-				.pipe(Effect.flatMap((res) => res.text));
-		});
+		const httpClient = yield* HTTPClient;
+
+		const getRawChangelog = () =>
+			genLogger('routes/sdk/utils/changelog/ProcessChangelog/effect.getRawChangelog')(function* () {
+				return yield* httpClient
+					.get(
+						'https://raw.githubusercontent.com/withstudiocms/studiocms/refs/heads/main/packages/studiocms/CHANGELOG.md'
+					)
+					.pipe(
+						Effect.flatMap((res) =>
+							res.status === 200
+								? res.text
+								: Effect.fail(
+										new Error(`Failed to fetch CHANGELOG.md: ${res.status} ${res.toString()}`)
+									)
+						)
+					);
+			});
 
 		const generateChangelog = (raw: string) =>
 			genLogger('routes/sdk/utils/changelog/ProcessChangelog/effect.generateChangelog')(
 				function* () {
-					let markdown = raw;
-
-					// Convert GitHub usernames in "Thanks ..." sentences to links
-					markdown = yield* Effect.try(() =>
-						markdown.replace(
-							/(?<=Thank[^.!]*? )@([a-z0-9-]+)(?=[\s,.!])/gi,
-							'[@$1](https://github.com/$1)'
-						)
-					);
-
-					const astStart = yield* Effect.try(() => fromMarkdown(markdown));
-
-					const changelog: Changelog = {
-						packageName: '',
-						versions: [],
-					};
-
-					let state: ParserState = 'packageName';
-					let version: Version | undefined;
-					let semverCategory: SemverCategory | undefined;
-
-					const handleNode = (node: ReturnType<typeof fromMarkdown>['children'][number]) =>
-						Effect.try(() => {
-							if (node.type === 'heading') {
-								if (node.depth === 1) {
-									if (state !== 'packageName') throw new Error('Unexpected h1');
-									changelog.packageName = ToString(node);
-									state = 'version';
-									return;
-								}
-								if (node.depth === 2) {
-									if (state === 'packageName') throw new Error('Unexpected h2');
-									version = {
-										version: ToString(node),
-										changes: {
-											major: { type: 'list', children: [] },
-											minor: { type: 'list', children: [] },
-											patch: { type: 'list', children: [] },
-										},
-										includes: new Set<string>(),
-									};
-									changelog.versions.push(version);
-									state = 'semverCategory';
-									return;
-								}
-								if (node.depth === 3) {
-									if (state === 'packageName' || state === 'version')
-										throw new Error('Unexpected h3');
-									semverCategory = (
-										ToString(node).split(' ')[0] || ''
-									).toLowerCase() as SemverCategory;
-									if (!semverCategories.includes(semverCategory))
-										throw new Error(`Unexpected semver category: ${semverCategory}`);
-									state = 'changes';
-									return;
-								}
-							}
-							if (node.type === 'list') {
-								if (state !== 'changes' || !version || !semverCategory)
-									throw new Error('Unexpected list');
-								// Go through list items
-								for (let listItemIdx = 0; listItemIdx < node.children.length; listItemIdx++) {
-									const listItem = node.children[listItemIdx];
-									if (!listItem) continue;
-
-									// Check if the current list item ends with a nested sub-list that consists
-									// of items matching the pattern `<some-package-name>@<version>`
-									const lastChild = listItem.children[listItem.children.length - 1];
-									if (lastChild?.type === 'list') {
-										const packageRefs: string[] = [];
-										lastChild.children.forEach((subListItem) => {
-											const text = ToString(subListItem);
-											if (parsePackageReference(text)) packageRefs.push(text);
-										});
-										if (packageRefs.length === lastChild.children.length) {
-											// If so, add the packages to `includes`
-											for (const packageRef of packageRefs) {
-												version.includes.add(packageRef);
-											}
-											// Remove the sub-list from the list item
-											listItem.children.pop();
-										}
-									}
-
-									const firstPara =
-										listItem.children[0]?.type === 'paragraph' ? listItem.children[0] : undefined;
-									if (firstPara) {
-										// Remove IDs like `bfed62a: ...` or `... [85dbab8]` from the first paragraph
-										visit(firstPara, 'text', (textNode) => {
-											textNode.value = textNode.value.replace(
-												/(^[0-9a-f]{7,}: | \[[0-9a-f]{7,}\]$)/,
-												''
-											);
-										});
-										// Skip list items that only contain the text `Updated dependencies`
-										const firstParaText = ToString(firstPara);
-										if (firstParaText === 'Updated dependencies') continue;
-										// If the list item is a package reference, add it to `includes` instead
-										const packageRef = parsePackageReference(firstParaText);
-										if (packageRef) {
-											version.includes.add(firstParaText);
-											continue;
-										}
-										// Add the list item to the changes
-										version.changes[semverCategory].children.push(listItem);
-									}
-								}
-								return;
-							}
-							throw new Error(`Unexpected node: ${JSON.stringify(node)}`);
-						});
-
-					for (const node of astStart.children) {
-						yield* handleNode(node);
-					}
-
-					const ToProcess = changelog;
+					const ToProcess = yield* Effect.try(() => loadChangelog({ raw }));
 
 					const output: string[] = [];
 
@@ -224,20 +83,22 @@ export class ProcessChangelog extends Effect.Service<ProcessChangelog>()('Proces
 
 		const renderChangelog = (content: string, context: APIContext) =>
 			genLogger('routes/sdk/utils/changelog/ProcessChangelog/effect.renderChangelog')(function* () {
-				const currentRequestJson = yield* Effect.tryPromise(() => context.request.json());
+				const currentRequestJson = yield* readAPIContextJson<{
+					currentURLOrigin: string;
+				}>(context);
 
 				const currentURLOrigin = currentRequestJson.currentURLOrigin;
 
 				const partialUrl = new URL(
-					context.locals.routeMap.endpointLinks.partials.render,
+					context.locals.StudioCMS?.routeMap.endpointLinks.partials.render,
 					currentURLOrigin
 				);
 
-				return yield* HttpClientRequest.post(partialUrl).pipe(
-					HttpClientRequest.setHeaders({
+				return yield* Platform.HttpClientRequest.post(partialUrl).pipe(
+					Platform.HttpClientRequest.setHeaders({
 						'Content-Type': 'application/json',
 					}),
-					HttpClientRequest.bodyJson({
+					Platform.HttpClientRequest.bodyJson({
 						content,
 					}),
 					Effect.flatMap(httpClient.execute),
@@ -251,7 +112,7 @@ export class ProcessChangelog extends Effect.Service<ProcessChangelog>()('Proces
 			renderChangelog,
 		};
 	}),
-	dependencies: [FetchHttpClient.layer],
+	dependencies: [HTTPClient.Default],
 }) {
 	static Provide = Effect.provide(this.Default);
 }

package/src/routes/auth/login.astro

@@ -1,11 +1,15 @@
 ---
-import { authEnvCheck } from 'studiocms:auth/utils/authEnvCheck';
 import { authConfig, developerConfig } from 'studiocms:config';
 import { useTranslations } from 'studiocms:i18n';
-import { Button, Card, Center, Input, Modal } from 'studiocms:ui/components';
-import AuthLayout from '../../layouts/auth/AuthLayout.astro';
-
-const lang = Astro.locals.defaultLang;
+import { Button } from 'studiocms:ui/components/button';
+import { Card } from 'studiocms:ui/components/card';
+import { Center } from 'studiocms:ui/components/center';
+import { Input } from 'studiocms:ui/components/input';
+import { Modal } from 'studiocms:ui/components/modal';
+import { providerData, showOAuth } from '../../components/auth/oAuthButtonProviders';
+import AuthLayout from '../../layouts/AuthLayout.astro';
+
+const lang = Astro.locals.StudioCMS.defaultLang;
 const t = useTranslations(lang, '@studiocms/auth:login');
 
 let DemoMode: {
@@ -25,16 +29,15 @@ if (developerConfig.demoMode) {
 }
 
 const {
-	providers,
 	providers: {
 		usernameAndPassword,
 		usernameAndPasswordConfig: { allowUserRegistration },
 	},
 } = authConfig;
 
-const { SHOW_OAUTH } = await authEnvCheck(providers);
+const SHOW_OAUTH = showOAuth && providerData.some(({ enabled }) => enabled);
 
-const { siteConfig: config } = Astro.locals;
+const { siteConfig: config } = Astro.locals.StudioCMS;
 
 const { enableMailer } = config.data || {
 	enableMailer: false,
@@ -68,7 +71,7 @@ if (usernameAndPassword && SHOW_OAUTH) {
             <t-login key="forgot-password-title">{t('forgot-password-title')}</t-login>
         </h2>
 
-        <input type="hidden" name="action-url" value={Astro.locals.routeMap.authLinks.forgotPasswordAPI} />
+        <input type="hidden" name="action-url" value={Astro.locals.StudioCMS.routeMap.authLinks.forgotPasswordAPI} />
 
         <p>
             <t-login key="forgot-password-message">{t('forgot-password-message')}</t-login>
@@ -106,7 +109,7 @@ if (usernameAndPassword && SHOW_OAUTH) {
     </div>
 
     { usernameAndPassword && (
-        <form class="form" id="login-form" method="post" action={Astro.locals.routeMap.authLinks.loginAPI}>
+        <form class="form" id="login-form" method="post" action={Astro.locals.StudioCMS.routeMap.authLinks.loginAPI}>
 
             <Input label={t('username-label')} name="username" type="text" />
             <Input label={t('password-label')} name="password" type='password' />
@@ -130,7 +133,7 @@ if (usernameAndPassword && SHOW_OAUTH) {
             <t-login key="allow-registration-noaccount">
                 {t('allow-registration-noaccount')}
             </t-login> 
-            <a href={Astro.locals.routeMap.authLinks.signupURL}>
+            <a href={Astro.locals.StudioCMS.routeMap.authLinks.signupURL}>
                 <t-login key="allow-registration-register">
                     {t('allow-registration-register')}
                 </t-login>
@@ -142,13 +145,13 @@ if (usernameAndPassword && SHOW_OAUTH) {
 
 <style>
     .forgot-password {
-        color: hsl(var(--text-muted));
+        color: var(--text-muted);
         font-size: 0.875rem;
         text-decoration: underline;
     }
 
     .forgot-password:hover {
-        color: hsl(var(--primary-hover));
+        color: var(--primary-hover);
         cursor: pointer;
     }
 
@@ -159,7 +162,7 @@ if (usernameAndPassword && SHOW_OAUTH) {
 
     .demo-table td {
         padding: 0.5rem;
-        border-bottom: 1px solid hsl(var(--border));
+        border-bottom: 1px solid var(--border);
     }
 
     .demo-table td:first-child {
@@ -171,7 +174,7 @@ if (usernameAndPassword && SHOW_OAUTH) {
     }
 
     .demo-table tr:nth-child(odd) {
-        background-color: hsl(var(--background-step-1));
+        background-color: var(--background-step-1);
     }
 
     .form-header {
@@ -213,47 +216,54 @@ if (usernameAndPassword && SHOW_OAUTH) {
 </script>
 
 <script>
-    import { formListener } from '../../scripts/formListener.js';
-    import { ModalHelper, toast } from 'studiocms:ui/components';
-    const loginForm = document.getElementById('login-form') as HTMLFormElement;
-
-    loginForm.addEventListener('submit', (event) => formListener(event, loginForm, 'login'));
-
-    const forgotPasswordModal = new ModalHelper('forgot-password-modal', 'forgot-password');
-
-    forgotPasswordModal.registerConfirmCallback(async (formData) => {
-        if (!formData) return;
-
-        const actionUrl = formData.get('action-url')?.toString() as string;
-
-        const data = {
-            email: formData.get('email')?.toString(),
-        };
-
-        const response = await fetch(actionUrl, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-            },
-            body: JSON.stringify(data),
-        });
-
-        const result = await response.json();
-
-        if (response.ok) {
-            toast({
-                title: 'Success',
-                description: result.message,
-                type: 'success',
-            })
-            return;
-        } else {
-            toast({
-                title: 'Error',
-                description: result.error || 'An error occurred',
-                type: 'danger',
-            })
-            return;
-        }
-    })
+    import { formListener } from '../../components/auth/component-scripts/formListener.js';
+    import { ModalHelper } from 'studiocms:ui/components/modal';
+    import { toast } from 'studiocms:ui/components/toaster';
+    
+    const loginForm = document.getElementById('login-form') as HTMLFormElement | null;
+    if (loginForm) {
+        loginForm.addEventListener('submit', (event) => formListener(event, loginForm, 'login'));
+    }
+
+    const forgotPasswordLink = document.getElementById('forgot-password') as HTMLDivElement;
+
+    if (forgotPasswordLink) {
+        const forgotPasswordModal = new ModalHelper('forgot-password-modal', 'forgot-password');
+
+        forgotPasswordModal.registerConfirmCallback(async (formData) => {
+            if (!formData) return;
+
+            const actionUrl = formData.get('action-url')?.toString() as string;
+
+            const data = {
+                email: formData.get('email')?.toString(),
+            };
+
+            const response = await fetch(actionUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify(data),
+            });
+
+            const result = await response.json();
+
+            if (response.ok) {
+                toast({
+                    title: 'Success',
+                    description: result.message,
+                    type: 'success',
+                })
+                return;
+            } else {
+                toast({
+                    title: 'Error',
+                    description: result.error || 'An error occurred',
+                    type: 'danger',
+                })
+                return;
+            }
+        })
+    }
 </script>

package/src/routes/auth/logout.astro

@@ -1,8 +1,8 @@
 ---
 import { useTranslations } from 'studiocms:i18n';
-import AuthLayout from '../../layouts/auth/AuthLayout.astro';
+import AuthLayout from '../../layouts/AuthLayout.astro';
 
-const lang = Astro.locals.defaultLang;
+const lang = Astro.locals.StudioCMS.defaultLang;
 const t = useTranslations(lang, '@studiocms/auth:logout');
 ---
 <AuthLayout 
@@ -14,7 +14,7 @@ const t = useTranslations(lang, '@studiocms/auth:logout');
 
 </AuthLayout>
 
-<div style="display: none;" id="redirect-to-logout" data-redirect={Astro.locals.routeMap.authLinks.logoutAPI}></div>
+<div style="display: none;" id="redirect-to-logout" data-redirect={Astro.locals.StudioCMS.routeMap.authLinks.logoutAPI}></div>
 
 <script>
 

package/src/routes/auth/signup.astro

@@ -1,22 +1,22 @@
 ---
-import { authEnvCheck } from 'studiocms:auth/utils/authEnvCheck';
 import { authConfig } from 'studiocms:config';
 import { useTranslations } from 'studiocms:i18n';
-import { Button, Input } from 'studiocms:ui/components';
-import AuthLayout from '../../layouts/auth/AuthLayout.astro';
+import { Button } from 'studiocms:ui/components/button';
+import { Input } from 'studiocms:ui/components/input';
+import { providerData, showOAuth } from '../../components/auth/oAuthButtonProviders.js';
+import AuthLayout from '../../layouts/AuthLayout.astro';
 
-const lang = Astro.locals.defaultLang;
+const lang = Astro.locals.StudioCMS.defaultLang;
 const t = useTranslations(lang, '@studiocms/auth:signup');
 
 const {
-	providers,
 	providers: {
 		usernameAndPassword,
 		usernameAndPasswordConfig: { allowUserRegistration },
 	},
 } = authConfig;
 
-const { SHOW_OAUTH } = await authEnvCheck(providers);
+const SHOW_OAUTH = showOAuth && providerData.some(({ enabled }) => enabled);
 
 let paragraph:
 	| 'sub-header-usernamepasswordoauth'
@@ -51,7 +51,7 @@ if (usernameAndPassword && SHOW_OAUTH) {
     </div>
 
     { usernameAndPassword && (
-        <form class="form" id="sign-up-form" method="post" action={Astro.locals.routeMap.authLinks.registerAPI}>
+        <form class="form" id="sign-up-form" method="post" action={Astro.locals.StudioCMS.routeMap.authLinks.registerAPI}>
 
             <Input label={t('username-label')} name="username" type="text" />
             <Input label={t('email-label')} name="email" type="email" />
@@ -70,7 +70,7 @@ if (usernameAndPassword && SHOW_OAUTH) {
             <t-signup key="allow-login-haveaccount">
                 {t('allow-login-haveaccount')}
             </t-signup> 
-            <a href={Astro.locals.routeMap.authLinks.loginURL}>
+            <a href={Astro.locals.StudioCMS.routeMap.authLinks.loginURL}>
                 <t-signup key="allow-login-login">
                     {t('allow-login-login')}
                 </t-signup>
@@ -116,7 +116,7 @@ if (usernameAndPassword && SHOW_OAUTH) {
 </script>
 
 <script>
-    import { formListener } from '../../scripts/formListener.js';
+    import { formListener } from '../../components/auth/component-scripts/formListener.js';
     const signUpForm = document.getElementById('sign-up-form') as HTMLFormElement;
 
     signUpForm.addEventListener('submit', async (event) => formListener(event, signUpForm, 'register'));

package/src/routes/dashboard/[...pluginPage].astro

@@ -1,10 +1,12 @@
 ---
 import { getPluginDashboardPages } from 'studiocms:plugin-helpers';
 import PageHeader from '../../components/dashboard/PageHeader.astro';
-import Layout from '../../layouts/dashboard/Layout.astro';
+import Layout from '../../layouts/DashboardLayout.astro';
 import type { FinalDashboardPage } from '../../schemas/index.js';
 
-const { siteConfig: config, userSessionData: currentUser, defaultLang: lang } = Astro.locals;
+const { siteConfig: config, defaultLang: lang, security } = Astro.locals.StudioCMS;
+
+const currentUser = security?.userSessionData ?? null;
 
 // Get all the pages from the plugins
 const { adminPages, userPages } = getPluginDashboardPages();

package/src/routes/dashboard/configuration.astro

@@ -1,11 +1,14 @@
 ---
 import { useTranslations } from 'studiocms:i18n';
-import { Button, Icon } from 'studiocms:ui/components';
+import { Button } from 'studiocms:ui/components/button';
+import { Icon } from 'studiocms:ui/components/icon';
 import ConfigForm from '../../components/dashboard/configuration/ConfigForm.astro';
 import PageHeader from '../../components/dashboard/PageHeader.astro';
-import Layout from '../../layouts/dashboard/Layout.astro';
+import Layout from '../../layouts/DashboardLayout.astro';
 
-const { siteConfig: config, userSessionData: currentUser, defaultLang: lang } = Astro.locals;
+const { siteConfig: config, defaultLang: lang, security } = Astro.locals.StudioCMS;
+
+const currentUser = security?.userSessionData ?? null;
 
 const t = useTranslations(lang, '@studiocms/dashboard:configuration');
 ---
@@ -22,7 +25,7 @@ const t = useTranslations(lang, '@studiocms/dashboard:configuration');
   <div slot="header">
     <PageHeader title={t('header')}>
       <Button variant="solid" color="primary" size="sm" type="submit" form="site-config-form">
-        <Icon slot="start-content" name="check-20-solid" width={20} height={20} />
+        <Icon slot="start-content" name="heroicons:check-20-solid" width={20} height={20} />
         <t-config key="save-button">{t('save-button')}</t-config>
       </Button>
     </PageHeader>

package/src/routes/dashboard/content-management/createfolder.astro

@@ -3,9 +3,11 @@ import { useTranslations } from 'studiocms:i18n';
 import CreateFolder from '../../../components/dashboard/content-mgmt/CreateFolder.astro';
 import InnerSidebarElement from '../../../components/dashboard/content-mgmt/InnerSidebarElement.astro';
 import PageHeader from '../../../components/dashboard/content-mgmt/PageHeader.astro';
-import Layout from '../../../layouts/dashboard/Layout.astro';
+import Layout from '../../../layouts/DashboardLayout.astro';
 
-const { siteConfig: config, userSessionData: currentUser, defaultLang: lang } = Astro.locals;
+const { siteConfig: config, defaultLang: lang, security } = Astro.locals.StudioCMS;
+
+const currentUser = security?.userSessionData ?? null;
 
 const t = useTranslations(lang, '@studiocms/dashboard:content-index');
 ---
@@ -90,7 +92,7 @@ const t = useTranslations(lang, '@studiocms/dashboard:content-index');
 
     p {
       font-size: 1.25rem;
-      color: hsl(var(--text-muted));
+      color: var(--text-muted);
     }
   }
 </style>