From 417a2c532ca6ddf655a05c4cd2c8048b82206ef4 Mon Sep 17 00:00:00 2001 From: Utku <74243531+utkubakir@users.noreply.github.com> Date: Thu, 4 May 2023 16:56:24 +0300 Subject: [PATCH] Hide Notice and some tweaks (#782) * Hide notice on overview and - Removed prettier/recommended from eslint - Optimized imports * move overview check to parent * don't show recents if there is none * use useMatch --- .prettierignore | 8 ++++++++ apps/desktop/src/commands.ts | 16 ++++++---------- apps/desktop/src/index.tsx | 8 ++++---- apps/landing/src/style.scss | 4 ++-- apps/mobile/metro.config.js | 12 ++---------- .../$libraryId/Explorer/DismissibleNotice.tsx | 2 ++ .../$libraryId/Explorer/File/DecryptDialog.tsx | 3 +-- interface/app/$libraryId/Explorer/GridView.tsx | 1 - .../Explorer/Inspector/FavoriteButton.tsx | 3 +-- .../app/$libraryId/Explorer/Inspector/index.tsx | 2 +- interface/app/$libraryId/Explorer/MediaView.tsx | 2 +- .../app/$libraryId/Explorer/QuickPreview.tsx | 3 +-- interface/app/$libraryId/Explorer/View.tsx | 7 +++++-- interface/app/$libraryId/Explorer/index.tsx | 7 +------ interface/app/$libraryId/KeyManager/Mounter.tsx | 2 +- interface/app/$libraryId/Layout/Sidebar/Job.tsx | 2 -- .../app/$libraryId/Layout/Sidebar/JobManager.tsx | 1 - .../$libraryId/Layout/Sidebar/LibrarySection.tsx | 2 -- interface/app/$libraryId/Layout/Sidebar/Link.tsx | 2 +- interface/app/$libraryId/TopBar/SearchBar.tsx | 4 ++-- .../app/$libraryId/TopBar/TopBarChildren.tsx | 3 +-- interface/app/$libraryId/TopBar/TopBarMobile.tsx | 3 +-- interface/app/$libraryId/debug.tsx | 4 ++-- interface/app/$libraryId/overview.tsx | 11 ++++++++--- interface/app/$libraryId/settings/Sidebar.tsx | 2 -- .../app/$libraryId/settings/library/general.tsx | 2 +- .../library/keys/BackupRestoreDialog.tsx | 3 +-- .../settings/library/locations/$id.tsx | 6 ++---- .../settings/library/locations/DeleteDialog.tsx | 1 - .../settings/library/locations/ListItem.tsx | 3 +-- .../settings/library/tags/CreateDialog.tsx | 1 - .../settings/library/tags/DeleteDialog.tsx | 1 - .../settings/node/libraries/DeleteDialog.tsx | 6 ++---- interface/app/$libraryId/spacedrop.tsx | 6 ++---- interface/app/$libraryId/spaces.tsx | 2 -- interface/app/$libraryId/sync.tsx | 8 +------- interface/app/onboarding/creating-library.tsx | 1 - packages/config/eslint/base.js | 2 +- 38 files changed, 62 insertions(+), 94 deletions(-) diff --git a/.prettierignore b/.prettierignore index 321737950..741aa3cb7 100644 --- a/.prettierignore +++ b/.prettierignore @@ -1,12 +1,20 @@ # built product/cache target/ dist/ + # macOS/iOS product/cache .build/ Pods/ + # just in case it tries to parse for some reason *.rs + # we plainly don't need a lockfile to look nice pnpm-lock.yaml + +# Import order is important +apps/desktop/src/index.tsx + # codegen from rspc -- not supposed to look nice /packages/client/src/core.ts +apps/desktop/src/commands.ts \ No newline at end of file diff --git a/apps/desktop/src/commands.ts b/apps/desktop/src/commands.ts index c39f6c1b6..6a5e6ca24 100644 --- a/apps/desktop/src/commands.ts +++ b/apps/desktop/src/commands.ts @@ -1,23 +1,19 @@ // This file was generated by [tauri-specta](https://github.com/oscartbeaumont/tauri-specta). Do not edit this file manually. declare global { - interface Window { - __TAURI_INVOKE__(cmd: string, args?: Record): Promise; - } + interface Window { + __TAURI_INVOKE__(cmd: string, args?: Record): Promise; + } } const invoke = window.__TAURI_INVOKE__; export function appReady() { - return invoke('app_ready'); + return invoke("app_ready") } export function openFilePath(library: string, id: number) { - return invoke('open_file_path', { library, id }); + return invoke("open_file_path", { library,id }) } -export type OpenFilePathResult = - | { t: 'NoLibrary' } - | { t: 'NoFile' } - | { t: 'OpenError'; c: string } - | { t: 'AllGood' }; +export type OpenFilePathResult = { t: "NoLibrary" } | { t: "NoFile" } | { t: "OpenError"; c: string } | { t: "AllGood" } diff --git a/apps/desktop/src/index.tsx b/apps/desktop/src/index.tsx index c70fc803f..9bc104991 100644 --- a/apps/desktop/src/index.tsx +++ b/apps/desktop/src/index.tsx @@ -1,14 +1,14 @@ -// WARNING: BE CAREFUL SAVING THIS FILE WITH A FORMATTER ENABLED. The import order is important and goes against prettier's recommendations. -import React, { Suspense } from 'react'; +// WARNING: Import order is important in this file. Make sure ~/patches comes before App. +import { StrictMode, Suspense } from 'react'; import ReactDOM from 'react-dom/client'; import '~/patches'; import App from './App'; const root = ReactDOM.createRoot(document.getElementById('root') as HTMLElement); root.render( - + - + ); diff --git a/apps/landing/src/style.scss b/apps/landing/src/style.scss index 435c75d83..6c35db001 100644 --- a/apps/landing/src/style.scss +++ b/apps/landing/src/style.scss @@ -169,7 +169,7 @@ html { } .slot-block { - @apply mb-2 rounded border-l-4 border-app-line bg-app-box py-3 px-4; + @apply mb-2 rounded border-l-4 border-app-line bg-app-box px-4 py-3; } .slot-block.note { @apply border-yellow-400 bg-yellow-300/20; @@ -184,7 +184,7 @@ html { @apply m-0 text-sm font-bold uppercase text-white; } .slot-block-content { - @apply my-1 mx-0 mb-0 text-white; + @apply mx-0 my-1 mb-0 text-white; } .slot-block-title-icon { @apply my-0 h-5 w-5 text-white; diff --git a/apps/mobile/metro.config.js b/apps/mobile/metro.config.js index 834a77396..e617dc7e7 100644 --- a/apps/mobile/metro.config.js +++ b/apps/mobile/metro.config.js @@ -34,21 +34,13 @@ const metroConfig = makeMetroConfig({ resolveRequest: (context, moduleName, platform) => { if (moduleName.startsWith('@rspc/client/v2')) { return { - filePath: path.resolve( - rspcClientPath, - 'dist', - 'v2.js' - ), + filePath: path.resolve(rspcClientPath, 'dist', 'v2.js'), type: 'sourceFile' }; } if (moduleName.startsWith('@rspc/react/v2')) { return { - filePath: path.resolve( - rspcReactPath, - 'dist', - 'v2.js' - ), + filePath: path.resolve(rspcReactPath, 'dist', 'v2.js'), type: 'sourceFile' }; } diff --git a/interface/app/$libraryId/Explorer/DismissibleNotice.tsx b/interface/app/$libraryId/Explorer/DismissibleNotice.tsx index 7aae1fa2e..e9960c0b4 100644 --- a/interface/app/$libraryId/Explorer/DismissibleNotice.tsx +++ b/interface/app/$libraryId/Explorer/DismissibleNotice.tsx @@ -52,9 +52,11 @@ const notices = { export default () => { const { layoutMode } = useExplorerStore(); + const notice = notices[layoutMode]; if (!notice) return null; + return ( { const scrollRef = useRef(null); + // Hide notice on overview page + const isOverview = useMatch('/:libraryId/overview'); + return (
{ style={{ paddingTop: TOP_BAR_HEIGHT }} onClick={() => (getExplorerStore().selectedRowIndex = -1)} > - + {!isOverview && } {layoutMode === 'grid' && } {layoutMode === 'rows' && } diff --git a/interface/app/$libraryId/Explorer/index.tsx b/interface/app/$libraryId/Explorer/index.tsx index 35ec62a79..32aa24b73 100644 --- a/interface/app/$libraryId/Explorer/index.tsx +++ b/interface/app/$libraryId/Explorer/index.tsx @@ -1,11 +1,6 @@ import { useEffect } from 'react'; import { useKey } from 'rooks'; -import { - ExplorerData, - useBridgeSubscription, - useLibraryContext, - useLibrarySubscription -} from '@sd/client'; +import { ExplorerData, useLibrarySubscription } from '@sd/client'; import { dialogManager } from '~/../packages/ui/src'; import { getExplorerStore, useExplorerStore } from '~/hooks/useExplorerStore'; import { Inspector } from '../Explorer/Inspector'; diff --git a/interface/app/$libraryId/KeyManager/Mounter.tsx b/interface/app/$libraryId/KeyManager/Mounter.tsx index f2bcb5ea1..655453af0 100644 --- a/interface/app/$libraryId/KeyManager/Mounter.tsx +++ b/interface/app/$libraryId/KeyManager/Mounter.tsx @@ -9,9 +9,9 @@ import { SelectOption, Slider, Switch, + Tooltip, tw } from '@sd/ui'; -import { Tooltip } from '@sd/ui'; import { generatePassword } from '~/util'; const KeyHeading = tw(CategoryHeading)`mb-1`; diff --git a/interface/app/$libraryId/Layout/Sidebar/Job.tsx b/interface/app/$libraryId/Layout/Sidebar/Job.tsx index 82c5e78b4..b94f6a22f 100644 --- a/interface/app/$libraryId/Layout/Sidebar/Job.tsx +++ b/interface/app/$libraryId/Layout/Sidebar/Job.tsx @@ -1,7 +1,6 @@ import clsx from 'clsx'; import dayjs from 'dayjs'; import { - ArrowsClockwise, Camera, Copy, Eye, @@ -9,7 +8,6 @@ import { Folder, LockSimple, LockSimpleOpen, - Pause, Question, Scissors, Trash, diff --git a/interface/app/$libraryId/Layout/Sidebar/JobManager.tsx b/interface/app/$libraryId/Layout/Sidebar/JobManager.tsx index 79c364731..44bf83e64 100644 --- a/interface/app/$libraryId/Layout/Sidebar/JobManager.tsx +++ b/interface/app/$libraryId/Layout/Sidebar/JobManager.tsx @@ -2,7 +2,6 @@ import { useQueryClient } from '@tanstack/react-query'; import { Trash, X } from 'phosphor-react'; import { useCallback } from 'react'; import { useLibraryMutation, useLibraryQuery } from '@sd/client'; -import { JobReport } from '@sd/client'; import { Button, CategoryHeading, PopoverClose, Tooltip } from '@sd/ui'; import { showAlertDialog } from '~/components/AlertDialog'; import GroupedJobs from './GroupedJobs'; diff --git a/interface/app/$libraryId/Layout/Sidebar/LibrarySection.tsx b/interface/app/$libraryId/Layout/Sidebar/LibrarySection.tsx index 1e52012b1..18b9138c4 100644 --- a/interface/app/$libraryId/Layout/Sidebar/LibrarySection.tsx +++ b/interface/app/$libraryId/Layout/Sidebar/LibrarySection.tsx @@ -1,11 +1,9 @@ import clsx from 'clsx'; -import { ArrowsClockwise } from 'phosphor-react'; import { Link, NavLink } from 'react-router-dom'; import { arraysEqual, useLibraryQuery, useOnlineLocations } from '@sd/client'; import { Folder } from '@sd/ui'; import { AddLocationButton } from '~/app/$libraryId/settings/library/locations/AddLocationButton'; import { SubtleButton } from '~/components/SubtleButton'; -import Icon from './Icon'; import SidebarLink from './Link'; import Section from './Section'; diff --git a/interface/app/$libraryId/Layout/Sidebar/Link.tsx b/interface/app/$libraryId/Layout/Sidebar/Link.tsx index e20d6e69b..ac09f60d4 100644 --- a/interface/app/$libraryId/Layout/Sidebar/Link.tsx +++ b/interface/app/$libraryId/Layout/Sidebar/Link.tsx @@ -1,7 +1,7 @@ import { cva } from 'class-variance-authority'; import clsx from 'clsx'; import { PropsWithChildren } from 'react'; -import { NavLink, NavLinkProps, useMatch } from 'react-router-dom'; +import { NavLink, NavLinkProps } from 'react-router-dom'; import { useOperatingSystem } from '~/hooks/useOperatingSystem'; const styles = cva( diff --git a/interface/app/$libraryId/TopBar/SearchBar.tsx b/interface/app/$libraryId/TopBar/SearchBar.tsx index 017a7d0d5..ffdaf2e15 100644 --- a/interface/app/$libraryId/TopBar/SearchBar.tsx +++ b/interface/app/$libraryId/TopBar/SearchBar.tsx @@ -1,6 +1,5 @@ import clsx from 'clsx'; -import { useEffect, useState, useTransition } from 'react'; -import { useRef } from 'react'; +import { useEffect, useRef, useState, useTransition } from 'react'; import { useLocation, useNavigate, useResolvedPath } from 'react-router'; import { createSearchParams, useSearchParams } from 'react-router-dom'; import { useKey, useKeys } from 'rooks'; @@ -40,6 +39,7 @@ export default () => { useEffect(() => { if (searchPath.pathname === location.pathname) updateParams(value); + // eslint-disable-next-line react-hooks/exhaustive-deps }, [value]); useKeys([os === 'macOS' ? 'Meta' : 'Ctrl', 'f'], () => searchRef.current?.focus()); diff --git a/interface/app/$libraryId/TopBar/TopBarChildren.tsx b/interface/app/$libraryId/TopBar/TopBarChildren.tsx index 8c7bf343a..03e34d384 100644 --- a/interface/app/$libraryId/TopBar/TopBarChildren.tsx +++ b/interface/app/$libraryId/TopBar/TopBarChildren.tsx @@ -1,6 +1,5 @@ import clsx from 'clsx'; -import { useContext, useLayoutEffect } from 'react'; -import { useState } from 'react'; +import { useContext, useLayoutEffect, useState } from 'react'; import { createPortal } from 'react-dom'; import { Popover, Tooltip } from '@sd/ui'; import { ToolOption } from '.'; diff --git a/interface/app/$libraryId/TopBar/TopBarMobile.tsx b/interface/app/$libraryId/TopBar/TopBarMobile.tsx index c9de3f2ed..878803665 100644 --- a/interface/app/$libraryId/TopBar/TopBarMobile.tsx +++ b/interface/app/$libraryId/TopBar/TopBarMobile.tsx @@ -1,6 +1,5 @@ import { DotsThreeCircle } from 'phosphor-react'; -import { HTMLAttributes, forwardRef } from 'react'; -import React from 'react'; +import React, { HTMLAttributes, forwardRef } from 'react'; import { Popover } from '@sd/ui'; import { TOP_BAR_ICON_STYLE, ToolOption } from '.'; import TopBarButton, { TopBarButtonProps } from './TopBarButton'; diff --git a/interface/app/$libraryId/debug.tsx b/interface/app/$libraryId/debug.tsx index 93166e98b..20fc5a7f3 100644 --- a/interface/app/$libraryId/debug.tsx +++ b/interface/app/$libraryId/debug.tsx @@ -1,4 +1,4 @@ -import { useBridgeQuery, useLibraryMutation, useLibraryQuery } from '@sd/client'; +import { useBridgeQuery, useLibraryQuery } from '@sd/client'; import { CodeBlock } from '~/components/Codeblock'; import { usePlatform } from '~/util/Platform'; @@ -14,7 +14,7 @@ export const Component = () => { // alert('Database purged'); // } // }); - const { mutate: identifyFiles } = useLibraryMutation('jobs.identifyUniqueFiles'); + // const { mutate: identifyFiles } = useLibraryMutation('jobs.identifyUniqueFiles'); return (

Developer Debugger

diff --git a/interface/app/$libraryId/overview.tsx b/interface/app/$libraryId/overview.tsx index 79711303d..78ab048cf 100644 --- a/interface/app/$libraryId/overview.tsx +++ b/interface/app/$libraryId/overview.tsx @@ -88,7 +88,7 @@ export const Component = () => { initialData: { ...EMPTY_STATISTICS } }); const { explorerViewOptions } = useExplorerTopBarOptions(); - const { data: items } = useLibraryQuery(['files.getRecent', 50]); + const recentFiles = useLibraryQuery(['files.getRecent', 50]); overviewMounted = true; @@ -136,8 +136,13 @@ export const Component = () => { Note:   This is a pre-alpha build of Spacedrive, many features are yet to be functional. */} - Recents - + {/* Recents */} + {(recentFiles.data?.length || 0) > 0 && ( + <> + Recents + + + )}
); diff --git a/interface/app/$libraryId/settings/Sidebar.tsx b/interface/app/$libraryId/settings/Sidebar.tsx index 4d3678eb7..e8a400725 100644 --- a/interface/app/$libraryId/settings/Sidebar.tsx +++ b/interface/app/$libraryId/settings/Sidebar.tsx @@ -2,9 +2,7 @@ import { Books, FlyingSaucer, GearSix, - Graph, HardDrive, - Heart, Key, KeyReturn, PaintBrush, diff --git a/interface/app/$libraryId/settings/library/general.tsx b/interface/app/$libraryId/settings/library/general.tsx index f0f1519da..d2e59b356 100644 --- a/interface/app/$libraryId/settings/library/general.tsx +++ b/interface/app/$libraryId/settings/library/general.tsx @@ -1,6 +1,6 @@ import { useForm } from 'react-hook-form'; import { useBridgeMutation, useLibraryContext } from '@sd/client'; -import { Button, Input, Switch, dialogManager } from '@sd/ui'; +import { Button, Input, dialogManager } from '@sd/ui'; import { useDebouncedFormWatch } from '~/hooks/useDebouncedForm'; import { Heading } from '../Layout'; import Setting from '../Setting'; diff --git a/interface/app/$libraryId/settings/library/keys/BackupRestoreDialog.tsx b/interface/app/$libraryId/settings/library/keys/BackupRestoreDialog.tsx index 25feaeff2..9322061d7 100644 --- a/interface/app/$libraryId/settings/library/keys/BackupRestoreDialog.tsx +++ b/interface/app/$libraryId/settings/library/keys/BackupRestoreDialog.tsx @@ -1,8 +1,7 @@ import { Eye, EyeSlash } from 'phosphor-react'; import { useState } from 'react'; import { useLibraryMutation } from '@sd/client'; -import { Button, Dialog, UseDialogProps, useDialog } from '@sd/ui'; -import { forms } from '@sd/ui'; +import { Button, Dialog, UseDialogProps, forms, useDialog } from '@sd/ui'; import { showAlertDialog } from '~/components/AlertDialog'; import { usePlatform } from '~/util/Platform'; diff --git a/interface/app/$libraryId/settings/library/locations/$id.tsx b/interface/app/$libraryId/settings/library/locations/$id.tsx index 3b9791e3d..088d2ab11 100644 --- a/interface/app/$libraryId/settings/library/locations/$id.tsx +++ b/interface/app/$libraryId/settings/library/locations/$id.tsx @@ -2,11 +2,9 @@ import { useQueryClient } from '@tanstack/react-query'; import { Archive, ArrowsClockwise, Info, Trash } from 'phosphor-react'; import { useState } from 'react'; import { Controller } from 'react-hook-form'; -import { useParams } from 'react-router'; -import { useNavigate } from 'react-router'; +import { useNavigate, useParams } from 'react-router'; import { useLibraryMutation, useLibraryQuery } from '@sd/client'; -import { Button, Divider, forms, tw } from '@sd/ui'; -import { Tooltip } from '@sd/ui'; +import { Button, Divider, Tooltip, forms, tw } from '@sd/ui'; import { showAlertDialog } from '~/components/AlertDialog'; import ModalLayout from '../../ModalLayout'; import { IndexerRuleEditor } from './IndexerRuleEditor'; diff --git a/interface/app/$libraryId/settings/library/locations/DeleteDialog.tsx b/interface/app/$libraryId/settings/library/locations/DeleteDialog.tsx index 5a78bed74..6615bbc9b 100644 --- a/interface/app/$libraryId/settings/library/locations/DeleteDialog.tsx +++ b/interface/app/$libraryId/settings/library/locations/DeleteDialog.tsx @@ -1,7 +1,6 @@ import { useLibraryMutation, usePlausibleEvent } from '@sd/client'; import { Dialog, UseDialogProps, useDialog } from '@sd/ui'; import { useZodForm } from '@sd/ui/src/forms'; -import { usePlatform } from '~/util/Platform'; interface Props extends UseDialogProps { onSuccess: () => void; diff --git a/interface/app/$libraryId/settings/library/locations/ListItem.tsx b/interface/app/$libraryId/settings/library/locations/ListItem.tsx index 7662e9979..97c184e08 100644 --- a/interface/app/$libraryId/settings/library/locations/ListItem.tsx +++ b/interface/app/$libraryId/settings/library/locations/ListItem.tsx @@ -2,8 +2,7 @@ import clsx from 'clsx'; import { Repeat, Trash } from 'phosphor-react'; import { useState } from 'react'; import { useNavigate } from 'react-router'; -import { arraysEqual, useLibraryMutation, useOnlineLocations } from '@sd/client'; -import { Location, Node } from '@sd/client'; +import { Location, Node, arraysEqual, useLibraryMutation, useOnlineLocations } from '@sd/client'; import { Button, Card, Folder, Tooltip, dialogManager } from '@sd/ui'; import DeleteDialog from './DeleteDialog'; diff --git a/interface/app/$libraryId/settings/library/tags/CreateDialog.tsx b/interface/app/$libraryId/settings/library/tags/CreateDialog.tsx index 177c94024..accb65421 100644 --- a/interface/app/$libraryId/settings/library/tags/CreateDialog.tsx +++ b/interface/app/$libraryId/settings/library/tags/CreateDialog.tsx @@ -2,7 +2,6 @@ import { useLibraryMutation, usePlausibleEvent } from '@sd/client'; import { Dialog, UseDialogProps, useDialog } from '@sd/ui'; import { Input, useZodForm, z } from '@sd/ui/src/forms'; import ColorPicker from '~/components/ColorPicker'; -import { usePlatform } from '~/util/Platform'; export default (props: UseDialogProps & { assignToObject?: number }) => { const dialog = useDialog(props); diff --git a/interface/app/$libraryId/settings/library/tags/DeleteDialog.tsx b/interface/app/$libraryId/settings/library/tags/DeleteDialog.tsx index f185e7412..600930193 100644 --- a/interface/app/$libraryId/settings/library/tags/DeleteDialog.tsx +++ b/interface/app/$libraryId/settings/library/tags/DeleteDialog.tsx @@ -1,7 +1,6 @@ import { useLibraryMutation, usePlausibleEvent } from '@sd/client'; import { Dialog, UseDialogProps, useDialog } from '@sd/ui'; import { useZodForm } from '@sd/ui/src/forms'; -import { usePlatform } from '~/util/Platform'; interface Props extends UseDialogProps { tagId: number; diff --git a/interface/app/$libraryId/settings/node/libraries/DeleteDialog.tsx b/interface/app/$libraryId/settings/node/libraries/DeleteDialog.tsx index 8e09e3973..9da58f320 100644 --- a/interface/app/$libraryId/settings/node/libraries/DeleteDialog.tsx +++ b/interface/app/$libraryId/settings/node/libraries/DeleteDialog.tsx @@ -1,8 +1,6 @@ import { useQueryClient } from '@tanstack/react-query'; -import { useBridgeMutation, usePlausibleEvent, useTelemetryState } from '@sd/client'; -import { Dialog, UseDialogProps, useDialog } from '@sd/ui'; -import { forms } from '@sd/ui'; -import { usePlatform } from '~/util/Platform'; +import { useBridgeMutation, usePlausibleEvent } from '@sd/client'; +import { Dialog, UseDialogProps, forms, useDialog } from '@sd/ui'; const { useZodForm, z } = forms; diff --git a/interface/app/$libraryId/spacedrop.tsx b/interface/app/$libraryId/spacedrop.tsx index 6f0b05685..bbf840270 100644 --- a/interface/app/$libraryId/spacedrop.tsx +++ b/interface/app/$libraryId/spacedrop.tsx @@ -1,14 +1,12 @@ import { GoogleDrive, Mega, iCloud } from '@sd/assets/images'; import clsx from 'clsx'; import { DeviceMobile, HardDrives, Icon, Laptop, User } from 'phosphor-react'; -import { useState } from 'react'; -import { Button, ScreenHeading, Select, SelectOption, forms, tw } from '@sd/ui'; -import { PeerMetadata, useBridgeMutation, useBridgeSubscription } from '~/../packages/client/src'; +import { tw } from '@sd/ui'; import { SubtleButton, SubtleButtonContainer } from '~/components/SubtleButton'; import { OperatingSystem } from '~/util/Platform'; import classes from './spacedrop.module.scss'; -const { Form, Input, useZodForm, z } = forms; +// const { Form, Input, useZodForm, z } = forms; // TODO: move this to UI, copied from Inspector const Pill = tw.span`mt-1 inline border border-transparent px-0.5 text-[9px] font-medium shadow shadow-app-shade/5 bg-app-selected rounded text-ink-dull`; diff --git a/interface/app/$libraryId/spaces.tsx b/interface/app/$libraryId/spaces.tsx index cd74541b7..69bde1f50 100644 --- a/interface/app/$libraryId/spaces.tsx +++ b/interface/app/$libraryId/spaces.tsx @@ -1,5 +1,3 @@ -import { ScreenHeading } from '@sd/ui'; - export const Component = () => { return
; }; diff --git a/interface/app/$libraryId/sync.tsx b/interface/app/$libraryId/sync.tsx index 3d32f51d8..5fb97d577 100644 --- a/interface/app/$libraryId/sync.tsx +++ b/interface/app/$libraryId/sync.tsx @@ -1,10 +1,4 @@ -import { - CRDTOperation, - useBridgeSubscription, - useLibraryContext, - useLibraryQuery, - useLibrarySubscription -} from '@sd/client'; +import { CRDTOperation, useLibraryQuery, useLibrarySubscription } from '@sd/client'; import { tw } from '@sd/ui'; const Label = tw.span`text-gray-300`; diff --git a/interface/app/onboarding/creating-library.tsx b/interface/app/onboarding/creating-library.tsx index 7933b8b49..ae11b80c2 100644 --- a/interface/app/onboarding/creating-library.tsx +++ b/interface/app/onboarding/creating-library.tsx @@ -2,7 +2,6 @@ import { useQueryClient } from '@tanstack/react-query'; import { useEffect, useRef, useState } from 'react'; import { useNavigate } from 'react-router'; import { - HASHING_ALGOS, resetOnboardingStore, telemetryStore, useBridgeMutation, diff --git a/packages/config/eslint/base.js b/packages/config/eslint/base.js index 2688880b1..f77ebd2de 100644 --- a/packages/config/eslint/base.js +++ b/packages/config/eslint/base.js @@ -15,7 +15,7 @@ module.exports = { 'plugin:@typescript-eslint/recommended', 'turbo', 'plugin:editorconfig/all', - 'plugin:prettier/recommended' + 'prettier' ], plugins: ['react', 'editorconfig'], rules: {