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.

Get rid of lib folder in designer app (#870)

Bogdan Chadkin56222a275934
diff --git a/apps/designer/app/designer/features/sidebar-left/lib/header.tsx b/apps/designer/app/designer/features/sidebar-left/header.tsx
similarity index 100%
rename from apps/designer/app/designer/features/sidebar-left/lib/header.tsx
rename to apps/designer/app/designer/features/sidebar-left/header.tsx
diff --git a/apps/designer/app/designer/features/sidebar-left/index.tsx b/apps/designer/app/designer/features/sidebar-left/index.tsx
index ed9a9b59f0..e996490006 100644
--- a/apps/designer/app/designer/features/sidebar-left/index.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/index.tsx
@@ -1,2 +1,2 @@
export { SidebarLeft } from "./sidebar-left";
-export { Navigator } from "./lib/navigator";
+export { Navigator } from "./navigator";
diff --git a/apps/designer/app/designer/features/sidebar-left/lib/navigator/index.ts b/apps/designer/app/designer/features/sidebar-left/navigator/index.ts
similarity index 100%
rename from apps/designer/app/designer/features/sidebar-left/lib/navigator/index.ts
rename to apps/designer/app/designer/features/sidebar-left/navigator/index.ts
diff --git a/apps/designer/app/designer/features/sidebar-left/lib/navigator/navigator.tsx b/apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx
similarity index 100%
rename from apps/designer/app/designer/features/sidebar-left/lib/navigator/navigator.tsx
rename to apps/designer/app/designer/features/sidebar-left/navigator/navigator.tsx
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/assets/assets.tsx b/apps/designer/app/designer/features/sidebar-left/panels/assets/assets.tsx
index 1853398bf1..6c99608893 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/assets/assets.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/assets/assets.tsx
@@ -1,8 +1,8 @@
import { ImageIcon } from "@webstudio-is/icons";
+import { Flex } from "@webstudio-is/design-system";
import { ImageManager } from "~/designer/shared/image-manager";
import { TabName } from "../../types";
-import { Header, CloseButton } from "../../lib/header";
-import { Flex } from "@webstudio-is/design-system";
+import { Header, CloseButton } from "../../header";
export const TabContent = ({
onSetActiveTab,
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx b/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx
index 4e88dc9cb0..77651a84d1 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/components/components.tsx
@@ -6,15 +6,14 @@ import {
getComponentMeta,
getComponentNames,
} from "@webstudio-is/react-sdk";
-import { useSubscribe, type Publish } from "~/shared/pubsub";
-import { Flex, useDrag, type Point } from "@webstudio-is/design-system";
+import { theme, Flex, useDrag, type Point } from "@webstudio-is/design-system";
import { PlusIcon } from "@webstudio-is/icons";
import { utils } from "@webstudio-is/project";
+import { useSubscribe, type Publish } from "~/shared/pubsub";
+import { useCanvasRect, useZoom } from "~/designer/shared/nano-states";
import type { TabName } from "../../types";
+import { Header, CloseButton } from "../../header";
import { ComponentThumb } from "./component-thumb";
-import { useCanvasRect, useZoom } from "~/designer/shared/nano-states";
-import { Header, CloseButton } from "../../lib/header";
-import { theme } from "@webstudio-is/design-system";
type DraggableThumbProps = {
onClick: MouseEventHandler<HTMLDivElement>;
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/design-tokens.tsx b/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/design-tokens.tsx
index eb8879d3bb..c797858a24 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/design-tokens.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/design-tokens/design-tokens.tsx
@@ -1,8 +1,8 @@
import { TokensIcon } from "@webstudio-is/icons";
+import { Flex } from "@webstudio-is/design-system";
import { DesignTokensManager } from "~/designer/shared/design-tokens-manager";
import { TabName } from "../../types";
-import { Header, CloseButton } from "../../lib/header";
-import { Flex } from "@webstudio-is/design-system";
+import { Header, CloseButton } from "../../header";
export const TabContent = ({
onSetActiveTab,
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/navigator/navigator.tsx b/apps/designer/app/designer/features/sidebar-left/panels/navigator/navigator.tsx
index ef720b7b3a..b9fc76df8e 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/navigator/navigator.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/navigator/navigator.tsx
@@ -1,6 +1,6 @@
-import { type Publish } from "~/shared/pubsub";
import { ListNestedIcon } from "@webstudio-is/icons";
-import { Navigator } from "../../lib/navigator";
+import { type Publish } from "~/shared/pubsub";
+import { Navigator } from "../../navigator";
import { TabName } from "../../types";
type TabContentProps = {
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx b/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx
index b7d335a7e5..8881855933 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/pages/pages.tsx
@@ -1,4 +1,7 @@
+import { useCallback, useEffect, useMemo, useRef, useState } from "react";
+import { useNavigate } from "react-router-dom";
import {
+ theme,
DeprecatedIconButton,
TreeItemLabel,
TreeItemBody,
@@ -9,27 +12,24 @@ import {
Tooltip,
Box,
} from "@webstudio-is/design-system";
-import { type Publish } from "~/shared/pubsub";
import {
ChevronRightIcon,
MenuIcon,
NewPageIcon,
PageIcon,
} from "@webstudio-is/icons";
-import type { TabName } from "../../types";
-import { CloseButton, Header } from "../../lib/header";
import { type Page, type Pages } from "@webstudio-is/project";
-import { useCallback, useEffect, useMemo, useRef, useState } from "react";
-import { useNavigate } from "react-router-dom";
+import { type Publish } from "~/shared/pubsub";
import {
useCurrentPageId,
usePages,
useProject,
} from "~/designer/shared/nano-states";
+import { designerPath } from "~/shared/router-utils";
+import type { TabName } from "../../types";
+import { CloseButton, Header } from "../../header";
import { SettingsPanel } from "./settings-panel";
import { NewPageSettings, PageSettings } from "./settings";
-import { designerPath } from "~/shared/router-utils";
-import { theme } from "@webstudio-is/design-system";
type TabContentProps = {
onSetActiveTab: (tabName: TabName) => void;
diff --git a/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx b/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx
index 7ee6e64531..b606444635 100644
--- a/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx
+++ b/apps/designer/app/designer/features/sidebar-left/panels/pages/settings.tsx
@@ -1,4 +1,12 @@
+import type { ZodError } from "zod";
+import { useState, useCallback, ComponentProps } from "react";
+import { useDebouncedCallback } from "use-debounce";
+import { useUnmount } from "react-use";
+import slugify from "slugify";
+import { useFetcher } from "@remix-run/react";
+import { type Page } from "@webstudio-is/project";
import {
+ theme,
DeprecatedIconButton,
Button,
Box,
@@ -10,16 +18,9 @@ import {
InputErrorsTooltip,
Tooltip,
} from "@webstudio-is/design-system";
-import { useFetcher } from "@remix-run/react";
import { ChevronDoubleLeftIcon, TrashIcon } from "@webstudio-is/icons";
import { type Pages, utils as projectUtils } from "@webstudio-is/project";
-import type { ZodError } from "zod";
-import { Header } from "../../lib/header";
-import { useState, useCallback, ComponentProps } from "react";
-import { type Page } from "@webstudio-is/project";
import { usePages } from "~/designer/shared/nano-states";
-import { useDebouncedCallback } from "use-debounce";
-import { useUnmount } from "react-use";
import { useOnFetchEnd, usePersistentFetcher } from "~/shared/fetcher";
import {
normalizeErrors,
@@ -33,8 +34,7 @@ import type {
CreatePageData,
} from "~/shared/pages";
import { restPagesPath } from "~/shared/router-utils";
-import slugify from "slugify";
-import { theme } from "@webstudio-is/design-system";
+import { Header } from "../../header";
const Group = styled(Flex, {
marginBottom: theme.spacing[9],