Open source website builder and Webflow alternative. Webstudio is an advanced visual builder that connects to any headless CMS, supports all CSS properties, and can be hosted anywhere, including with us.
TypeScript accessibilityalternativecloudflarecloudflare-workersdesignfreefrontendopen-sourceradix-uireactremixweb-developmentwebflowwebsite-builderwebsite-developmentwebsiteswebstudio
fix: Show page titles (#4026)
Ivan Starkov816ff5ef9c00
diff --git a/apps/builder/app/routes/_ui.(builder).tsx b/apps/builder/app/routes/_ui.(builder).tsxindex a460bdc0e5..cd5e28fea3 100644--- a/apps/builder/app/routes/_ui.(builder).tsx+++ b/apps/builder/app/routes/_ui.(builder).tsx@@ -5,7 +5,7 @@import { lazy } from "react";import { useLoaderData } from "@remix-run/react";-import type { ShouldRevalidateFunction } from "@remix-run/react";+import type { MetaFunction, ShouldRevalidateFunction } from "@remix-run/react";import { type LoaderFunctionArgs, redirect } from "@remix-run/server-runtime";import { loadBuildIdAndVersionByProjectId } from "@webstudio-is/project-build/index.server";@@ -35,6 +35,21 @@ export const links = () => {];};+export const meta: MetaFunction<typeof loader> = ({ data }) => {+ const metas: ReturnType<MetaFunction> = [];++ if (data === undefined) {+ return metas;+ }+ const { project } = data;++ if (project.title) {+ metas.push({ title: project.title });+ }++ return metas;+};+export const loader = async ({request,}: LoaderFunctionArgs): Promise<BuilderProps> => {diff --git a/apps/builder/app/routes/_ui.dashboard.tsx b/apps/builder/app/routes/_ui.dashboard.tsxindex f63d85b3fd..cc30085c4a 100644--- a/apps/builder/app/routes/_ui.dashboard.tsx+++ b/apps/builder/app/routes/_ui.dashboard.tsx@@ -1,5 +1,5 @@import { lazy } from "react";-import { useLoaderData } from "@remix-run/react";+import { useLoaderData, type MetaFunction } from "@remix-run/react";import {json,type LoaderFunctionArgs,@@ -16,6 +16,14 @@ import { createCallerFactory } from "@webstudio-is/trpc-interface/index.server";const dashboardProjectCaller = createCallerFactory(dashboardProjectRouter);+export const meta: MetaFunction<typeof loader> = () => {+ const metas: ReturnType<MetaFunction> = [];++ metas.push({ title: "Webstudio Dashboard" });++ return metas;+};+export const loader = async ({ request }: LoaderFunctionArgs) => {preventCrossOriginCookie(request);diff --git a/apps/builder/app/routes/_ui.error.tsx b/apps/builder/app/routes/_ui.error.tsxindex 4edd4dd06a..5b70f40021 100644--- a/apps/builder/app/routes/_ui.error.tsx+++ b/apps/builder/app/routes/_ui.error.tsx@@ -1,5 +1,5 @@import { type LoaderFunctionArgs, json } from "@remix-run/server-runtime";-import { useLoaderData } from "@remix-run/react";+import { useLoaderData, type MetaFunction } from "@remix-run/react";import { getAuthorizationServerOrigin } from "~/shared/router-utils/origins";import { builderSessionStorage } from "~/services/builder-session.server";import { sessionStorage } from "~/services/session.server";@@ -17,6 +17,14 @@ const SessionError = z.object({description: z.string().optional(),});+export const meta: MetaFunction<typeof loader> = () => {+ const metas: ReturnType<MetaFunction> = [];++ metas.push({ title: "Webstudio Error" });++ return metas;+};+export const loader = async ({ request }: LoaderFunctionArgs) => {preventCrossOriginCookie(request);diff --git a/apps/builder/app/routes/_ui.login._index.tsx b/apps/builder/app/routes/_ui.login._index.tsxindex 70b399d6e9..6d4de14c88 100644--- a/apps/builder/app/routes/_ui.login._index.tsx+++ b/apps/builder/app/routes/_ui.login._index.tsx@@ -4,7 +4,7 @@ import {redirect,json,} from "@remix-run/server-runtime";-import { useLoaderData } from "@remix-run/react";+import { useLoaderData, type MetaFunction } from "@remix-run/react";import { findAuthenticatedUser } from "~/services/auth.server";import env from "~/env/env.server";import type { LoginProps } from "~/auth/index.client";@@ -19,6 +19,14 @@ import { ClientOnly } from "~/shared/client-only";import { lazy } from "react";import { preventCrossOriginCookie } from "~/services/no-cross-origin-cookie";+export const meta: MetaFunction<typeof loader> = () => {+ const metas: ReturnType<MetaFunction> = [];++ metas.push({ title: "Webstudio Login" });++ return metas;+};+export const loader = async ({request,}: LoaderFunctionArgs): Promise<TypedResponse<LoginProps>> => {diff --git a/apps/builder/app/routes/_ui.logout.tsx b/apps/builder/app/routes/_ui.logout.tsxindex 690b7f0136..94d71347f0 100644--- a/apps/builder/app/routes/_ui.logout.tsx+++ b/apps/builder/app/routes/_ui.logout.tsx@@ -8,13 +8,21 @@ import { logoutRouter } from "~/services/logout-router.server";import { createContext } from "~/shared/context.server";import { redirect, type ActionFunctionArgs } from "react-router-dom";import { ClientOnly } from "~/shared/client-only";-import { useLoaderData } from "@remix-run/react";+import { useLoaderData, type MetaFunction } from "@remix-run/react";import { lazy, useRef } from "react";const logoutCaller = createCallerFactory(logoutRouter);const debug = createDebug(import.meta.url);+export const meta: MetaFunction<typeof loader> = () => {+ const metas: ReturnType<MetaFunction> = [];++ metas.push({ title: "Webstudio Logout" });++ return metas;+};+export const loader = async ({ request }: LoaderFunctionArgs) => {if (false === isDashboard(request)) {throw new Error("Only Dashboard can logout at this endpoint");