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
New dashboard has reached feature parity with the old one (#835)
Oleg Isonene0cd48aab54f
diff --git a/apps/designer/.env.example b/apps/designer/.env.exampleindex c67a069218..0c48996186 100644--- a/apps/designer/.env.example+++ b/apps/designer/.env.example@@ -10,34 +10,35 @@ MAX_ASSETS_PER_PROJECT=50# relative to the public directoryFILE_UPLOAD_PATH="uploads"+# Optional max upload size in Mb# MAX_UPLOAD_SIZE=10# S3 envs-S3_BUCKET=-S3_REGION=-S3_ACL="public-read"-S3_ENDPOINT=-S3_ACCESS_KEY_ID=-S3_SECRET_ACCESS_KEY=+# S3_BUCKET=+# S3_REGION=+# S3_ACL="public-read"+# S3_ENDPOINT=+# S3_ACCESS_KEY_ID=+# S3_SECRET_ACCESS_KEY=# if using r2 this your worker url-ASSET_CDN_URL=+# ASSET_CDN_URL=https://assets.webstudio.is# Publisher config-PUBLISHER_ENDPOINT=-PUBLISHER_HOST=-PUBLISHER_TOKEN=+# PUBLISHER_HOST=wstd.io+# PUBLISHER_ENDPOINT=https://publisher.webstudio.is+# PUBLISHER_TOKEN=# Base origin for accessing user-generated build (canvas / preview / etc)# Should contatin protocol and host (e.g. https://example.com)# Will be detected automatically in development environments like localhost or preview deployment-BUILD_ORIGIN=+# BUILD_ORIGIN=https://wstd.live# If set to `true`, user-generated build will be available# only at {project.domain} subdomain of {BUILD_ORIGIN}.# This is used in production deployment for security reasons.-BUILD_REQUIRE_SUBDOMAIN=+# BUILD_REQUIRE_SUBDOMAIN=# Enable features behind a flag, * enables all.FEATURES=*diff --git a/apps/designer/app/dashboard/components/card.tsx b/apps/designer/app/dashboard/components/card.tsxdeleted file mode 100644index 6b7f520276..0000000000--- a/apps/designer/app/dashboard/components/card.tsx+++ /dev/null@@ -1,88 +0,0 @@-import { useState } from "react";-import { Form, useTransition } from "@remix-run/react";-import { useNavigate } from "react-router-dom";-import {- Flex,- Card,- Select,- TextField,- Button,- DeprecatedHeading,- Text,-} from "@webstudio-is/design-system";-import { designerPath } from "~/shared/router-utils";-import { theme } from "@webstudio-is/design-system";--type SelectProjectProjectCardProps = {- projects: Array<{ id: string; title: string }>;- errors: string;-};--export const SelectProjectCard = ({- projects,- errors,-}: SelectProjectProjectCardProps) => {- const [selectedProject, setSelectedProject] = useState("");- const [newProject, setNewProject] = useState("My awesome project");- const navigate = useNavigate();- const transition = useTransition();-- const handleOpen = () => {- navigate(designerPath({ projectId: selectedProject }));- };-- const options = ["", ...projects.map((project) => project.id)];-- return (- <Card size={2}>- <Flex direction="column" gap="4">- <DeprecatedHeading size="2" css={{ textAlign: "center" }}>- Select a project- </DeprecatedHeading>- <Select- name="project"- options={options}- onChange={setSelectedProject}- value={selectedProject}- placeholder="Create new project"- getLabel={(option) =>- projects.find((project) => project.id === option)?.title ||- "Create new project"- }- />- {selectedProject === "" ? (- <Form method="post">- <Flex gap="1">- <TextField- state={errors ? "invalid" : undefined}- name="project"- defaultValue={newProject}- onFocus={(event) => {- event.target.select();- }}- onChange={(event) => {- setNewProject(event.target.value);- }}- />- <Button- disabled={- newProject.length === 0 || transition.state === "submitting"- }- type="submit"- >- {transition.state === "submitting" ? "Creating..." : "Create"}- </Button>- </Flex>- {errors ? (- <Text color="error" css={{ marginTop: theme.spacing[3] }}>- {errors}- </Text>- ) : null}- </Form>- ) : (- <Button onClick={handleOpen}>Open</Button>- )}- </Flex>- </Card>- );-};diff --git a/apps/designer/app/dashboard/components/header.tsx b/apps/designer/app/dashboard/components/header.tsxdeleted file mode 100644index 47fe342fa9..0000000000--- a/apps/designer/app/dashboard/components/header.tsx+++ /dev/null@@ -1,61 +0,0 @@-import { ChevronDownIcon } from "@webstudio-is/icons";-import { Avatar } from "@webstudio-is/design-system";-import {- DropdownMenu,- DropdownMenuTrigger,- DropdownMenuContent,- DropdownMenuItem,- DeprecatedButton,- Text,- Flex,-} from "@webstudio-is/design-system";-import { User as DbUser } from "@webstudio-is/prisma-client";-import { useNavigate } from "react-router-dom";-import { logoutPath } from "~/shared/router-utils";-import { theme } from "@webstudio-is/design-system";--type User = Omit<DbUser, "createdAt"> & {- createdAt: string;-};--export const DashboardHeader = ({ user }: { user: User }) => {- const navigate = useNavigate();- const userNameFallback = (user?.username || user?.email || "X")- .charAt(0)- .toLocaleUpperCase();-- return (- <Flex- as="header"- align="center"- justify="end"- css={{- p: theme.spacing[3],- bc: theme.colors.loContrast,- borderBottom: `${theme.spacing[1]} solid ${theme.colors.slate8}`,- }}- >- <Flex gap="1" align="center">- <DropdownMenu>- <DropdownMenuTrigger asChild>- <DeprecatedButton variant="raw" aria-label="Menu Button">- <Flex gap="1" align="center" css={{ height: theme.spacing[11] }}>- <Avatar- src={user?.image || undefined}- fallback={userNameFallback}- />-- <ChevronDownIcon width={15} height={15} color="white" />- </Flex>- </DeprecatedButton>- </DropdownMenuTrigger>- <DropdownMenuContent>- <DropdownMenuItem onSelect={() => navigate(logoutPath())}>- <Text>Logout</Text>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- </Flex>- </Flex>- );-};diff --git a/apps/designer/app/dashboard/dashboard.css b/apps/designer/app/dashboard/dashboard.cssdeleted file mode 100644index 778f302cf4..0000000000--- a/apps/designer/app/dashboard/dashboard.css+++ /dev/null@@ -1,6 +0,0 @@-body {- margin: 0;- overflow: hidden;- font-family: var(--fonts-sans);- font-size: var(--fontSizes-1);-}diff --git a/apps/designer/app/dashboard/dashboard.tsx b/apps/designer/app/dashboard/dashboard.tsxindex 155c79533d..0c170c81c0 100644--- a/apps/designer/app/dashboard/dashboard.tsx+++ b/apps/designer/app/dashboard/dashboard.tsx@@ -1,48 +1,41 @@-import { useActionData } from "@remix-run/react";--import { Flex } from "@webstudio-is/design-system";+import { Flex, globalCss, theme, Toaster } from "@webstudio-is/design-system";+import type { DashboardProject } from "@webstudio-is/prisma-client";+import { Header } from "./header";// eslint-disable-next-line import/no-internal-modulesimport interFont from "@fontsource/inter/variable.css";-import dashboardStyles from "./dashboard.css";-import { User as DbUser } from "@webstudio-is/prisma-client";-import { DashboardHeader } from "./components/header";-import { SelectProjectCard } from "./components/card";+// eslint-disable-next-line import/no-internal-modules+import manropeVariableFont from "@fontsource/manrope/variable.css";+import { Projects } from "./projects";+import type { User } from "~/shared/db/user.server";-export const links = () => {- return [- {- rel: "stylesheet",- href: interFont,- },- {- rel: "stylesheet",- href: dashboardStyles,- },- ];-};+export const links = () => [+ { rel: "stylesheet", href: interFont },+ { rel: "stylesheet", href: manropeVariableFont },+];-type User = Omit<DbUser, "createdAt"> & {- createdAt: string;-};+const globalStyles = globalCss({+ body: {+ margin: 0,+ background: theme.colors.brandBackgroundDashboard,+ },+});type DashboardProps = {- projects?: Array<{ id: string; title: string }>;user: User;+ projects: Array<DashboardProject>;};-export const Dashboard = ({ projects = [], user }: DashboardProps) => {- const actionData = useActionData();+export const Dashboard = ({ user, projects }: DashboardProps) => {+ globalStyles();return (<>- <DashboardHeader user={user} />- <Flex- css={{ height: "100vh" }}- direction="column"- align="center"- justify="center"- >- <SelectProjectCard projects={projects} errors={actionData?.errors} />- </Flex>+ <Header user={user} />+ <main>+ <Flex justify="center" as="section" css={{ minWidth: "min-content" }}>+ <Projects projects={projects} />+ </Flex>+ </main>+ <Toaster /></>);};diff --git a/apps/designer/app/dashboard2/empty-state.tsx b/apps/designer/app/dashboard/empty-state.tsxsimilarity index 100%rename from apps/designer/app/dashboard2/empty-state.tsxrename to apps/designer/app/dashboard/empty-state.tsxdiff --git a/apps/designer/app/dashboard2/header.tsx b/apps/designer/app/dashboard/header.tsxsimilarity index 81%rename from apps/designer/app/dashboard2/header.tsxrename to apps/designer/app/dashboard/header.tsxindex 641ae4e333..8ddb77232a 100644--- a/apps/designer/app/dashboard2/header.tsx+++ b/apps/designer/app/dashboard/header.tsx@@ -13,9 +13,9 @@ import {theme,Button,} from "@webstudio-is/design-system";-import { User as DbUser } from "@webstudio-is/prisma-client";import { useNavigate } from "react-router-dom";import { logoutPath } from "~/shared/router-utils";+import type { User } from "~/shared/db/user.server";const containerStyle = css({px: theme.spacing[13],@@ -24,12 +24,13 @@ const containerStyle = css({height: theme.spacing[17],});-const getAvatarLetter = (user: User) => {- return (user?.username || user?.email || "X").charAt(0).toLocaleUpperCase();+const getAvatarLetter = (title?: string) => {+ return (title || "X").charAt(0).toLocaleUpperCase();};const Menu = ({ user }: { user: User }) => {const navigate = useNavigate();+ const title = user?.username ?? user?.email ?? undefined;return (<DropdownMenu><DropdownMenuTrigger asChild>@@ -37,7 +38,8 @@ const Menu = ({ user }: { user: User }) => {<Flex gap="1" align="center" css={{ height: theme.spacing[11] }}><Avatarsrc={user?.image || undefined}- fallback={getAvatarLetter(user)}+ fallback={getAvatarLetter(title)}+ alt={title || "User Avatar"}/><ChevronDownIconwidth={15}@@ -48,7 +50,7 @@ const Menu = ({ user }: { user: User }) => {</Button></DropdownMenuTrigger><DropdownMenuContent>- <DropdownMenuLabel>{user?.username || user?.email}</DropdownMenuLabel>+ <DropdownMenuLabel>{title}</DropdownMenuLabel><DropdownMenuItem onSelect={() => navigate(logoutPath())}><Text>Logout</Text></DropdownMenuItem>@@ -57,10 +59,6 @@ const Menu = ({ user }: { user: User }) => {);};-type User = Omit<DbUser, "createdAt"> & {- createdAt: string;-};-export const Header = ({ user }: { user: User }) => {return (<Flexdiff --git a/apps/designer/app/dashboard2/heading.tsx b/apps/designer/app/dashboard/heading.tsxsimilarity index 100%rename from apps/designer/app/dashboard2/heading.tsxrename to apps/designer/app/dashboard/heading.tsxdiff --git a/apps/designer/app/dashboard/new-project.tsx b/apps/designer/app/dashboard/new-project.tsxnew file mode 100644index 0000000000..abc3043e5c--- /dev/null+++ b/apps/designer/app/dashboard/new-project.tsx@@ -0,0 +1,49 @@+import type { DashboardProjectRouter } from "@webstudio-is/dashboard";+import { Button, toast } from "@webstudio-is/design-system";+import { PlusIcon } from "@webstudio-is/icons";+import { useEffect } from "react";+import { useNavigate } from "react-router-dom";+import { dashboardProjectPath, designerPath } from "~/shared/router-utils";+import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";++const trpc = createTrpcRemixProxy<DashboardProjectRouter>(dashboardProjectPath);+const useNewProject = () => {+ const { submit, data } = trpc.create.useMutation();+ const navigate = useNavigate();++ const handleCreate = () => {+ // @todo replace with the new dialog UI, waiting for dialog component+ const title = prompt("Project Title");+ // User has aborted+ if (title === null) {+ return;+ }++ submit({ title });+ };++ // @todo with dialog it can be displayed in the dialog+ useEffect(() => {+ if (data === undefined) {+ return;+ }+ if ("errors" in data) {+ toast.error(data.errors);+ return;+ }++ navigate(designerPath({ projectId: data.id }));+ }, [data, navigate]);++ return handleCreate;+};++export const NewProject = () => {+ const handleCreate = useNewProject();++ return (+ <Button prefix={<PlusIcon />} onClick={handleCreate}>+ New Project+ </Button>+ );+};diff --git a/apps/designer/app/dashboard2/panel.tsx b/apps/designer/app/dashboard/panel.tsxsimilarity index 100%rename from apps/designer/app/dashboard2/panel.tsxrename to apps/designer/app/dashboard/panel.tsxdiff --git a/apps/designer/app/dashboard/project-card.tsx b/apps/designer/app/dashboard/project-card.tsxnew file mode 100644index 0000000000..ec6ba76c38--- /dev/null+++ b/apps/designer/app/dashboard/project-card.tsx@@ -0,0 +1,301 @@+import {+ DropdownMenu,+ DropdownMenuTrigger,+ DropdownMenuContent,+ DropdownMenuItem,+ IconButton,+ css,+ Flex,+ Text,+ theme,+ toast,+} from "@webstudio-is/design-system";+import { MenuIcon } from "@webstudio-is/icons";+import type { DashboardProject } from "@webstudio-is/prisma-client";+import { KeyboardEvent, useEffect, useRef, useState } from "react";+import {+ dashboardProjectPath,+ designerPath,+ getPublishedUrl,+} from "~/shared/router-utils";+import { Link as RemixLink, useFetcher } from "@remix-run/react";+import { isFeatureEnabled } from "@webstudio-is/feature-flags";+import type { DashboardProjectRouter } from "@webstudio-is/dashboard";+import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";++const projectCardContainerStyle = css({+ overflow: "hidden",+ width: theme.spacing[31],+ height: theme.spacing[29],+ borderWidth: 1,+ borderStyle: "solid",+ borderColor: theme.colors.borderMain,+ borderRadius: theme.borderRadius[4],+ background: theme.colors.brandBackgroundProjectCardBack,+ "&:hover, &:focus-within": {+ boxShadow: theme.shadows.brandElevationBig,+ },+});++const projectCardFooterStyle = css({+ background: theme.colors.brandBackgroundProjectCardTextArea,+ height: theme.spacing[17],+ py: theme.spacing[5],+ px: theme.spacing[7],+});++const projectThumbnailStyle = css({+ background: theme.colors.brandBackgroundProjectCardBack,+ outline: "none",+});++// @todo use typography from figma tokens+const projectThumbnailTextStyle = css({+ fontFamily: theme.fonts.manrope,+ fontWeight: 200,+ fontSize: 360,+ letterSpacing: "-0.05em",+ alignSelf: "center",+ marginLeft: "-0.5em",+ background: theme.colors.brandBackgroundProjectCardFront,+ WebkitBackgroundClip: "text",+ backgroundClip: "text",+ color: "transparent",+ userSelect: "none",+ outline: "none",+ "&:hover, &:focus": {+ fontWeight: 800,+ transition: "100ms",+ },+});++// My Next Project > MN+const getAbbreviation = (title: string) =>+ title+ .split(/\s+/)+ .slice(0, 2)+ .map((word) => word.charAt(0).toUpperCase())+ .join("");++const usePublishedLink = ({ domain }: { domain: string }) => {+ const [url, setUrl] = useState<URL>();++ useEffect(() => {+ // It uses `window.location` to detect the default values when running locally localhost,+ // so it needs an effect to avoid hydration errors.+ setUrl(new URL(getPublishedUrl(domain)));+ }, [domain]);++ return { url };+};++const PublishedLink = ({+ domain,+ tabIndex,+}: {+ domain: string;+ tabIndex: number;+}) => {+ const { url } = usePublishedLink({ domain });+ return (+ <Text+ as="a"+ href={url?.href}+ target="_blank"+ truncate+ color="hint"+ tabIndex={tabIndex}+ css={{+ "&:not(:hover)": {+ textDecoration: "none",+ },+ }}+ >+ {url?.host}+ </Text>+ );+};++const Menu = ({+ tabIndex,+ onDelete,+ onRename,+ onDuplicate,+}: {+ tabIndex: number;+ onDelete: () => void;+ onRename: () => void;+ onDuplicate: () => void;+}) => {+ const [isOpen, setIsOpen] = useState(false);+ return (+ <DropdownMenu open={isOpen} onOpenChange={setIsOpen}>+ <DropdownMenuTrigger asChild>+ <IconButton+ variant={isOpen ? "active" : "default"}+ aria-label="Menu Button"+ tabIndex={tabIndex}+ css={{ alignSelf: "center" }}+ >+ <MenuIcon width={15} height={15} />+ </IconButton>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem onSelect={onDuplicate}>+ <Text>Duplicate</Text>+ </DropdownMenuItem>+ <DropdownMenuItem onSelect={onRename}>+ <Text>Rename</Text>+ </DropdownMenuItem>+ {isFeatureEnabled("share2") && (+ <DropdownMenuItem>+ <Text>Share</Text>+ </DropdownMenuItem>+ )}+ <DropdownMenuItem onSelect={onDelete}>+ <Text>Delete</Text>+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ );+};++const useProjectCard = () => {+ const fetcher = useFetcher();+ const designerLinkRef = useRef<HTMLAnchorElement>(null);+ const { submit: deleteProject } = trpc.delete.useMutation();+ const { submit: rename } = trpc.rename.useMutation();+ const { submit: duplicate } = trpc.duplicate.useMutation();++ // @todo with dialog it can be displayed in the dialog+ useEffect(() => {+ if (fetcher.data?.errors) {+ toast.error(fetcher.data.errors);+ }+ }, [fetcher.data]);++ const handleKeyDown = (event: KeyboardEvent<HTMLElement>) => {+ const elements: Array<HTMLElement> = Array.from(+ event.currentTarget.querySelectorAll(`[tabIndex='-1']`)+ );+ const currentIndex = elements.indexOf(+ document.activeElement as HTMLElement+ );+ switch (event.key) {+ case "Enter": {+ designerLinkRef.current?.click();+ break;+ }+ case "ArrowUp":+ case "ArrowRight": {+ const nextElement = elements.at(currentIndex + 1) ?? elements[0];+ nextElement?.focus();+ break;+ }+ case "ArrowDown":+ case "ArrowLeft": {+ const nextElement = elements.at(currentIndex - 1) ?? elements[0];+ nextElement?.focus();+ break;+ }+ }+ };++ const handleDelete = (projectId: string) => {+ deleteProject({ projectId });+ };++ const handleRename = (projectId: string) => {+ // @todo replace with the new dialog UI, waiting for dialog component+ const title = prompt();+ // User has aborted+ if (title === null) {+ return;+ }+ rename({ projectId, title });+ };++ const handleDuplicate = (projectId: string) => {+ duplicate({ projectId });+ };++ return {+ designerLinkRef,+ handleKeyDown,+ handleDelete,+ handleRename,+ handleDuplicate,+ };+};++const trpc = createTrpcRemixProxy<DashboardProjectRouter>(dashboardProjectPath);++type ProjectCardProps = DashboardProject;++export const ProjectCard = ({+ id,+ title,+ domain,+ isPublished,+}: ProjectCardProps) => {+ const {+ designerLinkRef,+ handleKeyDown,+ handleDelete,+ handleRename,+ handleDuplicate,+ } = useProjectCard();+ return (+ <Flex+ direction="column"+ shrink={false}+ as="article"+ className={projectCardContainerStyle()}+ tabIndex={0}+ onKeyDown={handleKeyDown}+ >+ <Flex+ grow+ align="center"+ as={RemixLink}+ ref={designerLinkRef}+ to={designerPath({ projectId: id })}+ className={projectThumbnailStyle()}+ tabIndex={-1}+ >+ <span className={projectThumbnailTextStyle()}>+ {getAbbreviation(title)}+ </span>+ </Flex>+ <Flex+ justify="between"+ shrink={false}+ gap="1"+ className={projectCardFooterStyle()}+ >+ <Flex direction="column" justify="around">+ <Text variant="title" truncate>+ {title}+ </Text>+ {isPublished ? (+ <PublishedLink domain={domain} tabIndex={-1} />+ ) : (+ <Text color="hint">Not Published</Text>+ )}+ </Flex>+ <Menu+ tabIndex={-1}+ onDelete={() => {+ handleDelete(id);+ }}+ onRename={() => {+ handleRename(id);+ }}+ onDuplicate={() => {+ handleDuplicate(id);+ }}+ />+ </Flex>+ </Flex>+ );+};diff --git a/apps/designer/app/dashboard2/projects.tsx b/apps/designer/app/dashboard/projects.tsxsimilarity index 76%rename from apps/designer/app/dashboard2/projects.tsxrename to apps/designer/app/dashboard/projects.tsxindex f59bcd8845..366b20bc56 100644--- a/apps/designer/app/dashboard2/projects.tsx+++ b/apps/designer/app/dashboard/projects.tsx@@ -1,10 +1,14 @@-import { Button, Flex } from "@webstudio-is/design-system";+import { Flex } from "@webstudio-is/design-system";import { EmptyState } from "./empty-state";import { Panel } from "./panel";import { Heading } from "./heading";-import { PlusIcon } from "@webstudio-is/icons";import type { DashboardProject } from "@webstudio-is/prisma-client";import { ProjectCard } from "./project-card";+import { NewProject } from "./new-project";++const projectsContainerStyle = {+ "@laptop": { minWidth: 900 },+};type ProjectsProps = {projects: Array<DashboardProject>;@@ -12,11 +16,11 @@ type ProjectsProps = {export const Projects = ({ projects }: ProjectsProps) => {return (- <Panel>+ <Panel css={projectsContainerStyle}><Flex direction="column" gap="3"><Flex justify="between"><Heading variant="small">Projects</Heading>- <Button prefix={<PlusIcon />}>New Project</Button>+ <NewProject /></Flex>{projects.length === 0 && <EmptyState />}<Flex gap="6" wrap="wrap">diff --git a/apps/designer/app/dashboard2/dashboard.tsx b/apps/designer/app/dashboard2/dashboard.tsxdeleted file mode 100644index 3645804477..0000000000--- a/apps/designer/app/dashboard2/dashboard.tsx+++ /dev/null@@ -1,46 +0,0 @@-import { Flex, globalCss, theme } from "@webstudio-is/design-system";-import type {- DashboardProject,- User as DbUser,-} from "@webstudio-is/prisma-client";-import { Header } from "./header";-// eslint-disable-next-line import/no-internal-modules-import interFont from "@fontsource/inter/variable.css";-// eslint-disable-next-line import/no-internal-modules-import manropeVariableFont from "@fontsource/manrope/variable.css";-import { Projects } from "./projects";--export const links = () => [- { rel: "stylesheet", href: interFont },- { rel: "stylesheet", href: manropeVariableFont },-];--type User = Omit<DbUser, "createdAt"> & {- createdAt: string;-};--const globalStyles = globalCss({- body: {- margin: 0,- background: theme.colors.brandBackgroundDashboard,- },-});--type DashboardProps = {- user: User;- projects: Array<DashboardProject>;-};--export const Dashboard = ({ user, projects }: DashboardProps) => {- globalStyles();- return (- <>- <Header user={user} />- <main>- <Flex justify="center" as="section" css={{ minWidth: "min-content" }}>- <Projects projects={projects} />- </Flex>- </main>- </>- );-};diff --git a/apps/designer/app/dashboard2/index.ts b/apps/designer/app/dashboard2/index.tsdeleted file mode 100644index e578baa939..0000000000--- a/apps/designer/app/dashboard2/index.ts+++ /dev/null@@ -1 +0,0 @@-export * from "./dashboard";diff --git a/apps/designer/app/dashboard2/project-card.tsx b/apps/designer/app/dashboard2/project-card.tsxdeleted file mode 100644index b903ec6a2a..0000000000--- a/apps/designer/app/dashboard2/project-card.tsx+++ /dev/null@@ -1,165 +0,0 @@-import {- DropdownMenu,- DropdownMenuTrigger,- DropdownMenuContent,- DropdownMenuItem,- IconButton,- css,- Flex,- Text,- theme,-} from "@webstudio-is/design-system";-import { MenuIcon } from "@webstudio-is/icons";-import type { DashboardProject } from "@webstudio-is/prisma-client";-import { useState } from "react";-import { designerPath, getPublishedUrl } from "~/shared/router-utils";-import { Link as RemixLink } from "@remix-run/react";--const projectCardContainerStyle = css({- overflow: "hidden",- width: theme.spacing[31],- height: theme.spacing[29],- borderWidth: 1,- borderStyle: "solid",- borderColor: theme.colors.borderMain,- borderRadius: theme.borderRadius[4],- background: "linear-gradient(0deg, #FBF8FF 0%, #C7C7C7 100%)",- "&:hover, &:focus-within": {- boxShadow: theme.shadows.brandElevationBig,- },-});--const projectCardFooterStyle = css({- background: theme.colors.brandBackgroundProjectCardTextArea,- height: theme.spacing[17],- py: theme.spacing[5],- px: theme.spacing[7],-});--const projectNameAvatarStyle = css({- fontFamily: theme.fonts.manrope,- fontWeight: 200,- fontSize: 360,- alignSelf: "center",- letterSpacing: "-0.05em",- marginLeft: "-0.5em",- background: "linear-gradient(0deg, #FBF8FF 25%, #E2E2E2 66%)",- WebkitBackgroundClip: "text",- backgroundClip: "text",- color: "transparent",- // @todo figure out the effect from figma in text-shadow- //textShadow: "0px 5px 3px rgba(251, 248, 255, 1)",- userSelect: "none",- "&:hover, &:focus": {- fontWeight: 800,- transition: "100ms",- },-});--// My Next Project > MN-const getAbbreviation = (title: string) =>- title- .split(/\s+/)- .slice(0, 2)- .map((word) => word.charAt(0).toUpperCase())- .join("");--const Domain = ({- domain,- isPublished,-}: {- domain: string;- isPublished: boolean;-}) => {- if (isPublished) {- const url = new URL(getPublishedUrl(domain));- return (- <Text- as="a"- href={url.href}- target="_blank"- truncate- color="hint"- css={{- "&:not(:hover)": {- textDecoration: "none",- },- }}- >- {url.host}- </Text>- );- }- return <Text color="hint">Not Published</Text>;-};--const Menu = () => {- const [isOpen, setIsOpen] = useState(false);- return (- <DropdownMenu open={isOpen} onOpenChange={setIsOpen}>- <DropdownMenuTrigger asChild>- <IconButton- variant={isOpen ? "active" : "default"}- aria-label="Menu Button"- css={{ alignSelf: "center" }}- >- <MenuIcon width={15} height={15} />- </IconButton>- </DropdownMenuTrigger>- <DropdownMenuContent align="end">- <DropdownMenuItem>- <Text>Duplicate</Text>- </DropdownMenuItem>- <DropdownMenuItem>- <Text>Rename</Text>- </DropdownMenuItem>- <DropdownMenuItem>- <Text>Share</Text>- </DropdownMenuItem>- <DropdownMenuItem>- <Text>Delete</Text>- </DropdownMenuItem>- </DropdownMenuContent>- </DropdownMenu>- );-};--export const ProjectCard = ({- id,- title,- domain,- isPublished,-}: DashboardProject) => {- return (- <Flex- direction="column"- shrink={false}- as="article"- className={projectCardContainerStyle()}- >- <Flex- grow- align="center"- as={RemixLink}- to={designerPath({ projectId: id })}- className={projectNameAvatarStyle()}- >- {getAbbreviation(title)}- </Flex>- <Flex- justify="between"- shrink={false}- gap="1"- className={projectCardFooterStyle()}- >- <Flex direction="column" justify="around">- <Text variant="title" truncate>- {title}- </Text>- <Domain domain={domain} isPublished={isPublished} />- </Flex>- <Menu />- </Flex>- </Flex>- );-};diff --git a/apps/designer/app/designer/features/topbar/publish.tsx b/apps/designer/app/designer/features/topbar/publish.tsxindex 1108b1b734..ea25167ef9 100644--- a/apps/designer/app/designer/features/topbar/publish.tsx+++ b/apps/designer/app/designer/features/topbar/publish.tsx@@ -28,9 +28,6 @@ const Content = ({ project }: PublishButtonProps) => {const domain = fetcher.data?.domain || project.domain;useEffect(() => {- if (typeof location !== "object" || !domain) {- return;- }setUrl(getPublishedUrl(domain));}, [domain]);diff --git a/apps/designer/app/routes/dashboard/index.tsx b/apps/designer/app/routes/dashboard/index.tsxindex 34f376625c..c1c2c12d73 100644--- a/apps/designer/app/routes/dashboard/index.tsx+++ b/apps/designer/app/routes/dashboard/index.tsx@@ -1,68 +1,47 @@import { useLoaderData } from "@remix-run/react";-import type { ActionArgs, LoaderArgs } from "@remix-run/node";-import { json, redirect } from "@remix-run/node";-import { Dashboard, links } from "~/dashboard";-import { db } from "@webstudio-is/project/server";+import type { ErrorBoundaryComponent, LoaderArgs } from "@remix-run/node";+import { redirect } from "@remix-run/node";+import { Dashboard } from "~/dashboard";import { findAuthenticatedUser } from "~/services/auth.server";-import { zfd } from "zod-form-data";-import { type Project, User as DbUser } from "@webstudio-is/prisma-client";-import { designerPath, loginPath } from "~/shared/router-utils";+import { loginPath } from "~/shared/router-utils";+import { ComponentProps } from "react";+import { sentryException } from "~/shared/sentry";+import { ErrorMessage } from "~/shared/error";+import { dashboardProjectRouter } from "@webstudio-is/dashboard/server";-type User = Omit<DbUser, "createdAt"> & {- createdAt: string;-};--export { links };-const schema = zfd.formData({- project: zfd.text(),-});--type Data = {- projects: Array<Project>;- user: User;-};+export { links } from "~/dashboard";-export const action = async ({ request }: ActionArgs) => {- const { project: title } = schema.parse(await request.formData());-- const authenticatedUser = await findAuthenticatedUser(request);- if (authenticatedUser === null) {- throw new Error("Not authenticated");- }-- try {- const project = await db.project.create({- title,- userId: authenticatedUser?.id,- });- return redirect(designerPath({ projectId: project.id }));- } catch (error) {- if (error instanceof Error) {- return { errors: error.message };- }- }- return { errors: "Unexpected error" };-};--export const loader = async ({ request }: LoaderArgs) => {+export const loader = async ({+ request,+}: LoaderArgs): Promise<ComponentProps<typeof Dashboard>> => {const user = await findAuthenticatedUser(request);- if (!user) {++ if (user === null) {const url = new URL(request.url);- return redirect(+ throw redirect(loginPath({returnTo: url.pathname,}));}- const projects = await db.project.loadManyByUserId(user.id);- return json({ projects, user });+ const projects = await dashboardProjectRouter+ // @todo pass authorization context+ .createCaller({ userId: user.id })+ .findMany({ userId: user.id });++ return { user, projects };};-const DashboardRoute = () => {- const { projects, user } = useLoaderData<Data>();+export const ErrorBoundary: ErrorBoundaryComponent = ({ error }) => {+ sentryException({ error });+ const message = error instanceof Error ? error.message : String(error);+ return <ErrorMessage message={message} />;+};- return <Dashboard user={user} projects={projects} />;+const DashboardRoute = () => {+ const data = useLoaderData<ReturnType<typeof loader>>();+ return <Dashboard {...data} />;};export default DashboardRoute;diff --git a/apps/designer/app/routes/dashboard/projects.$method.ts b/apps/designer/app/routes/dashboard/projects.$method.tsnew file mode 100644index 0000000000..c8cdfa0fa2--- /dev/null+++ b/apps/designer/app/routes/dashboard/projects.$method.ts@@ -0,0 +1,22 @@+import type { ActionArgs } from "@remix-run/node";+import { dashboardProjectRouter } from "@webstudio-is/dashboard/server";+import { findAuthenticatedUser } from "~/services/auth.server";+import { handleTrpcRemixAction } from "~/shared/remix/trpc-remix-request.server";++export const action = async ({ request, params }: ActionArgs) => {+ const authenticatedUser = await findAuthenticatedUser(request);+ if (authenticatedUser === null) {+ throw new Error("Not authenticated");+ }+ // @todo use createContext+ const context = {+ userId: authenticatedUser.id,+ };++ return await handleTrpcRemixAction({+ request,+ params,+ router: dashboardProjectRouter,+ context,+ });+};diff --git a/apps/designer/app/routes/dashboard2/index.tsx b/apps/designer/app/routes/dashboard2/index.tsxdeleted file mode 100644index 89a5deea7f..0000000000--- a/apps/designer/app/routes/dashboard2/index.tsx+++ /dev/null@@ -1,40 +0,0 @@-import { useLoaderData } from "@remix-run/react";-import type { LoaderArgs } from "@remix-run/node";-import { json, redirect } from "@remix-run/node";-import { Dashboard } from "~/dashboard2";-import { findAuthenticatedUser } from "~/services/auth.server";-import { loginPath } from "~/shared/router-utils";-import { ComponentProps } from "react";-import { prisma } from "@webstudio-is/prisma-client";--export { links } from "~/dashboard2";--type Data = ComponentProps<typeof Dashboard>;--export const loader = async ({ request }: LoaderArgs) => {- const user = await findAuthenticatedUser(request);-- if (!user) {- const url = new URL(request.url);- return redirect(- loginPath({- returnTo: url.pathname,- })- );- }-- const projects = await prisma.dashboardProject.findMany({- where: {- userId: user.id,- },- });-- return json({ user, projects });-};--const DashboardRoute = () => {- const data = useLoaderData<Data>();- return <Dashboard {...data} />;-};--export default DashboardRoute;diff --git a/apps/designer/app/routes/rest/project/clone.$domain.ts b/apps/designer/app/routes/rest/project/clone.$domain.tsindex 500f0fc37f..909f5bc123 100644--- a/apps/designer/app/routes/rest/project/clone.$domain.ts+++ b/apps/designer/app/routes/rest/project/clone.$domain.ts@@ -17,7 +17,7 @@ const ensureProject = async ({return projects[0];}- return await projectDb.project.clone(domain, userId);+ return await projectDb.project.cloneByDomain(domain, userId);};/**diff --git a/apps/designer/app/services/auth.server.ts b/apps/designer/app/services/auth.server.tsindex 684ecfd8bc..263ef8c33c 100644--- a/apps/designer/app/services/auth.server.ts+++ b/apps/designer/app/services/auth.server.ts@@ -1,4 +1,3 @@-import { type User, prisma } from "@webstudio-is/prisma-client";import { Authenticator } from "remix-auth";import { FormStrategy } from "remix-auth-form";import { GitHubStrategy, type GitHubProfile } from "remix-auth-github";@@ -8,6 +7,7 @@ import { sessionStorage } from "~/services/session.server";import { sentryException } from "~/shared/sentry";import { AUTH_PROVIDERS } from "~/shared/session";import { authCallbackPath } from "~/shared/router-utils";+import { getUserById, User } from "~/shared/db/user.server";const url =process.env.DEPLOYMENT_ENVIRONMENT === "production"@@ -95,11 +95,8 @@ if (process.env.DEV_LOGIN === "true") {export const findAuthenticatedUser = async (request: Request) => {const user = await authenticator.isAuthenticated(request);- if (user != null) {- const dbUser = await prisma.user.findUnique({- where: { id: user.id },- });- return dbUser;+ if (user == null) {+ return null;}- return null;+ return await getUserById(user.id);};diff --git a/apps/designer/app/shared/db/user.server.ts b/apps/designer/app/shared/db/user.server.tsindex 0454c6fc6b..10d61e7703 100644--- a/apps/designer/app/shared/db/user.server.ts+++ b/apps/designer/app/shared/db/user.server.ts@@ -1,6 +1,25 @@import type { GitHubProfile } from "remix-auth-github";import type { GoogleProfile } from "remix-auth-google";-import { prisma, User } from "@webstudio-is/prisma-client";+import { prisma } from "@webstudio-is/prisma-client";+import { z } from "zod";++const User = z.object({+ id: z.string(),+ email: z.string().nullable(),+ image: z.string().nullable(),+ username: z.string().nullable(),+ createdAt: z.date().transform((date) => date.toISOString()),+ teamId: z.string().nullable(),+});++export type User = z.infer<typeof User>;++export const getUserById = async (id: User["id"]) => {+ const dbUser = await prisma.user.findUnique({+ where: { id },+ });+ return User.parse(dbUser);+};const genericCreateAccount = async (userData: {email: string;@@ -8,27 +27,29 @@ const genericCreateAccount = async (userData: {image: string;provider: string;}): Promise<User> => {- const existingUserWithEmail = await prisma.user.findUnique({+ const dbUser = await prisma.user.findUnique({where: {email: userData.email,},});- if (existingUserWithEmail) {- if (existingUserWithEmail.teamId) {- return existingUserWithEmail;+ if (dbUser) {+ const user = User.parse(dbUser);++ if (user.teamId) {+ return user;}await prisma.team.create({data: {users: {connect: {- id: existingUserWithEmail.id,+ id: user.id,},},},});- return existingUserWithEmail;+ return user;}const newTeam = await prisma.team.create({@@ -42,7 +63,7 @@ const genericCreateAccount = async (userData: {},});- return newTeam.users[0];+ return User.parse(newTeam.users[0]);};export const createOrLoginWithOAuth = async (diff --git a/apps/designer/app/shared/remix/trpc-remix-proxy.ts b/apps/designer/app/shared/remix/trpc-remix-proxy.tsnew file mode 100644index 0000000000..7a939e7a4e--- /dev/null+++ b/apps/designer/app/shared/remix/trpc-remix-proxy.ts@@ -0,0 +1,48 @@+import { useFetcher } from "@remix-run/react";+import type {+ AnyMutationProcedure,+ AnyRouter,+ inferRouterInputs,+ inferRouterOutputs,+} from "@trpc/server";+// eslint-disable-next-line import/no-internal-modules+import { createRecursiveProxy } from "@trpc/server/shared";++export const createTrpcRemixProxy = <Router extends AnyRouter>(+ getPath: (method: string) => string+): {+ [Procedure in keyof Router["_def"]["record"]]: Router["_def"]["record"][Procedure] extends AnyMutationProcedure+ ? {+ useMutation: () => {+ submit: (input: inferRouterInputs<Router>[Procedure]) => void;+ data?: inferRouterOutputs<Router>[Procedure];+ };+ }+ : {+ useQuery: () => {+ load: (input: inferRouterInputs<Router>[Procedure]) => void;+ data?: inferRouterOutputs<Router>[Procedure];+ };+ };+} =>+ createRecursiveProxy((options) => {+ const path = [...options.path];+ const hook = path.pop();++ if (hook !== "useMutation" && hook !== "useQuery") {+ throw new Error(`Invalid hook ${hook}`);+ }++ const fetcher = useFetcher();++ const method = path.join(".");++ const submit = (input: never) => {+ return fetcher.submit(input, {+ method: hook === "useMutation" ? "post" : "get",+ action: getPath(method),+ });+ };++ return { submit, data: fetcher.data };+ }) as never;diff --git a/apps/designer/app/shared/remix/trpc-remix-request.server.ts b/apps/designer/app/shared/remix/trpc-remix-request.server.tsnew file mode 100644index 0000000000..a41cb0e4af--- /dev/null+++ b/apps/designer/app/shared/remix/trpc-remix-request.server.ts@@ -0,0 +1,36 @@+import type { ActionArgs } from "@remix-run/node";+import type { AnyRouter } from "@trpc/server";++export const handleTrpcRemixAction = async <Router extends AnyRouter>({+ router,+ params,+ request,+ context,+}: {+ router: Router;+ params: ActionArgs["params"];+ request: Request;+ context: Router["_def"]["_config"]["$types"]["ctx"];+}) => {+ const { method } = params;++ if (typeof method !== "string") {+ throw new Error("Missing method");+ }++ const data = Object.fromEntries(await request.formData()) as never;+ const caller = router.createCaller(context);+ const allowedProcedures = Object.keys(router["_def"].record);++ if (allowedProcedures.includes(method) === false) {+ throw new Error(`Unknown RPC method "${method}"`);+ }++ const fn = caller[method];++ if (typeof fn === "function") {+ return await fn(data);+ }++ throw new Error(`Unknown RPC method "${method}"`);+};diff --git a/apps/designer/app/shared/router-utils/path-utils.ts b/apps/designer/app/shared/router-utils/path-utils.tsindex eeed6a792d..d50e00b033 100644--- a/apps/designer/app/shared/router-utils/path-utils.ts+++ b/apps/designer/app/shared/router-utils/path-utils.ts@@ -23,7 +23,12 @@ export const designerPath = ({pageId?: string;}) => `/designer/${projectId}${searchParams({ pageId })}`;-export const dashboardPath = () => "/dashboard";+export const dashboardPath = () => {+ return "/dashboard";+};++export const dashboardProjectPath = (method: string) =>+ `/dashboard/projects/${method}`;export const loginPath = (params: {error?: typeof AUTH_PROVIDERS[keyof typeof AUTH_PROVIDERS];diff --git a/apps/designer/env-check.js b/apps/designer/env-check.jsindex 4e446601aa..961ecbae2b 100644--- a/apps/designer/env-check.js+++ b/apps/designer/env-check.js@@ -40,6 +40,11 @@ if (process.env.DEPLOYMENT_ENVIRONMENT === "production") {"👉 In production DESIGNER_HOST is required for website functionality. Please set it to your production URL of the designer.");}+ if (!process.env.PUBLISHER_HOST) {+ errors.push(+ "👉 In production PUBLISHER_HOST is required for website functionality. Please set it to your production URL of the designer."+ );+ }if (!process.env.BUILD_ORIGIN) {errors.push("👉 In production BUILD_ORIGIN is required for security reasons."diff --git a/apps/designer/package.json b/apps/designer/package.jsonindex 379fd14553..075327e8ff 100644--- a/apps/designer/package.json+++ b/apps/designer/package.json@@ -49,6 +49,8 @@"@webstudio-is/project": "workspace:^","@webstudio-is/react-sdk": "workspace:^","@webstudio-is/trpc-interface": "workspace:^",+ "@webstudio-is/dashboard": "workspace:^",+ "@trpc/server": "^10.9.0","bson-objectid": "^2.0.4","camelcase": "^6.3.0","colord": "^2.9.3",diff --git a/packages/dashboard/LICENSE b/packages/dashboard/LICENSEnew file mode 100644index 0000000000..1f6edad9a7--- /dev/null+++ b/packages/dashboard/LICENSE@@ -0,0 +1,21 @@+MIT License++Copyright (c) 2022 Webstudio++Permission is hereby granted, free of charge, to any person obtaining a copy+of this software and associated documentation files (the "Software"), to deal+in the Software without restriction, including without limitation the rights+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell+copies of the Software, and to permit persons to whom the Software is+furnished to do so, subject to the following conditions:++The above copyright notice and this permission notice shall be included in all+copies or substantial portions of the Software.++THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE+SOFTWARE.diff --git a/packages/dashboard/README.md b/packages/dashboard/README.mdnew file mode 100644index 0000000000..1b2038b7b0--- /dev/null+++ b/packages/dashboard/README.md@@ -0,0 +1,3 @@+# Webstudio Project++Project related functionalities. This was temporarily placed here to reuse between other packages, but we need to split this into separate packages and probably remove this package entirely or keep it only for "project" specific functionality.diff --git a/packages/dashboard/jest.config.js b/packages/dashboard/jest.config.jsnew file mode 100644index 0000000000..e7fc137533--- /dev/null+++ b/packages/dashboard/jest.config.js@@ -0,0 +1 @@+export { default } from "@webstudio-is/jest-config";diff --git a/packages/dashboard/package.json b/packages/dashboard/package.jsonnew file mode 100644index 0000000000..23eb465475--- /dev/null+++ b/packages/dashboard/package.json@@ -0,0 +1,45 @@+{+ "name": "@webstudio-is/dashboard",+ "version": "0.22.0",+ "description": "Webstudio Dashboard",+ "author": "Webstudio <[email protected]>",+ "homepage": "https://webstudio.is",+ "type": "module",+ "scripts": {+ "typecheck": "tsc --noEmit",+ "test": "NODE_OPTIONS=--experimental-vm-modules jest",+ "checks": "pnpm typecheck && pnpm lint",+ "dev": "build-package --watch",+ "build": "build-package",+ "lint": "eslint ./src --ext .ts,.tsx --max-warnings 0"+ },+ "dependencies": {+ "@webstudio-is/project": "workspace:^",+ "@webstudio-is/prisma-client": "workspace:^",+ "zod": "^3.19.1"+ },+ "devDependencies": {+ "@jest/globals": "^29.3.1",+ "@webstudio-is/jest-config": "workspace:^",+ "@webstudio-is/scripts": "workspace:^",+ "@webstudio-is/tsconfig": "workspace:^",+ "jest": "^29.3.1",+ "typescript": "4.7.4"+ },+ "exports": {+ ".": {+ "import": "./lib/index.js",+ "require": "./lib/cjs/index.cjs"+ },+ "./server": "./server.js"+ },+ "types": "src/index.ts",+ "files": [+ "lib/*",+ "src/*",+ "!*.test.*"+ ],+ "license": "MIT",+ "private": false,+ "sideEffects": false+}diff --git a/packages/dashboard/server.d.ts b/packages/dashboard/server.d.tsnew file mode 100644index 0000000000..ad6dde9958--- /dev/null+++ b/packages/dashboard/server.d.ts@@ -0,0 +1 @@+export * from "./src/index.server";diff --git a/packages/dashboard/server.js b/packages/dashboard/server.jsnew file mode 100644index 0000000000..a6fbe7c12c--- /dev/null+++ b/packages/dashboard/server.js@@ -0,0 +1 @@+export * from "./lib/index.server";diff --git a/packages/dashboard/src/db/index.ts b/packages/dashboard/src/db/index.tsnew file mode 100644index 0000000000..c55f927311--- /dev/null+++ b/packages/dashboard/src/db/index.ts@@ -0,0 +1 @@+export * as db from "./projects";diff --git a/packages/dashboard/src/db/projects.ts b/packages/dashboard/src/db/projects.tsnew file mode 100644index 0000000000..e0771d9183--- /dev/null+++ b/packages/dashboard/src/db/projects.ts@@ -0,0 +1,10 @@+import { prisma } from "@webstudio-is/prisma-client";++export const findMany = async (userId: string) => {+ return await prisma.dashboardProject.findMany({+ where: {+ userId,+ isDeleted: false,+ },+ });+};diff --git a/packages/dashboard/src/index.server.ts b/packages/dashboard/src/index.server.tsnew file mode 100644index 0000000000..66cfba1293--- /dev/null+++ b/packages/dashboard/src/index.server.ts@@ -0,0 +1,2 @@+export * as db from "./db";+export * from "./trpc";diff --git a/packages/dashboard/src/index.ts b/packages/dashboard/src/index.tsnew file mode 100644index 0000000000..9a367e6e46--- /dev/null+++ b/packages/dashboard/src/index.ts@@ -0,0 +1 @@+export type { DashboardProjectRouter } from "./trpc";diff --git a/packages/dashboard/src/trpc/index.ts b/packages/dashboard/src/trpc/index.tsnew file mode 100644index 0000000000..1f54bc1362--- /dev/null+++ b/packages/dashboard/src/trpc/index.ts@@ -0,0 +1 @@+export * from "./project-router";diff --git a/packages/dashboard/src/trpc/project-router.ts b/packages/dashboard/src/trpc/project-router.tsnew file mode 100644index 0000000000..65c1897240--- /dev/null+++ b/packages/dashboard/src/trpc/project-router.ts@@ -0,0 +1,27 @@+import {+ mergeRouters,+ router,+ procedure,+ projectRouter as baseProjectRouter,+} from "@webstudio-is/project/server";+import { db } from "../db";+import { z } from "zod";++const projectRouter = router({+ findMany: procedure+ .input(+ z.object({+ userId: z.string(),+ })+ )+ .query(async ({ input }) => {+ return await db.findMany(input.userId);+ }),+});++export const dashboardProjectRouter = mergeRouters(+ baseProjectRouter,+ projectRouter+);++export type DashboardProjectRouter = typeof dashboardProjectRouter;diff --git a/packages/dashboard/tsconfig.json b/packages/dashboard/tsconfig.jsonnew file mode 100644index 0000000000..ecb353d7bb--- /dev/null+++ b/packages/dashboard/tsconfig.json@@ -0,0 +1,11 @@+{+ "extends": "@webstudio-is/tsconfig/base.json",+ "include": ["src", "../../@types/**/*.d.ts"],+ "compilerOptions": {+ "module": "ES2020",+ "target": "ES2020",+ "baseUrl": ".",+ "outDir": "./lib",+ "rootDir": "./src"+ }+}diff --git a/packages/design-system/src/components/__DEPRECATED__/heading.tsx b/packages/design-system/src/components/__DEPRECATED__/heading.tsxindex d61b006d0d..197a6400d9 100644--- a/packages/design-system/src/components/__DEPRECATED__/heading.tsx+++ b/packages/design-system/src/components/__DEPRECATED__/heading.tsx@@ -23,10 +23,10 @@ export const DeprecatedHeading = React.forwardRef<const { size = "1", ...textProps } = props;// This is the mapping of Heading Variants to Text variantsconst textSize: Record<HeadingSizeVariants, TextSizeVariants["size"]> = {- 1: { "@initial": "4", "@bp2": "5" },- 2: { "@initial": "6", "@bp2": "7" },- 3: { "@initial": "7", "@bp2": "8" },- 4: { "@initial": "8", "@bp2": "9" },+ 1: { "@initial": "4", "@laptop": "5" },+ 2: { "@initial": "6", "@laptop": "7" },+ 3: { "@initial": "7", "@laptop": "8" },+ 4: { "@initial": "8", "@laptop": "9" },};// This is the mapping of Heading Variants to Text css@@ -34,11 +34,23 @@ export const DeprecatedHeading = React.forwardRef<1: {fontWeight: 500,lineHeight: theme.lineHeight[4],- "@bp2": { lineHeight: "23px" },+ "@laptop": { lineHeight: "23px" },+ },+ 2: {+ fontWeight: 500,+ lineHeight: "25px",+ "@laptop": { lineHeight: "30px" },+ },+ 3: {+ fontWeight: 500,+ lineHeight: "33px",+ "@laptop": { lineHeight: "41px" },+ },+ 4: {+ fontWeight: 500,+ lineHeight: "35px",+ "@laptop": { lineHeight: "55px" },},- 2: { fontWeight: 500, lineHeight: "25px", "@bp2": { lineHeight: "30px" } },- 3: { fontWeight: 500, lineHeight: "33px", "@bp2": { lineHeight: "41px" } },- 4: { fontWeight: 500, lineHeight: "35px", "@bp2": { lineHeight: "55px" } },};return (diff --git a/packages/design-system/src/stitches.config.ts b/packages/design-system/src/stitches.config.tsindex 1bc04a16cb..cf95fb6d49 100644--- a/packages/design-system/src/stitches.config.ts+++ b/packages/design-system/src/stitches.config.ts@@ -306,10 +306,9 @@ const {shadows: figmaShadows,},media: {- bp1: "(min-width: 520px)",- bp2: "(min-width: 900px)",- bp3: "(min-width: 1200px)",- bp4: "(min-width: 1800px)",+ tablet: "(min-width: 768px)",+ laptop: "(min-width: 1024px)",+ desktop: "(min-width: 1280px)",motion: "(prefers-reduced-motion)",hover: "(any-hover: hover)",dark: "(prefers-color-scheme: dark)",diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.tsindex 2f3c578e62..a823008048 100644--- a/packages/feature-flags/src/flags.ts+++ b/packages/feature-flags/src/flags.ts@@ -2,3 +2,4 @@ export const designTokens = false;export const example = false;export const dark = false;export const propertyReset = false;+export const share2 = false;diff --git a/packages/prisma-client/prisma/migrations/20230120130131_dashboard-project-is-prod/migration.sql b/packages/prisma-client/prisma/migrations/20230120130131_dashboard-project-is-prod/migration.sqlnew file mode 100644index 0000000000..458b41776a--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20230120130131_dashboard-project-is-prod/migration.sql@@ -0,0 +1,16 @@+-- AlterTable+CREATE+OR REPLACE VIEW "DashboardProject" AS+SELECT+ *,+ EXISTS (+ SELECT+ 1+ from+ "Build"+ WHERE+ "Build"."projectId" = "Project".id+ AND "Build"."isProd" = true+ ) AS "isPublished"+FROM+ "Project";\ No newline at end of filediff --git a/packages/prisma-client/prisma/migrations/20230123225816_dashboard-project-is-deleted/migration.sql b/packages/prisma-client/prisma/migrations/20230123225816_dashboard-project-is-deleted/migration.sqlnew file mode 100644index 0000000000..6833710624--- /dev/null+++ b/packages/prisma-client/prisma/migrations/20230123225816_dashboard-project-is-deleted/migration.sql@@ -0,0 +1,24 @@+-- AlterTable+ALTER TABLE+ "Project"+ADD+ COLUMN "isDeleted" BOOLEAN NOT NULL DEFAULT false;++-- Drop DashboardProject View+DROP VIEW IF EXISTS "DashboardProject";++-- Update DashboardProject View+CREATE VIEW "DashboardProject" AS+SELECT+ *,+ EXISTS (+ SELECT+ 1+ from+ "Build"+ WHERE+ "Build"."projectId" = "Project".id+ AND "Build"."isProd" = true+ ) AS "isPublished"+FROM+ "Project";\ No newline at end of filediff --git a/packages/prisma-client/prisma/schema.prisma b/packages/prisma-client/prisma/schema.prismaindex 2e80cfc566..b46d5f2e7b 100644--- a/packages/prisma-client/prisma/schema.prisma+++ b/packages/prisma-client/prisma/schema.prisma@@ -53,12 +53,13 @@ model User {}model Project {- id String @id @default(uuid())- title String- domain String @unique- user User? @relation(fields: [userId], references: [id])- userId String?- build Build[]+ id String @id @default(uuid())+ title String+ domain String @unique+ user User? @relation(fields: [userId], references: [id])+ userId String?+ build Build[]+ isDeleted Boolean @default(false)}model Build {@@ -112,5 +113,6 @@ view DashboardProject {title Stringdomain StringuserId String?+ isDeleted Boolean @default(false)isPublished Boolean}diff --git a/packages/project/package.json b/packages/project/package.jsonindex 26f30b4d9f..981f36d32c 100644--- a/packages/project/package.json+++ b/packages/project/package.json@@ -28,7 +28,8 @@"slugify": "^1.6.5","uuid": "^9.0.0","warn-once": "^0.1.1",- "zod": "^3.19.1"+ "zod": "^3.19.1",+ "@trpc/server": "^10.9.0"},"devDependencies": {"@jest/globals": "^29.3.1",diff --git a/packages/project/src/db/build.ts b/packages/project/src/db/build.tsindex 38105c9c68..eb91e6d9c4 100644--- a/packages/project/src/db/build.ts+++ b/packages/project/src/db/build.ts@@ -56,7 +56,7 @@ export async function loadByProjectId(});if (build === null) {- return undefined;+ return;}return parseBuild(build);diff --git a/packages/project/src/db/project.ts b/packages/project/src/db/project.tsindex 13dbdc802b..db30a840c5 100644--- a/packages/project/src/db/project.ts+++ b/packages/project/src/db/project.ts@@ -56,15 +56,12 @@ const generateDomain = (title: string) => {return domain;};-export const create = async ({- userId,- title,-}: {- userId: string;- title: string;-}) => {+export const create = async (+ { title }: { title: string },+ { userId }: { userId: string }+) => {if (title.length < MIN_TITLE_LENGTH) {- throw new Error(`Minimum ${MIN_TITLE_LENGTH} characters required`);+ return { errors: `Minimum ${MIN_TITLE_LENGTH} characters required` };}const project = await prisma.$transaction(async (client) => {@@ -84,33 +81,80 @@ export const create = async ({return project;};-export const clone = async (clonableDomain: string, userId: string) => {- const clonableProject = await loadByDomain(clonableDomain);- if (clonableProject === null) {- throw new Error(`Not found project "${clonableDomain}"`);+export const markAsDeleted = async (projectId: Project["id"]) => {+ return await prisma.project.update({+ where: { id: projectId },+ data: { isDeleted: true },+ });+};++export const rename = async ({+ projectId,+ title,+}: {+ projectId: Project["id"];+ title: string;+}) => {+ if (title.length < MIN_TITLE_LENGTH) {+ return { errors: `Minimum ${MIN_TITLE_LENGTH} characters required` };}- const prodBuild = await db.build.loadByProjectId(clonableProject.id, "prod");+ return await prisma.project.update({+ where: { id: projectId },+ data: { title },+ });+};- if (prodBuild === undefined) {- throw new Error("Expected project to be published first");- }+const clone = async ({+ project,+ userId,+ title,+ env = "dev",+}: {+ project: Project;+ userId?: string;+ title?: string;+ env?: "dev" | "prod";+}) => {+ const build =+ env === "dev"+ ? await db.build.loadByProjectId(project.id, "dev")+ : await db.build.loadByProjectId(project.id, "prod");- const project = await prisma.$transaction(async (client) => {- const project = await client.project.create({+ const clonedProject = await prisma.$transaction(async (client) => {+ const clonedProject = await client.project.create({data: {- userId,- title: clonableProject.title,- domain: generateDomain(clonableProject.title),+ userId: userId ?? project.userId,+ title: title ?? project.title,+ domain: generateDomain(project.title),},});- await db.build.create(project.id, "dev", prodBuild, client);+ await db.build.create(clonedProject.id, "dev", build, client);- return project;+ return clonedProject;});- return project;+ return clonedProject;+};++export const duplicate = async (projectId: string) => {+ const project = await loadById(projectId);+ if (project === null) {+ throw new Error(`Not found project "${projectId}"`);+ }+ return await clone({+ project,+ title: `${project.title} (copy)`,+ });+};++export const cloneByDomain = async (domain: string, userId: string) => {+ const project = await loadByDomain(domain);+ if (project === null) {+ throw new Error(`Not found project "${domain}"`);+ }+ return await clone({ project, userId, env: "prod" });};export const update = async ({diff --git a/packages/project/src/index.server.ts b/packages/project/src/index.server.tsindex a89f5bdf70..8dca4d08ed 100644--- a/packages/project/src/index.server.ts+++ b/packages/project/src/index.server.ts@@ -1,2 +1,3 @@import * as dbFunctions from "./db";export const db = dbFunctions;+export * from "./trpc";diff --git a/packages/project/src/index.ts b/packages/project/src/index.tsindex cb1ae522e2..e7638d14f8 100644--- a/packages/project/src/index.ts+++ b/packages/project/src/index.ts@@ -14,3 +14,4 @@ export * from "./shared/styles";export * from "./db/schema";export * from "./shared/canvas-components";export type { InstanceInsertionSpec } from "./shared/tree-utils";+export type { ProjectRouter } from "./trpc";diff --git a/packages/project/src/trpc/index.ts b/packages/project/src/trpc/index.tsnew file mode 100644index 0000000000..a65f00d0b7--- /dev/null+++ b/packages/project/src/trpc/index.ts@@ -0,0 +1,2 @@+export * from "./project-router";+export { mergeRouters, router, procedure } from "./trpc";diff --git a/packages/project/src/trpc/project-router.ts b/packages/project/src/trpc/project-router.tsnew file mode 100644index 0000000000..e610b03970--- /dev/null+++ b/packages/project/src/trpc/project-router.ts@@ -0,0 +1,35 @@+import * as db from "../db";+import { z } from "zod";+import { router, procedure } from "./trpc";++export const projectRouter = router({+ rename: procedure+ .input(+ z.object({+ title: z.string(),+ projectId: z.string(),+ })+ )+ .mutation(async ({ input }) => {+ // @todo pass ctx for authorization+ return await db.project.rename(input);+ }),+ delete: procedure+ .input(z.object({ projectId: z.string() }))+ .mutation(async ({ input }) => {+ // @todo pass ctx for authorization+ return await db.project.markAsDeleted(input.projectId);+ }),+ duplicate: procedure+ .input(z.object({ projectId: z.string() }))+ .mutation(async ({ input }) => {+ return await db.project.duplicate(input.projectId);+ }),+ create: procedure+ .input(z.object({ title: z.string() }))+ .mutation(async ({ input, ctx }) => {+ return await db.project.create(input, ctx);+ }),+});++export type ProjectRouter = typeof projectRouter;diff --git a/packages/project/src/trpc/trpc.ts b/packages/project/src/trpc/trpc.tsnew file mode 100644index 0000000000..b4f47025a3--- /dev/null+++ b/packages/project/src/trpc/trpc.ts@@ -0,0 +1,11 @@+import { initTRPC } from "@trpc/server";++//export const createContext = async (): {userId: string} => {+// return {};+//};++export type Context = { userId: string }; //inferAsyncReturnType<typeof createContext>;++export const { router, procedure, middleware, mergeRouters } = initTRPC+ .context<Context>()+ .create();diff --git a/pnpm-lock.yaml b/pnpm-lock.yamlindex 6e9f05ccc5..7121adc6b1 100644--- a/pnpm-lock.yaml+++ b/pnpm-lock.yaml@@ -65,6 +65,7 @@ importers:'@storybook/testing-library': ^0.0.13'@testing-library/react': ^12.1.5'@testing-library/react-hooks': ^8.0.1+ '@trpc/server': ^10.9.0'@types/css-tree': ^2.0.0'@types/hoist-non-react-statics': ^3.3.1'@types/hyphenate-style-name': ^1.0.0@@ -86,6 +87,7 @@ importers:'@webstudio-is/css-data': workspace:^'@webstudio-is/css-engine': workspace:^'@webstudio-is/css-vars': workspace:^+ '@webstudio-is/dashboard': workspace:^'@webstudio-is/design-system': workspace:^'@webstudio-is/design-tokens': workspace:^'@webstudio-is/eslint-config-custom': workspace:^@@ -169,11 +171,13 @@ importers:'@remix-run/vercel': 1.9.0_hlxpekux3uuzuytqwu73gmyvry'@sentry/remix': 7.5.0_u5gs4jhw3fwvojiab4cbbaz4ki'@sentry/types': 7.5.0+ '@trpc/server': 10.9.0'@vercel/node': 2.4.1'@webstudio-is/asset-uploader': link:../../packages/asset-uploader'@webstudio-is/css-data': link:../../packages/css-data'@webstudio-is/css-engine': link:../../packages/css-engine'@webstudio-is/css-vars': link:../../packages/css-vars+ '@webstudio-is/dashboard': link:../../packages/dashboard'@webstudio-is/design-system': link:../../packages/design-system'@webstudio-is/design-tokens': link:../../packages/design-tokens'@webstudio-is/feature-flags': link:../../packages/feature-flags@@ -380,6 +384,29 @@ importers:'@webstudio-is/tsconfig': link:../tsconfigtypescript: 4.7.4+ packages/dashboard:+ specifiers:+ '@jest/globals': ^29.3.1+ '@webstudio-is/jest-config': workspace:^+ '@webstudio-is/prisma-client': workspace:^+ '@webstudio-is/project': workspace:^+ '@webstudio-is/scripts': workspace:^+ '@webstudio-is/tsconfig': workspace:^+ jest: ^29.3.1+ typescript: 4.7.4+ zod: ^3.19.1+ dependencies:+ '@webstudio-is/prisma-client': link:../prisma-client+ '@webstudio-is/project': link:../project+ zod: 3.19.1+ devDependencies:+ '@jest/globals': 29.3.1+ '@webstudio-is/jest-config': link:../jest-config+ '@webstudio-is/scripts': link:../scripts+ '@webstudio-is/tsconfig': link:../tsconfig+ jest: 29.3.1+ typescript: 4.7.4+packages/design-system:specifiers:'@jest/globals': ^29.3.1@@ -733,6 +760,7 @@ importers:packages/project:specifiers:'@jest/globals': ^29.3.1+ '@trpc/server': ^10.9.0'@types/uuid': ^8.3.4'@webstudio-is/asset-uploader': workspace:^'@webstudio-is/css-data': workspace:^@@ -755,6 +783,7 @@ importers:warn-once: ^0.1.1zod: ^3.19.1dependencies:+ '@trpc/server': 10.9.0'@webstudio-is/asset-uploader': link:../asset-uploader'@webstudio-is/css-data': link:../css-data'@webstudio-is/css-engine': link:../css-engine