diff --git a/.vscode/settings.json b/.vscode/settings.json index 7c929f596..eb08003fc 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -50,6 +50,8 @@ "**/bower_components": true, "**/*.code-search": true, // Hiding these folders bcs they create a lot of noise in the search results + "**/*.contentlayer": true, + "**/*.next": true, "apps/mobile/ios/Pods": true // "apps/mobile/android": true // "apps/mobile/ios": true diff --git a/apps/mobile/src/screens/Location.tsx b/apps/mobile/src/screens/Location.tsx index 5ce2c6aa0..7ca64a3d0 100644 --- a/apps/mobile/src/screens/Location.tsx +++ b/apps/mobile/src/screens/Location.tsx @@ -29,7 +29,7 @@ export default function LocationScreen({ navigation, route }: SharedScreenProps< title: location.data?.name ?? 'Location' }); } - }, [data, navigation, path]); + }, [location.data?.name, navigation, path]); useEffect(() => { getExplorerStore().locationId = id; diff --git a/apps/releases/package.json b/apps/releases/package.json index 85375a2b1..674b8e681 100644 --- a/apps/releases/package.json +++ b/apps/releases/package.json @@ -13,7 +13,6 @@ "@types/react": "18.0.35", "@types/react-dom": "18.0.11", "@vercel/edge-config": "^0.1.7", - "eslint": "^8.38.0", "eslint-config-next": "13.3.0", "next": "13.3.0", "octokit": "^2.0.14", diff --git a/apps/storybook/package.json b/apps/storybook/package.json index 767f9c907..c25f36db3 100644 --- a/apps/storybook/package.json +++ b/apps/storybook/package.json @@ -27,7 +27,7 @@ "postcss": "^8.4.17", "prop-types": "^15.8.1", "storybook": "^7.0.5", - "tailwindcss": "^3.1.8", + "tailwindcss": "^3.3.2", "typescript": "^4.9.3", "vite": "^4.2.0" } diff --git a/crates/sync/example/web/package.json b/crates/sync/example/web/package.json index 8b6332901..e01ebc072 100644 --- a/crates/sync/example/web/package.json +++ b/crates/sync/example/web/package.json @@ -20,6 +20,6 @@ "react": "^18.2.0", "react-dom": "^18.2.0", "solid-js": "^1.5.1", - "tailwindcss": "^3.1.8" + "tailwindcss": "^3.3.2" } } diff --git a/docs/changelog/beta/0.1.0.md b/docs/changelog/beta/0.1.0.mdx similarity index 64% rename from docs/changelog/beta/0.1.0.md rename to docs/changelog/beta/0.1.0.mdx index 62edfea53..ad8b6f06e 100644 --- a/docs/changelog/beta/0.1.0.md +++ b/docs/changelog/beta/0.1.0.mdx @@ -1,8 +1,10 @@ # 0.1.0 (Beta) -::: slot warning Coming soon -This release has not happened yet, stay tuned... -::: + After \_\_ months of development we are extremely excited to be releasing the first version of Spacedrive as an early public beta. @@ -16,11 +18,11 @@ _Features:_ - Basic onboarding flow, determine use-case and preferences. -- Create [Libraries](../architecture/libraries.md) and switch between them. +- Create [Libraries](../../developers/architecture/libraries) and switch between them. -- Connect multiple [Nodes](../architecture/nodes.md) to a Library via LAN. +- Connect multiple [Nodes](../../developers/architecture/nodes) to a Library via LAN. -- Add [Locations](../architecture/locations.md) to import files into Spacedrive. +- Add [Locations](../../developers/architecture/locations) to import files into Spacedrive. - Indexer watch for changes and performs light re-scans. @@ -30,28 +32,28 @@ _Features:_ _Eventually Clouds will be supported and added as Cloud Locations_ -- Browse Locations via the [Explorer](../architecture/explorer.md) and view previews and metadata. +- Browse Locations via the [Explorer](../../developers/architecture/explorer) and view previews and metadata. - Viewer options: row/grid item size, gap adjustment, show/hide info. - Context menu: rename, copy, duplicate, delete, favorite and add tags. - Multi-select with dedicated context menu options. - Open with default OS app, in-app viewer (images/text only) or Apple Quicklook - Automatically identify unique files to discover duplicates, shown in the inspector. -- Generate [Preview Media](../architecture/preview-media.md) for image, video and text. +- Generate [Preview Media](../../developers/architecture/preview-media) for image, video and text. -- Create [Tags](../architecture/tags.md) and assign them to files, browse Tags in the Explorer. +- Create [Tags](../../developers/architecture/tags) and assign them to files, browse Tags in the Explorer. -- Create [Spaces](../architecture/spaces.md) to organize and present files. +- Create [Spaces](../../developers/architecture/spaces) to organize and present files. - Automated Spaces can include files that match criteria. _Eventually Spaces will be sharable, publically or privately_ -- Create photo [Albums](../architecture/albums.md) and add images. +- Create photo [Albums](../../developers/architecture/albums) and add images. - Library statistics: total capacity, database size, preview media size, free space. -- [Search](../architecture/search.md) Library via search bar or CTRL+F. +- [Search](../../developers/architecture/search) Library via search bar or CTRL+F. - Searches online and offline Locations, Spaces, Tags and Albums. @@ -61,7 +63,7 @@ _Features:_ - Customize sidebar freely with section headings and flexible slots, include default layout. -- Pause and resume [Jobs](../architecture/jobs.md) with recovery on crash via Job Manager widget. +- Pause and resume [Jobs](../../developers/architecture/jobs) with recovery on crash via Job Manager widget. - Multi-window support. diff --git a/docs/company/about/credits.md b/docs/company/about/credits.mdx similarity index 100% rename from docs/company/about/credits.md rename to docs/company/about/credits.mdx diff --git a/docs/company/about/longevity.md b/docs/company/about/longevity.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/docs/company/about/longevity.mdx b/docs/company/about/longevity.mdx new file mode 100644 index 000000000..c6dd7529e --- /dev/null +++ b/docs/company/about/longevity.mdx @@ -0,0 +1 @@ +# Longevity diff --git a/docs/company/about/philosophy.md b/docs/company/about/philosophy.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/docs/company/about/philosophy.mdx b/docs/company/about/philosophy.mdx new file mode 100644 index 000000000..a6811985c --- /dev/null +++ b/docs/company/about/philosophy.mdx @@ -0,0 +1 @@ +# Philosophy diff --git a/docs/company/branding/logo.md b/docs/company/branding/logo.mdx similarity index 100% rename from docs/company/branding/logo.md rename to docs/company/branding/logo.mdx diff --git a/docs/company/branding/typeography.md b/docs/company/branding/typeography.md deleted file mode 100644 index e69de29bb..000000000 diff --git a/docs/company/branding/typeography.mdx b/docs/company/branding/typeography.mdx new file mode 100644 index 000000000..7f877f491 --- /dev/null +++ b/docs/company/branding/typeography.mdx @@ -0,0 +1 @@ +# Typeography diff --git a/docs/company/legal/privacy.md b/docs/company/legal/privacy.mdx similarity index 100% rename from docs/company/legal/privacy.md rename to docs/company/legal/privacy.mdx diff --git a/docs/company/legal/terms.md b/docs/company/legal/terms.mdx similarity index 100% rename from docs/company/legal/terms.md rename to docs/company/legal/terms.mdx diff --git a/docs/developers/architecture/albums.md b/docs/developers/architecture/albums.mdx similarity index 100% rename from docs/developers/architecture/albums.md rename to docs/developers/architecture/albums.mdx diff --git a/docs/developers/architecture/database.md b/docs/developers/architecture/database.mdx similarity index 100% rename from docs/developers/architecture/database.md rename to docs/developers/architecture/database.mdx diff --git a/docs/developers/architecture/explorer.md b/docs/developers/architecture/explorer.mdx similarity index 100% rename from docs/developers/architecture/explorer.md rename to docs/developers/architecture/explorer.mdx diff --git a/docs/developers/architecture/extensions.md b/docs/developers/architecture/extensions.mdx similarity index 100% rename from docs/developers/architecture/extensions.md rename to docs/developers/architecture/extensions.mdx diff --git a/docs/developers/architecture/jobs.md b/docs/developers/architecture/jobs.mdx similarity index 100% rename from docs/developers/architecture/jobs.md rename to docs/developers/architecture/jobs.mdx diff --git a/docs/developers/architecture/libraries.md b/docs/developers/architecture/libraries.mdx similarity index 100% rename from docs/developers/architecture/libraries.md rename to docs/developers/architecture/libraries.mdx diff --git a/docs/developers/architecture/locations.md b/docs/developers/architecture/locations.mdx similarity index 100% rename from docs/developers/architecture/locations.md rename to docs/developers/architecture/locations.mdx diff --git a/docs/developers/architecture/nodes.md b/docs/developers/architecture/nodes.mdx similarity index 100% rename from docs/developers/architecture/nodes.md rename to docs/developers/architecture/nodes.mdx diff --git a/docs/developers/architecture/objects.md b/docs/developers/architecture/objects.mdx similarity index 99% rename from docs/developers/architecture/objects.md rename to docs/developers/architecture/objects.mdx index c1d1de53b..57cb734bc 100644 --- a/docs/developers/architecture/objects.md +++ b/docs/developers/architecture/objects.mdx @@ -1,7 +1,6 @@ --- -name: Objects +title: Objects index: 2 -new: true --- # Objects diff --git a/docs/developers/architecture/preview-media.md b/docs/developers/architecture/preview-media.mdx similarity index 93% rename from docs/developers/architecture/preview-media.md rename to docs/developers/architecture/preview-media.mdx index c6f1623ae..41ad6730e 100644 --- a/docs/developers/architecture/preview-media.md +++ b/docs/developers/architecture/preview-media.mdx @@ -1,5 +1,5 @@ --- -name: Preview Media +title: Preview Media index: 10 --- diff --git a/docs/developers/architecture/search.md b/docs/developers/architecture/search.mdx similarity index 100% rename from docs/developers/architecture/search.md rename to docs/developers/architecture/search.mdx diff --git a/docs/developers/architecture/spaces.md b/docs/developers/architecture/spaces.mdx similarity index 100% rename from docs/developers/architecture/spaces.md rename to docs/developers/architecture/spaces.mdx diff --git a/docs/developers/architecture/sync.md b/docs/developers/architecture/sync.mdx similarity index 100% rename from docs/developers/architecture/sync.md rename to docs/developers/architecture/sync.mdx diff --git a/docs/developers/architecture/tags.md b/docs/developers/architecture/tags.mdx similarity index 100% rename from docs/developers/architecture/tags.md rename to docs/developers/architecture/tags.mdx diff --git a/docs/developers/architecture/virtual-filesystem.md b/docs/developers/architecture/virtual-filesystem.mdx similarity index 100% rename from docs/developers/architecture/virtual-filesystem.md rename to docs/developers/architecture/virtual-filesystem.mdx diff --git a/docs/developers/clients/cli.md b/docs/developers/clients/cli.mdx similarity index 100% rename from docs/developers/clients/cli.md rename to docs/developers/clients/cli.mdx diff --git a/docs/developers/clients/javascript.md b/docs/developers/clients/javascript.mdx similarity index 96% rename from docs/developers/clients/javascript.md rename to docs/developers/clients/javascript.mdx index a47bce34e..8aa74e73e 100644 --- a/docs/developers/clients/javascript.md +++ b/docs/developers/clients/javascript.mdx @@ -1,5 +1,5 @@ --- -name: JavaScript +title: JavaScript index: 500 --- diff --git a/docs/developers/clients/rust.md b/docs/developers/clients/rust.mdx similarity index 100% rename from docs/developers/clients/rust.md rename to docs/developers/clients/rust.mdx diff --git a/docs/developers/prerequisites/environment-setup.md b/docs/developers/prerequisites/environment-setup.mdx similarity index 88% rename from docs/developers/prerequisites/environment-setup.md rename to docs/developers/prerequisites/environment-setup.mdx index b0067ace7..628b8b1a1 100644 --- a/docs/developers/prerequisites/environment-setup.md +++ b/docs/developers/prerequisites/environment-setup.mdx @@ -48,9 +48,10 @@ This project uses [Cargo](https://doc.rust-lang.org/cargo/getting-started/instal - **Server:** `DATA_DIR=/path/to/library cargo run -p sdcore` - **Webapp:** `pnpm web dev` -::: slot note -When changing branches, make sure to run `pnpm prep` command right after. This ensures all the codegen is up to date. -::: + ### Mobile app @@ -72,9 +73,10 @@ If you are having issues ensure you are using the following versions of Rust and ### Seeding data on startup -::: slot note -You may loose data if your using this feature so please be careful! This only works on development builds for this reason. -::: + You can add a file called `sd_init.json` in the same folder where you start Spacedrive and it can automatically seed data on startup. diff --git a/docs/developers/prerequisites/guidelines.md b/docs/developers/prerequisites/guidelines.mdx similarity index 100% rename from docs/developers/prerequisites/guidelines.md rename to docs/developers/prerequisites/guidelines.mdx diff --git a/docs/developers/prerequisites/welcome.md b/docs/developers/prerequisites/welcome.mdx similarity index 100% rename from docs/developers/prerequisites/welcome.md rename to docs/developers/prerequisites/welcome.mdx diff --git a/docs/developers/technology/open-source.md b/docs/developers/technology/open-source.mdx similarity index 63% rename from docs/developers/technology/open-source.md rename to docs/developers/technology/open-source.mdx index 75214db03..a0f7cf1c6 100644 --- a/docs/developers/technology/open-source.md +++ b/docs/developers/technology/open-source.mdx @@ -1,5 +1,5 @@ --- -name: Open Source +title: Open Source index: 10 --- diff --git a/docs/developers/technology/tech-stack.md b/docs/developers/technology/tech-stack.mdx similarity index 64% rename from docs/developers/technology/tech-stack.md rename to docs/developers/technology/tech-stack.mdx index 36d76362c..e9d2a51d1 100644 --- a/docs/developers/technology/tech-stack.md +++ b/docs/developers/technology/tech-stack.mdx @@ -1,5 +1,5 @@ --- -name: Tech Stack +title: Tech Stack index: 10 --- diff --git a/docs/package.json b/docs/package.json deleted file mode 100644 index d8ec39075..000000000 --- a/docs/package.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "name": "@sd/docs", - "description": "Allows turborepo to detect our markdown files", - "private": true -} diff --git a/docs/product/getting-started/features.md b/docs/product/getting-started/features.mdx similarity index 100% rename from docs/product/getting-started/features.md rename to docs/product/getting-started/features.mdx diff --git a/docs/product/getting-started/introduction.md b/docs/product/getting-started/introduction.mdx similarity index 80% rename from docs/product/getting-started/introduction.md rename to docs/product/getting-started/introduction.mdx index 7299f0069..771c033dc 100644 --- a/docs/product/getting-started/introduction.md +++ b/docs/product/getting-started/introduction.mdx @@ -1,5 +1,5 @@ --- -name: Introduction +title: Introduction index: 0 --- @@ -15,6 +15,7 @@ Create photo albums that you'll never lose, effortlessly catalogue terabytes of A decentralized, local-first design optimizes for privacy, security and data ownership—and best of all, its open source and entirely free. -::: slot note -Spacedrive is not yet released, these docs are a work in progress. Check out our [roadmap](/roadmap) to see a timeline leading to release! -::: + diff --git a/docs/product/getting-started/setup.md b/docs/product/getting-started/setup.md deleted file mode 100644 index 1cc4ae2af..000000000 --- a/docs/product/getting-started/setup.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -name: Setup -index: 0 ---- - -# Setup - -::: slot note Note -Spacedrive is not yet released, these docs are a work in progress. Check out our [roadmap](/roadmap) to see a timeline leading to release! -::: diff --git a/docs/product/getting-started/setup.mdx b/docs/product/getting-started/setup.mdx new file mode 100644 index 000000000..643feb1b5 --- /dev/null +++ b/docs/product/getting-started/setup.mdx @@ -0,0 +1,11 @@ +--- +title: Setup +index: 0 +--- + +# Setup + + diff --git a/docs/product/getting-started/terminology.md b/docs/product/getting-started/terminology.mdx similarity index 98% rename from docs/product/getting-started/terminology.md rename to docs/product/getting-started/terminology.mdx index 6ae1a283e..e9be5fa71 100644 --- a/docs/product/getting-started/terminology.md +++ b/docs/product/getting-started/terminology.mdx @@ -1,5 +1,5 @@ --- -name: Terminology +title: Terminology index: 0 --- diff --git a/docs/product/guides/adding-locations.md b/docs/product/guides/adding-locations.mdx similarity index 85% rename from docs/product/guides/adding-locations.md rename to docs/product/guides/adding-locations.mdx index d05461722..4d66e7249 100644 --- a/docs/product/guides/adding-locations.md +++ b/docs/product/guides/adding-locations.mdx @@ -20,9 +20,10 @@ When a Location is added it is immediately scanned. The scan happens via several If any one of these jobs fail or the application is closed, the state is saved and it will resume when the app is relaunched. -::: slot info -If you wish to pause or cancel these jobs you can do so from the [Job Manager]() -::: + There is a button to trigger a full re-scan of this Location. Otherwise the location will keep watch for filesystem changes automatically. @@ -30,10 +31,11 @@ Deleting a location will remove the data from the database permanently. ## Archiving -::: slot warning -This feature is WIP -::: -Locations can be archived, meaning the directory structure is extracted from the Spacedrive database and preserved as a standalone database file. This file can be opened by Spacedrive in the [Database]() view. + + +Locations can be archived, meaning the directory structure is extracted from the Spacedrive database +and preserved as a standalone database file. This file can be opened by Spacedrive in the [Database]() +view. Archives are useful when files have been moved or deleted from a Location, but you want to keep a record of the directory structure of that Location without cluttering the Spacedrive interface. File metadata can optionally be included/excluded from the archive file. diff --git a/docs/product/guides/connecting-nodes.md b/docs/product/guides/connecting-nodes.mdx similarity index 67% rename from docs/product/guides/connecting-nodes.md rename to docs/product/guides/connecting-nodes.mdx index 2404f9317..ecb92546a 100644 --- a/docs/product/guides/connecting-nodes.md +++ b/docs/product/guides/connecting-nodes.mdx @@ -4,9 +4,11 @@ index: 6 # Connecting Nodes -::: slot note WIP -It is not possible to connect Nodes yet, please check our [roadmap](/roadmap). -::: + Nodes are instances of Spacedrive, commonly your devices. Currently Spacedrive supports Windows, Linux, Mac, iOS and Android. diff --git a/docs/product/guides/converting-files.md b/docs/product/guides/converting-files.mdx similarity index 100% rename from docs/product/guides/converting-files.md rename to docs/product/guides/converting-files.mdx diff --git a/docs/product/guides/creating-spaces.md b/docs/product/guides/creating-spaces.mdx similarity index 100% rename from docs/product/guides/creating-spaces.md rename to docs/product/guides/creating-spaces.mdx diff --git a/docs/product/guides/discover-duplicates.md b/docs/product/guides/discover-duplicates.mdx similarity index 100% rename from docs/product/guides/discover-duplicates.md rename to docs/product/guides/discover-duplicates.mdx diff --git a/docs/product/guides/file-viewer.md b/docs/product/guides/file-viewer.mdx similarity index 100% rename from docs/product/guides/file-viewer.md rename to docs/product/guides/file-viewer.mdx diff --git a/docs/product/guides/find-my-file.md b/docs/product/guides/find-my-file.mdx similarity index 100% rename from docs/product/guides/find-my-file.md rename to docs/product/guides/find-my-file.mdx diff --git a/docs/product/guides/generating-thumbails.md b/docs/product/guides/generating-thumbails.mdx similarity index 100% rename from docs/product/guides/generating-thumbails.md rename to docs/product/guides/generating-thumbails.mdx diff --git a/docs/product/guides/library-setup.md b/docs/product/guides/library-setup.mdx similarity index 100% rename from docs/product/guides/library-setup.md rename to docs/product/guides/library-setup.mdx diff --git a/docs/product/guides/managing-jobs.md b/docs/product/guides/managing-jobs.mdx similarity index 100% rename from docs/product/guides/managing-jobs.md rename to docs/product/guides/managing-jobs.mdx diff --git a/docs/product/guides/managing-tags.md b/docs/product/guides/managing-tags.mdx similarity index 100% rename from docs/product/guides/managing-tags.md rename to docs/product/guides/managing-tags.mdx diff --git a/docs/product/guides/photo-albums.md b/docs/product/guides/photo-albums.mdx similarity index 100% rename from docs/product/guides/photo-albums.md rename to docs/product/guides/photo-albums.mdx diff --git a/docs/product/resources/faq.md b/docs/product/resources/faq.mdx similarity index 99% rename from docs/product/resources/faq.md rename to docs/product/resources/faq.mdx index dc1748db0..4adf387be 100644 --- a/docs/product/resources/faq.md +++ b/docs/product/resources/faq.mdx @@ -1,5 +1,5 @@ --- -name: FAQ +title: FAQ --- # Frequently Asked Questions diff --git a/docs/product/resources/privacy.md b/docs/product/resources/privacy.mdx similarity index 100% rename from docs/product/resources/privacy.md rename to docs/product/resources/privacy.mdx diff --git a/docs/product/resources/security.md b/docs/product/resources/security.mdx similarity index 100% rename from docs/product/resources/security.md rename to docs/product/resources/security.mdx diff --git a/interface/app/$libraryId/Explorer/File/Thumb.tsx b/interface/app/$libraryId/Explorer/File/Thumb.tsx index c529e8790..a5fb9cd3e 100644 --- a/interface/app/$libraryId/Explorer/File/Thumb.tsx +++ b/interface/app/$libraryId/Explorer/File/Thumb.tsx @@ -1,4 +1,4 @@ -import { getIcon, iconNames } from '@sd/assets/icons/util'; +import { getIcon, iconNames } from '@sd/assets/util'; import clsx from 'clsx'; import { ImgHTMLAttributes, memo, useEffect, useLayoutEffect, useRef, useState } from 'react'; import { ExplorerItem, useLibraryContext } from '@sd/client'; diff --git a/interface/app/$libraryId/Explorer/OptionsPanel.tsx b/interface/app/$libraryId/Explorer/OptionsPanel.tsx index 5a3cb2e02..b5384ad92 100644 --- a/interface/app/$libraryId/Explorer/OptionsPanel.tsx +++ b/interface/app/$libraryId/Explorer/OptionsPanel.tsx @@ -17,7 +17,8 @@ const sortOptions: Record = { sizeInBytes: 'Size', dateCreated: 'Date created', dateModified: 'Date modified', - dateIndexed: 'Date indexed' + dateIndexed: 'Date indexed', + object: 'Object' }; export default () => { diff --git a/interface/app/$libraryId/Explorer/util.ts b/interface/app/$libraryId/Explorer/util.ts index 0de29f166..2e1573d6f 100644 --- a/interface/app/$libraryId/Explorer/util.ts +++ b/interface/app/$libraryId/Explorer/util.ts @@ -1,13 +1,22 @@ import { z } from 'zod'; -import { ExplorerItem, ObjectKind, ObjectKindKey, Ordering, isObject, isPath } from '@sd/client'; +import { + ExplorerItem, + FilePathSearchOrdering, + ObjectKind, + ObjectKindKey, + isObject, + isPath +} from '@sd/client'; import { useExplorerStore, useZodSearchParams } from '~/hooks'; -export function useExplorerOrder(): Ordering | undefined { +export function useExplorerOrder(): FilePathSearchOrdering | undefined { const explorerStore = useExplorerStore(); if (explorerStore.orderBy === 'none') return undefined; - return { [explorerStore.orderBy]: explorerStore.orderByDirection === 'asc' } as Ordering; + return { + [explorerStore.orderBy]: explorerStore.orderByDirection === 'asc' + } as FilePathSearchOrdering; } export function getItemObject(data: ExplorerItem) { diff --git a/interface/app/$libraryId/Layout/Sidebar/JobManager/index.tsx b/interface/app/$libraryId/Layout/Sidebar/JobManager/index.tsx index 143c4fe7b..fcf5d233a 100644 --- a/interface/app/$libraryId/Layout/Sidebar/JobManager/index.tsx +++ b/interface/app/$libraryId/Layout/Sidebar/JobManager/index.tsx @@ -1,4 +1,3 @@ -/* eslint-disable tailwindcss/classnames-order */ import { useQueryClient } from '@tanstack/react-query'; import { Trash, X } from 'phosphor-react'; import { useCallback } from 'react'; diff --git a/interface/app/$libraryId/Layout/Sidebar/JobManager/useJobTimeText.tsx b/interface/app/$libraryId/Layout/Sidebar/JobManager/useJobTimeText.tsx index 2ca6514d9..837a3e28b 100644 --- a/interface/app/$libraryId/Layout/Sidebar/JobManager/useJobTimeText.tsx +++ b/interface/app/$libraryId/Layout/Sidebar/JobManager/useJobTimeText.tsx @@ -9,7 +9,7 @@ export function useJobTimeText(job: JobReport): string | null { const elapsedTimeText = useMemo(() => { let newText: string; if (job.status === 'Running') { - newText = `Elapsed in ${dayjs(job.started_at).fromNow(true)}`; + newText = `Elapsed ${dayjs(job.started_at).fromNow(true)}`; } else if (job.completed_at) { newText = `Took ${dayjs(job.started_at).from(job.completed_at, true)}`; } else { diff --git a/interface/app/$libraryId/Layout/Sidebar/LibrariesDropdown.tsx b/interface/app/$libraryId/Layout/Sidebar/LibrariesDropdown.tsx index e978d50d6..7ab87d450 100644 --- a/interface/app/$libraryId/Layout/Sidebar/LibrariesDropdown.tsx +++ b/interface/app/$libraryId/Layout/Sidebar/LibrariesDropdown.tsx @@ -40,7 +40,7 @@ export default () => { ))} dialogManager.create((dp) => )} diff --git a/interface/app/$libraryId/overview/index.tsx b/interface/app/$libraryId/overview/index.tsx index 525334a22..21efaaf6d 100644 --- a/interface/app/$libraryId/overview/index.tsx +++ b/interface/app/$libraryId/overview/index.tsx @@ -1,5 +1,4 @@ -import * as icons from '@sd/assets/icons'; -import { getIcon, iconNames } from '@sd/assets/icons/util'; +import { getIcon, iconNames } from '@sd/assets/util'; import { useInfiniteQuery } from '@tanstack/react-query'; import { useMemo, useState } from 'react'; import 'react-loading-skeleton/dist/skeleton.css'; @@ -93,12 +92,12 @@ export const Component = () => { favorite: isFavoritesCategory ? true : undefined, ...(explorerStore.layoutMode === 'media' ? { - kind: [5, 7].includes(kind) - ? [kind] - : isFavoritesCategory + kind: [5, 7].includes(kind) + ? [kind] + : isFavoritesCategory ? [5, 7] : [5, 7, kind] - } + } : { kind: isFavoritesCategory ? [] : [kind] }) } } diff --git a/interface/app/onboarding/alpha.tsx b/interface/app/onboarding/alpha.tsx index 5d561440b..7faa67498 100644 --- a/interface/app/onboarding/alpha.tsx +++ b/interface/app/onboarding/alpha.tsx @@ -1,5 +1,5 @@ import { AlphaBg, AppLogo } from '@sd/assets/images'; -import { Discord } from '@icons-pack/react-simple-icons'; +import { SiDiscord } from '@icons-pack/react-simple-icons'; import { useNavigate } from 'react-router-dom'; import { Button } from '@sd/ui'; import { usePlatform } from '~/util/Platform'; @@ -33,7 +33,7 @@ export default function OnboardingAlpha() { className="flex gap-2" variant="gray" > - + Join Discord