Skip to content

armgit / mimik

Public Imported from GitHub
0

🎬 A browser extension and desktop app that turns your clicks into step-by-step guides with annotated screenshots πŸ“–

refactor(ui): organise the package by feature

Luis Ortizf48655df7bd2
diff --git a/apps/desktop/src/renderer/App.tsx b/apps/desktop/src/renderer/App.tsx
index 6fe83d9..034519a 100644
--- a/apps/desktop/src/renderer/App.tsx
+++ b/apps/desktop/src/renderer/App.tsx
@@ -1,9 +1,9 @@
import { TooltipProvider } from '@mimik/ui/components/ui/tooltip';
-import GuideContent from '@mimik/ui/fullview/GuideContent';
-import LibraryContent from '@mimik/ui/fullview/LibraryContent';
-import { navigate, useRoute } from '@mimik/ui/fullview/router';
-import SearchModal from '@mimik/ui/fullview/SearchModal';
-import TopNav from '@mimik/ui/fullview/TopNav';
+import GuideContent from '@mimik/ui/guide/components/GuideContent';
+import LibraryContent from '@mimik/ui/library/components/LibraryContent';
+import TopNav from '@mimik/ui/navigation/components/TopNav';
+import { navigate, useRoute } from '@mimik/ui/navigation/lib/router';
+import SearchModal from '@mimik/ui/search/components/SearchModal';
import { useEffect, useState } from 'react';
import CaptureSheet from './CaptureSheet';
import GuideZoom from './GuideZoom';
diff --git a/apps/desktop/src/renderer/SettingsPanel.tsx b/apps/desktop/src/renderer/SettingsPanel.tsx
index 7cacecf..5c36a4a 100644
--- a/apps/desktop/src/renderer/SettingsPanel.tsx
+++ b/apps/desktop/src/renderer/SettingsPanel.tsx
@@ -2,10 +2,10 @@ import { validateApiKey } from '@mimik/core/capture/ai/validate';
import { i18n } from '@mimik/core/env';
import { MAX_ZOOM, MIN_ZOOM, ZOOM_STEP } from '@mimik/core/screenshot/record';
import { CURSOR_STYLES } from '@mimik/core/screenshot/types';
+import AiSettings from '@mimik/ui/ai/components/AiSettings';
+import { useKeyCheck } from '@mimik/ui/ai/components/key-status';
import { Input } from '@mimik/ui/components/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@mimik/ui/components/ui/select';
-import AiSettings from '@mimik/ui/shared/AiSettings';
-import { useKeyCheck } from '@mimik/ui/shared/key-status';
import { Command, Keyboard, MonitorPlay } from 'lucide-react';
import type { ReactNode } from 'react';
import { useEffect, useState } from 'react';
diff --git a/apps/desktop/src/renderer/overlay.ts b/apps/desktop/src/renderer/overlay.ts
index 265a204..0bcd31a 100644
--- a/apps/desktop/src/renderer/overlay.ts
+++ b/apps/desktop/src/renderer/overlay.ts
@@ -6,7 +6,7 @@ import {
MASCOT_FACES,
MASCOT_SEAM,
MASCOT_VIEW_BOX,
-} from '@mimik/ui/shared/mascot-shapes';
+} from '@mimik/ui/common/lib/mascot-shapes';
import { icon } from './icons';
import './overlay.css';
diff --git a/packages/ui/package.json b/packages/ui/package.json
index b99112e..fec20c0 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -8,6 +8,6 @@
},
"sideEffects": [
"**/*.css",
- "./src/lib/utils.ts"
+ "./src/common/lib/utils.ts"
]
}
diff --git a/packages/ui/src/shared/AiSettings.tsx b/packages/ui/src/ai/components/AiSettings.tsx
similarity index 98%
rename from packages/ui/src/shared/AiSettings.tsx
rename to packages/ui/src/ai/components/AiSettings.tsx
index 8ebcc9e..8f17a5a 100644
--- a/packages/ui/src/shared/AiSettings.tsx
+++ b/packages/ui/src/ai/components/AiSettings.tsx
@@ -1,9 +1,6 @@
import { AI_PROVIDERS, type AIProviderKey, CUSTOM_MODEL_VALUE } from '@mimik/core/capture/ai/models';
import { AI_LANGUAGES, type AILanguageCode } from '@mimik/core/capture/ai/prompts';
import { i18n } from '@mimik/core/env';
-import { Button } from '@mimik/ui/components/ui/button';
-import { Input } from '@mimik/ui/components/ui/input';
-import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@mimik/ui/components/ui/select';
import {
type KeyStatus,
KeyStatusNote,
@@ -11,8 +8,11 @@ import {
KeyWarningNote,
ModelList,
SecretInput,
-} from '@mimik/ui/shared/key-status';
-import { useAiSettings } from '@mimik/ui/shared/use-ai-settings';
+} from '@mimik/ui/ai/components/key-status';
+import { useAiSettings } from '@mimik/ui/ai/hooks/use-ai-settings';
+import { Button } from '@mimik/ui/components/ui/button';
+import { Input } from '@mimik/ui/components/ui/input';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@mimik/ui/components/ui/select';
import { Globe, Sparkles, TriangleAlert } from 'lucide-react';
export interface KeyCheck {
diff --git a/packages/ui/src/shared/key-status.tsx b/packages/ui/src/ai/components/key-status.tsx
similarity index 100%
rename from packages/ui/src/shared/key-status.tsx
rename to packages/ui/src/ai/components/key-status.tsx
diff --git a/packages/ui/src/shared/use-ai-settings.ts b/packages/ui/src/ai/hooks/use-ai-settings.ts
similarity index 100%
rename from packages/ui/src/shared/use-ai-settings.ts
rename to packages/ui/src/ai/hooks/use-ai-settings.ts
diff --git a/packages/ui/src/shared/AskAi.tsx b/packages/ui/src/ai/hooks/use-ask-ai.tsx
similarity index 98%
rename from packages/ui/src/shared/AskAi.tsx
rename to packages/ui/src/ai/hooks/use-ask-ai.tsx
index 06045fb..e6722c2 100644
--- a/packages/ui/src/shared/AskAi.tsx
+++ b/packages/ui/src/ai/hooks/use-ask-ai.tsx
@@ -1,9 +1,9 @@
import { REWRITE_PRESETS, type RewritePreset } from '@mimik/core/capture/ai/prompts';
import { i18n } from '@mimik/core/env';
+import { rewriteErrorMessage } from '@mimik/ui/ai/lib/rewrite-error';
+import Toast from '@mimik/ui/common/components/Toast';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
import { send } from '@mimik/ui/env';
-import { rewriteErrorMessage } from '@mimik/ui/shared/rewrite-error';
-import Toast from '@mimik/ui/shared/Toast';
import { Loader2, Sparkles, Wand2 } from 'lucide-react';
import { useCallback, useEffect, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
diff --git a/packages/ui/src/fullview/use-guide-description.ts b/packages/ui/src/ai/hooks/use-guide-description.ts
similarity index 96%
rename from packages/ui/src/fullview/use-guide-description.ts
rename to packages/ui/src/ai/hooks/use-guide-description.ts
index e27d690..d8c1bf9 100644
--- a/packages/ui/src/fullview/use-guide-description.ts
+++ b/packages/ui/src/ai/hooks/use-guide-description.ts
@@ -1,6 +1,6 @@
import { updateGuideDescription } from '@mimik/core/guides/service';
+import { guideDescriptionErrorMessage } from '@mimik/ui/ai/lib/guide-description-error';
import { send } from '@mimik/ui/env';
-import { guideDescriptionErrorMessage } from '@mimik/ui/shared/guide-description-error';
import { useCallback, useState } from 'react';
export interface GuideDescription {
diff --git a/packages/ui/src/shared/__tests__/guide-description-error.test.ts b/packages/ui/src/ai/lib/__tests__/guide-description-error.test.ts
similarity index 100%
rename from packages/ui/src/shared/__tests__/guide-description-error.test.ts
rename to packages/ui/src/ai/lib/__tests__/guide-description-error.test.ts
diff --git a/packages/ui/src/shared/guide-description-error.ts b/packages/ui/src/ai/lib/guide-description-error.ts
similarity index 100%
rename from packages/ui/src/shared/guide-description-error.ts
rename to packages/ui/src/ai/lib/guide-description-error.ts
diff --git a/packages/ui/src/shared/rewrite-error.ts b/packages/ui/src/ai/lib/rewrite-error.ts
similarity index 100%
rename from packages/ui/src/shared/rewrite-error.ts
rename to packages/ui/src/ai/lib/rewrite-error.ts
diff --git a/packages/ui/src/shared/AnnotationEditor.tsx b/packages/ui/src/annotation/components/AnnotationEditor.tsx
similarity index 99%
rename from packages/ui/src/shared/AnnotationEditor.tsx
rename to packages/ui/src/annotation/components/AnnotationEditor.tsx
index c2f4e98..02ff8de 100644
--- a/packages/ui/src/shared/AnnotationEditor.tsx
+++ b/packages/ui/src/annotation/components/AnnotationEditor.tsx
@@ -33,6 +33,9 @@ import {
MIN_FONT_SIZE,
MIN_LINE_HEIGHT,
} from '@mimik/core/screenshot/types';
+import { useEditHistory } from '@mimik/ui/annotation/hooks/use-edit-history';
+import { usePointerGesture } from '@mimik/ui/annotation/hooks/use-pointer-gesture';
+import { useTextStyle } from '@mimik/ui/annotation/hooks/use-text-style';
import {
DropdownMenu,
DropdownMenuContent,
@@ -41,9 +44,6 @@ import {
} from '@mimik/ui/components/ui/dropdown-menu';
import { Popover, PopoverContent, PopoverTrigger } from '@mimik/ui/components/ui/popover';
import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
-import { useEditHistory } from '@mimik/ui/shared/use-edit-history';
-import { usePointerGesture } from '@mimik/ui/shared/use-pointer-gesture';
-import { useTextStyle } from '@mimik/ui/shared/use-text-style';
import {
ArrowUpRight,
ChevronDown,
diff --git a/packages/ui/src/shared/ColorPicker.tsx b/packages/ui/src/annotation/components/ColorPicker.tsx
similarity index 100%
rename from packages/ui/src/shared/ColorPicker.tsx
rename to packages/ui/src/annotation/components/ColorPicker.tsx
diff --git a/packages/ui/src/shared/use-edit-history.ts b/packages/ui/src/annotation/hooks/use-edit-history.ts
similarity index 100%
rename from packages/ui/src/shared/use-edit-history.ts
rename to packages/ui/src/annotation/hooks/use-edit-history.ts
diff --git a/packages/ui/src/shared/use-pointer-gesture.ts b/packages/ui/src/annotation/hooks/use-pointer-gesture.ts
similarity index 100%
rename from packages/ui/src/shared/use-pointer-gesture.ts
rename to packages/ui/src/annotation/hooks/use-pointer-gesture.ts
diff --git a/packages/ui/src/shared/use-text-style.ts b/packages/ui/src/annotation/hooks/use-text-style.ts
similarity index 100%
rename from packages/ui/src/shared/use-text-style.ts
rename to packages/ui/src/annotation/hooks/use-text-style.ts
diff --git a/packages/ui/src/shared/ConfirmDialog.tsx b/packages/ui/src/common/components/ConfirmDialog.tsx
similarity index 100%
rename from packages/ui/src/shared/ConfirmDialog.tsx
rename to packages/ui/src/common/components/ConfirmDialog.tsx
diff --git a/packages/ui/src/shared/FaviconImg.tsx b/packages/ui/src/common/components/FaviconImg.tsx
similarity index 93%
rename from packages/ui/src/shared/FaviconImg.tsx
rename to packages/ui/src/common/components/FaviconImg.tsx
index 66a7dee..5e3250b 100644
--- a/packages/ui/src/shared/FaviconImg.tsx
+++ b/packages/ui/src/common/components/FaviconImg.tsx
@@ -1,4 +1,4 @@
-import { getDomainInitial, getFaviconUrl } from '@mimik/ui/lib/utils';
+import { getDomainInitial, getFaviconUrl } from '@mimik/ui/common/lib/utils';
import { useState } from 'react';
interface FaviconImgProps {
diff --git a/packages/ui/src/shared/MascotIcon.tsx b/packages/ui/src/common/components/MascotIcon.tsx
similarity index 98%
rename from packages/ui/src/shared/MascotIcon.tsx
rename to packages/ui/src/common/components/MascotIcon.tsx
index 05d5e64..e8b0209 100644
--- a/packages/ui/src/shared/MascotIcon.tsx
+++ b/packages/ui/src/common/components/MascotIcon.tsx
@@ -7,7 +7,7 @@ import {
MASCOT_SEAM,
MASCOT_VIEW_BOX,
type MascotPose,
-} from './mascot-shapes';
+} from '../lib/mascot-shapes';
interface MascotIconProps {
size?: number;
diff --git a/packages/ui/src/shared/Toast.tsx b/packages/ui/src/common/components/Toast.tsx
similarity index 100%
rename from packages/ui/src/shared/Toast.tsx
rename to packages/ui/src/common/components/Toast.tsx
diff --git a/packages/ui/src/shared/mascot-shapes.ts b/packages/ui/src/common/lib/mascot-shapes.ts
similarity index 100%
rename from packages/ui/src/shared/mascot-shapes.ts
rename to packages/ui/src/common/lib/mascot-shapes.ts
diff --git a/packages/ui/src/lib/utils.ts b/packages/ui/src/common/lib/utils.ts
similarity index 100%
rename from packages/ui/src/lib/utils.ts
rename to packages/ui/src/common/lib/utils.ts
diff --git a/packages/ui/src/components/ui/badge.tsx b/packages/ui/src/components/ui/badge.tsx
index b0f1138..1f731f1 100644
--- a/packages/ui/src/components/ui/badge.tsx
+++ b/packages/ui/src/components/ui/badge.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@mimik/ui/lib/utils';
+import { cn } from '@mimik/ui/common/lib/utils';
import { cva, type VariantProps } from 'class-variance-authority';
import { Slot } from 'radix-ui';
import type * as React from 'react';
diff --git a/packages/ui/src/components/ui/button.tsx b/packages/ui/src/components/ui/button.tsx
index c9e0dd0..17c8718 100644
--- a/packages/ui/src/components/ui/button.tsx
+++ b/packages/ui/src/components/ui/button.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@mimik/ui/lib/utils';
+import { cn } from '@mimik/ui/common/lib/utils';
import { cva, type VariantProps } from 'class-variance-authority';
import { Slot } from 'radix-ui';
import type * as React from 'react';
diff --git a/packages/ui/src/components/ui/dialog.tsx b/packages/ui/src/components/ui/dialog.tsx
index d4e2c5f..be38b49 100644
--- a/packages/ui/src/components/ui/dialog.tsx
+++ b/packages/ui/src/components/ui/dialog.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@mimik/ui/lib/utils';
+import { cn } from '@mimik/ui/common/lib/utils';
import { XIcon } from 'lucide-react';
import { Dialog as DialogPrimitive } from 'radix-ui';
import type * as React from 'react';
diff --git a/packages/ui/src/components/ui/dropdown-menu.tsx b/packages/ui/src/components/ui/dropdown-menu.tsx
index ab73b06..f04785e 100644
--- a/packages/ui/src/components/ui/dropdown-menu.tsx
+++ b/packages/ui/src/components/ui/dropdown-menu.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@mimik/ui/lib/utils';
+import { cn } from '@mimik/ui/common/lib/utils';
import { ChevronRight } from 'lucide-react';
import { DropdownMenu as DropdownMenuPrimitive } from 'radix-ui';
import type * as React from 'react';
diff --git a/packages/ui/src/components/ui/input.tsx b/packages/ui/src/components/ui/input.tsx
index 0b87f19..5b92ca3 100644
--- a/packages/ui/src/components/ui/input.tsx
+++ b/packages/ui/src/components/ui/input.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@mimik/ui/lib/utils';
+import { cn } from '@mimik/ui/common/lib/utils';
import type * as React from 'react';
function Input({ className, type, ...props }: React.ComponentProps<'input'>) {
diff --git a/packages/ui/src/components/ui/popover.tsx b/packages/ui/src/components/ui/popover.tsx
index 821f1a0..4f1a2e0 100644
--- a/packages/ui/src/components/ui/popover.tsx
+++ b/packages/ui/src/components/ui/popover.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@mimik/ui/lib/utils';
+import { cn } from '@mimik/ui/common/lib/utils';
import { Popover as PopoverPrimitive } from 'radix-ui';
import type * as React from 'react';
diff --git a/packages/ui/src/components/ui/select.tsx b/packages/ui/src/components/ui/select.tsx
index 03b13ac..a6aa925 100644
--- a/packages/ui/src/components/ui/select.tsx
+++ b/packages/ui/src/components/ui/select.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@mimik/ui/lib/utils';
+import { cn } from '@mimik/ui/common/lib/utils';
import { Check, ChevronDown } from 'lucide-react';
import { Select as SelectPrimitive } from 'radix-ui';
import type * as React from 'react';
diff --git a/packages/ui/src/components/ui/tooltip.tsx b/packages/ui/src/components/ui/tooltip.tsx
index 7aba0be..e3f0386 100644
--- a/packages/ui/src/components/ui/tooltip.tsx
+++ b/packages/ui/src/components/ui/tooltip.tsx
@@ -1,4 +1,4 @@
-import { cn } from '@mimik/ui/lib/utils';
+import { cn } from '@mimik/ui/common/lib/utils';
import { Tooltip as TooltipPrimitive } from 'radix-ui';
import type * as React from 'react';
diff --git a/packages/ui/src/fullview/ExportPreviewModal.tsx b/packages/ui/src/export/components/ExportPreviewModal.tsx
similarity index 98%
rename from packages/ui/src/fullview/ExportPreviewModal.tsx
rename to packages/ui/src/export/components/ExportPreviewModal.tsx
index e2688ba..7b819fb 100644
--- a/packages/ui/src/fullview/ExportPreviewModal.tsx
+++ b/packages/ui/src/export/components/ExportPreviewModal.tsx
@@ -16,8 +16,8 @@ import { Dialog, DialogContent, DialogHeader, DialogTitle } from '@mimik/ui/comp
import { FileCode, FileDown, FileImage, FileText, Loader2, Video } from 'lucide-react';
import { lazy, Suspense, useEffect, useState } from 'react';
-import { type ExportFormat, useGuideExport } from './use-guide-export';
-import { useVideoPreview } from './use-video-preview';
+import { type ExportFormat, useGuideExport } from '../hooks/use-guide-export';
+import { useVideoPreview } from '../hooks/use-video-preview';
const VideoStepPlayer = lazy(() => import('./VideoStepPlayer'));
diff --git a/packages/ui/src/fullview/VideoStepPlayer.tsx b/packages/ui/src/export/components/VideoStepPlayer.tsx
similarity index 100%
rename from packages/ui/src/fullview/VideoStepPlayer.tsx
rename to packages/ui/src/export/components/VideoStepPlayer.tsx
diff --git a/packages/ui/src/fullview/use-guide-export.ts b/packages/ui/src/export/hooks/use-guide-export.ts
similarity index 100%
rename from packages/ui/src/fullview/use-guide-export.ts
rename to packages/ui/src/export/hooks/use-guide-export.ts
diff --git a/packages/ui/src/fullview/use-video-preview.ts b/packages/ui/src/export/hooks/use-video-preview.ts
similarity index 97%
rename from packages/ui/src/fullview/use-video-preview.ts
rename to packages/ui/src/export/hooks/use-video-preview.ts
index 821c4ec..32b6b46 100644
--- a/packages/ui/src/fullview/use-video-preview.ts
+++ b/packages/ui/src/export/hooks/use-video-preview.ts
@@ -4,7 +4,7 @@ import { canExportVideo } from '@mimik/core/export/video-support';
import type { Guide, Screenshot, Step } from '@mimik/core/guides/types';
import { useEffect, useState } from 'react';
-import type { VideoMime } from './VideoStepPlayer';
+import type { VideoMime } from '../components/VideoStepPlayer';
const AUTOPLAY_STEP_LIMIT = 25;
diff --git a/packages/ui/src/shared/BlockCard.tsx b/packages/ui/src/guide/components/BlockCard.tsx
similarity index 98%
rename from packages/ui/src/shared/BlockCard.tsx
rename to packages/ui/src/guide/components/BlockCard.tsx
index f7abe3e..45fdae7 100644
--- a/packages/ui/src/shared/BlockCard.tsx
+++ b/packages/ui/src/guide/components/BlockCard.tsx
@@ -2,9 +2,9 @@ import { i18n } from '@mimik/core/env';
import { CALLOUT_VARIANTS, calloutAccent, DEFAULT_CALLOUT_COLOR, tint, variantLabel } from '@mimik/core/guides/blocks';
import { updateCallout } from '@mimik/core/guides/service';
import type { CalloutVariant, Step } from '@mimik/core/guides/types';
+import ConfirmDialog from '@mimik/ui/common/components/ConfirmDialog';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
-import ConfirmDialog from '@mimik/ui/shared/ConfirmDialog';
-import { DragGrip, type DragHandleProps, useCardDrag } from '@mimik/ui/shared/card-drag';
+import { DragGrip, type DragHandleProps, useCardDrag } from '@mimik/ui/guide/components/card-drag';
import { Trash2 } from 'lucide-react';
import { useEffect, useState } from 'react';
diff --git a/packages/ui/src/shared/CaptureTabDialog.tsx b/packages/ui/src/guide/components/CaptureTabDialog.tsx
similarity index 100%
rename from packages/ui/src/shared/CaptureTabDialog.tsx
rename to packages/ui/src/guide/components/CaptureTabDialog.tsx
diff --git a/packages/ui/src/shared/EmptyGuideState.tsx b/packages/ui/src/guide/components/EmptyGuideState.tsx
similarity index 100%
rename from packages/ui/src/shared/EmptyGuideState.tsx
rename to packages/ui/src/guide/components/EmptyGuideState.tsx
diff --git a/packages/ui/src/fullview/GuideContent.tsx b/packages/ui/src/guide/components/GuideContent.tsx
similarity index 97%
rename from packages/ui/src/fullview/GuideContent.tsx
rename to packages/ui/src/guide/components/GuideContent.tsx
index 6a00356..ce9b29d 100644
--- a/packages/ui/src/fullview/GuideContent.tsx
+++ b/packages/ui/src/guide/components/GuideContent.tsx
@@ -15,20 +15,20 @@ import type { SnapshotLike } from '@mimik/core/guides/snapshot-diff';
import type { Guide, Screenshot, Snapshot, Step } from '@mimik/core/guides/types';
import { logger } from '@mimik/core/logger';
import type { ScreenshotEdits } from '@mimik/core/screenshot/types';
+import { useAskAi } from '@mimik/ui/ai/hooks/use-ask-ai';
+import AnnotationEditor from '@mimik/ui/annotation/components/AnnotationEditor';
+import FaviconImg from '@mimik/ui/common/components/FaviconImg';
+import Toast from '@mimik/ui/common/components/Toast';
+import { formatDate } from '@mimik/ui/common/lib/utils';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
import { panel, send, tabs } from '@mimik/ui/env';
-import { formatDate } from '@mimik/ui/lib/utils';
-import AnnotationEditor from '@mimik/ui/shared/AnnotationEditor';
-import { useAskAi } from '@mimik/ui/shared/AskAi';
-import FaviconImg from '@mimik/ui/shared/FaviconImg';
-import Toast from '@mimik/ui/shared/Toast';
import { useFullview } from '@mimik/ui/stores/fullview';
import { History, Loader2, Play, Sparkles } from 'lucide-react';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
import { TypeAnimation } from 'react-type-animation';
-import GuideStepList from './components/GuideStepList';
-import VersionHistoryPanel from './components/VersionHistoryPanel';
-import { useGuideDescription } from './use-guide-description';
+import { useGuideDescription } from '../../ai/hooks/use-guide-description';
+import VersionHistoryPanel from '../../history/components/VersionHistoryPanel';
+import GuideStepList from './GuideStepList';
interface GuideContentProps {
guideId: string;
diff --git a/packages/ui/src/fullview/components/GuideStepList.tsx b/packages/ui/src/guide/components/GuideStepList.tsx
similarity index 95%
rename from packages/ui/src/fullview/components/GuideStepList.tsx
rename to packages/ui/src/guide/components/GuideStepList.tsx
index 5fa82ab..9ae3f65 100644
--- a/packages/ui/src/fullview/components/GuideStepList.tsx
+++ b/packages/ui/src/guide/components/GuideStepList.tsx
@@ -4,13 +4,13 @@ import { createSnapshot, deleteSteps, insertBlock, reorderSteps } from '@mimik/c
import type { BlockType, Screenshot, Step } from '@mimik/core/guides/types';
import { logger } from '@mimik/core/logger';
import { dominantRatio } from '@mimik/core/screenshot/geometry';
+import ConfirmDialog from '@mimik/ui/common/components/ConfirmDialog';
import { Button } from '@mimik/ui/components/ui/button';
-import BlockCard from '@mimik/ui/shared/BlockCard';
-import CaptureTabDialog from '@mimik/ui/shared/CaptureTabDialog';
-import ConfirmDialog from '@mimik/ui/shared/ConfirmDialog';
-import EmptyGuideState from '@mimik/ui/shared/EmptyGuideState';
-import InsertBlockMenu from '@mimik/ui/shared/InsertBlockMenu';
-import StepCard from '@mimik/ui/sidepanel/StepCard';
+import BlockCard from '@mimik/ui/guide/components/BlockCard';
+import CaptureTabDialog from '@mimik/ui/guide/components/CaptureTabDialog';
+import EmptyGuideState from '@mimik/ui/guide/components/EmptyGuideState';
+import InsertBlockMenu from '@mimik/ui/guide/components/InsertBlockMenu';
+import StepCard from '@mimik/ui/guide/components/StepCard';
import { useFullview } from '@mimik/ui/stores/fullview';
import { Trash2 } from 'lucide-react';
import { useEffect, useRef, useState } from 'react';
diff --git a/packages/ui/src/shared/ImagePlaceholder.tsx b/packages/ui/src/guide/components/ImagePlaceholder.tsx
similarity index 91%
rename from packages/ui/src/shared/ImagePlaceholder.tsx
rename to packages/ui/src/guide/components/ImagePlaceholder.tsx
index e4b9a96..f64d252 100644
--- a/packages/ui/src/shared/ImagePlaceholder.tsx
+++ b/packages/ui/src/guide/components/ImagePlaceholder.tsx
@@ -1,6 +1,6 @@
import { i18n } from '@mimik/core/env';
-import MascotIcon from '@mimik/ui/shared/MascotIcon';
-import ReplaceImageDialog from '@mimik/ui/shared/ReplaceImageDialog';
+import MascotIcon from '@mimik/ui/common/components/MascotIcon';
+import ReplaceImageDialog from '@mimik/ui/guide/components/ReplaceImageDialog';
import { ImageUp } from 'lucide-react';
import { useState } from 'react';
diff --git a/packages/ui/src/shared/InsertBlockMenu.tsx b/packages/ui/src/guide/components/InsertBlockMenu.tsx
similarity index 100%
rename from packages/ui/src/shared/InsertBlockMenu.tsx
rename to packages/ui/src/guide/components/InsertBlockMenu.tsx
diff --git a/packages/ui/src/shared/ReplaceImageDialog.tsx b/packages/ui/src/guide/components/ReplaceImageDialog.tsx
similarity index 100%
rename from packages/ui/src/shared/ReplaceImageDialog.tsx
rename to packages/ui/src/guide/components/ReplaceImageDialog.tsx
diff --git a/packages/ui/src/shared/ScreenshotView.tsx b/packages/ui/src/guide/components/ScreenshotView.tsx
similarity index 98%
rename from packages/ui/src/shared/ScreenshotView.tsx
rename to packages/ui/src/guide/components/ScreenshotView.tsx
index 446ae28..8343a95 100644
--- a/packages/ui/src/shared/ScreenshotView.tsx
+++ b/packages/ui/src/guide/components/ScreenshotView.tsx
@@ -4,6 +4,7 @@ import type { Screenshot, ScreenshotBounds } from '@mimik/core/guides/types';
import { panBy, resolveViewport, zoomBy } from '@mimik/core/screenshot/geometry';
import { imageDimensions, renderScreenshot } from '@mimik/core/screenshot/render';
import type { ScreenshotEdits } from '@mimik/core/screenshot/types';
+import ConfirmDialog from '@mimik/ui/common/components/ConfirmDialog';
import {
DropdownMenu,
DropdownMenuContent,
@@ -16,9 +17,8 @@ import {
} from '@mimik/ui/components/ui/dropdown-menu';
import { Popover, PopoverContent, PopoverTrigger } from '@mimik/ui/components/ui/popover';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
-import ConfirmDialog from '@mimik/ui/shared/ConfirmDialog';
-import ImagePlaceholder from '@mimik/ui/shared/ImagePlaceholder';
-import ReplaceImageDialog from '@mimik/ui/shared/ReplaceImageDialog';
+import ImagePlaceholder from '@mimik/ui/guide/components/ImagePlaceholder';
+import ReplaceImageDialog from '@mimik/ui/guide/components/ReplaceImageDialog';
import { Download, ImageUp, Pencil, Trash2, ZoomIn, ZoomOut } from 'lucide-react';
import { useEffect, useRef, useState } from 'react';
diff --git a/packages/ui/src/sidepanel/StepCard.tsx b/packages/ui/src/guide/components/StepCard.tsx
similarity index 94%
rename from packages/ui/src/sidepanel/StepCard.tsx
rename to packages/ui/src/guide/components/StepCard.tsx
index f4af2a0..1f8c38a 100644
--- a/packages/ui/src/sidepanel/StepCard.tsx
+++ b/packages/ui/src/guide/components/StepCard.tsx
@@ -3,13 +3,13 @@ import { replaceScreenshot } from '@mimik/core/guides/service';
import type { Screenshot, Step } from '@mimik/core/guides/types';
import { logger } from '@mimik/core/logger';
import { imageDimensions, renderScreenshot } from '@mimik/core/screenshot/render';
+import { useAskAi } from '@mimik/ui/ai/hooks/use-ask-ai';
+import ConfirmDialog from '@mimik/ui/common/components/ConfirmDialog';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
-import { useAskAi } from '@mimik/ui/shared/AskAi';
-import ConfirmDialog from '@mimik/ui/shared/ConfirmDialog';
-import { DragGrip, type DragHandleProps, useCardDrag } from '@mimik/ui/shared/card-drag';
-import ImagePlaceholder from '@mimik/ui/shared/ImagePlaceholder';
-import ScreenshotView from '@mimik/ui/shared/ScreenshotView';
-import StepSourceBadge from '@mimik/ui/shared/StepSourceBadge';
+import { DragGrip, type DragHandleProps, useCardDrag } from '@mimik/ui/guide/components/card-drag';
+import ImagePlaceholder from '@mimik/ui/guide/components/ImagePlaceholder';
+import ScreenshotView from '@mimik/ui/guide/components/ScreenshotView';
+import StepSourceBadge from '@mimik/ui/guide/components/StepSourceBadge';
import { Check, Copy, Loader2, Trash2 } from 'lucide-react';
import { useEffect, useState } from 'react';
diff --git a/packages/ui/src/shared/StepSourceBadge.tsx b/packages/ui/src/guide/components/StepSourceBadge.tsx
similarity index 100%
rename from packages/ui/src/shared/StepSourceBadge.tsx
rename to packages/ui/src/guide/components/StepSourceBadge.tsx
diff --git a/packages/ui/src/shared/__tests__/step-source-badge.test.tsx b/packages/ui/src/guide/components/__tests__/step-source-badge.test.tsx
similarity index 95%
rename from packages/ui/src/shared/__tests__/step-source-badge.test.tsx
rename to packages/ui/src/guide/components/__tests__/step-source-badge.test.tsx
index 1a677ed..b4b648d 100644
--- a/packages/ui/src/shared/__tests__/step-source-badge.test.tsx
+++ b/packages/ui/src/guide/components/__tests__/step-source-badge.test.tsx
@@ -3,7 +3,7 @@ import '@testing-library/jest-dom/vitest';
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import type { DescriptionSource } from '@mimik/core/guides/types';
-import StepSourceBadge from '@mimik/ui/shared/StepSourceBadge';
+import StepSourceBadge from '@mimik/ui/guide/components/StepSourceBadge';
import { render, screen } from '@testing-library/react';
import { describe, expect, it } from 'vitest';
diff --git a/packages/ui/src/shared/card-drag.tsx b/packages/ui/src/guide/components/card-drag.tsx
similarity index 100%
rename from packages/ui/src/shared/card-drag.tsx
rename to packages/ui/src/guide/components/card-drag.tsx
diff --git a/packages/ui/src/stores/slices/editor.ts b/packages/ui/src/guide/store/editor-slice.ts
similarity index 100%
rename from packages/ui/src/stores/slices/editor.ts
rename to packages/ui/src/guide/store/editor-slice.ts
diff --git a/packages/ui/src/stores/slices/guide.ts b/packages/ui/src/guide/store/guide-slice.ts
similarity index 95%
rename from packages/ui/src/stores/slices/guide.ts
rename to packages/ui/src/guide/store/guide-slice.ts
index a8f7379..98a3605 100644
--- a/packages/ui/src/stores/slices/guide.ts
+++ b/packages/ui/src/guide/store/guide-slice.ts
@@ -1,6 +1,6 @@
import type { Guide, Screenshot, Step } from '@mimik/core/guides/types';
import type { StateCreator } from 'zustand';
-import { CLOSED_EDITOR, type EditorSlice } from './editor';
+import { CLOSED_EDITOR, type EditorSlice } from './editor-slice';
export interface GuideExportData {
guideId: string;
diff --git a/packages/ui/src/fullview/components/VersionHistoryPanel.tsx b/packages/ui/src/history/components/VersionHistoryPanel.tsx
similarity index 99%
rename from packages/ui/src/fullview/components/VersionHistoryPanel.tsx
rename to packages/ui/src/history/components/VersionHistoryPanel.tsx
index 39a7fcd..875c601 100644
--- a/packages/ui/src/fullview/components/VersionHistoryPanel.tsx
+++ b/packages/ui/src/history/components/VersionHistoryPanel.tsx
@@ -2,16 +2,16 @@ import { i18n } from '@mimik/core/env';
import { diffSnapshots, type SnapshotDiff, type SnapshotLike } from '@mimik/core/guides/snapshot-diff';
import { groupSnapshots } from '@mimik/core/guides/snapshot-groups';
import type { Snapshot } from '@mimik/core/guides/types';
+import { formatDateTime } from '@mimik/ui/common/lib/utils';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
} from '@mimik/ui/components/ui/dropdown-menu';
-import { formatDateTime } from '@mimik/ui/lib/utils';
import { ChevronRight, MoreVertical, RotateCcw, X } from 'lucide-react';
import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import { useSnapshots } from './use-snapshots';
+import { useSnapshots } from '../hooks/use-snapshots';
function changeSummary(diff: SnapshotDiff): string {
const parts: string[] = [];
diff --git a/packages/ui/src/fullview/components/__tests__/version-history-panel.test.tsx b/packages/ui/src/history/components/__tests__/version-history-panel.test.tsx
similarity index 100%
rename from packages/ui/src/fullview/components/__tests__/version-history-panel.test.tsx
rename to packages/ui/src/history/components/__tests__/version-history-panel.test.tsx
diff --git a/packages/ui/src/fullview/components/use-snapshots.ts b/packages/ui/src/history/hooks/use-snapshots.ts
similarity index 100%
rename from packages/ui/src/fullview/components/use-snapshots.ts
rename to packages/ui/src/history/hooks/use-snapshots.ts
diff --git a/packages/ui/src/fullview/components/ConfirmDeleteModal.tsx b/packages/ui/src/library/components/ConfirmDeleteModal.tsx
similarity index 100%
rename from packages/ui/src/fullview/components/ConfirmDeleteModal.tsx
rename to packages/ui/src/library/components/ConfirmDeleteModal.tsx
diff --git a/packages/ui/src/fullview/components/GuideGridView.tsx b/packages/ui/src/library/components/GuideGridView.tsx
similarity index 97%
rename from packages/ui/src/fullview/components/GuideGridView.tsx
rename to packages/ui/src/library/components/GuideGridView.tsx
index 6019360..591f843 100644
--- a/packages/ui/src/fullview/components/GuideGridView.tsx
+++ b/packages/ui/src/library/components/GuideGridView.tsx
@@ -1,10 +1,10 @@
import { i18n } from '@mimik/core/env';
-import { formatDate } from '@mimik/ui/lib/utils';
-import ScreenshotView from '@mimik/ui/shared/ScreenshotView';
+import { formatDate } from '@mimik/ui/common/lib/utils';
+import ScreenshotView from '@mimik/ui/guide/components/ScreenshotView';
import { useFullview } from '@mimik/ui/stores/fullview';
import { MoreVertical, RotateCcw, Star, StarOff, Trash2 } from 'lucide-react';
import { useEffect, useRef, useState } from 'react';
-import { navigate } from '../router';
+import { navigate } from '../../navigation/lib/router';
interface GuideGridViewProps {
category: 'all' | 'starred' | 'trash';
diff --git a/packages/ui/src/fullview/components/GuideListView.tsx b/packages/ui/src/library/components/GuideListView.tsx
similarity index 97%
rename from packages/ui/src/fullview/components/GuideListView.tsx
rename to packages/ui/src/library/components/GuideListView.tsx
index ee4fa15..b25d889 100644
--- a/packages/ui/src/fullview/components/GuideListView.tsx
+++ b/packages/ui/src/library/components/GuideListView.tsx
@@ -1,9 +1,9 @@
import { i18n } from '@mimik/core/env';
+import { formatDate } from '@mimik/ui/common/lib/utils';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
-import { formatDate } from '@mimik/ui/lib/utils';
import { useFullview } from '@mimik/ui/stores/fullview';
import { RotateCcw, Star, Trash2 } from 'lucide-react';
-import { navigate } from '../router';
+import { navigate } from '../../navigation/lib/router';
interface GuideListViewProps {
category: 'all' | 'starred' | 'trash';
diff --git a/packages/ui/src/fullview/LibraryContent.tsx b/packages/ui/src/library/components/LibraryContent.tsx
similarity index 98%
rename from packages/ui/src/fullview/LibraryContent.tsx
rename to packages/ui/src/library/components/LibraryContent.tsx
index adb185d..faf9d5f 100644
--- a/packages/ui/src/fullview/LibraryContent.tsx
+++ b/packages/ui/src/library/components/LibraryContent.tsx
@@ -24,9 +24,9 @@ import {
Video,
} from 'lucide-react';
import { useCallback, useEffect, useRef, useState } from 'react';
-import ConfirmDeleteModal from './components/ConfirmDeleteModal';
-import GuideGridView from './components/GuideGridView';
-import GuideListView from './components/GuideListView';
+import ConfirmDeleteModal from './ConfirmDeleteModal';
+import GuideGridView from './GuideGridView';
+import GuideListView from './GuideListView';
interface LibraryContentProps {
category: 'all' | 'starred' | 'trash';
diff --git a/packages/ui/src/stores/slices/library.ts b/packages/ui/src/library/store/library-slice.ts
similarity index 100%
rename from packages/ui/src/stores/slices/library.ts
rename to packages/ui/src/library/store/library-slice.ts
diff --git a/packages/ui/src/fullview/TopNav.tsx b/packages/ui/src/navigation/components/TopNav.tsx
similarity index 96%
rename from packages/ui/src/fullview/TopNav.tsx
rename to packages/ui/src/navigation/components/TopNav.tsx
index 5fdff14..aba5416 100644
--- a/packages/ui/src/fullview/TopNav.tsx
+++ b/packages/ui/src/navigation/components/TopNav.tsx
@@ -1,10 +1,10 @@
import { i18n } from '@mimik/core/env';
import { createSnapshot } from '@mimik/core/guides/service';
import { logger } from '@mimik/core/logger';
+import MascotIcon from '@mimik/ui/common/components/MascotIcon';
import { Button } from '@mimik/ui/components/ui/button';
-import type { Route } from '@mimik/ui/fullview/router';
-import { navigate } from '@mimik/ui/fullview/router';
-import MascotIcon from '@mimik/ui/shared/MascotIcon';
+import type { Route } from '@mimik/ui/navigation/lib/router';
+import { navigate } from '@mimik/ui/navigation/lib/router';
import { useFullview } from '@mimik/ui/stores/fullview';
import {
Check,
@@ -20,7 +20,7 @@ import {
} from 'lucide-react';
import type { ReactNode } from 'react';
import { useState } from 'react';
-import ExportPreviewModal from './ExportPreviewModal';
+import ExportPreviewModal from '../../export/components/ExportPreviewModal';
interface TopNavProps {
route: Route;
diff --git a/packages/ui/src/fullview/router.ts b/packages/ui/src/navigation/lib/router.ts
similarity index 100%
rename from packages/ui/src/fullview/router.ts
rename to packages/ui/src/navigation/lib/router.ts
diff --git a/packages/ui/src/fullview/components/KeyboardHints.tsx b/packages/ui/src/search/components/KeyboardHints.tsx
similarity index 100%
rename from packages/ui/src/fullview/components/KeyboardHints.tsx
rename to packages/ui/src/search/components/KeyboardHints.tsx
diff --git a/packages/ui/src/fullview/SearchModal.tsx b/packages/ui/src/search/components/SearchModal.tsx
similarity index 96%
rename from packages/ui/src/fullview/SearchModal.tsx
rename to packages/ui/src/search/components/SearchModal.tsx
index 1399c49..30289f3 100644
--- a/packages/ui/src/fullview/SearchModal.tsx
+++ b/packages/ui/src/search/components/SearchModal.tsx
@@ -3,12 +3,12 @@ import { getGuideDomain, getGuides } from '@mimik/core/guides/service';
import type { Guide } from '@mimik/core/guides/types';
import { Dialog, DialogPortal } from '@mimik/ui/components/ui/dialog';
import { Input } from '@mimik/ui/components/ui/input';
-import { navigate } from '@mimik/ui/fullview/router';
+import { navigate } from '@mimik/ui/navigation/lib/router';
import { useFullview } from '@mimik/ui/stores/fullview';
import { Search, X } from 'lucide-react';
import { useCallback, useEffect, useRef, useState } from 'react';
-import KeyboardHints from './components/KeyboardHints';
-import SearchResults from './components/SearchResults';
+import KeyboardHints from './KeyboardHints';
+import SearchResults from './SearchResults';
interface GuideResult {
guide: Guide;
diff --git a/packages/ui/src/fullview/components/SearchResults.tsx b/packages/ui/src/search/components/SearchResults.tsx
similarity index 95%
rename from packages/ui/src/fullview/components/SearchResults.tsx
rename to packages/ui/src/search/components/SearchResults.tsx
index 13b5534..0cc241e 100644
--- a/packages/ui/src/fullview/components/SearchResults.tsx
+++ b/packages/ui/src/search/components/SearchResults.tsx
@@ -1,7 +1,7 @@
import { i18n } from '@mimik/core/env';
import type { Guide } from '@mimik/core/guides/types';
-import { formatDateShort } from '@mimik/ui/lib/utils';
-import FaviconImg from '@mimik/ui/shared/FaviconImg';
+import FaviconImg from '@mimik/ui/common/components/FaviconImg';
+import { formatDateShort } from '@mimik/ui/common/lib/utils';
interface GuideResult {
guide: Guide;
diff --git a/packages/ui/src/stores/slices/search.ts b/packages/ui/src/search/store/search-slice.ts
similarity index 100%
rename from packages/ui/src/stores/slices/search.ts
rename to packages/ui/src/search/store/search-slice.ts
diff --git a/packages/ui/src/stores/fullview.ts b/packages/ui/src/stores/fullview.ts
index a204148..ca53f1a 100644
--- a/packages/ui/src/stores/fullview.ts
+++ b/packages/ui/src/stores/fullview.ts
@@ -1,11 +1,11 @@
import { create } from 'zustand';
import { useShallow } from 'zustand/react/shallow';
-import { createEditorSlice, type EditorSlice } from './slices/editor';
-import { createGuideSlice, type GuideSlice } from './slices/guide';
-import { createLibrarySlice, type LibrarySlice } from './slices/library';
-import { createSearchSlice, type SearchSlice } from './slices/search';
+import { createEditorSlice, type EditorSlice } from '../guide/store/editor-slice';
+import { createGuideSlice, type GuideSlice } from '../guide/store/guide-slice';
+import { createLibrarySlice, type LibrarySlice } from '../library/store/library-slice';
+import { createSearchSlice, type SearchSlice } from '../search/store/search-slice';
-export type { GuideExportData } from './slices/guide';
+export type { GuideExportData } from '../guide/store/guide-slice';
type FullviewStore = LibrarySlice & SearchSlice & GuideSlice & EditorSlice;
diff --git a/src/lib/__tests__/utils.test.ts b/src/lib/__tests__/utils.test.ts
index 1a6643b..11f1d53 100644
--- a/src/lib/__tests__/utils.test.ts
+++ b/src/lib/__tests__/utils.test.ts
@@ -1,4 +1,4 @@
-import { extractDomain, getDomainInitial, getMostCommonDomain } from '@mimik/ui/lib/utils';
+import { extractDomain, getDomainInitial, getMostCommonDomain } from '@mimik/ui/common/lib/utils';
import { describe, expect, it } from 'vitest';
describe('extractDomain', () => {
diff --git a/src/ui/fullview/App.tsx b/src/ui/fullview/App.tsx
index 85c845a..fd18979 100644
--- a/src/ui/fullview/App.tsx
+++ b/src/ui/fullview/App.tsx
@@ -1,9 +1,9 @@
import { TooltipProvider } from '@mimik/ui/components/ui/tooltip';
-import GuideContent from '@mimik/ui/fullview/GuideContent';
-import LibraryContent from '@mimik/ui/fullview/LibraryContent';
-import { useRoute } from '@mimik/ui/fullview/router';
-import SearchModal from '@mimik/ui/fullview/SearchModal';
-import TopNav from '@mimik/ui/fullview/TopNav';
+import GuideContent from '@mimik/ui/guide/components/GuideContent';
+import LibraryContent from '@mimik/ui/library/components/LibraryContent';
+import TopNav from '@mimik/ui/navigation/components/TopNav';
+import { useRoute } from '@mimik/ui/navigation/lib/router';
+import SearchModal from '@mimik/ui/search/components/SearchModal';
import { useFullview } from '@mimik/ui/stores/fullview';
import { useEffect } from 'react';
import { openSidebar } from '@/lib/browser-api';
diff --git a/src/ui/fullview/__tests__/ExportPreviewModal.test.tsx b/src/ui/fullview/__tests__/ExportPreviewModal.test.tsx
index 8e3c7d1..99d8da0 100644
--- a/src/ui/fullview/__tests__/ExportPreviewModal.test.tsx
+++ b/src/ui/fullview/__tests__/ExportPreviewModal.test.tsx
@@ -9,7 +9,7 @@ const exportGuideAsHTML = vi.hoisted(() => vi.fn());
const canExportVideo = vi.hoisted(() => vi.fn());
vi.mock('@/core/export/video-export', () => ({ exportGuideAsVideo }));
-vi.mock('@mimik/ui/fullview/VideoStepPlayer', () => ({ default: () => <div data-testid="video-player" /> }));
+vi.mock('@mimik/ui/export/components/VideoStepPlayer', () => ({ default: () => <div data-testid="video-player" /> }));
vi.mock('@/core/export/html-export', () => ({ exportGuideAsHTML }));
vi.mock('@/core/export/video-support', async (importOriginal) => ({
...(await importOriginal<typeof import('@/core/export/video-support')>()),
@@ -21,7 +21,7 @@ vi.mock('@/core/export/options', async (importOriginal) => ({
saveExportOptions: async () => {},
}));
-import ExportPreviewModal from '@mimik/ui/fullview/ExportPreviewModal';
+import ExportPreviewModal from '@mimik/ui/export/components/ExportPreviewModal';
const guide: Guide = {
id: 'guide-1',
diff --git a/src/ui/onboarding/App.tsx b/src/ui/onboarding/App.tsx
index 134ef7f..ea2b1ad 100644
--- a/src/ui/onboarding/App.tsx
+++ b/src/ui/onboarding/App.tsx
@@ -1,6 +1,6 @@
+import { useAiSettings } from '@mimik/ui/ai/hooks/use-ai-settings';
import { Input } from '@mimik/ui/components/ui/input';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@mimik/ui/components/ui/select';
-import { useAiSettings } from '@mimik/ui/shared/use-ai-settings';
import { Globe, Mic, MousePointerClick, Shield } from 'lucide-react';
import { useEffect, useState } from 'react';
import { browser, i18n } from '#imports';
diff --git a/src/ui/shared/SettingsView.tsx b/src/ui/shared/SettingsView.tsx
index 3df6cff..0df7895 100644
--- a/src/ui/shared/SettingsView.tsx
+++ b/src/ui/shared/SettingsView.tsx
@@ -6,13 +6,12 @@ import type { VoiceProvider } from '@mimik/core/capture/voice/transcribe';
import { i18n } from '@mimik/core/env';
import { type BrandLogo, defaultFooterLine, makeBrandLogo } from '@mimik/core/export/branding';
import { DEFAULT_TARGET_COLOR, TARGET_COLORS } from '@mimik/core/screenshot/types';
+import AiSettings from '@mimik/ui/ai/components/AiSettings';
+import ColorPicker from '@mimik/ui/annotation/components/ColorPicker';
import { Button } from '@mimik/ui/components/ui/button';
import { Input } from '@mimik/ui/components/ui/input';
import { Popover, PopoverContent, PopoverTrigger } from '@mimik/ui/components/ui/popover';
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@mimik/ui/components/ui/select';
-import { useSettingsAutosave } from '@mimik/ui/lib/use-settings-autosave';
-import AiSettings from '@mimik/ui/shared/AiSettings';
-import ColorPicker from '@mimik/ui/shared/ColorPicker';
import {
ArrowLeft,
Bug,
@@ -33,6 +32,7 @@ import { useEffect, useRef, useState } from 'react';
import { localStorage } from '@/lib/browser-api';
import { KeyStatusNote, ModelList, SecretInput, useKeyCheck } from '@/ui/shared/key-check';
import MicrophonePicker from '@/ui/shared/MicrophonePicker';
+import { useSettingsAutosave } from '@/ui/shared/use-settings-autosave';
interface SettingsViewProps {
onBack?: () => void;
diff --git a/packages/ui/src/lib/__tests__/settings-autosave.test.ts b/src/ui/shared/__tests__/settings-autosave.test.ts
similarity index 100%
rename from packages/ui/src/lib/__tests__/settings-autosave.test.ts
rename to src/ui/shared/__tests__/settings-autosave.test.ts
diff --git a/src/ui/shared/key-check.tsx b/src/ui/shared/key-check.tsx
index 5d00fd2..92cc835 100644
--- a/src/ui/shared/key-check.tsx
+++ b/src/ui/shared/key-check.tsx
@@ -1,9 +1,9 @@
-import { useKeyCheck as useSharedKeyCheck } from '@mimik/ui/shared/key-status';
+import { useKeyCheck as useSharedKeyCheck } from '@mimik/ui/ai/components/key-status';
import { useCallback } from 'react';
import { sendMessage } from '@/lib/messaging';
-export type { KeyStatus, KeyWarning } from '@mimik/ui/shared/key-status';
-export { KeyStatusNote, KeyWarningNote, ModelList, SecretInput } from '@mimik/ui/shared/key-status';
+export type { KeyStatus, KeyWarning } from '@mimik/ui/ai/components/key-status';
+export { KeyStatusNote, KeyWarningNote, ModelList, SecretInput } from '@mimik/ui/ai/components/key-status';
export function useKeyCheck() {
return useSharedKeyCheck(
diff --git a/packages/ui/src/lib/settings-autosave.ts b/src/ui/shared/settings-autosave.ts
similarity index 100%
rename from packages/ui/src/lib/settings-autosave.ts
rename to src/ui/shared/settings-autosave.ts
diff --git a/packages/ui/src/lib/use-settings-autosave.ts b/src/ui/shared/use-settings-autosave.ts
similarity index 95%
rename from packages/ui/src/lib/use-settings-autosave.ts
rename to src/ui/shared/use-settings-autosave.ts
index a7059d4..fbc4827 100644
--- a/packages/ui/src/lib/use-settings-autosave.ts
+++ b/src/ui/shared/use-settings-autosave.ts
@@ -1,7 +1,7 @@
import { localStorage } from '@mimik/core/env';
import { logger } from '@mimik/core/logger';
-import { changedSettings, type SettingsSnapshot } from '@mimik/ui/lib/settings-autosave';
import { useCallback, useEffect, useRef, useState } from 'react';
+import { changedSettings, type SettingsSnapshot } from '@/ui/shared/settings-autosave';
const SAVE_DEBOUNCE_MS = 400;
const SAVED_BADGE_MS = 1600;
diff --git a/src/ui/sidepanel/GuideEditor.tsx b/src/ui/sidepanel/GuideEditor.tsx
index e4aadaf..23b0e3b 100644
--- a/src/ui/sidepanel/GuideEditor.tsx
+++ b/src/ui/sidepanel/GuideEditor.tsx
@@ -1,9 +1,9 @@
+import FaviconImg from '@mimik/ui/common/components/FaviconImg';
+import { getMostCommonDomain } from '@mimik/ui/common/lib/utils';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
-import { getMostCommonDomain } from '@mimik/ui/lib/utils';
-import BlockCard from '@mimik/ui/shared/BlockCard';
-import EmptyGuideState from '@mimik/ui/shared/EmptyGuideState';
-import FaviconImg from '@mimik/ui/shared/FaviconImg';
-import StepCard from '@mimik/ui/sidepanel/StepCard';
+import BlockCard from '@mimik/ui/guide/components/BlockCard';
+import EmptyGuideState from '@mimik/ui/guide/components/EmptyGuideState';
+import StepCard from '@mimik/ui/guide/components/StepCard';
import { ArrowLeft, Maximize2, Play } from 'lucide-react';
import { useCallback, useEffect, useState } from 'react';
import { i18n } from '#imports';
diff --git a/src/ui/sidepanel/GuideMeView.tsx b/src/ui/sidepanel/GuideMeView.tsx
index 8e5825d..81df157 100644
--- a/src/ui/sidepanel/GuideMeView.tsx
+++ b/src/ui/sidepanel/GuideMeView.tsx
@@ -1,6 +1,6 @@
-import { extractDomain } from '@mimik/ui/lib/utils';
-import FaviconImg from '@mimik/ui/shared/FaviconImg';
-import ScreenshotView from '@mimik/ui/shared/ScreenshotView';
+import FaviconImg from '@mimik/ui/common/components/FaviconImg';
+import { extractDomain } from '@mimik/ui/common/lib/utils';
+import ScreenshotView from '@mimik/ui/guide/components/ScreenshotView';
import { ArrowLeft, Check, ChevronLeft, ChevronRight, TriangleAlert } from 'lucide-react';
import { useCallback, useEffect, useState } from 'react';
import { browser, i18n } from '#imports';
diff --git a/src/ui/sidepanel/LibraryView.tsx b/src/ui/sidepanel/LibraryView.tsx
index bce4795..c948c0a 100644
--- a/src/ui/sidepanel/LibraryView.tsx
+++ b/src/ui/sidepanel/LibraryView.tsx
@@ -1,6 +1,6 @@
+import FaviconImg from '@mimik/ui/common/components/FaviconImg';
+import { formatRelativeTime } from '@mimik/ui/common/lib/utils';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
-import { formatRelativeTime } from '@mimik/ui/lib/utils';
-import FaviconImg from '@mimik/ui/shared/FaviconImg';
import { Star, Trash2 } from 'lucide-react';
import { useCallback, useEffect, useState } from 'react';
import { i18n } from '#imports';
diff --git a/src/ui/sidepanel/RecordingView.tsx b/src/ui/sidepanel/RecordingView.tsx
index ad1e853..50019a2 100644
--- a/src/ui/sidepanel/RecordingView.tsx
+++ b/src/ui/sidepanel/RecordingView.tsx
@@ -1,8 +1,8 @@
+import { extractDomain } from '@mimik/ui/common/lib/utils';
import { Button } from '@mimik/ui/components/ui/button';
import { Tooltip, TooltipContent, TooltipTrigger } from '@mimik/ui/components/ui/tooltip';
-import { extractDomain } from '@mimik/ui/lib/utils';
-import ScreenshotView from '@mimik/ui/shared/ScreenshotView';
-import StepSourceBadge from '@mimik/ui/shared/StepSourceBadge';
+import ScreenshotView from '@mimik/ui/guide/components/ScreenshotView';
+import StepSourceBadge from '@mimik/ui/guide/components/StepSourceBadge';
import { Check, EyeOff, Loader2, X } from 'lucide-react';
import { useCallback, useEffect, useRef, useState } from 'react';
import { browser, i18n } from '#imports';
diff --git a/src/ui/sidepanel/__tests__/step-card-drag.test.tsx b/src/ui/sidepanel/__tests__/step-card-drag.test.tsx
index e9772ce..8cb4819 100644
--- a/src/ui/sidepanel/__tests__/step-card-drag.test.tsx
+++ b/src/ui/sidepanel/__tests__/step-card-drag.test.tsx
@@ -8,7 +8,7 @@ import type { Step } from '@/core/guides/types';
vi.mock('@/core/guides/service', () => ({ replaceScreenshot: vi.fn() }));
vi.mock('@/core/screenshot/render', () => ({ imageDimensions: vi.fn(), renderScreenshot: vi.fn() }));
-import StepCard from '@mimik/ui/sidepanel/StepCard';
+import StepCard from '@mimik/ui/guide/components/StepCard';
const step: Step = {
id: 's1',
diff --git a/src/ui/sidepanel/__tests__/step-card-upload.test.tsx b/src/ui/sidepanel/__tests__/step-card-upload.test.tsx
index 3cae082..3c9e852 100644
--- a/src/ui/sidepanel/__tests__/step-card-upload.test.tsx
+++ b/src/ui/sidepanel/__tests__/step-card-upload.test.tsx
@@ -8,7 +8,7 @@ import type { Step } from '@/core/guides/types';
vi.mock('@/core/guides/service', () => ({ replaceScreenshot: vi.fn() }));
vi.mock('@/core/screenshot/render', () => ({ imageDimensions: vi.fn(), renderScreenshot: vi.fn() }));
-import StepCard from '@mimik/ui/sidepanel/StepCard';
+import StepCard from '@mimik/ui/guide/components/StepCard';
const step: Step = {
id: 's1',