Skip to content

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.

feat: Enable page templates in the marketplace (#2985)

Oleg Isonen7abeab1d7871
diff --git a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx b/apps/builder/app/builder/features/project-settings/section-marketplace.tsx
index c9385ab86c..f421b1fd46 100644
--- a/apps/builder/app/builder/features/project-settings/section-marketplace.tsx
+++ b/apps/builder/app/builder/features/project-settings/section-marketplace.tsx
@@ -13,6 +13,8 @@ import {
Checkbox,
InputErrorsTooltip,
PanelBanner,
+ Select,
+ rawTheme,
} from "@webstudio-is/design-system";
import { ImageControl } from "./image-control";
import {
@@ -25,7 +27,10 @@ import env from "~/shared/env";
import { Image, createImageLoader } from "@webstudio-is/image";
import { useIds } from "~/shared/form-utils";
import { useState } from "react";
-import { MarketplaceProduct } from "@webstudio-is/project-build";
+import {
+ MarketplaceProduct,
+ marketplaceCategories,
+} from "@webstudio-is/project-build";
import { serverSyncStore } from "~/shared/sync";
import { createTrpcRemixProxy } from "~/shared/remix/trpc-remix-proxy";
import {
@@ -35,12 +40,11 @@ import {
import { projectsPath } from "~/shared/router-utils";
const imgStyle = css({
- width: 72,
- height: 72,
borderRadius: theme.borderRadius[4],
borderWidth: 1,
borderStyle: "solid",
borderColor: theme.colors.borderMain,
+ aspectRatio: "1.91",
});
const defaultMarketplaceProduct: Partial<MarketplaceProduct> = {
@@ -119,7 +123,7 @@ export const SectionMarketplace = () => {
const [data, setData] = useState(() => $marketplaceProduct.get());
const ids = useIds([
"name",
- "thumbnailAssetId",
+ "category",
"author",
"email",
"website",
@@ -149,6 +153,7 @@ export const SectionMarketplace = () => {
const errors = validate(nextData);
setErrors(errors);
setData(nextData);
+
if (errors) {
return;
}
@@ -183,20 +188,36 @@ export const SectionMarketplace = () => {
</InputErrorsTooltip>
</Grid>
+ <Grid gap={1} css={sectionSpacing}>
+ <Label htmlFor={ids.category}>Category</Label>
+ <Select
+ css={{ zIndex: theme.zIndices[1] }}
+ options={Array.from(marketplaceCategories.keys())}
+ getLabel={(category: MarketplaceProduct["category"]) =>
+ marketplaceCategories.get(category)
+ }
+ onChange={handleSave("category")}
+ value={data.category}
+ defaultValue={defaultMarketplaceProduct.category}
+ />
+ </Grid>
+
<Grid gap={2} css={sectionSpacing}>
<Label>Thumbnail</Label>
<Grid flow="column" gap={3}>
- <Image
- width={72}
- height={72}
- className={imgStyle()}
- src={thumbnailUrl}
- loader={imageLoader}
- />
+ <InputErrorsTooltip errors={errors?.thumbnailAssetId}>
+ <Image
+ width={rawTheme.spacing[28]}
+ className={imgStyle()}
+ src={thumbnailUrl}
+ loader={imageLoader}
+ />
+ </InputErrorsTooltip>
<Grid gap={2}>
<Text color="subtle">
- Upload a 32 x 32 px image to display in the marketplace overview.
+ The optimal dimensions in marketplace are 600x315 px or larger
+ with a 1.91:1 aspect ratio.
</Text>
<ImageControl onAssetIdChange={handleSave("thumbnailAssetId")}>
<Button css={{ justifySelf: "start" }}>Upload</Button>
@@ -278,9 +299,8 @@ export const SectionMarketplace = () => {
<Grid gap={2} css={sectionSpacing}>
<PanelBanner>
<Text>
- {`For a page to show up in the marketplace, you will need to add a "ws:category"
- meta tag in the page settings. Optionally, you can also define
- "ws:title"; otherwise, the page title will be used.`}
+ {`You can add a "ws:category" meta tag in the page settings for pages being grouped by category. You can also define
+ "ws:title" for each page; otherwise, the page title will be used.`}
</Text>
<Text color="destructive">
{`Don't forget to publish your project after every change to make your
@@ -314,11 +334,11 @@ export const SectionMarketplace = () => {
{approval.status === "UNLISTED" ? (
<Button
color="primary"
- disabled={isConfirmed === false}
+ disabled={isConfirmed === false || errors !== undefined}
state={approval.state === "idle" ? undefined : "pending"}
onClick={approval.submit}
>
- Submit
+ Start Review
</Button>
) : (
<Button
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/about.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/about.tsx
index a479c95f1b..6340c07ff8 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/about.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/about.tsx
@@ -2,13 +2,16 @@ import {
Button,
Flex,
Link,
+ Separator,
Text,
Tooltip,
+ buttonStyle,
theme,
} from "@webstudio-is/design-system";
import type { MarketplaceOverviewItem } from "~/shared/marketplace/types";
import { Header } from "../../shared/panel";
-import { ChevronDoubleLeftIcon } from "@webstudio-is/icons";
+import { ChevronDoubleLeftIcon, ExternalLinkIcon } from "@webstudio-is/icons";
+import { builderUrl } from "~/shared/router-utils";
export const About = ({
item,
@@ -68,6 +71,23 @@ export const About = ({
)}
</Flex>
</Flex>
+ <Separator />
+ <Flex gap="1" css={{ my: theme.spacing[5], mx: theme.spacing[8] }}>
+ <Link
+ className={buttonStyle({
+ color: "neutral",
+ css: { gap: theme.spacing[3] },
+ })}
+ underline="none"
+ href={builderUrl({
+ projectId: item.projectId,
+ origin: location.origin,
+ })}
+ target="_blank"
+ >
+ <ExternalLinkIcon aria-hidden /> Open project
+ </Link>
+ </Flex>
</>
);
};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/card.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/card.tsx
new file mode 100644
index 0000000000..efdb361429
--- /dev/null
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/card.tsx
@@ -0,0 +1,120 @@
+import {
+ Flex,
+ Text,
+ theme,
+ focusRingStyle,
+ css,
+ rawTheme,
+} from "@webstudio-is/design-system";
+import env from "~/shared/env";
+import { Image, createImageLoader } from "@webstudio-is/image";
+import { forwardRef } from "react";
+import { SpinnerIcon } from "@webstudio-is/icons";
+
+const focusOutline = focusRingStyle();
+
+const imageLoader = createImageLoader({
+ imageBaseUrl: env.IMAGE_BASE_URL,
+});
+
+const imageContainerStyle = css({
+ position: "relative",
+ overflow: "hidden",
+ aspectRatio: "1.91",
+});
+
+const spinnerStyle = css({
+ position: "absolute",
+ inset: 0,
+ display: "flex",
+ alignItems: "center",
+ justifyContent: "center",
+ backgroundColor: "rgba(255, 255, 255, 0.5)",
+ backdropFilter: "blur(8px)",
+});
+
+const imageStyle = css({
+ position: "absolute",
+ top: 0,
+ width: "100%",
+ height: "100%",
+ objectFit: "cover",
+ transition: "transform 100ms",
+ "&:hover": {
+ transform: "scale(1.1)",
+ },
+});
+
+type ThumbnailProps = {
+ image?: { name: string } | string;
+ state?: "loading";
+};
+
+const Thumbnail = ({ image, state }: ThumbnailProps) => {
+ return (
+ <div className={imageContainerStyle()}>
+ {image === "" ? (
+ // Will render a placeholder
+ <Image loader={imageLoader} className={imageStyle()} />
+ ) : typeof image === "string" ? (
+ // Its a URL.
+ <img src={image} className={imageStyle()} />
+ ) : (
+ <Image
+ src={image?.name}
+ width={rawTheme.spacing[28]}
+ loader={imageLoader}
+ className={imageStyle()}
+ />
+ )}
+
+ {state === "loading" && (
+ <div className={spinnerStyle()}>
+ <SpinnerIcon size={rawTheme.spacing[15]} />
+ </div>
+ )}
+ </div>
+ );
+};
+
+type CardProps = {
+ image?: ThumbnailProps["image"];
+ title?: string;
+ suffix?: React.ReactNode;
+ state?: "selected" | "loading";
+};
+
+export const Card = forwardRef<HTMLDivElement, CardProps>(
+ ({ image, title, suffix, state = "initial" as const, ...props }, ref) => {
+ return (
+ <Flex
+ {...props}
+ ref={ref}
+ direction="column"
+ data-state={state}
+ css={{
+ px: theme.spacing[9],
+ py: theme.spacing[5],
+ position: "relative",
+ overflow: "hidden",
+ outline: "none",
+ "&:focus-visible, &:hover, &[data-state=selected]": focusOutline,
+ }}
+ gap="1"
+ >
+ <Thumbnail
+ image={image}
+ state={state === "loading" ? state : undefined}
+ />
+ <Flex align="center">
+ <Text truncate css={{ flexGrow: 1 }}>
+ {title}
+ </Text>
+ {suffix}
+ </Flex>
+ </Flex>
+ );
+ }
+);
+
+Card.displayName = "Card";
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
index 835b9c22bd..25e1a1a305 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/marketplace.tsx
@@ -3,7 +3,7 @@ import { Flex, rawTheme } from "@webstudio-is/design-system";
import type { TabContentProps } from "../../types";
import { Header, CloseButton, Root } from "../../shared/panel";
import { Overview } from "./overview";
-import { SectionTemplates } from "./section-templates";
+import { Templates } from "./templates";
import { marketplacePath } from "~/shared/router-utils";
import { useEffect, useState } from "react";
import { toWebstudioData } from "./utils";
@@ -19,7 +19,7 @@ const trpc = createTrpcFetchProxy<MarketplaceRouter>(marketplacePath);
export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
const [activeOverviewItem, setAciveOverviewItem] =
useState<MarketplaceOverviewItem>();
- const [openAbout, setopenAbout] = useState<Project["id"]>();
+ const [openAbout, setOpenAbout] = useState<Project["id"]>();
const {
load: getItems,
@@ -42,13 +42,9 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
title="Marketplace"
suffix={<CloseButton onClick={() => onSetActiveTab("none")} />}
/>
- {itemsLoadingState !== "idle" && (
- <Flex justify="center" css={{ mt: "20%" }}>
- <SpinnerIcon size={rawTheme.spacing[15]} />
- </Flex>
- )}
{activeOverviewItem && buildData ? (
- <SectionTemplates
+ <Templates
+ projectId={activeOverviewItem.projectId}
name={activeOverviewItem.name}
data={toWebstudioData(buildData)}
onOpenChange={(isOpen: boolean) => {
@@ -66,15 +62,20 @@ export const TabContent = ({ onSetActiveTab }: TabContentProps) => {
getBuildData({ projectId: activeOverviewItem.projectId });
}}
openAbout={openAbout}
- onOpenAbout={setopenAbout}
+ onOpenAbout={setOpenAbout}
/>
)}
+ {itemsLoadingState !== "idle" && (
+ <Flex justify="center" css={{ mt: "20%" }}>
+ <SpinnerIcon size={rawTheme.spacing[15]} />
+ </Flex>
+ )}
</Root>
<ExtendedPanel isOpen={openAboutItem !== undefined}>
<About
item={openAboutItem}
onClose={() => {
- setopenAbout(undefined);
+ setOpenAbout(undefined);
}}
/>
</ExtendedPanel>
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/overview.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/overview.tsx
index d0ddf6f510..be62f20093 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/overview.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/overview.tsx
@@ -1,27 +1,22 @@
-import { useMemo } from "react";
+import { useMemo, useState } from "react";
import {
Flex,
+ IconButton,
List,
ListItem,
+ PanelTabs,
+ PanelTabsContent,
+ PanelTabsList,
+ PanelTabsTrigger,
ScrollArea,
- SmallIconButton,
- Text,
- focusRingStyle,
- rawTheme,
- theme,
} from "@webstudio-is/design-system";
-import { CollapsibleSection } from "~/builder/shared/collapsible-section";
-import { categories } from "./utils";
-import {
- ChevronRightIcon,
- EllipsesIcon,
- SpinnerIcon,
-} from "@webstudio-is/icons";
-import env from "~/shared/env";
-import { Image, createImageLoader } from "@webstudio-is/image";
+import { EllipsesIcon } from "@webstudio-is/icons";
import type { MarketplaceOverviewItem } from "~/shared/marketplace/types";
import type { Project } from "@webstudio-is/project";
import { usePress } from "@react-aria/interactions";
+import { marketplaceCategories } from "@webstudio-is/project-build";
+import { Card } from "./card";
+import { isFeatureEnabled } from "@webstudio-is/feature-flags";
const getItemsByCategory = (items: Array<MarketplaceOverviewItem> = []) => {
const itemsByCategory = new Map<
@@ -30,10 +25,7 @@ const getItemsByCategory = (items: Array<MarketplaceOverviewItem> = []) => {
>();
for (const item of items) {
- if (
- categories.some((category) => category.category === item.category) ===
- false
- ) {
+ if (marketplaceCategories.has(item.category) === false) {
throw new Error(`Unknown category: ${item.category}`);
}
let categoryItems = itemsByCategory.get(item.category);
@@ -47,13 +39,7 @@ const getItemsByCategory = (items: Array<MarketplaceOverviewItem> = []) => {
return itemsByCategory;
};
-const focusOutline = focusRingStyle();
-
-const imageLoader = createImageLoader({
- imageBaseUrl: env.IMAGE_BASE_URL,
-});
-
-const OverviewItem = ({
+const GalleryOverviewItem = ({
item,
isLoading,
isOpen,
@@ -72,42 +58,21 @@ const OverviewItem = ({
});
return (
- <Flex
+ <Card
{...props}
- css={{
- position: "relative",
- height: theme.spacing[13],
- px: theme.spacing[9],
- outline: "none",
- "&:focus-visible": focusOutline,
- "&:hover": focusOutline,
- }}
- align="center"
- justify="between"
- >
- <Flex align="center" gap="2">
- <Image
- src={item.thumbnailAssetName}
- loader={imageLoader}
- width={rawTheme.spacing[11]}
- height={rawTheme.spacing[11]}
- aria-disabled
- />
- <Text variant="labelsSentenceCase" truncate>
- {item.name}
- </Text>
- </Flex>
- <Flex shrink={false} align="center">
- {isLoading ? (
- <SpinnerIcon />
- ) : (
- <SmallIconButton
- icon={isOpen ? <ChevronRightIcon /> : <EllipsesIcon />}
- {...pressProps}
- />
- )}
- </Flex>
- </Flex>
+ title={item.name}
+ image={
+ item.thumbnailAssetName ? { name: item.thumbnailAssetName } : undefined
+ }
+ state={isOpen ? "selected" : isLoading ? "loading" : undefined}
+ suffix={
+ <Flex shrink={false} align="center">
+ <IconButton {...pressProps} state={isOpen ? "open" : undefined}>
+ <EllipsesIcon />
+ </IconButton>
+ </Flex>
+ }
+ />
);
};
@@ -125,19 +90,40 @@ export const Overview = ({
onOpenAbout: (projectId?: string) => void;
}) => {
const itemsByCategory = useMemo(() => getItemsByCategory(items), [items]);
+ const [selectedCategory, setSelectedCategory] =
+ useState<MarketplaceOverviewItem["category"]>("sectionTemplates");
+
+ const categoryItems = itemsByCategory.get(selectedCategory);
return (
- <ScrollArea>
- {categories.map(({ category, label }) => {
- const items = itemsByCategory.get(category);
- if (items === undefined || items.length === 0) {
- return;
- }
- return (
- <CollapsibleSection label={label} key={category} fullWidth>
+ <PanelTabs
+ value={selectedCategory}
+ onValueChange={(category) => {
+ setSelectedCategory(category as MarketplaceOverviewItem["category"]);
+ }}
+ asChild
+ >
+ <Flex direction="column">
+ <PanelTabsList>
+ {Array.from(marketplaceCategories.keys()).map((category) => {
+ if (
+ category === "pageTemplates" &&
+ isFeatureEnabled("pageTemplates") === false
+ ) {
+ return;
+ }
+ return (
+ <PanelTabsTrigger key={category} value={category}>
+ {marketplaceCategories.get(category)}
+ </PanelTabsTrigger>
+ );
+ })}
+ </PanelTabsList>
+ <PanelTabsContent value={selectedCategory} tabIndex={-1}>
+ <ScrollArea>
<List asChild>
<Flex direction="column">
- {items.map((item, index) => {
+ {categoryItems?.map((item, index) => {
return (
<ListItem
asChild
@@ -145,9 +131,10 @@ export const Overview = ({
index={index}
onSelect={() => {
onSelect(item);
+ onOpenAbout(undefined);
}}
>
- <OverviewItem
+ <GalleryOverviewItem
item={item}
isLoading={item.projectId === activeProjectId}
isOpen={openAbout === item.projectId}
@@ -160,9 +147,9 @@ export const Overview = ({
})}
</Flex>
</List>
- </CollapsibleSection>
- );
- })}
- </ScrollArea>
+ </ScrollArea>
+ </PanelTabsContent>
+ </Flex>
+ </PanelTabs>
);
};
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/section-templates.tsx b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/templates.tsx
similarity index 53%
rename from apps/builder/app/builder/features/sidebar-left/panels/marketplace/section-templates.tsx
rename to apps/builder/app/builder/features/sidebar-left/panels/marketplace/templates.tsx
index af32c33ac9..479259aca6 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/section-templates.tsx
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/templates.tsx
@@ -5,60 +5,17 @@ import {
ListItem,
ScrollArea,
Separator,
- Text,
theme,
- focusRingStyle,
- css,
+ Link,
} from "@webstudio-is/design-system";
-import { ChevronLeftIcon } from "@webstudio-is/icons";
+import { ChevronLeftIcon, ExternalLinkIcon } from "@webstudio-is/icons";
import { insert } from "./utils";
import { computeExpression } from "~/shared/nano-states";
import { CollapsibleSection } from "~/builder/shared/collapsible-section";
import type { Asset, WebstudioData } from "@webstudio-is/sdk";
import { useMemo } from "react";
-import env from "~/shared/env";
-import { Image, createImageLoader } from "@webstudio-is/image";
-
-const focusOutline = focusRingStyle();
-
-const imageLoader = createImageLoader({
- imageBaseUrl: env.IMAGE_BASE_URL,
-});
-
-const imageContainerStyle = css({
- position: "relative",
- overflow: "hidden",
- aspectRatio: "1.91",
-});
-
-const imageStyle = css({
- position: "absolute",
- top: 0,
- width: "100%",
- height: "100%",
- objectFit: "cover",
- transition: "transform 100ms",
- "&:hover": {
- transform: "scale(1.1)",
- },
-});
-
-const Thumbnail = ({
- asset,
- imageUrl,
-}: {
- asset?: Asset;
- imageUrl?: string;
-}) => {
- return (
- <div className={imageContainerStyle()}>
- {imageUrl && <img src={imageUrl} className={imageStyle()} />}
- {asset && (
- <Image src={asset.name} loader={imageLoader} className={imageStyle()} />
- )}
- </div>
- );
-};
+import { builderUrl } from "~/shared/router-utils";
+import { Card } from "./card";
type TemplateData = {
socialImageAsset?: Asset;
@@ -67,38 +24,6 @@ type TemplateData = {
rootInstanceId: string;
};
-const SectionTemplate = ({
- data: { socialImageAsset, socialImageUrl, title },
- ...listItemProps
-}: {
- data: TemplateData;
-}) => {
- return (
- <Flex
- {...listItemProps}
- direction="column"
- css={{
- px: theme.spacing[9],
- py: theme.spacing[5],
- position: "relative",
- overflow: "hidden",
- outline: "none",
- "&:hover": {
- background: theme.colors.backgroundPresetMain,
- },
- "&:focus-visible": {
- ...focusOutline,
- background: theme.colors.backgroundPresetMain,
- },
- }}
- gap="1"
- >
- <Thumbnail asset={socialImageAsset} imageUrl={socialImageUrl} />
- {title && <Text truncate>{title}</Text>}
- </Flex>
- );
-};
-
// Special meta properties for the marketplace
const marketplaceMeta = {
category: "ws:category",
@@ -120,50 +45,56 @@ const getTemplatesDataByCategory = (data?: WebstudioData) => {
let category = page.meta.custom?.find(
({ property }) => property === marketplaceMeta.category
)?.content;
+
if (category !== undefined) {
category = computeExpression(category, variableValues);
}
- if (category !== undefined) {
- let templates = templatesByCategory.get(category);
- if (templates === undefined) {
- templates = [];
- templatesByCategory.set(category, templates);
- }
- const socialImageUrl = page.meta.socialImageUrl
- ? String(computeExpression(page.meta.socialImageUrl, variableValues))
- : undefined;
- const socialImageAsset = page.meta.socialImageAssetId
- ? data.assets.get(page.meta.socialImageAssetId)
- : undefined;
+ if (category === undefined) {
+ category = "Pages";
+ }
- let title = page.meta.custom?.find(
- ({ property }) => property === marketplaceMeta.title
- )?.content;
- if (title !== undefined) {
- title = computeExpression(title, variableValues);
- }
- if (title === undefined || title === "") {
- title = computeExpression(page.title, variableValues);
- }
+ let templates = templatesByCategory.get(category);
+ if (templates === undefined) {
+ templates = [];
+ templatesByCategory.set(category, templates);
+ }
- templates.push({
- title,
- socialImageUrl,
- socialImageAsset,
- rootInstanceId: page.rootInstanceId,
- });
+ const socialImageUrl = page.meta.socialImageUrl
+ ? String(computeExpression(page.meta.socialImageUrl, variableValues))
+ : undefined;
+ const socialImageAsset = page.meta.socialImageAssetId
+ ? data.assets.get(page.meta.socialImageAssetId)
+ : undefined;
+
+ let title = page.meta.custom?.find(
+ ({ property }) => property === marketplaceMeta.title
+ )?.content;
+ if (title !== undefined) {
+ title = computeExpression(title, variableValues);
+ }
+ if (title === undefined || title === "") {
+ title = computeExpression(page.title, variableValues);
}
+
+ templates.push({
+ title,
+ socialImageUrl,
+ socialImageAsset,
+ rootInstanceId: page.rootInstanceId,
+ });
}
return templatesByCategory;
};
-export const SectionTemplates = ({
+export const Templates = ({
name,
+ projectId,
data,
onOpenChange,
}: {
name: string;
+ projectId: string;
data: WebstudioData;
onOpenChange: (isOpen: boolean) => void;
}) => {
@@ -181,6 +112,7 @@ export const SectionTemplates = ({
<Flex
align="center"
shrink="false"
+ justify="between"
css={{ px: theme.spacing[9], py: theme.spacing[5] }}
>
<Button
@@ -192,6 +124,17 @@ export const SectionTemplates = ({
>
{name}
</Button>
+ <Link
+ underline="none"
+ href={builderUrl({
+ projectId: projectId,
+ origin: location.origin,
+ })}
+ target="_blank"
+ aria-label="Open project in new tab"
+ >
+ <ExternalLinkIcon />
+ </Link>
</Flex>
<Separator />
<ScrollArea>
@@ -217,7 +160,13 @@ export const SectionTemplates = ({
});
}}
>
- <SectionTemplate data={templateData} />
+ <Card
+ image={
+ templateData.socialImageAsset ??
+ templateData.socialImageUrl
+ }
+ title={templateData.title}
+ />
</ListItem>
);
})}
diff --git a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/utils.ts b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/utils.ts
index e366d28768..27d3ddba75 100644
--- a/apps/builder/app/builder/features/sidebar-left/panels/marketplace/utils.ts
+++ b/apps/builder/app/builder/features/sidebar-left/panels/marketplace/utils.ts
@@ -4,16 +4,10 @@ import {
findTargetAndInsertFragment,
} from "~/shared/instance-utils";
import type { WebstudioData } from "@webstudio-is/sdk";
-import { MarketplaceProduct } from "@webstudio-is/project-build";
import type { BuildData } from "~/shared/marketplace/types";
export const $activeProductData = atom<WebstudioData | undefined>();
-export const categories: Array<{
- category: MarketplaceProduct["category"];
- label: string;
-}> = [{ category: "sectionTemplates", label: "Section Templates" }];
-
export const toWebstudioData = (data: BuildData): WebstudioData => ({
pages: data.build.pages,
assets: new Map(data.assets),
diff --git a/packages/design-system/src/components/icon-button.tsx b/packages/design-system/src/components/icon-button.tsx
index 81e3f29bd9..cbf166f083 100644
--- a/packages/design-system/src/components/icon-button.tsx
+++ b/packages/design-system/src/components/icon-button.tsx
@@ -7,6 +7,10 @@
import { styled } from "../stitches.config";
import { theme } from "../stitches.config";
+const openOrHoverStateStyle = {
+ backgroundColor: theme.colors.backgroundHover,
+};
+
export const IconButton = styled("button", {
// reset styles
boxSizing: "border-box",
@@ -20,9 +24,8 @@ export const IconButton = styled("button", {
alignItems: "center",
// prevent shrinking inside flex box
flexShrink: 0,
- // set size and shape
- width: 28,
- height: 28,
+ width: theme.spacing[12],
+ height: theme.spacing[12],
borderRadius: theme.borderRadius[3],
"&[data-focused=true], &:focus-visible": {
@@ -37,24 +40,13 @@ export const IconButton = styled("button", {
},
// https://www.radix-ui.com/docs/primitives/components/popover#trigger
- "&[data-state=open]": {
- borderColor: "transparent",
- backgroundColor: theme.colors.backgroundActive,
- color: theme.colors.foregroundContrastMain,
- "&:hover, &[data-hovered=true]": {
- borderColor: "transparent",
- backgroundColor: theme.colors.backgroundActive,
- color: theme.colors.foregroundContrastMain,
- },
- },
+ "&[data-state=open]": openOrHoverStateStyle,
variants: {
variant: {
default: {
color: theme.colors.foregroundMain,
- "&:hover, &[data-hovered=true]": {
- backgroundColor: theme.colors.backgroundHover,
- },
+ "&:hover, &[data-hovered=true]": openOrHoverStateStyle,
// According to the design https://www.figma.com/file/sfCE7iLS0k25qCxiifQNLE/%F0%9F%93%9A-Webstudio-Library?node-id=4-3199&t=lpT9jFuaiUnz1Foa-0
// only the default variant has different toggle state
// https://www.radix-ui.com/docs/primitives/components/toggle#root
@@ -62,9 +54,7 @@ export const IconButton = styled("button", {
backgroundColor: theme.colors.backgroundPresetMain,
borderColor: theme.colors.borderMain,
- "&:hover, &[data-hovered=true]": {
- backgroundColor: theme.colors.backgroundHover,
- },
+ "&:hover, &[data-hovered=true]": openOrHoverStateStyle,
},
"&:disabled": {
@@ -120,6 +110,9 @@ export const IconButton = styled("button", {
},
},
},
+ state: {
+ open: openOrHoverStateStyle,
+ },
},
defaultVariants: {
diff --git a/packages/design-system/src/components/panel-tabs.tsx b/packages/design-system/src/components/panel-tabs.tsx
index 613b331845..3f523cf21e 100644
--- a/packages/design-system/src/components/panel-tabs.tsx
+++ b/packages/design-system/src/components/panel-tabs.tsx
@@ -39,6 +39,8 @@ export const PanelTabsTrigger = styled(Primitive.Trigger, {
});
export const PanelTabsContent = styled(Primitive.Content, {
+ display: "grid",
+ minHeight: 0,
"&:focus": { outline: "none" },
"&[data-state=inactive]": { display: "none" },
});
diff --git a/packages/feature-flags/src/flags.ts b/packages/feature-flags/src/flags.ts
index 502121da8c..dd323b180f 100644
--- a/packages/feature-flags/src/flags.ts
+++ b/packages/feature-flags/src/flags.ts
@@ -5,3 +5,4 @@ export const unsupportedBrowsers = false;
export const aiRadixComponents = false;
export const cms = false;
export const marketplace = false;
+export const pageTemplates = false;
diff --git a/packages/project-build/src/shared/marketplace.ts b/packages/project-build/src/shared/marketplace.ts
index f6735689c0..731e7d57d0 100644
--- a/packages/project-build/src/shared/marketplace.ts
+++ b/packages/project-build/src/shared/marketplace.ts
@@ -1,6 +1,10 @@
import { z } from "zod";
-const Base = z.object({
+export const MarketplaceProduct = z.object({
+ category: z.union([
+ z.literal("sectionTemplates"),
+ z.literal("pageTemplates"),
+ ]),
name: z.string().min(2).trim(),
thumbnailAssetId: z.string(),
author: z.string().min(2).trim(),
@@ -9,11 +13,12 @@ const Base = z.object({
issues: z.union([z.string().url().trim().optional(), z.literal("")]),
description: z.string().trim().min(10),
});
-
-const TemplatesProduct = Base.extend({
- category: z.literal("sectionTemplates"),
-});
-
-// Will add an AppProduct later.
-export const MarketplaceProduct = TemplatesProduct;
export type MarketplaceProduct = z.infer<typeof MarketplaceProduct>;
+
+export const marketplaceCategories = new Map<
+ MarketplaceProduct["category"],
+ string
+>([
+ ["sectionTemplates", "Sections"],
+ ["pageTemplates", "Pages"],
+]);