diff --git a/.vscode/settings.json b/.vscode/settings.json index b1ac7f28b..3d2f14d63 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -34,5 +34,8 @@ "displayName": "md directive (web font)", "name": "mdDirective" } - ] + ], + "editor.codeActionsOnSave": { + "source.organizeImports": "explicit" + } } diff --git a/docusaurus.config.ts b/docusaurus.config.ts index 158cd2718..c28bda2cc 100644 --- a/docusaurus.config.ts +++ b/docusaurus.config.ts @@ -1,52 +1,52 @@ require('dotenv').config(); import logger from '@docusaurus/logger'; +import type { VersionOptions } from '@docusaurus/plugin-content-docs'; import type { - EditThisPageOption, - ShowEditThisPage, - TdevConfig + EditThisPageOption, + ShowEditThisPage, + TdevConfig } from '@tdev/siteConfig/siteConfig'; -import type { VersionOptions } from '@docusaurus/plugin-content-docs'; -import { themes as prismThemes } from 'prism-react-renderer'; -import type { Config, OnBrokenMarkdownImagesFunction } from '@docusaurus/types'; import type * as Preset from '@docusaurus/preset-classic'; -import { v4 as uuidv4 } from 'uuid'; -import matter from 'gray-matter'; +import type { Config, OnBrokenMarkdownImagesFunction } from '@docusaurus/types'; +import { GlobExcludeDefault } from '@docusaurus/utils'; +import { resolveEditUrl } from '@tdev/material-sync/src/helpers/resolveEditUrl'; +import { remarkPdfPluginConfig } from '@tdev/remark-pdf'; +import type { TdevCustomFields } from '@tdev/siteConfig/TdevCustomFields'; import { promises as fs } from 'fs'; -import { - accountSwitcher, - blog, - devModeAccessLocalFS, - docs, - gitHub, - loginProfileButton, - personalSpaceOverlay, - requestTarget, - taskStateOverview -} from './src/siteConfig/navbarItems'; -import { applyTransformers } from './src/siteConfig/transformers'; -import { withSiteConfig } from './src/siteConfig/withSiteConfig'; -import { - sassPluginConfig, - dynamicRouterPluginConfig, - stackblitzRspackTargetPluginConfig, - rsDoctorPluginConfig, - sentryPluginConfig, - socketIoNoDepWarningsPluginConfig, - aliasConfigurationPlugin -} from './src/siteConfig/pluginConfigs'; +import matter from 'gray-matter'; +import path from 'path'; +import { themes as prismThemes } from 'prism-react-renderer'; +import { v4 as uuidv4 } from 'uuid'; import pageIndexPlugin from './packages/tdev/page-index/plugin'; import { useTdevContentPath } from './src/siteConfig/helpers'; -import path from 'path'; import { - recommendedBeforeDefaultRemarkPlugins, - recommendedRehypePlugins, - recommendedRemarkPlugins, + recommendedBeforeDefaultRemarkPlugins, + recommendedRehypePlugins, + recommendedRemarkPlugins, } from './src/siteConfig/markdownPluginConfigs'; -import { remarkPdfPluginConfig } from '@tdev/remark-pdf'; -import { GlobExcludeDefault } from '@docusaurus/utils'; -import type { TdevCustomFields } from '@tdev/siteConfig/TdevCustomFields'; -import { resolveEditUrl } from '@tdev/material-sync/src/helpers/resolveEditUrl'; +import { + accountSwitcher, + blog, + devModeAccessLocalFS, + docs, + gitHub, + loginProfileButton, + personalSpaceOverlay, + requestTarget, + taskStateOverview +} from './src/siteConfig/navbarItems'; +import { + aliasConfigurationPlugin, + dynamicRouterPluginConfig, + rsDoctorPluginConfig, + sassPluginConfig, + sentryPluginConfig, + socketIoNoDepWarningsPluginConfig, + stackblitzRspackTargetPluginConfig +} from './src/siteConfig/pluginConfigs'; +import { applyTransformers } from './src/siteConfig/transformers'; +import { withSiteConfig } from './src/siteConfig/withSiteConfig'; const BUILD_LOCATION = __dirname; const GIT_COMMIT_SHA = process.env.GITHUB_SHA || Math.random().toString(36).substring(7); diff --git a/packages/hfr/github-cms/components/FileUpload/index.tsx b/packages/hfr/github-cms/components/FileUpload/index.tsx index defc0f9bd..93246dc23 100644 --- a/packages/hfr/github-cms/components/FileUpload/index.tsx +++ b/packages/hfr/github-cms/components/FileUpload/index.tsx @@ -1,17 +1,17 @@ -import React, { useId, useState } from 'react'; -import styles from './styles.module.scss'; -import Icon from '@mdi/react'; import { mdiCloudArrowUpOutline } from '@mdi/js'; -import clsx from 'clsx'; -import ImagePreview from '../Github/iFile/File/FilePreview/ImagePreview'; +import Icon from '@mdi/react'; import Button from '@tdev-components/shared/Button'; +import Checkbox from '@tdev-components/shared/Checkbox'; +import TextInput from '@tdev-components/shared/TextInput'; +import { resolvePath } from '@tdev-models/helpers/resolvePath'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React, { useId, useState } from 'react'; import { useCmsStore } from '../../hooks/useCmsStore'; -import { resolvePath } from '@tdev-models/helpers/resolvePath'; -import { default as CmsFile } from '../../models/File'; -import TextInput from '@tdev-components/shared/TextInput'; -import Checkbox from '@tdev-components/shared/Checkbox'; import BinFile from '../../models/BinFile'; +import { default as CmsFile } from '../../models/File'; +import ImagePreview from '../Github/iFile/File/FilePreview/ImagePreview'; +import styles from './styles.module.scss'; const toMb = (bytes: number): number => { return Math.round((100 * bytes) / 1024 / 1024) / 100; diff --git a/packages/hfr/github-cms/components/Github/AccountOptions/UserAvatar/index.tsx b/packages/hfr/github-cms/components/Github/AccountOptions/UserAvatar/index.tsx index 9b288f6eb..878e64e91 100644 --- a/packages/hfr/github-cms/components/Github/AccountOptions/UserAvatar/index.tsx +++ b/packages/hfr/github-cms/components/Github/AccountOptions/UserAvatar/index.tsx @@ -1,15 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Avatar from '@tdev-components/shared/Avatar'; -import Icon from '@mdi/react'; -import { SIZE_S, SIZE_XS } from '@tdev-components/shared/iconSizes'; import { mdiAccountCircle, mdiAlertDecagram, mdiCheckDecagram } from '@mdi/js'; +import Icon from '@mdi/react'; +import Avatar from '@tdev-components/shared/Avatar'; import Button from '@tdev-components/shared/Button'; -import AccountOptions from '..'; +import { SIZE_S, SIZE_XS } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import Popup from 'reactjs-popup'; +import AccountOptions from '..'; import { useCmsStore } from '../../../../hooks/useCmsStore'; +import styles from './styles.module.scss'; interface Props { showOptions?: boolean; diff --git a/packages/hfr/github-cms/components/Github/AccountOptions/index.tsx b/packages/hfr/github-cms/components/Github/AccountOptions/index.tsx index 7212b1bc3..b68a9af4d 100644 --- a/packages/hfr/github-cms/components/Github/AccountOptions/index.tsx +++ b/packages/hfr/github-cms/components/Github/AccountOptions/index.tsx @@ -1,15 +1,15 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../hooks/useCmsStore'; +import { useHistory } from '@docusaurus/router'; import { mdiLoading, mdiLogoutVariant, mdiReload } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; -import NavItem from '../../MdxEditor/EditorNav/BranchPathNav/NavItem'; -import { useHistory } from '@docusaurus/router'; -import _ from 'es-toolkit/compat'; import Card from '@tdev-components/shared/Card'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { useCmsStore } from '../../../hooks/useCmsStore'; +import NavItem from '../../MdxEditor/EditorNav/BranchPathNav/NavItem'; +import styles from './styles.module.scss'; import UserAvatar from './UserAvatar'; interface Props {} diff --git a/packages/hfr/github-cms/components/Github/Branch/ExpandableOverwiew/index.tsx b/packages/hfr/github-cms/components/Github/Branch/ExpandableOverwiew/index.tsx index b4257d789..adee9fc8a 100644 --- a/packages/hfr/github-cms/components/Github/Branch/ExpandableOverwiew/index.tsx +++ b/packages/hfr/github-cms/components/Github/Branch/ExpandableOverwiew/index.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../../hooks/useCmsStore'; -import { default as BranchModel } from '../../../../models/Branch'; import { mdiDotsHorizontalCircleOutline, mdiDotsVerticalCircleOutline } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import Branch from '..'; +import { useCmsStore } from '../../../../hooks/useCmsStore'; +import { default as BranchModel } from '../../../../models/Branch'; +import styles from './styles.module.scss'; interface Props { branch: BranchModel; diff --git a/packages/hfr/github-cms/components/Github/Branch/NewBranch/index.tsx b/packages/hfr/github-cms/components/Github/Branch/NewBranch/index.tsx index 494690c56..d30cbe310 100644 --- a/packages/hfr/github-cms/components/Github/Branch/NewBranch/index.tsx +++ b/packages/hfr/github-cms/components/Github/Branch/NewBranch/index.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import clsx from 'clsx'; -import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../../hooks/useCmsStore'; -import Card from '@tdev-components/shared/Card'; import { mdiClose, mdiFlashTriangle, mdiPlusCircleMultipleOutline, mdiSourceBranchPlus } from '@mdi/js'; import Icon from '@mdi/react'; -import Button from '@tdev-components/shared/Button'; import Alert from '@tdev-components/shared/Alert'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; import TextInput from '@tdev-components/shared/TextInput'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { useCmsStore } from '../../../../hooks/useCmsStore'; import File from '../../../../models/File'; interface Props { diff --git a/packages/hfr/github-cms/components/Github/Branch/Selector.tsx b/packages/hfr/github-cms/components/Github/Branch/Selector.tsx index 69292319e..4ac484f5d 100644 --- a/packages/hfr/github-cms/components/Github/Branch/Selector.tsx +++ b/packages/hfr/github-cms/components/Github/Branch/Selector.tsx @@ -1,11 +1,9 @@ -import React from 'react'; +import Loader from '@tdev-components/Loader'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import _ from 'es-toolkit/compat'; import CreatableSelect from 'react-select/creatable'; import { useCmsStore } from '../../../hooks/useCmsStore'; -import Loader from '@tdev-components/Loader'; +import styles from './styles.module.scss'; interface Props { onSelect: (name: string) => void; diff --git a/packages/hfr/github-cms/components/Github/Branch/index.tsx b/packages/hfr/github-cms/components/Github/Branch/index.tsx index 199c34df3..b0f5203a3 100644 --- a/packages/hfr/github-cms/components/Github/Branch/index.tsx +++ b/packages/hfr/github-cms/components/Github/Branch/index.tsx @@ -1,19 +1,20 @@ -import React from 'react'; +import { mdiGit, mdiPlusCircleMultipleOutline, mdiSourceBranch, mdiSourceCommit, mdiSync } from '@mdi/js'; +import Icon from '@mdi/react'; +import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; +import { Delete } from '@tdev-components/shared/Button/Delete'; +import { SIZE_S, SIZE_XS } from '@tdev-components/shared/iconSizes'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Popup from 'reactjs-popup'; +import { PopupActions } from 'reactjs-popup/dist/types'; import { useCmsStore } from '../../../hooks/useCmsStore'; -import { Delete } from '@tdev-components/shared/Button/Delete'; -import Badge from '@tdev-components/shared/Badge'; -import Icon from '@mdi/react'; -import { mdiGit, mdiPlusCircleMultipleOutline, mdiSourceBranch, mdiSourceCommit, mdiSync } from '@mdi/js'; import { default as BranchModel } from '../../../models/Branch'; -import Button from '@tdev-components/shared/Button'; -import Popup from 'reactjs-popup'; import NewPR from '../PR/NewPR'; -import { PopupActions } from 'reactjs-popup/dist/types'; -import { SIZE_S, SIZE_XS } from '@tdev-components/shared/iconSizes'; +import styles from './styles.module.scss'; type BranchElements = 'name' | 'spacer' | 'delete' | 'commits' | 'reload' | 'defaultBranch' | 'createPr'; + interface Props { branch: BranchModel; className?: string; diff --git a/packages/hfr/github-cms/components/Github/DefaultEditor/index.tsx b/packages/hfr/github-cms/components/Github/DefaultEditor/index.tsx index 52c197140..308809631 100644 --- a/packages/hfr/github-cms/components/Github/DefaultEditor/index.tsx +++ b/packages/hfr/github-cms/components/Github/DefaultEditor/index.tsx @@ -1,14 +1,13 @@ -import React from 'react'; +import { mdiLanguageMarkdown } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import CodeEditor from '@tdev-components/shared/CodeEditor'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { action } from 'mobx'; import { observer } from 'mobx-react-lite'; -import CodeEditor from '@tdev-components/shared/CodeEditor'; -import Actions from '../../MdxEditor/toolbar/Actions'; import File from '../../../models/File'; -import { action } from 'mobx'; -import { mdiLanguageMarkdown } from '@mdi/js'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; -import Button from '@tdev-components/shared/Button'; +import Actions from '../../MdxEditor/toolbar/Actions'; +import styles from './styles.module.scss'; interface Props { file: File; diff --git a/packages/hfr/github-cms/components/Github/PR/ExpandableOverwiew/index.tsx b/packages/hfr/github-cms/components/Github/PR/ExpandableOverwiew/index.tsx index 9b47cfcc2..58ef92548 100644 --- a/packages/hfr/github-cms/components/Github/PR/ExpandableOverwiew/index.tsx +++ b/packages/hfr/github-cms/components/Github/PR/ExpandableOverwiew/index.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../../hooks/useCmsStore'; -import { default as PrModel } from '../../../../models/PR'; import { mdiDotsHorizontalCircleOutline, mdiDotsVerticalCircleOutline } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import PR from '..'; +import { useCmsStore } from '../../../../hooks/useCmsStore'; +import { default as PrModel } from '../../../../models/PR'; +import styles from './styles.module.scss'; interface Props { pr: PrModel; diff --git a/packages/hfr/github-cms/components/Github/PR/NewPR/index.tsx b/packages/hfr/github-cms/components/Github/PR/NewPR/index.tsx index fb766ccc6..66455eedc 100644 --- a/packages/hfr/github-cms/components/Github/PR/NewPR/index.tsx +++ b/packages/hfr/github-cms/components/Github/PR/NewPR/index.tsx @@ -1,20 +1,20 @@ -import React from 'react'; +import { mdiClose, mdiFlashTriangle, mdiRecordCircleOutline, mdiSourceBranch } from '@mdi/js'; +import Icon from '@mdi/react'; +import Alert from '@tdev-components/shared/Alert'; +import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; +import Checkbox from '@tdev-components/shared/Checkbox'; +import TextAreaInput from '@tdev-components/shared/TextAreaInput'; +import TextInput from '@tdev-components/shared/TextInput'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import { useCmsStore } from '../../../../hooks/useCmsStore'; import Branch from '../../../../models/Branch'; -import Card from '@tdev-components/shared/Card'; -import Badge from '@tdev-components/shared/Badge'; -import Icon from '@mdi/react'; -import { mdiClose, mdiFlashTriangle, mdiRecordCircleOutline, mdiSourceBranch } from '@mdi/js'; -import TextInput from '@tdev-components/shared/TextInput'; -import TextAreaInput from '@tdev-components/shared/TextAreaInput'; -import Button from '@tdev-components/shared/Button'; -import PR from '../../../../models/PR'; -import Alert from '@tdev-components/shared/Alert'; -import Checkbox from '@tdev-components/shared/Checkbox'; import { withoutPreviewPRName, withPreviewPRName } from '../../../../models/helpers'; +import PR from '../../../../models/PR'; +import styles from './styles.module.scss'; interface Props { branch: Branch; diff --git a/packages/hfr/github-cms/components/Github/PR/index.tsx b/packages/hfr/github-cms/components/Github/PR/index.tsx index afa6f65fe..102683c7d 100644 --- a/packages/hfr/github-cms/components/Github/PR/index.tsx +++ b/packages/hfr/github-cms/components/Github/PR/index.tsx @@ -1,12 +1,4 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../hooks/useCmsStore'; -import { default as PrModel } from '../../../models/PR'; -import Badge from '@tdev-components/shared/Badge'; -import Icon from '@mdi/react'; -import { Confirm } from '@tdev-components/shared/Button/Confirm'; +import Link from '@docusaurus/Link'; import { mdiCloseCircle, mdiEye, @@ -18,10 +10,18 @@ import { mdiSourceMerge, mdiSync } from '@mdi/js'; +import Icon from '@mdi/react'; +import Badge from '@tdev-components/shared/Badge'; import Button from '@tdev-components/shared/Button'; -import { ApiState } from '@tdev-stores/iStore'; -import Link from '@docusaurus/Link'; +import { Confirm } from '@tdev-components/shared/Button/Confirm'; import { SIZE_S, SIZE_XS } from '@tdev-components/shared/iconSizes'; +import { ApiState } from '@tdev-stores/iStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { useCmsStore } from '../../../hooks/useCmsStore'; +import { default as PrModel } from '../../../models/PR'; +import styles from './styles.module.scss'; type PRElements = | 'prName' diff --git a/packages/hfr/github-cms/components/Github/iFile/Dir/index.tsx b/packages/hfr/github-cms/components/Github/iFile/Dir/index.tsx index 9e9bbe74b..b4637cdcf 100644 --- a/packages/hfr/github-cms/components/Github/iFile/Dir/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/Dir/index.tsx @@ -1,14 +1,14 @@ -import React from 'react'; +import Icon from '@mdi/react'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import { default as DirModel } from '../../../../models/Dir'; +import iFile from '../../../../models/iFile'; import File from '../File'; -import shared from '../styles.module.scss'; -import styles from './styles.module.scss'; -import Icon from '@mdi/react'; import AddFilePopup from '../File/AddOrUpdateFile/AddFilePopup'; -import iFile from '../../../../models/iFile'; import PreviewPopup from '../File/FilePreview/PreviewPopup'; +import shared from '../styles.module.scss'; +import styles from './styles.module.scss'; interface Props { dir: DirModel; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/AddFilePopup.tsx b/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/AddFilePopup.tsx index 78a18deb7..05ba990e9 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/AddFilePopup.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/AddFilePopup.tsx @@ -1,17 +1,17 @@ -import React from 'react'; +import { mdiFilePlus } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import { resolvePath } from '@tdev-models/helpers/resolvePath'; +import { ApiState } from '@tdev-stores/iStore'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../../../hooks/useCmsStore'; +import React from 'react'; import Popup from 'reactjs-popup'; -import AddOrUpdateFile from '.'; -import Button from '@tdev-components/shared/Button'; -import { mdiFilePlus } from '@mdi/js'; import { PopupActions } from 'reactjs-popup/dist/types'; -import { ApiState } from '@tdev-stores/iStore'; -import Dir from '../../../../../models/Dir'; -import { resolvePath } from '@tdev-models/helpers/resolvePath'; import { v4 as uuidv4 } from 'uuid'; +import AddOrUpdateFile from '.'; +import { useCmsStore } from '../../../../../hooks/useCmsStore'; +import Dir from '../../../../../models/Dir'; +import styles from './styles.module.scss'; interface Props { dir: Dir; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/RenameFilePopup.tsx b/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/RenameFilePopup.tsx index 6dcc39746..af8387c08 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/RenameFilePopup.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/RenameFilePopup.tsx @@ -1,17 +1,17 @@ -import React from 'react'; +import { mdiFileEdit } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import { resolvePath } from '@tdev-models/helpers/resolvePath'; +import { ApiState } from '@tdev-stores/iStore'; +import { action } from 'mobx'; import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../../../hooks/useCmsStore'; +import React from 'react'; import Popup from 'reactjs-popup'; -import AddOrUpdateFile from '.'; -import Button from '@tdev-components/shared/Button'; -import { mdiFileEdit } from '@mdi/js'; import { PopupActions } from 'reactjs-popup/dist/types'; -import { ApiState } from '@tdev-stores/iStore'; -import FileStub from '../../../../../models/FileStub'; -import File from '../../../../../models/File'; -import { resolvePath } from '@tdev-models/helpers/resolvePath'; +import AddOrUpdateFile from '.'; +import { useCmsStore } from '../../../../../hooks/useCmsStore'; import BinFile from '../../../../../models/BinFile'; -import { action } from 'mobx'; +import File from '../../../../../models/File'; +import FileStub from '../../../../../models/FileStub'; interface Props { file: File | BinFile | FileStub; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/index.tsx b/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/index.tsx index 84c9342d1..e66921f27 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/AddOrUpdateFile/index.tsx @@ -1,19 +1,19 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; -import TextInput from '@tdev-components/shared/TextInput'; -import Button from '@tdev-components/shared/Button'; import { mdiClose, mdiFileEdit, mdiFileMove, mdiFilePlus, mdiLoading } from '@mdi/js'; -import { ApiState } from '@tdev-stores/iStore'; import Alert from '@tdev-components/shared/Alert'; -import FileStub from '../../../../../models/FileStub'; -import File from '../../../../../models/File'; -import { resolvePath } from '@tdev-models/helpers/resolvePath'; +import Button from '@tdev-components/shared/Button'; import { Confirm } from '@tdev-components/shared/Button/Confirm'; -import BinFile from '../../../../../models/BinFile'; +import Card from '@tdev-components/shared/Card'; +import TextInput from '@tdev-components/shared/TextInput'; +import { resolvePath } from '@tdev-models/helpers/resolvePath'; +import { ApiState } from '@tdev-stores/iStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import { useCmsStore } from '../../../../../hooks/useCmsStore'; +import BinFile from '../../../../../models/BinFile'; +import File from '../../../../../models/File'; +import FileStub from '../../../../../models/FileStub'; +import styles from './styles.module.scss'; export type Response = { state: ApiState; message?: string }; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/AudioPreview/index.tsx b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/AudioPreview/index.tsx index 73c25ef9d..1e8bea475 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/AudioPreview/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/AudioPreview/index.tsx @@ -1,8 +1,8 @@ -import React from 'react'; +import Card from '@tdev-components/shared/Card'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; -import Card from '@tdev-components/shared/Card'; interface Props { src: string; fileName?: string; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/ImagePreview/index.tsx b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/ImagePreview/index.tsx index bda5215e3..dcfcdce6e 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/ImagePreview/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/ImagePreview/index.tsx @@ -1,9 +1,9 @@ -import React from 'react'; +import Card from '@tdev-components/shared/Card'; import clsx from 'clsx'; +import type { Property } from 'csstype'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; -import Card from '@tdev-components/shared/Card'; -import type { Property } from 'csstype'; interface Props { src: string; fileName?: string; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/PreviewPopup/index.tsx b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/PreviewPopup/index.tsx index d850e5d22..e3a7cf46f 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/PreviewPopup/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/PreviewPopup/index.tsx @@ -1,8 +1,8 @@ -import React from 'react'; import { observer } from 'mobx-react-lite'; -import type { FileType } from '../../../../../../models/FileStub'; +import React from 'react'; import Popup from 'reactjs-popup'; import FilePreview from '..'; +import type { FileType } from '../../../../../../models/FileStub'; interface Props { file: FileType; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/TextPreview/index.tsx b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/TextPreview/index.tsx index d58044a8b..4064dd5f2 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/TextPreview/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/TextPreview/index.tsx @@ -1,9 +1,8 @@ -import React from 'react'; +import CodeBlock from '@theme/CodeBlock'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; import File from '../../../../../../models/File'; -import CodeBlock from '@theme/CodeBlock'; +import styles from './styles.module.scss'; interface Props { file: File; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/VideoPreview/index.tsx b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/VideoPreview/index.tsx index f3151f40b..288fd53ab 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/VideoPreview/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/VideoPreview/index.tsx @@ -1,8 +1,8 @@ -import React from 'react'; +import Card from '@tdev-components/shared/Card'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; -import Card from '@tdev-components/shared/Card'; interface Props { src: string; fileName?: string; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/index.tsx b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/index.tsx index b11cf5039..59cc66d40 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/FilePreview/index.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import styles from './styles.module.scss'; +import Loader from '@tdev-components/Loader'; +import Card from '@tdev-components/shared/Card'; import { observer } from 'mobx-react-lite'; -import FileStub from '../../../../../models/FileStub'; import BinFile from '../../../../../models/BinFile'; import File from '../../../../../models/File'; -import Card from '@tdev-components/shared/Card'; +import FileStub from '../../../../../models/FileStub'; import { useLoadedFile } from '../../../../MdxEditor/hooks/useLoadedFile'; -import Loader from '@tdev-components/Loader'; import ImagePreview from './ImagePreview'; +import styles from './styles.module.scss'; import TextPreview from './TextPreview'; import VideoPreview from './VideoPreview'; diff --git a/packages/hfr/github-cms/components/Github/iFile/File/index.tsx b/packages/hfr/github-cms/components/Github/iFile/File/index.tsx index 339707487..b6b6b4c69 100644 --- a/packages/hfr/github-cms/components/Github/iFile/File/index.tsx +++ b/packages/hfr/github-cms/components/Github/iFile/File/index.tsx @@ -1,19 +1,18 @@ -import React from 'react'; +import Link from '@docusaurus/Link'; +import { mdiContentSave, mdiEye, mdiLoading, mdiRestore, mdiStar } from '@mdi/js'; +import Icon from '@mdi/react'; +import Button from '@tdev-components/shared/Button'; +import { Delete } from '@tdev-components/shared/Button/Delete'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import { useCmsStore } from '../../../../hooks/useCmsStore'; +import BinFile from '../../../../models/BinFile'; import { default as FileModel } from '../../../../models/File'; import FileStub from '../../../../models/FileStub'; import shared from '../styles.module.scss'; -import styles from './styles.module.scss'; -import Icon from '@mdi/react'; -import Button from '@tdev-components/shared/Button'; -import { mdiContentSave, mdiEye, mdiLoading, mdiRestore, mdiStar } from '@mdi/js'; -import { useCmsStore } from '../../../../hooks/useCmsStore'; -import Link from '@docusaurus/Link'; -import { Delete } from '@tdev-components/shared/Button/Delete'; import RenameFilePopup from './AddOrUpdateFile/RenameFilePopup'; -import BinFile from '../../../../models/BinFile'; import PreviewPopup from './FilePreview/PreviewPopup'; +import styles from './styles.module.scss'; interface Props { file: FileModel | BinFile | FileStub; showActions?: 'always' | 'hover' | 'never'; diff --git a/packages/hfr/github-cms/components/MdxEditor/AssetSelector/index.tsx b/packages/hfr/github-cms/components/MdxEditor/AssetSelector/index.tsx index 93a13147d..f6fd7360e 100644 --- a/packages/hfr/github-cms/components/MdxEditor/AssetSelector/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/AssetSelector/index.tsx @@ -1,12 +1,12 @@ -import React from 'react'; +import { mdiFolderArrowUpOutline } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Dir from '../../../components/Github/iFile/Dir'; import { useCmsStore } from '../../../hooks/useCmsStore'; import iFile from '../../../models/iFile'; -import Dir from '../../../components/Github/iFile/Dir'; -import Button from '@tdev-components/shared/Button'; -import { mdiFolderArrowUpOutline } from '@mdi/js'; +import styles from './styles.module.scss'; interface Props { onSelect: (entry: T) => void; diff --git a/packages/hfr/github-cms/components/MdxEditor/CmsMdxEditor.tsx b/packages/hfr/github-cms/components/MdxEditor/CmsMdxEditor.tsx index 7b82cb673..9e93e5d3d 100644 --- a/packages/hfr/github-cms/components/MdxEditor/CmsMdxEditor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/CmsMdxEditor.tsx @@ -1,5 +1,5 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; +import ErrorBoundary from '@docusaurus/ErrorBoundary'; +import { mdiCodeJson } from '@mdi/js'; import { BlockTypeSelect, BoldItalicUnderlineToggles, @@ -33,47 +33,45 @@ import { ViewMode, viewMode$ } from '@mdxeditor/editor'; -import _ from 'es-toolkit/compat'; import '@mdxeditor/editor/style.css'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import useLocalStorage from '@tdev-hooks/useLocalStorage'; +import { extractOptions } from '@tdev-plugins/helpers'; +import clsx from 'clsx'; +import * as Mdast from 'mdast'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import DefaultEditor from '../../components/Github/DefaultEditor'; +import { useCmsStore } from '../../hooks/useCmsStore'; +import { Asset } from '../../models/Dir'; import { default as FileModel } from '../../models/File'; -import { AdmonitionDirectiveDescriptor } from './plugins/AdmonitionDescriptor'; +import { CodeDefBoxDirectiveDescriptor } from '../../plugins/defbox'; import { DetailsDirectiveDescriptor } from '../../plugins/details'; -import '@mdxeditor/editor/style.css'; -import { InsertAdmonition } from './plugins/AdmonitionDescriptor/InsertAdmonition'; -import { InsertJsxElements } from './plugins/plugins-jsx/InsertJsxOptions'; -import { MdiDescriptor } from '../../plugins/mdi'; import { CardsDirectiveDescriptor, FlexDirectiveDescriptor } from '../../plugins/flex-cards'; -import mdiCompletePlugin from '../../plugins/mdi/MdiComplete'; import { ImageFigure, imagePlugin } from '../../plugins/images'; -import ErrorBoundary from '@docusaurus/ErrorBoundary'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; -import Actions from './toolbar/Actions'; -import * as Mdast from 'mdast'; import { InsertImage } from '../../plugins/images/InsertImage'; -import { Box, strongPlugin } from '../../plugins/strong'; -import { ToolbarInsertBoxed } from '../../plugins/strong/ToolbarInsertBoxed'; -import { useCmsStore } from '../../hooks/useCmsStore'; -import { codeMirrorPlugin } from './plugins/Codemirror'; -import DefaultEditor from '../../components/Github/DefaultEditor'; import { Kbd, kbdPlugin } from '../../plugins/kbd'; import { ToolbarInsertKbd } from '../../plugins/kbd/ToolbarInsertKbd'; -import { CodeDefBoxDirectiveDescriptor } from '../../plugins/defbox'; -import { footnotePlugin } from './plugins/footnote'; -import Button from '@tdev-components/shared/Button'; -import { mathPlugin } from './plugins/mathPlugin'; +import { MdiDescriptor } from '../../plugins/mdi'; +import mdiCompletePlugin from '../../plugins/mdi/MdiComplete'; import MediaDescriptors from '../../plugins/media'; import { PdfDescriptor } from '../../plugins/pdf/PdfDescriptor'; -import { Asset } from '../../models/Dir'; -import { draggableBlockPlugin } from './plugins/DraggableBlockPlugin'; -import JsxDescriptors from './plugins/plugins-jsx/JsxDescriptors'; -import { extractOptions } from '@tdev-plugins/helpers'; +import { Box, strongPlugin } from '../../plugins/strong'; +import { ToolbarInsertBoxed } from '../../plugins/strong/ToolbarInsertBoxed'; +import { AdmonitionDirectiveDescriptor } from './plugins/AdmonitionDescriptor'; +import { InsertAdmonition } from './plugins/AdmonitionDescriptor/InsertAdmonition'; import { GenericDirectiveDescriptor } from './plugins/CatchAllUnknown/GenericDirectiveDescriptor'; -import { keepImportsPlugin } from './plugins/keepImportsPlugin'; -import useLocalStorage from '@tdev-hooks/useLocalStorage'; -import { mdiCodeJson } from '@mdi/js'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import { codeMirrorPlugin } from './plugins/Codemirror'; +import { draggableBlockPlugin } from './plugins/DraggableBlockPlugin'; import { registerKeydownHandler } from './plugins/focusHandler/keyDownHandler'; +import { footnotePlugin } from './plugins/footnote'; +import { keepImportsPlugin } from './plugins/keepImportsPlugin'; +import { mathPlugin } from './plugins/mathPlugin'; +import { InsertJsxElements } from './plugins/plugins-jsx/InsertJsxOptions'; +import JsxDescriptors from './plugins/plugins-jsx/JsxDescriptors'; +import styles from './styles.module.scss'; +import Actions from './toolbar/Actions'; export interface Props { file: FileModel; diff --git a/packages/hfr/github-cms/components/MdxEditor/Directory/index.tsx b/packages/hfr/github-cms/components/MdxEditor/Directory/index.tsx index db5990cc6..3885d5038 100644 --- a/packages/hfr/github-cms/components/MdxEditor/Directory/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/Directory/index.tsx @@ -1,11 +1,11 @@ -import React from 'react'; +import Card from '@tdev-components/shared/Card'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import { default as DirModel } from '../../../models/Dir'; -import Card from '@tdev-components/shared/Card'; -import Dir from '../../Github/iFile/Dir'; import UserAvatar from '../../Github/AccountOptions/UserAvatar'; +import Dir from '../../Github/iFile/Dir'; +import styles from './styles.module.scss'; interface Props { dir?: DirModel; diff --git a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/BranchSelector/index.tsx b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/BranchSelector/index.tsx index 0cfd5a822..9474939c3 100644 --- a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/BranchSelector/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/BranchSelector/index.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../../../hooks/useCmsStore'; -import Loader from '@tdev-components/Loader'; import { mdiSourceBranch, mdiSourceBranchPlus } from '@mdi/js'; +import Loader from '@tdev-components/Loader'; +import Card from '@tdev-components/shared/Card'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import Popup from 'reactjs-popup'; -import NewBranch from '../../../../Github/Branch/NewBranch'; import { PopupActions } from 'reactjs-popup/dist/types'; -import Card from '@tdev-components/shared/Card'; +import { useCmsStore } from '../../../../../hooks/useCmsStore'; +import NewBranch from '../../../../Github/Branch/NewBranch'; import NavItem from '../NavItem'; +import styles from './styles.module.scss'; interface Props { compact?: boolean; diff --git a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/DirNav/index.tsx b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/DirNav/index.tsx index 5aa87f07b..eff733a17 100644 --- a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/DirNav/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/DirNav/index.tsx @@ -1,16 +1,16 @@ -import React from 'react'; +import Loader from '@tdev-components/Loader'; +import Card from '@tdev-components/shared/Card'; import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { action } from 'mobx'; import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../../../hooks/useCmsStore'; -import Dir from '../../../../../models/Dir'; +import React from 'react'; import Popup from 'reactjs-popup'; import { PopupActions } from 'reactjs-popup/dist/types'; -import Card from '@tdev-components/shared/Card'; -import Loader from '@tdev-components/Loader'; -import NavItem from '../../../../MdxEditor/EditorNav/BranchPathNav/NavItem'; -import { action } from 'mobx'; +import { useCmsStore } from '../../../../../hooks/useCmsStore'; +import Dir from '../../../../../models/Dir'; import FileNav from '../../../../MdxEditor/EditorNav/BranchPathNav/FileNav'; +import NavItem from '../../../../MdxEditor/EditorNav/BranchPathNav/NavItem'; +import styles from './styles.module.scss'; interface Props { dir: Dir; diff --git a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/FileNav/index.tsx b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/FileNav/index.tsx index 46f5540aa..f6381c854 100644 --- a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/FileNav/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/FileNav/index.tsx @@ -1,9 +1,8 @@ -import React from 'react'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; import { useCmsStore } from '../../../../../hooks/useCmsStore'; -import File from '../../../../../models/File'; import BinFile from '../../../../../models/BinFile'; +import File from '../../../../../models/File'; import FileStub from '../../../../../models/FileStub'; import NavItem from '../../../../MdxEditor/EditorNav/BranchPathNav/NavItem'; diff --git a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/NavItem/index.tsx b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/NavItem/index.tsx index 74062f01b..713e5c151 100644 --- a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/NavItem/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/NavItem/index.tsx @@ -1,8 +1,8 @@ -import React from 'react'; +import Icon from '@mdi/react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import Icon from '@mdi/react'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { icon?: string; diff --git a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/index.tsx b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/index.tsx index 5ba79c4c7..fa6311a8f 100644 --- a/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/EditorNav/BranchPathNav/index.tsx @@ -1,12 +1,11 @@ -import React from 'react'; +import useIsMobileView from '@tdev-hooks/useIsMobileView'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import FileNav from '../../../../components/MdxEditor/EditorNav/BranchPathNav/FileNav'; import iEntry from '../../../../models/iEntry'; import BranchSelector from './BranchSelector'; -import FileNav from '../../../../components/MdxEditor/EditorNav/BranchPathNav/FileNav'; import DirNav from './DirNav'; -import useIsMobileView from '@tdev-hooks/useIsMobileView'; +import styles from './styles.module.scss'; interface Props { item: iEntry; diff --git a/packages/hfr/github-cms/components/MdxEditor/EditorNav/index.tsx b/packages/hfr/github-cms/components/MdxEditor/EditorNav/index.tsx index f71b48166..c4b849cd3 100644 --- a/packages/hfr/github-cms/components/MdxEditor/EditorNav/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/EditorNav/index.tsx @@ -1,16 +1,16 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useCmsStore } from '../../../hooks/useCmsStore'; -import Button from '@tdev-components/shared/Button'; import { mdiFileTree, mdiFileTreeOutline } from '@mdi/js'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; -import BranchPathNav from './BranchPathNav'; import Loader from '@tdev-components/Loader'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; import useIsMobileView from '@tdev-hooks/useIsMobileView'; -import { default as PrOverview } from '../../Github/PR/ExpandableOverwiew'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { useCmsStore } from '../../../hooks/useCmsStore'; import { default as BranchOverview } from '../../Github/Branch/ExpandableOverwiew'; +import { default as PrOverview } from '../../Github/PR/ExpandableOverwiew'; +import BranchPathNav from './BranchPathNav'; +import styles from './styles.module.scss'; interface Props {} diff --git a/packages/hfr/github-cms/components/MdxEditor/GenericAttributeEditor/MyAttributes/index.tsx b/packages/hfr/github-cms/components/MdxEditor/GenericAttributeEditor/MyAttributes/index.tsx index da8c85f78..016b7589b 100644 --- a/packages/hfr/github-cms/components/MdxEditor/GenericAttributeEditor/MyAttributes/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/GenericAttributeEditor/MyAttributes/index.tsx @@ -1,9 +1,9 @@ -import React from 'react'; +import Badge from '@tdev-components/shared/Badge'; +import CopyBadge from '@tdev-components/shared/CopyBadge'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import CopyBadge from '@tdev-components/shared/CopyBadge'; -import Badge from '@tdev-components/shared/Badge'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { className?: string; diff --git a/packages/hfr/github-cms/components/MdxEditor/GenericAttributeEditor/index.tsx b/packages/hfr/github-cms/components/MdxEditor/GenericAttributeEditor/index.tsx index bad438c63..08ba96516 100644 --- a/packages/hfr/github-cms/components/MdxEditor/GenericAttributeEditor/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/GenericAttributeEditor/index.tsx @@ -1,11 +1,10 @@ -import React from 'react'; -import _ from 'es-toolkit/compat'; -import PropertyEditor from '../PropertyEditor'; -import Popup from 'reactjs-popup'; import { mdiCog } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; -import { PopupActions } from 'reactjs-popup/dist/types'; import type { FormField } from '@tdev-models/Form/Field'; +import React from 'react'; +import Popup from 'reactjs-popup'; +import { PopupActions } from 'reactjs-popup/dist/types'; +import PropertyEditor from '../PropertyEditor'; export type GenericPropery = FormField; diff --git a/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/Editor/Input/index.tsx b/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/Editor/Input/index.tsx index cecca84d4..d5a411a2f 100644 --- a/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/Editor/Input/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/Editor/Input/index.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import CodeEditor from '@tdev-components/shared/CodeEditor'; import Checkbox from '@tdev-components/shared/Checkbox'; +import CodeEditor from '@tdev-components/shared/CodeEditor'; import TextInput from '@tdev-components/shared/TextInput'; import Field from '@tdev-models/Form/Field'; +import clsx from 'clsx'; import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; import Select from 'react-select'; +import styles from './styles.module.scss'; interface Props { field: Field; diff --git a/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/Editor/index.tsx b/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/Editor/index.tsx index 143fa655b..6ded41f3d 100644 --- a/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/Editor/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/Editor/index.tsx @@ -1,20 +1,19 @@ -import React from 'react'; -import _ from 'es-toolkit/compat'; -import Card from '@tdev-components/shared/Card'; -import styles from './styles.module.scss'; -import Button from '@tdev-components/shared/Button'; import { mdiCircleSmall, mdiClose, mdiContentSave, mdiIdentifier, mdiRestore, mdiSync } from '@mdi/js'; +import Icon from '@mdi/react'; +import Button from '@tdev-components/shared/Button'; import { Delete } from '@tdev-components/shared/Button/Delete'; -import clsx from 'clsx'; -import { GenericPropery } from '../../GenericAttributeEditor'; -import useIsMobileView from '@tdev-hooks/useIsMobileView'; +import Card from '@tdev-components/shared/Card'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; -import Icon from '@mdi/react'; import TextInput from '@tdev-components/shared/TextInput'; -import { v4 as uuidv4 } from 'uuid'; +import useIsMobileView from '@tdev-hooks/useIsMobileView'; import Form from '@tdev-models/Form'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { v4 as uuidv4 } from 'uuid'; +import { GenericPropery } from '../../GenericAttributeEditor'; import Input from './Input'; +import styles from './styles.module.scss'; /* @see https://github.com/mdx-editor/editor/blob/main/src/plugins/core/PropertyPopover.tsx */ diff --git a/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/index.tsx b/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/index.tsx index 29a091598..980304201 100644 --- a/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/PropertyEditor/index.tsx @@ -1,8 +1,7 @@ import React from 'react'; -import _ from 'es-toolkit/compat'; -import Editor from './Editor'; import type { GenericPropery, GenericValueProperty } from '../GenericAttributeEditor'; +import Editor from './Editor'; export interface Props { properties: GenericPropery[]; diff --git a/packages/hfr/github-cms/components/MdxEditor/RemoveNode.tsx b/packages/hfr/github-cms/components/MdxEditor/RemoveNode.tsx index 0347775c2..ad935371b 100644 --- a/packages/hfr/github-cms/components/MdxEditor/RemoveNode.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/RemoveNode.tsx @@ -1,9 +1,7 @@ -import React from 'react'; -import _ from 'es-toolkit/compat'; -import { useLexicalNodeRemove } from '@mdxeditor/editor'; import { mdiClose, mdiCloseBox } from '@mdi/js'; -import clsx from 'clsx'; +import { useLexicalNodeRemove } from '@mdxeditor/editor'; import { Confirm } from '@tdev-components/shared/Button/Confirm'; +import clsx from 'clsx'; export interface Props { className?: string; diff --git a/packages/hfr/github-cms/components/MdxEditor/hooks/useAssetFile.tsx b/packages/hfr/github-cms/components/MdxEditor/hooks/useAssetFile.tsx index 2b22c236d..f78e22822 100644 --- a/packages/hfr/github-cms/components/MdxEditor/hooks/useAssetFile.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/hooks/useAssetFile.tsx @@ -1,6 +1,6 @@ +import React from 'react'; import { useCmsStore } from '../../../hooks/useCmsStore'; import FileStub from '../../../models/FileStub'; -import React from 'react'; export const isRelPath = (path?: string) => { if (!path) { return false; diff --git a/packages/hfr/github-cms/components/MdxEditor/hooks/useAttributeEditorInNestedEditor.tsx b/packages/hfr/github-cms/components/MdxEditor/hooks/useAttributeEditorInNestedEditor.tsx index 2b448e644..51d0694a8 100644 --- a/packages/hfr/github-cms/components/MdxEditor/hooks/useAttributeEditorInNestedEditor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/hooks/useAttributeEditorInNestedEditor.tsx @@ -1,11 +1,10 @@ -import React from 'react'; -import _ from 'es-toolkit/compat'; +import { useMdastNodeUpdater } from '@mdxeditor/editor'; import { MdxJsxAttribute, MdxJsxAttributeValueExpression, MdxJsxExpressionAttribute } from 'mdast-util-mdx-jsx'; -import { useMdastNodeUpdater } from '@mdxeditor/editor'; +import React from 'react'; import type { GenericPropery, GenericValueProperty } from '../GenericAttributeEditor'; diff --git a/packages/hfr/github-cms/components/MdxEditor/hooks/useDirectiveAttributeEditor.tsx b/packages/hfr/github-cms/components/MdxEditor/hooks/useDirectiveAttributeEditor.tsx index 9d5001cfa..75248a866 100644 --- a/packages/hfr/github-cms/components/MdxEditor/hooks/useDirectiveAttributeEditor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/hooks/useDirectiveAttributeEditor.tsx @@ -1,10 +1,10 @@ -import React from 'react'; +import { useMdastNodeUpdater } from '@mdxeditor/editor'; import _ from 'es-toolkit/compat'; import { Directives } from 'mdast-util-directive'; -import { useMdastNodeUpdater } from '@mdxeditor/editor'; +import React from 'react'; -import type { GenericPropery, GenericValueProperty } from '../GenericAttributeEditor'; import { Options, transformAttributes } from '@tdev-plugins/helpers'; +import type { GenericPropery, GenericValueProperty } from '../GenericAttributeEditor'; export type DirectiveProperty = Omit & { type: React.HTMLInputTypeAttribute }; type DirectiveValueProperty = Omit & { type: React.HTMLInputTypeAttribute }; diff --git a/packages/hfr/github-cms/components/MdxEditor/hooks/useLoadedFile.tsx b/packages/hfr/github-cms/components/MdxEditor/hooks/useLoadedFile.tsx index 229ac2978..70cf2059e 100644 --- a/packages/hfr/github-cms/components/MdxEditor/hooks/useLoadedFile.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/hooks/useLoadedFile.tsx @@ -1,10 +1,10 @@ +import { ApiState } from '@tdev-stores/iStore'; +import React from 'react'; import { useCmsStore } from '../../../hooks/useCmsStore'; import BinFile from '../../../models/BinFile'; import Dir from '../../../models/Dir'; import File from '../../../models/File'; import FileStub from '../../../models/FileStub'; -import { ApiState } from '@tdev-stores/iStore'; -import React from 'react'; export const useLoadedFile = ( file: T | FileStub | undefined diff --git a/packages/hfr/github-cms/components/MdxEditor/index.tsx b/packages/hfr/github-cms/components/MdxEditor/index.tsx index 497d6458a..9fa8eb26c 100644 --- a/packages/hfr/github-cms/components/MdxEditor/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/index.tsx @@ -1,9 +1,7 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import _ from 'es-toolkit/compat'; -import File from '../../models/File'; import BrowserOnly from '@docusaurus/BrowserOnly'; import Loader from '@tdev-components/Loader'; +import { observer } from 'mobx-react-lite'; +import File from '../../models/File'; export interface Props { file: File; diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionBody.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionBody.tsx index 86eb1041e..84f495857 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionBody.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionBody.tsx @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import React from 'react'; import { NestedLexicalEditor } from '@mdxeditor/editor'; -import { ContainerDirective } from 'mdast-util-directive'; +import { LexicalEditor, LexicalNode } from 'lexical'; import { BlockContent } from 'mdast'; -import styles from './styles.module.scss'; +import { ContainerDirective } from 'mdast-util-directive'; import { observer } from 'mobx-react-lite'; -import { LexicalEditor, LexicalNode } from 'lexical'; +import React from 'react'; +import styles from './styles.module.scss'; import useSelectionHandler from './useSelectionHandler'; interface Props { diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionHeader.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionHeader.tsx index 8dad0f2d3..bc70462df 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionHeader.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionHeader.tsx @@ -1,18 +1,18 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import React from 'react'; -import { NestedLexicalEditor, useMdastNodeUpdater } from '@mdxeditor/editor'; -import { ContainerDirective } from 'mdast-util-directive'; -import { Paragraph, PhrasingContent } from 'mdast'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import { mdiChevronDown } from '@mdi/js'; +import { NestedLexicalEditor, useMdastNodeUpdater } from '@mdxeditor/editor'; import Button from '@tdev-components/shared/Button'; +import clsx from 'clsx'; +import { LexicalEditor, LexicalNode } from 'lexical'; +import { Paragraph, PhrasingContent } from 'mdast'; +import { ContainerDirective } from 'mdast-util-directive'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import Popup from 'reactjs-popup'; import RemoveNode from '../../RemoveNode'; -import { observer } from 'mobx-react-lite'; import AdmonitionTypeSelector from './AdmonitionTypeSelector'; -import { LexicalEditor, LexicalNode } from 'lexical'; +import styles from './styles.module.scss'; import useSelectionHandler from './useSelectionHandler'; interface Props { diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector/admonitionTypes.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector/admonitionTypes.ts index ab464f6f6..c4111abf3 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector/admonitionTypes.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector/admonitionTypes.ts @@ -1,6 +1,5 @@ -import siteConfig from '@generated/docusaurus.config'; -import _ from 'es-toolkit/compat'; import type * as Preset from '@docusaurus/preset-classic'; +import siteConfig from '@generated/docusaurus.config'; const { organizationName, projectName, presets } = siteConfig; if (!organizationName || !projectName) { diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector/index.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector/index.tsx index d8d15d6e9..74a704b7c 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector/index.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import Button from '@tdev-components/shared/Button'; +import clsx from 'clsx'; import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; import { ADMONITION_TYPES } from './admonitionTypes'; +import styles from './styles.module.scss'; interface Props { currentName: string; diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/InsertAdmonition.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/InsertAdmonition.tsx index fe8e042b3..7b0f1a60f 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/InsertAdmonition.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/InsertAdmonition.tsx @@ -1,3 +1,4 @@ +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; import { ButtonOrDropdownButton, iconComponentFor$, @@ -6,10 +7,9 @@ import { usePublisher, useTranslation } from '@mdxeditor/editor'; -import React from 'react'; import _ from 'es-toolkit/compat'; -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import { ADMONITION_TYPES } from './AdmonitionTypeSelector/admonitionTypes'; /** diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/index.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/index.tsx index d8a829c0f..fbf1d2230 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/index.tsx @@ -1,15 +1,14 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import React from 'react'; import { DirectiveDescriptor } from '@mdxeditor/editor'; -import { ContainerDirective } from 'mdast-util-directive'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import Admonition from '@theme/Admonition'; +import clsx from 'clsx'; +import { ContainerDirective } from 'mdast-util-directive'; import { observer } from 'mobx-react-lite'; -import { ADMONITION_TYPES } from './AdmonitionTypeSelector/admonitionTypes'; import AdmonitionBody from './AdmonitionBody'; import AdmonitionHeader from './AdmonitionHeader'; +import { ADMONITION_TYPES } from './AdmonitionTypeSelector/admonitionTypes'; +import styles from './styles.module.scss'; /** @internal */ export type AdmonitionKind = (typeof ADMONITION_TYPES)[number]; diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/useSelectionHandler.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/useSelectionHandler.tsx index c8cbce352..cb729ae0c 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/useSelectionHandler.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/AdmonitionDescriptor/useSelectionHandler.tsx @@ -1,4 +1,5 @@ -import React from 'react'; +import { $isDirectiveNode } from '@mdxeditor/editor'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; import { $getNodeByKey, $getSelection, @@ -9,13 +10,12 @@ import { KEY_DOWN_COMMAND, LexicalEditor } from 'lexical'; -import { $isDirectiveNode } from '@mdxeditor/editor'; -import { GO_DOWN_KEYS, GO_UP_KEYS, HandledKeys } from '../../helpers/lexical/selectAction'; +import React from 'react'; +import { selectEndOfDiv } from '../../helpers/lexical/select-end-of-div'; import { actionForNext, needsToFocusNext } from '../../helpers/lexical/select-next-helpers'; import { actionForPrevious, needsToFocusPrevious } from '../../helpers/lexical/select-previous-helpers'; -import { selectEndOfDiv } from '../../helpers/lexical/select-end-of-div'; +import { GO_DOWN_KEYS, GO_UP_KEYS, HandledKeys } from '../../helpers/lexical/selectAction'; import { $insertPlaceholderParagraph, $insertPlaceholderText } from '../focusHandler/keyDownHandler'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; const useSelectionHandler = ( editor: LexicalEditor, diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/CatchAllUnknown/GenericDirectiveDescriptor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/CatchAllUnknown/GenericDirectiveDescriptor.tsx index 7da71277e..f88aeb2c9 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/CatchAllUnknown/GenericDirectiveDescriptor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/CatchAllUnknown/GenericDirectiveDescriptor.tsx @@ -1,15 +1,15 @@ /* eslint-disable @typescript-eslint/no-unsafe-argument */ -import { PhrasingContent } from 'mdast'; -import React from 'react'; -import { Directives } from 'mdast-util-directive'; import { DirectiveDescriptor, DirectiveEditorProps, NestedLexicalEditor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; -import GenericAttributeEditor from '../../GenericAttributeEditor'; -import { useDirectiveAttributeEditor } from '../../hooks/useDirectiveAttributeEditor'; import Card from '@tdev-components/shared/Card'; import clsx from 'clsx'; +import { PhrasingContent } from 'mdast'; +import { Directives } from 'mdast-util-directive'; +import React from 'react'; +import GenericAttributeEditor from '../../GenericAttributeEditor'; import MyAttributes from '../../GenericAttributeEditor/MyAttributes'; +import { useDirectiveAttributeEditor } from '../../hooks/useDirectiveAttributeEditor'; import RemoveNode from '../../RemoveNode'; +import styles from './styles.module.scss'; /** * A generic editor that can be used as an universal UI for any directive. diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/CatchAllUnknown/GenericJsxDescriptor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/CatchAllUnknown/GenericJsxDescriptor.tsx index 21015d6a8..98db967d6 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/CatchAllUnknown/GenericJsxDescriptor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/CatchAllUnknown/GenericJsxDescriptor.tsx @@ -1,15 +1,15 @@ /* eslint-disable @typescript-eslint/no-unsafe-argument */ +import { JsxComponentDescriptor, NestedLexicalEditor } from '@mdxeditor/editor'; +import CodeBlock from '@theme/CodeBlock'; +import clsx from 'clsx'; import { PhrasingContent } from 'mdast'; import { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx-jsx'; import React from 'react'; -import styles from './styles.module.scss'; -import { JsxComponentDescriptor, NestedLexicalEditor } from '@mdxeditor/editor'; -import { useAttributeEditorInNestedEditor } from '../../hooks/useAttributeEditorInNestedEditor'; -import clsx from 'clsx'; import GenericAttributeEditor from '../../GenericAttributeEditor'; -import RemoveNode from '../../RemoveNode'; import MyAttributes from '../../GenericAttributeEditor/MyAttributes'; -import CodeBlock from '@theme/CodeBlock'; +import { useAttributeEditorInNestedEditor } from '../../hooks/useAttributeEditorInNestedEditor'; +import RemoveNode from '../../RemoveNode'; +import styles from './styles.module.scss'; /** * A generic editor that can be used as an universal UI for any JSX element. diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/CodeMirrorEditor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/CodeMirrorEditor.tsx index f7e21e457..800897185 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/CodeMirrorEditor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/CodeMirrorEditor.tsx @@ -5,28 +5,28 @@ import React from 'react'; import { languages } from '@codemirror/language-data'; import { EditorState, Extension } from '@codemirror/state'; import { EditorView, lineNumbers } from '@codemirror/view'; -import { basicLight } from 'cm6-theme-basic-light'; -import { basicSetup } from 'codemirror'; -import { codeBlockLanguages$, codeMirrorAutoLoadLanguageSupport$, codeMirrorExtensions$ } from '.'; import { CodeBlockEditorProps, readOnly$, useCodeBlockEditorContext } from '@mdxeditor/editor'; -import { useCodeMirrorRef } from './useCodeMirrorRef'; -import styles from './styles.module.scss'; +import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; import Card from '@tdev-components/shared/Card'; -import RemoveNode from '../../../MdxEditor/RemoveNode'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; +import { extractMetaProps, sanitizedTitle } from '@tdev/theme/CodeBlock'; import clsx from 'clsx'; +import { basicLight } from 'cm6-theme-basic-light'; +import { basicSetup } from 'codemirror'; +import { action } from 'mobx'; +import Popup from 'reactjs-popup'; +import { v4 } from 'uuid'; +import { codeBlockLanguages$, codeMirrorAutoLoadLanguageSupport$, codeMirrorExtensions$ } from '.'; import GenericAttributeEditor, { GenericPropery, GenericValueProperty } from '../../../MdxEditor/GenericAttributeEditor'; -import { extractMetaProps, sanitizedTitle } from '@tdev/theme/CodeBlock'; -import { v4 } from 'uuid'; -import Badge from '@tdev-components/shared/Badge'; -import Button from '@tdev-components/shared/Button'; -import Popup from 'reactjs-popup'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import RemoveNode from '../../../MdxEditor/RemoveNode'; import MyAttributes from '../../GenericAttributeEditor/MyAttributes'; -import { action } from 'mobx'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; +import styles from './styles.module.scss'; +import { useCodeMirrorRef } from './useCodeMirrorRef'; export const COMMON_STATE_CONFIG_EXTENSIONS: Extension[] = []; diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/index.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/index.tsx index d17587265..040114466 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/index.tsx @@ -1,4 +1,3 @@ -import { Cell, Signal, map } from '@mdxeditor/gurx'; import { Extension } from '@codemirror/state'; import { $isCodeBlockNode, @@ -8,7 +7,7 @@ import { insertCodeBlock$, realmPlugin } from '@mdxeditor/editor'; -import { CodeMirrorEditor } from './CodeMirrorEditor'; +import { Cell, map, Signal } from '@mdxeditor/gurx'; import { $getSelection, $isElementNode, @@ -17,6 +16,7 @@ import { KEY_DOWN_COMMAND, LexicalEditor } from 'lexical'; +import { CodeMirrorEditor } from './CodeMirrorEditor'; /** * The codemirror code block languages. diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/useCodeMirrorRef.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/useCodeMirrorRef.tsx index 74f8aebb3..b00bb4a63 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/useCodeMirrorRef.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/Codemirror/useCodeMirrorRef.tsx @@ -1,8 +1,8 @@ // https://github.com/mdx-editor/editor/blob/main/src/plugins/sandpack/useCodeMirrorRef.ts import type { EditorView } from '@codemirror/view'; -import React from 'react'; -import { usePublisher } from '@mdxeditor/gurx'; import { editorInFocus$, useCodeBlockEditorContext, VoidEmitter } from '@mdxeditor/editor'; +import { usePublisher } from '@mdxeditor/gurx'; +import React from 'react'; import { $insertPlaceholderParagraph } from '../focusHandler/keyDownHandler'; interface CodeMirrorRef { diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/DraggableBlockPlugin/DraggableBlockNode/index.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/DraggableBlockPlugin/DraggableBlockNode/index.tsx index fe3b613aa..4961e7f75 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/DraggableBlockPlugin/DraggableBlockNode/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/DraggableBlockPlugin/DraggableBlockNode/index.tsx @@ -10,10 +10,10 @@ import type { JSX } from 'react'; import styles from './styles.module.scss'; import { DraggableBlockPlugin_EXPERIMENTAL } from '@lexical/react/LexicalDraggableBlockPlugin'; -import React, { useRef } from 'react'; -import clsx from 'clsx'; -import { contentEditableRef$, useCellValue } from '@mdxeditor/editor'; import Icon from '@mdi/react'; +import { contentEditableRef$, useCellValue } from '@mdxeditor/editor'; +import clsx from 'clsx'; +import React, { useRef } from 'react'; const DRAGGABLE_BLOCK_MENU_CLASSNAME = styles.draggableBlockMenu; const PATH = diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/DraggableBlockPlugin/index.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/DraggableBlockPlugin/index.tsx index 22f8101e4..236d4d8e9 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/DraggableBlockPlugin/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/DraggableBlockPlugin/index.tsx @@ -2,7 +2,7 @@ * By Mdx Editor, @url https://github.com/mdx-editor/editor/tree/main/src/plugins/image */ -import { addComposerChild$, realmPlugin, addNestedEditorChild$ } from '@mdxeditor/editor'; +import { addComposerChild$, addNestedEditorChild$, realmPlugin } from '@mdxeditor/editor'; import DraggableBlockNode from './DraggableBlockNode'; export const draggableBlockPlugin = realmPlugin<{}>({ init(realm) { diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/focusHandler/keyDownHandler.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/focusHandler/keyDownHandler.ts index 0890af195..d1e148def 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/focusHandler/keyDownHandler.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/focusHandler/keyDownHandler.ts @@ -1,3 +1,4 @@ +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; import { $addUpdateTag, $createParagraphNode, @@ -9,7 +10,6 @@ import { ParagraphNode, TextNode } from 'lexical'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; let cleanupInsertedParagraph: (() => void) | null = null; const lastKeys: [string, string] = ['null', 'null']; const OPPOSITE = { diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/Footnote.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/Footnote.tsx index bb015a862..47620311a 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/Footnote.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/Footnote.tsx @@ -10,7 +10,6 @@ import type { BaseSelection, EditorConfig, - LexicalCommand, LexicalNode, NodeKey, RangeSelection, diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/LexicalFootnoteVisitor.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/LexicalFootnoteVisitor.ts index bbdaca5f8..01a791e68 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/LexicalFootnoteVisitor.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/LexicalFootnoteVisitor.ts @@ -1,6 +1,6 @@ -import { $isFootnoteDefinitioNode, FootnoteDefinitionNode } from './FootnoteDefinition'; import { LexicalExportVisitor } from '@mdxeditor/editor'; import { FootnoteDefinition, FootnoteReference } from 'mdast'; +import { $isFootnoteDefinitioNode, FootnoteDefinitionNode } from './FootnoteDefinition'; import { $isFootnoteReferenceNode, FootnoteReferenceNode } from './FootnoteReference'; export const LexicalFootnoteDefinitionVisitor: LexicalExportVisitor< diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/MdastFootnoteVisitor.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/MdastFootnoteVisitor.ts index 22ca3d9af..1b55ba4da 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/MdastFootnoteVisitor.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/MdastFootnoteVisitor.ts @@ -1,11 +1,11 @@ /** * By Mdx Editor, @url https://github.com/mdx-editor/editor/tree/main/src/plugins/image */ -import { $createTextNode } from 'lexical'; import { MdastImportVisitor } from '@mdxeditor/editor'; -import { $createFootnoteReferenceNode } from './FootnoteReference'; +import { $createTextNode } from 'lexical'; import type { FootnoteDefinition, FootnoteReference } from 'mdast'; import { $createFootnoteDefinitionNode } from './FootnoteDefinition'; +import { $createFootnoteReferenceNode } from './FootnoteReference'; export const MdastFootnoteReferenceVisitor: MdastImportVisitor = { testNode: 'footnoteReference', diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/index.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/index.ts index 51cbb0cbe..4b5845110 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/index.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/footnote/index.ts @@ -6,16 +6,16 @@ import { addExportVisitor$, addImportVisitor$, addLexicalNode$, - addToMarkdownExtension$, addMdastExtension$, - realmPlugin, - addSyntaxExtension$ + addSyntaxExtension$, + addToMarkdownExtension$, + realmPlugin } from '@mdxeditor/editor'; import { gfmFootnoteFromMarkdown, gfmFootnoteToMarkdown } from 'mdast-util-gfm-footnote'; import { gfmFootnote } from 'micromark-extension-gfm-footnote'; import { FootnoteDefinitionNode } from './FootnoteDefinition'; -import { LexicalFootnoteDefinitionVisitor, LexicalFootnoteReferenceVisitor } from './LexicalFootnoteVisitor'; import { FootnoteReferenceNode } from './FootnoteReference'; +import { LexicalFootnoteDefinitionVisitor, LexicalFootnoteReferenceVisitor } from './LexicalFootnoteVisitor'; import { MdastFootnoteDefinitionVisitor, MdastFootnoteReferenceVisitor } from './MdastFootnoteVisitor'; export const footnotePlugin = realmPlugin<{}>({ diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/keepImportsPlugin/LexicalMetaDataVisitor.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/keepImportsPlugin/LexicalMetaDataVisitor.ts index d8b0e21aa..2858bffda 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/keepImportsPlugin/LexicalMetaDataVisitor.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/keepImportsPlugin/LexicalMetaDataVisitor.ts @@ -1,6 +1,6 @@ +import { LexicalExportVisitor } from '@mdxeditor/editor'; import { Root } from 'mdast'; import { $isMetaDataNode, MetaDataNode } from './LexicalMetaDataNode'; -import { LexicalExportVisitor } from '@mdxeditor/editor'; export const LexicalMetaDataVisitor: LexicalExportVisitor = { testLexicalNode: $isMetaDataNode, diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/keepImportsPlugin/index.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/keepImportsPlugin/index.ts index b54b26923..ca161138c 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/keepImportsPlugin/index.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/keepImportsPlugin/index.ts @@ -1,7 +1,7 @@ import { addExportVisitor$, addImportVisitor$, addLexicalNode$, realmPlugin } from '@mdxeditor/editor'; -import { MdastMdxJsEsmVisitor } from './MdastMdxJsEsmVisitor'; import { MetaDataNode } from './LexicalMetaDataNode'; import { LexicalMetaDataVisitor } from './LexicalMetaDataVisitor'; +import { MdastMdxJsEsmVisitor } from './MdastMdxJsEsmVisitor'; export const keepImportsPlugin = realmPlugin({ init: (realm, params) => { diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/BlockMathEditor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/BlockMathEditor.tsx index 2e73e0c3c..416f85ebf 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/BlockMathEditor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/BlockMathEditor.tsx @@ -1,14 +1,13 @@ -import React from 'react'; +import { useMdastNodeUpdater } from '@mdxeditor/editor'; +import CodeEditor from '@tdev-components/shared/CodeEditor'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import TabItem from '@theme/TabItem'; +import Tabs from '@theme/Tabs'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { Math } from 'mdast-util-math'; import { BlockMath } from 'react-katex'; -import { useMdastNodeUpdater } from '@mdxeditor/editor'; -import Tabs from '@theme/Tabs'; -import TabItem from '@theme/TabItem'; -import CodeEditor from '@tdev-components/shared/CodeEditor'; import RemoveNode from '../../../../MdxEditor/RemoveNode'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import styles from './styles.module.scss'; interface Props { mdastNode: Math; diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/InlineMathEditor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/InlineMathEditor.tsx index ccfa4b10b..2d2393566 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/InlineMathEditor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/InlineMathEditor.tsx @@ -1,14 +1,14 @@ -import React from 'react'; +import { useMdastNodeUpdater } from '@mdxeditor/editor'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; +import TextInput from '@tdev-components/shared/TextInput'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { InlineMath as MdastNodeInlineMath } from 'mdast-util-math'; +import React from 'react'; import { InlineMath as KatexInline } from 'react-katex'; import Popup from 'reactjs-popup'; -import Card from '@tdev-components/shared/Card'; -import TextInput from '@tdev-components/shared/TextInput'; -import Button from '@tdev-components/shared/Button'; -import { useMdastNodeUpdater } from '@mdxeditor/editor'; import { PopupActions } from 'reactjs-popup/dist/types'; +import styles from './styles.module.scss'; interface Props { mdastNode: MdastNodeInlineMath; diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/index.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/index.tsx index 03404f43a..6a52dabdd 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/JsxMathContainer/index.tsx @@ -1,9 +1,9 @@ import { NestedEditorsContext, VoidEmitter } from '@mdxeditor/editor'; import type { EditorConfig, LexicalEditor } from 'lexical'; -import { MathNode } from '../MathNode'; import { InlineMath, Math } from 'mdast-util-math'; -import InlineMathEditor from './InlineMathEditor'; +import { MathNode } from '../MathNode'; import BlockMathEditor from './BlockMathEditor'; +import InlineMathEditor from './InlineMathEditor'; interface Props { /** The Lexical editor that contains the node */ diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/LexicalMathVisitor.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/LexicalMathVisitor.ts index e0d7ec2dd..ed8ab9ff5 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/LexicalMathVisitor.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/LexicalMathVisitor.ts @@ -1,6 +1,6 @@ import { LexicalExportVisitor } from '@mdxeditor/editor'; -import { $isMathNode, MathNode } from './MathNode'; import { InlineMath, Math } from 'mdast-util-math'; +import { $isMathNode, MathNode } from './MathNode'; export const LexicalMathVisitor: LexicalExportVisitor = { testLexicalNode: $isMathNode, diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/MdastMathVisitor.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/MdastMathVisitor.ts index a615c0a39..6206e6664 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/MdastMathVisitor.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/MdastMathVisitor.ts @@ -2,8 +2,8 @@ * By Mdx Editor, @url https://github.com/mdx-editor/editor/tree/main/src/plugins/image */ import { MdastImportVisitor } from '@mdxeditor/editor'; -import { $createMathNode } from './MathNode'; import { InlineMath, Math } from 'mdast-util-math'; +import { $createMathNode } from './MathNode'; export const MdastMathVisitor: MdastImportVisitor = { testNode: 'math', diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/index.ts b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/index.ts index 961dc398a..d7d9a09d0 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/index.ts +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/mathPlugin/index.ts @@ -13,9 +13,9 @@ import { } from '@mdxeditor/editor'; import { mathFromMarkdown, mathToMarkdown } from 'mdast-util-math'; import { math } from 'micromark-extension-math'; -import { MdastInlineMathVisitor, MdastMathVisitor } from './MdastMathVisitor'; -import { MathNode } from './MathNode'; import { LexicalMathVisitor } from './LexicalMathVisitor'; +import { MathNode } from './MathNode'; +import { MdastInlineMathVisitor, MdastMathVisitor } from './MdastMathVisitor'; export const mathPlugin = realmPlugin<{}>({ init(realm, params) { diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/AnswerDescriptor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/AnswerDescriptor.tsx index a2af125ad..52d5e18e5 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/AnswerDescriptor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/AnswerDescriptor.tsx @@ -1,15 +1,15 @@ -import React from 'react'; -import { JsxComponentDescriptor, JsxPropertyDescriptor } from '@mdxeditor/editor'; -import RemoveNode from '../../../MdxEditor/RemoveNode'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import { mdiCardTextOutline, mdiCheckboxOutline, mdiFormTextbox, mdiInvoiceTextSendOutline } from '@mdi/js'; -import GenericAttributeEditor, { GenericPropery } from '../../../MdxEditor/GenericAttributeEditor'; -import Card from '@tdev-components/shared/Card'; +import { JsxComponentDescriptor, JsxPropertyDescriptor } from '@mdxeditor/editor'; import { DocumentType } from '@tdev-api/document'; -import { useAttributeEditorInNestedEditor } from '../../../MdxEditor/hooks/useAttributeEditorInNestedEditor'; import Answer from '@tdev-components/Answer'; +import Card from '@tdev-components/shared/Card'; +import clsx from 'clsx'; +import React from 'react'; import { v4 as uuidv4 } from 'uuid'; +import GenericAttributeEditor, { GenericPropery } from '../../../MdxEditor/GenericAttributeEditor'; +import { useAttributeEditorInNestedEditor } from '../../../MdxEditor/hooks/useAttributeEditorInNestedEditor'; +import RemoveNode from '../../../MdxEditor/RemoveNode'; +import styles from './styles.module.scss'; const BaseProps: GenericPropery[] = [ { name: 'id', type: 'text', required: true, placeholder: 'id', generateNewValue: () => uuidv4() }, diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/BrowserWindowDescriptor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/BrowserWindowDescriptor.tsx index cb42fe639..3ac7f3a56 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/BrowserWindowDescriptor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/BrowserWindowDescriptor.tsx @@ -1,12 +1,12 @@ import { JsxComponentDescriptor, type JsxPropertyDescriptor, NestedLexicalEditor } from '@mdxeditor/editor'; import BrowserWindow from '@tdev-components/BrowserWindow'; +import clsx from 'clsx'; import { MdxJsxFlowElement } from 'mdast-util-mdx'; import GenericAttributeEditor, { type GenericPropery } from '../../../MdxEditor/GenericAttributeEditor'; -import RemoveNode from '../../RemoveNode'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import { useAttributeEditorInNestedEditor } from '../../hooks/useAttributeEditorInNestedEditor'; import { parseExpression } from '../../PropertyEditor/parseExpression'; +import RemoveNode from '../../RemoveNode'; +import styles from './styles.module.scss'; const props: GenericPropery[] = [ { name: 'url', type: 'text', required: false, placeholder: 'http://localhost:3000' }, diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/DeflistDescriptor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/DeflistDescriptor.tsx index 0bbc8a553..1651b93e7 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/DeflistDescriptor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/DeflistDescriptor.tsx @@ -1,6 +1,6 @@ import { JsxComponentDescriptor, NestedLexicalEditor } from '@mdxeditor/editor'; -import { MdxJsxFlowElement } from 'mdast-util-mdx'; import DefinitionList from '@tdev-components/DefinitionList'; +import { MdxJsxFlowElement } from 'mdast-util-mdx'; export const DeflistDescriptor: JsxComponentDescriptor = { name: 'Dl', diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/DocCardListDescriptor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/DocCardListDescriptor.tsx index 54f4a8464..b55219deb 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/DocCardListDescriptor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/DocCardListDescriptor.tsx @@ -1,9 +1,9 @@ +import { mdiFormatListCheckbox } from '@mdi/js'; +import Icon from '@mdi/react'; import { JsxComponentDescriptor } from '@mdxeditor/editor'; +import clsx from 'clsx'; import RemoveNode from '../../RemoveNode'; import styles from './styles.module.scss'; -import clsx from 'clsx'; -import { mdiFormatListCheckbox } from '@mdi/js'; -import Icon from '@mdi/react'; const DocCardListDescriptor: JsxComponentDescriptor = { name: 'DocCardList', diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/InsertJsxOptions.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/InsertJsxOptions.tsx index 903bfa92c..2e24a527b 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/InsertJsxOptions.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/InsertJsxOptions.tsx @@ -1,5 +1,4 @@ -import { ButtonOrDropdownButton, insertJsx$, insertMarkdown$, usePublisher } from '@mdxeditor/editor'; -import React from 'react'; +import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; import { mdiApplicationOutline, mdiCardTextOutline, @@ -11,11 +10,11 @@ import { mdiMathIntegralBox, mdiQrcode } from '@mdi/js'; -import Button from '@tdev-components/shared/Button'; import Icon from '@mdi/react'; -import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; -import { v4 as uuidv4 } from 'uuid'; +import { ButtonOrDropdownButton, insertJsx$, insertMarkdown$, usePublisher } from '@mdxeditor/editor'; +import Button from '@tdev-components/shared/Button'; import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; +import { v4 as uuidv4 } from 'uuid'; /** * A toolbar dropdown button that allows the user to insert admonitions. diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/QrCodeDescriptor/index.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/QrCodeDescriptor/index.tsx index 01130cdc0..06520898e 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/QrCodeDescriptor/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/QrCodeDescriptor/index.tsx @@ -1,12 +1,11 @@ -import React from 'react'; import { JsxComponentDescriptor, JsxPropertyDescriptor } from '@mdxeditor/editor'; +import GenericAttributeEditor, { GenericPropery } from '../../../../MdxEditor/GenericAttributeEditor'; import RemoveNode from '../../../../MdxEditor/RemoveNode'; import styles from './styles.module.scss'; -import GenericAttributeEditor, { GenericPropery } from '../../../../MdxEditor/GenericAttributeEditor'; import Card from '@tdev-components/shared/Card'; -import { useAttributeEditorInNestedEditor } from '../../../../MdxEditor/hooks/useAttributeEditorInNestedEditor'; import QrCode from '@tdev-components/shared/QrCode'; +import { useAttributeEditorInNestedEditor } from '../../../../MdxEditor/hooks/useAttributeEditorInNestedEditor'; import { toJsxAttributes } from '../../../../MdxEditor/PropertyEditor/toJsxAttributes'; const ScannerProps: GenericPropery[] = [ diff --git a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/StepsDescriptor.tsx b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/StepsDescriptor.tsx index c702fb7ef..27f9930d5 100644 --- a/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/StepsDescriptor.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/plugins/plugins-jsx/StepsDescriptor.tsx @@ -1,11 +1,11 @@ import { JsxComponentDescriptor, type JsxPropertyDescriptor, NestedLexicalEditor } from '@mdxeditor/editor'; +import Steps from '@tdev-components/Steps'; +import Card from '@tdev-components/shared/Card'; +import clsx from 'clsx'; import { MdxJsxFlowElement } from 'mdast-util-mdx'; import { type GenericPropery } from '../../../MdxEditor/GenericAttributeEditor'; import RemoveNode from '../../RemoveNode'; import styles from './styles.module.scss'; -import clsx from 'clsx'; -import Steps from '@tdev-components/Steps'; -import Card from '@tdev-components/shared/Card'; const props: GenericPropery[] = []; diff --git a/packages/hfr/github-cms/components/MdxEditor/toolbar/Actions/Save.tsx b/packages/hfr/github-cms/components/MdxEditor/toolbar/Actions/Save.tsx index 72c375dc4..1d689cc9c 100644 --- a/packages/hfr/github-cms/components/MdxEditor/toolbar/Actions/Save.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/toolbar/Actions/Save.tsx @@ -1,14 +1,12 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import _ from 'es-toolkit/compat'; -import File from '../../../../models/File'; -import Button from '@tdev-components/shared/Button'; import { mdiCircle, mdiContentSave } from '@mdi/js'; -import { Color } from '@tdev-components/shared/Colors'; import Icon from '@mdi/react'; -import { useCmsStore } from '../../../../hooks/useCmsStore'; -import { ApiState } from '@tdev-stores/iStore'; +import Button from '@tdev-components/shared/Button'; +import { Color } from '@tdev-components/shared/Colors'; import { apiButtonColor, apiIcon } from '@tdev-components/utils/apiStateIcon'; +import { ApiState } from '@tdev-stores/iStore'; +import { observer } from 'mobx-react-lite'; +import { useCmsStore } from '../../../../hooks/useCmsStore'; +import File from '../../../../models/File'; export interface Props { file: File; diff --git a/packages/hfr/github-cms/components/MdxEditor/toolbar/Actions/index.tsx b/packages/hfr/github-cms/components/MdxEditor/toolbar/Actions/index.tsx index 173242b1d..387aa453c 100644 --- a/packages/hfr/github-cms/components/MdxEditor/toolbar/Actions/index.tsx +++ b/packages/hfr/github-cms/components/MdxEditor/toolbar/Actions/index.tsx @@ -1,10 +1,3 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import _ from 'es-toolkit/compat'; -import File from '../../../../models/File'; -import Save from './Save'; -import Popup from 'reactjs-popup'; -import Button from '@tdev-components/shared/Button'; import { mdiChevronDown, mdiCloseCircle, @@ -12,15 +5,21 @@ import { mdiContentSaveAlert, mdiSourceBranchPlus } from '@mdi/js'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; -import Card from '@tdev-components/shared/Card'; -import { PopupActions } from 'reactjs-popup/dist/types'; +import Button from '@tdev-components/shared/Button'; import { Confirm } from '@tdev-components/shared/Button/Confirm'; -import { ApiState } from '@tdev-stores/iStore'; +import Card from '@tdev-components/shared/Card'; import { apiButtonColor, apiIcon } from '@tdev-components/utils/apiStateIcon'; -import NewBranch from '../../../Github/Branch/NewBranch'; +import { ApiState } from '@tdev-stores/iStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Popup from 'reactjs-popup'; +import { PopupActions } from 'reactjs-popup/dist/types'; import { useCmsStore } from '../../../../hooks/useCmsStore'; +import File from '../../../../models/File'; +import NewBranch from '../../../Github/Branch/NewBranch'; +import Save from './Save'; +import styles from './styles.module.scss'; export interface Props { file: File; diff --git a/packages/hfr/github-cms/components/ShowFile/index.tsx b/packages/hfr/github-cms/components/ShowFile/index.tsx index cd47b3f36..4693234fa 100644 --- a/packages/hfr/github-cms/components/ShowFile/index.tsx +++ b/packages/hfr/github-cms/components/ShowFile/index.tsx @@ -1,20 +1,20 @@ -import React from 'react'; +import Loader from '@tdev-components/Loader'; +import Card from '@tdev-components/shared/Card'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import FileStub from '../../models/FileStub'; +import React from 'react'; +import BinFile from '../../models/BinFile'; import Dir from '../../models/Dir'; import File from '../../models/File'; -import BinFile from '../../models/BinFile'; -import { useLoadedFile } from '../MdxEditor/hooks/useLoadedFile'; -import Loader from '@tdev-components/Loader'; -import Directory from '../MdxEditor/Directory'; +import FileStub from '../../models/FileStub'; +import DefaultEditor from '../Github/DefaultEditor'; +import AudioPreview from '../Github/iFile/File/FilePreview/AudioPreview'; import ImagePreview from '../Github/iFile/File/FilePreview/ImagePreview'; import VideoPreview from '../Github/iFile/File/FilePreview/VideoPreview'; import MdxEditor from '../MdxEditor'; -import DefaultEditor from '../Github/DefaultEditor'; -import Card from '@tdev-components/shared/Card'; -import AudioPreview from '../Github/iFile/File/FilePreview/AudioPreview'; +import Directory from '../MdxEditor/Directory'; +import { useLoadedFile } from '../MdxEditor/hooks/useLoadedFile'; +import styles from './styles.module.scss'; interface Props { file: FileStub | Dir | File | BinFile; diff --git a/packages/hfr/github-cms/components/index.tsx b/packages/hfr/github-cms/components/index.tsx index bc802a2a5..ac471e17a 100644 --- a/packages/hfr/github-cms/components/index.tsx +++ b/packages/hfr/github-cms/components/index.tsx @@ -1,27 +1,27 @@ import Layout from '@theme/Layout'; +import BrowserOnly from '@docusaurus/BrowserOnly'; import { matchPath, Redirect, useLocation } from '@docusaurus/router'; +import siteConfig from '@generated/docusaurus.config'; +import Loader from '@tdev-components/Loader'; +import { useStore } from '@tdev-hooks/useStore'; +import Details from '@theme/Details'; +import clsx from 'clsx'; import type { Location } from 'history'; -import BrowserOnly from '@docusaurus/BrowserOnly'; +import { reaction } from 'mobx'; import { observer } from 'mobx-react-lite'; -import Loader from '@tdev-components/Loader'; import React from 'react'; -import { useStore } from '@tdev-hooks/useStore'; +import { useCmsNavigator } from '../hooks/useCmsNavigator'; +import { useCmsStore } from '../hooks/useCmsStore'; import { useGithubAccess } from '../hooks/useGithubAccess'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; -import Directory from './MdxEditor/Directory'; -import Details from '@theme/Details'; -import PR from './Github/PR'; +import { FileNavigation } from '../stores/CmsStore'; import Branch from './Github/Branch'; +import PR from './Github/PR'; +import Directory from './MdxEditor/Directory'; import EditorNav from './MdxEditor/EditorNav'; import { useLoadedFile } from './MdxEditor/hooks/useLoadedFile'; import ShowFile from './ShowFile'; -import siteConfig from '@generated/docusaurus.config'; -import { reaction } from 'mobx'; -import { useCmsNavigator } from '../hooks/useCmsNavigator'; -import { FileNavigation } from '../stores/CmsStore'; -import { useCmsStore } from '../hooks/useCmsStore'; +import styles from './styles.module.scss'; const { organizationName, projectName } = siteConfig; const parseLocation = (location: Location): FileNavigation => { diff --git a/packages/hfr/github-cms/hooks/useCmsNavigator.tsx b/packages/hfr/github-cms/hooks/useCmsNavigator.tsx index 4b79c48ac..4ae674019 100644 --- a/packages/hfr/github-cms/hooks/useCmsNavigator.tsx +++ b/packages/hfr/github-cms/hooks/useCmsNavigator.tsx @@ -1,7 +1,7 @@ +import { useLocation } from '@docusaurus/router'; import React from 'react'; -import { useCmsStore } from '../hooks/useCmsStore'; import { useHistory } from 'react-router'; -import { useLocation } from '@docusaurus/router'; +import { useCmsStore } from '../hooks/useCmsStore'; export const useCmsNavigator = () => { const cmsStore = useCmsStore(); diff --git a/packages/hfr/github-cms/models/BinFile.ts b/packages/hfr/github-cms/models/BinFile.ts index 27b7fafbf..65d6c426e 100644 --- a/packages/hfr/github-cms/models/BinFile.ts +++ b/packages/hfr/github-cms/models/BinFile.ts @@ -1,6 +1,6 @@ -import { CmsStore } from '../stores/CmsStore'; -import { observable } from 'mobx'; import { ApiState } from '@tdev-stores/iStore'; +import { observable } from 'mobx'; +import { CmsStore } from '../stores/CmsStore'; import iFile, { BinFileProps } from './iFile'; class BinFile extends iFile { diff --git a/packages/hfr/github-cms/models/Branch.ts b/packages/hfr/github-cms/models/Branch.ts index 1761d29a9..5e0ccdcd5 100644 --- a/packages/hfr/github-cms/models/Branch.ts +++ b/packages/hfr/github-cms/models/Branch.ts @@ -1,6 +1,6 @@ +import { ApiState } from '@tdev-stores/iStore'; import { action, computed, observable } from 'mobx'; import Github from './Github'; -import { ApiState } from '@tdev-stores/iStore'; interface Props { name: string; diff --git a/packages/hfr/github-cms/models/Dir.ts b/packages/hfr/github-cms/models/Dir.ts index c5fd9f3ec..2db07c792 100644 --- a/packages/hfr/github-cms/models/Dir.ts +++ b/packages/hfr/github-cms/models/Dir.ts @@ -1,9 +1,9 @@ -import { CmsStore } from '../stores/CmsStore'; -import { action, computed, observable } from 'mobx'; -import iEntry, { iEntryProps } from './iEntry'; import { mdiFolder, mdiFolderOpen, mdiLoading } from '@mdi/js'; import { ApiState } from '@tdev-stores/iStore'; +import { action, computed, observable } from 'mobx'; +import { CmsStore } from '../stores/CmsStore'; import { FileType } from './FileStub'; +import iEntry, { iEntryProps } from './iEntry'; interface DirProps extends iEntryProps {} diff --git a/packages/hfr/github-cms/models/File.ts b/packages/hfr/github-cms/models/File.ts index 533ab15ff..33d7c4d31 100644 --- a/packages/hfr/github-cms/models/File.ts +++ b/packages/hfr/github-cms/models/File.ts @@ -1,7 +1,7 @@ -import { CmsStore } from '../stores/CmsStore'; -import { action, computed, observable } from 'mobx'; import { ApiState } from '@tdev-stores/iStore'; +import { action, computed, observable } from 'mobx'; import { Position } from 'unist'; +import { CmsStore } from '../stores/CmsStore'; import iFile, { FileProps } from './iFile'; class File extends iFile { diff --git a/packages/hfr/github-cms/models/FileStub.ts b/packages/hfr/github-cms/models/FileStub.ts index b045b82a9..d8f01c3fa 100644 --- a/packages/hfr/github-cms/models/FileStub.ts +++ b/packages/hfr/github-cms/models/FileStub.ts @@ -1,8 +1,8 @@ -import { type CmsStore } from '../stores/CmsStore'; -import iFile, { FileStubProps } from './iFile'; import { computed } from 'mobx'; +import { type CmsStore } from '../stores/CmsStore'; import type BinFile from './BinFile'; import type File from './File'; +import iFile, { FileStubProps } from './iFile'; export const DUMMY_PROPS: FileStubProps = { name: '', diff --git a/packages/hfr/github-cms/models/Github.ts b/packages/hfr/github-cms/models/Github.ts index 7255b6c6d..d299c078a 100644 --- a/packages/hfr/github-cms/models/Github.ts +++ b/packages/hfr/github-cms/models/Github.ts @@ -1,15 +1,15 @@ -import { CmsStore } from '../stores/CmsStore'; +import { RestEndpointMethodTypes as GhTypes, Octokit } from '@octokit/rest'; +import { ApiState } from '@tdev-stores/iStore'; import { action, computed, IObservableArray, observable, observableRef } from 'mobx'; -import { Octokit, RestEndpointMethodTypes as GhTypes } from '@octokit/rest'; -import { FileStubProps, iFile } from './iFile'; -import FileStub from './FileStub'; +import { CmsStore } from '../stores/CmsStore'; +import BinFile from './BinFile'; +import Branch from './Branch'; import Dir from './Dir'; import { default as FileModel } from './File'; -import { ApiState } from '@tdev-stores/iStore'; -import Branch from './Branch'; +import FileStub from './FileStub'; import PR from './PR'; import { convertToBase64, isBinaryFile, withoutPreviewPRName } from './helpers'; -import BinFile from './BinFile'; +import { FileStubProps, iFile } from './iFile'; export type GhRepo = GhTypes['repos']['get']['response']['data']; export type GhBranch = GhTypes['repos']['listBranches']['response']['data'][number]; diff --git a/packages/hfr/github-cms/models/PR.ts b/packages/hfr/github-cms/models/PR.ts index 60ad5abf6..d509c4731 100644 --- a/packages/hfr/github-cms/models/PR.ts +++ b/packages/hfr/github-cms/models/PR.ts @@ -1,6 +1,6 @@ +import { ApiState } from '@tdev-stores/iStore'; import { action, computed, observable } from 'mobx'; import Github from './Github'; -import { ApiState } from '@tdev-stores/iStore'; import { withoutPreviewPRName, withPreviewPRName } from './helpers'; type PRRef = { diff --git a/packages/hfr/github-cms/models/PartialSettings.ts b/packages/hfr/github-cms/models/PartialSettings.ts index 9dce04a54..4902c657d 100644 --- a/packages/hfr/github-cms/models/PartialSettings.ts +++ b/packages/hfr/github-cms/models/PartialSettings.ts @@ -1,7 +1,6 @@ import { CmsSettings } from '@tdev-api/cms'; -import { CmsStore } from '../stores/CmsStore'; -import _ from 'es-toolkit/compat'; import { action, computed, observable, observableRef } from 'mobx'; +import { CmsStore } from '../stores/CmsStore'; export const REFRESH_THRESHOLD = 60 * 60; diff --git a/packages/hfr/github-cms/models/Settings.ts b/packages/hfr/github-cms/models/Settings.ts index 22ea98f19..4ee4af20f 100644 --- a/packages/hfr/github-cms/models/Settings.ts +++ b/packages/hfr/github-cms/models/Settings.ts @@ -1,13 +1,12 @@ import { FullCmsSettings } from '@tdev-api/cms'; -import { CmsStore } from '../stores/CmsStore'; -import _ from 'es-toolkit/compat'; import { action, computed } from 'mobx'; +import { CmsStore } from '../stores/CmsStore'; +import BinFile from './BinFile'; +import Dir from './Dir'; import File from './File'; +import FileStub from './FileStub'; import iEntry from './iEntry'; -import Dir from './Dir'; import PartialSettings from './PartialSettings'; -import BinFile from './BinFile'; -import FileStub from './FileStub'; class Settings extends PartialSettings { constructor(props: FullCmsSettings, store: CmsStore) { diff --git a/packages/hfr/github-cms/models/iEntry.ts b/packages/hfr/github-cms/models/iEntry.ts index fa4225b1c..c489f89cf 100644 --- a/packages/hfr/github-cms/models/iEntry.ts +++ b/packages/hfr/github-cms/models/iEntry.ts @@ -1,9 +1,9 @@ -import { CmsStore } from '../stores/CmsStore'; -import { action, computed, observable } from 'mobx'; -import type { FileType } from './FileStub'; -import Dir from './Dir'; import { ApiState } from '@tdev-stores/iStore'; +import { action, computed, observable } from 'mobx'; +import { CmsStore } from '../stores/CmsStore'; import BinFile from './BinFile'; +import Dir from './Dir'; +import type { FileType } from './FileStub'; export interface iEntryProps { name: string; diff --git a/packages/hfr/github-cms/models/iFile.ts b/packages/hfr/github-cms/models/iFile.ts index 831053506..55c4075c8 100644 --- a/packages/hfr/github-cms/models/iFile.ts +++ b/packages/hfr/github-cms/models/iFile.ts @@ -1,6 +1,3 @@ -import { CmsStore } from '../stores/CmsStore'; -import iEntry, { iEntryProps } from './iEntry'; -import { action, computed } from 'mobx'; import { mdiFileCode, mdiFileDocumentOutline, @@ -10,8 +7,11 @@ import { mdiLoading } from '@mdi/js'; import { keysOfInterface } from '@tdev-models/helpers/keysOfInterface'; -import { isApplication, isAudio, isImage, isVideo } from './helpers'; import { ApiState } from '@tdev-stores/iStore'; +import { action, computed } from 'mobx'; +import { CmsStore } from '../stores/CmsStore'; +import { isApplication, isAudio, isImage, isVideo } from './helpers'; +import iEntry, { iEntryProps } from './iEntry'; export interface FileStubProps extends iEntryProps { size: number; diff --git a/packages/hfr/github-cms/pages/gh-callback.tsx b/packages/hfr/github-cms/pages/gh-callback.tsx index 053018c81..e95c0844f 100644 --- a/packages/hfr/github-cms/pages/gh-callback.tsx +++ b/packages/hfr/github-cms/pages/gh-callback.tsx @@ -1,15 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import Layout from '@theme/Layout'; +import Link from '@docusaurus/Link'; +import { Redirect, useHistory, useLocation } from '@docusaurus/router'; import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; +import CodeBlock from '@theme/CodeBlock'; +import Layout from '@theme/Layout'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import { Redirect, useHistory } from '@docusaurus/router'; +import React from 'react'; import { useCmsStore } from '../hooks/useCmsStore'; -import { useLocation } from '@docusaurus/router'; -import CodeBlock from '@theme/CodeBlock'; -import Link from '@docusaurus/Link'; import { useGithubAccess } from '../hooks/useGithubAccess'; +import styles from './styles.module.scss'; function HomepageHeader() { const { siteConfig } = useDocusaurusContext(); diff --git a/packages/hfr/github-cms/pages/gh-login.tsx b/packages/hfr/github-cms/pages/gh-login.tsx index 2f49331f5..2565e1a83 100644 --- a/packages/hfr/github-cms/pages/gh-login.tsx +++ b/packages/hfr/github-cms/pages/gh-login.tsx @@ -1,17 +1,16 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import Layout from '@theme/Layout'; -import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; import Link from '@docusaurus/Link'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import { useGithubAccess } from '../hooks/useGithubAccess'; import { Redirect } from '@docusaurus/router'; -import Card from '@tdev-components/shared/Card'; -import LoginProfileButton from '@tdev-components/Navbar/LoginProfileButton'; +import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; import Loader from '@tdev-components/Loader'; +import LoginProfileButton from '@tdev-components/Navbar/LoginProfileButton'; +import Card from '@tdev-components/shared/Card'; import customFields from '@tdev-components/utils/customFields'; +import { useStore } from '@tdev-hooks/useStore'; +import Layout from '@theme/Layout'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import { useGithubAccess } from '../hooks/useGithubAccess'; +import styles from './styles.module.scss'; const { APP_URL, GH_OAUTH_CLIENT_ID } = customFields; const callback = `${APP_URL || 'http://localhost:3000'}/gh-callback`; diff --git a/packages/hfr/github-cms/plugins/defbox/index.tsx b/packages/hfr/github-cms/plugins/defbox/index.tsx index 3a3280869..b4a9b111d 100644 --- a/packages/hfr/github-cms/plugins/defbox/index.tsx +++ b/packages/hfr/github-cms/plugins/defbox/index.tsx @@ -1,20 +1,19 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import React from 'react'; -import { DirectiveDescriptor, NestedLexicalEditor, useMdastNodeUpdater } from '@mdxeditor/editor'; -import { ContainerDirective } from 'mdast-util-directive'; -import { BlockContent, Paragraph, PhrasingContent } from 'mdast'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import { mdiChevronDown } from '@mdi/js'; -import Button from '@tdev-components/shared/Button'; -import Popup from 'reactjs-popup'; +import { DirectiveDescriptor, NestedLexicalEditor, useMdastNodeUpdater } from '@mdxeditor/editor'; import DefBox from '@tdev-components/CodeDefBox'; -import DefHeading from '@tdev-components/CodeDefBox/DefHeading'; -import RemoveNode from '../../components/MdxEditor/RemoveNode'; import DefContent from '@tdev-components/CodeDefBox/DefContent'; -import AdmonitionTypeSelector from '../../components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector'; +import DefHeading from '@tdev-components/CodeDefBox/DefHeading'; +import Button from '@tdev-components/shared/Button'; +import clsx from 'clsx'; +import { BlockContent, Paragraph, PhrasingContent } from 'mdast'; +import { ContainerDirective } from 'mdast-util-directive'; import { observer } from 'mobx-react-lite'; +import Popup from 'reactjs-popup'; +import AdmonitionTypeSelector from '../../components/MdxEditor/plugins/AdmonitionDescriptor/AdmonitionTypeSelector'; +import RemoveNode from '../../components/MdxEditor/RemoveNode'; +import styles from './styles.module.scss'; /** * Pass this descriptor to the `directivesPlugin` `directiveDescriptors` parameter to enable {@link https://docusaurus.io/docs/markdown-features/admonitions | markdown admonitions}. diff --git a/packages/hfr/github-cms/plugins/details/index.tsx b/packages/hfr/github-cms/plugins/details/index.tsx index ddd25445e..3f464954e 100644 --- a/packages/hfr/github-cms/plugins/details/index.tsx +++ b/packages/hfr/github-cms/plugins/details/index.tsx @@ -1,14 +1,14 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import React from 'react'; -import { DirectiveDescriptor, DirectiveEditorProps, NestedLexicalEditor } from '@mdxeditor/editor'; -import { ContainerDirective, Directives } from 'mdast-util-directive'; -import { BlockContent, Paragraph, PhrasingContent } from 'mdast'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import { mdiChevronDown, mdiChevronRight } from '@mdi/js'; +import { DirectiveDescriptor, DirectiveEditorProps, NestedLexicalEditor } from '@mdxeditor/editor'; import Button from '@tdev-components/shared/Button'; +import clsx from 'clsx'; +import { BlockContent, Paragraph, PhrasingContent } from 'mdast'; +import { ContainerDirective, Directives } from 'mdast-util-directive'; +import React from 'react'; import RemoveNode from '../../components/MdxEditor/RemoveNode'; +import styles from './styles.module.scss'; export const DetailsEditor: React.ComponentType> = () => { const [open, setOpen] = React.useState(false); diff --git a/packages/hfr/github-cms/plugins/flex-cards/FlexCardEditor.tsx b/packages/hfr/github-cms/plugins/flex-cards/FlexCardEditor.tsx index 165ccd935..fbc657101 100644 --- a/packages/hfr/github-cms/plugins/flex-cards/FlexCardEditor.tsx +++ b/packages/hfr/github-cms/plugins/flex-cards/FlexCardEditor.tsx @@ -1,15 +1,15 @@ -import React from 'react'; import { useLexicalComposerContext } from '@lexical/react/LexicalComposerContext'; +import { mdiChevronRight } from '@mdi/js'; import { DirectiveEditorProps, useMdastNodeUpdater } from '@mdxeditor/editor'; -import { LeafDirective, Directives } from 'mdast-util-directive'; -import { BlockContent, PhrasingContent } from 'mdast'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import Popup from 'reactjs-popup'; import Button from '@tdev-components/shared/Button'; -import { mdiChevronRight } from '@mdi/js'; import Card from '@tdev-components/shared/Card'; +import clsx from 'clsx'; +import { BlockContent, PhrasingContent } from 'mdast'; +import { Directives, LeafDirective } from 'mdast-util-directive'; +import React from 'react'; +import Popup from 'reactjs-popup'; import ItemEditor from './ItemEditor'; +import styles from './styles.module.scss'; const isBreak = (node?: BlockContent | any): node is LeafDirective => { if (!node) { diff --git a/packages/hfr/github-cms/plugins/flex-cards/ItemEditor.tsx b/packages/hfr/github-cms/plugins/flex-cards/ItemEditor.tsx index fde3f5db5..1c8ec7044 100644 --- a/packages/hfr/github-cms/plugins/flex-cards/ItemEditor.tsx +++ b/packages/hfr/github-cms/plugins/flex-cards/ItemEditor.tsx @@ -1,12 +1,11 @@ -import React from 'react'; -import { NestedLexicalEditor } from '@mdxeditor/editor'; -import { ContainerDirective, LeafDirective } from 'mdast-util-directive'; -import { BlockContent } from 'mdast'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import { mdiMinusBoxOutline, mdiPlusBoxOutline } from '@mdi/js'; +import { NestedLexicalEditor } from '@mdxeditor/editor'; import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { BlockContent } from 'mdast'; +import { ContainerDirective, LeafDirective } from 'mdast-util-directive'; +import styles from './styles.module.scss'; const isBreak = (node?: BlockContent | any): node is LeafDirective => { if (!node) { diff --git a/packages/hfr/github-cms/plugins/images/ImageComponent/index.tsx b/packages/hfr/github-cms/plugins/images/ImageComponent/index.tsx index ad4be8c59..82150abde 100644 --- a/packages/hfr/github-cms/plugins/images/ImageComponent/index.tsx +++ b/packages/hfr/github-cms/plugins/images/ImageComponent/index.tsx @@ -8,27 +8,27 @@ import type { BaseSelection, LexicalEditor } from 'lexical'; import { useLexicalNodeSelection } from '@lexical/react/useLexicalNodeSelection.js'; import { mergeRegister } from '@lexical/utils'; +import { mdiImage, mdiImageEditOutline } from '@mdi/js'; +import Icon from '@mdi/react'; +import Loader from '@tdev-components/Loader'; +import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import { ParsedOptions } from '@tdev-plugins/helpers'; +import clsx from 'clsx'; import { $getSelection, $isNodeSelection, CLICK_COMMAND, COMMAND_PRIORITY_LOW } from 'lexical'; -import ImageResizer from '../ImageResizer'; -import { type ImageNode } from '../ImageNode'; import { observer } from 'mobx-react-lite'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import Popup from 'reactjs-popup'; +import { PopupActions } from 'reactjs-popup/dist/types'; +import GenericAttributeEditor from '../../../components/MdxEditor/GenericAttributeEditor'; +import { asStringRecord } from '../../../components/MdxEditor/helpers/asStringRecord'; import { useAssetFile } from '../../../components/MdxEditor/hooks/useAssetFile'; -import Icon from '@mdi/react'; -import { mdiImage, mdiImageEditOutline } from '@mdi/js'; -import Loader from '@tdev-components/Loader'; import RemoveNode from '../../../components/MdxEditor/RemoveNode'; import { $isImageFigureNode } from '../ImageFigureNode'; -import GenericAttributeEditor from '../../../components/MdxEditor/GenericAttributeEditor'; -import { ParsedOptions } from '@tdev-plugins/helpers'; -import { asStringRecord } from '../../../components/MdxEditor/helpers/asStringRecord'; -import Badge from '@tdev-components/shared/Badge'; -import Popup from 'reactjs-popup'; +import { type ImageNode } from '../ImageNode'; +import ImageResizer from '../ImageResizer'; import { ImageDialog } from '../ImagesDialog'; -import Button from '@tdev-components/shared/Button'; -import { PopupActions } from 'reactjs-popup/dist/types'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import styles from './styles.module.scss'; export interface ImageEditorProps { nodeKey: string; diff --git a/packages/hfr/github-cms/plugins/images/ImageFigureNode.tsx b/packages/hfr/github-cms/plugins/images/ImageFigureNode.tsx index 3d7cc5f1e..197174ad9 100644 --- a/packages/hfr/github-cms/plugins/images/ImageFigureNode.tsx +++ b/packages/hfr/github-cms/plugins/images/ImageFigureNode.tsx @@ -10,8 +10,8 @@ import type { BaseSelection, EditorConfig, LexicalNode, NodeKey, SerializedElementNode } from 'lexical'; import { $applyNodeReplacement, $isRangeSelection, ElementNode, Spread } from 'lexical'; -import styles from './styles.module.scss'; import { $isImageNode, ImageNode } from './ImageNode'; +import styles from './styles.module.scss'; export type SerializedImageFigureNode = Spread<{}, SerializedElementNode>; diff --git a/packages/hfr/github-cms/plugins/images/ImageNode.tsx b/packages/hfr/github-cms/plugins/images/ImageNode.tsx index 12e2d352f..fce370968 100644 --- a/packages/hfr/github-cms/plugins/images/ImageNode.tsx +++ b/packages/hfr/github-cms/plugins/images/ImageNode.tsx @@ -2,7 +2,6 @@ * By Mdx Editor, @url https://github.com/mdx-editor/editor/tree/main/src/plugins/image */ -import React from 'react'; import type { EditorConfig, LexicalEditor, @@ -11,11 +10,11 @@ import type { SerializedLexicalNode, Spread } from 'lexical'; +import React from 'react'; +import { camelCased, ParsedOptions, parseOptions, serializeOptions } from '@tdev/plugins/helpers'; import { DecoratorNode } from 'lexical'; import { ImageComponent } from './ImageComponent'; -import { camelCased, ParsedOptions, parseOptions, serializeOptions } from '@tdev/plugins/helpers'; -import _ from 'es-toolkit/compat'; /** * A serialized representation of an {@link ImageNode}. diff --git a/packages/hfr/github-cms/plugins/images/ImageResizer/index.tsx b/packages/hfr/github-cms/plugins/images/ImageResizer/index.tsx index f3d503e89..68763e032 100644 --- a/packages/hfr/github-cms/plugins/images/ImageResizer/index.tsx +++ b/packages/hfr/github-cms/plugins/images/ImageResizer/index.tsx @@ -11,10 +11,10 @@ import type { LexicalEditor } from 'lexical'; +import clsx from 'clsx'; import * as React from 'react'; import { useRef } from 'react'; import styles from './styles.module.scss'; -import clsx from 'clsx'; function clamp(value: number, min: number, max: number) { return Math.min(Math.max(value, min), max); diff --git a/packages/hfr/github-cms/plugins/images/ImagesDialog/index.tsx b/packages/hfr/github-cms/plugins/images/ImagesDialog/index.tsx index 1aa183072..3606a3fa8 100644 --- a/packages/hfr/github-cms/plugins/images/ImagesDialog/index.tsx +++ b/packages/hfr/github-cms/plugins/images/ImagesDialog/index.tsx @@ -1,17 +1,17 @@ -import React from 'react'; +import { usePublisher } from '@mdxeditor/editor'; +import Button from '@tdev-components/shared/Button'; import Card from '@tdev-components/shared/Card'; -import styles from './styles.module.scss'; +import TextInput from '@tdev-components/shared/TextInput'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import { usePublisher } from '@mdxeditor/editor'; +import React from 'react'; import { insertImage$ } from '..'; -import TextInput from '@tdev-components/shared/TextInput'; -import Button from '@tdev-components/shared/Button'; import FileUpload from '../../../components/FileUpload'; -import clsx from 'clsx'; -import { Asset } from '../../../models/Dir'; -import BinFile from '../../../models/BinFile'; import AssetSelector from '../../../components/MdxEditor/AssetSelector'; import { useCmsStore } from '../../../hooks/useCmsStore'; +import BinFile from '../../../models/BinFile'; +import { Asset } from '../../../models/Dir'; +import styles from './styles.module.scss'; interface Props { onClose: () => void; diff --git a/packages/hfr/github-cms/plugins/images/InsertImage.tsx b/packages/hfr/github-cms/plugins/images/InsertImage.tsx index 8ca2f7d79..c9921c512 100644 --- a/packages/hfr/github-cms/plugins/images/InsertImage.tsx +++ b/packages/hfr/github-cms/plugins/images/InsertImage.tsx @@ -1,10 +1,10 @@ import React from 'react'; // import styles from '../../../styles/ui.module.css'; -import Popup from 'reactjs-popup'; -import { ImageDialog } from './ImagesDialog'; -import Button from '@tdev-components/shared/Button'; import { mdiImageOutline } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import Popup from 'reactjs-popup'; import { PopupActions } from 'reactjs-popup/dist/types'; +import { ImageDialog } from './ImagesDialog'; /** * A toolbar button that allows the user to insert an image from an URL. diff --git a/packages/hfr/github-cms/plugins/images/LexicalImageVisitor.ts b/packages/hfr/github-cms/plugins/images/LexicalImageVisitor.ts index 73161c411..93a0a78b8 100644 --- a/packages/hfr/github-cms/plugins/images/LexicalImageVisitor.ts +++ b/packages/hfr/github-cms/plugins/images/LexicalImageVisitor.ts @@ -2,12 +2,12 @@ * By Mdx Editor, @url https://github.com/mdx-editor/editor/tree/main/src/plugins/image */ -import * as Mdast from 'mdast'; -import { ImageNode, $isImageNode } from './ImageNode'; import { LexicalExportVisitor } from '@mdxeditor/editor'; -import { $isImageFigureNode, ImageFigureNode } from './ImageFigureNode'; -import { $isImageCaptionNode, ImageCaptionNode } from './ImageCaptionNode'; +import * as Mdast from 'mdast'; import { ImageCaption, ImageFigure } from '.'; +import { $isImageCaptionNode, ImageCaptionNode } from './ImageCaptionNode'; +import { $isImageFigureNode, ImageFigureNode } from './ImageFigureNode'; +import { $isImageNode, ImageNode } from './ImageNode'; export const LexicalImageVisitor: LexicalExportVisitor = { testLexicalNode: $isImageNode, diff --git a/packages/hfr/github-cms/plugins/images/MdastImageVisitor.ts b/packages/hfr/github-cms/plugins/images/MdastImageVisitor.ts index 6fc4f0162..b013a00d5 100644 --- a/packages/hfr/github-cms/plugins/images/MdastImageVisitor.ts +++ b/packages/hfr/github-cms/plugins/images/MdastImageVisitor.ts @@ -2,12 +2,12 @@ * By Mdx Editor, @url https://github.com/mdx-editor/editor/tree/main/src/plugins/image */ -import * as Mdast from 'mdast'; -import { $createImageNode } from './ImageNode'; import { MdastImportVisitor } from '@mdxeditor/editor'; -import { $createImageCaptionNode } from './ImageCaptionNode'; +import * as Mdast from 'mdast'; import { ImageCaption, ImageFigure } from '.'; +import { $createImageCaptionNode } from './ImageCaptionNode'; import { $createImageFigureNode } from './ImageFigureNode'; +import { $createImageNode } from './ImageNode'; export const MdastImageVisitor: MdastImportVisitor = { testNode: 'image', diff --git a/packages/hfr/github-cms/plugins/images/index.ts b/packages/hfr/github-cms/plugins/images/index.ts index f3353c438..3140b49df 100644 --- a/packages/hfr/github-cms/plugins/images/index.ts +++ b/packages/hfr/github-cms/plugins/images/index.ts @@ -2,7 +2,22 @@ * By Mdx Editor, @url https://github.com/mdx-editor/editor/tree/main/src/plugins/image */ +import { $isHeadingNode } from '@lexical/rich-text'; +import { + activeEditor$, + addExportVisitor$, + addImportVisitor$, + addLexicalNode$, + addMdastExtension$, + createActiveEditorSubscription$, + createRootEditorSubscription$, + realmPlugin +} from '@mdxeditor/editor'; import { Cell, Signal, withLatestFrom } from '@mdxeditor/gurx'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; +import { transformer } from '@tdev-plugins/remark-images/transformer'; +import { transformer as strongTransformer } from '@tdev-plugins/remark-strong/plugin'; +import { rootStore } from '@tdev/stores/rootStore'; import { $createParagraphNode, $getSelection, @@ -13,35 +28,20 @@ import { KEY_DOWN_COMMAND, LexicalEditor } from 'lexical'; +import type { Image, Parent, PhrasingContent, Root } from 'mdast'; +import { directiveFromMarkdown } from 'mdast-util-directive'; +import { fromMarkdown } from 'mdast-util-from-markdown'; +import { directive } from 'micromark-extension-directive'; +import React from 'react'; +import { $createImageCaptionNode, $isImageCaptionNode, ImageCaptionNode } from './ImageCaptionNode'; +import { $createImageFigureNode, ImageFigureNode } from './ImageFigureNode'; +import { $createImageNode, ImageNode } from './ImageNode'; import { LexicalImageCaptionVisitor, LexicalImageFigureVisitor, LexicalImageVisitor } from './LexicalImageVisitor'; -import { - activeEditor$, - addExportVisitor$, - addImportVisitor$, - addLexicalNode$, - addMdastExtension$, - createRootEditorSubscription$, - createActiveEditorSubscription$, - realmPlugin -} from '@mdxeditor/editor'; -import { $createImageNode, ImageNode } from './ImageNode'; import { MdastImageCaptionVisitor, MdastImageFigureVisitor, MdastImageVisitor } from './MdastImageVisitor'; -import React from 'react'; -import { rootStore } from '@tdev/stores/rootStore'; -import type { Parent, PhrasingContent, Root, Image } from 'mdast'; -import { transformer as strongTransformer } from '@tdev-plugins/remark-strong/plugin'; -import { transformer } from '@tdev-plugins/remark-images/transformer'; -import { $createImageCaptionNode, $isImageCaptionNode, ImageCaptionNode } from './ImageCaptionNode'; -import { $createImageFigureNode, ImageFigureNode } from './ImageFigureNode'; -import { fromMarkdown } from 'mdast-util-from-markdown'; -import { directiveFromMarkdown } from 'mdast-util-directive'; -import { directive } from 'micromark-extension-directive'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; -import { $isHeadingNode } from '@lexical/rich-text'; export * from './ImageNode'; export interface ImageCaption extends Parent { diff --git a/packages/hfr/github-cms/plugins/kbd/LexicalKbdVisitor.ts b/packages/hfr/github-cms/plugins/kbd/LexicalKbdVisitor.ts index 773dea9b1..8d1ad1556 100644 --- a/packages/hfr/github-cms/plugins/kbd/LexicalKbdVisitor.ts +++ b/packages/hfr/github-cms/plugins/kbd/LexicalKbdVisitor.ts @@ -1,5 +1,5 @@ -import { Strong } from 'mdast'; import { LexicalExportVisitor } from '@mdxeditor/editor'; +import { Strong } from 'mdast'; import { $isKbdNode, KbdNode } from './KbdNode'; export const LexicalKbdVisitor: LexicalExportVisitor = { diff --git a/packages/hfr/github-cms/plugins/kbd/MdastKbdVisitor.ts b/packages/hfr/github-cms/plugins/kbd/MdastKbdVisitor.ts index 3365dcb5a..bf959a5c4 100644 --- a/packages/hfr/github-cms/plugins/kbd/MdastKbdVisitor.ts +++ b/packages/hfr/github-cms/plugins/kbd/MdastKbdVisitor.ts @@ -3,8 +3,8 @@ */ import { MdastImportVisitor } from '@mdxeditor/editor'; -import { $createKbdNode } from './KbdNode'; import type { Kbd } from '.'; +import { $createKbdNode } from './KbdNode'; export const MdastKbdVisitor: MdastImportVisitor = { testNode: 'kbd', diff --git a/packages/hfr/github-cms/plugins/kbd/ToolbarInsertKbd.tsx b/packages/hfr/github-cms/plugins/kbd/ToolbarInsertKbd.tsx index fe79db6d1..437c202f3 100644 --- a/packages/hfr/github-cms/plugins/kbd/ToolbarInsertKbd.tsx +++ b/packages/hfr/github-cms/plugins/kbd/ToolbarInsertKbd.tsx @@ -2,9 +2,9 @@ import { mdiKeyboardOutline } from '@mdi/js'; import Icon from '@mdi/react'; import { activeEditor$, currentSelection$, MultipleChoiceToggleGroup } from '@mdxeditor/editor'; import { useCellValues } from '@mdxeditor/gurx'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; import React from 'react'; import { $isKbdNode, TOGGLE_KBD_COMMAND } from './KbdNode'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; /** * A toolbar component that lets the user undo and redo changes in the editor. diff --git a/packages/hfr/github-cms/plugins/kbd/index.ts b/packages/hfr/github-cms/plugins/kbd/index.ts index 03acfbaea..83a8810b4 100644 --- a/packages/hfr/github-cms/plugins/kbd/index.ts +++ b/packages/hfr/github-cms/plugins/kbd/index.ts @@ -10,14 +10,14 @@ import { createRootEditorSubscription$, realmPlugin } from '@mdxeditor/editor'; -import type { Parent, PhrasingContent, Root } from 'mdast'; -import { MdastKbdVisitor } from './MdastKbdVisitor'; -import { $isKbdNode, $toggleKbd, KbdNode, TOGGLE_KBD_COMMAND } from './KbdNode'; -import { LexicalKbdVisitor } from './LexicalKbdVisitor'; +import { transformer } from '@tdev-plugins/remark-kbd/plugin'; import { COMMAND_PRIORITY_LOW, type LexicalEditor } from 'lexical'; +import type { Parent, PhrasingContent, Root } from 'mdast'; import handleFocusNextInline from '../../components/MdxEditor/helpers/lexical/handle-focus-next-inline'; import handleFocusPreviousInline from '../../components/MdxEditor/helpers/lexical/handle-focus-previous-inline'; -import { transformer } from '@tdev-plugins/remark-kbd/plugin'; +import { $isKbdNode, $toggleKbd, KbdNode, TOGGLE_KBD_COMMAND } from './KbdNode'; +import { LexicalKbdVisitor } from './LexicalKbdVisitor'; +import { MdastKbdVisitor } from './MdastKbdVisitor'; export interface Kbd extends Parent { type: 'kbd'; diff --git a/packages/hfr/github-cms/plugins/mdi/MdiComplete/MdiPickerPlugin.tsx b/packages/hfr/github-cms/plugins/mdi/MdiComplete/MdiPickerPlugin.tsx index 6882e17c2..48a318bad 100644 --- a/packages/hfr/github-cms/plugins/mdi/MdiComplete/MdiPickerPlugin.tsx +++ b/packages/hfr/github-cms/plugins/mdi/MdiComplete/MdiPickerPlugin.tsx @@ -12,18 +12,17 @@ import { MenuOption, useBasicTypeaheadTriggerMatch } from '@lexical/react/LexicalTypeaheadMenuPlugin'; -import Icon from '@mdi/react'; +import * as Mdi from '@mdi/js'; +import { $createDirectiveNode } from '@mdxeditor/editor'; +import Button from '@tdev-components/shared/Button'; import Card from '@tdev-components/shared/Card'; -import { $createTextNode, $getSelection, $isRangeSelection, TextNode } from 'lexical'; +import clsx from 'clsx'; import _ from 'es-toolkit/compat'; -import * as Mdi from '@mdi/js'; +import { $getSelection, $isRangeSelection, TextNode } from 'lexical'; import * as React from 'react'; import { useCallback, useMemo, useState } from 'react'; import * as ReactDOM from 'react-dom'; import styles from './styles.module.scss'; -import clsx from 'clsx'; -import { $createDirectiveNode } from '@mdxeditor/editor'; -import Button from '@tdev-components/shared/Button'; enum MdiColorClass { Black = 'black', diff --git a/packages/hfr/github-cms/plugins/mdi/index.tsx b/packages/hfr/github-cms/plugins/mdi/index.tsx index 4f7eeb26e..5bb15e4af 100644 --- a/packages/hfr/github-cms/plugins/mdi/index.tsx +++ b/packages/hfr/github-cms/plugins/mdi/index.tsx @@ -1,20 +1,20 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import React from 'react'; -import { DirectiveDescriptor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import * as MdiIcons from '@mdi/js'; -import Popup from 'reactjs-popup'; import Icon from '@mdi/react'; +import { DirectiveDescriptor } from '@mdxeditor/editor'; import { camelCased, captialize } from '@tdev/plugins/helpers'; import { transformMdiAttributes } from '@tdev/plugins/remark-mdi/plugin'; +import clsx from 'clsx'; +import React from 'react'; +import Popup from 'reactjs-popup'; import { PopupActions } from 'reactjs-popup/dist/types'; import { DirectiveProperty, useDirectiveAttributeEditor } from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; import PropertyEditor from '../../components/MdxEditor/PropertyEditor'; +import styles from './styles.module.scss'; export const DEFAULT_SIZE = '1.25em'; diff --git a/packages/hfr/github-cms/plugins/media/AudioDescriptor.tsx b/packages/hfr/github-cms/plugins/media/AudioDescriptor.tsx index f6aad3c3b..deeb96cc2 100644 --- a/packages/hfr/github-cms/plugins/media/AudioDescriptor.tsx +++ b/packages/hfr/github-cms/plugins/media/AudioDescriptor.tsx @@ -1,18 +1,18 @@ -import React from 'react'; import { DirectiveDescriptor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; +import Card from '@tdev-components/shared/Card'; +import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; import clsx from 'clsx'; -import { - DirectiveProperty, - useDirectiveAttributeEditor -} from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; +import React from 'react'; import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; +import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; import RemoveNode from '../../components/MdxEditor/RemoveNode'; import { useAssetFile } from '../../components/MdxEditor/hooks/useAssetFile'; -import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; -import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; +import { + DirectiveProperty, + useDirectiveAttributeEditor +} from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; +import styles from './styles.module.scss'; const props: DirectiveProperty[] = []; export const AudioDescriptor: DirectiveDescriptor = { diff --git a/packages/hfr/github-cms/plugins/media/CircuitverseDescriptor.tsx b/packages/hfr/github-cms/plugins/media/CircuitverseDescriptor.tsx index 939a0c9d7..c176459e2 100644 --- a/packages/hfr/github-cms/plugins/media/CircuitverseDescriptor.tsx +++ b/packages/hfr/github-cms/plugins/media/CircuitverseDescriptor.tsx @@ -1,17 +1,17 @@ -import React from 'react'; import { DirectiveDescriptor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; +import Card from '@tdev-components/shared/Card'; +import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; +import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; import { DirectiveProperty, useDirectiveAttributeEditor } from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; -import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; -import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; import RemoveNode from '../../components/MdxEditor/RemoveNode'; -import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; -import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; +import styles from './styles.module.scss'; const props: DirectiveProperty[] = [ { diff --git a/packages/hfr/github-cms/plugins/media/CodepenDescriptor.tsx b/packages/hfr/github-cms/plugins/media/CodepenDescriptor.tsx index 0cf6cb2e6..e2e0c8972 100644 --- a/packages/hfr/github-cms/plugins/media/CodepenDescriptor.tsx +++ b/packages/hfr/github-cms/plugins/media/CodepenDescriptor.tsx @@ -1,17 +1,17 @@ -import React from 'react'; import { DirectiveDescriptor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; +import Card from '@tdev-components/shared/Card'; +import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; +import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; import { DirectiveProperty, useDirectiveAttributeEditor } from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; -import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; -import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; import RemoveNode from '../../components/MdxEditor/RemoveNode'; -import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; -import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; +import styles from './styles.module.scss'; const props: DirectiveProperty[] = [ { diff --git a/packages/hfr/github-cms/plugins/media/LearningDescriptor.tsx b/packages/hfr/github-cms/plugins/media/LearningDescriptor.tsx index f42ec15b1..127ed138d 100644 --- a/packages/hfr/github-cms/plugins/media/LearningDescriptor.tsx +++ b/packages/hfr/github-cms/plugins/media/LearningDescriptor.tsx @@ -1,17 +1,17 @@ -import React from 'react'; import { DirectiveDescriptor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; +import Card from '@tdev-components/shared/Card'; +import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; +import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; import { DirectiveProperty, useDirectiveAttributeEditor } from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; -import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; -import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; import RemoveNode from '../../components/MdxEditor/RemoveNode'; -import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; -import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; +import styles from './styles.module.scss'; const props: DirectiveProperty[] = [ { diff --git a/packages/hfr/github-cms/plugins/media/VideoDescriptor.tsx b/packages/hfr/github-cms/plugins/media/VideoDescriptor.tsx index 24e1de86c..21705924c 100644 --- a/packages/hfr/github-cms/plugins/media/VideoDescriptor.tsx +++ b/packages/hfr/github-cms/plugins/media/VideoDescriptor.tsx @@ -1,18 +1,18 @@ -import React from 'react'; import { DirectiveDescriptor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; +import Card from '@tdev-components/shared/Card'; +import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; import clsx from 'clsx'; -import { - DirectiveProperty, - useDirectiveAttributeEditor -} from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; +import React from 'react'; import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; +import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; import RemoveNode from '../../components/MdxEditor/RemoveNode'; import { useAssetFile } from '../../components/MdxEditor/hooks/useAssetFile'; -import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; -import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; +import { + DirectiveProperty, + useDirectiveAttributeEditor +} from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; +import styles from './styles.module.scss'; const props: DirectiveProperty[] = [ { diff --git a/packages/hfr/github-cms/plugins/media/YoutubeDescriptor.tsx b/packages/hfr/github-cms/plugins/media/YoutubeDescriptor.tsx index 0fd213791..f798019bd 100644 --- a/packages/hfr/github-cms/plugins/media/YoutubeDescriptor.tsx +++ b/packages/hfr/github-cms/plugins/media/YoutubeDescriptor.tsx @@ -1,17 +1,17 @@ -import React from 'react'; import { DirectiveDescriptor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; +import Card from '@tdev-components/shared/Card'; +import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; +import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; import { DirectiveProperty, useDirectiveAttributeEditor } from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; -import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; -import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; import RemoveNode from '../../components/MdxEditor/RemoveNode'; -import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; -import { LeafDirectiveName } from '@tdev-plugins/remark-media/plugin'; +import styles from './styles.module.scss'; const props: DirectiveProperty[] = [ { diff --git a/packages/hfr/github-cms/plugins/pdf/PdfDescriptor.tsx b/packages/hfr/github-cms/plugins/pdf/PdfDescriptor.tsx index af34ab176..f8c24f3f3 100644 --- a/packages/hfr/github-cms/plugins/pdf/PdfDescriptor.tsx +++ b/packages/hfr/github-cms/plugins/pdf/PdfDescriptor.tsx @@ -1,19 +1,19 @@ -import React from 'react'; import { DirectiveDescriptor } from '@mdxeditor/editor'; -import styles from './styles.module.scss'; +import Loader from '@tdev-components/Loader'; +import Card from '@tdev-components/shared/Card'; +import PdfViewer from '@tdev/remark-pdf/PdfViewer'; import clsx from 'clsx'; -import { - DirectiveProperty, - useDirectiveAttributeEditor -} from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; +import React from 'react'; import GenericAttributeEditor from '../../components/MdxEditor/GenericAttributeEditor'; +import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; import RemoveNode from '../../components/MdxEditor/RemoveNode'; import { isRelPath, useAssetFile } from '../../components/MdxEditor/hooks/useAssetFile'; -import MyAttributes from '../../components/MdxEditor/GenericAttributeEditor/MyAttributes'; -import PdfViewer from '@tdev/remark-pdf/PdfViewer'; -import Loader from '@tdev-components/Loader'; +import { + DirectiveProperty, + useDirectiveAttributeEditor +} from '../../components/MdxEditor/hooks/useDirectiveAttributeEditor'; +import styles from './styles.module.scss'; const props: DirectiveProperty[] = [ { diff --git a/packages/hfr/github-cms/plugins/strong/LexicalBoxVisitor.ts b/packages/hfr/github-cms/plugins/strong/LexicalBoxVisitor.ts index ce859b97e..a1c3cce16 100644 --- a/packages/hfr/github-cms/plugins/strong/LexicalBoxVisitor.ts +++ b/packages/hfr/github-cms/plugins/strong/LexicalBoxVisitor.ts @@ -1,6 +1,6 @@ +import { LexicalExportVisitor } from '@mdxeditor/editor'; import { Strong } from 'mdast'; import { $isBoxNode, BoxNode } from './BoxNode'; -import { LexicalExportVisitor } from '@mdxeditor/editor'; export const LexicalBoxVisitor: LexicalExportVisitor = { testLexicalNode: $isBoxNode, diff --git a/packages/hfr/github-cms/plugins/strong/MdastBoxVisitor.ts b/packages/hfr/github-cms/plugins/strong/MdastBoxVisitor.ts index f7b25c2c1..ca706074f 100644 --- a/packages/hfr/github-cms/plugins/strong/MdastBoxVisitor.ts +++ b/packages/hfr/github-cms/plugins/strong/MdastBoxVisitor.ts @@ -3,8 +3,8 @@ */ import { MdastImportVisitor } from '@mdxeditor/editor'; -import { $createBoxNode } from './BoxNode'; import type { Box } from '.'; +import { $createBoxNode } from './BoxNode'; export const MdastBoxVisitor: MdastImportVisitor = { testNode: 'box', diff --git a/packages/hfr/github-cms/plugins/strong/ToolbarInsertBoxed.tsx b/packages/hfr/github-cms/plugins/strong/ToolbarInsertBoxed.tsx index 1cde7ffe6..86104bb89 100644 --- a/packages/hfr/github-cms/plugins/strong/ToolbarInsertBoxed.tsx +++ b/packages/hfr/github-cms/plugins/strong/ToolbarInsertBoxed.tsx @@ -1,10 +1,9 @@ -import { mdiRectangleOutline } from '@mdi/js'; import Icon from '@mdi/react'; import { activeEditor$, currentSelection$, MultipleChoiceToggleGroup } from '@mdxeditor/editor'; import { useCellValues } from '@mdxeditor/gurx'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; import React from 'react'; import { $isBoxNode, TOGGLE_BOX_COMMAND } from './BoxNode'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; const BoxIcon = 'M17.042 15.8047c-.036-.102-.09-.2761-.12-.5342-.4021.4201-.8883.6302-1.4465.6302-.4982 0-.9123-.1441-1.2304-.4261-.3181-.2701-.4802-.6362-.4802-1.0744 0-.5282.1981-.9363.6002-1.2304.4021-.2941.9663-.4382 1.6986-.4382h.8403v-.3841c0-.2941-.09-.5282-.2701-.7022-.1801-.1741-.4502-.2581-.7983-.2581-.3121 0-.5702.072-.7803.2161-.2101.1501-.3121.3241-.3121.5342h-.8763c0-.2581.09-.5042.2701-.7443.1681-.2401.4261-.4261.7323-.5642.3061-.126.6362-.2101 1.0144-.2101.5882 0 1.0444.1441 1.3745.4382.3301.2941.5042.6962.5162 1.2124v2.3348c0 .4802.06.8523.1801 1.1284v.072H17.042m-1.4405-.6722c.2701 0 .5282-.066.7743-.1921.2401-.126.4201-.2941.5282-.4982v-.9423h-.6782c-1.0624 0-1.5966.2821-1.5966.8463 0 .2581.09.4382.2761.5762.1801.138.4081.2101.6962.2101M8.2789 13.2298h2.4429L9.5033 9.9766 8.2789 13.2298m.7082-4.6276h1.0324l2.827 7.2025H11.6881l-.5822-1.5425H7.8948l-.5762 1.5425H6.1602l2.827-7.2025ZM3.078 14.812c0 3.001 1.539 4.617 4.617 4.617h2.3085V17.89H7.695c-2.3085 0-3.078-.7695-3.078-3.078V12.5035H3.078V14.812m17.6985-4.617c0-3.001-1.539-4.617-4.617-4.617H13.851V7.117h2.3085c2.3085 0 3.078.7695 3.078 3.078v3.078h1.539V10.195m-4.617 9.234c3.078 0 4.617-1.539 4.617-4.617V13.273h-1.539v1.539c0 2.3085-.7695 3.078-3.078 3.078h-6.156v1.539h6.156M7.695 5.578c-3.078 0-4.617 1.539-4.617 4.617v2.3085H4.617V10.195c0-2.3085.7695-3.078 3.078-3.078h6.156V5.578H7.695Z'; diff --git a/packages/hfr/github-cms/plugins/strong/index.ts b/packages/hfr/github-cms/plugins/strong/index.ts index 654a79cf8..3007df58e 100644 --- a/packages/hfr/github-cms/plugins/strong/index.ts +++ b/packages/hfr/github-cms/plugins/strong/index.ts @@ -10,15 +10,15 @@ import { createRootEditorSubscription$, realmPlugin } from '@mdxeditor/editor'; -import { LexicalEditor, COMMAND_PRIORITY_LOW } from 'lexical'; -import { MdastBoxVisitor } from './MdastBoxVisitor'; -import { $isBoxNode, $toggleBoxed, BoxNode, TOGGLE_BOX_COMMAND } from './BoxNode'; -import { LexicalBoxVisitor } from './LexicalBoxVisitor'; -import { Parent, PhrasingContent, Root } from 'mdast'; import { transformer } from '@tdev-plugins/remark-strong/plugin'; import { rootStore } from '@tdev/stores/rootStore'; +import { COMMAND_PRIORITY_LOW, LexicalEditor } from 'lexical'; +import { Parent, PhrasingContent, Root } from 'mdast'; import handleFocusNextInline from '../../components/MdxEditor/helpers/lexical/handle-focus-next-inline'; import handleFocusPreviousInline from '../../components/MdxEditor/helpers/lexical/handle-focus-previous-inline'; +import { $isBoxNode, $toggleBoxed, BoxNode, TOGGLE_BOX_COMMAND } from './BoxNode'; +import { LexicalBoxVisitor } from './LexicalBoxVisitor'; +import { MdastBoxVisitor } from './MdastBoxVisitor'; export interface Box extends Parent { type: 'box'; diff --git a/packages/hfr/github-cms/register.ts b/packages/hfr/github-cms/register.ts index b0a736757..16f0480fe 100644 --- a/packages/hfr/github-cms/register.ts +++ b/packages/hfr/github-cms/register.ts @@ -1,6 +1,6 @@ import { rootStore } from '@tdev-stores/rootStore'; -import { CmsStore } from './stores/CmsStore'; import ViewStore from '@tdev-stores/ViewStores'; +import { CmsStore } from './stores/CmsStore'; const createStore = (viewStore: ViewStore) => { return new CmsStore(viewStore); diff --git a/packages/hfr/github-cms/stores/CmsStore.ts b/packages/hfr/github-cms/stores/CmsStore.ts index 8f30cdde5..b721a10b1 100644 --- a/packages/hfr/github-cms/stores/CmsStore.ts +++ b/packages/hfr/github-cms/stores/CmsStore.ts @@ -1,30 +1,30 @@ -import { action, computed, observable, reaction, observableRef } from 'mobx'; -import { RootStore } from '@tdev-stores/rootStore'; -import iStore from '@tdev-stores/iStore'; +import siteConfig from '@generated/docusaurus.config'; import { + logout as apiGithubLogout, githubToken as apiGithubToken, load as apiLoadSettings, update as apiUpdateSettings, - logout as apiGithubLogout, CmsSettings, FullCmsSettings } from '@tdev-api/cms'; -import siteConfig from '@generated/docusaurus.config'; +import { trimSlashes } from '@tdev-models/helpers/trimSlashes'; +import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; +import ViewStore from '@tdev-stores/ViewStores'; +import imageCompression from 'browser-image-compression'; +import _ from 'es-toolkit/compat'; +import { action, computed, observable, observableRef, reaction } from 'mobx'; +import { computedFn } from 'mobx-utils'; +import BinFile from '../models/BinFile'; import Dir from '../models/Dir'; import { default as FileModel } from '../models/File'; -import { computedFn } from 'mobx-utils'; -import _ from 'es-toolkit/compat'; -import Settings from '../models/Settings'; -import Github from '../models/Github'; import FileStub from '../models/FileStub'; +import Github from '../models/Github'; import iEntry from '../models/iEntry'; -import { trimSlashes } from '@tdev-models/helpers/trimSlashes'; +import iFile from '../models/iFile'; import PartialSettings, { REFRESH_THRESHOLD } from '../models/PartialSettings'; -import imageCompression from 'browser-image-compression'; -import BinFile from '../models/BinFile'; +import Settings from '../models/Settings'; import { default as CmsViewStore } from './ViewStore'; -import iFile from '../models/iFile'; -import ViewStore from '@tdev-stores/ViewStores'; const { organizationName, projectName } = siteConfig; if (!organizationName || !projectName) { diff --git a/packages/hfr/github-cms/stores/ViewStore.ts b/packages/hfr/github-cms/stores/ViewStore.ts index f02423dfb..ff75b199a 100644 --- a/packages/hfr/github-cms/stores/ViewStore.ts +++ b/packages/hfr/github-cms/stores/ViewStore.ts @@ -1,7 +1,7 @@ -import { CmsStore } from '../stores/CmsStore'; +import iViewStore from '@tdev-stores/ViewStores/iViewStore'; import { action, computed, observable } from 'mobx'; import Dir from '../models/Dir'; -import iViewStore from '@tdev-stores/ViewStores/iViewStore'; +import { CmsStore } from '../stores/CmsStore'; export default class ViewStore extends iViewStore { @observable accessor showFileTree = false; diff --git a/packages/tdev/brython-code/components/Footer/index.tsx b/packages/tdev/brython-code/components/Footer/index.tsx index e377180fd..aa09d788a 100644 --- a/packages/tdev/brython-code/components/Footer/index.tsx +++ b/packages/tdev/brython-code/components/Footer/index.tsx @@ -1,8 +1,7 @@ -import * as React from 'react'; +import Container from '@tdev-components/documents/CodeEditor/Editor/Footer/Container'; import Logs from '@tdev-components/documents/CodeEditor/Editor/Footer/Logs'; -import { observer } from 'mobx-react-lite'; import type Script from '@tdev/brython-code/models/Script'; -import Container from '@tdev-components/documents/CodeEditor/Editor/Footer/Container'; +import { observer } from 'mobx-react-lite'; interface Props { code: Script; diff --git a/packages/tdev/brython-code/components/Header/index.tsx b/packages/tdev/brython-code/components/Header/index.tsx index c897fe7cf..496e49387 100644 --- a/packages/tdev/brython-code/components/Header/index.tsx +++ b/packages/tdev/brython-code/components/Header/index.tsx @@ -1,9 +1,8 @@ -import * as React from 'react'; import RunCode from '@tdev-components/documents/CodeEditor/Actions/RunCode'; -import { observer } from 'mobx-react-lite'; import Container from '@tdev-components/documents/CodeEditor/Editor/Header/Container'; -import Script, { IsBrythonPluginRegistered } from '@tdev/brython-code/models/Script'; import Content from '@tdev-components/documents/CodeEditor/Editor/Header/Content'; +import Script, { IsBrythonPluginRegistered } from '@tdev/brython-code/models/Script'; +import { observer } from 'mobx-react-lite'; import PluginNotRegistered from './PluginNotRegisteredAlert'; interface Props { diff --git a/packages/tdev/brython-code/components/Meta/BrythonCommunicator.tsx b/packages/tdev/brython-code/components/Meta/BrythonCommunicator.tsx index 7a357e171..cfd161852 100644 --- a/packages/tdev/brython-code/components/Meta/BrythonCommunicator.tsx +++ b/packages/tdev/brython-code/components/Meta/BrythonCommunicator.tsx @@ -1,7 +1,7 @@ -import * as React from 'react'; -import { observer } from 'mobx-react-lite'; import { BRYTHON_NOTIFICATION_EVENT, DOM_ELEMENT_IDS } from '@tdev/brython-code'; import Script, { LogMessage } from '@tdev/brython-code/models/Script'; +import { observer } from 'mobx-react-lite'; +import * as React from 'react'; interface Props { code: Script; diff --git a/packages/tdev/brython-code/components/Meta/Graphics/Canvas.tsx b/packages/tdev/brython-code/components/Meta/Graphics/Canvas.tsx index d221269ae..662bbc376 100644 --- a/packages/tdev/brython-code/components/Meta/Graphics/Canvas.tsx +++ b/packages/tdev/brython-code/components/Meta/Graphics/Canvas.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; -import styles from './styles.module.scss'; -import Button from '@tdev-components/documents/CodeEditor/Button'; -import { observer } from 'mobx-react-lite'; import { mdiDownload } from '@mdi/js'; +import Button from '@tdev-components/documents/CodeEditor/Button'; +import { DOM_ELEMENT_IDS } from '@tdev/brython-code'; import Script from '@tdev/brython-code/models/Script'; +import { observer } from 'mobx-react-lite'; import Graphics from '.'; -import { DOM_ELEMENT_IDS } from '@tdev/brython-code'; +import styles from './styles.module.scss'; const downloadCanvas = (canvasId: string) => { const canvas = document.getElementById(canvasId) as HTMLCanvasElement; diff --git a/packages/tdev/brython-code/components/Meta/Graphics/Turtle.tsx b/packages/tdev/brython-code/components/Meta/Graphics/Turtle.tsx index 950910127..3f954cf9f 100644 --- a/packages/tdev/brython-code/components/Meta/Graphics/Turtle.tsx +++ b/packages/tdev/brython-code/components/Meta/Graphics/Turtle.tsx @@ -1,13 +1,13 @@ -import * as React from 'react'; -import styles from './styles.module.scss'; -import { saveSvg } from '@tdev/brython-code/components/utils/saveSvg'; +import { mdiAnimationPlay, mdiDownload } from '@mdi/js'; import Button from '@tdev-components/documents/CodeEditor/Button'; +import { DOM_ELEMENT_IDS } from '@tdev/brython-code'; +import { saveSvg } from '@tdev/brython-code/components/utils/saveSvg'; +import Script from '@tdev/brython-code/models/Script'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import { mdiAnimationPlay, mdiDownload } from '@mdi/js'; -import Script from '@tdev/brython-code/models/Script'; +import * as React from 'react'; import Graphics from '.'; -import { DOM_ELEMENT_IDS } from '@tdev/brython-code'; +import styles from './styles.module.scss'; interface Props { code: Script; diff --git a/packages/tdev/brython-code/components/Meta/Graphics/index.tsx b/packages/tdev/brython-code/components/Meta/Graphics/index.tsx index ac324c88e..7fbaab0e6 100644 --- a/packages/tdev/brython-code/components/Meta/Graphics/index.tsx +++ b/packages/tdev/brython-code/components/Meta/Graphics/index.tsx @@ -1,13 +1,13 @@ -import * as React from 'react'; -import styles from './styles.module.scss'; -import Draggable from 'react-draggable'; -import { checkForButtonClick } from '../../utils/checkForButtonClick'; +import { mdiClose } from '@mdi/js'; import Button from '@tdev-components/documents/CodeEditor/Button'; +import type Script from '@tdev/brython-code/models/Script'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import { mdiClose } from '@mdi/js'; -import type Script from '@tdev/brython-code/models/Script'; +import * as React from 'react'; +import Draggable from 'react-draggable'; import { DOM_ELEMENT_IDS } from '../../..'; +import { checkForButtonClick } from '../../utils/checkForButtonClick'; +import styles from './styles.module.scss'; export interface Props { code: Script; diff --git a/packages/tdev/brython-code/components/Meta/index.tsx b/packages/tdev/brython-code/components/Meta/index.tsx index 609c4ff1a..c6237d926 100644 --- a/packages/tdev/brython-code/components/Meta/index.tsx +++ b/packages/tdev/brython-code/components/Meta/index.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; +import { useFullscreenTargetId } from '@tdev-hooks/useFullscreenTargetId'; import { useStore } from '@tdev-hooks/useStore'; +import Script from '@tdev/brython-code/models/Script'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import { DOM_ELEMENT_IDS } from '../../index'; -import Turtle from './Graphics/Turtle'; -import Canvas from './Graphics/Canvas'; -import Graphics from './Graphics'; import BrythonCommunicator from './BrythonCommunicator'; -import Script from '@tdev/brython-code/models/Script'; -import { useFullscreenTargetId } from '@tdev-hooks/useFullscreenTargetId'; +import Graphics from './Graphics'; +import Canvas from './Graphics/Canvas'; +import Turtle from './Graphics/Turtle'; interface Props { code: Script; diff --git a/packages/tdev/brython-code/components/utils/bryRunner.ts b/packages/tdev/brython-code/components/utils/bryRunner.ts index 915259893..ab79b9b9f 100644 --- a/packages/tdev/brython-code/components/utils/bryRunner.ts +++ b/packages/tdev/brython-code/components/utils/bryRunner.ts @@ -1,6 +1,6 @@ import { RouterType } from '@docusaurus/types'; -import { sanitizePyScript } from './helpers'; import { DOM_ELEMENT_IDS } from '@tdev/brython-code'; +import { sanitizePyScript } from './helpers'; export const runCode = ( code: string, diff --git a/packages/tdev/brython-code/components/utils/svgWithoutAnimations.ts b/packages/tdev/brython-code/components/utils/svgWithoutAnimations.ts index fcb968221..f27070ccd 100644 --- a/packages/tdev/brython-code/components/utils/svgWithoutAnimations.ts +++ b/packages/tdev/brython-code/components/utils/svgWithoutAnimations.ts @@ -1,4 +1,4 @@ -import { parse, RootNode, Node } from 'svg-parser'; +import { Node, parse, RootNode } from 'svg-parser'; const objToAttr = (obj: Object) => { return Object.entries(obj || {}) diff --git a/packages/tdev/brython-code/index.ts b/packages/tdev/brython-code/index.ts index e696ffd0e..d26f7eac9 100644 --- a/packages/tdev/brython-code/index.ts +++ b/packages/tdev/brython-code/index.ts @@ -27,14 +27,14 @@ const GRAPHICS_OUTPUT_TESTER = /^(SETUP_)?GRAPHICS_OUTPUT\s*=\s*(True|1)/m; const CANVAS_OUTPUT_TESTER = /^(SETUP_)?CANVAS_OUTPUT\s*=\s*(True|1)/m; export { - DOM_ELEMENT_IDS, BRYTHON_NOTIFICATION_EVENT, + CANVAS_OUTPUT_TESTER, CLOSE_TURTLE_MODAL_EVENT, - TURTLE_IMPORTS_TESTER, + DOM_ELEMENT_IDS, GRAPHICS_OUTPUT_TESTER, - CANVAS_OUTPUT_TESTER, GRID_IMPORTS_TESTER, - TURTLE3D_IMPORTS_TESTER + TURTLE3D_IMPORTS_TESTER, + TURTLE_IMPORTS_TESTER }; declare module '@tdev-api/document' { diff --git a/packages/tdev/brython-code/models/Script.ts b/packages/tdev/brython-code/models/Script.ts index 7bbeeea3f..1846dfb5a 100644 --- a/packages/tdev/brython-code/models/Script.ts +++ b/packages/tdev/brython-code/models/Script.ts @@ -1,12 +1,12 @@ -import { action, computed, observable } from 'mobx'; -import { runCode } from '@tdev/brython-code/components/utils/bryRunner'; -import { Document as DocumentProps, Factory, TypeDataMapping } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; import siteConfig from '@generated/docusaurus.config'; import globalData from '@generated/globalData'; -import _ from 'es-toolkit/compat'; +import { Document as DocumentProps, Factory } from '@tdev-api/document'; +import { LogMessage as _LogMessageType } from '@tdev-components/documents/CodeEditor/Editor/Footer/Logs'; import iCode from '@tdev-models/documents/iCode'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { runCode } from '@tdev/brython-code/components/utils/bryRunner'; import { orderBy } from 'es-toolkit/array'; +import { action, computed, observable } from 'mobx'; import { CANVAS_OUTPUT_TESTER, DOM_ELEMENT_IDS, @@ -15,7 +15,6 @@ import { TURTLE_IMPORTS_TESTER } from '..'; import { ScriptMeta } from './ScriptMeta'; -import { LogMessage as _LogMessageType } from '@tdev-components/documents/CodeEditor/Editor/Footer/Logs'; export const IsBrythonPluginRegistered = 'tdev-brython-code' in globalData; const libDir = IsBrythonPluginRegistered ? (globalData['tdev-brython-code'] as { default: { libDir: string } }).default.libDir diff --git a/packages/tdev/brython-code/models/ScriptMeta.ts b/packages/tdev/brython-code/models/ScriptMeta.ts index 07bf23057..364f91dac 100644 --- a/packages/tdev/brython-code/models/ScriptMeta.ts +++ b/packages/tdev/brython-code/models/ScriptMeta.ts @@ -1,6 +1,5 @@ import { Document as DocumentProps, Factory } from '@tdev-api/document'; import { Props as CodeEditorProps } from '@tdev-components/documents/CodeEditor'; -import _ from 'es-toolkit/compat'; import { default as iScriptMeta } from '@tdev-models/documents/iCode/iCodeMeta'; import Script from './Script'; diff --git a/packages/tdev/brython-code/register.ts b/packages/tdev/brython-code/register.ts index 5efa5d42c..a730337f7 100644 --- a/packages/tdev/brython-code/register.ts +++ b/packages/tdev/brython-code/register.ts @@ -1,9 +1,9 @@ +import { LiveCode } from '@tdev-stores/ComponentStore'; import { rootStore } from '@tdev-stores/rootStore'; -import Header from './components/Header'; import Footer from './components/Footer'; +import Header from './components/Header'; import Meta from './components/Meta'; import { createModel } from './models/Script'; -import { LiveCode } from '@tdev-stores/ComponentStore'; import { ScriptMeta } from './models/ScriptMeta'; const register = () => { diff --git a/packages/tdev/excalidoc/Component/Editor/index.tsx b/packages/tdev/excalidoc/Component/Editor/index.tsx index 158db9cfe..2f68c1afc 100644 --- a/packages/tdev/excalidoc/Component/Editor/index.tsx +++ b/packages/tdev/excalidoc/Component/Editor/index.tsx @@ -1,18 +1,18 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; +import { useColorMode } from '@docusaurus/theme-common'; +import type * as ExcalidrawLib from '@excalidraw/excalidraw'; +import '@excalidraw/excalidraw/index.css'; import type { ExcalidrawImperativeAPI, LibraryItems, NormalizedZoomValue } from '@excalidraw/excalidraw/types'; -import { Source } from '@tdev-models/iDocument'; -import { reaction } from 'mobx'; -import { useColorMode } from '@docusaurus/theme-common'; -import type * as ExcalidrawLib from '@excalidraw/excalidraw'; -import _ from 'es-toolkit/compat'; import { useDocument } from '@tdev-hooks/useDocument'; -import '@excalidraw/excalidraw/index.css'; +import { Source } from '@tdev-models/iDocument'; import { MetaInit } from '@tdev/excalidoc/model/ModelMeta'; +import _ from 'es-toolkit/compat'; +import { reaction } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; export interface Props extends MetaInit { Lib: typeof ExcalidrawLib; documentId: string; diff --git a/packages/tdev/excalidoc/Component/Preview/Image.tsx b/packages/tdev/excalidoc/Component/Preview/Image.tsx index 57e65ba50..94add537a 100644 --- a/packages/tdev/excalidoc/Component/Preview/Image.tsx +++ b/packages/tdev/excalidoc/Component/Preview/Image.tsx @@ -1,8 +1,6 @@ -import React from 'react'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; import styles from './styles.module.scss'; -import _ from 'es-toolkit/compat'; -import clsx from 'clsx'; export interface Props { image?: string; diff --git a/packages/tdev/excalidoc/Component/Preview/index.tsx b/packages/tdev/excalidoc/Component/Preview/index.tsx index da02249a5..9f11688cf 100644 --- a/packages/tdev/excalidoc/Component/Preview/index.tsx +++ b/packages/tdev/excalidoc/Component/Preview/index.tsx @@ -1,8 +1,6 @@ -import React from 'react'; +import { useDocument } from '@tdev-hooks/useDocument'; import { observer } from 'mobx-react-lite'; -import _ from 'es-toolkit/compat'; import Image from './Image'; -import { useDocument } from '@tdev-hooks/useDocument'; export interface Props { documentId: string; diff --git a/packages/tdev/excalidoc/Component/WithCodeEditor/index.tsx b/packages/tdev/excalidoc/Component/WithCodeEditor/index.tsx index 7b816c53a..95a545d45 100644 --- a/packages/tdev/excalidoc/Component/WithCodeEditor/index.tsx +++ b/packages/tdev/excalidoc/Component/WithCodeEditor/index.tsx @@ -1,15 +1,15 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import CodeEditor from '@tdev-components/shared/CodeEditor'; -import { ExcalidocComponent, Props } from '..'; -import { useFirstRealMainDocument } from '@tdev-hooks/useFirstRealMainDocument'; import Loader from '@tdev-components/Loader'; import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import Image from '../Preview/Image'; +import CodeEditor from '@tdev-components/shared/CodeEditor'; +import { useFirstRealMainDocument } from '@tdev-hooks/useFirstRealMainDocument'; import { Source } from '@tdev-models/iDocument'; import { ModelMeta } from '@tdev/excalidoc/model/ModelMeta'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { ExcalidocComponent, Props } from '..'; +import Image from '../Preview/Image'; +import styles from './styles.module.scss'; const ExcalidocWithCodeEditor = observer((props: Props) => { const meta = React.useMemo( diff --git a/packages/tdev/excalidoc/Component/index.tsx b/packages/tdev/excalidoc/Component/index.tsx index a4da60a65..1a2dc9a6d 100644 --- a/packages/tdev/excalidoc/Component/index.tsx +++ b/packages/tdev/excalidoc/Component/index.tsx @@ -1,24 +1,23 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import styles from './styles.module.scss'; +import type * as ExcalidrawLib from '@excalidraw/excalidraw'; +import type { LibraryItems } from '@excalidraw/excalidraw/types'; +import { mdiCircleEditOutline, mdiClose, mdiLoading } from '@mdi/js'; import Loader from '@tdev-components/Loader'; -import { useFirstRealMainDocument } from '@tdev-hooks/useFirstRealMainDocument'; -import _ from 'es-toolkit/compat'; -import Preview from './Preview'; -import Editor from './Editor'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; import SyncStatus from '@tdev-components/SyncStatus'; -import RequestFullscreen from '@tdev-components/shared/RequestFullscreen'; -import { mdiCircleEditOutline, mdiClose, mdiFullscreen, mdiFullscreenExit, mdiLoading } from '@mdi/js'; -import clsx from 'clsx'; import Button from '@tdev-components/shared/Button'; -import type { LibraryItems } from '@excalidraw/excalidraw/types'; -import type * as ExcalidrawLib from '@excalidraw/excalidraw'; -import Image from './Preview/Image'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import { useDocument } from '@tdev-hooks/useDocument'; +import RequestFullscreen from '@tdev-components/shared/RequestFullscreen'; import { useClientLib } from '@tdev-hooks/useClientLib'; -import { MetaInit, ModelMeta } from '@tdev/excalidoc/model/ModelMeta'; +import { useDocument } from '@tdev-hooks/useDocument'; +import { useFirstRealMainDocument } from '@tdev-hooks/useFirstRealMainDocument'; import { useStore } from '@tdev-hooks/useStore'; +import { MetaInit, ModelMeta } from '@tdev/excalidoc/model/ModelMeta'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Editor from './Editor'; +import Preview from './Preview'; +import Image from './Preview/Image'; +import styles from './styles.module.scss'; export const DEFAULT_HEIGHT = '600px' as const; export const mdiExcalidraw = diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/EditorPopup/index.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/EditorPopup/index.tsx index 9f5e4cad3..185541045 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/EditorPopup/index.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/EditorPopup/index.tsx @@ -1,17 +1,17 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Card from '@tdev-components/shared/Card'; -import Popup from 'reactjs-popup'; +import { mdiClose, mdiImageEditOutline } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; -import { mdiClose, mdiImageEditOutline } from '@mdi/js'; -import ImageMarkupEditor from '..'; import requestDocusaurusRootAcess from '@tdev-components/utils/localFS/requestDocusaurusRootAcess'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Popup from 'reactjs-popup'; import type { PopupActions } from 'reactjs-popup/dist/types'; +import ImageMarkupEditor from '..'; import useExcalidrawSource from '../hooks/useExcalidrawSource'; +import styles from './styles.module.scss'; interface Props { src: string; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/MainMenu/index.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/MainMenu/index.tsx index f6cf58676..ee8131a8e 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/MainMenu/index.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/MainMenu/index.tsx @@ -1,9 +1,8 @@ -import React from 'react'; import type * as ExcalidrawLib from '@excalidraw/excalidraw'; import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; -import onSaveCallback, { OnSave } from '../helpers/onSaveCallback'; import { mdiContentSave, mdiImageMove, mdiRestoreAlert } from '@mdi/js'; import Icon from '@mdi/react'; +import onSaveCallback, { OnSave } from '../helpers/onSaveCallback'; interface Props { Lib: typeof ExcalidrawLib; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/DesktopSidebar.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/DesktopSidebar.tsx index fab33505d..47152eb92 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/DesktopSidebar.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/DesktopSidebar.tsx @@ -1,17 +1,17 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import Button from '@tdev-components/shared/Button'; -import Icon from '@mdi/react'; import { - mdiFolderOpen, mdiChevronLeft, mdiChevronRight, mdiFilePlusOutline, + mdiFolderOpen, mdiRenameOutline } from '@mdi/js'; +import Icon from '@mdi/react'; import Dir, { DirType } from '@tdev-components/FileSystem/Dir'; +import Button from '@tdev-components/shared/Button'; import RequestFullscreen from '@tdev-components/shared/RequestFullscreen'; +import clsx from 'clsx'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { fullscreenTargetId: string; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/MobileSidebar.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/MobileSidebar.tsx index 8b2406ea4..a2fcd0582 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/MobileSidebar.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/MobileSidebar.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import Button from '@tdev-components/shared/Button'; +import { mdiClose, mdiFilePlusOutline, mdiFileTree, mdiFolderOpen, mdiRenameOutline } from '@mdi/js'; import Icon from '@mdi/react'; -import { mdiFolderOpen, mdiFileTree, mdiClose, mdiFilePlusOutline, mdiRenameOutline } from '@mdi/js'; import Dir, { DirType } from '@tdev-components/FileSystem/Dir'; +import Button from '@tdev-components/shared/Button'; import RequestFullscreen from '@tdev-components/shared/RequestFullscreen'; +import clsx from 'clsx'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { fullscreenTargetId: string; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/index.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/index.tsx index 44ace06dc..854111c22 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/index.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/StandaloneEditor/index.tsx @@ -1,24 +1,24 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import useIsMobileView from '@tdev-hooks/useIsMobileView'; -import ImageMarkupEditor from '..'; +import { localDb } from '@tdev-api/base'; +import type { DirType } from '@tdev-components/FileSystem/Dir'; +import Alert from '@tdev-components/shared/Alert'; import requestLocalDirectoryAccess, { restoreAccess } from '@tdev-components/utils/localFS/requestLocalDirectoryAccess'; -import { localDb } from '@tdev-api/base'; -import type { DirType } from '@tdev-components/FileSystem/Dir'; import { FullscreenContext } from '@tdev-hooks/useFullscreenTargetId'; -import { IMAGE_RE } from '../helpers/constants'; +import useIsMobileView from '@tdev-hooks/useIsMobileView'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import ImageMarkupEditor from '..'; import buildImageTree from '../helpers/buildImageTree'; +import { IMAGE_RE } from '../helpers/constants'; import useCreateNewDrawing from '../hooks/useCreateNewDrawing'; -import useRenameImage from '../hooks/useRenameImage'; import useExcalidrawSource from '../hooks/useExcalidrawSource'; -import Alert from '@tdev-components/shared/Alert'; +import useRenameImage from '../hooks/useRenameImage'; import DesktopSidebar from './DesktopSidebar'; import MobileSidebar from './MobileSidebar'; +import styles from './styles.module.scss'; interface Props { className?: string; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/ChangeSrcPopup/ChangeSrc.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/ChangeSrcPopup/ChangeSrc.tsx index dd46a7d79..a05c99d41 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/ChangeSrcPopup/ChangeSrc.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/ChangeSrcPopup/ChangeSrc.tsx @@ -1,6 +1,9 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { OrderedExcalidrawElement } from '@excalidraw/excalidraw/element/types'; +import type { + BinaryFileData, + ExcalidrawImperativeAPI, + ExcalidrawInitialDataState +} from '@excalidraw/excalidraw/types'; import { mdiButtonCursor, mdiClipboardFileOutline, @@ -8,15 +11,13 @@ import { mdiCloudArrowUpOutline, mdiFileUploadOutline } from '@mdi/js'; -import Card from '@tdev-components/shared/Card'; -import Button from '@tdev-components/shared/Button'; import Icon from '@mdi/react'; -import type { - BinaryFileData, - ExcalidrawImperativeAPI, - ExcalidrawInitialDataState -} from '@excalidraw/excalidraw/types'; +import Alert from '@tdev-components/shared/Alert'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; import fileToDataUrl from '@tdev-components/utils/localFS/fileToDataUrl'; +import getImageDimensions from '@tdev-components/utils/localFS/getImageDimensions'; import { type CustomData, EXCALIDRAW_BACKGROUND_FILE_ID, @@ -24,15 +25,14 @@ import { EXCALIDRAW_IMAGE_RECTANGLE_ID, EXCALIDRAW_MAX_WIDTH } from '@tdev/excalidoc/ImageMarkupEditor/helpers/constants'; -import { OrderedExcalidrawElement } from '@excalidraw/excalidraw/element/types'; -import getImageDimensions from '@tdev-components/utils/localFS/getImageDimensions'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; -import Alert from '@tdev-components/shared/Alert'; import { getImageElementFromScene, getImageFileFromScene, getRectangleElementFromScene } from '@tdev/excalidoc/ImageMarkupEditor/helpers/getElementsFromScene'; +import clsx from 'clsx'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { api: ExcalidrawImperativeAPI; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/ChangeSrcPopup/index.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/ChangeSrcPopup/index.tsx index e7b60a5bc..99b277490 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/ChangeSrcPopup/index.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/ChangeSrcPopup/index.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import clsx from 'clsx'; -import { PopupActions } from 'reactjs-popup/dist/types'; -import Popup from 'reactjs-popup'; +import type { ExcalidrawImperativeAPI, ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; import { mdiFileReplace } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; -import type { ExcalidrawImperativeAPI, ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; +import clsx from 'clsx'; +import React from 'react'; +import Popup from 'reactjs-popup'; +import { PopupActions } from 'reactjs-popup/dist/types'; import ChangeSrc from './ChangeSrc'; interface Props { diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/UpdateCustomProps/index.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/UpdateCustomProps/index.tsx index 9613c64dd..90d757f06 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/UpdateCustomProps/index.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/UpdateCustomProps/index.tsx @@ -1,15 +1,15 @@ -import React from 'react'; -import clsx from 'clsx'; -import { PopupActions } from 'reactjs-popup/dist/types'; -import Popup from 'reactjs-popup'; +import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; import { mdiCog } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; import JsObjectEditor from '@tdev-components/shared/JsObject/Editor'; -import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; -import { getMetaElementFromScene } from '../../helpers/getElementsFromScene'; -import { getCustomProps, CustomProps, updateCustomProps } from '../../helpers/customProps'; import { JsTypes } from '@tdev-components/shared/JsObject/toJsSchema'; -import Card from '@tdev-components/shared/Card'; +import clsx from 'clsx'; +import React from 'react'; +import Popup from 'reactjs-popup'; +import { PopupActions } from 'reactjs-popup/dist/types'; +import { CustomProps, getCustomProps, updateCustomProps } from '../../helpers/customProps'; +import { getMetaElementFromScene } from '../../helpers/getElementsFromScene'; interface Props { api: ExcalidrawImperativeAPI; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/index.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/index.tsx index 3a6d8e88d..20b247639 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/index.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/TopRightUi/index.tsx @@ -1,8 +1,6 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; import type * as ExcalidrawLib from '@excalidraw/excalidraw'; -import { observer } from 'mobx-react-lite'; +import type { ExcalidrawFreeDrawElement, ExcalidrawTextElement } from '@excalidraw/excalidraw/element/types'; +import type { ExcalidrawImperativeAPI, ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; import { mdiContentSave, mdiDraw, @@ -12,15 +10,16 @@ import { mdiMinus, mdiPlus } from '@mdi/js'; +import Icon from '@mdi/react'; import Button from '@tdev-components/shared/Button'; -import type { ExcalidrawImperativeAPI, ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import { getSelectedStrokeElements } from '../helpers/getSelectedStrokeElements'; -import updateElementsWith from '../helpers/updateElementsWith'; import restoreElementsWith from '../helpers/restoreElementsWith'; -import type { ExcalidrawFreeDrawElement, ExcalidrawTextElement } from '@excalidraw/excalidraw/element/types'; +import updateElementsWith from '../helpers/updateElementsWith'; import ChangeSrcPopup from './ChangeSrcPopup'; -import Icon from '@mdi/react'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import styles from './styles.module.scss'; import UpdateCustomProps from './UpdateCustomProps'; interface Props { diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/createExcalidrawMarkup.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/createExcalidrawMarkup.ts index 6052c1371..9dea0a123 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/createExcalidrawMarkup.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/createExcalidrawMarkup.ts @@ -1,21 +1,21 @@ -import fileToDataUrl from '@tdev-components/utils/localFS/fileToDataUrl'; -import getImageDimensions from '@tdev-components/utils/localFS/getImageDimensions'; import type { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; import type { BinaryFileData, ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; +import fileToDataUrl from '@tdev-components/utils/localFS/fileToDataUrl'; +import getImageDimensions from '@tdev-components/utils/localFS/getImageDimensions'; import { + CustomData, + EXCALIDRAW_BACKGROUND_FILE, EXCALIDRAW_BACKGROUND_FILE_ID, + EXCALIDRAW_BACKGROUND_IMAGE, EXCALIDRAW_BACKGROUND_IMAGE_ID, - EXCALIDRAW_IMAGE_RECTANGLE_ID, EXCALIDRAW_IMAGE_RECTANGLE, - EXCALIDRAW_BACKGROUND_FILE, - EXCALIDRAW_BACKGROUND_IMAGE, + EXCALIDRAW_IMAGE_RECTANGLE_ID, EXCALIDRAW_MAX_WIDTH, - CustomData, EXCALIDRAW_STANDALONE_DRAWING_ID, EXCALIDRAW_STANDALONE_DRAWING_RECTANGLE } from './constants'; -import { withoutMetaElements } from './getElementsFromScene'; import { getBoundingRect } from './getBoundingRect'; +import { withoutMetaElements } from './getElementsFromScene'; export const createExcalidrawMarkup = async ( imgFileHandle: FileSystemFileHandle diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/customProps.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/customProps.ts index 53068e2ba..de1a19899 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/customProps.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/customProps.ts @@ -1,7 +1,7 @@ import { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; +import { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; import { EXCALIDRAW_EXPORT_QUALITY, EXCALIDRAW_MAX_EXPORT_WIDTH } from './constants'; import { getBoundingRect } from './getBoundingRect'; -import { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; import { getMetaElementFromScene } from './getElementsFromScene'; import updateElementsWith from './updateElementsWith'; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/ensureDir.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/ensureDir.ts index 9e864ddff..476044ed9 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/ensureDir.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/ensureDir.ts @@ -1,5 +1,5 @@ import { promises as fs } from 'fs'; -import { dirname, sep, normalize } from 'path'; +import { dirname, normalize, sep } from 'path'; /** * Ensures that the directory for the given path exists. diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getBoundingRect.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getBoundingRect.ts index 8fe2ad11f..b47f78dbc 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getBoundingRect.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getBoundingRect.ts @@ -1,4 +1,4 @@ -import { ExcalidrawElement, ExcalidrawFreeDrawElement } from '@excalidraw/excalidraw/element/types'; +import { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; interface Rect { x: number; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getElementsFromScene.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getElementsFromScene.ts index dd01f68ee..c6fb80893 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getElementsFromScene.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getElementsFromScene.ts @@ -6,13 +6,13 @@ import type { Ordered, OrderedExcalidrawElement } from '@excalidraw/excalidraw/element/types'; +import type { BinaryFileData, BinaryFiles } from '@excalidraw/excalidraw/types'; import { EXCALIDRAW_BACKGROUND_FILE_ID, EXCALIDRAW_BACKGROUND_IMAGE_ID, EXCALIDRAW_IMAGE_RECTANGLE_ID, EXCALIDRAW_STANDALONE_DRAWING_ID } from './constants'; -import type { BinaryFileData, BinaryFiles } from '@excalidraw/excalidraw/types'; export const getImageElementFromScene = ( elements: readonly (OrderedExcalidrawElement | ExcalidrawElement)[] diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getSelectedStrokeElements.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getSelectedStrokeElements.ts index bf317f7ad..42eddd205 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getSelectedStrokeElements.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/getSelectedStrokeElements.ts @@ -1,5 +1,5 @@ -import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; import { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; +import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; import { EXCALIDRAW_STROKE_TYPES } from './constants'; export const getSelectedStrokeElements = (api: ExcalidrawImperativeAPI): ExcalidrawElement[] => { diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/onSaveCallback.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/onSaveCallback.ts index ba0f65ca0..c42bff639 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/onSaveCallback.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/onSaveCallback.ts @@ -1,13 +1,13 @@ -import type { ExcalidrawImperativeAPI, ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; -import { EXCALIDRAW_BACKGROUND_FILE_ID, EXCALIDRAW_STANDALONE_DRAWING_ID } from './constants'; import type * as ExcalidrawLib from '@excalidraw/excalidraw'; -import { getImageElementFromScene, withoutMetaElements } from './getElementsFromScene'; import type { ExcalidrawImageElement, NonDeletedExcalidrawElement, Ordered } from '@excalidraw/excalidraw/element/types'; +import type { ExcalidrawImperativeAPI, ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; +import { EXCALIDRAW_BACKGROUND_FILE_ID, EXCALIDRAW_STANDALONE_DRAWING_ID } from './constants'; import { getCustomProps } from './customProps'; +import { getImageElementFromScene, withoutMetaElements } from './getElementsFromScene'; export type OnSave = (data: ExcalidrawInitialDataState, blob: Blob, asWebp: boolean) => void; const withBackgroundImage = ( diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/restoreElementsWith.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/restoreElementsWith.ts index 7817dd5d4..11d52a08d 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/restoreElementsWith.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/restoreElementsWith.ts @@ -1,6 +1,6 @@ -import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; import type * as ExcalidrawLib from '@excalidraw/excalidraw'; import { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; +import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; const restoreElementsWith = ( restoreFn: typeof ExcalidrawLib.restoreElements, diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/restoreExcalidrawFromFs.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/restoreExcalidrawFromFs.ts index d57bb5a92..451f02261 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/restoreExcalidrawFromFs.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/restoreExcalidrawFromFs.ts @@ -1,9 +1,9 @@ -import type { ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; import type { OrderedExcalidrawElement } from '@excalidraw/excalidraw/element/types'; +import type { ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; import requestFileHandle from '@tdev-components/utils/localFS/requestFileHandle'; -import { getImageElementFromScene, getImageFileFromScene } from './getElementsFromScene'; -import dataUrlToBlob from './dataUrlToBlob'; import { CustomData } from './constants'; +import dataUrlToBlob from './dataUrlToBlob'; +import { getImageElementFromScene, getImageFileFromScene } from './getElementsFromScene'; import writeFileHandle from './writeFileHandle'; /** diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/updateElementsWith.ts b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/updateElementsWith.ts index e2e70eb79..317e60b01 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/helpers/updateElementsWith.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/helpers/updateElementsWith.ts @@ -1,5 +1,5 @@ -import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; import { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; +import type { ExcalidrawImperativeAPI } from '@excalidraw/excalidraw/types'; const updateElementsWith = ( api: ExcalidrawImperativeAPI, diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useCreateNewDrawing.ts b/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useCreateNewDrawing.ts index 208c237f3..a0d2e4355 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useCreateNewDrawing.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useCreateNewDrawing.ts @@ -1,9 +1,9 @@ -import React from 'react'; import type { ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; import type { DirType } from '@tdev-components/FileSystem/Dir'; +import React from 'react'; +import buildImageTree from '../helpers/buildImageTree'; import { NEW_EXCALIDRAW_DRAWING, VALID_EXPORT_EXTENSIONS } from '../helpers/constants'; import writeFileHandle from '../helpers/writeFileHandle'; -import buildImageTree from '../helpers/buildImageTree'; const DEFAULT_IMAGES: Record = { '.png': require('../../Component/Preview/images/excalidraw-logo.png').default, diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useExcalidrawSource.ts b/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useExcalidrawSource.ts index 14c74f6c0..88c01ebae 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useExcalidrawSource.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useExcalidrawSource.ts @@ -1,9 +1,9 @@ -import React from 'react'; import type { ExcalidrawInitialDataState } from '@excalidraw/excalidraw/types'; +import React from 'react'; import extractExalidrawImageName from '../helpers/extractExalidrawImageName'; import loadExcalidrawState from '../helpers/loadExcalidrawState'; -import saveExcalidrawToFs from '../helpers/saveExcalidrawToFs'; import restoreExcalidrawFromFs from '../helpers/restoreExcalidrawFromFs'; +import saveExcalidrawToFs from '../helpers/saveExcalidrawToFs'; const useExcalidrawSource = (root: FileSystemDirectoryHandle | null, src: string | null) => { const [excaliState, setExcaliState] = React.useState(null); diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useRenameImage.ts b/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useRenameImage.ts index 2ecd96789..a76bc5040 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useRenameImage.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/hooks/useRenameImage.ts @@ -1,8 +1,8 @@ -import React from 'react'; import type { DirType } from '@tdev-components/FileSystem/Dir'; -import writeFileHandle from '../helpers/writeFileHandle'; -import buildImageTree from '../helpers/buildImageTree'; import requestFileHandle from '@tdev-components/utils/localFS/requestFileHandle'; +import React from 'react'; +import buildImageTree from '../helpers/buildImageTree'; +import writeFileHandle from '../helpers/writeFileHandle'; const useRenameImage = ( dirHandle: FileSystemDirectoryHandle | null, diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/index.tsx b/packages/tdev/excalidoc/ImageMarkupEditor/index.tsx index e41e6f74c..060d65b08 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/index.tsx +++ b/packages/tdev/excalidoc/ImageMarkupEditor/index.tsx @@ -1,24 +1,23 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import { useClientLib } from '@tdev-hooks/useClientLib'; +import { useColorMode } from '@docusaurus/theme-common'; import type * as ExcalidrawLib from '@excalidraw/excalidraw'; -import Loader from '@tdev-components/Loader'; +import { ExcalidrawFreeDrawElement } from '@excalidraw/excalidraw/element/types'; import type { ExcalidrawImperativeAPI, ExcalidrawInitialDataState, NormalizedZoomValue } from '@excalidraw/excalidraw/types'; -import { useColorMode } from '@docusaurus/theme-common'; -import _ from 'es-toolkit/compat'; +import Loader from '@tdev-components/Loader'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; +import { useClientLib } from '@tdev-hooks/useClientLib'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import { EXCALIDRAW_RED } from './helpers/constants'; -import onSaveCallback, { OnSave } from './helpers/onSaveCallback'; +import { getImageElementFromScene } from './helpers/getElementsFromScene'; import { getSelectedStrokeElements } from './helpers/getSelectedStrokeElements'; import getSelectedTextElementId from './helpers/getSelectedTextElementId'; -import TopRightUi from './TopRightUi'; +import onSaveCallback, { OnSave } from './helpers/onSaveCallback'; import MainMenu from './MainMenu'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; -import { getImageElementFromScene } from './helpers/getElementsFromScene'; -import { ExcalidrawFreeDrawElement } from '@excalidraw/excalidraw/element/types'; +import TopRightUi from './TopRightUi'; interface Props { mimeType: string; diff --git a/packages/tdev/excalidoc/ImageMarkupEditor/onNewExcalidrawSketch.ts b/packages/tdev/excalidoc/ImageMarkupEditor/onNewExcalidrawSketch.ts index b2b4f207e..32f134102 100644 --- a/packages/tdev/excalidoc/ImageMarkupEditor/onNewExcalidrawSketch.ts +++ b/packages/tdev/excalidoc/ImageMarkupEditor/onNewExcalidrawSketch.ts @@ -1,9 +1,9 @@ -import { OnBrokenMarkdownImagesFunction } from '@docusaurus/types'; import { logger } from '@docusaurus/logger'; +import { OnBrokenMarkdownImagesFunction } from '@docusaurus/types'; +import { promises as fs } from 'fs'; import path from 'path'; import { NEW_EXCALIDRAW_DRAWING, VALID_EXPORT_EXTENSIONS } from './helpers/constants'; import { ensureDir } from './helpers/ensureDir'; -import { promises as fs } from 'fs'; const reportBrokenImage = (params: Parameters[0]) => { const cwd = process.cwd(); diff --git a/packages/tdev/excalidoc/index.ts b/packages/tdev/excalidoc/index.ts index 2efeb6eb6..ecc4b8f4f 100644 --- a/packages/tdev/excalidoc/index.ts +++ b/packages/tdev/excalidoc/index.ts @@ -1,7 +1,7 @@ -import path from 'path'; import type { PluginConfig, PluginModule } from '@docusaurus/types'; -import type { BinaryFiles } from '@excalidraw/excalidraw/types'; import type { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; +import type { BinaryFiles } from '@excalidraw/excalidraw/types'; +import path from 'path'; import Excalidoc from './model'; export interface ExcaliData { files: BinaryFiles; diff --git a/packages/tdev/excalidoc/model/ModelMeta.ts b/packages/tdev/excalidoc/model/ModelMeta.ts index 8dbf83f32..4699ed4c8 100644 --- a/packages/tdev/excalidoc/model/ModelMeta.ts +++ b/packages/tdev/excalidoc/model/ModelMeta.ts @@ -1,7 +1,7 @@ -import { TypeDataMapping, Access } from '@tdev-api/document'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; import type { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; import type { BinaryFiles } from '@excalidraw/excalidraw/types'; +import { TypeDataMapping } from '@tdev-api/document'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; import { computed } from 'mobx'; export interface MetaInit { diff --git a/packages/tdev/excalidoc/model/index.ts b/packages/tdev/excalidoc/model/index.ts index 817772271..bda4a7a27 100644 --- a/packages/tdev/excalidoc/model/index.ts +++ b/packages/tdev/excalidoc/model/index.ts @@ -1,11 +1,11 @@ -import { action, computed, observableRef } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; -import { Document as DocumentProps, TypeDataMapping, Factory } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; import type { exportToBlob } from '@excalidraw/excalidraw'; import type { ExcalidrawElement } from '@excalidraw/excalidraw/element/types'; import type { BinaryFiles } from '@excalidraw/excalidraw/types'; -import { ModelMeta, MetaInit } from './ModelMeta'; +import { Document as DocumentProps, Factory, TypeDataMapping } from '@tdev-api/document'; +import iDocument, { Source } from '@tdev-models/iDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed, observableRef } from 'mobx'; +import { ModelMeta } from './ModelMeta'; import { blobToBase64 } from './helpers'; type ExportToBlobArgs = Parameters[0]; type ExportToBlobReturn = ReturnType; diff --git a/packages/tdev/material-sync/src/add.ts b/packages/tdev/material-sync/src/add.ts index 7018dcd9e..b75c4d366 100644 --- a/packages/tdev/material-sync/src/add.ts +++ b/packages/tdev/material-sync/src/add.ts @@ -1,6 +1,6 @@ +import minimist from 'minimist'; import fs from 'node:fs'; import { exit } from 'node:process'; -import minimist from 'minimist'; import { DOC_PATHS, loadMaterialConfig, diff --git a/packages/tdev/material-sync/src/add_class.ts b/packages/tdev/material-sync/src/add_class.ts index 4ecb6d2f3..d3fbc16b1 100644 --- a/packages/tdev/material-sync/src/add_class.ts +++ b/packages/tdev/material-sync/src/add_class.ts @@ -1,9 +1,9 @@ -import path from 'node:path'; -import fs from 'node:fs/promises'; -import { loadMaterialConfig, pathExists, REPO_ROOT, saveMaterialConfig } from './helpers/index.js'; import minimist from 'minimist'; -import { exit } from 'node:process'; import crypto from 'node:crypto'; +import fs from 'node:fs/promises'; +import path from 'node:path'; +import { exit } from 'node:process'; +import { loadMaterialConfig, pathExists, REPO_ROOT, saveMaterialConfig } from './helpers/index.js'; process.chdir(REPO_ROOT); const configs = loadMaterialConfig(); diff --git a/packages/tdev/material-sync/src/cleanup.ts b/packages/tdev/material-sync/src/cleanup.ts index 2a13dec63..227f79625 100644 --- a/packages/tdev/material-sync/src/cleanup.ts +++ b/packages/tdev/material-sync/src/cleanup.ts @@ -1,6 +1,6 @@ +import minimist from 'minimist'; import fs from 'node:fs'; import path from 'node:path'; -import minimist from 'minimist'; import { loadMaterialConfig, REPO_ROOT, resolveMaterialConfig } from './helpers/index.js'; process.chdir(REPO_ROOT); diff --git a/packages/tdev/material-sync/src/helpers/index.ts b/packages/tdev/material-sync/src/helpers/index.ts index 961990738..17c7f913b 100644 --- a/packages/tdev/material-sync/src/helpers/index.ts +++ b/packages/tdev/material-sync/src/helpers/index.ts @@ -1,9 +1,9 @@ +import { dump as yamlDump, load as yamlLoad } from 'js-yaml'; import fs from 'node:fs'; import fsp from 'node:fs/promises'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; import Rsync from 'rsync'; -import { load as yamlLoad, dump as yamlDump } from 'js-yaml'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); diff --git a/packages/tdev/material-sync/src/helpers/resolveEditUrl.ts b/packages/tdev/material-sync/src/helpers/resolveEditUrl.ts index 73cac4b7a..c19ee205e 100644 --- a/packages/tdev/material-sync/src/helpers/resolveEditUrl.ts +++ b/packages/tdev/material-sync/src/helpers/resolveEditUrl.ts @@ -1,6 +1,6 @@ import { type EditUrlFunction } from '@docusaurus/plugin-content-docs'; -import { loadMaterialConfig, normalizeMaterialConfig } from './index.js'; import path from 'path'; +import { loadMaterialConfig, normalizeMaterialConfig } from './index.js'; const ensureLeadingSlash = (str: string) => { return str.startsWith('/') ? str : `/${str}`; diff --git a/packages/tdev/material-sync/src/prepare_archive.ts b/packages/tdev/material-sync/src/prepare_archive.ts index 9e1be3e97..ded31281a 100644 --- a/packages/tdev/material-sync/src/prepare_archive.ts +++ b/packages/tdev/material-sync/src/prepare_archive.ts @@ -1,9 +1,9 @@ -import path from 'node:path'; -import fs from 'node:fs/promises'; -import { loadMaterialConfig, REPO_ROOT } from './helpers/index.js'; import minimist from 'minimist'; -import { exit } from 'node:process'; import crypto from 'node:crypto'; +import fs from 'node:fs/promises'; +import path from 'node:path'; +import { exit } from 'node:process'; +import { loadMaterialConfig, REPO_ROOT } from './helpers/index.js'; process.chdir(REPO_ROOT); const configs = loadMaterialConfig(); diff --git a/packages/tdev/material-sync/src/remove.ts b/packages/tdev/material-sync/src/remove.ts index cd90ab3df..6d52372fc 100644 --- a/packages/tdev/material-sync/src/remove.ts +++ b/packages/tdev/material-sync/src/remove.ts @@ -1,6 +1,6 @@ +import minimist from 'minimist'; import fs from 'node:fs'; import path from 'node:path'; -import minimist from 'minimist'; import { docBasePath, ensureTrailingSlash, diff --git a/packages/tdev/migrate-tdev/actions/format.action.ts b/packages/tdev/migrate-tdev/actions/format.action.ts index 7e62aa101..666d54e5d 100644 --- a/packages/tdev/migrate-tdev/actions/format.action.ts +++ b/packages/tdev/migrate-tdev/actions/format.action.ts @@ -1,5 +1,5 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; +import { MigrationRunner } from '../src/constants'; const migrate: MigrationRunner = async (root, name): Promise => { const $ = execa({ stdio: 'inherit' }); diff --git a/packages/tdev/migrate-tdev/actions/git.status.ts b/packages/tdev/migrate-tdev/actions/git.status.ts index 7aee541ce..6ed2c9736 100644 --- a/packages/tdev/migrate-tdev/actions/git.status.ts +++ b/packages/tdev/migrate-tdev/actions/git.status.ts @@ -1,5 +1,5 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; +import { MigrationRunner } from '../src/constants'; const migrate: MigrationRunner = async (root, name): Promise => { const $ = execa({ stdio: 'inherit' }); diff --git a/packages/tdev/migrate-tdev/actions/reinstall.action.ts b/packages/tdev/migrate-tdev/actions/reinstall.action.ts index d39ded056..382429e46 100644 --- a/packages/tdev/migrate-tdev/actions/reinstall.action.ts +++ b/packages/tdev/migrate-tdev/actions/reinstall.action.ts @@ -1,5 +1,5 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; +import { MigrationRunner } from '../src/constants'; const migrate: MigrationRunner = async (root, name): Promise => { const $ = execa({ stdio: 'inherit' }); diff --git a/packages/tdev/migrate-tdev/actions/updateTdev.action.ts b/packages/tdev/migrate-tdev/actions/updateTdev.action.ts index c3c98778c..7932bd79a 100644 --- a/packages/tdev/migrate-tdev/actions/updateTdev.action.ts +++ b/packages/tdev/migrate-tdev/actions/updateTdev.action.ts @@ -1,5 +1,5 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; +import { MigrationRunner } from '../src/constants'; import { hasUncommittedChanges } from '../src/helpers/gitHelpers'; const migrate: MigrationRunner = async (root, name, ts, conf, argv): Promise => { diff --git a/packages/tdev/migrate-tdev/migrations/2026-07-11-upgrade-tdev.done.ts b/packages/tdev/migrate-tdev/migrations/2026-07-11-upgrade-tdev.done.ts index c7333ee59..bc56fa3c6 100644 --- a/packages/tdev/migrate-tdev/migrations/2026-07-11-upgrade-tdev.done.ts +++ b/packages/tdev/migrate-tdev/migrations/2026-07-11-upgrade-tdev.done.ts @@ -1,8 +1,8 @@ +import { execa } from 'execa'; import { MigrationRunner } from '../src/constants'; +import { ensureTdevConfig, modifyPackages } from '../src/helpers/actions'; import { packageJson, updateTdevConfig } from '../src/helpers/loadFile'; -import { execa } from 'execa'; import { writePackageJson, writeUpdateTdevConfig } from '../src/helpers/writeFile'; -import { ensureTdevConfig, modifyPackages } from '../src/helpers/actions'; const migrate: MigrationRunner = async (root, name): Promise => { const $ = execa({ stdio: 'inherit' }); diff --git a/packages/tdev/migrate-tdev/migrations/2026-07-12-upgrade-docusaurus-v3.10.2.done.ts b/packages/tdev/migrate-tdev/migrations/2026-07-12-upgrade-docusaurus-v3.10.2.done.ts index 9c0065b6c..e607f4489 100644 --- a/packages/tdev/migrate-tdev/migrations/2026-07-12-upgrade-docusaurus-v3.10.2.done.ts +++ b/packages/tdev/migrate-tdev/migrations/2026-07-12-upgrade-docusaurus-v3.10.2.done.ts @@ -1,8 +1,8 @@ +import { execa } from 'execa'; import { MigrationRunner } from '../src/constants'; +import { modifyPackages } from '../src/helpers/actions'; import { packageJson } from '../src/helpers/loadFile'; -import { execa } from 'execa'; import { writePackageJson } from '../src/helpers/writeFile'; -import { modifyPackages } from '../src/helpers/actions'; const migrate: MigrationRunner = async (root, name): Promise => { const $ = execa({ stdio: 'inherit' }); diff --git a/packages/tdev/migrate-tdev/migrations/2026-07-14-upgrade-tdev.done.ts b/packages/tdev/migrate-tdev/migrations/2026-07-14-upgrade-tdev.done.ts index 909745d53..114137891 100644 --- a/packages/tdev/migrate-tdev/migrations/2026-07-14-upgrade-tdev.done.ts +++ b/packages/tdev/migrate-tdev/migrations/2026-07-14-upgrade-tdev.done.ts @@ -1,5 +1,5 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; +import { MigrationRunner } from '../src/constants'; const migrate: MigrationRunner = async (root, name): Promise => { const $ = execa({ stdio: 'inherit' }); diff --git a/packages/tdev/migrate-tdev/migrations/2026-07-15-fix-mdx-default-components.done.ts b/packages/tdev/migrate-tdev/migrations/2026-07-15-fix-mdx-default-components.done.ts index 2b7b5a34a..84018f5f2 100644 --- a/packages/tdev/migrate-tdev/migrations/2026-07-15-fix-mdx-default-components.done.ts +++ b/packages/tdev/migrate-tdev/migrations/2026-07-15-fix-mdx-default-components.done.ts @@ -1,7 +1,7 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; -import { updateTdevConfig } from '../src/helpers/loadFile'; +import { MigrationRunner } from '../src/constants'; import { ensureTdevConfig } from '../src/helpers/actions'; +import { updateTdevConfig } from '../src/helpers/loadFile'; import { writeUpdateTdevConfig } from '../src/helpers/writeFile'; const migrate: MigrationRunner = async (root, name): Promise => { diff --git a/packages/tdev/migrate-tdev/migrations/2026-08-04-include-presentation-mode.done.ts b/packages/tdev/migrate-tdev/migrations/2026-08-04-include-presentation-mode.done.ts index 230ddc80d..363b95a39 100644 --- a/packages/tdev/migrate-tdev/migrations/2026-08-04-include-presentation-mode.done.ts +++ b/packages/tdev/migrate-tdev/migrations/2026-08-04-include-presentation-mode.done.ts @@ -1,11 +1,11 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; -import { packageJson, updateTdevConfig } from '../src/helpers/loadFile'; +import { MigrationRunner } from '../src/constants'; import { ensureTdevConfig, modifyPackages } from '../src/helpers/actions'; -import { writePackageJson, writeUpdateTdevConfig } from '../src/helpers/writeFile'; import { filesContainingMatch } from '../src/helpers/filesContainingMatch'; -import { applySearchAndReplace } from '../src/helpers/searchAndReplace'; import { hasUncommittedChanges } from '../src/helpers/gitHelpers'; +import { packageJson, updateTdevConfig } from '../src/helpers/loadFile'; +import { applySearchAndReplace } from '../src/helpers/searchAndReplace'; +import { writePackageJson, writeUpdateTdevConfig } from '../src/helpers/writeFile'; const migrate: MigrationRunner = async (root, name): Promise => { const $ = execa({ stdio: 'inherit' }); diff --git a/packages/tdev/migrate-tdev/migrations/2026-08-05-move-migration-tools-to-package.done.ts b/packages/tdev/migrate-tdev/migrations/2026-08-05-move-migration-tools-to-package.done.ts index bbe792032..60c5ab7a5 100644 --- a/packages/tdev/migrate-tdev/migrations/2026-08-05-move-migration-tools-to-package.done.ts +++ b/packages/tdev/migrate-tdev/migrations/2026-08-05-move-migration-tools-to-package.done.ts @@ -1,7 +1,7 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; -import { updateTdevConfig } from '../src/helpers/loadFile'; +import { MigrationRunner } from '../src/constants'; import { ensureTdevConfig } from '../src/helpers/actions'; +import { updateTdevConfig } from '../src/helpers/loadFile'; import { writeUpdateTdevConfig } from '../src/helpers/writeFile'; const migrate: MigrationRunner = async (root, name): Promise => { diff --git a/packages/tdev/migrate-tdev/migrations/2026-08-06-fix-landing-page.done.ts b/packages/tdev/migrate-tdev/migrations/2026-08-06-fix-landing-page.done.ts index c4ad1d91b..4cdb91a32 100644 --- a/packages/tdev/migrate-tdev/migrations/2026-08-06-fix-landing-page.done.ts +++ b/packages/tdev/migrate-tdev/migrations/2026-08-06-fix-landing-page.done.ts @@ -1,7 +1,7 @@ -import { MigrationRunner } from '../src/constants'; import { execa } from 'execa'; -import { updateTdevConfig } from '../src/helpers/loadFile'; +import { MigrationRunner } from '../src/constants'; import { ensureTdevConfig } from '../src/helpers/actions'; +import { updateTdevConfig } from '../src/helpers/loadFile'; import { writeUpdateTdevConfig } from '../src/helpers/writeFile'; const migrate: MigrationRunner = async (root, name): Promise => { diff --git a/packages/tdev/migrate-tdev/src/constants.ts b/packages/tdev/migrate-tdev/src/constants.ts index 78e2f23c7..486c54dc0 100644 --- a/packages/tdev/migrate-tdev/src/constants.ts +++ b/packages/tdev/migrate-tdev/src/constants.ts @@ -1,7 +1,7 @@ +import type { ParsedArgs } from 'minimist'; import path from 'node:path'; import { fileURLToPath } from 'node:url'; import { REPO_ROOT } from './helpers/base.js'; -import type { ParsedArgs } from 'minimist'; const __dirname = path.dirname(fileURLToPath(import.meta.url)); export const MIGRATION_CONFIG_NAME = 'migrateTdev.config.yaml'; export const MIGRATION_CONFIG_PATH = path.join(REPO_ROOT, MIGRATION_CONFIG_NAME); diff --git a/packages/tdev/migrate-tdev/src/helpers/actions.ts b/packages/tdev/migrate-tdev/src/helpers/actions.ts index 45fb6a4d0..5deae9ecf 100644 --- a/packages/tdev/migrate-tdev/src/helpers/actions.ts +++ b/packages/tdev/migrate-tdev/src/helpers/actions.ts @@ -1,7 +1,7 @@ import type { Config } from '@site/updateSync/types.js'; -import { type PackageJson } from './loadFile.js'; import { execa } from 'execa'; import { hasUncommittedChanges } from './gitHelpers.js'; +import { type PackageJson } from './loadFile.js'; export const ensureTdevConfig = (config: Config, ensure: Config['trackedElements']) => { for (const element of ensure) { diff --git a/packages/tdev/migrate-tdev/src/helpers/loadFile.ts b/packages/tdev/migrate-tdev/src/helpers/loadFile.ts index 3aa0c9fb3..653d4b78a 100644 --- a/packages/tdev/migrate-tdev/src/helpers/loadFile.ts +++ b/packages/tdev/migrate-tdev/src/helpers/loadFile.ts @@ -1,7 +1,7 @@ -import path from 'node:path'; -import fs from 'node:fs/promises'; -import { load as yamlLoad } from 'js-yaml'; import type { Config } from '@site/updateSync/types.js'; +import { load as yamlLoad } from 'js-yaml'; +import fs from 'node:fs/promises'; +import path from 'node:path'; // add overload signatures for loadFile function: `${string}.json` and `${string}.yaml` or `${string}.yml` should return a Promise and any other string should return a Promise diff --git a/packages/tdev/migrate-tdev/src/helpers/readOrCreateMigrationConfig.ts b/packages/tdev/migrate-tdev/src/helpers/readOrCreateMigrationConfig.ts index 107aea3c5..759a6e5be 100644 --- a/packages/tdev/migrate-tdev/src/helpers/readOrCreateMigrationConfig.ts +++ b/packages/tdev/migrate-tdev/src/helpers/readOrCreateMigrationConfig.ts @@ -1,7 +1,7 @@ -import fs from 'node:fs/promises'; import { load as yamlLoad } from 'js-yaml'; -import { pathExists } from './base.js'; +import fs from 'node:fs/promises'; import { MIGRATION_CONFIG_PATH } from '../constants.js'; +import { pathExists } from './base.js'; import shellInput from './shellInput.js'; export interface MigrationConfig { diff --git a/packages/tdev/migrate-tdev/src/helpers/shellInput.ts b/packages/tdev/migrate-tdev/src/helpers/shellInput.ts index 9b60bb3a4..9c9002b39 100644 --- a/packages/tdev/migrate-tdev/src/helpers/shellInput.ts +++ b/packages/tdev/migrate-tdev/src/helpers/shellInput.ts @@ -1,5 +1,5 @@ -import { createInterface } from 'node:readline/promises'; import { stdin as input, stdout as output } from 'node:process'; +import { createInterface } from 'node:readline/promises'; const shellInput = async (message: string): Promise => { const rl = createInterface({ input, output }); diff --git a/packages/tdev/migrate-tdev/src/helpers/writeFile.ts b/packages/tdev/migrate-tdev/src/helpers/writeFile.ts index ea6706b4b..8553e15ba 100644 --- a/packages/tdev/migrate-tdev/src/helpers/writeFile.ts +++ b/packages/tdev/migrate-tdev/src/helpers/writeFile.ts @@ -1,8 +1,8 @@ -import path from 'node:path'; -import fs from 'node:fs/promises'; +import { Config } from '@site/updateSync/types.js'; import { dump as yamlDump } from 'js-yaml'; +import fs from 'node:fs/promises'; +import path from 'node:path'; import type { PackageJson } from './loadFile.js'; -import { Config } from '@site/updateSync/types.js'; // add overload signatures for writeFile function: `${string}.json` and `${string}.yaml` or `${string}.yml` should return a Promise and any other string should return a Promise diff --git a/packages/tdev/migrate-tdev/src/index.ts b/packages/tdev/migrate-tdev/src/index.ts index 30dd786ab..c6ba8acd6 100644 --- a/packages/tdev/migrate-tdev/src/index.ts +++ b/packages/tdev/migrate-tdev/src/index.ts @@ -1,11 +1,11 @@ +import minimist from 'minimist'; import fs from 'node:fs/promises'; import path from 'node:path'; -import readOrCreateMigrationConfig from './helpers/readOrCreateMigrationConfig.js'; -import { loadMigrationRunners } from './helpers/loadMigrationRunners.js'; +import { MIGRATION_PATH } from './constants.js'; import { gitEnsureClean } from './helpers/actions.js'; -import minimist from 'minimist'; import { pathExists, REPO_ROOT } from './helpers/base.js'; -import { MIGRATION_PATH } from './constants.js'; +import { loadMigrationRunners } from './helpers/loadMigrationRunners.js'; +import readOrCreateMigrationConfig from './helpers/readOrCreateMigrationConfig.js'; process.chdir(REPO_ROOT); const argv = minimist(process.argv.slice(2)); diff --git a/packages/tdev/migrate-tdev/src/runAction.ts b/packages/tdev/migrate-tdev/src/runAction.ts index 2d0316399..239543821 100644 --- a/packages/tdev/migrate-tdev/src/runAction.ts +++ b/packages/tdev/migrate-tdev/src/runAction.ts @@ -1,10 +1,10 @@ +import minimist from 'minimist'; import path from 'node:path'; -import readOrCreateMigrationConfig from './helpers/readOrCreateMigrationConfig.js'; +import { ACTIONS_PATH } from './constants.js'; import { gitEnsureClean } from './helpers/actions.js'; -import minimist from 'minimist'; import { pathExists, REPO_ROOT } from './helpers/base.js'; -import { ACTIONS_PATH } from './constants.js'; import { loadActionRunner } from './helpers/loadActionRunner.js'; +import readOrCreateMigrationConfig from './helpers/readOrCreateMigrationConfig.js'; const LINE = '----------------------------------------------------------------------------------'; process.chdir(REPO_ROOT); diff --git a/packages/tdev/netpbm-graphic/NetpbmEditor/ImageCanvas.tsx b/packages/tdev/netpbm-graphic/NetpbmEditor/ImageCanvas.tsx index 8bb9b57e2..2d772d573 100644 --- a/packages/tdev/netpbm-graphic/NetpbmEditor/ImageCanvas.tsx +++ b/packages/tdev/netpbm-graphic/NetpbmEditor/ImageCanvas.tsx @@ -1,10 +1,10 @@ -import React, { useEffect, useRef } from 'react'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; -import Button from '@tdev-components/shared/Button'; import { mdiImage, mdiImageSizeSelectLarge } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import React, { useEffect, useRef } from 'react'; import { createDownloadCanvas } from './createDownloadCanvas'; +import styles from './styles.module.scss'; interface Props { pixels?: ImageDataArray; diff --git a/packages/tdev/netpbm-graphic/NetpbmEditor/index.tsx b/packages/tdev/netpbm-graphic/NetpbmEditor/index.tsx index dd0a7643b..2af3368cd 100644 --- a/packages/tdev/netpbm-graphic/NetpbmEditor/index.tsx +++ b/packages/tdev/netpbm-graphic/NetpbmEditor/index.tsx @@ -1,13 +1,3 @@ -import { observer } from 'mobx-react-lite'; -import styles from './styles.module.scss'; -import React from 'react'; -import clsx from 'clsx'; -import ImageCanvas from './ImageCanvas'; -import NetpbmGraphic from '@tdev/netpbm-graphic/model/index'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; -import { Source } from '@tdev-models/iDocument'; -import SyncStatus from '@tdev-components/SyncStatus'; -import Icon from '@mdi/react'; import { mdiAlertCircle, mdiAlertCircleOutline, @@ -16,11 +6,21 @@ import { mdiFormatTextRotationAngleUp, mdiTextBoxCheckOutline } from '@mdi/js'; +import Icon from '@mdi/react'; +import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import SyncStatus from '@tdev-components/SyncStatus'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { Source } from '@tdev-models/iDocument'; import { ApiState } from '@tdev-stores/iStore'; +import NetpbmGraphic from '@tdev/netpbm-graphic/model/index'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import { MetaInit, ModelMeta } from '../model/ModelMeta'; -import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; +import ImageCanvas from './ImageCanvas'; +import styles from './styles.module.scss'; const StateIcons = observer(({ doc }: { doc: NetpbmGraphic }) => ( diff --git a/packages/tdev/netpbm-graphic/model/ModelMeta.ts b/packages/tdev/netpbm-graphic/model/ModelMeta.ts index 149d8e917..69dc4653d 100644 --- a/packages/tdev/netpbm-graphic/model/ModelMeta.ts +++ b/packages/tdev/netpbm-graphic/model/ModelMeta.ts @@ -1,4 +1,4 @@ -import { TypeDataMapping, Access } from '@tdev-api/document'; +import { TypeDataMapping } from '@tdev-api/document'; import { TypeMeta } from '@tdev-models/DocumentRoot'; import { computed } from 'mobx'; export interface MetaInit { diff --git a/packages/tdev/netpbm-graphic/model/index.ts b/packages/tdev/netpbm-graphic/model/index.ts index 471984014..76ebddcf0 100644 --- a/packages/tdev/netpbm-graphic/model/index.ts +++ b/packages/tdev/netpbm-graphic/model/index.ts @@ -1,10 +1,10 @@ -import { action, computed, observable } from 'mobx'; +import { Document as DocumentProps, Factory, TypeDataMapping } from '@tdev-api/document'; import iDocument, { Source } from '@tdev-models/iDocument'; -import { Document as DocumentProps, TypeDataMapping, Access, Factory } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; +import { ApiState } from '@tdev-stores/iStore'; import { parse } from '@tdev/netpbm-graphic/model/parser/parser'; import { ParserResult } from '@tdev/netpbm-graphic/model/types'; -import { ApiState } from '@tdev-stores/iStore'; +import { action, computed, observable } from 'mobx'; import { ModelMeta } from './ModelMeta'; export const createModel: Factory = (data, store) => { diff --git a/packages/tdev/page-index/components/TaskableState/index.tsx b/packages/tdev/page-index/components/TaskableState/index.tsx index d561f0eb1..3ae3bf204 100644 --- a/packages/tdev/page-index/components/TaskableState/index.tsx +++ b/packages/tdev/page-index/components/TaskableState/index.tsx @@ -1,10 +1,9 @@ -import React from 'react'; +import useIsBrowser from '@docusaurus/useIsBrowser'; +import Icon from '@mdi/react'; +import Page from '@tdev-models/Page'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import Page from '@tdev-models/Page'; -import Icon from '@mdi/react'; -import useIsBrowser from '@docusaurus/useIsBrowser'; +import styles from './styles.module.scss'; interface Props { page?: Page; diff --git a/packages/tdev/page-index/plugin.ts b/packages/tdev/page-index/plugin.ts index 6715a7a26..3ab38c74c 100644 --- a/packages/tdev/page-index/plugin.ts +++ b/packages/tdev/page-index/plugin.ts @@ -1,8 +1,8 @@ import { LoadContext, Plugin, PluginModule } from '@docusaurus/types'; -import { exportDB } from './utils/exportDb'; -import path from 'path'; import { promises as fs } from 'fs'; +import path from 'path'; import { PluginName } from '.'; +import { exportDB } from './utils/exportDb'; import { pageIndexPath } from './utils/options'; const isDev = process.env.NODE_ENV !== 'production'; diff --git a/packages/tdev/page-index/remark-plugin/index.ts b/packages/tdev/page-index/remark-plugin/index.ts index aee700f47..ae8707172 100644 --- a/packages/tdev/page-index/remark-plugin/index.ts +++ b/packages/tdev/page-index/remark-plugin/index.ts @@ -1,12 +1,12 @@ -import type { Plugin, Transformer } from 'unified'; +import { TypeModelMapping } from '@tdev-api/document'; +import type { Statement } from 'better-sqlite3'; +import { debounce } from 'es-toolkit/function'; import type { Code, Root } from 'mdast'; import type { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; import path from 'path'; +import type { Plugin, Transformer } from 'unified'; import { exportDB } from '../utils/exportDb'; -import { debounce } from 'es-toolkit/function'; import { tdevRoot } from '../utils/options'; -import { TypeModelMapping } from '@tdev-api/document'; -import type { Statement } from 'better-sqlite3'; const TdevRoot = `${tdevRoot === '' ? '' : '/'}${tdevRoot}`; const TdevRootRegex = new RegExp(`^${TdevRoot}`); diff --git a/packages/tdev/page-index/utils/db.ts b/packages/tdev/page-index/utils/db.ts index e5c7d6da8..38d0c4135 100644 --- a/packages/tdev/page-index/utils/db.ts +++ b/packages/tdev/page-index/utils/db.ts @@ -1,6 +1,6 @@ -import path from 'path'; import Database from 'better-sqlite3'; import { accessSync, mkdirSync } from 'fs'; +import path from 'path'; import { dbPath } from './options'; try { diff --git a/packages/tdev/page-index/utils/exportDb.ts b/packages/tdev/page-index/utils/exportDb.ts index d149d68f2..7fdeb821c 100644 --- a/packages/tdev/page-index/utils/exportDb.ts +++ b/packages/tdev/page-index/utils/exportDb.ts @@ -1,7 +1,7 @@ +import type { Statement } from 'better-sqlite3'; import { promises as fs } from 'fs'; -import { pageIndexPath } from './options'; import { PageIndex } from '..'; -import type { Statement } from 'better-sqlite3'; +import { pageIndexPath } from './options'; const _cachedImport = { getDocumentRoots: null as Statement | null diff --git a/packages/tdev/page-read-check/PageReadCheck/index.tsx b/packages/tdev/page-read-check/PageReadCheck/index.tsx index 1dce6ada8..498839ccb 100644 --- a/packages/tdev/page-read-check/PageReadCheck/index.tsx +++ b/packages/tdev/page-read-check/PageReadCheck/index.tsx @@ -1,16 +1,16 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import { MetaInit, ModelMeta } from '../model/ModelMeta'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; -import SlideButton from '@tdev-components/shared/SlideButton'; -import Badge from '@tdev-components/shared/Badge'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import { mdiFlashTriangle } from '@mdi/js'; import Icon from '@mdi/react'; -import PageReadChecker from '../model'; +import Badge from '@tdev-components/shared/Badge'; +import SlideButton from '@tdev-components/shared/SlideButton'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; import { useScrollTo } from '@tdev-hooks/useScrollTo'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import PageReadChecker from '../model'; +import { MetaInit, ModelMeta } from '../model/ModelMeta'; +import styles from './styles.module.scss'; interface Props extends MetaInit { id: string; diff --git a/packages/tdev/page-read-check/model/ModelMeta.ts b/packages/tdev/page-read-check/model/ModelMeta.ts index dfa0d294a..d6a4ebcdc 100644 --- a/packages/tdev/page-read-check/model/ModelMeta.ts +++ b/packages/tdev/page-read-check/model/ModelMeta.ts @@ -1,4 +1,4 @@ -import { TypeDataMapping, Access } from '@tdev-api/document'; +import { TypeDataMapping } from '@tdev-api/document'; import { TypeMeta } from '@tdev-models/DocumentRoot'; import { fSeconds } from '../helpers/time'; diff --git a/packages/tdev/page-read-check/model/index.ts b/packages/tdev/page-read-check/model/index.ts index cae1fb48e..ebee7a661 100644 --- a/packages/tdev/page-read-check/model/index.ts +++ b/packages/tdev/page-read-check/model/index.ts @@ -1,11 +1,11 @@ -import { action, computed, observable } from 'mobx'; +import { mdiBookCheck, mdiBookEducation, mdiBookOpenVariantOutline } from '@mdi/js'; +import { Document as DocumentProps, Factory, TypeDataMapping } from '@tdev-api/document'; import iDocument, { Source } from '@tdev-models/iDocument'; import { iTaskableDocument } from '@tdev-models/iTaskableDocument'; -import { Document as DocumentProps, TypeDataMapping, Factory } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { ModelMeta } from './ModelMeta'; -import { mdiBookCheck, mdiBookEducation, mdiBookOpenVariantOutline } from '@mdi/js'; +import { action, computed, observable } from 'mobx'; import { fSeconds, fSecondsLong } from '../helpers/time'; +import { ModelMeta } from './ModelMeta'; export const createModel: Factory = (data, store) => { return new PageReadChecker(data as DocumentProps<'page_read_check'>, store); diff --git a/packages/tdev/pyodide-code/components/Footer/index.tsx b/packages/tdev/pyodide-code/components/Footer/index.tsx index 08b63d399..941744228 100644 --- a/packages/tdev/pyodide-code/components/Footer/index.tsx +++ b/packages/tdev/pyodide-code/components/Footer/index.tsx @@ -1,13 +1,12 @@ -import * as React from 'react'; -import { observer } from 'mobx-react-lite'; +import { mdiClose, mdiSend } from '@mdi/js'; import Container from '@tdev-components/documents/CodeEditor/Editor/Footer/Container'; import Logs from '@tdev-components/documents/CodeEditor/Editor/Footer/Logs'; +import Button from '@tdev-components/shared/Button'; +import TextInput from '@tdev-components/shared/TextInput'; import PyodideCode from '@tdev/pyodide-code/models/PyodideCode'; -import styles from './styles.module.scss'; import clsx from 'clsx'; -import TextInput from '@tdev-components/shared/TextInput'; -import Button from '@tdev-components/shared/Button'; -import { mdiClose, mdiSend } from '@mdi/js'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { code: PyodideCode; diff --git a/packages/tdev/pyodide-code/components/Header/index.tsx b/packages/tdev/pyodide-code/components/Header/index.tsx index 6dcbc9005..dbc025ace 100644 --- a/packages/tdev/pyodide-code/components/Header/index.tsx +++ b/packages/tdev/pyodide-code/components/Header/index.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; +import { mdiClose } from '@mdi/js'; import RunCode from '@tdev-components/documents/CodeEditor/Actions/RunCode'; -import { observer } from 'mobx-react-lite'; import Container from '@tdev-components/documents/CodeEditor/Editor/Header/Container'; import Content from '@tdev-components/documents/CodeEditor/Editor/Header/Content'; -import PyodideCode from '@tdev/pyodide-code/models/PyodideCode'; import Button from '@tdev-components/shared/Button'; -import { mdiClose } from '@mdi/js'; +import PyodideCode from '@tdev/pyodide-code/models/PyodideCode'; +import { observer } from 'mobx-react-lite'; interface Props { code: PyodideCode; diff --git a/packages/tdev/pyodide-code/components/Pyodide.tsx b/packages/tdev/pyodide-code/components/Pyodide.tsx index 7998ca2b1..7abcc8f23 100644 --- a/packages/tdev/pyodide-code/components/Pyodide.tsx +++ b/packages/tdev/pyodide-code/components/Pyodide.tsx @@ -1,6 +1,5 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { CodeEditor, Props } from '@tdev-components/documents/CodeEditor'; +import { observer } from 'mobx-react-lite'; const Pyodide = observer((props: Props) => { return ; diff --git a/packages/tdev/pyodide-code/index.ts b/packages/tdev/pyodide-code/index.ts index 880670449..12ab5f3ae 100644 --- a/packages/tdev/pyodide-code/index.ts +++ b/packages/tdev/pyodide-code/index.ts @@ -1,5 +1,5 @@ -import type PyodideStore from './stores/PyodideStore'; import PyodideCode from './models/PyodideCode'; +import type PyodideStore from './stores/PyodideStore'; export interface PyodideData { code: string; } diff --git a/packages/tdev/pyodide-code/models/PyodideCode.ts b/packages/tdev/pyodide-code/models/PyodideCode.ts index 804488e41..f6634460d 100644 --- a/packages/tdev/pyodide-code/models/PyodideCode.ts +++ b/packages/tdev/pyodide-code/models/PyodideCode.ts @@ -1,10 +1,10 @@ -import { action, computed, observable } from 'mobx'; import { Document as DocumentProps, Factory } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; -import { ModelMeta } from './ModelMeta'; import iCode from '@tdev-models/documents/iCode'; -import { orderBy } from 'es-toolkit/array'; +import DocumentStore from '@tdev-stores/DocumentStore'; import { ErrorMessage, LogMessage, Message } from '@tdev/pyodide-code/pyodideJsModules'; +import { orderBy } from 'es-toolkit/array'; +import { action, computed, observable } from 'mobx'; +import { ModelMeta } from './ModelMeta'; export const createModel: Factory = (data, store) => { return new PyodideCode(data as DocumentProps<'pyodide_code'>, store); diff --git a/packages/tdev/pyodide-code/register.ts b/packages/tdev/pyodide-code/register.ts index 65a15e848..01b709e59 100644 --- a/packages/tdev/pyodide-code/register.ts +++ b/packages/tdev/pyodide-code/register.ts @@ -1,11 +1,11 @@ +import { LiveCode } from '@tdev-stores/ComponentStore'; import { rootStore } from '@tdev-stores/rootStore'; -import PyodideStore from './stores/PyodideStore'; import ViewStore from '@tdev-stores/ViewStores'; -import { createModel } from './models/PyodideCode'; -import { ModelMeta } from './models/ModelMeta'; -import { LiveCode } from '@tdev-stores/ComponentStore'; -import Header from './components/Header'; import Footer from './components/Footer'; +import Header from './components/Header'; +import { ModelMeta } from './models/ModelMeta'; +import { createModel } from './models/PyodideCode'; +import PyodideStore from './stores/PyodideStore'; const createStore = (viewStore: ViewStore) => { return new PyodideStore(viewStore); diff --git a/packages/tdev/pyodide-code/stores/PyodideStore.ts b/packages/tdev/pyodide-code/stores/PyodideStore.ts index 54dbe3f13..a886f1935 100644 --- a/packages/tdev/pyodide-code/stores/PyodideStore.ts +++ b/packages/tdev/pyodide-code/stores/PyodideStore.ts @@ -1,13 +1,13 @@ -import { action, computed, observable, runInAction, observableRef } from 'mobx'; -import * as Comlink from 'comlink'; -import ViewStore from '@tdev-stores/ViewStores'; -import { PyWorker, PyWorkerApi } from '../workers/pyodide.worker'; import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; -import { PY_AWAIT_INPUT, PY_CANCEL_ALL, PY_CANCEL_INPUT, PY_INPUT } from '../config'; -import PyodideCode from '../models/PyodideCode'; import siteConfig from '@generated/docusaurus.config'; -import { Message } from '@tdev/pyodide-code/pyodideJsModules'; import SessionStorage from '@tdev-stores/utils/SessionStorage'; +import ViewStore from '@tdev-stores/ViewStores'; +import { Message } from '@tdev/pyodide-code/pyodideJsModules'; +import * as Comlink from 'comlink'; +import { action, computed, observable, observableRef, runInAction } from 'mobx'; +import { PY_AWAIT_INPUT, PY_CANCEL_ALL, PY_CANCEL_INPUT, PY_INPUT } from '../config'; +import PyodideCode from '../models/PyodideCode'; +import { PyWorker, PyWorkerApi } from '../workers/pyodide.worker'; const BASE_URL = siteConfig.baseUrl || '/'; declare module '@tdev-stores/utils/SessionStorage' { diff --git a/packages/tdev/pyodide-code/workers/helper.loadPackages.ts b/packages/tdev/pyodide-code/workers/helper.loadPackages.ts index 3eb5fdf80..473a53acb 100644 --- a/packages/tdev/pyodide-code/workers/helper.loadPackages.ts +++ b/packages/tdev/pyodide-code/workers/helper.loadPackages.ts @@ -1,6 +1,6 @@ +import _ from 'es-toolkit/compat'; import type { PyodideAPI } from 'pyodide'; import { type Context, pyodideJsModules } from '../pyodideJsModules'; -import _ from 'es-toolkit/compat'; const siteModules = new Set(Object.keys(pyodideJsModules)); const StandardPythonNamespaces = new Set([ 'xml', diff --git a/packages/tdev/pyodide-code/workers/pyodide.worker.ts b/packages/tdev/pyodide-code/workers/pyodide.worker.ts index 9fd285d0d..835c3faa6 100644 --- a/packages/tdev/pyodide-code/workers/pyodide.worker.ts +++ b/packages/tdev/pyodide-code/workers/pyodide.worker.ts @@ -1,8 +1,8 @@ +import { Message } from '@tdev/pyodide-code/pyodideJsModules'; import * as Comlink from 'comlink'; import type { loadPyodide } from 'pyodide'; import { PY_STDIN_ROUTE } from '../config'; import { loadPackages } from './helper.loadPackages'; -import { Message } from '@tdev/pyodide-code/pyodideJsModules'; // @ts-ignore importScripts('https://cdn.jsdelivr.net/pyodide/v0.29.1/full/pyodide.js'); // @ts-ignore diff --git a/packages/tdev/remark-graphviz/remark-plugin/index.ts b/packages/tdev/remark-graphviz/remark-plugin/index.ts index be7c1959e..5333f7f90 100644 --- a/packages/tdev/remark-graphviz/remark-plugin/index.ts +++ b/packages/tdev/remark-graphviz/remark-plugin/index.ts @@ -1,9 +1,9 @@ -import { CONTINUE, SKIP } from 'unist-util-visit'; +import { Graphviz } from '@hpcc-js/wasm-graphviz'; +import { promises as fs } from 'fs'; +import { Root } from 'mdast'; import path from 'path'; import type { Plugin, Transformer } from 'unified'; -import { Root } from 'mdast'; -import { promises as fs } from 'fs'; -import { Graphviz } from '@hpcc-js/wasm-graphviz'; +import { CONTINUE, SKIP } from 'unist-util-visit'; interface OptionsInput { dotFileRootDir?: string; diff --git a/packages/tdev/remark-graphviz/tests/plugin.test.ts b/packages/tdev/remark-graphviz/tests/plugin.test.ts index 5c1c5f989..ced6b3920 100644 --- a/packages/tdev/remark-graphviz/tests/plugin.test.ts +++ b/packages/tdev/remark-graphviz/tests/plugin.test.ts @@ -1,10 +1,10 @@ +import { promises as fs } from 'fs'; +import path from 'path'; import { remark } from 'remark'; import remarkMdx from 'remark-mdx'; -import { afterAll, afterEach, describe, expect, it } from 'vitest'; import { fileURLToPath } from 'url'; import { VFile } from 'vfile'; -import path from 'path'; -import { promises as fs } from 'fs'; +import { afterAll, afterEach, describe, expect, it } from 'vitest'; const __filename = fileURLToPath(import.meta.url); const __dirname = path.dirname(__filename); diff --git a/packages/tdev/remark-pdf/PdfViewer/PdfViewer.tsx b/packages/tdev/remark-pdf/PdfViewer/PdfViewer.tsx index 16cca618f..25b6de0f4 100644 --- a/packages/tdev/remark-pdf/PdfViewer/PdfViewer.tsx +++ b/packages/tdev/remark-pdf/PdfViewer/PdfViewer.tsx @@ -1,15 +1,15 @@ import useIsBrowser from '@docusaurus/useIsBrowser'; -import styles from './PdfViewer.module.scss'; +import { mdiArrowLeftCircle, mdiArrowRightCircle, mdiDownload } from '@mdi/js'; +import Icon from '@mdi/react'; +import Loader from '@tdev-components/Loader'; +import Button from '@tdev-components/shared/Button'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; import clsx from 'clsx'; import React, { useState } from 'react'; -import { pdfjs, Document, Page } from 'react-pdf'; +import { Document, Page, pdfjs } from 'react-pdf'; import 'react-pdf/dist/Page/AnnotationLayer.css'; import 'react-pdf/dist/Page/TextLayer.css'; -import Icon from '@mdi/react'; -import { mdiArrowLeftCircle, mdiArrowRightCircle, mdiDownload } from '@mdi/js'; -import Button from '@tdev-components/shared/Button'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; -import Loader from '@tdev-components/Loader'; +import styles from './PdfViewer.module.scss'; export interface Props { file: string | { data: Uint8Array; url?: string } | { url: string }; diff --git a/packages/tdev/remark-pdf/PdfViewer/index.tsx b/packages/tdev/remark-pdf/PdfViewer/index.tsx index f85eb6daa..0e90a7235 100644 --- a/packages/tdev/remark-pdf/PdfViewer/index.tsx +++ b/packages/tdev/remark-pdf/PdfViewer/index.tsx @@ -1,8 +1,8 @@ import useIsBrowser from '@docusaurus/useIsBrowser'; +import Loader from '@tdev-components/Loader'; +import type { default as PdfViewerType } from '@tdev/remark-pdf/PdfViewer/PdfViewer'; import { observer } from 'mobx-react-lite'; import * as React from 'react'; -import type { default as PdfViewerType } from '@tdev/remark-pdf/PdfViewer/PdfViewer'; -import Loader from '@tdev-components/Loader'; /** * Lazy load PdfViewer component - this is a workaround for SSR diff --git a/packages/tdev/remark-pdf/remark-plugin/index.ts b/packages/tdev/remark-pdf/remark-plugin/index.ts index 31266080b..bafd89b20 100644 --- a/packages/tdev/remark-pdf/remark-plugin/index.ts +++ b/packages/tdev/remark-pdf/remark-plugin/index.ts @@ -1,9 +1,9 @@ -import { visit } from 'unist-util-visit'; -import type { Plugin, Transformer } from 'unified'; -import type { MdxJsxFlowElement, MdxjsEsm } from 'mdast-util-mdx'; import { requireDefaultMdastNode, toJsxAttribute, transformAttributes } from '@tdev/core/src/plugins/helpers'; import { Root, Text } from 'mdast'; +import type { MdxJsxFlowElement, MdxjsEsm } from 'mdast-util-mdx'; import path from 'path'; +import type { Plugin, Transformer } from 'unified'; +import { visit } from 'unist-util-visit'; const IMPORT_PDF_REACT_NODE: MdxjsEsm = { type: 'mdxjsEsm', diff --git a/packages/tdev/remark-pdf/remark-plugin/tests/plugin.test.ts b/packages/tdev/remark-pdf/remark-plugin/tests/plugin.test.ts index fe9bb6595..cffd034a1 100644 --- a/packages/tdev/remark-pdf/remark-plugin/tests/plugin.test.ts +++ b/packages/tdev/remark-pdf/remark-plugin/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const alignLeft = (content: string) => { diff --git a/packages/tdev/text-message/components/SimpleChat/ChatName.tsx b/packages/tdev/text-message/components/SimpleChat/ChatName.tsx index 4a102dadd..be16f0557 100644 --- a/packages/tdev/text-message/components/SimpleChat/ChatName.tsx +++ b/packages/tdev/text-message/components/SimpleChat/ChatName.tsx @@ -1,11 +1,10 @@ -import React from 'react'; +import EditDataProps from '@tdev-components/documents/DynamicDocumentRoots/EditDataProps'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import SimpleChat from '@tdev/text-message/models/SimpleChat'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import SimpleChat from '@tdev/text-message/models/SimpleChat'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; import ClearHistory from './ClearHistory'; -import EditDataProps from '@tdev-components/documents/DynamicDocumentRoots/EditDataProps'; +import styles from './styles.module.scss'; interface Props { name: string; diff --git a/packages/tdev/text-message/components/SimpleChat/ClearHistory.tsx b/packages/tdev/text-message/components/SimpleChat/ClearHistory.tsx index 29b445030..1e5c89b20 100644 --- a/packages/tdev/text-message/components/SimpleChat/ClearHistory.tsx +++ b/packages/tdev/text-message/components/SimpleChat/ClearHistory.tsx @@ -1,9 +1,8 @@ -import { observer } from 'mobx-react-lite'; -import React from 'react'; -import { Delete } from '@tdev-components/shared/Button/Delete'; import { mdiChatRemove } from '@mdi/js'; +import { Delete } from '@tdev-components/shared/Button/Delete'; import SimpleChat from '@tdev/text-message/models/SimpleChat'; import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; interface Props { simpleChat: SimpleChat; diff --git a/packages/tdev/text-message/components/SimpleChat/Conversation/index.tsx b/packages/tdev/text-message/components/SimpleChat/Conversation/index.tsx index 5b21001ce..e52b852c8 100644 --- a/packages/tdev/text-message/components/SimpleChat/Conversation/index.tsx +++ b/packages/tdev/text-message/components/SimpleChat/Conversation/index.tsx @@ -1,9 +1,9 @@ -import React from 'react'; +import { default as SimpleChatModel } from '@tdev/text-message/models/SimpleChat'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import TextMessage from '../../TextMessage'; -import { default as SimpleChatModel } from '@tdev/text-message/models/SimpleChat'; +import styles from './styles.module.scss'; interface Props { simpleChat: SimpleChatModel; diff --git a/packages/tdev/text-message/components/SimpleChat/CreateSimpleChat.tsx b/packages/tdev/text-message/components/SimpleChat/CreateSimpleChat.tsx index fab13c0e5..6adbe493f 100644 --- a/packages/tdev/text-message/components/SimpleChat/CreateSimpleChat.tsx +++ b/packages/tdev/text-message/components/SimpleChat/CreateSimpleChat.tsx @@ -1,13 +1,13 @@ -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import React from 'react'; -import { ModelMeta } from '@tdev/text-message/models/SimpleChat/ModelMeta'; +import Button from '@tdev-components/shared/Button'; import { useCreateDocument } from '@tdev-hooks/useCreateDocument'; import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; import { ApiState } from '@tdev-stores/iStore'; +import { ModelMeta } from '@tdev/text-message/models/SimpleChat/ModelMeta'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import ChatName from './ChatName'; +import styles from './styles.module.scss'; interface Props { id: string; diff --git a/packages/tdev/text-message/components/SimpleChat/NewMessage/index.tsx b/packages/tdev/text-message/components/SimpleChat/NewMessage/index.tsx index f362274b8..eadd881f2 100644 --- a/packages/tdev/text-message/components/SimpleChat/NewMessage/index.tsx +++ b/packages/tdev/text-message/components/SimpleChat/NewMessage/index.tsx @@ -1,11 +1,10 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import { mdiSend } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; -import SimpleChat from '@tdev/text-message/models/SimpleChat'; import TextInput from '@tdev-components/shared/TextInput'; +import SimpleChat from '@tdev/text-message/models/SimpleChat'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { simpleChat: SimpleChat; diff --git a/packages/tdev/text-message/components/SimpleChat/SimpleChat.tsx b/packages/tdev/text-message/components/SimpleChat/SimpleChat.tsx index 0d0d3eaa3..062fa58b2 100644 --- a/packages/tdev/text-message/components/SimpleChat/SimpleChat.tsx +++ b/packages/tdev/text-message/components/SimpleChat/SimpleChat.tsx @@ -1,12 +1,12 @@ import clsx from 'clsx'; +import { default as SimpleChatModel } from '@tdev/text-message/models/SimpleChat'; import { observer } from 'mobx-react-lite'; -import styles from './styles.module.scss'; import React from 'react'; +import ChatName from './ChatName'; import Conversation from './Conversation'; import NewMessage from './NewMessage'; -import { default as SimpleChatModel } from '@tdev/text-message/models/SimpleChat'; -import ChatName from './ChatName'; +import styles from './styles.module.scss'; interface Props { documentContainer: SimpleChatModel; diff --git a/packages/tdev/text-message/components/SimpleChat/index.tsx b/packages/tdev/text-message/components/SimpleChat/index.tsx index d8ae756cb..df01176d1 100644 --- a/packages/tdev/text-message/components/SimpleChat/index.tsx +++ b/packages/tdev/text-message/components/SimpleChat/index.tsx @@ -1,11 +1,11 @@ +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { ModelMeta } from '@tdev/text-message/models/SimpleChat/ModelMeta'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; import React from 'react'; -import { ModelMeta } from '@tdev/text-message/models/SimpleChat/ModelMeta'; -import { default as SimpleChatComponent } from './SimpleChat'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; import CreateSimpleChat from './CreateSimpleChat'; +import { default as SimpleChatComponent } from './SimpleChat'; +import styles from './styles.module.scss'; interface Props { id: string; diff --git a/packages/tdev/text-message/components/TextMessage/index.tsx b/packages/tdev/text-message/components/TextMessage/index.tsx index d3daaf393..a40c51777 100644 --- a/packages/tdev/text-message/components/TextMessage/index.tsx +++ b/packages/tdev/text-message/components/TextMessage/index.tsx @@ -1,10 +1,9 @@ -import React from 'react'; +import { mdiClose } from '@mdi/js'; +import Icon from '@mdi/react'; +import type { default as TextMessageModel } from '@tdev/text-message/models/TextMessage'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import type { default as TextMessageModel } from '@tdev/text-message/models/TextMessage'; -import Icon from '@mdi/react'; -import { mdiClose } from '@mdi/js'; +import styles from './styles.module.scss'; interface Props { message: TextMessageModel; diff --git a/packages/tdev/text-message/models/SimpleChat/ModelMeta.ts b/packages/tdev/text-message/models/SimpleChat/ModelMeta.ts index af3e36157..7aca5c23b 100644 --- a/packages/tdev/text-message/models/SimpleChat/ModelMeta.ts +++ b/packages/tdev/text-message/models/SimpleChat/ModelMeta.ts @@ -1,4 +1,4 @@ -import { TypeDataMapping, Access } from '@tdev-api/document'; +import { TypeDataMapping } from '@tdev-api/document'; import { ContainerMeta } from '@tdev-models/documents/DynamicDocumentRoots/ContainerMeta'; import { computed } from 'mobx'; diff --git a/packages/tdev/text-message/models/SimpleChat/index.ts b/packages/tdev/text-message/models/SimpleChat/index.ts index 9f463e77f..6028163c4 100644 --- a/packages/tdev/text-message/models/SimpleChat/index.ts +++ b/packages/tdev/text-message/models/SimpleChat/index.ts @@ -1,9 +1,9 @@ -import { action, computed, observable } from 'mobx'; +import { Document as DocumentProps, Factory, TypeDataMapping } from '@tdev-api/document'; import { Source } from '@tdev-models/iDocument'; import iDocumentContainer from '@tdev-models/iDocumentContainer'; -import { Document as DocumentProps, Factory, TypeDataMapping } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; import { orderBy } from 'es-toolkit/array'; +import { action, computed, observable } from 'mobx'; import TextMessage from '../TextMessage'; export const createModel: Factory = (data, store) => { diff --git a/packages/tdev/text-message/models/TextMessage/index.ts b/packages/tdev/text-message/models/TextMessage/index.ts index 223ab4ba7..44ab97805 100644 --- a/packages/tdev/text-message/models/TextMessage/index.ts +++ b/packages/tdev/text-message/models/TextMessage/index.ts @@ -1,7 +1,7 @@ -import { action, computed, observable } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; import { Document as DocumentProps, Factory, TypeDataMapping } from '@tdev-api/document'; +import iDocument, { Source } from '@tdev-models/iDocument'; import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed, observable } from 'mobx'; import { ModelMeta } from './ModelMeta'; export const createModel: Factory = (data, store) => { diff --git a/packages/tdev/text-message/register.ts b/packages/tdev/text-message/register.ts index 59e50de41..506e92851 100644 --- a/packages/tdev/text-message/register.ts +++ b/packages/tdev/text-message/register.ts @@ -1,8 +1,8 @@ import { rootStore } from '@tdev-stores/rootStore'; -import { createModel as createTextMessage } from './models/TextMessage'; -import { createModel as createSimpleChat } from './models/SimpleChat'; import SimpleChat from './components/SimpleChat/SimpleChat'; +import { createModel as createSimpleChat } from './models/SimpleChat'; import { ModelMeta } from './models/SimpleChat/ModelMeta'; +import { createModel as createTextMessage } from './models/TextMessage'; const register = () => { rootStore.documentStore.registerFactory('text_message', createTextMessage); diff --git a/packages/tdev/webserial/component/ReplayControl/index.tsx b/packages/tdev/webserial/component/ReplayControl/index.tsx index eedf41eb6..3dc8eadb9 100644 --- a/packages/tdev/webserial/component/ReplayControl/index.tsx +++ b/packages/tdev/webserial/component/ReplayControl/index.tsx @@ -1,14 +1,13 @@ -import React from 'react'; +import { mdiMotionPauseOutline, mdiMotionPlay, mdiMotionPlayOutline, mdiStopCircleOutline } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import Button from '@tdev-components/shared/Button'; -import { mdiMotionPauseOutline, mdiMotionPlay, mdiMotionPlayOutline, mdiStopCircleOutline } from '@mdi/js'; +import styles from './styles.module.scss'; // @ts-ignore +import Badge from '@tdev-components/shared/Badge'; +import SerialDevice from '@tdev/webserial/models/SerialDevice'; import Slider from 'rc-slider'; import 'rc-slider/assets/index.css'; -import SerialDevice from '@tdev/webserial/models/SerialDevice'; -import Badge from '@tdev-components/shared/Badge'; interface Props { device: SerialDevice; diff --git a/packages/tdev/webserial/component/index.tsx b/packages/tdev/webserial/component/index.tsx index 5296cc2b4..7b0df68cc 100644 --- a/packages/tdev/webserial/component/index.tsx +++ b/packages/tdev/webserial/component/index.tsx @@ -1,16 +1,3 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Logs from '@tdev-components/documents/CodeEditor/Editor/Footer/Logs'; -import Alert from '@tdev-components/shared/Alert'; -import Admonition from '@theme-original/Admonition'; -import CodeBlock from '@theme-original/CodeBlock'; -import { ConnectionState } from '../models/SerialDevice'; -import Badge from '@tdev-components/shared/Badge'; -import Card from '@tdev-components/shared/Card'; -import Button from '@tdev-components/shared/Button'; import { mdiCardRemoveOutline, mdiCheckCircle, @@ -23,13 +10,26 @@ import { mdiSync } from '@mdi/js'; import Icon from '@mdi/react'; +import Logs from '@tdev-components/documents/CodeEditor/Editor/Footer/Logs'; +import Alert from '@tdev-components/shared/Alert'; +import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; import TextInput from '@tdev-components/shared/TextInput'; +import { useStore } from '@tdev-hooks/useStore'; +import Admonition from '@theme-original/Admonition'; +import CodeBlock from '@theme-original/CodeBlock'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { ConnectionState } from '../models/SerialDevice'; +import styles from './styles.module.scss'; // @ts-ignore +import RequestFullscreen from '@tdev-components/shared/RequestFullscreen'; +import { FullscreenContext } from '@tdev-hooks/useFullscreenTargetId'; import Details from '@theme/Details'; import { DeviceContext } from '../hooks/useDeviceId'; import ReplayControl from './ReplayControl'; -import { FullscreenContext } from '@tdev-hooks/useFullscreenTargetId'; -import RequestFullscreen from '@tdev-components/shared/RequestFullscreen'; interface Props { /** Override default baud rate (default: 115200) */ diff --git a/packages/tdev/webserial/decoders/BinaryDecoder/component/Bit/index.tsx b/packages/tdev/webserial/decoders/BinaryDecoder/component/Bit/index.tsx index 74d6c2e9b..eb960e02a 100644 --- a/packages/tdev/webserial/decoders/BinaryDecoder/component/Bit/index.tsx +++ b/packages/tdev/webserial/decoders/BinaryDecoder/component/Bit/index.tsx @@ -1,7 +1,6 @@ -import React from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { value: '0' | '1' | ''; diff --git a/packages/tdev/webserial/decoders/BinaryDecoder/component/Byte/index.tsx b/packages/tdev/webserial/decoders/BinaryDecoder/component/Byte/index.tsx index f8834822e..c258866ff 100644 --- a/packages/tdev/webserial/decoders/BinaryDecoder/component/Byte/index.tsx +++ b/packages/tdev/webserial/decoders/BinaryDecoder/component/Byte/index.tsx @@ -1,8 +1,7 @@ -import React from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; import Bit from '../Bit'; +import styles from './styles.module.scss'; interface Props { byteString: string; diff --git a/packages/tdev/webserial/decoders/BinaryDecoder/component/index.tsx b/packages/tdev/webserial/decoders/BinaryDecoder/component/index.tsx index 84581521c..71bcaffb3 100644 --- a/packages/tdev/webserial/decoders/BinaryDecoder/component/index.tsx +++ b/packages/tdev/webserial/decoders/BinaryDecoder/component/index.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import byteStyles from './Byte/styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import Card from '@tdev-components/shared/Card'; +import { useFullscreenTargetId } from '@tdev-hooks/useFullscreenTargetId'; import { useStore } from '@tdev-hooks/useStore'; import { useDeviceId } from '@tdev/webserial/hooks/useDeviceId'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import Decoder from '../model/Decoder'; import Byte from './Byte'; -import Card from '@tdev-components/shared/Card'; -import { useFullscreenTargetId } from '@tdev-hooks/useFullscreenTargetId'; +import byteStyles from './Byte/styles.module.scss'; +import styles from './styles.module.scss'; interface Props { bitDimension?: { width: string; height: string }; diff --git a/packages/tdev/webserial/models/SerialDevice.ts b/packages/tdev/webserial/models/SerialDevice.ts index 1543a0c27..3e29f90d5 100644 --- a/packages/tdev/webserial/models/SerialDevice.ts +++ b/packages/tdev/webserial/models/SerialDevice.ts @@ -1,8 +1,8 @@ /// +import { Hashery } from 'hashery'; import { action, computed, observable } from 'mobx'; import WebserialStore from '../stores/WebserialStore'; -import { Hashery } from 'hashery'; const hasher = new Hashery({ cache: { enabled: false } }); export type ConnectionState = 'disconnected' | 'connecting' | 'connected' | 'error'; diff --git a/packages/tdev/webserial/register.ts b/packages/tdev/webserial/register.ts index f3da2a962..07f122c4a 100644 --- a/packages/tdev/webserial/register.ts +++ b/packages/tdev/webserial/register.ts @@ -1,6 +1,6 @@ import { rootStore } from '@tdev-stores/rootStore'; -import WebserialStore from './stores/WebserialStore'; import ViewStore from '@tdev-stores/ViewStores'; +import WebserialStore from './stores/WebserialStore'; const createStore = (viewStore: ViewStore) => { return new WebserialStore(viewStore); diff --git a/packages/tdev/webserial/stores/WebserialStore.ts b/packages/tdev/webserial/stores/WebserialStore.ts index cb6ca4fb7..0e5e2e13d 100644 --- a/packages/tdev/webserial/stores/WebserialStore.ts +++ b/packages/tdev/webserial/stores/WebserialStore.ts @@ -1,5 +1,5 @@ -import { action, computed, observable } from 'mobx'; import ViewStore from '@tdev-stores/ViewStores/index'; +import { action, computed, observable } from 'mobx'; import SerialDevice, { Config } from '../models/SerialDevice'; export default class WebserialStore { diff --git a/src/api/IoEventTypes.ts b/src/api/IoEventTypes.ts index a08d2c4bf..adcf7f5fb 100644 --- a/src/api/IoEventTypes.ts +++ b/src/api/IoEventTypes.ts @@ -1,8 +1,8 @@ -import { User } from '../api/user'; import { Document, DocumentType } from '../api/document'; -import { rootStore } from '../stores/rootStore'; -import { GroupPermission, UserPermission } from '../api/permission'; import { DocumentRootUpdate } from '../api/documentRoot'; +import { GroupPermission, UserPermission } from '../api/permission'; +import { User } from '../api/user'; +import { rootStore } from '../stores/rootStore'; import { CmsSettings } from './cms'; import { StudentGroup } from './studentGroup'; diff --git a/src/api/OfflineApi/Adapter/IndexedDb.ts b/src/api/OfflineApi/Adapter/IndexedDb.ts index 9b92fa1a7..0fee7baee 100644 --- a/src/api/OfflineApi/Adapter/IndexedDb.ts +++ b/src/api/OfflineApi/Adapter/IndexedDb.ts @@ -1,6 +1,6 @@ +import { Document, DocumentType } from '@tdev-api/document'; import { IDBPDatabase, openDB } from 'idb'; import { DbAdapter, DBSchema } from '.'; -import { Document, DocumentType } from '@tdev-api/document'; import { OfflineUser } from '..'; const withFallback = (fn: () => Promise, fallback: T = undefined as T) => { diff --git a/src/api/OfflineApi/index.ts b/src/api/OfflineApi/index.ts index fbb3491f4..2d9989f8f 100644 --- a/src/api/OfflineApi/index.ts +++ b/src/api/OfflineApi/index.ts @@ -1,16 +1,15 @@ +import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; +import { DB_NAME } from '@tdev-api/config'; import { AxiosPromise } from 'axios'; -import { Role, User } from '../user'; -import { Access, Document, DocumentType } from '../document'; import { v4 as uuidv4 } from 'uuid'; +import { Access, Document, DocumentType } from '../document'; import { DocumentRoot } from '../documentRoot'; import { GroupPermission, Permissions, UserPermission } from '../permission'; import { StudentGroup } from '../studentGroup'; +import { Role, User } from '../user'; import { DbAdapter } from './Adapter'; import IndexedDbAdapter from './Adapter/IndexedDb'; import MemoryDbAdapter from './Adapter/MemoryDb'; -import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; -import _ from 'es-toolkit/compat'; -import { DB_NAME } from '@tdev-api/config'; const TIME_NOW = new Date().toISOString(); const LOG_REQUESTS = false; diff --git a/src/api/admin.ts b/src/api/admin.ts index 625414791..dfe115ac9 100644 --- a/src/api/admin.ts +++ b/src/api/admin.ts @@ -1,5 +1,5 @@ -import api from './base'; import { AxiosPromise } from 'axios'; +import api from './base'; import type { Document, DocumentType } from './document'; import { User } from './user'; diff --git a/src/api/base.ts b/src/api/base.ts index e3fb9de3d..103e8efd2 100644 --- a/src/api/base.ts +++ b/src/api/base.ts @@ -1,9 +1,9 @@ +import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; import axios, { AxiosInstance } from 'axios'; import OfflineApi from './OfflineApi'; import IndexedDbAdapter from './OfflineApi/Adapter/IndexedDb'; -import { BACKEND_URL, DB_NAME, OFFLINE_API } from './config'; -import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; import MemoryDbAdapter from './OfflineApi/Adapter/MemoryDb'; +import { BACKEND_URL, DB_NAME, OFFLINE_API } from './config'; export namespace Api { export const BASE_API_URL = eventsApiUrl(); diff --git a/src/api/cms.ts b/src/api/cms.ts index 0f7d82a9f..1709b252c 100644 --- a/src/api/cms.ts +++ b/src/api/cms.ts @@ -1,5 +1,5 @@ -import api from './base'; import { AxiosPromise } from 'axios'; +import api from './base'; export interface CmsSettings { id: string; diff --git a/src/api/config.ts b/src/api/config.ts index 45cec98db..90618c176 100644 --- a/src/api/config.ts +++ b/src/api/config.ts @@ -3,4 +3,4 @@ import customFields from '@tdev-components/utils/customFields'; const { BACKEND_URL, OFFLINE_API } = customFields; const DB_NAME = `${siteConfig.organizationName ?? 'gbsl'}-${siteConfig.projectName ?? 'tdev'}-db${process.env.NODE_ENV === 'production' ? '' : '-dev'}`; -export { BACKEND_URL, OFFLINE_API, DB_NAME }; +export { BACKEND_URL, DB_NAME, OFFLINE_API }; diff --git a/src/api/document.ts b/src/api/document.ts index f83fab5b7..758da5d01 100644 --- a/src/api/document.ts +++ b/src/api/document.ts @@ -1,30 +1,29 @@ -import type ScriptVersion from '@tdev-models/documents/ScriptVersion'; -import type TaskState from '@tdev-models/documents/TaskState'; -import type String from '@tdev-models/documents/String'; -import api from './base'; -import { AxiosPromise } from 'axios'; -import QuillV2 from '@tdev-models/documents/QuillV2'; -import { Delta } from 'quill/core'; -import Solution from '@tdev-models/documents/Solution'; -import Directory from '@tdev-models/documents/FileSystem/Directory'; -import File from '@tdev-models/documents/FileSystem/File'; -import Restricted from '@tdev-models/documents/Restricted'; -import MdxComment from '@tdev-models/documents/MdxComment'; import { Color } from '@tdev-components/shared/Colors'; +import type ChoiceAnswer from '@tdev-models/documents/Assessable/ChoiceAnswer'; +import type Quiz from '@tdev-models/documents/Assessable/Quiz'; +import type TrueFalseAnswer from '@tdev-models/documents/Assessable/TrueFalseAnswer'; +import iAssessable from '@tdev-models/documents/Assessable/iAssessable'; import CmsText from '@tdev-models/documents/CmsText'; +import Code from '@tdev-models/documents/Code'; import DynamicDocumentRoots from '@tdev-models/documents/DynamicDocumentRoots'; +import Directory from '@tdev-models/documents/FileSystem/Directory'; +import File from '@tdev-models/documents/FileSystem/File'; +import MdxComment from '@tdev-models/documents/MdxComment'; import ProgressState from '@tdev-models/documents/ProgressState'; -import type DocumentStore from '@tdev-stores/DocumentStore'; +import QuillV2 from '@tdev-models/documents/QuillV2'; +import Restricted from '@tdev-models/documents/Restricted'; +import type ScriptVersion from '@tdev-models/documents/ScriptVersion'; +import Solution from '@tdev-models/documents/Solution'; +import type String from '@tdev-models/documents/String'; +import type TaskState from '@tdev-models/documents/TaskState'; +import Unknown from '@tdev-models/documents/Unknown'; import iDocumentContainer from '@tdev-models/iDocumentContainer'; -import iViewStore from '@tdev-stores/ViewStores/iViewStore'; -import Code from '@tdev-models/documents/Code'; import { iTaskableDocument } from '@tdev-models/iTaskableDocument'; -import type ChoiceAnswer from '@tdev-models/documents/Assessable/ChoiceAnswer'; -import type TrueFalseAnswer from '@tdev-models/documents/Assessable/TrueFalseAnswer'; -import type Quiz from '@tdev-models/documents/Assessable/Quiz'; -import iAssessable from '@tdev-models/documents/Assessable/iAssessable'; -import iDocument from '@tdev-models/iDocument'; -import Unknown from '@tdev-models/documents/Unknown'; +import type DocumentStore from '@tdev-stores/DocumentStore'; +import iViewStore from '@tdev-stores/ViewStores/iViewStore'; +import { AxiosPromise } from 'axios'; +import { Delta } from 'quill/core'; +import api from './base'; export enum Access { RO_DocumentRoot = 'RO_DocumentRoot', diff --git a/src/api/documentRoot.ts b/src/api/documentRoot.ts index 70ed629a0..90830e695 100644 --- a/src/api/documentRoot.ts +++ b/src/api/documentRoot.ts @@ -1,5 +1,5 @@ -import api from './base'; import { AxiosPromise } from 'axios'; +import api from './base'; import { Access, Document, DocumentType } from './document'; import { GroupPermissionBase, UserPermissionBase } from './permission'; @@ -39,10 +39,6 @@ export interface DocumentRootUpdate { sharedAccess: Access; } -export function find(id: string, signal: AbortSignal): AxiosPromise { - return api.get(`/documentRoots/${id}`, { signal }); -} - interface FindManyForData { documentRootIds: string[]; ignoreMissingRoots?: boolean; diff --git a/src/api/permission.ts b/src/api/permission.ts index ba43f76c7..5e4cd3ee5 100644 --- a/src/api/permission.ts +++ b/src/api/permission.ts @@ -1,5 +1,5 @@ -import api from './base'; import { AxiosPromise } from 'axios'; +import api from './base'; import { Access } from './document'; export interface GroupPermissionBase { @@ -68,10 +68,6 @@ export function deleteGroupPermission(id: string, signal: AbortSignal): AxiosPro return api.delete(`/permissions/group/${id}`, { signal }); } -export function permissionsFor(documentRootId: string, signal: AbortSignal): AxiosPromise { - return api.get(`/documentRoots/${documentRootId}/permissions`, { signal }); -} - export function documentRootPermissions( documentRootIds: string[], signal: AbortSignal diff --git a/src/api/studentGroup.ts b/src/api/studentGroup.ts index 32f69d119..9e47e52ea 100644 --- a/src/api/studentGroup.ts +++ b/src/api/studentGroup.ts @@ -1,7 +1,7 @@ import { type Access, type Document, type DocumentType } from '@tdev-api/document'; -import api from './base'; -import { AxiosPromise } from 'axios'; import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { AxiosPromise } from 'axios'; +import api from './base'; export interface DocumentPresentation { document: Document; diff --git a/src/api/user.ts b/src/api/user.ts index 31dd166d4..95a2881bc 100644 --- a/src/api/user.ts +++ b/src/api/user.ts @@ -1,8 +1,8 @@ import { mdiEmailLock, mdiGithub, mdiMicrosoft } from '@mdi/js'; -import api from './base'; -import { AxiosPromise } from 'axios'; import { IfmColors } from '@tdev-components/shared/Colors'; +import { AxiosPromise } from 'axios'; import { Session as BetterAuthSession } from 'better-auth'; +import api from './base'; export enum Role { STUDENT = 'student', diff --git a/src/auth-client.ts b/src/auth-client.ts index 084cb7807..9e395e152 100644 --- a/src/auth-client.ts +++ b/src/auth-client.ts @@ -1,11 +1,10 @@ import { inferAdditionalFields } from 'better-auth/client/plugins'; import { createAuthClient } from 'better-auth/react'; -import { adminClient } from 'better-auth/client/plugins'; -import { oneTimeTokenClient } from 'better-auth/client/plugins'; +import customFields from '@tdev-components/utils/customFields'; +import { adminClient, oneTimeTokenClient } from 'better-auth/client/plugins'; import { adminAc, userAc } from 'better-auth/plugins/admin/access'; import { teacher } from './helpers/auth-permissions'; -import customFields from '@tdev-components/utils/customFields'; export const { BACKEND_URL } = customFields; diff --git a/src/components/Admin/ActionRequest/NavReloadRequest.tsx b/src/components/Admin/ActionRequest/NavReloadRequest.tsx index 5f0543003..ee67b05ac 100644 --- a/src/components/Admin/ActionRequest/NavReloadRequest.tsx +++ b/src/components/Admin/ActionRequest/NavReloadRequest.tsx @@ -1,10 +1,8 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import { Confirm } from '@tdev-components/shared/Button/Confirm'; import { mdiLoading, mdiReloadAlert, mdiWebRefresh } from '@mdi/js'; +import { Confirm } from '@tdev-components/shared/Button/Confirm'; +import { useStore } from '@tdev-hooks/useStore'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; interface Props { roomIds?: string[]; diff --git a/src/components/Admin/ActionRequest/NavSetTargetRequest.tsx b/src/components/Admin/ActionRequest/NavSetTargetRequest.tsx index 177c52cfe..febe6e366 100644 --- a/src/components/Admin/ActionRequest/NavSetTargetRequest.tsx +++ b/src/components/Admin/ActionRequest/NavSetTargetRequest.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; import { mdiLoading, mdiTarget } from '@mdi/js'; -import StudentGroup from '@tdev-models/StudentGroup'; import Button from '@tdev-components/shared/Button'; +import { useStore } from '@tdev-hooks/useStore'; +import StudentGroup from '@tdev-models/StudentGroup'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { studentGroup: StudentGroup; diff --git a/src/components/Admin/AdminPanel/index.tsx b/src/components/Admin/AdminPanel/index.tsx index 1ba322d56..413f21e41 100644 --- a/src/components/Admin/AdminPanel/index.tsx +++ b/src/components/Admin/AdminPanel/index.tsx @@ -1,12 +1,9 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Tabs from '@theme/Tabs'; -import TabItem from '@theme/TabItem'; import StudentGroupPanel from '@tdev-components/Admin/StudentGroupPanel'; import UserTable from '@tdev-components/Admin/UserTable'; +import { useStore } from '@tdev-hooks/useStore'; +import TabItem from '@theme/TabItem'; +import Tabs from '@theme/Tabs'; +import { observer } from 'mobx-react-lite'; import AllowedActions from '../AllowedActions'; import CreateUser from '../CreateUser'; import PermissionsControl from '../PermissionsControl'; diff --git a/src/components/Admin/AllowedActions/index.tsx b/src/components/Admin/AllowedActions/index.tsx index b028549c6..46227328e 100644 --- a/src/components/Admin/AllowedActions/index.tsx +++ b/src/components/Admin/AllowedActions/index.tsx @@ -1,18 +1,18 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Button from '@tdev-components/shared/Button'; import { mdiPlusCircle, mdiSortAscending, mdiSortDescending } from '@mdi/js'; +import { DocumentType } from '@tdev-api/document'; +import Button from '@tdev-components/shared/Button'; +import { Delete } from '@tdev-components/shared/Button/Delete'; +import SelectInput from '@tdev-components/shared/SelectInput'; +import TextInput from '@tdev-components/shared/TextInput'; import { useStore } from '@tdev-hooks/useStore'; +import Details from '@theme/Details'; import _ from 'es-toolkit/compat'; -import { Delete } from '@tdev-components/shared/Button/Delete'; import { action } from 'mobx'; -import Details from '@theme/Details'; -import TextInput from '@tdev-components/shared/TextInput'; -import SelectInput from '@tdev-components/shared/SelectInput'; -import { DocumentType } from '@tdev-api/document'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; const SIZE_S = 0.6; diff --git a/src/components/Admin/CreateUser/BulkCreation/index.tsx b/src/components/Admin/CreateUser/BulkCreation/index.tsx index 1f05a9bd1..78a94c68d 100644 --- a/src/components/Admin/CreateUser/BulkCreation/index.tsx +++ b/src/components/Admin/CreateUser/BulkCreation/index.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import FromXlsxClipboard from '@tdev-components/shared/FromXlsxClipboard'; +import Loader from '@tdev-components/Loader'; import AssignColumns from '@tdev-components/shared/AssignColumns'; import Button from '@tdev-components/shared/Button'; -import { Hashery } from 'hashery'; +import FromXlsxClipboard from '@tdev-components/shared/FromXlsxClipboard'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; import _ from 'es-toolkit/compat'; -import Loader from '@tdev-components/Loader'; +import { Hashery } from 'hashery'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; const hashery = new Hashery({ cache: { enabled: false } }); diff --git a/src/components/Admin/CreateUser/index.tsx b/src/components/Admin/CreateUser/index.tsx index df1762081..d5aea6557 100644 --- a/src/components/Admin/CreateUser/index.tsx +++ b/src/components/Admin/CreateUser/index.tsx @@ -1,16 +1,16 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; -import TextInput from '@tdev-components/shared/TextInput'; -import Card from '@tdev-components/shared/Card'; import { mdiAccountPlus, mdiCheck } from '@mdi/js'; import Alert from '@tdev-components/shared/Alert'; -import Tabs from '@theme/Tabs'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; +import TextInput from '@tdev-components/shared/TextInput'; +import { useStore } from '@tdev-hooks/useStore'; import TabItem from '@theme/TabItem'; +import Tabs from '@theme/Tabs'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import BulkCreation from './BulkCreation'; +import styles from './styles.module.scss'; interface Props {} diff --git a/src/components/Admin/EditUser/index.tsx b/src/components/Admin/EditUser/index.tsx index ec98ce97f..cb6ba6e3d 100644 --- a/src/components/Admin/EditUser/index.tsx +++ b/src/components/Admin/EditUser/index.tsx @@ -1,20 +1,20 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import { mdiAccountCancel, mdiAccountCheck, mdiLink, mdiLinkOff, mdiLoading, mdiTrashCan } from '@mdi/js'; import { Role, RoleAccessLevel, RoleNames } from '@tdev-api/user'; -import Card from '@tdev-components/shared/Card'; -import TextInput from '@tdev-components/shared/TextInput'; +import Loader from '@tdev-components/Loader'; +import Alert from '@tdev-components/shared/Alert'; import Button from '@tdev-components/shared/Button'; -import { authClient } from '@tdev/auth-client'; -import { useStore } from '@tdev-hooks/useStore'; import { Confirm } from '@tdev-components/shared/Button/Confirm'; -import { mdiAccountCancel, mdiAccountCheck, mdiLink, mdiLinkOff, mdiLoading, mdiTrashCan } from '@mdi/js'; +import Card from '@tdev-components/shared/Card'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; -import { action } from 'mobx'; -import Loader from '@tdev-components/Loader'; +import TextInput from '@tdev-components/shared/TextInput'; +import { useStore } from '@tdev-hooks/useStore'; import type User from '@tdev-models/User'; -import Alert from '@tdev-components/shared/Alert'; +import { authClient } from '@tdev/auth-client'; +import clsx from 'clsx'; +import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { user: User; diff --git a/src/components/Admin/ExportPanel/ExportModal.tsx b/src/components/Admin/ExportPanel/ExportModal.tsx index a928dc002..1dc820056 100644 --- a/src/components/Admin/ExportPanel/ExportModal.tsx +++ b/src/components/Admin/ExportPanel/ExportModal.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import ExportPanel, { Props as ExportProps } from '.'; -import type { PopupActions } from 'reactjs-popup/dist/types'; -import Popup from 'reactjs-popup'; import { mdiDatabaseExport } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Popup from 'reactjs-popup'; +import type { PopupActions } from 'reactjs-popup/dist/types'; +import ExportPanel, { Props as ExportProps } from '.'; interface Props extends Omit { className?: string; diff --git a/src/components/Admin/ExportPanel/index.tsx b/src/components/Admin/ExportPanel/index.tsx index 179373245..7a94cbeb1 100644 --- a/src/components/Admin/ExportPanel/index.tsx +++ b/src/components/Admin/ExportPanel/index.tsx @@ -1,15 +1,15 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; import { mdiClose, mdiDatabaseExport, mdiLoading } from '@mdi/js'; -import Card from '@tdev-components/shared/Card'; import { DocumentType } from '@tdev-api/document'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import { useStore } from '@tdev-hooks/useStore'; import { ApiState } from '@tdev-stores/iStore'; +import clsx from 'clsx'; import {} from 'es-toolkit/array'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; export interface Props { name?: string; diff --git a/src/components/Admin/PermissionsControl/AccessOverview.tsx b/src/components/Admin/PermissionsControl/AccessOverview.tsx index a11fa8891..631aeccd0 100644 --- a/src/components/Admin/PermissionsControl/AccessOverview.tsx +++ b/src/components/Admin/PermissionsControl/AccessOverview.tsx @@ -1,15 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; +import { mdiAccount, mdiAccountGroup, mdiFileMultipleOutline, mdiShareVariantOutline } from '@mdi/js'; +import Icon from '@mdi/react'; +import { DocumentType } from '@tdev-api/document'; +import { AccessColor, AccessIcon } from '@tdev-components/PermissionsPanel/AccessBadge'; import Badge from '@tdev-components/shared/Badge'; import CopyBadge from '@tdev-components/shared/CopyBadge'; -import { AccessColor, AccessIcon } from '@tdev-components/PermissionsPanel/AccessBadge'; -import Icon from '@mdi/react'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; -import { mdiAccount, mdiAccountGroup, mdiFileMultipleOutline, mdiShareVariantOutline } from '@mdi/js'; -import { DocumentType } from '@tdev-api/document'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { doc: { id: string; type: DocumentType }; diff --git a/src/components/Admin/PermissionsControl/DocumentTypeSelector.tsx b/src/components/Admin/PermissionsControl/DocumentTypeSelector.tsx index 87f0f7648..8bf6eb9e6 100644 --- a/src/components/Admin/PermissionsControl/DocumentTypeSelector.tsx +++ b/src/components/Admin/PermissionsControl/DocumentTypeSelector.tsx @@ -1,11 +1,10 @@ -import React from 'react'; +import { DocumentType } from '@tdev-api/document'; +import Button from '@tdev-components/shared/Button'; +import { useStore } from '@tdev-hooks/useStore'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; import Select, { StylesConfig } from 'react-select'; -import { DocumentType, TypeModelMapping } from '@tdev-api/document'; -import Button from '@tdev-components/shared/Button'; +import styles from './styles.module.scss'; interface Props {} const colourStyles: StylesConfig<{ value: DocumentType; hslDeg: number; label: DocumentType }, true> = { diff --git a/src/components/Admin/PermissionsControl/PageActions.tsx b/src/components/Admin/PermissionsControl/PageActions.tsx index 43a2d7751..4a8c70d88 100644 --- a/src/components/Admin/PermissionsControl/PageActions.tsx +++ b/src/components/Admin/PermissionsControl/PageActions.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; import { mdiAccountMultipleRemove, mdiAccountRemove } from '@mdi/js'; import { Confirm } from '@tdev-components/shared/Button/Confirm'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { docs: { id: string; type: string }[]; diff --git a/src/components/Admin/PermissionsControl/index.tsx b/src/components/Admin/PermissionsControl/index.tsx index 0b4b120ea..9e6030fc1 100644 --- a/src/components/Admin/PermissionsControl/index.tsx +++ b/src/components/Admin/PermissionsControl/index.tsx @@ -1,22 +1,22 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import siteConfig from '@generated/docusaurus.config'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; import Link from '@docusaurus/Link'; -import { reaction } from 'mobx'; +import type * as Preset from '@docusaurus/preset-classic'; +import siteConfig from '@generated/docusaurus.config'; import { mdiSync } from '@mdi/js'; -import { ApiState } from '@tdev-stores/iStore'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; import Card from '@tdev-components/shared/Card'; -import DocumentTypeSelector from './DocumentTypeSelector'; import TextInput from '@tdev-components/shared/TextInput'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import PageActions from './PageActions'; +import { useStore } from '@tdev-hooks/useStore'; +import { ApiState } from '@tdev-stores/iStore'; +import clsx from 'clsx'; +import { reaction } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import AccessOverview from './AccessOverview'; -import Badge from '@tdev-components/shared/Badge'; -import type * as Preset from '@docusaurus/preset-classic'; +import DocumentTypeSelector from './DocumentTypeSelector'; +import PageActions from './PageActions'; +import styles from './styles.module.scss'; const { presets } = siteConfig; const classicPreset = ( diff --git a/src/components/Admin/SelectUser/index.tsx b/src/components/Admin/SelectUser/index.tsx index 71e274e3f..a992af1b8 100644 --- a/src/components/Admin/SelectUser/index.tsx +++ b/src/components/Admin/SelectUser/index.tsx @@ -1,25 +1,20 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import UserTableRow from '@tdev-components/Admin/UserTable/User'; -import Button from '@tdev-components/shared/Button'; import { - mdiCheckboxBlank, mdiCheckboxBlankOutline, mdiCheckboxMarked, mdiCheckCircle, - mdiCheckCircleOutline, mdiCircleMultiple, - mdiCircleOutline, - mdiSortAscending, - mdiSortDescending + mdiCircleOutline } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; -import _ from 'es-toolkit/compat'; +import Button from '@tdev-components/shared/Button'; import PageStudentGroupFilter from '@tdev-components/shared/PageStudentGroupFilter'; import TextInput from '@tdev-components/shared/TextInput'; +import { useStore } from '@tdev-hooks/useStore'; +import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; const IconMap = { none: mdiCircleOutline, diff --git a/src/components/Admin/StudentGroupPanel/index.tsx b/src/components/Admin/StudentGroupPanel/index.tsx index 5bc2833d3..05104ceb2 100644 --- a/src/components/Admin/StudentGroupPanel/index.tsx +++ b/src/components/Admin/StudentGroupPanel/index.tsx @@ -1,17 +1,15 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; import { mdiCloseCircleOutline, mdiMagnify, mdiPlusCircleOutline, mdiRestore } from '@mdi/js'; -import StudentGroup from '@tdev-components/StudentGroup'; -import _ from 'es-toolkit/compat'; -import { action } from 'mobx'; import Icon from '@mdi/react'; -import TextInput from '@tdev-components/shared/TextInput'; import DefinitionList from '@tdev-components/DefinitionList'; import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; +import TextInput from '@tdev-components/shared/TextInput'; +import StudentGroup from '@tdev-components/StudentGroup'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; const StudentGroupPanel = observer(() => { const userStore = useStore('userStore'); diff --git a/src/components/Admin/UserTable/User.tsx b/src/components/Admin/UserTable/User.tsx index 1993186be..faf0c0ef5 100644 --- a/src/components/Admin/UserTable/User.tsx +++ b/src/components/Admin/UserTable/User.tsx @@ -1,27 +1,27 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { default as UserModel } from '@tdev-models/User'; -import CopyBadge from '@tdev-components/shared/CopyBadge'; -import { formatDateTime } from '@tdev-models/helpers/date'; +import { mdiAccountCancel, mdiAccountEdit, mdiCloudQuestion } from '@mdi/js'; +import Icon from '@mdi/react'; import { AuthProviderColor, AuthProviderIcons, RoleColors, RoleNames } from '@tdev-api/user'; -import { useStore } from '@tdev-hooks/useStore'; +import DefinitionList from '@tdev-components/DefinitionList'; import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; -import Icon from '@mdi/react'; -import { mdiAccountCancel, mdiAccountEdit, mdiCloudQuestion } from '@mdi/js'; -import { SIZE_S, SIZE_XS } from '@tdev-components/shared/iconSizes'; +import Badge from '@tdev-components/shared/Badge'; import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; +import { IfmColors } from '@tdev-components/shared/Colors'; +import CopyBadge from '@tdev-components/shared/CopyBadge'; +import { SIZE_S, SIZE_XS } from '@tdev-components/shared/iconSizes'; +import { useStore } from '@tdev-hooks/useStore'; +import { formatDateTime } from '@tdev-models/helpers/date'; +import { default as UserModel } from '@tdev-models/User'; +import { observer } from 'mobx-react-lite'; import Popup from 'reactjs-popup'; -import EditUser from '../EditUser'; import { PopupActions } from 'reactjs-popup/dist/types'; -import Badge from '@tdev-components/shared/Badge'; import NavReloadRequest from '../ActionRequest/NavReloadRequest'; -import { IfmColors } from '@tdev-components/shared/Colors'; +import EditUser from '../EditUser'; import ExportModal from '../ExportPanel/ExportModal'; -import Card from '@tdev-components/shared/Card'; -import DefinitionList from '@tdev-components/DefinitionList'; +import styles from './styles.module.scss'; interface Props { user: UserModel; diff --git a/src/components/Admin/UserTable/index.tsx b/src/components/Admin/UserTable/index.tsx index 6cfcf7f98..0ac741210 100644 --- a/src/components/Admin/UserTable/index.tsx +++ b/src/components/Admin/UserTable/index.tsx @@ -1,13 +1,13 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import { mdiSortAscending, mdiSortDescending } from '@mdi/js'; import UserTableRow from '@tdev-components/Admin/UserTable/User'; import Button from '@tdev-components/shared/Button'; -import { mdiSortAscending, mdiSortDescending } from '@mdi/js'; import { useStore } from '@tdev-hooks/useStore'; import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; const SIZE_S = 0.6; diff --git a/src/components/Answer/index.tsx b/src/components/Answer/index.tsx index bc05d3d7a..cb3596740 100644 --- a/src/components/Answer/index.tsx +++ b/src/components/Answer/index.tsx @@ -1,10 +1,10 @@ -import * as React from 'react'; -import { observer } from 'mobx-react-lite'; +import { DocumentType } from '@tdev-api/document'; +import ProgressState from '@tdev-components/documents/ProgressState'; import QuillV2 from '@tdev-components/documents/QuillV2'; import String from '@tdev-components/documents/String'; import TaskState from '@tdev-components/documents/TaskState'; -import ProgressState from '@tdev-components/documents/ProgressState'; -import { DocumentType } from '@tdev-api/document'; +import { observer } from 'mobx-react-lite'; +import * as React from 'react'; import { getAnswerDocumentType } from './helper.answer'; interface Props { diff --git a/src/components/BrowserWindow/index.tsx b/src/components/BrowserWindow/index.tsx index e379f23fd..fb627d434 100644 --- a/src/components/BrowserWindow/index.tsx +++ b/src/components/BrowserWindow/index.tsx @@ -6,8 +6,8 @@ * @see https://github.com/facebook/docusaurus/blob/main/website/src/components/BrowserWindow/index.tsx */ -import React, { type CSSProperties, type ReactNode } from 'react'; import clsx from 'clsx'; +import React, { type CSSProperties, type ReactNode } from 'react'; import styles from './styles.module.css'; diff --git a/src/components/CodeDefBox/DefContent.tsx b/src/components/CodeDefBox/DefContent.tsx index e64341da2..88f3bf731 100644 --- a/src/components/CodeDefBox/DefContent.tsx +++ b/src/components/CodeDefBox/DefContent.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; import styles from './styles.module.scss'; diff --git a/src/components/CodeDefBox/DefHeading.tsx b/src/components/CodeDefBox/DefHeading.tsx index d343cf90d..98bee4933 100644 --- a/src/components/CodeDefBox/DefHeading.tsx +++ b/src/components/CodeDefBox/DefHeading.tsx @@ -1,9 +1,9 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import Icon from '@mdi/react'; import { mdiFileEyeOutline } from '@mdi/js'; +import Icon from '@mdi/react'; +import styles from './styles.module.scss'; interface Props { children: React.ReactNode | React.ReactNode[]; diff --git a/src/components/CodeDefBox/index.tsx b/src/components/CodeDefBox/index.tsx index 79955014e..36944d5e5 100644 --- a/src/components/CodeDefBox/index.tsx +++ b/src/components/CodeDefBox/index.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; import styles from './styles.module.scss'; diff --git a/src/components/CodeShowcase/index.tsx b/src/components/CodeShowcase/index.tsx index 1eb3f19ee..a4a081a3c 100644 --- a/src/components/CodeShowcase/index.tsx +++ b/src/components/CodeShowcase/index.tsx @@ -1,8 +1,8 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import CodeBlock from '@theme/CodeBlock'; import BrowserWindow from '@tdev-components/BrowserWindow'; +import CodeBlock from '@theme/CodeBlock'; import Details from '@theme/Details'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; interface Props { code: string; diff --git a/src/components/DefinitionList/index.tsx b/src/components/DefinitionList/index.tsx index 13ef3f6c4..fea48ace6 100644 --- a/src/components/DefinitionList/index.tsx +++ b/src/components/DefinitionList/index.tsx @@ -1,8 +1,8 @@ -import React, { type ReactNode } from 'react'; import clsx from 'clsx'; +import { type ReactNode } from 'react'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { children: ReactNode; diff --git a/src/components/DynamicValues/Input/index.tsx b/src/components/DynamicValues/Input/index.tsx index 29f65e5ee..c3289c348 100644 --- a/src/components/DynamicValues/Input/index.tsx +++ b/src/components/DynamicValues/Input/index.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import TextInput from '@tdev-components/shared/TextInput'; -import Button from '@tdev-components/shared/Button'; import { mdiRestore, mdiSync } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; -import Page from '@tdev-models/Page'; import TextAreaInput from '@tdev-components/shared/TextAreaInput'; +import TextInput from '@tdev-components/shared/TextInput'; +import { useStore } from '@tdev-hooks/useStore'; +import Page from '@tdev-models/Page'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { name: string; diff --git a/src/components/DynamicValues/TemplateCode/index.tsx b/src/components/DynamicValues/TemplateCode/index.tsx index 7a188ee31..d3fd2f2e5 100644 --- a/src/components/DynamicValues/TemplateCode/index.tsx +++ b/src/components/DynamicValues/TemplateCode/index.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { useStore } from '@tdev-hooks/useStore'; +import { CodeAttributes } from '@tdev-plugins/remark-code-as-attribute/plugin'; import CodeBlock from '@theme/CodeBlock'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import { templateReplacer } from '../templateReplacer'; -import { CodeAttributes } from '@tdev-plugins/remark-code-as-attribute/plugin'; interface Props { children?: React.ReactNode; diff --git a/src/components/DynamicValues/Val/index.tsx b/src/components/DynamicValues/Val/index.tsx index 77d769026..1d9b7ab84 100644 --- a/src/components/DynamicValues/Val/index.tsx +++ b/src/components/DynamicValues/Val/index.tsx @@ -1,6 +1,5 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { useStore } from '@tdev-hooks/useStore'; +import { observer } from 'mobx-react-lite'; import { templateReplacer } from '../templateReplacer'; interface BaseProps { diff --git a/src/components/DynamicValues/index.tsx b/src/components/DynamicValues/index.tsx index 009518a74..31c77a975 100644 --- a/src/components/DynamicValues/index.tsx +++ b/src/components/DynamicValues/index.tsx @@ -1,5 +1,5 @@ -import Val from './Val'; import DynamicInput from './Input'; import TemplateCode from './TemplateCode'; +import Val from './Val'; -export { Val, DynamicInput, TemplateCode }; +export { DynamicInput, TemplateCode, Val }; diff --git a/src/components/EditingOverview/EditingStateList.tsx b/src/components/EditingOverview/EditingStateList.tsx index 80d408fb6..7cb185f6e 100644 --- a/src/components/EditingOverview/EditingStateList.tsx +++ b/src/components/EditingOverview/EditingStateList.tsx @@ -1,10 +1,8 @@ -import React from 'react'; - -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; import Icon from '@mdi/react'; +import { useStore } from '@tdev-hooks/useStore'; import type { iTaskableDocument } from '@tdev-models/iTaskableDocument'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { editingStatus: iTaskableDocument[]; diff --git a/src/components/EditingOverview/index.tsx b/src/components/EditingOverview/index.tsx index 901a85128..1827f611a 100644 --- a/src/components/EditingOverview/index.tsx +++ b/src/components/EditingOverview/index.tsx @@ -1,22 +1,21 @@ -import React from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { mdiAccountSyncOutline, mdiCheckboxMultipleMarkedCircle } from '@mdi/js'; -import { StateType } from '@tdev-api/document'; import Icon from '@mdi/react'; -import Popup from 'reactjs-popup'; -import EditingStateList from './EditingStateList'; -import { RWAccess } from '@tdev-models/helpers/accessPolicy'; -import _ from 'es-toolkit/compat'; -import PageStudentGroupFilter from '@tdev-components/shared/PageStudentGroupFilter'; -import useIsBrowser from '@docusaurus/useIsBrowser'; +import { StateType } from '@tdev-api/document'; import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; +import Button from '@tdev-components/shared/Button'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; +import PageStudentGroupFilter from '@tdev-components/shared/PageStudentGroupFilter'; import customFields from '@tdev-components/utils/customFields'; +import { useStore } from '@tdev-hooks/useStore'; +import { RWAccess } from '@tdev-models/helpers/accessPolicy'; +import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; +import Popup from 'reactjs-popup'; +import EditingStateList from './EditingStateList'; +import styles from './styles.module.scss'; const { tdevConfig } = customFields; export const mdiColor: { [key in StateType]: string } = { diff --git a/src/components/Figure/SourceRef/index.tsx b/src/components/Figure/SourceRef/index.tsx index 39922c7f0..09e21aea0 100644 --- a/src/components/Figure/SourceRef/index.tsx +++ b/src/components/Figure/SourceRef/index.tsx @@ -1,8 +1,8 @@ +import { mdiOpenInNew } from '@mdi/js'; +import Icon from '@mdi/react'; import clsx from 'clsx'; import React from 'react'; import styles from './styles.module.scss'; -import Icon from '@mdi/react'; -import { mdiOpenInNew } from '@mdi/js'; interface Bib { author?: string; diff --git a/src/components/Figure/index.tsx b/src/components/Figure/index.tsx index 892385c9d..fc4d7da84 100644 --- a/src/components/Figure/index.tsx +++ b/src/components/Figure/index.tsx @@ -1,8 +1,8 @@ -import React from 'react'; +import EditorPopup from '@tdev/excalidoc/ImageMarkupEditor/EditorPopup'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import EditorPopup from '@tdev/excalidoc/ImageMarkupEditor/EditorPopup'; +import React from 'react'; +import styles from './styles.module.scss'; const defaultUnit = (value: string | number, unit: string = 'px') => { // when only a number is given, add the default unit diff --git a/src/components/FileSystem/Dir.tsx b/src/components/FileSystem/Dir.tsx index ae5855d7c..41fee88e0 100644 --- a/src/components/FileSystem/Dir.tsx +++ b/src/components/FileSystem/Dir.tsx @@ -1,11 +1,11 @@ -import React from 'react'; +import { ReactContextError } from '@docusaurus/theme-common'; +import { mdiFolder, mdiFolderOpen } from '@mdi/js'; +import Icon from '@mdi/react'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import styles from './styles.module.scss'; -import Icon from '@mdi/react'; -import { mdiFolder, mdiFolderOpen } from '@mdi/js'; +import React from 'react'; import File, { FileType } from './File'; -import { ReactContextError } from '@docusaurus/theme-common'; +import styles from './styles.module.scss'; export type DirType = { name: string; diff --git a/src/components/FileSystem/File.tsx b/src/components/FileSystem/File.tsx index 44335bdfc..fd9826523 100644 --- a/src/components/FileSystem/File.tsx +++ b/src/components/FileSystem/File.tsx @@ -1,7 +1,6 @@ -import React from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; export type FileType = string; diff --git a/src/components/HomepageCourses/index.tsx b/src/components/HomepageCourses/index.tsx index 4b9d8b2cd..aba355af9 100644 --- a/src/components/HomepageCourses/index.tsx +++ b/src/components/HomepageCourses/index.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import Link from '@docusaurus/Link'; -import { useStore } from '@tdev-hooks/useStore'; import useIsBrowser from '@docusaurus/useIsBrowser'; +import customFields from '@tdev-components/utils/customFields'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -const { DOCS_ONLY } = customFields; +import styles from './styles.module.scss'; import { Course, useClassVersions } from './useClassVersions'; -import customFields from '@tdev-components/utils/customFields'; +const { DOCS_ONLY } = customFields; // add additional courses here, e.g. for workshops or alumni // CourseList.push(); diff --git a/src/components/HomepageCourses/useClassVersions.ts b/src/components/HomepageCourses/useClassVersions.ts index bdca746a8..b0bea08a8 100644 --- a/src/components/HomepageCourses/useClassVersions.ts +++ b/src/components/HomepageCourses/useClassVersions.ts @@ -1,5 +1,5 @@ -import siteConfig from '@generated/docusaurus.config'; import type { VersionOptions } from '@docusaurus/plugin-content-docs'; +import siteConfig from '@generated/docusaurus.config'; export interface Klass { label: string; diff --git a/src/components/HomepageFeatures/index.tsx b/src/components/HomepageFeatures/index.tsx index 8d37750df..1c7ff65ef 100644 --- a/src/components/HomepageFeatures/index.tsx +++ b/src/components/HomepageFeatures/index.tsx @@ -1,14 +1,13 @@ -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { useStore } from '@tdev-hooks/useStore'; -import { observer } from 'mobx-react-lite'; -import DefinitionList from '@tdev-components/DefinitionList'; -import Icon from '@mdi/react'; import { mdiCheckCircle, mdiCloseCircle, mdiConnection } from '@mdi/js'; +import Icon from '@mdi/react'; +import DefinitionList from '@tdev-components/DefinitionList'; import Button from '@tdev-components/shared/Button'; -import { useIsLive } from '@tdev-hooks/useIsLive'; import Card from '@tdev-components/shared/Card'; import customFields from '@tdev-components/utils/customFields'; +import { useIsLive } from '@tdev-hooks/useIsLive'; +import { useStore } from '@tdev-hooks/useStore'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; const { BACKEND_URL, NO_AUTH, OFFLINE_API } = customFields; const HomepageFeatures = observer(() => { diff --git a/src/components/HomepageHeader/index.tsx b/src/components/HomepageHeader/index.tsx index 2d8816e50..4aab5a751 100644 --- a/src/components/HomepageHeader/index.tsx +++ b/src/components/HomepageHeader/index.tsx @@ -1,10 +1,10 @@ -import clsx from 'clsx'; import Link from '@docusaurus/Link'; import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; import Heading from '@theme/Heading'; +import clsx from 'clsx'; -import styles from './styles.module.scss'; import type { Navbar } from '@docusaurus/theme-common'; +import styles from './styles.module.scss'; interface HeaderProps { hasCourses?: boolean; diff --git a/src/components/LiveStatusIndicator/index.tsx b/src/components/LiveStatusIndicator/index.tsx index d8aed3943..ca51d9a41 100644 --- a/src/components/LiveStatusIndicator/index.tsx +++ b/src/components/LiveStatusIndicator/index.tsx @@ -1,8 +1,8 @@ -import Icon from '@mdi/react'; import { mdiCircle } from '@mdi/js'; +import Icon from '@mdi/react'; +import { useIsLive } from '@tdev-hooks/useIsLive'; import { useStore } from '@tdev-hooks/useStore'; import clsx from 'clsx'; -import { useIsLive } from '@tdev-hooks/useIsLive'; import { observer } from 'mobx-react-lite'; interface Props { diff --git a/src/components/Loader/index.tsx b/src/components/Loader/index.tsx index a59ac7e9b..52fbb8abf 100644 --- a/src/components/Loader/index.tsx +++ b/src/components/Loader/index.tsx @@ -1,9 +1,8 @@ -import * as React from 'react'; +import useIsBrowser from '@docusaurus/useIsBrowser'; +import { mdiLoading } from '@mdi/js'; +import Icon from '@mdi/react'; import clsx from 'clsx'; import styles from './styles.module.scss'; -import Icon from '@mdi/react'; -import { mdiLoading } from '@mdi/js'; -import useIsBrowser from '@docusaurus/useIsBrowser'; interface Props { label?: string; diff --git a/src/components/LoggedOutOverlay/index.tsx b/src/components/LoggedOutOverlay/index.tsx index b4c802cbf..aa2c7659d 100644 --- a/src/components/LoggedOutOverlay/index.tsx +++ b/src/components/LoggedOutOverlay/index.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import styles from './styles.module.scss'; -import Button from '@tdev-components/shared/Button'; -import { mdiCloudOffOutline, mdiIncognito, mdiLogin, mdiReload, mdiSyncOff } from '@mdi/js'; -import Admonition from '@theme/Admonition'; import { useLocation } from '@docusaurus/router'; -import { useStore } from '@tdev-hooks/useStore'; -import { observer } from 'mobx-react-lite'; +import { mdiCloudOffOutline, mdiIncognito, mdiLogin, mdiReload, mdiSyncOff } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import customFields from '@tdev-components/utils/customFields'; import useLocalStorage from '@tdev-hooks/useLocalStorage'; +import { useStore } from '@tdev-hooks/useStore'; +import Admonition from '@theme/Admonition'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; const { loggedOutOverlay } = customFields.tdevConfig; const ALLOWED_PATHS = new Set(['/login', '/signIn'].map((p) => p.toLowerCase())); diff --git a/src/components/MdiSelector/DropdownSelector.tsx b/src/components/MdiSelector/DropdownSelector.tsx index 8286f4cc6..177438484 100644 --- a/src/components/MdiSelector/DropdownSelector.tsx +++ b/src/components/MdiSelector/DropdownSelector.tsx @@ -1,6 +1,5 @@ -import React from 'react'; import * as Mdi from '@mdi/js'; -import _ from 'es-toolkit/compat'; +import React from 'react'; import Select from 'react-select'; const DropdownSelector = (): React.ReactNode => { diff --git a/src/components/MdiSelector/index.tsx b/src/components/MdiSelector/index.tsx index 4c4755cca..7d7a337c9 100644 --- a/src/components/MdiSelector/index.tsx +++ b/src/components/MdiSelector/index.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import Icon from '@mdi/react'; import * as Mdi from '@mdi/js'; -import _ from 'es-toolkit/compat'; -import CopyBadge from '@tdev-components/shared/CopyBadge'; -import TextInput from '@tdev-components/shared/TextInput'; +import Icon from '@mdi/react'; import Button from '@tdev-components/shared/Button'; +import CopyBadge from '@tdev-components/shared/CopyBadge'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; +import TextInput from '@tdev-components/shared/TextInput'; +import clsx from 'clsx'; +import _ from 'es-toolkit/compat'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { // Optional top margin for the filter bar diff --git a/src/components/MdxPage/index.tsx b/src/components/MdxPage/index.tsx index e42d496dc..d8cc595f1 100644 --- a/src/components/MdxPage/index.tsx +++ b/src/components/MdxPage/index.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; +import type { DocumentType } from '@tdev-api/document'; import { useDocumentRoot } from '@tdev-hooks/useDocumentRoot'; +import { useStore } from '@tdev-hooks/useStore'; import { TypeMeta } from '@tdev-models/DocumentRoot'; -import type { DocumentType } from '@tdev-api/document'; -import { computed } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; interface Props { pageId: string; diff --git a/src/components/Navbar/AccountSwitcher/index.tsx b/src/components/Navbar/AccountSwitcher/index.tsx index ae7f6e93b..277b743e5 100644 --- a/src/components/Navbar/AccountSwitcher/index.tsx +++ b/src/components/Navbar/AccountSwitcher/index.tsx @@ -1,17 +1,16 @@ -import React from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import { useLocation } from '@docusaurus/router'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { mdiAccountCircleOutline, mdiAccountSwitch, mdiHomeAccount, mdiShieldAccount } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; +import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; import Button from '@tdev-components/shared/Button'; -import useIsBrowser from '@docusaurus/useIsBrowser'; -import Popup from 'reactjs-popup'; -import _ from 'es-toolkit/compat'; -import { useLocation } from '@docusaurus/router'; +import { useStore } from '@tdev-hooks/useStore'; import User from '@tdev-models/User'; -import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; +import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; +import Popup from 'reactjs-popup'; +import styles from './styles.module.scss'; interface SwitchToUserButtonProps { user: User; diff --git a/src/components/Navbar/DevModeAccessLocalFS/index.tsx b/src/components/Navbar/DevModeAccessLocalFS/index.tsx index 57535082c..82b1e15bf 100644 --- a/src/components/Navbar/DevModeAccessLocalFS/index.tsx +++ b/src/components/Navbar/DevModeAccessLocalFS/index.tsx @@ -1,17 +1,17 @@ import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import { mdiFolderCancel, mdiFolderCancelOutline, mdiFolderEditOutline } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; +import { localDb } from '@tdev-api/base'; import Button from '@tdev-components/shared/Button'; import requestDocusaurusRootAcess from '@tdev-components/utils/localFS/requestDocusaurusRootAcess'; -import clsx from 'clsx'; import { FS_DocusaurusRootID, restoreAccess } from '@tdev-components/utils/localFS/requestLocalDirectoryAccess'; -import { localDb } from '@tdev-api/base'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; const IsDevMode = process.env.NODE_ENV === ('development' as const); diff --git a/src/components/Navbar/LoginProfileButton/AdminNavPopup.tsx b/src/components/Navbar/LoginProfileButton/AdminNavPopup.tsx index b65632e39..345f29cfb 100644 --- a/src/components/Navbar/LoginProfileButton/AdminNavPopup.tsx +++ b/src/components/Navbar/LoginProfileButton/AdminNavPopup.tsx @@ -1,3 +1,5 @@ +import { useLocation } from '@docusaurus/router'; +import useBaseUrl from '@docusaurus/useBaseUrl'; import { mdiAccountCircleOutline, mdiAccountDetailsOutline, @@ -5,14 +7,12 @@ import { mdiCogs, mdiShieldAccountOutline } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import Popup from 'reactjs-popup'; -import styles from './styles.module.scss'; import ProfileButton from './ProfileButton'; -import Button from '@tdev-components/shared/Button'; -import { useLocation } from '@docusaurus/router'; -import useBaseUrl from '@docusaurus/useBaseUrl'; -import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface AdminNavButtonProps { href: string; diff --git a/src/components/Navbar/LoginProfileButton/ProfileButton.tsx b/src/components/Navbar/LoginProfileButton/ProfileButton.tsx index 1584d8af3..a3f80a95f 100644 --- a/src/components/Navbar/LoginProfileButton/ProfileButton.tsx +++ b/src/components/Navbar/LoginProfileButton/ProfileButton.tsx @@ -1,13 +1,13 @@ +import useBaseUrl from '@docusaurus/useBaseUrl'; import { mdiAccountCircleOutline } from '@mdi/js'; +import { DEFAULT_OFFLINE_USER } from '@tdev-api/OfflineApi'; import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; import Button from '@tdev-components/shared/Button'; import useIsMobileView from '@tdev-hooks/useIsMobileView'; import { useStore } from '@tdev-hooks/useStore'; import clsx from 'clsx'; -import styles from './styles.module.scss'; -import useBaseUrl from '@docusaurus/useBaseUrl'; import { observer } from 'mobx-react-lite'; -import { DEFAULT_OFFLINE_USER, OfflineUser } from '@tdev-api/OfflineApi'; +import styles from './styles.module.scss'; interface Props { preventClick?: boolean; diff --git a/src/components/Navbar/LoginProfileButton/index.tsx b/src/components/Navbar/LoginProfileButton/index.tsx index 5e973ae0d..e05d5e9b3 100644 --- a/src/components/Navbar/LoginProfileButton/index.tsx +++ b/src/components/Navbar/LoginProfileButton/index.tsx @@ -1,13 +1,13 @@ +import useBaseUrl from '@docusaurus/useBaseUrl'; import useIsBrowser from '@docusaurus/useIsBrowser'; import { mdiLogin } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; +import customFields from '@tdev-components/utils/customFields'; import { useStore } from '@tdev-hooks/useStore'; +import { authClient } from '@tdev/auth-client'; import { observer } from 'mobx-react-lite'; import AdminNavPopup from './AdminNavPopup'; import ProfileButton from './ProfileButton'; -import useBaseUrl from '@docusaurus/useBaseUrl'; -import { authClient } from '@tdev/auth-client'; -import customFields from '@tdev-components/utils/customFields'; const { NO_AUTH } = customFields; const LoginButton = () => { diff --git a/src/components/Navbar/PersonalSpaceOverlay/index.tsx b/src/components/Navbar/PersonalSpaceOverlay/index.tsx index b7c2159ad..2cca29646 100644 --- a/src/components/Navbar/PersonalSpaceOverlay/index.tsx +++ b/src/components/Navbar/PersonalSpaceOverlay/index.tsx @@ -1,15 +1,15 @@ -import styles from './styles.module.scss'; -import Popup from 'reactjs-popup'; -import clsx from 'clsx'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { mdiFolderHomeOutline } from '@mdi/js'; -import Button from '@tdev-components/shared/Button'; import Directory from '@tdev-components/documents/FileSystem/Directory'; +import Button from '@tdev-components/shared/Button'; +import customFields from '@tdev-components/utils/customFields'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import React from 'react'; +import Popup from 'reactjs-popup'; import { PopupActions } from 'reactjs-popup/dist/types'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import useIsBrowser from '@docusaurus/useIsBrowser'; -import customFields from '@tdev-components/utils/customFields'; +import styles from './styles.module.scss'; const { PERSONAL_SPACE_DOC_ROOT_ID } = customFields; const PersonalSpaceOverlay = observer(() => { diff --git a/src/components/Navbar/RequestTarget/index.tsx b/src/components/Navbar/RequestTarget/index.tsx index a94959f7f..d05208328 100644 --- a/src/components/Navbar/RequestTarget/index.tsx +++ b/src/components/Navbar/RequestTarget/index.tsx @@ -1,15 +1,14 @@ -import React from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { mdiLaptop } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; +import NavSetTargetRequest from '@tdev-components/Admin/ActionRequest/NavSetTargetRequest'; import Button from '@tdev-components/shared/Button'; -import useIsBrowser from '@docusaurus/useIsBrowser'; -import Popup from 'reactjs-popup'; +import { useStore } from '@tdev-hooks/useStore'; import _ from 'es-toolkit/compat'; -import NavSetTargetRequest from '@tdev-components/Admin/ActionRequest/NavSetTargetRequest'; +import { observer } from 'mobx-react-lite'; +import Popup from 'reactjs-popup'; +import styles from './styles.module.scss'; const RequestTarget = observer(() => { const isBrowser = useIsBrowser(); diff --git a/src/components/PermissionsPanel/AccessBadge/index.tsx b/src/components/PermissionsPanel/AccessBadge/index.tsx index 7481fa04e..d0169394f 100644 --- a/src/components/PermissionsPanel/AccessBadge/index.tsx +++ b/src/components/PermissionsPanel/AccessBadge/index.tsx @@ -1,12 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { Access } from '@tdev-api/document'; -import Icon from '@mdi/react'; -import { NoneAccess, ROAccess, RWAccess } from '@tdev-models/helpers/accessPolicy'; import { mdiEye, mdiEyeOff, mdiSquareEditOutline } from '@mdi/js'; +import Icon from '@mdi/react'; +import { Access } from '@tdev-api/document'; import { IfmColors } from '@tdev-components/shared/Colors'; +import { NoneAccess, ROAccess, RWAccess } from '@tdev-models/helpers/accessPolicy'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; const SIZE = 0.8; export const AccessIcon = (access?: Access) => { if (RWAccess.has(access)) { diff --git a/src/components/PermissionsPanel/AccessSelector/GroupAccessSelector.tsx b/src/components/PermissionsPanel/AccessSelector/GroupAccessSelector.tsx index f5eafac8c..c89f582a0 100644 --- a/src/components/PermissionsPanel/AccessSelector/GroupAccessSelector.tsx +++ b/src/components/PermissionsPanel/AccessSelector/GroupAccessSelector.tsx @@ -1,10 +1,9 @@ -import React from 'react'; +import { Access } from '@tdev-api/document'; +import { useStore } from '@tdev-hooks/useStore'; +import StudentGroup from '@tdev-models/StudentGroup'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; import AccessSelector from '.'; -import { Access } from '@tdev-api/document'; -import StudentGroup from '@tdev-models/StudentGroup'; interface Props { group: StudentGroup; diff --git a/src/components/PermissionsPanel/AccessSelector/RootAccessSelector.tsx b/src/components/PermissionsPanel/AccessSelector/RootAccessSelector.tsx index 75d5d41c1..6f72e3a87 100644 --- a/src/components/PermissionsPanel/AccessSelector/RootAccessSelector.tsx +++ b/src/components/PermissionsPanel/AccessSelector/RootAccessSelector.tsx @@ -1,10 +1,7 @@ -import React from 'react'; -import clsx from 'clsx'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import AccessSelector from '.'; import { Access, DocumentType } from '@tdev-api/document'; import DocumentRoot from '@tdev-models/DocumentRoot'; +import { observer } from 'mobx-react-lite'; +import AccessSelector from '.'; interface Props { documentRoot: DocumentRoot; diff --git a/src/components/PermissionsPanel/AccessSelector/SharedAccessSelector.tsx b/src/components/PermissionsPanel/AccessSelector/SharedAccessSelector.tsx index a00b07f71..866556b69 100644 --- a/src/components/PermissionsPanel/AccessSelector/SharedAccessSelector.tsx +++ b/src/components/PermissionsPanel/AccessSelector/SharedAccessSelector.tsx @@ -1,10 +1,7 @@ -import React from 'react'; -import clsx from 'clsx'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import AccessSelector from '.'; import { Access, DocumentType } from '@tdev-api/document'; import DocumentRoot from '@tdev-models/DocumentRoot'; +import { observer } from 'mobx-react-lite'; +import AccessSelector from '.'; interface Props { documentRoot: DocumentRoot; diff --git a/src/components/PermissionsPanel/AccessSelector/index.tsx b/src/components/PermissionsPanel/AccessSelector/index.tsx index 688fb9e7e..588f358a3 100644 --- a/src/components/PermissionsPanel/AccessSelector/index.tsx +++ b/src/components/PermissionsPanel/AccessSelector/index.tsx @@ -1,10 +1,10 @@ -import React from 'react'; +import { mdiCircleSmall } from '@mdi/js'; +import Icon from '@mdi/react'; +import { Access } from '@tdev-api/document'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import { Access } from '@tdev-api/document'; -import Icon from '@mdi/react'; -import { mdiCircleSmall } from '@mdi/js'; +import React from 'react'; +import styles from './styles.module.scss'; export const AccessNames: { [key in Access]: string } = { [Access.RO_User]: 'RO', diff --git a/src/components/PermissionsPanel/GroupPermission/AccessPanel.tsx b/src/components/PermissionsPanel/GroupPermission/AccessPanel.tsx index 9828262f7..8c3242692 100644 --- a/src/components/PermissionsPanel/GroupPermission/AccessPanel.tsx +++ b/src/components/PermissionsPanel/GroupPermission/AccessPanel.tsx @@ -1,15 +1,13 @@ -import React from 'react'; +import { Access } from '@tdev-api/document'; +import Loader from '@tdev-components/Loader'; +import AccessSelector from '@tdev-components/PermissionsPanel/AccessSelector'; +import { useStore } from '@tdev-hooks/useStore'; +import DocumentRoot from '@tdev-models/DocumentRoot'; import clsx from 'clsx'; -import styles from '../AccessPanel.module.scss'; import { observer } from 'mobx-react-lite'; -import DocumentRoot from '@tdev-models/DocumentRoot'; -import { useStore } from '@tdev-hooks/useStore'; +import React from 'react'; import GroupPermission from '.'; -import AccessSelector from '@tdev-components/PermissionsPanel/AccessSelector'; -import Loader from '@tdev-components/Loader'; -import { Access } from '@tdev-api/document'; -import { default as GroupPermissionModel } from '@tdev-models/GroupPermission'; -import _ from 'es-toolkit/compat'; +import styles from '../AccessPanel.module.scss'; interface Props { documentRoots: DocumentRoot[]; diff --git a/src/components/PermissionsPanel/GroupPermission/index.tsx b/src/components/PermissionsPanel/GroupPermission/index.tsx index 20ddaf925..055ba70e4 100644 --- a/src/components/PermissionsPanel/GroupPermission/index.tsx +++ b/src/components/PermissionsPanel/GroupPermission/index.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from '../Permission.module.scss'; -import { observer } from 'mobx-react-lite'; -import AccessSelector from '../AccessSelector'; -import Button from '@tdev-components/shared/Button'; import { mdiAccountSupervisorCircle, mdiDelete } from '@mdi/js'; -import { default as GroupPermissionModel } from '@tdev-models/GroupPermission'; import Icon from '@mdi/react'; import { Access } from '@tdev-api/document'; +import Button from '@tdev-components/shared/Button'; +import { default as GroupPermissionModel } from '@tdev-models/GroupPermission'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import AccessSelector from '../AccessSelector'; +import styles from '../Permission.module.scss'; interface SingleProps { permission: GroupPermissionModel; diff --git a/src/components/PermissionsPanel/UserPermission/AccessPanel.tsx b/src/components/PermissionsPanel/UserPermission/AccessPanel.tsx index 1364afd80..a28ce98d2 100644 --- a/src/components/PermissionsPanel/UserPermission/AccessPanel.tsx +++ b/src/components/PermissionsPanel/UserPermission/AccessPanel.tsx @@ -1,14 +1,13 @@ -import React from 'react'; +import { Access } from '@tdev-api/document'; +import Loader from '@tdev-components/Loader'; +import { useStore } from '@tdev-hooks/useStore'; +import DocumentRoot from '@tdev-models/DocumentRoot'; import clsx from 'clsx'; -import styles from '../AccessPanel.module.scss'; import { observer } from 'mobx-react-lite'; -import DocumentRoot from '@tdev-models/DocumentRoot'; -import { useStore } from '@tdev-hooks/useStore'; +import React from 'react'; import UserPermission from '.'; +import styles from '../AccessPanel.module.scss'; import AccessSelector from '../AccessSelector'; -import Loader from '@tdev-components/Loader'; -import { Access } from '@tdev-api/document'; -import _ from 'es-toolkit/compat'; interface Props { documentRoots: DocumentRoot[]; diff --git a/src/components/PermissionsPanel/UserPermission/index.tsx b/src/components/PermissionsPanel/UserPermission/index.tsx index 27eec388b..6cf39b944 100644 --- a/src/components/PermissionsPanel/UserPermission/index.tsx +++ b/src/components/PermissionsPanel/UserPermission/index.tsx @@ -1,14 +1,13 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from '../Permission.module.scss'; -import { observer } from 'mobx-react-lite'; -import { default as UserPermissionModel } from '@tdev-models/UserPermission'; -import AccessSelector from '../AccessSelector'; -import Button from '@tdev-components/shared/Button'; import { mdiAccountCircle, mdiDelete } from '@mdi/js'; import Icon from '@mdi/react'; import { Access } from '@tdev-api/document'; +import Button from '@tdev-components/shared/Button'; import { useStore } from '@tdev-hooks/useStore'; +import { default as UserPermissionModel } from '@tdev-models/UserPermission'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import AccessSelector from '../AccessSelector'; +import styles from '../Permission.module.scss'; interface SingleProps { permission: UserPermissionModel; diff --git a/src/components/PermissionsPanel/index.tsx b/src/components/PermissionsPanel/index.tsx index 121cd7a8a..3becc8155 100644 --- a/src/components/PermissionsPanel/index.tsx +++ b/src/components/PermissionsPanel/index.tsx @@ -1,20 +1,20 @@ -import React from 'react'; -import Popup from 'reactjs-popup'; -import styles from './styles.module.scss'; -import Button from '@tdev-components/shared/Button'; import { mdiShieldLockOutline } from '@mdi/js'; -import { observer } from 'mobx-react-lite'; import { Access } from '@tdev-api/document'; +import UserPermission from '@tdev-components/PermissionsPanel/UserPermission'; +import Button from '@tdev-components/shared/Button'; +import useIsMobileView from '@tdev-hooks/useIsMobileView'; import { useStore } from '@tdev-hooks/useStore'; import clsx from 'clsx'; -import AccessSelector from './AccessSelector'; -import { default as UserAccessPanel } from './UserPermission/AccessPanel'; -import { default as GroupAccessPanel } from './GroupPermission/AccessPanel'; -import DefinitionList from '../DefinitionList'; import { action } from 'mobx'; -import UserPermission from '@tdev-components/PermissionsPanel/UserPermission'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Popup from 'reactjs-popup'; import { PopupPosition } from 'reactjs-popup/dist/types'; -import useIsMobileView from '@tdev-hooks/useIsMobileView'; +import DefinitionList from '../DefinitionList'; +import AccessSelector from './AccessSelector'; +import { default as GroupAccessPanel } from './GroupPermission/AccessPanel'; +import styles from './styles.module.scss'; +import { default as UserAccessPanel } from './UserPermission/AccessPanel'; interface BaseProps { position?: PopupPosition | PopupPosition[]; diff --git a/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/AdminActions.tsx b/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/AdminActions.tsx index 1b7de85c6..4aac412f4 100644 --- a/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/AdminActions.tsx +++ b/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/AdminActions.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from '../styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import { mdiClose, mdiProjectorScreenOffOutline, mdiSync } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import useIsMobileView from '@tdev-hooks/useIsMobileView'; import { useStore } from '@tdev-hooks/useStore'; import StudentGroup from '@tdev-models/StudentGroup'; -import Button from '@tdev-components/shared/Button'; -import { mdiClose, mdiProjectorScreenOffOutline, mdiSync } from '@mdi/js'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import CanEditBadge from '../CanEditBadge'; -import useIsMobileView from '@tdev-hooks/useIsMobileView'; +import styles from '../styles.module.scss'; interface Props { group: StudentGroup; diff --git a/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/FocusSelector.tsx b/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/FocusSelector.tsx index 30643ab9c..3a7b4810d 100644 --- a/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/FocusSelector.tsx +++ b/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/FocusSelector.tsx @@ -1,11 +1,10 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from '../styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import StudentGroup from '@tdev-models/StudentGroup'; import { Access } from '@tdev-api/document'; import BadgeSelector from '@tdev-components/User/BadgeSelector'; +import { useStore } from '@tdev-hooks/useStore'; +import StudentGroup from '@tdev-models/StudentGroup'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from '../styles.module.scss'; interface Props { group: StudentGroup; diff --git a/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/SpinningWheel/index.tsx b/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/SpinningWheel/index.tsx index 3ce55176e..ee66af710 100644 --- a/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/SpinningWheel/index.tsx +++ b/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/SpinningWheel/index.tsx @@ -1,15 +1,15 @@ /** * Generated with Sonnet 5 @ claude.ai 4-8-2026 */ +import { Access } from '@tdev-api/document'; +import Loader from '@tdev-components/Loader'; +import Alert from '@tdev-components/shared/Alert'; +import { useStore } from '@tdev-hooks/useStore'; import StudentGroup from '@tdev-models/StudentGroup'; -import styles from './styles.module.scss'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; import React, { CSSProperties } from 'react'; -import Alert from '@tdev-components/shared/Alert'; -import Loader from '@tdev-components/Loader'; -import { useStore } from '@tdev-hooks/useStore'; -import { Access } from '@tdev-api/document'; +import styles from './styles.module.scss'; /** * SpinningWheel diff --git a/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/index.tsx b/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/index.tsx index c1fbee973..2b2df5530 100644 --- a/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/index.tsx +++ b/src/components/PresentationPanel/DocumentPresentationView/AdminPanel/index.tsx @@ -1,17 +1,3 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from '../styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import StudentGroup from '@tdev-models/StudentGroup'; -import GroupAccessSelector from '@tdev-components/PermissionsPanel/AccessSelector/GroupAccessSelector'; -import SharedAccessSelector from '@tdev-components/PermissionsPanel/AccessSelector/SharedAccessSelector'; -import { asStudentGroupAccess } from '@tdev-models/helpers/accessPolicy'; -import Card from '@tdev-components/shared/Card'; -import Badge from '@tdev-components/shared/Badge'; -import RootAccessSelector from '@tdev-components/PermissionsPanel/AccessSelector/RootAccessSelector'; -import Alert from '@tdev-components/shared/Alert'; -import Button from '@tdev-components/shared/Button'; import { mdiCloudCheckVariantOutline, mdiCloudOffOutline, @@ -22,14 +8,27 @@ import { mdiMagnify, mdiMagnifyScan } from '@mdi/js'; -import FocusSelector from './FocusSelector'; -import SpinningWheel from './SpinningWheel'; -import Tabs from '@theme/Tabs'; -import TabItem from '@theme/TabItem'; -import useIsMobileView from '@tdev-hooks/useIsMobileView'; -import DefinitionList from '@tdev-components/DefinitionList'; import Icon from '@mdi/react'; +import DefinitionList from '@tdev-components/DefinitionList'; +import GroupAccessSelector from '@tdev-components/PermissionsPanel/AccessSelector/GroupAccessSelector'; +import RootAccessSelector from '@tdev-components/PermissionsPanel/AccessSelector/RootAccessSelector'; +import SharedAccessSelector from '@tdev-components/PermissionsPanel/AccessSelector/SharedAccessSelector'; +import Alert from '@tdev-components/shared/Alert'; +import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import useIsMobileView from '@tdev-hooks/useIsMobileView'; +import { useStore } from '@tdev-hooks/useStore'; +import { asStudentGroupAccess } from '@tdev-models/helpers/accessPolicy'; +import StudentGroup from '@tdev-models/StudentGroup'; +import TabItem from '@theme/TabItem'; +import Tabs from '@theme/Tabs'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from '../styles.module.scss'; +import FocusSelector from './FocusSelector'; +import SpinningWheel from './SpinningWheel'; interface Props { group: StudentGroup; diff --git a/src/components/PresentationPanel/DocumentPresentationView/CanEditBadge.tsx b/src/components/PresentationPanel/DocumentPresentationView/CanEditBadge.tsx index c127e8a05..f60c6cae4 100644 --- a/src/components/PresentationPanel/DocumentPresentationView/CanEditBadge.tsx +++ b/src/components/PresentationPanel/DocumentPresentationView/CanEditBadge.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import StudentGroup from '@tdev-models/StudentGroup'; -import Badge from '@tdev-components/shared/Badge'; import { mdiEye, mdiMovieOpenPlay } from '@mdi/js'; import Icon from '@mdi/react'; +import { Access } from '@tdev-api/document'; +import Badge from '@tdev-components/shared/Badge'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; import { useStore } from '@tdev-hooks/useStore'; -import { Access } from '@tdev-api/document'; import { RWAccess } from '@tdev-models/helpers/accessPolicy'; +import StudentGroup from '@tdev-models/StudentGroup'; +import { observer } from 'mobx-react-lite'; interface Props { group: StudentGroup; diff --git a/src/components/PresentationPanel/DocumentPresentationView/CodeEditor.tsx b/src/components/PresentationPanel/DocumentPresentationView/CodeEditor.tsx index fdacf9064..be6a80d7d 100644 --- a/src/components/PresentationPanel/DocumentPresentationView/CodeEditor.tsx +++ b/src/components/PresentationPanel/DocumentPresentationView/CodeEditor.tsx @@ -1,16 +1,16 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import StudentGroup from '@tdev-models/StudentGroup'; import { CodeType } from '@tdev-api/document'; +import Loader from '@tdev-components/Loader'; import CodeEditorComponent from '@tdev-components/documents/CodeEditor'; -import iCode from '@tdev-models/documents/iCode'; +import { type Overrides } from '@tdev-components/documents/CodeEditor/Editor/EditorAce'; import Alert from '@tdev-components/shared/Alert'; import { useStore } from '@tdev-hooks/useStore'; +import StudentGroup from '@tdev-models/StudentGroup'; +import iCode from '@tdev-models/documents/iCode'; import CodeBlock from '@theme/CodeBlock'; -import Loader from '@tdev-components/Loader'; -import { type Overrides } from '@tdev-components/documents/CodeEditor/Editor/EditorAce'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { group: StudentGroup; diff --git a/src/components/PresentationPanel/DocumentPresentationView/index.tsx b/src/components/PresentationPanel/DocumentPresentationView/index.tsx index 2bea7293c..b10b83e0d 100644 --- a/src/components/PresentationPanel/DocumentPresentationView/index.tsx +++ b/src/components/PresentationPanel/DocumentPresentationView/index.tsx @@ -1,15 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import { useStore } from '@tdev-hooks/useStore'; import StudentGroup from '@tdev-models/StudentGroup'; -import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; +import Tabs from '@theme/Tabs'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import AdminPanel from './AdminPanel'; -import CodeEditor from './CodeEditor'; import AdminActions from './AdminPanel/AdminActions'; import CanEditBadge from './CanEditBadge'; +import CodeEditor from './CodeEditor'; +import styles from './styles.module.scss'; interface Props { group: StudentGroup; diff --git a/src/components/PresentationPanel/PresentationModal/index.tsx b/src/components/PresentationPanel/PresentationModal/index.tsx index 29d12bfd1..2102d5056 100644 --- a/src/components/PresentationPanel/PresentationModal/index.tsx +++ b/src/components/PresentationPanel/PresentationModal/index.tsx @@ -1,14 +1,13 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { useColorMode } from '@docusaurus/theme-common'; +import { mdiPresentationPlay } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import { useClientLib } from '@tdev-hooks/useClientLib'; -import { observer } from 'mobx-react-lite'; import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import Popup from 'reactjs-popup'; import type { default as PresentationPanelLib } from '..'; -import Button from '@tdev-components/shared/Button'; -import { mdiPresentationPlay } from '@mdi/js'; -import { useColorMode } from '@docusaurus/theme-common'; +import styles from './styles.module.scss'; interface Props {} diff --git a/src/components/PresentationPanel/index.tsx b/src/components/PresentationPanel/index.tsx index f4090e8b2..2dd5bf706 100644 --- a/src/components/PresentationPanel/index.tsx +++ b/src/components/PresentationPanel/index.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import useIsBrowser from '@docusaurus/useIsBrowser'; +import Alert from '@tdev-components/shared/Alert'; import { useStore } from '@tdev-hooks/useStore'; -import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; +import Tabs from '@theme/Tabs'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import DocumentPresentationView from './DocumentPresentationView'; -import Alert from '@tdev-components/shared/Alert'; -import useIsBrowser from '@docusaurus/useIsBrowser'; +import styles from './styles.module.scss'; interface Props {} diff --git a/src/components/Rooms/index.tsx b/src/components/Rooms/index.tsx index 2b371eaed..7edc9fa1d 100644 --- a/src/components/Rooms/index.tsx +++ b/src/components/Rooms/index.tsx @@ -1,23 +1,23 @@ -import clsx from 'clsx'; import Layout from '@theme/Layout'; +import clsx from 'clsx'; -import { matchPath, useLocation } from '@docusaurus/router'; import BrowserOnly from '@docusaurus/BrowserOnly'; -import { observer } from 'mobx-react-lite'; -import Loader from '@tdev-components/Loader'; -import Icon from '@mdi/react'; +import { matchPath, useLocation } from '@docusaurus/router'; import { mdiEmoticonSad } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; -import styles from './styles.module.scss'; -import React from 'react'; -import type DynamicDocumentRoots from '@tdev-models/documents/DynamicDocumentRoots'; +import Icon from '@mdi/react'; +import { ContainerType } from '@tdev-api/document'; import { default as DynamicDocumentRootsComponent } from '@tdev-components/documents/DynamicDocumentRoots'; -import { ModelMeta } from '@tdev-models/documents/DynamicDocumentRoots'; +import Loader from '@tdev-components/Loader'; import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; import NoAccess from '@tdev-components/shared/NoAccess'; -import { ContainerType } from '@tdev-api/document'; import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { useStore } from '@tdev-hooks/useStore'; +import type DynamicDocumentRoots from '@tdev-models/documents/DynamicDocumentRoots'; +import { ModelMeta } from '@tdev-models/documents/DynamicDocumentRoots'; +import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; const NoRoom = () => { return ( diff --git a/src/components/Steps/index.tsx b/src/components/Steps/index.tsx index f851515be..90d6d1935 100644 --- a/src/components/Steps/index.tsx +++ b/src/components/Steps/index.tsx @@ -1,7 +1,7 @@ -import React from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { children: React.ReactNode; diff --git a/src/components/StudentGroup/AddMembersPopup/AddUser.tsx b/src/components/StudentGroup/AddMembersPopup/AddUser.tsx index 1aaf1de22..359503974 100644 --- a/src/components/StudentGroup/AddMembersPopup/AddUser.tsx +++ b/src/components/StudentGroup/AddMembersPopup/AddUser.tsx @@ -1,14 +1,14 @@ -import styles from './styles.module.scss'; import { mdiAccountPlus, mdiAccountPlusOutline } from '@mdi/js'; +import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; +import Button from '@tdev-components/shared/Button'; import { useStore } from '@tdev-hooks/useStore'; +import StudentGroup from '@tdev-models/StudentGroup'; +import User from '@tdev-models/User'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; import React from 'react'; +import styles from './styles.module.scss'; import { _AddMembersPopupPropsInternal } from './types'; -import Button from '@tdev-components/shared/Button'; -import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; -import User from '@tdev-models/User'; -import StudentGroup from '@tdev-models/StudentGroup'; interface AddUserLineProps { idx: number; diff --git a/src/components/StudentGroup/AddMembersPopup/ImportFromList.tsx b/src/components/StudentGroup/AddMembersPopup/ImportFromList.tsx index 8b27f3f0c..aeeae386c 100644 --- a/src/components/StudentGroup/AddMembersPopup/ImportFromList.tsx +++ b/src/components/StudentGroup/AddMembersPopup/ImportFromList.tsx @@ -1,15 +1,15 @@ -import styles from './styles.module.scss'; +import { mdiAccountArrowLeft } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import TextAreaInput from '@tdev-components/shared/TextAreaInput'; import { useStore } from '@tdev-hooks/useStore'; -import { observer } from 'mobx-react-lite'; -import { _AddMembersPopupPropsInternal } from './types'; -import React from 'react'; import User from '@tdev-models/User'; +import Admonition from '@theme/Admonition'; import clsx from 'clsx'; -import Button from '@tdev-components/shared/Button'; -import { mdiAccountArrowLeft } from '@mdi/js'; -import TextAreaInput from '@tdev-components/shared/TextAreaInput'; import { debounce } from 'es-toolkit'; -import Admonition from '@theme/Admonition'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; +import { _AddMembersPopupPropsInternal } from './types'; const ImportFromList = observer((props: _AddMembersPopupPropsInternal) => { const userStore = useStore('userStore'); diff --git a/src/components/StudentGroup/AddMembersPopup/ImportGroup.tsx b/src/components/StudentGroup/AddMembersPopup/ImportGroup.tsx index d8a156c5b..15cecbad4 100644 --- a/src/components/StudentGroup/AddMembersPopup/ImportGroup.tsx +++ b/src/components/StudentGroup/AddMembersPopup/ImportGroup.tsx @@ -1,11 +1,11 @@ -import styles from './styles.module.scss'; -import React from 'react'; -import { _AddMembersPopupPropsInternal } from './types'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import clsx from 'clsx'; import { mdiAccountArrowLeft } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; +import { _AddMembersPopupPropsInternal } from './types'; const ImportGroup = observer((props: _AddMembersPopupPropsInternal) => { const studentGroupStore = useStore('studentGroupStore'); diff --git a/src/components/StudentGroup/AddMembersPopup/index.tsx b/src/components/StudentGroup/AddMembersPopup/index.tsx index 4987cd6c6..77915b096 100644 --- a/src/components/StudentGroup/AddMembersPopup/index.tsx +++ b/src/components/StudentGroup/AddMembersPopup/index.tsx @@ -1,4 +1,3 @@ -import styles from './styles.module.scss'; import { mdiAccountMultiple, mdiAccountPlus } from '@mdi/js'; import Icon from '@mdi/react'; import TabItem from '@theme/TabItem'; @@ -12,6 +11,7 @@ import Button from '../../shared/Button'; import AddUser from './AddUser'; import ImportFromList from './ImportFromList'; import ImportGroup from './ImportGroup'; +import styles from './styles.module.scss'; import { AddMembersPopupProps } from './types'; const AddUserPopup = observer((props: AddMembersPopupProps) => { diff --git a/src/components/StudentGroup/AssignCredentials/index.tsx b/src/components/StudentGroup/AssignCredentials/index.tsx index 6a51fe710..676d06e57 100644 --- a/src/components/StudentGroup/AssignCredentials/index.tsx +++ b/src/components/StudentGroup/AssignCredentials/index.tsx @@ -1,18 +1,16 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; import Loader from '@tdev-components/Loader'; +import Alert from '@tdev-components/shared/Alert'; import AssignColumns from '@tdev-components/shared/AssignColumns'; -import { Hashery } from 'hashery'; -import _ from 'es-toolkit/compat'; +import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; import FromXlsxClipboard from '@tdev-components/shared/FromXlsxClipboard'; +import { useStore } from '@tdev-hooks/useStore'; import StudentGroup from '@tdev-models/StudentGroup'; -import Badge from '@tdev-components/shared/Badge'; -import { authClient } from '@tdev/auth-client'; -import Alert from '@tdev-components/shared/Alert'; +import clsx from 'clsx'; +import { Hashery } from 'hashery'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; const hashery = new Hashery({ cache: { enabled: false } }); interface Props { diff --git a/src/components/StudentGroup/Undo.tsx b/src/components/StudentGroup/Undo.tsx index d7580436b..d388a6a9b 100644 --- a/src/components/StudentGroup/Undo.tsx +++ b/src/components/StudentGroup/Undo.tsx @@ -1,7 +1,7 @@ +import { mdiAccountReactivateOutline } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import clsx from 'clsx'; import styles from './styles.module.scss'; -import Button from '@tdev-components/shared/Button'; -import { mdiAccountReactivateOutline } from '@mdi/js'; interface Props { message: string | React.ReactElement; diff --git a/src/components/StudentGroup/index.tsx b/src/components/StudentGroup/index.tsx index 486ede2c6..9d8fe8fea 100644 --- a/src/components/StudentGroup/index.tsx +++ b/src/components/StudentGroup/index.tsx @@ -1,9 +1,3 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { default as StudentGroupModel } from '@tdev-models/StudentGroup'; -import Button from '@tdev-components/shared/Button'; import { mdiAccountCancel, mdiAccountKey, @@ -22,21 +16,27 @@ import { mdiToggleSwitchOff, mdiTrashCanOutline } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; -import DefinitionList from '../DefinitionList'; -import Details from '@theme/Details'; +import ExportModal from '@tdev-components/Admin/ExportPanel/ExportModal'; +import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; import { exportAsExcelSpreadsheet } from '@tdev-components/StudentGroup/services/excelExport'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import Button from '@tdev-components/shared/Button'; import { Confirm } from '@tdev-components/shared/Button/Confirm'; -import Undo from './Undo'; -import AddUserPopup from './AddMembersPopup'; -import LiveStatusIndicator from '@tdev-components/LiveStatusIndicator'; -import { exportNameCards } from './services/exportNameCards'; -import AssignCredentials from './AssignCredentials'; import Card from '@tdev-components/shared/Card'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import { useStore } from '@tdev-hooks/useStore'; +import { default as StudentGroupModel } from '@tdev-models/StudentGroup'; +import Details from '@theme/Details'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import Popup from 'reactjs-popup'; +import DefinitionList from '../DefinitionList'; +import AddUserPopup from './AddMembersPopup'; +import AssignCredentials from './AssignCredentials'; +import Undo from './Undo'; import { exportNewPasswordList } from './services/excelNewPwExport'; -import ExportModal from '@tdev-components/Admin/ExportPanel/ExportModal'; +import { exportNameCards } from './services/exportNameCards'; +import styles from './styles.module.scss'; interface Props { studentGroup: StudentGroupModel; diff --git a/src/components/StudentGroup/services/excelExport.ts b/src/components/StudentGroup/services/excelExport.ts index b28dfe8a6..3f79c6a62 100644 --- a/src/components/StudentGroup/services/excelExport.ts +++ b/src/components/StudentGroup/services/excelExport.ts @@ -1,7 +1,7 @@ -import StudentGroup from '@tdev-models/StudentGroup'; -import ExcelJS from 'exceljs'; import siteConfig from '@generated/docusaurus.config'; import saveAs from '@tdev-components/utils/saveAs'; +import StudentGroup from '@tdev-models/StudentGroup'; +import ExcelJS from 'exceljs'; export async function exportAsExcelSpreadsheet(group: StudentGroup) { const workbook = new ExcelJS.Workbook(); diff --git a/src/components/StudentGroup/services/excelNewPwExport.ts b/src/components/StudentGroup/services/excelNewPwExport.ts index 99eff93b9..2f4c8508c 100644 --- a/src/components/StudentGroup/services/excelNewPwExport.ts +++ b/src/components/StudentGroup/services/excelNewPwExport.ts @@ -1,9 +1,9 @@ -import StudentGroup from '@tdev-models/StudentGroup'; -import ExcelJS from 'exceljs'; import siteConfig from '@generated/docusaurus.config'; +import generatePassword, { ALPHABET_SMALL } from '@tdev-components/utils/generatePassword'; import saveAs from '@tdev-components/utils/saveAs'; +import StudentGroup from '@tdev-models/StudentGroup'; import User from '@tdev-models/User'; -import generatePassword, { ALPHABET_SMALL } from '@tdev-components/utils/generatePassword'; +import ExcelJS from 'exceljs'; export async function exportNewPasswordList( group: StudentGroup, diff --git a/src/components/SyncStatus/index.tsx b/src/components/SyncStatus/index.tsx index f3841985e..ae8df527d 100644 --- a/src/components/SyncStatus/index.tsx +++ b/src/components/SyncStatus/index.tsx @@ -1,9 +1,8 @@ -import * as React from 'react'; -import { observer } from 'mobx-react-lite'; -import { ApiState } from '@tdev-stores/iStore'; -import Icon from '@mdi/react'; -import { mdiContentSaveCheckOutline, mdiContentSaveOffOutline, mdiSync } from '@mdi/js'; import useIsBrowser from '@docusaurus/useIsBrowser'; +import { mdiContentSaveCheckOutline, mdiContentSaveOffOutline, mdiSync } from '@mdi/js'; +import Icon from '@mdi/react'; +import { ApiState } from '@tdev-stores/iStore'; +import { observer } from 'mobx-react-lite'; interface Props { model: { state: ApiState }; diff --git a/src/components/User/BadgeSelector/index.tsx b/src/components/User/BadgeSelector/index.tsx index 92c816ae2..8765fd5c5 100644 --- a/src/components/User/BadgeSelector/index.tsx +++ b/src/components/User/BadgeSelector/index.tsx @@ -1,12 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import User from '@tdev-models/User'; -import Button from '@tdev-components/shared/Button'; import { mdiMinusCircleOutline, mdiPlusCircleOutline } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; +import { useStore } from '@tdev-hooks/useStore'; +import User from '@tdev-models/User'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { user: User; diff --git a/src/components/documents/Assessable/ChoiceAnswer/index.tsx b/src/components/documents/Assessable/ChoiceAnswer/index.tsx index 92e615557..af3c84379 100644 --- a/src/components/documents/Assessable/ChoiceAnswer/index.tsx +++ b/src/components/documents/Assessable/ChoiceAnswer/index.tsx @@ -1,18 +1,18 @@ -import { observer } from 'mobx-react-lite'; -import React from 'react'; -import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; -import Loader from '@tdev-components/Loader'; import useIsBrowser from '@docusaurus/useIsBrowser'; +import { DocContext } from '@tdev-components/documents/DocumentContext'; +import Loader from '@tdev-components/Loader'; +import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; +import { useDocument } from '@tdev-hooks/useContextDocument'; import { useDocumentRootId } from '@tdev-hooks/useContextDocumentRootId'; import { useNestedAssessableDocumentBy } from '@tdev-hooks/useNestedAssessableDocumentBy'; -import { DocContext } from '@tdev-components/documents/DocumentContext'; import { AssessableComponentProps } from '@tdev-models/documents/Assessable/AssessableMeta'; import { type default as ChoiceAnswerModel, ModelMeta } from '@tdev-models/documents/Assessable/ChoiceAnswer'; -import Options from '../Inputs/Options'; +import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import Option, { Props as OptionProps } from '../Inputs/Option'; +import Options from '../Inputs/Options'; import QuestionCard from '../QuestionCard'; -import { action } from 'mobx'; -import { useDocument } from '@tdev-hooks/useContextDocument'; interface SharedProps extends AssessableComponentProps<'choice_answer'> { multiple?: boolean; diff --git a/src/components/documents/Assessable/Feedback/Hint/index.tsx b/src/components/documents/Assessable/Feedback/Hint/index.tsx index 46723b293..6235d135b 100644 --- a/src/components/documents/Assessable/Feedback/Hint/index.tsx +++ b/src/components/documents/Assessable/Feedback/Hint/index.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import { useDocument } from '@tdev-hooks/useContextDocument'; import type { AssessableType, TypeModelMapping } from '@tdev-api/document'; -import { Correctness } from '@tdev-models/documents/Assessable/iAssessable'; import Alert, { type AlertType } from '@tdev-components/shared/Alert'; +import { useDocument } from '@tdev-hooks/useContextDocument'; +import { Correctness } from '@tdev-models/documents/Assessable/iAssessable'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; type When = Correctness | 'assessed' | 'unassessed'; type WhenFunction = ( diff --git a/src/components/documents/Assessable/Feedback/QuestionScore.tsx b/src/components/documents/Assessable/Feedback/QuestionScore.tsx index 03d8a9a20..f533f4a16 100644 --- a/src/components/documents/Assessable/Feedback/QuestionScore.tsx +++ b/src/components/documents/Assessable/Feedback/QuestionScore.tsx @@ -1,15 +1,14 @@ -import Icon from '@mdi/react'; -import { observer } from 'mobx-react-lite'; -import styles from './styles.module.scss'; -import React from 'react'; -import { QuestionScoringHint } from '../Hints'; -import useIsMobileView from '@tdev-hooks/useIsMobileView'; -import { Correctness, CorrectnessColors } from '@tdev-models/documents/Assessable/iAssessable'; import { mdiCheckCircleOutline, mdiCloseCircleOutline, mdiProgressCheck, mdiProgressQuestion } from '@mdi/js'; +import Icon from '@mdi/react'; import type { AssessableType, AssessableTypeModelMapping } from '@tdev-api/document'; import Badge from '@tdev-components/shared/Badge'; +import useIsMobileView from '@tdev-hooks/useIsMobileView'; import { useScrollTo } from '@tdev-hooks/useScrollTo'; +import { Correctness, CorrectnessColors } from '@tdev-models/documents/Assessable/iAssessable'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import { QuestionScoringHint } from '../Hints'; +import styles from './styles.module.scss'; interface FeedbackBadgeProps { doc: AssessableTypeModelMapping[T]; diff --git a/src/components/documents/Assessable/Feedback/QuizScore.tsx b/src/components/documents/Assessable/Feedback/QuizScore.tsx index 5926c54cd..22d06686a 100644 --- a/src/components/documents/Assessable/Feedback/QuizScore.tsx +++ b/src/components/documents/Assessable/Feedback/QuizScore.tsx @@ -1,9 +1,8 @@ -import { observer } from 'mobx-react-lite'; -import styles from './styles.module.scss'; -import React from 'react'; +import Badge from '@tdev-components/shared/Badge'; import useIsMobileView from '@tdev-hooks/useIsMobileView'; import Quiz from '@tdev-models/documents/Assessable/Quiz'; -import Badge from '@tdev-components/shared/Badge'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface QuizScoreProps { doc: Quiz; diff --git a/src/components/documents/Assessable/Hints/index.tsx b/src/components/documents/Assessable/Hints/index.tsx index 66dec7d11..9c5fe4fce 100644 --- a/src/components/documents/Assessable/Hints/index.tsx +++ b/src/components/documents/Assessable/Hints/index.tsx @@ -1,5 +1,6 @@ import { mdiCloseCircleOutline, mdiInformationOutline } from '@mdi/js'; import Icon from '@mdi/react'; +import type { AssessableType, AssessableTypeModelMapping } from '@tdev-api/document'; import Button from '@tdev-components/shared/Button'; import Card from '@tdev-components/shared/Card'; import clsx from 'clsx'; @@ -8,7 +9,6 @@ import React from 'react'; import Popup from 'reactjs-popup'; import { PopupActions } from 'reactjs-popup/dist/types'; import styles from './styles.module.scss'; -import type { AssessableType, AssessableTypeModelMapping } from '@tdev-api/document'; interface QuestionScoringHintProps { doc?: AssessableTypeModelMapping[T]; diff --git a/src/components/documents/Assessable/Inputs/Option/index.tsx b/src/components/documents/Assessable/Inputs/Option/index.tsx index 1445abe77..bc06d72e5 100644 --- a/src/components/documents/Assessable/Inputs/Option/index.tsx +++ b/src/components/documents/Assessable/Inputs/Option/index.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from '../styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useDocument } from '@tdev-hooks/useContextDocument'; -import Button from '@tdev-components/shared/Button'; import { mdiTrashCanOutline } from '@mdi/js'; import type { AssessableType, AssessableTypeModelMapping } from '@tdev-api/document'; +import Button from '@tdev-components/shared/Button'; +import { useDocument } from '@tdev-hooks/useContextDocument'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from '../styles.module.scss'; export interface Props { type?: T; diff --git a/src/components/documents/Assessable/Inputs/Options/index.tsx b/src/components/documents/Assessable/Inputs/Options/index.tsx index d2410191f..b0d9aaae2 100644 --- a/src/components/documents/Assessable/Inputs/Options/index.tsx +++ b/src/components/documents/Assessable/Inputs/Options/index.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from '../styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useDocument } from '@tdev-hooks/useContextDocument'; +import { mdiCollapseAll, mdiExpandAll } from '@mdi/js'; import { AssessableType } from '@tdev-api/document'; import Button from '@tdev-components/shared/Button'; -import { mdiCollapseAll, mdiExpandAll } from '@mdi/js'; +import { useDocument } from '@tdev-hooks/useContextDocument'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from '../styles.module.scss'; const Options = observer(({ children }: { children: React.ReactNode }) => { const doc = useDocument(); diff --git a/src/components/documents/Assessable/QuestionCard/Controls/index.tsx b/src/components/documents/Assessable/QuestionCard/Controls/index.tsx index b734b4b0b..be45e4aa4 100644 --- a/src/components/documents/Assessable/QuestionCard/Controls/index.tsx +++ b/src/components/documents/Assessable/QuestionCard/Controls/index.tsx @@ -1,12 +1,12 @@ -import styles from './styles.module.scss'; -import { Confirm } from '@tdev-components/shared/Button/Confirm'; +import { mdiCheckboxMarkedCircleAutoOutline, mdiRestore } from '@mdi/js'; +import type { AssessableType, AssessableTypeModelMapping } from '@tdev-api/document'; import Button from '@tdev-components/shared/Button'; +import { Confirm } from '@tdev-components/shared/Button/Confirm'; import SyncStatus from '@tdev-components/SyncStatus'; -import { observer } from 'mobx-react-lite'; -import { mdiCheckboxMarkedCircleAutoOutline, mdiRestore } from '@mdi/js'; -import clsx from 'clsx'; import useIsMobileView from '@tdev-hooks/useIsMobileView'; -import type { AssessableType, AssessableTypeModelMapping } from '@tdev-api/document'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface ControlsProps { doc: AssessableTypeModelMapping[T]; diff --git a/src/components/documents/Assessable/QuestionCard/index.tsx b/src/components/documents/Assessable/QuestionCard/index.tsx index 55f86fbcb..3ca5f2b2e 100644 --- a/src/components/documents/Assessable/QuestionCard/index.tsx +++ b/src/components/documents/Assessable/QuestionCard/index.tsx @@ -1,12 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Card from '@tdev-components/shared/Card'; import { AssessableType, TypeModelMapping } from '@tdev-api/document'; import DocumentContext from '@tdev-components/documents/DocumentContext'; +import Card from '@tdev-components/shared/Card'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import { QuestionScore } from '../Feedback/QuestionScore'; import QuestionControls from './Controls'; +import styles from './styles.module.scss'; interface Props { doc: TypeModelMapping[T]; diff --git a/src/components/documents/Assessable/Quiz/QuizControls/index.tsx b/src/components/documents/Assessable/Quiz/QuizControls/index.tsx index 7a983f4d2..75a83ef22 100644 --- a/src/components/documents/Assessable/Quiz/QuizControls/index.tsx +++ b/src/components/documents/Assessable/Quiz/QuizControls/index.tsx @@ -1,16 +1,16 @@ -import styles from './styles.module.scss'; -import { Confirm } from '@tdev-components/shared/Button/Confirm'; -import { observer } from 'mobx-react-lite'; import { mdiCheckboxMarkedCircleAutoOutline, mdiCheckboxMarkedCircleMinusOutline, mdiEraser, mdiRestore } from '@mdi/js'; -import QuizDocument from '@tdev-models/documents/Assessable/Quiz'; -import clsx from 'clsx'; +import { Confirm } from '@tdev-components/shared/Button/Confirm'; import useIsMobileView from '@tdev-hooks/useIsMobileView'; import { Correctness } from '@tdev-models/documents/Assessable/iAssessable'; +import QuizDocument from '@tdev-models/documents/Assessable/Quiz'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface QuizControlsProps { doc: QuizDocument; diff --git a/src/components/documents/Assessable/Quiz/index.tsx b/src/components/documents/Assessable/Quiz/index.tsx index 72d201b6f..7c0d3111c 100644 --- a/src/components/documents/Assessable/Quiz/index.tsx +++ b/src/components/documents/Assessable/Quiz/index.tsx @@ -1,17 +1,17 @@ -import { observer } from 'mobx-react-lite'; -import React from 'react'; +import { AssessableType } from '@tdev-api/document'; import LoginRequiredForDocumentType from '@tdev-components/shared/Alert/LoginRequiredForDocumentType'; -import styles from './styles.module.scss'; import { DocumentRootIdContext } from '@tdev-hooks/useContextDocumentRootId'; +import { useFirstRealMainDocument } from '@tdev-hooks/useFirstRealMainDocument'; +import useLinkedMetaModel from '@tdev-hooks/useLinkedMetaModel'; +import { useScrollTo } from '@tdev-hooks/useScrollTo'; import { AssessableComponentProps } from '@tdev-models/documents/Assessable/AssessableMeta'; import { ModelMeta } from '@tdev-models/documents/Assessable/Quiz'; -import useLinkedMetaModel from '@tdev-hooks/useLinkedMetaModel'; -import { AssessableType } from '@tdev-api/document'; -import QuizControls from './QuizControls'; -import { useFirstRealMainDocument } from '@tdev-hooks/useFirstRealMainDocument'; -import { QuizScore } from '../Feedback/QuizScore'; import clsx from 'clsx'; -import { useScrollTo } from '@tdev-hooks/useScrollTo'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { QuizScore } from '../Feedback/QuizScore'; +import QuizControls from './QuizControls'; +import styles from './styles.module.scss'; export interface Props extends AssessableComponentProps { id: string; diff --git a/src/components/documents/Assessable/TrueFalseAnswer/index.tsx b/src/components/documents/Assessable/TrueFalseAnswer/index.tsx index 7ef674663..8d12e7458 100644 --- a/src/components/documents/Assessable/TrueFalseAnswer/index.tsx +++ b/src/components/documents/Assessable/TrueFalseAnswer/index.tsx @@ -1,18 +1,18 @@ -import { observer } from 'mobx-react-lite'; -import React from 'react'; +import { DocContext } from '@tdev-components/documents/DocumentContext'; +import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; +import { useDocumentRootId } from '@tdev-hooks/useContextDocumentRootId'; +import { useNestedAssessableDocumentBy } from '@tdev-hooks/useNestedAssessableDocumentBy'; import { AssessableComponentProps } from '@tdev-models/documents/Assessable/AssessableMeta'; import { type default as TrueFalseAnswerModel, ModelMeta } from '@tdev-models/documents/Assessable/TrueFalseAnswer'; -import { useDocumentRootId } from '@tdev-hooks/useContextDocumentRootId'; -import { useNestedAssessableDocumentBy } from '@tdev-hooks/useNestedAssessableDocumentBy'; -import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; -import QuestionCard from '../QuestionCard'; -import { DocContext } from '@tdev-components/documents/DocumentContext'; -import Options from '../Inputs/Options'; -import Option from '../Inputs/Option'; import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Option from '../Inputs/Option'; +import Options from '../Inputs/Options'; +import QuestionCard from '../QuestionCard'; interface BaseProps extends AssessableComponentProps<'true_false_answer'> {} diff --git a/src/components/documents/CmsText/CmsActions/index.tsx b/src/components/documents/CmsText/CmsActions/index.tsx index 6592db566..b28a2025f 100644 --- a/src/components/documents/CmsText/CmsActions/index.tsx +++ b/src/components/documents/CmsText/CmsActions/index.tsx @@ -1,11 +1,10 @@ -import { observer } from 'mobx-react-lite'; -import React from 'react'; import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import CmsImporter from '../CmsImporter'; -import styles from './styles.module.scss'; +import DivSpanWrapper from '@tdev-components/shared/DivSpanWrapper'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import CmsImporter from '../CmsImporter'; import { CmsTextEntries } from '../WithCmsText'; -import DivSpanWrapper from '@tdev-components/shared/DivSpanWrapper'; +import styles from './styles.module.scss'; interface Props { entries: CmsTextEntries; diff --git a/src/components/documents/CmsText/CmsImporter/CodeImport/index.tsx b/src/components/documents/CmsText/CmsImporter/CodeImport/index.tsx index cb03244ac..4792ccbcd 100644 --- a/src/components/documents/CmsText/CmsImporter/CodeImport/index.tsx +++ b/src/components/documents/CmsText/CmsImporter/CodeImport/index.tsx @@ -1,11 +1,10 @@ -import React from 'react'; +import SelectUser from '@tdev-components/Admin/SelectUser'; +import Button from '@tdev-components/shared/Button'; +import CodeEditor from '@tdev-components/shared/CodeEditor'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; -import clsx from 'clsx'; -import CodeEditor from '@tdev-components/shared/CodeEditor'; -import UserTable from '@tdev-components/Admin/UserTable'; -import Button from '@tdev-components/shared/Button'; -import SelectUser from '@tdev-components/Admin/SelectUser'; interface Props { onDone: (data: string[][]) => void; diff --git a/src/components/documents/CmsText/CmsImporter/ImportPreview/index.tsx b/src/components/documents/CmsText/CmsImporter/ImportPreview/index.tsx index c4c264a18..95d1ca782 100644 --- a/src/components/documents/CmsText/CmsImporter/ImportPreview/index.tsx +++ b/src/components/documents/CmsText/CmsImporter/ImportPreview/index.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { type AssignedColumn } from '@tdev-components/shared/AssignColumns'; import CodeBlock from '@theme/CodeBlock'; -import Tabs from '@theme/Tabs'; import TabItem from '@theme/TabItem'; -import { type AssignedColumn } from '@tdev-components/shared/AssignColumns'; +import Tabs from '@theme/Tabs'; +import clsx from 'clsx'; +import styles from './styles.module.scss'; const getPreview = (table: string[][], selectedColumn: number, docRootId: string) => { const preview = table diff --git a/src/components/documents/CmsText/CmsImporter/XlsxImport.tsx b/src/components/documents/CmsText/CmsImporter/XlsxImport.tsx index 91093a524..fd0583833 100644 --- a/src/components/documents/CmsText/CmsImporter/XlsxImport.tsx +++ b/src/components/documents/CmsText/CmsImporter/XlsxImport.tsx @@ -1,7 +1,6 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import FromXlsxClipboard from '@tdev-components/shared/FromXlsxClipboard'; import { mdiClose } from '@mdi/js'; +import FromXlsxClipboard from '@tdev-components/shared/FromXlsxClipboard'; +import { observer } from 'mobx-react-lite'; interface Props { onDone: (data: string[][]) => void; diff --git a/src/components/documents/CmsText/CmsImporter/index.tsx b/src/components/documents/CmsText/CmsImporter/index.tsx index 9e5ae9497..31df9a820 100644 --- a/src/components/documents/CmsText/CmsImporter/index.tsx +++ b/src/components/documents/CmsText/CmsImporter/index.tsx @@ -1,22 +1,22 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Popup from 'reactjs-popup'; +import { mdiCodeBlockBraces, mdiDatabaseImport, mdiFileExcel } from '@mdi/js'; +import AssignColumns, { type AssignedColumn } from '@tdev-components/shared/AssignColumns'; +import Badge from '@tdev-components/shared/Badge'; import Button from '@tdev-components/shared/Button'; -import { mdiCodeBlockBraces, mdiDatabaseImport, mdiFileExcel, mdiFileExcelOutline } from '@mdi/js'; import { useStore } from '@tdev-hooks/useStore'; -import { CmsTextEntries } from '../WithCmsText'; -import DocumentStore from '@tdev-stores/DocumentStore'; import CmsText from '@tdev-models/documents/CmsText'; import { Source } from '@tdev-models/iDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; import { ApiState } from '@tdev-stores/iStore'; -import AssignColumns, { type AssignedColumn } from '@tdev-components/shared/AssignColumns'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import Popup from 'reactjs-popup'; +import { PopupActions } from 'reactjs-popup/dist/types'; +import { CmsTextEntries } from '../WithCmsText'; +import CodeImport from './CodeImport'; import ImportPreview from './ImportPreview'; +import styles from './styles.module.scss'; import XlsxImport from './XlsxImport'; -import CodeImport from './CodeImport'; -import { PopupActions } from 'reactjs-popup/dist/types'; -import Badge from '@tdev-components/shared/Badge'; interface Props { className?: string; diff --git a/src/components/documents/CmsText/Code/index.tsx b/src/components/documents/CmsText/Code/index.tsx index ad00f1ba5..7c794d2d7 100644 --- a/src/components/documents/CmsText/Code/index.tsx +++ b/src/components/documents/CmsText/Code/index.tsx @@ -1,14 +1,14 @@ -import { observer } from 'mobx-react-lite'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { CmsTextContext, useFirstCmsTextDocumentIfExists } from '@tdev-components/documents/CmsText/shared'; -import React from 'react'; +import { useStore } from '@tdev-hooks/useStore'; import CodeBlock, { Props as CodeBlockProps } from '@theme/CodeBlock'; -import { Props as DefaultCmsProps } from '..'; -import styles from './styles.module.scss'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import { Props as DefaultCmsProps } from '..'; import CmsActions from '../CmsActions'; import { CmsTextEntries } from '../WithCmsText'; -import { useStore } from '@tdev-hooks/useStore'; -import useIsBrowser from '@docusaurus/useIsBrowser'; +import styles from './styles.module.scss'; interface Props extends DefaultCmsProps { codeBlockProps?: CodeBlockProps; diff --git a/src/components/documents/CmsText/Link/index.tsx b/src/components/documents/CmsText/Link/index.tsx index 33ae0049c..2450f5cb2 100644 --- a/src/components/documents/CmsText/Link/index.tsx +++ b/src/components/documents/CmsText/Link/index.tsx @@ -1,15 +1,15 @@ -import { observer } from 'mobx-react-lite'; +import Link from '@docusaurus/Link'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { CmsTextContext, useFirstCmsTextDocumentIfExists } from '@tdev-components/documents/CmsText/shared'; +import DivSpanWrapper from '@tdev-components/shared/DivSpanWrapper'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import React from 'react'; import { Props as DefaultCmsProps, EmptyContent } from '..'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; import CmsActions from '../CmsActions'; import { CmsTextEntries } from '../WithCmsText'; -import { useStore } from '@tdev-hooks/useStore'; -import Link from '@docusaurus/Link'; -import DivSpanWrapper from '@tdev-components/shared/DivSpanWrapper'; -import useIsBrowser from '@docusaurus/useIsBrowser'; +import styles from './styles.module.scss'; interface Props extends DefaultCmsProps { children?: React.ReactNode; diff --git a/src/components/documents/CmsText/WithCmsText/index.tsx b/src/components/documents/CmsText/WithCmsText/index.tsx index 51f26eb0e..b58a39fb4 100644 --- a/src/components/documents/CmsText/WithCmsText/index.tsx +++ b/src/components/documents/CmsText/WithCmsText/index.tsx @@ -1,9 +1,9 @@ +import useIsBrowser from '@docusaurus/useIsBrowser'; import { CmsTextContext, useFirstCmsTextDocumentIfExists } from '@tdev-components/documents/CmsText/shared'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; import CmsActions from '../CmsActions'; import styles from './styles.module.scss'; -import clsx from 'clsx'; -import useIsBrowser from '@docusaurus/useIsBrowser'; export type Name = string & { __nameBrand: 'Name' }; export type DocumentRootId = string & { __nameBrand: 'DocumentRootId' }; diff --git a/src/components/documents/CmsText/index.tsx b/src/components/documents/CmsText/index.tsx index 209201b80..d1579646f 100644 --- a/src/components/documents/CmsText/index.tsx +++ b/src/components/documents/CmsText/index.tsx @@ -1,12 +1,12 @@ -import { observer } from 'mobx-react-lite'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { CmsTextContext, useFirstCmsTextDocumentIfExists } from '@tdev-components/documents/CmsText/shared'; -import React from 'react'; -import CmsActions from './CmsActions'; -import { CmsTextEntries } from './WithCmsText'; import { useStore } from '@tdev-hooks/useStore'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import Popup from 'reactjs-popup'; -import useIsBrowser from '@docusaurus/useIsBrowser'; +import CmsActions from './CmsActions'; +import { CmsTextEntries } from './WithCmsText'; export interface Props { id?: string; diff --git a/src/components/documents/CmsText/shared.ts b/src/components/documents/CmsText/shared.ts index 3e9060571..e78b5fb87 100644 --- a/src/components/documents/CmsText/shared.ts +++ b/src/components/documents/CmsText/shared.ts @@ -1,6 +1,6 @@ -import React from 'react'; import { useDocumentRoot } from '@tdev-hooks/useDocumentRoot'; import CmsText, { CmsTextMeta } from '@tdev-models/documents/CmsText'; +import React from 'react'; interface CmsTextContextType { entries: { [key: string]: string }; diff --git a/src/components/documents/CodeEditor/Actions/DownloadCode.tsx b/src/components/documents/CodeEditor/Actions/DownloadCode.tsx index 622090120..96fe84168 100644 --- a/src/components/documents/CodeEditor/Actions/DownloadCode.tsx +++ b/src/components/documents/CodeEditor/Actions/DownloadCode.tsx @@ -1,9 +1,8 @@ -import * as React from 'react'; -import Button from '@tdev-components/documents/CodeEditor/Button'; -import { observer } from 'mobx-react-lite'; import { mdiDownload } from '@mdi/js'; -import type iCode from '@tdev-models/documents/iCode'; import type { CodeType } from '@tdev-api/document'; +import Button from '@tdev-components/documents/CodeEditor/Button'; +import type iCode from '@tdev-models/documents/iCode'; +import { observer } from 'mobx-react-lite'; interface Props { code: iCode; diff --git a/src/components/documents/CodeEditor/Actions/Reset.tsx b/src/components/documents/CodeEditor/Actions/Reset.tsx index a90986889..27460a2d4 100644 --- a/src/components/documents/CodeEditor/Actions/Reset.tsx +++ b/src/components/documents/CodeEditor/Actions/Reset.tsx @@ -1,9 +1,8 @@ -import * as React from 'react'; -import Button from '@tdev-components/documents/CodeEditor/Button'; import { mdiRestore } from '@mdi/js'; -import { observer } from 'mobx-react-lite'; import type { CodeType } from '@tdev-api/document'; +import Button from '@tdev-components/documents/CodeEditor/Button'; import type iCode from '@tdev-models/documents/iCode'; +import { observer } from 'mobx-react-lite'; interface Props { code: iCode; diff --git a/src/components/documents/CodeEditor/Actions/RunCode.tsx b/src/components/documents/CodeEditor/Actions/RunCode.tsx index 2d0ecf544..1c85dc963 100644 --- a/src/components/documents/CodeEditor/Actions/RunCode.tsx +++ b/src/components/documents/CodeEditor/Actions/RunCode.tsx @@ -1,11 +1,10 @@ -import * as React from 'react'; +import { mdiLoading } from '@mdi/js'; +import { CodeType } from '@tdev-api/document'; import Button, { Color } from '@tdev-components/documents/CodeEditor/Button'; -import styles from './styles.module.scss'; +import iCode from '@tdev-models/documents/iCode'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import { mdiLoading } from '@mdi/js'; -import iCode from '@tdev-models/documents/iCode'; -import { CodeType } from '@tdev-api/document'; +import styles from './styles.module.scss'; interface Props { code: iCode; diff --git a/src/components/documents/CodeEditor/Actions/ShowRaw.tsx b/src/components/documents/CodeEditor/Actions/ShowRaw.tsx index 37f7c0441..94cbda7e5 100644 --- a/src/components/documents/CodeEditor/Actions/ShowRaw.tsx +++ b/src/components/documents/CodeEditor/Actions/ShowRaw.tsx @@ -1,9 +1,8 @@ -import * as React from 'react'; +import { mdiFileCodeOutline, mdiFileDocumentEditOutline } from '@mdi/js'; +import type { CodeType } from '@tdev-api/document'; import Button, { Color } from '@tdev-components/documents/CodeEditor/Button'; -import { observer } from 'mobx-react-lite'; -import { mdiFileCodeOutline, mdiFileDocumentEditOutline, mdiFileEdit } from '@mdi/js'; import type iCode from '@tdev-models/documents/iCode'; -import type { CodeType } from '@tdev-api/document'; +import { observer } from 'mobx-react-lite'; interface Props { code: iCode; diff --git a/src/components/documents/CodeEditor/Button/index.tsx b/src/components/documents/CodeEditor/Button/index.tsx index 0dc970066..8ec0a1947 100644 --- a/src/components/documents/CodeEditor/Button/index.tsx +++ b/src/components/documents/CodeEditor/Button/index.tsx @@ -1,7 +1,7 @@ +import Icon from '@mdi/react'; +import clsx from 'clsx'; import * as React from 'react'; import styles from './styles.module.scss'; -import clsx from 'clsx'; -import Icon from '@mdi/react'; export enum Color { Primary = 'button--primary', diff --git a/src/components/documents/CodeEditor/CodeHistory/index.tsx b/src/components/documents/CodeEditor/CodeHistory/index.tsx index 6b4756957..26fb04743 100644 --- a/src/components/documents/CodeEditor/CodeHistory/index.tsx +++ b/src/components/documents/CodeEditor/CodeHistory/index.tsx @@ -1,17 +1,17 @@ -import * as React from 'react'; +import Translate, { translate } from '@docusaurus/Translate'; +import { mdiSync } from '@mdi/js'; +import { CodeType } from '@tdev-api/document'; +import iCode from '@tdev-models/documents/iCode'; +import Details from '@theme/Details'; import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { observer } from 'mobx-react-lite'; import { Prism } from 'prism-react-renderer'; import Slider from 'rc-slider'; import 'rc-slider/assets/index.css'; -import Translate, { translate } from '@docusaurus/Translate'; +import * as React from 'react'; import DiffViewer from 'react-diff-viewer-continued'; -import Details from '@theme/Details'; -import { observer } from 'mobx-react-lite'; import Button from '../Button'; -import { mdiSync } from '@mdi/js'; -import iCode from '@tdev-models/documents/iCode'; -import { CodeType } from '@tdev-api/document'; +import styles from './styles.module.scss'; const highlightSyntax = (str: string) => { if (!str) { diff --git a/src/components/documents/CodeEditor/Editor/EditorAce.tsx b/src/components/documents/CodeEditor/Editor/EditorAce.tsx index 2da861578..43bdf4592 100644 --- a/src/components/documents/CodeEditor/Editor/EditorAce.tsx +++ b/src/components/documents/CodeEditor/Editor/EditorAce.tsx @@ -1,14 +1,16 @@ -import * as React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +// ace editor must be imported before ace-builds/* import AceEditor from 'react-ace'; +// rest +import type { CodeType } from '@tdev-api/document'; +import useCodeTheme from '@tdev-hooks/useCodeTheme'; +import type iCode from '@tdev-models/documents/iCode'; +import 'ace-builds/esm-resolver'; import 'ace-builds/src-noconflict/ext-language_tools'; import 'ace-builds/webpack-resolver'; -import 'ace-builds/esm-resolver'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import useCodeTheme from '@tdev-hooks/useCodeTheme'; -import type { CodeType } from '@tdev-api/document'; -import type iCode from '@tdev-models/documents/iCode'; +import * as React from 'react'; +import styles from './styles.module.scss'; const ALIAS_LANG_MAP_ACE = { mpy: 'python', diff --git a/src/components/documents/CodeEditor/Editor/Footer/Container.tsx b/src/components/documents/CodeEditor/Editor/Footer/Container.tsx index e48f7ceba..a972b3a59 100644 --- a/src/components/documents/CodeEditor/Editor/Footer/Container.tsx +++ b/src/components/documents/CodeEditor/Editor/Footer/Container.tsx @@ -1,6 +1,6 @@ +import { observer } from 'mobx-react-lite'; import * as React from 'react'; import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; interface Props { children?: React.ReactNode; diff --git a/src/components/documents/CodeEditor/Editor/Footer/Logs/index.tsx b/src/components/documents/CodeEditor/Editor/Footer/Logs/index.tsx index c4d0a9e51..b2e8fe9f2 100644 --- a/src/components/documents/CodeEditor/Editor/Footer/Logs/index.tsx +++ b/src/components/documents/CodeEditor/Editor/Footer/Logs/index.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Button from '@tdev-components/shared/Button'; import { mdiCardRemoveOutline } from '@mdi/js'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import Button from '@tdev-components/shared/Button'; import CopyButton from '@tdev-components/shared/Button/CopyButton'; -import { useStore } from '@tdev-hooks/useStore'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; import { useFullscreenTargetId } from '@tdev-hooks/useFullscreenTargetId'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; export type LogMessage = { type: 'log' | 'error'; message: string }; diff --git a/src/components/documents/CodeEditor/Editor/Header/Container.tsx b/src/components/documents/CodeEditor/Editor/Header/Container.tsx index 5875ad5b0..7129d1242 100644 --- a/src/components/documents/CodeEditor/Editor/Header/Container.tsx +++ b/src/components/documents/CodeEditor/Editor/Header/Container.tsx @@ -1,9 +1,9 @@ -import * as React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import type { CodeType } from '@tdev-api/document'; import type iCode from '@tdev-models/documents/iCode'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import * as React from 'react'; +import styles from './styles.module.scss'; interface Props { code: iCode; diff --git a/src/components/documents/CodeEditor/Editor/Header/Content.tsx b/src/components/documents/CodeEditor/Editor/Header/Content.tsx index 6c49ad6f2..ba9467c6a 100644 --- a/src/components/documents/CodeEditor/Editor/Header/Content.tsx +++ b/src/components/documents/CodeEditor/Editor/Header/Content.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import Reset from '@tdev-components/documents/CodeEditor/Actions/Reset'; -import { observer } from 'mobx-react-lite'; -import SyncStatus from '@tdev-components/SyncStatus'; -import Icon from '@mdi/react'; import { mdiFlashTriangle } from '@mdi/js'; +import Icon from '@mdi/react'; import type { CodeType } from '@tdev-api/document'; -import type iCode from '@tdev-models/documents/iCode'; -import DownloadCode from '../../Actions/DownloadCode'; -import ShowRaw from '../../Actions/ShowRaw'; +import Reset from '@tdev-components/documents/CodeEditor/Actions/Reset'; import RequestFullscreen from '@tdev-components/shared/RequestFullscreen'; +import RequestPresentationMode from '@tdev-components/shared/RequestPresentationMode'; +import SyncStatus from '@tdev-components/SyncStatus'; import { useFullscreenTargetId } from '@tdev-hooks/useFullscreenTargetId'; -import { reaction } from 'mobx'; import { useStore } from '@tdev-hooks/useStore'; -import RequestPresentationMode from '@tdev-components/shared/RequestPresentationMode'; +import type iCode from '@tdev-models/documents/iCode'; +import clsx from 'clsx'; +import { reaction } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import * as React from 'react'; +import DownloadCode from '../../Actions/DownloadCode'; +import ShowRaw from '../../Actions/ShowRaw'; +import styles from './styles.module.scss'; interface Props { code: iCode; diff --git a/src/components/documents/CodeEditor/Editor/Header/index.tsx b/src/components/documents/CodeEditor/Editor/Header/index.tsx index e662974eb..f1ad0c450 100644 --- a/src/components/documents/CodeEditor/Editor/Header/index.tsx +++ b/src/components/documents/CodeEditor/Editor/Header/index.tsx @@ -1,7 +1,6 @@ -import * as React from 'react'; -import { observer } from 'mobx-react-lite'; import type { CodeType } from '@tdev-api/document'; import type iCode from '@tdev-models/documents/iCode'; +import { observer } from 'mobx-react-lite'; import Container from './Container'; import Content from './Content'; diff --git a/src/components/documents/CodeEditor/Editor/HiddenCode/index.tsx b/src/components/documents/CodeEditor/Editor/HiddenCode/index.tsx index 068386e84..70fb916d9 100644 --- a/src/components/documents/CodeEditor/Editor/HiddenCode/index.tsx +++ b/src/components/documents/CodeEditor/Editor/HiddenCode/index.tsx @@ -1,13 +1,13 @@ -import * as React from 'react'; -import styles from './styles.module.scss'; -import CodeBlock from '@theme/CodeBlock'; -import clsx from 'clsx'; -import { observer } from 'mobx-react-lite'; -import Icon from '@mdi/react'; import { mdiArrowExpandDown, mdiArrowExpandUp } from '@mdi/js'; -import _ from 'es-toolkit/compat'; +import Icon from '@mdi/react'; import type { CodeType } from '@tdev-api/document'; import type iCode from '@tdev-models/documents/iCode'; +import CodeBlock from '@theme/CodeBlock'; +import clsx from 'clsx'; +import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; +import * as React from 'react'; +import styles from './styles.module.scss'; interface Props { type: 'pre' | 'post'; diff --git a/src/components/documents/CodeEditor/Editor/index.tsx b/src/components/documents/CodeEditor/Editor/index.tsx index 7d63ea534..4aeb90730 100644 --- a/src/components/documents/CodeEditor/Editor/index.tsx +++ b/src/components/documents/CodeEditor/Editor/index.tsx @@ -1,16 +1,15 @@ -import * as React from 'react'; +import { useStore } from '@tdev-hooks/useStore'; import clsx from 'clsx'; -import styles from './styles.module.scss'; -import HiddenCode from './HiddenCode'; -import EditorAce, { type Overrides } from './EditorAce'; import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; +import EditorAce, { type Overrides } from './EditorAce'; +import HiddenCode from './HiddenCode'; +import styles from './styles.module.scss'; import type { CodeType, TypeModelMapping } from '@tdev-api/document'; -import type iCode from '@tdev-models/documents/iCode'; -import Header from './Header'; import PermissionsPanel from '@tdev-components/PermissionsPanel'; import Alert from '@tdev-components/shared/Alert'; +import type iCode from '@tdev-models/documents/iCode'; +import Header from './Header'; interface Props { code: iCode; diff --git a/src/components/documents/CodeEditor/HtmlEditor/HtmlIDE/index.tsx b/src/components/documents/CodeEditor/HtmlEditor/HtmlIDE/index.tsx index 405b2fcd9..2b01805b0 100644 --- a/src/components/documents/CodeEditor/HtmlEditor/HtmlIDE/index.tsx +++ b/src/components/documents/CodeEditor/HtmlEditor/HtmlIDE/index.tsx @@ -1,12 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import Dir, { DirType } from '@tdev-components/FileSystem/Dir'; -import HtmlEditor from '..'; +import { resolvePath } from '@tdev-models/helpers/resolvePath'; import { MultiCode } from '@tdev-plugins/remark-code-as-attribute/plugin'; import { extractMetaProps } from '@tdev/theme/CodeBlock'; -import { resolvePath } from '@tdev-models/helpers/resolvePath'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import HtmlEditor from '..'; +import styles from './styles.module.scss'; interface MetaProps { id?: string; diff --git a/src/components/documents/CodeEditor/HtmlEditor/HtmlSandbox.tsx b/src/components/documents/CodeEditor/HtmlEditor/HtmlSandbox.tsx index 24c162c34..e35bfa40e 100644 --- a/src/components/documents/CodeEditor/HtmlEditor/HtmlSandbox.tsx +++ b/src/components/documents/CodeEditor/HtmlEditor/HtmlSandbox.tsx @@ -1,8 +1,8 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import Alert from '@tdev-components/shared/Alert'; -import _ from 'es-toolkit/compat'; import clsx from 'clsx'; +import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; interface IframeErrorMessage { diff --git a/src/components/documents/CodeEditor/HtmlEditor/index.tsx b/src/components/documents/CodeEditor/HtmlEditor/index.tsx index 2579b6c04..12dcaff8a 100644 --- a/src/components/documents/CodeEditor/HtmlEditor/index.tsx +++ b/src/components/documents/CodeEditor/HtmlEditor/index.tsx @@ -1,19 +1,19 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { CodeMeta } from '@tdev-models/documents/Code'; -import { MetaProps } from '@tdev/theme/CodeBlock'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; -import CodeEditorComponent from '..'; import ErrorBoundary from '@docusaurus/ErrorBoundary'; -import CodeBlock from '@theme/CodeBlock'; -import Button from '@tdev-components/shared/Button'; import useIsBrowser from '@docusaurus/useIsBrowser'; import BrowserWindow from '@tdev-components/BrowserWindow'; -import HtmlSandbox from './HtmlSandbox'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import Button from '@tdev-components/shared/Button'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; import { useStore } from '@tdev-hooks/useStore'; +import { CodeMeta } from '@tdev-models/documents/Code'; +import { MetaProps } from '@tdev/theme/CodeBlock'; +import CodeBlock from '@theme/CodeBlock'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import CodeEditorComponent from '..'; +import HtmlSandbox from './HtmlSandbox'; +import styles from './styles.module.scss'; export interface Props extends Omit, 'live_jsx' | 'live_py' | 'title'> { title?: string; diff --git a/src/components/documents/CodeEditor/SvgEditor/index.tsx b/src/components/documents/CodeEditor/SvgEditor/index.tsx index 1a9f6f702..d003b9826 100644 --- a/src/components/documents/CodeEditor/SvgEditor/index.tsx +++ b/src/components/documents/CodeEditor/SvgEditor/index.tsx @@ -1,18 +1,18 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { CodeMeta } from '@tdev-models/documents/Code'; -import { MetaProps } from '@tdev/theme/CodeBlock'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; -import CodeEditorComponent from '..'; import ErrorBoundary from '@docusaurus/ErrorBoundary'; -import CodeBlock from '@theme/CodeBlock'; -import Card from '@tdev-components/shared/Card'; -import Button from '@tdev-components/shared/Button'; import useIsBrowser from '@docusaurus/useIsBrowser'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; import { useStore } from '@tdev-hooks/useStore'; +import { CodeMeta } from '@tdev-models/documents/Code'; +import { MetaProps } from '@tdev/theme/CodeBlock'; +import CodeBlock from '@theme/CodeBlock'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import CodeEditorComponent from '..'; +import styles from './styles.module.scss'; export interface Props extends Omit, 'live_jsx' | 'live_py' | 'title'> { title?: string; diff --git a/src/components/documents/CodeEditor/index.tsx b/src/components/documents/CodeEditor/index.tsx index 5e66a2aa2..91e88c139 100644 --- a/src/components/documents/CodeEditor/index.tsx +++ b/src/components/documents/CodeEditor/index.tsx @@ -1,20 +1,20 @@ -import * as React from 'react'; -import styles from './styles.module.scss'; -import clsx from 'clsx'; -import CodeBlock from '@theme/CodeBlock'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; -import Editor from './Editor'; -import CodeHistory from './CodeHistory'; -import { MetaProps } from '@tdev/theme/CodeBlock'; -import { observer } from 'mobx-react-lite'; import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; -import useCodeTheme from '@tdev-hooks/useCodeTheme'; -import iCode from '@tdev-models/documents/iCode'; import { CodeType } from '@tdev-api/document'; +import type { Overrides } from '@tdev-components/documents/CodeEditor/Editor/EditorAce'; +import useCodeTheme from '@tdev-hooks/useCodeTheme'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { FullscreenContext } from '@tdev-hooks/useFullscreenTargetId'; import { useStore } from '@tdev-hooks/useStore'; +import iCode from '@tdev-models/documents/iCode'; import { LiveCode } from '@tdev-stores/ComponentStore'; -import { FullscreenContext } from '@tdev-hooks/useFullscreenTargetId'; -import type { Overrides } from '@tdev-components/documents/CodeEditor/Editor/EditorAce'; +import { MetaProps } from '@tdev/theme/CodeBlock'; +import CodeBlock from '@theme/CodeBlock'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import * as React from 'react'; +import CodeHistory from './CodeHistory'; +import Editor from './Editor'; +import styles from './styles.module.scss'; export interface Props extends Omit { title: string; diff --git a/src/components/documents/DocumentContext.tsx b/src/components/documents/DocumentContext.tsx index 5eb1f474c..7d6c1ec31 100644 --- a/src/components/documents/DocumentContext.tsx +++ b/src/components/documents/DocumentContext.tsx @@ -1,6 +1,6 @@ -import React from 'react'; -import { DocumentType, DocumentModelType, TypeModelMapping } from '@tdev-api/document'; +import { DocumentModelType, DocumentType, TypeModelMapping } from '@tdev-api/document'; import { observer } from 'mobx-react-lite'; +import React from 'react'; export const DocContext = React.createContext(undefined); interface Props { diff --git a/src/components/documents/DynamicDocumentRoots/AddDynamicDocumentRoot/index.tsx b/src/components/documents/DynamicDocumentRoots/AddDynamicDocumentRoot/index.tsx index 726468d2a..7e42f85ab 100644 --- a/src/components/documents/DynamicDocumentRoots/AddDynamicDocumentRoot/index.tsx +++ b/src/components/documents/DynamicDocumentRoots/AddDynamicDocumentRoot/index.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import DynamicDocumentRoots from '@tdev-models/documents/DynamicDocumentRoots'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; import { mdiPlusCircleOutline } from '@mdi/js'; import { ContainerType } from '@tdev-api/document'; +import Button from '@tdev-components/shared/Button'; +import { useStore } from '@tdev-hooks/useStore'; +import DynamicDocumentRoots from '@tdev-models/documents/DynamicDocumentRoots'; import { RWAccess } from '@tdev-models/helpers/accessPolicy'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; interface Props { dynamicDocumentRoot: DynamicDocumentRoots; diff --git a/src/components/documents/DynamicDocumentRoots/DocumentContainer/index.tsx b/src/components/documents/DynamicDocumentRoots/DocumentContainer/index.tsx index 6460fda1f..458695a11 100644 --- a/src/components/documents/DynamicDocumentRoots/DocumentContainer/index.tsx +++ b/src/components/documents/DynamicDocumentRoots/DocumentContainer/index.tsx @@ -1,9 +1,3 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import Button from '@tdev-components/shared/Button'; import { mdiCircleEditOutline, mdiCloseCircle, @@ -12,9 +6,15 @@ import { mdiTrashCan } from '@mdi/js'; import { ContainerType, ContainerTypeModelMapping } from '@tdev-api/document'; -import TextInput from '@tdev-components/shared/TextInput'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import Button from '@tdev-components/shared/Button'; import { Delete } from '@tdev-components/shared/Button/Delete'; +import TextInput from '@tdev-components/shared/TextInput'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import EditDataProps from '../EditDataProps'; +import styles from './styles.module.scss'; interface Props { docContainer: ContainerTypeModelMapping[ContainerType]; diff --git a/src/components/documents/DynamicDocumentRoots/EditDataProps/index.tsx b/src/components/documents/DynamicDocumentRoots/EditDataProps/index.tsx index 56b8f6efb..0b857fc0e 100644 --- a/src/components/documents/DynamicDocumentRoots/EditDataProps/index.tsx +++ b/src/components/documents/DynamicDocumentRoots/EditDataProps/index.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import type { ContainerType, TypeDataMapping } from '@tdev-api/document'; -import { Source } from '@tdev-models/iDocument'; import JsEditorPopup from '@tdev-components/shared/JsObject/JsEditorPopup'; import type { JsTypes } from '@tdev-components/shared/JsObject/toJsSchema'; +import { Source } from '@tdev-models/iDocument'; import iDocumentContainer from '@tdev-models/iDocumentContainer'; +import { observer } from 'mobx-react-lite'; interface Props { docContainer: iDocumentContainer; diff --git a/src/components/documents/DynamicDocumentRoots/index.tsx b/src/components/documents/DynamicDocumentRoots/index.tsx index 6c484a1ba..ff6a91096 100644 --- a/src/components/documents/DynamicDocumentRoots/index.tsx +++ b/src/components/documents/DynamicDocumentRoots/index.tsx @@ -1,19 +1,19 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import { Access, ContainerType } from '@tdev-api/document'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import { NotCreated } from '@tdev-components/Rooms'; import { useFirstRealMainDocument } from '@tdev-hooks/useFirstRealMainDocument'; +import { useStore } from '@tdev-hooks/useStore'; import { + default as DynamicDocumentRootsModel, MetaInit, - ModelMeta, - default as DynamicDocumentRootsModel + ModelMeta } from '@tdev-models/documents/DynamicDocumentRoots'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; -import { Access, ContainerType } from '@tdev-api/document'; -import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import AddDynamicDocumentRoot from './AddDynamicDocumentRoot'; -import { NotCreated } from '@tdev-components/Rooms'; import DocumentContainer from './DocumentContainer'; +import styles from './styles.module.scss'; interface Props extends MetaInit { id: string; diff --git a/src/components/documents/FileSystem/Actions/MoveItem/DirTree/index.tsx b/src/components/documents/FileSystem/Actions/MoveItem/DirTree/index.tsx index e3bcd3c69..473d0c709 100644 --- a/src/components/documents/FileSystem/Actions/MoveItem/DirTree/index.tsx +++ b/src/components/documents/FileSystem/Actions/MoveItem/DirTree/index.tsx @@ -8,16 +8,16 @@ import { mdiFolderOpen, mdiFolderOutline } from '@mdi/js'; -import styles from './styles.module.scss'; +import Icon, { Stack } from '@mdi/react'; +import { DocumentType } from '@tdev-api/document'; import Button from '@tdev-components/shared/Button'; +import { getNumericCircleIcon } from '@tdev-components/shared/numberIcons'; import Directory from '@tdev-models/documents/FileSystem/Directory'; -import { observer } from 'mobx-react-lite'; +import type iFileSystem from '@tdev-models/documents/FileSystem/iFileSystem'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import React from 'react'; -import { DocumentType } from '@tdev-api/document'; -import Icon, { Stack } from '@mdi/react'; -import { getNumericCircleIcon } from '@tdev-components/shared/numberIcons'; -import type iFileSystem from '@tdev-models/documents/FileSystem/iFileSystem'; +import styles from './styles.module.scss'; interface DirProps { item: iFileSystem; diff --git a/src/components/documents/FileSystem/Actions/MoveItem/index.tsx b/src/components/documents/FileSystem/Actions/MoveItem/index.tsx index 8e3b60e14..d9abfbd82 100644 --- a/src/components/documents/FileSystem/Actions/MoveItem/index.tsx +++ b/src/components/documents/FileSystem/Actions/MoveItem/index.tsx @@ -1,13 +1,11 @@ -import styles from './styles.module.scss'; +import { useStore } from '@tdev-hooks/useStore'; import Directory from '@tdev-models/documents/FileSystem/Directory'; import File from '@tdev-models/documents/FileSystem/File'; -import { observer } from 'mobx-react-lite'; import clsx from 'clsx'; -import React from 'react'; -import { DocumentType } from '@tdev-api/document'; -import DirTree from './DirTree'; -import { useStore } from '@tdev-hooks/useStore'; import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import DirTree from './DirTree'; +import styles from './styles.module.scss'; interface Props { item: File | Directory; diff --git a/src/components/documents/FileSystem/Actions/index.tsx b/src/components/documents/FileSystem/Actions/index.tsx index bb0e041c1..4a6d95987 100644 --- a/src/components/documents/FileSystem/Actions/index.tsx +++ b/src/components/documents/FileSystem/Actions/index.tsx @@ -7,16 +7,15 @@ import { mdiTrashCan, mdiTrashCanOutline } from '@mdi/js'; -import styles from './styles.module.scss'; import Button from '@tdev-components/shared/Button'; import Directory from '@tdev-models/documents/FileSystem/Directory'; import File from '@tdev-models/documents/FileSystem/File'; -import { observer } from 'mobx-react-lite'; -import Popup from 'reactjs-popup'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import React from 'react'; -import { DocumentType } from '@tdev-api/document'; +import Popup from 'reactjs-popup'; import MoveItem from './MoveItem'; +import styles from './styles.module.scss'; interface Props { item: File | Directory; diff --git a/src/components/documents/FileSystem/Directory/Directory.tsx b/src/components/documents/FileSystem/Directory/Directory.tsx index 22eeb6dd0..a9fa9adb7 100644 --- a/src/components/documents/FileSystem/Directory/Directory.tsx +++ b/src/components/documents/FileSystem/Directory/Directory.tsx @@ -1,17 +1,16 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import shared from '@tdev-components/documents/FileSystem/shared.module.scss'; -import { observer } from 'mobx-react-lite'; -import { default as DirctoryModel } from '@tdev-models/documents/FileSystem/Directory'; -import Icon from '@mdi/react'; import { mdiFolder, mdiFolderOpen } from '@mdi/js'; +import Icon from '@mdi/react'; import SyncStatus from '@tdev-components/SyncStatus'; -import NewItem from '@tdev-components/documents/FileSystem/Directory/NewItem'; import File from '@tdev-components/documents/FileSystem//File'; import Actions from '@tdev-components/documents/FileSystem/Actions'; -import Name from '@tdev-components/documents/FileSystem/Name'; +import NewItem from '@tdev-components/documents/FileSystem/Directory/NewItem'; import FsDetails from '@tdev-components/documents/FileSystem/FsDetails'; +import Name from '@tdev-components/documents/FileSystem/Name'; +import shared from '@tdev-components/documents/FileSystem/shared.module.scss'; +import { default as DirctoryModel } from '@tdev-models/documents/FileSystem/Directory'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { dir: DirctoryModel; diff --git a/src/components/documents/FileSystem/Directory/NewItem/index.tsx b/src/components/documents/FileSystem/Directory/NewItem/index.tsx index b1cfa6dfc..ef39ab7cf 100644 --- a/src/components/documents/FileSystem/Directory/NewItem/index.tsx +++ b/src/components/documents/FileSystem/Directory/NewItem/index.tsx @@ -1,8 +1,3 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Popup from 'reactjs-popup'; import { mdiFileCode, mdiFileDocument, @@ -11,16 +6,20 @@ import { mdiLanguagePython, mdiPlusCircleOutline } from '@mdi/js'; +import Icon from '@mdi/react'; import Button from '@tdev-components/shared/Button'; +import TextInput from '@tdev-components/shared/TextInput'; import { useStore } from '@tdev-hooks/useStore'; -import { DocumentType } from '@tdev-api/document'; import Directory from '@tdev-models/documents/FileSystem/Directory'; -import { Delta } from 'quill/core'; import DocumentStore from '@tdev-stores/DocumentStore'; -import Icon from '@mdi/react'; -import TextInput from '@tdev-components/shared/TextInput'; import { ExcalidrawColor, mdiExcalidraw } from '@tdev/excalidoc/Component'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import { Delta } from 'quill/core'; +import React from 'react'; +import Popup from 'reactjs-popup'; import { PopupActions } from 'reactjs-popup/dist/types'; +import styles from './styles.module.scss'; interface Props { directory: Directory; diff --git a/src/components/documents/FileSystem/Directory/index.tsx b/src/components/documents/FileSystem/Directory/index.tsx index f595834d6..79a3a3853 100644 --- a/src/components/documents/FileSystem/Directory/index.tsx +++ b/src/components/documents/FileSystem/Directory/index.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import { ModelMeta } from '@tdev-models/documents/FileSystem/Directory'; -import { MetaInit } from '@tdev-models/documents/FileSystem/iFileSystem'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import type { default as DirectoryComponentType } from '@tdev-components/documents/FileSystem/Directory/Directory'; import Loader from '@tdev-components/Loader'; import { useClientLib } from '@tdev-hooks/useClientLib'; -import type { default as DirectoryComponentType } from '@tdev-components/documents/FileSystem/Directory/Directory'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { ModelMeta } from '@tdev-models/documents/FileSystem/Directory'; +import { MetaInit } from '@tdev-models/documents/FileSystem/iFileSystem'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; interface Props extends MetaInit { diff --git a/src/components/documents/FileSystem/File/CodeEditorSelector.tsx b/src/components/documents/FileSystem/File/CodeEditorSelector.tsx index f7aea54fd..8dabd5edd 100644 --- a/src/components/documents/FileSystem/File/CodeEditorSelector.tsx +++ b/src/components/documents/FileSystem/File/CodeEditorSelector.tsx @@ -1,9 +1,8 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import CodeEditorComponent from '@tdev-components/documents/CodeEditor'; import HtmlEditor from '@tdev-components/documents/CodeEditor/HtmlEditor'; import SvgEditor from '@tdev-components/documents/CodeEditor/SvgEditor'; import iCode from '@tdev-models/documents/iCode'; +import { observer } from 'mobx-react-lite'; interface Props { code: iCode; diff --git a/src/components/documents/FileSystem/File/index.tsx b/src/components/documents/FileSystem/File/index.tsx index 108d836da..63ac5867c 100644 --- a/src/components/documents/FileSystem/File/index.tsx +++ b/src/components/documents/FileSystem/File/index.tsx @@ -1,10 +1,3 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import shared from '../shared.module.scss'; -import { observer } from 'mobx-react-lite'; -import { default as FileModel } from '@tdev-models/documents/FileSystem/File'; -import Icon from '@mdi/react'; import { mdiFile, mdiFileCode, @@ -13,20 +6,26 @@ import { mdiFileDocumentOutline, mdiFileOutline } from '@mdi/js'; -import SyncStatus from '../../../SyncStatus'; +import Icon from '@mdi/react'; import { DocumentType } from '@tdev-api/document'; -import { QuillV2Component } from '../../QuillV2'; -import Actions from '../Actions'; -import Name from '../Name'; -import FsDetails from '../FsDetails'; +import { default as FileModel } from '@tdev-models/documents/FileSystem/File'; +import iCode from '@tdev-models/documents/iCode'; import { ExcalidocComponent, ExcalidrawColor, mdiExcalidraw, mdiExcalidrawOutline } from '@tdev/excalidoc/Component'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import SyncStatus from '../../../SyncStatus'; +import { QuillV2Component } from '../../QuillV2'; +import Actions from '../Actions'; +import FsDetails from '../FsDetails'; +import Name from '../Name'; +import shared from '../shared.module.scss'; import CodeEditorSelector from './CodeEditorSelector'; -import iCode from '@tdev-models/documents/iCode'; +import styles from './styles.module.scss'; interface Props { file: FileModel; diff --git a/src/components/documents/FileSystem/FsDetails/index.tsx b/src/components/documents/FileSystem/FsDetails/index.tsx index 0199f47b7..98f41456b 100644 --- a/src/components/documents/FileSystem/FsDetails/index.tsx +++ b/src/components/documents/FileSystem/FsDetails/index.tsx @@ -1,11 +1,11 @@ -import React, { useRef, type ComponentProps, type ReactElement } from 'react'; -import clsx from 'clsx'; import useIsBrowser from '@docusaurus/useIsBrowser'; +import clsx from 'clsx'; +import React, { useRef, type ComponentProps, type ReactElement } from 'react'; import { Collapsible } from '@docusaurus/theme-common'; -import styles from './styles.module.css'; import iFileSystem from '@tdev-models/documents/FileSystem/iFileSystem'; +import styles from './styles.module.css'; function isInSummary(node: HTMLElement | null): boolean { if (!node) { diff --git a/src/components/documents/FileSystem/Name/index.tsx b/src/components/documents/FileSystem/Name/index.tsx index 0f138b205..30498a6b6 100644 --- a/src/components/documents/FileSystem/Name/index.tsx +++ b/src/components/documents/FileSystem/Name/index.tsx @@ -1,9 +1,8 @@ -import React from 'react'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; import type Directory from '@tdev-models/documents/FileSystem/Directory'; import type File from '@tdev-models/documents/FileSystem/File'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; interface Props { model: Directory | File; diff --git a/src/components/documents/MdxComment/AddComment/index.tsx b/src/components/documents/MdxComment/AddComment/index.tsx index 0ed41244f..62cbb465d 100644 --- a/src/components/documents/MdxComment/AddComment/index.tsx +++ b/src/components/documents/MdxComment/AddComment/index.tsx @@ -1,12 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from '../styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Icon, { Stack } from '@mdi/react'; import { mdiCommentPlus, mdiCommentPlusOutline } from '@mdi/js'; -import { DocumentType, MdxCommentData } from '@tdev-api/document'; +import Icon, { Stack } from '@mdi/react'; +import { MdxCommentData } from '@tdev-api/document'; import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import { Delta } from 'quill/core'; +import styles from '../styles.module.scss'; interface Props extends MdxCommentData { pageId: string; diff --git a/src/components/documents/MdxComment/Comment/Options.tsx b/src/components/documents/MdxComment/Comment/Options.tsx index d5a869696..097096b7f 100644 --- a/src/components/documents/MdxComment/Comment/Options.tsx +++ b/src/components/documents/MdxComment/Comment/Options.tsx @@ -1,12 +1,12 @@ -import React from 'react'; +import { mdiClose, mdiTrashCan, mdiTrashCanOutline } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import { Color } from '@tdev-components/shared/Colors'; +import MdxComment from '@tdev-models/documents/MdxComment'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import sharedStyles from '../styles.module.scss'; import styles from './options.module.scss'; -import { observer } from 'mobx-react-lite'; -import MdxComment from '@tdev-models/documents/MdxComment'; -import { mdiClose, mdiTrashCan, mdiTrashCanOutline } from '@mdi/js'; -import { Color } from '@tdev-components/shared/Colors'; -import Button from '@tdev-components/shared/Button'; interface Props { comment: MdxComment; diff --git a/src/components/documents/MdxComment/Comment/index.tsx b/src/components/documents/MdxComment/Comment/index.tsx index 14ff37b31..97b5852f6 100644 --- a/src/components/documents/MdxComment/Comment/index.tsx +++ b/src/components/documents/MdxComment/Comment/index.tsx @@ -1,20 +1,18 @@ -import React from 'react'; -import clsx from 'clsx'; -import sharedStyles from '../styles.module.scss'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { DocumentType } from '@tdev-api/document'; -import MdxComment from '@tdev-models/documents/MdxComment'; -import { QuillV2Component } from '@tdev-components/documents/QuillV2'; -import Icon, { Stack } from '@mdi/react'; import { mdiCommentAccount, mdiCommentAccountOutline, mdiDotsHorizontalCircle, mdiDotsHorizontalCircleOutline } from '@mdi/js'; -import Options from './Options'; +import Icon, { Stack } from '@mdi/react'; +import { QuillV2Component } from '@tdev-components/documents/QuillV2'; import { useStore } from '@tdev-hooks/useStore'; +import MdxComment from '@tdev-models/documents/MdxComment'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import sharedStyles from '../styles.module.scss'; +import Options from './Options'; +import styles from './styles.module.scss'; interface Props { comment: MdxComment; diff --git a/src/components/documents/MdxComment/index.tsx b/src/components/documents/MdxComment/index.tsx index 536ffef4f..1f297815c 100644 --- a/src/components/documents/MdxComment/index.tsx +++ b/src/components/documents/MdxComment/index.tsx @@ -1,9 +1,8 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { MdxCommentData } from '@tdev-api/document'; +import { useMdxComment } from '@tdev-hooks/useMdxComment'; +import { observer } from 'mobx-react-lite'; import AddComment from './AddComment'; import { default as CommentComponent } from './Comment'; -import { useMdxComment } from '@tdev-hooks/useMdxComment'; interface Props extends MdxCommentData { pageId: string; diff --git a/src/components/documents/ProgressState/Item.tsx b/src/components/documents/ProgressState/Item.tsx index 0496389f4..797952046 100644 --- a/src/components/documents/ProgressState/Item.tsx +++ b/src/components/documents/ProgressState/Item.tsx @@ -1,14 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { MetaInit } from '@tdev-models/documents/ProgressState'; -import Icon from '@mdi/react'; -import { SIZE_M } from '@tdev-components/shared/iconSizes'; import { mdiChevronDown, mdiChevronUp, mdiCloseCircle } from '@mdi/js'; +import Icon from '@mdi/react'; import IconButton from '@tdev-components/shared/Button/IconButton'; import { IfmColors } from '@tdev-components/shared/Colors'; +import { SIZE_M } from '@tdev-components/shared/iconSizes'; +import { MetaInit } from '@tdev-models/documents/ProgressState'; import Step from '@tdev-models/documents/ProgressState/Step'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props extends MetaInit { item: React.ReactNode; diff --git a/src/components/documents/ProgressState/index.tsx b/src/components/documents/ProgressState/index.tsx index a9c7a851b..2c368d953 100644 --- a/src/components/documents/ProgressState/index.tsx +++ b/src/components/documents/ProgressState/index.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { useStore } from '@tdev-hooks/useStore'; import { MetaInit, ModelMeta } from '@tdev-models/documents/ProgressState'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import Item from './Item'; -import { useStore } from '@tdev-hooks/useStore'; +import styles from './styles.module.scss'; import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; interface Props extends MetaInit { diff --git a/src/components/documents/QuillV2/QuillV2.tsx b/src/components/documents/QuillV2/QuillV2.tsx index 39e3dfc25..68c8aada1 100644 --- a/src/components/documents/QuillV2/QuillV2.tsx +++ b/src/components/documents/QuillV2/QuillV2.tsx @@ -1,25 +1,25 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; +import { mdiFlashTriangle } from '@mdi/js'; +import Icon from '@mdi/react'; import Loader from '@tdev-components/Loader'; +import SyncStatus from '@tdev-components/SyncStatus'; +import { useDocument } from '@tdev-hooks/useContextDocument'; import { MetaInit } from '@tdev-models/documents/QuillV2'; -import { useQuill } from 'react-quilljs'; import { ToolbarOptions } from '@tdev-models/documents/QuillV2/helpers/toolbar'; -import 'quill/dist/quill.snow.css'; // Add css for snow theme +import clsx from 'clsx'; +import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import { Delta } from 'quill/core'; import 'quill/dist/quill.bubble.css'; // Add css for snow theme +import 'quill/dist/quill.snow.css'; // Add css for snow theme import BaseImageFormat from 'quill/formats/image'; +import React from 'react'; +import { useQuill } from 'react-quilljs'; import { downscaleImage } from './quill-img-compress/downscaleImage'; -import ImageResize from './quill-img-resize'; -import { file2b64 } from './quill-img-compress/file2b64'; import dropImage from './quill-img-compress/dropImage'; +import { file2b64 } from './quill-img-compress/file2b64'; import pasteImage from './quill-img-compress/pasteImage'; +import ImageResize from './quill-img-resize'; import styles from './styles.module.scss'; -import clsx from 'clsx'; -import SyncStatus from '@tdev-components/SyncStatus'; -import { action } from 'mobx'; -import Icon from '@mdi/react'; -import { mdiFlashTriangle } from '@mdi/js'; -import { useDocument } from '@tdev-hooks/useContextDocument'; -import { Delta } from 'quill/core'; const FORMATS = [ 'bold', diff --git a/src/components/documents/QuillV2/index.tsx b/src/components/documents/QuillV2/index.tsx index c53088b33..2fcfd96a6 100644 --- a/src/components/documents/QuillV2/index.tsx +++ b/src/components/documents/QuillV2/index.tsx @@ -1,11 +1,11 @@ import useIsBrowser from '@docusaurus/useIsBrowser'; -import { observer } from 'mobx-react-lite'; -import * as React from 'react'; -import type { default as QuillV2Type, Props } from './QuillV2'; -import { default as QuillV2Model, ModelMeta } from '@tdev-models/documents/QuillV2'; import { DocContext } from '@tdev-components/documents/DocumentContext'; import Loader from '@tdev-components/Loader'; import { useFirstRealMainDocument } from '@tdev-hooks/useFirstRealMainDocument'; +import { ModelMeta, default as QuillV2Model } from '@tdev-models/documents/QuillV2'; +import { observer } from 'mobx-react-lite'; +import * as React from 'react'; +import type { Props, default as QuillV2Type } from './QuillV2'; /** * Lazy load QuillV2 component - this is a workaround for SSR diff --git a/src/components/documents/QuillV2/quill-img-resize/Toolbar.ts b/src/components/documents/QuillV2/quill-img-resize/Toolbar.ts index 2b2d75806..4b499261a 100644 --- a/src/components/documents/QuillV2/quill-img-resize/Toolbar.ts +++ b/src/components/documents/QuillV2/quill-img-resize/Toolbar.ts @@ -1,7 +1,7 @@ import { mdiFormatAlignCenter, mdiFormatAlignLeft, mdiFormatAlignRight, mdiTrashCan } from '@mdi/js'; -import { BaseModule } from './BaseModule'; import { Parchment } from 'quill'; import styles from '../styles.module.scss'; +import { BaseModule } from './BaseModule'; import { deleteSelectedImage } from './helper'; // let Parchment: any = {}; diff --git a/src/components/documents/QuillV2/quill-img-resize/index.ts b/src/components/documents/QuillV2/quill-img-resize/index.ts index 800e04cb0..3d11a3a57 100644 --- a/src/components/documents/QuillV2/quill-img-resize/index.ts +++ b/src/components/documents/QuillV2/quill-img-resize/index.ts @@ -8,14 +8,14 @@ */ import { defaultsDeep } from 'es-toolkit/compat'; -import DefaultOptions from './DefaultOptions'; -import Toolbar from './Toolbar'; -import Resize from './Resize'; -import Size from './Size'; -import React from 'react'; import type Quill from 'quill'; +import React from 'react'; import { BaseModule } from './BaseModule'; +import DefaultOptions from './DefaultOptions'; import { deleteSelectedImage } from './helper'; +import Resize from './Resize'; +import Size from './Size'; +import Toolbar from './Toolbar'; /** * Custom module for quilljs to allow user to resize elements diff --git a/src/components/documents/Restricted/index.tsx b/src/components/documents/Restricted/index.tsx index f62b55e5a..620941b3c 100644 --- a/src/components/documents/Restricted/index.tsx +++ b/src/components/documents/Restricted/index.tsx @@ -1,15 +1,15 @@ -import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import useIsBrowser from '@docusaurus/useIsBrowser'; +import { Access } from '@tdev-api/document'; import Loader from '@tdev-components/Loader'; -import { MetaInit, ModelMeta } from '@tdev-models/documents/Restricted'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import AccessBadge from '@tdev-components/PermissionsPanel/AccessBadge'; import { useDocumentRoot } from '@tdev-hooks/useDocumentRoot'; -import { Access } from '@tdev-api/document'; import { useStore } from '@tdev-hooks/useStore'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import { MetaInit, ModelMeta } from '@tdev-models/documents/Restricted'; import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; -import AccessBadge from '@tdev-components/PermissionsPanel/AccessBadge'; -import useIsBrowser from '@docusaurus/useIsBrowser'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props extends MetaInit { id: string; diff --git a/src/components/documents/SelfCheck/SelfCheckContent.tsx b/src/components/documents/SelfCheck/SelfCheckContent.tsx index 5930d5963..bbc5bf1f6 100644 --- a/src/components/documents/SelfCheck/SelfCheckContent.tsx +++ b/src/components/documents/SelfCheck/SelfCheckContent.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import { TaskMeta } from '@tdev-models/documents/TaskState'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; -import { useStore } from '@tdev-hooks/useStore'; import Loader from '@tdev-components/Loader'; import { SelfCheckStateType } from '@tdev-components/documents/SelfCheck/models'; import { SelfCheckContext } from '@tdev-components/documents/SelfCheck/shared'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { useStore } from '@tdev-hooks/useStore'; +import { TaskMeta } from '@tdev-models/documents/TaskState'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; interface StateDependentProps { visibleFrom?: SelfCheckStateType; diff --git a/src/components/documents/SelfCheck/SelfCheckSolution.tsx b/src/components/documents/SelfCheck/SelfCheckSolution.tsx index 011d42bc3..ed54ccebb 100644 --- a/src/components/documents/SelfCheck/SelfCheckSolution.tsx +++ b/src/components/documents/SelfCheck/SelfCheckSolution.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import { MetaInit } from '@tdev-models/documents/TaskState'; +import { Access } from '@tdev-api/document'; import { SelfCheckStateType } from '@tdev-components/documents/SelfCheck/models'; -import { SelfCheckContext } from '@tdev-components/documents/SelfCheck/shared'; import SelfCheckContent from '@tdev-components/documents/SelfCheck/SelfCheckContent'; +import { SelfCheckContext } from '@tdev-components/documents/SelfCheck/shared'; import Solution from '@tdev-components/documents/Solution'; -import { Access } from '@tdev-api/document'; +import { MetaInit } from '@tdev-models/documents/TaskState'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; interface Props extends MetaInit { visibleFrom?: SelfCheckStateType; diff --git a/src/components/documents/SelfCheck/SelfCheckTaskState.tsx b/src/components/documents/SelfCheck/SelfCheckTaskState.tsx index 7049ddf3d..2b8842736 100644 --- a/src/components/documents/SelfCheck/SelfCheckTaskState.tsx +++ b/src/components/documents/SelfCheck/SelfCheckTaskState.tsx @@ -1,17 +1,15 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { DocumentModelType } from '@tdev-api/document'; import Loader from '@tdev-components/Loader'; +import { SelfCheckStateType } from '@tdev-components/documents/SelfCheck/models'; +import { SelfCheckContext, SelfCheckStateSideEffect } from '@tdev-components/documents/SelfCheck/shared'; import TaskStateComponent from '@tdev-components/documents/TaskState'; -import { MetaInit, TaskMeta } from '@tdev-models/documents/TaskState'; -import { ModelMeta as SolutionModelMeta } from '@tdev-models/documents/Solution'; import { useDocumentRoot } from '@tdev-hooks/useDocumentRoot'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { ModelMeta as SolutionModelMeta } from '@tdev-models/documents/Solution'; +import TaskState, { MetaInit, TaskMeta } from '@tdev-models/documents/TaskState'; import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; -import { SelfCheckStateType } from '@tdev-components/documents/SelfCheck/models'; -import { SelfCheckContext, SelfCheckStateSideEffect } from '@tdev-components/documents/SelfCheck/shared'; -import { DocumentModelType } from '@tdev-api/document'; -import TaskState from '@tdev-models/documents/TaskState'; -import { reaction } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; interface Props extends MetaInit { includeQuestion: boolean; diff --git a/src/components/documents/SelfCheck/shared.ts b/src/components/documents/SelfCheck/shared.ts index 3dd5d15a8..921703865 100644 --- a/src/components/documents/SelfCheck/shared.ts +++ b/src/components/documents/SelfCheck/shared.ts @@ -1,10 +1,10 @@ -import React from 'react'; -import iSideEffect from '@tdev-models/SideEffects/iSideEffect'; import { TypeDataMapping } from '@tdev-api/document'; -import DocumentRoot from '@tdev-models/DocumentRoot'; -import { computed } from 'mobx'; import { SelfCheckStateType } from '@tdev-components/documents/SelfCheck/models'; +import DocumentRoot from '@tdev-models/DocumentRoot'; import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; +import iSideEffect from '@tdev-models/SideEffects/iSideEffect'; +import { computed } from 'mobx'; +import React from 'react'; interface SelfCheckContextType { solutionId: string; diff --git a/src/components/documents/Solution/index.tsx b/src/components/documents/Solution/index.tsx index 5f577aea4..a6a23ba9f 100644 --- a/src/components/documents/Solution/index.tsx +++ b/src/components/documents/Solution/index.tsx @@ -1,18 +1,18 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import Details from '@theme/Details'; +import { mdiCheckAll } from '@mdi/js'; +import Icon from '@mdi/react'; +import { Access } from '@tdev-api/document'; import Loader from '@tdev-components/Loader'; -import { MetaInit, ModelMeta } from '@tdev-models/documents/Solution'; +import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import AccessBadge from '@tdev-components/PermissionsPanel/AccessBadge'; import { useDocumentRoot } from '@tdev-hooks/useDocumentRoot'; -import { Access } from '@tdev-api/document'; import { useStore } from '@tdev-hooks/useStore'; -import Icon from '@mdi/react'; -import { mdiCheckAll } from '@mdi/js'; -import PermissionsPanel from '@tdev-components/PermissionsPanel'; +import { MetaInit, ModelMeta } from '@tdev-models/documents/Solution'; import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; -import AccessBadge from '@tdev-components/PermissionsPanel/AccessBadge'; +import Details from '@theme/Details'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props extends MetaInit { id: string; diff --git a/src/components/documents/String/index.tsx b/src/components/documents/String/index.tsx index c275ee06e..5ffa314a9 100644 --- a/src/components/documents/String/index.tsx +++ b/src/components/documents/String/index.tsx @@ -1,17 +1,17 @@ -import React, { useId, type ReactNode } from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import useIsBrowser from '@docusaurus/useIsBrowser'; +import { mdiCheckCircle, mdiCloseCircle, mdiFlashTriangle, mdiHelpCircleOutline } from '@mdi/js'; +import Icon from '@mdi/react'; import Loader from '@tdev-components/Loader'; -import { MetaInit, ModelMeta, StringAnswer } from '@tdev-models/documents/String'; +import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; import Button from '@tdev-components/shared/Button'; -import Icon from '@mdi/react'; import SyncStatus from '@tdev-components/SyncStatus'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { MetaInit, ModelMeta, StringAnswer } from '@tdev-models/documents/String'; import { Source } from '@tdev-models/iDocument'; -import { mdiCheckCircle, mdiCloseCircle, mdiFlashTriangle, mdiHelpCircleOutline } from '@mdi/js'; -import useIsBrowser from '@docusaurus/useIsBrowser'; -import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React, { useId, type ReactNode } from 'react'; +import styles from './styles.module.scss'; interface Props extends MetaInit { id: string; diff --git a/src/components/documents/TaskState/index.tsx b/src/components/documents/TaskState/index.tsx index 34d8e3192..324f6d987 100644 --- a/src/components/documents/TaskState/index.tsx +++ b/src/components/documents/TaskState/index.tsx @@ -1,8 +1,6 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import { mdiAccountQuestionOutline, mdiCheckboxBlankOutline, @@ -13,18 +11,20 @@ import { mdiStarHalfFull, mdiStarOutline } from '@mdi/js'; +import Icon from '@mdi/react'; import { StateType } from '@tdev-api/document'; +import Loader from '@tdev-components/Loader'; import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; -import Icon from '@mdi/react'; +import { useScrollTo } from '@tdev-hooks/useScrollTo'; +import { useStore } from '@tdev-hooks/useStore'; import { - default as TaskStateModel, + DEFAULT_TASK_STATES, MetaInit, TaskMeta, - DEFAULT_TASK_STATES + default as TaskStateModel } from '@tdev-models/documents/TaskState'; -import Loader from '@tdev-components/Loader'; -import { useStore } from '@tdev-hooks/useStore'; -import { useScrollTo } from '@tdev-hooks/useScrollTo'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; export const mdiIcon: { [key in StateType]: string } = { checked: mdiCheckboxMarkedOutline, diff --git a/src/components/documents/_scaffold/index.tsx b/src/components/documents/_scaffold/index.tsx index 9e9c74b94..84d75f49e 100644 --- a/src/components/documents/_scaffold/index.tsx +++ b/src/components/documents/_scaffold/index.tsx @@ -1,10 +1,7 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; -import Loader from '@tdev-components/Loader'; import UnknownDocumentType from '@tdev-components/shared/Alert/UnknownDocumentType'; +import { useFirstMainDocument } from '@tdev-hooks/useFirstMainDocument'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; // @ts-ignore interface Props extends MetaInit { diff --git a/src/components/shared/Alert/LoginRequiredForDocumentType.tsx b/src/components/shared/Alert/LoginRequiredForDocumentType.tsx index e59521b20..3c48a89a0 100644 --- a/src/components/shared/Alert/LoginRequiredForDocumentType.tsx +++ b/src/components/shared/Alert/LoginRequiredForDocumentType.tsx @@ -1,8 +1,8 @@ +import { mdiAlert } from '@mdi/js'; import Icon from '@mdi/react'; import Alert from '.'; -import { mdiAlert } from '@mdi/js'; -import { SIZE_S } from '../iconSizes'; import { IfmColors } from '../Colors'; +import { SIZE_S } from '../iconSizes'; interface Props { type: string; diff --git a/src/components/shared/Alert/UnknownDocumentType.tsx b/src/components/shared/Alert/UnknownDocumentType.tsx index 830a73abd..1cf865944 100644 --- a/src/components/shared/Alert/UnknownDocumentType.tsx +++ b/src/components/shared/Alert/UnknownDocumentType.tsx @@ -1,8 +1,8 @@ +import { mdiAlert } from '@mdi/js'; import Icon from '@mdi/react'; import Alert from '.'; -import { mdiAlert } from '@mdi/js'; -import { SIZE_S } from '../iconSizes'; import { IfmColors } from '../Colors'; +import { SIZE_S } from '../iconSizes'; interface Props { type: string; diff --git a/src/components/shared/Alert/index.tsx b/src/components/shared/Alert/index.tsx index 98c6326f0..39f4b7307 100644 --- a/src/components/shared/Alert/index.tsx +++ b/src/components/shared/Alert/index.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; export type AlertType = 'primary' | 'secondary' | 'blue' | 'success' | 'info' | 'warning' | 'danger'; diff --git a/src/components/shared/AssignColumns/index.tsx b/src/components/shared/AssignColumns/index.tsx index f8764b9c8..31a377534 100644 --- a/src/components/shared/AssignColumns/index.tsx +++ b/src/components/shared/AssignColumns/index.tsx @@ -1,8 +1,8 @@ -import React from 'react'; +import Button from '@tdev-components/shared/Button'; +import Table from '@tdev-components/shared/Table'; import clsx from 'clsx'; +import React from 'react'; import styles from './styles.module.scss'; -import Table from '@tdev-components/shared/Table'; -import Button from '@tdev-components/shared/Button'; const COLORS = ['primary', 'success', 'warning', 'danger', 'info', 'secondary'] as const; const IFM_COLORS = [...COLORS.map((c) => `var(--ifm-color-${c}-lightest)`)] as const; diff --git a/src/components/shared/Avatar/index.tsx b/src/components/shared/Avatar/index.tsx index 4b3667756..cd56833f8 100644 --- a/src/components/shared/Avatar/index.tsx +++ b/src/components/shared/Avatar/index.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; interface Props { imgSrc: string; diff --git a/src/components/shared/Badge/index.tsx b/src/components/shared/Badge/index.tsx index 1440e0f2e..6a39546d5 100644 --- a/src/components/shared/Badge/index.tsx +++ b/src/components/shared/Badge/index.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; type BadgeType = 'primary' | 'secondary' | 'blue' | 'success' | 'info' | 'warning' | 'danger'; diff --git a/src/components/shared/Button/Confirm/index.tsx b/src/components/shared/Button/Confirm/index.tsx index 2a3838ff6..7bc054bc1 100644 --- a/src/components/shared/Button/Confirm/index.tsx +++ b/src/components/shared/Button/Confirm/index.tsx @@ -1,10 +1,10 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import Button from '..'; import { mdiClose } from '@mdi/js'; import { Color } from '@tdev-components/shared/Colors'; +import Button from '..'; +import styles from './styles.module.scss'; interface Props { className?: string; diff --git a/src/components/shared/Button/CopyButton/index.tsx b/src/components/shared/Button/CopyButton/index.tsx index c58ec038f..7a85426e5 100644 --- a/src/components/shared/Button/CopyButton/index.tsx +++ b/src/components/shared/Button/CopyButton/index.tsx @@ -1,8 +1,8 @@ +import { mdiCheck, mdiContentCopy } from '@mdi/js'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; import clsx from 'clsx'; import React from 'react'; import Button from '..'; -import { mdiCheck, mdiContentCopy } from '@mdi/js'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; const useCopyButton = (value: string | undefined) => { const [isCopied, setIsCopied] = React.useState(false); diff --git a/src/components/shared/Button/Delete/index.tsx b/src/components/shared/Button/Delete/index.tsx index d332f6df1..576b4964c 100644 --- a/src/components/shared/Button/Delete/index.tsx +++ b/src/components/shared/Button/Delete/index.tsx @@ -1,9 +1,6 @@ -import React from 'react'; -import clsx from 'clsx'; - import { mdiClose, mdiTrashCan, mdiTrashCanOutline } from '@mdi/js'; -import { Color } from '@tdev-components/shared/Colors'; import { Confirm } from '@tdev-components/shared/Button/Confirm'; +import { Color } from '@tdev-components/shared/Colors'; interface Props { className?: string; diff --git a/src/components/shared/Button/IconButton/index.tsx b/src/components/shared/Button/IconButton/index.tsx index 851562f8a..9bbcb0352 100644 --- a/src/components/shared/Button/IconButton/index.tsx +++ b/src/components/shared/Button/IconButton/index.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { action } from 'mobx'; import Icon from '@mdi/react'; import { IfmColors } from '@tdev-components/shared/Colors'; +import clsx from 'clsx'; +import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { path: string; diff --git a/src/components/shared/Button/index.tsx b/src/components/shared/Button/index.tsx index d46df96ee..d419f76fc 100644 --- a/src/components/shared/Button/index.tsx +++ b/src/components/shared/Button/index.tsx @@ -1,11 +1,11 @@ -import React, { MouseEventHandler, type ReactNode } from 'react'; import clsx from 'clsx'; +import React, { MouseEventHandler, type ReactNode } from 'react'; -import styles from './styles.module.scss'; import Link from '@docusaurus/Link'; -import { Color, getButtonColorClass } from '../Colors'; -import Icon from '@mdi/react'; import useIsBrowser from '@docusaurus/useIsBrowser'; +import Icon from '@mdi/react'; +import { Color, getButtonColorClass } from '../Colors'; +import styles from './styles.module.scss'; export const POPUP_BUTTON_STYLE = clsx( styles.button, diff --git a/src/components/shared/Card/index.tsx b/src/components/shared/Card/index.tsx index ba3edc23a..c5845a6ae 100644 --- a/src/components/shared/Card/index.tsx +++ b/src/components/shared/Card/index.tsx @@ -6,9 +6,9 @@ * @see https://github.com/facebook/docusaurus/blob/main/website/src/components/BrowserWindow/index.tsx */ -import React from 'react'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; interface Props { classNames?: { diff --git a/src/components/shared/Checkbox/index.tsx b/src/components/shared/Checkbox/index.tsx index b73eed3a4..38b91fa5e 100644 --- a/src/components/shared/Checkbox/index.tsx +++ b/src/components/shared/Checkbox/index.tsx @@ -1,9 +1,8 @@ -import React from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { label?: string; diff --git a/src/components/shared/CodeEditor/index.tsx b/src/components/shared/CodeEditor/index.tsx index 9e3e9884c..2f8531148 100644 --- a/src/components/shared/CodeEditor/index.tsx +++ b/src/components/shared/CodeEditor/index.tsx @@ -1,18 +1,20 @@ -import * as React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +// ace editor must be imported before ace-builds/* import AceEditor from 'react-ace'; +// rest +import useCodeTheme from '@tdev-hooks/useCodeTheme'; +import 'ace-builds/esm-resolver'; +import 'ace-builds/src-noconflict/ext-language_tools'; import 'ace-builds/src-noconflict/ext-searchbox'; import 'ace-builds/src-noconflict/mode-plain_text'; import 'ace-builds/src-noconflict/mode-python'; import 'ace-builds/src-noconflict/mode-sql'; import 'ace-builds/src-noconflict/mode-svg'; import 'ace-builds/src-noconflict/theme-dracula'; -import 'ace-builds/src-noconflict/ext-language_tools'; import 'ace-builds/webpack-resolver'; -import 'ace-builds/esm-resolver'; -import useCodeTheme from '@tdev-hooks/useCodeTheme'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; +import * as React from 'react'; +import styles from './styles.module.scss'; const ALIAS_LANG_MAP_ACE = { mpy: 'python', diff --git a/src/components/shared/CopyBadge/index.tsx b/src/components/shared/CopyBadge/index.tsx index d645f2379..bd4d1d2fa 100644 --- a/src/components/shared/CopyBadge/index.tsx +++ b/src/components/shared/CopyBadge/index.tsx @@ -1,9 +1,9 @@ -import clsx from 'clsx'; -import * as React from 'react'; -import styles from './styles.module.scss'; import { mdiCircle, mdiClipboardCheck, mdiClipboardText, mdiCloseCircle, mdiLoading } from '@mdi/js'; import Icon, { Stack } from '@mdi/react'; +import clsx from 'clsx'; +import * as React from 'react'; import { Color, getType } from '../Badge'; +import styles from './styles.module.scss'; type CopyState = 'none' | 'spin' | 'copied' | 'error'; const CopyIcon: { [key in CopyState]: string } = { diff --git a/src/components/shared/FromXlsxClipboard/index.tsx b/src/components/shared/FromXlsxClipboard/index.tsx index 366e49194..6ea9d9cd4 100644 --- a/src/components/shared/FromXlsxClipboard/index.tsx +++ b/src/components/shared/FromXlsxClipboard/index.tsx @@ -1,12 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import TextAreaInput from '../TextAreaInput'; +import { mdiCheckboxBlankOutline, mdiCheckboxMarked } from '@mdi/js'; import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import React from 'react'; +import Badge from '../Badge'; import Button from '../Button'; import Table from '../Table'; -import { mdiCheckboxBlankOutline, mdiCheckboxMarked } from '@mdi/js'; -import Badge from '../Badge'; +import TextAreaInput from '../TextAreaInput'; +import styles from './styles.module.scss'; interface Props { matchUsers?: boolean; diff --git a/src/components/shared/JsObject/Editor/Actions/AddValue/index.tsx b/src/components/shared/JsObject/Editor/Actions/AddValue/index.tsx index 09b683e91..bcddb4c56 100644 --- a/src/components/shared/JsObject/Editor/Actions/AddValue/index.tsx +++ b/src/components/shared/JsObject/Editor/Actions/AddValue/index.tsx @@ -1,8 +1,3 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import type iParentable from '../../models/iParentable'; import { mdiCodeBrackets, mdiCodeJson, @@ -13,14 +8,18 @@ import { mdiPlusCircleOutline, mdiToggleSwitchOffOutline } from '@mdi/js'; -import type { JsTypeName, JsValue } from '../../../toJsSchema'; +import Icon from '@mdi/react'; import Button from '@tdev-components/shared/Button'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; -import { ColorMap } from '../../JsType'; +import clsx from 'clsx'; import { action } from 'mobx'; -import { toModel } from '../../models/toModel'; -import Icon from '@mdi/react'; +import { observer } from 'mobx-react-lite'; import { CustomAction } from '../..'; +import type { JsTypeName, JsValue } from '../../../toJsSchema'; +import { ColorMap } from '../../JsType'; +import type iParentable from '../../models/iParentable'; +import { toModel } from '../../models/toModel'; +import styles from './styles.module.scss'; interface Props { jsParent: iParentable; diff --git a/src/components/shared/JsObject/Editor/Actions/ChangeType/index.tsx b/src/components/shared/JsObject/Editor/Actions/ChangeType/index.tsx index 3456eb9a8..7fbb8c320 100644 --- a/src/components/shared/JsObject/Editor/Actions/ChangeType/index.tsx +++ b/src/components/shared/JsObject/Editor/Actions/ChangeType/index.tsx @@ -1,14 +1,14 @@ -import React from 'react'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_XS } from '@tdev-components/shared/iconSizes'; import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { action } from 'mobx'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import type { JsTypeName } from '../../../toJsSchema'; -import Button from '@tdev-components/shared/Button'; -import { SIZE_XS } from '@tdev-components/shared/iconSizes'; import { ColorMap } from '../../JsType'; -import { action } from 'mobx'; -import { IconMap } from '../AddValue'; import type iJs from '../../models/iJs'; +import { IconMap } from '../AddValue'; +import styles from './styles.module.scss'; interface Props { js: iJs; diff --git a/src/components/shared/JsObject/Editor/Actions/RemoveProp/index.tsx b/src/components/shared/JsObject/Editor/Actions/RemoveProp/index.tsx index bb07279e8..633aa9e80 100644 --- a/src/components/shared/JsObject/Editor/Actions/RemoveProp/index.tsx +++ b/src/components/shared/JsObject/Editor/Actions/RemoveProp/index.tsx @@ -1,12 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; import { mdiCloseCircleOutline } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; +import { Confirm } from '@tdev-components/shared/Button/Confirm'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import type iJs from '../../models/iJs'; -import { Confirm } from '@tdev-components/shared/Button/Confirm'; +import styles from './styles.module.scss'; interface Props { js: iJs; diff --git a/src/components/shared/JsObject/Editor/JsArray/index.tsx b/src/components/shared/JsObject/Editor/JsArray/index.tsx index 2da4ffdcf..464dbfb1b 100644 --- a/src/components/shared/JsObject/Editor/JsArray/index.tsx +++ b/src/components/shared/JsObject/Editor/JsArray/index.tsx @@ -1,15 +1,14 @@ -import React from 'react'; +import { mdiChevronDown, mdiChevronRight } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_XS } from '@tdev-components/shared/iconSizes'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import type { CustomAction } from '..'; +import AddValue from '../Actions/AddValue'; import JsType from '../JsType'; -import type { default as JsArrayModel } from '../models/JsArray'; import JsTypeSwitcher from '../JsType/Switcher'; -import AddValue from '../Actions/AddValue'; -import Button from '@tdev-components/shared/Button'; -import { mdiChevronDown, mdiChevronRight } from '@mdi/js'; -import { SIZE_XS } from '@tdev-components/shared/iconSizes'; -import type { CustomAction } from '..'; +import type { default as JsArrayModel } from '../models/JsArray'; +import styles from './styles.module.scss'; interface Props { js: JsArrayModel; diff --git a/src/components/shared/JsObject/Editor/JsBoolean/index.tsx b/src/components/shared/JsObject/Editor/JsBoolean/index.tsx index 09d9a2e6a..07685e6c0 100644 --- a/src/components/shared/JsObject/Editor/JsBoolean/index.tsx +++ b/src/components/shared/JsObject/Editor/JsBoolean/index.tsx @@ -1,12 +1,11 @@ -import React from 'react'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_XS } from '@tdev-components/shared/iconSizes'; import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { action } from 'mobx'; import { observer } from 'mobx-react-lite'; import JsType from '../JsType'; import type { default as JsBooleanModel } from '../models/JsBoolean'; -import { action } from 'mobx'; -import Button from '@tdev-components/shared/Button'; -import { SIZE_XS } from '@tdev-components/shared/iconSizes'; +import styles from './styles.module.scss'; interface Props { js: JsBooleanModel; diff --git a/src/components/shared/JsObject/Editor/JsNullish/index.tsx b/src/components/shared/JsObject/Editor/JsNullish/index.tsx index 60ea01e8e..308309582 100644 --- a/src/components/shared/JsObject/Editor/JsNullish/index.tsx +++ b/src/components/shared/JsObject/Editor/JsNullish/index.tsx @@ -1,11 +1,10 @@ -import React from 'react'; +import Button from '@tdev-components/shared/Button'; import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { action } from 'mobx'; import { observer } from 'mobx-react-lite'; import JsType from '../JsType'; import type { default as JsNullishModel } from '../models/JsNullish'; -import { action } from 'mobx'; -import Button from '@tdev-components/shared/Button'; +import styles from './styles.module.scss'; interface Props { js: JsNullishModel; diff --git a/src/components/shared/JsObject/Editor/JsNumber/index.tsx b/src/components/shared/JsObject/Editor/JsNumber/index.tsx index 890cf03fa..8ab31d468 100644 --- a/src/components/shared/JsObject/Editor/JsNumber/index.tsx +++ b/src/components/shared/JsObject/Editor/JsNumber/index.tsx @@ -1,11 +1,10 @@ -import React from 'react'; +import TextInput from '@tdev-components/shared/TextInput'; import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { action } from 'mobx'; import { observer } from 'mobx-react-lite'; import JsType from '../JsType'; import type { default as JsNumberModel } from '../models/JsNumber'; -import TextInput from '@tdev-components/shared/TextInput'; -import { action } from 'mobx'; +import styles from './styles.module.scss'; interface Props { js: JsNumberModel; diff --git a/src/components/shared/JsObject/Editor/JsObject/index.tsx b/src/components/shared/JsObject/Editor/JsObject/index.tsx index 8124f2eb3..a17ab04de 100644 --- a/src/components/shared/JsObject/Editor/JsObject/index.tsx +++ b/src/components/shared/JsObject/Editor/JsObject/index.tsx @@ -1,15 +1,14 @@ -import React from 'react'; +import { mdiChevronDown, mdiChevronRight } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_XS } from '@tdev-components/shared/iconSizes'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import type { CustomAction } from '..'; +import AddValue from '../Actions/AddValue'; import JsType from '../JsType'; -import Button from '@tdev-components/shared/Button'; -import { mdiChevronDown, mdiChevronRight } from '@mdi/js'; -import { SIZE_XS } from '@tdev-components/shared/iconSizes'; import type { default as JsObjectModel } from '../models/JsObject'; import JsSchemaEditor from '../SchemaEditor'; -import AddValue from '../Actions/AddValue'; -import type { CustomAction } from '..'; +import styles from './styles.module.scss'; interface Props { js: JsObjectModel; diff --git a/src/components/shared/JsObject/Editor/JsString/index.tsx b/src/components/shared/JsObject/Editor/JsString/index.tsx index 30d529f2c..19ba5523f 100644 --- a/src/components/shared/JsObject/Editor/JsString/index.tsx +++ b/src/components/shared/JsObject/Editor/JsString/index.tsx @@ -1,10 +1,9 @@ -import React from 'react'; +import TextAreaInput from '@tdev-components/shared/TextAreaInput'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; import JsType from '../JsType'; import type { default as JsStringModel } from '../models/JsString'; -import TextAreaInput from '@tdev-components/shared/TextAreaInput'; +import styles from './styles.module.scss'; interface Props { js: JsStringModel; diff --git a/src/components/shared/JsObject/Editor/JsType/Switcher.tsx b/src/components/shared/JsObject/Editor/JsType/Switcher.tsx index 599637049..fb8f1dd57 100644 --- a/src/components/shared/JsObject/Editor/JsType/Switcher.tsx +++ b/src/components/shared/JsObject/Editor/JsType/Switcher.tsx @@ -1,14 +1,13 @@ -import React from 'react'; import { observer } from 'mobx-react-lite'; -import type { JsModelType } from '../models/iJs'; +import type { CustomAction } from '..'; +import JsFunction from '../../Viewer/JsFunction'; import JsArray from '../JsArray'; -import JsObject from '../JsObject'; -import JsString from '../JsString'; -import JsNumber from '../JsNumber'; import JsBoolean from '../JsBoolean'; import JsNullish from '../JsNullish'; -import JsFunction from '../../Viewer/JsFunction'; -import type { CustomAction } from '..'; +import JsNumber from '../JsNumber'; +import JsObject from '../JsObject'; +import JsString from '../JsString'; +import type { JsModelType } from '../models/iJs'; export interface Props { js: JsModelType; diff --git a/src/components/shared/JsObject/Editor/JsType/index.tsx b/src/components/shared/JsObject/Editor/JsType/index.tsx index f7c5079f6..b85b5a9f6 100644 --- a/src/components/shared/JsObject/Editor/JsType/index.tsx +++ b/src/components/shared/JsObject/Editor/JsType/index.tsx @@ -1,15 +1,14 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import type { IfmColors } from '@tdev-components/shared/Colors'; import TextInput from '@tdev-components/shared/TextInput'; +import clsx from 'clsx'; import { action } from 'mobx'; -import _ from 'es-toolkit/compat'; -import type { IfmColors } from '@tdev-components/shared/Colors'; -import type iJs from '../models/iJs'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import type { JsTypeName } from '../../toJsSchema'; import ChangeType from '../Actions/ChangeType'; import RemoveProp from '../Actions/RemoveProp'; +import type iJs from '../models/iJs'; +import styles from './styles.module.scss'; interface Props { js: iJs; diff --git a/src/components/shared/JsObject/Editor/SchemaEditor/index.tsx b/src/components/shared/JsObject/Editor/SchemaEditor/index.tsx index 3135b8249..552374859 100644 --- a/src/components/shared/JsObject/Editor/SchemaEditor/index.tsx +++ b/src/components/shared/JsObject/Editor/SchemaEditor/index.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import styles from './styles.module.scss'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import type { CustomAction } from '..'; import JsTypeSwitcher from '../JsType/Switcher'; import type iParentable from '../models/iParentable'; -import type { CustomAction } from '..'; +import styles from './styles.module.scss'; export interface Props { schema: iParentable; diff --git a/src/components/shared/JsObject/Editor/index.tsx b/src/components/shared/JsObject/Editor/index.tsx index c7a1d989a..6867bf299 100644 --- a/src/components/shared/JsObject/Editor/index.tsx +++ b/src/components/shared/JsObject/Editor/index.tsx @@ -1,17 +1,16 @@ -import React from 'react'; +import { mdiContentSave } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { reaction } from 'mobx'; import { observer, useLocalObservable } from 'mobx-react-lite'; +import React from 'react'; import type { EditLevel, JsTypes } from '../toJsSchema'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import AddValue from './Actions/AddValue'; import JsSchemaEditor from './SchemaEditor'; import JsRoot, { type EditorConfig } from './models/JsRoot'; -import { reaction } from 'mobx'; -import AddValue from './Actions/AddValue'; -import Button from '@tdev-components/shared/Button'; -import { mdiContentSave } from '@mdi/js'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; -import _ from 'es-toolkit/compat'; import type iParentable from './models/iParentable'; +import styles from './styles.module.scss'; export type CustomAction = (js: iParentable, className: string, key: string | number) => React.ReactNode; diff --git a/src/components/shared/JsObject/Editor/models/JsArray.ts b/src/components/shared/JsObject/Editor/models/JsArray.ts index 26ec4e361..4e06f0a3a 100644 --- a/src/components/shared/JsObject/Editor/models/JsArray.ts +++ b/src/components/shared/JsObject/Editor/models/JsArray.ts @@ -1,7 +1,6 @@ +import { computed } from 'mobx'; import type { JsArray as JsArrayType, JsParents, JsTypes } from '../../toJsSchema'; -import _ from 'es-toolkit/compat'; import iParentable from './iParentable'; -import { computed } from 'mobx'; class JsArray extends iParentable { readonly type = 'array'; diff --git a/src/components/shared/JsObject/Editor/models/JsBoolean.ts b/src/components/shared/JsObject/Editor/models/JsBoolean.ts index e0a12a7b7..c9db72a1e 100644 --- a/src/components/shared/JsObject/Editor/models/JsBoolean.ts +++ b/src/components/shared/JsObject/Editor/models/JsBoolean.ts @@ -1,6 +1,6 @@ import { action, computed, observable } from 'mobx'; -import iJs from './iJs'; import type { JsBoolean as JsBooleanType } from '../../toJsSchema'; +import iJs from './iJs'; import type iParentable from './iParentable'; class JsBoolean extends iJs { diff --git a/src/components/shared/JsObject/Editor/models/JsFunction.ts b/src/components/shared/JsObject/Editor/models/JsFunction.ts index d0e409e8d..5dcdfe53c 100644 --- a/src/components/shared/JsObject/Editor/models/JsFunction.ts +++ b/src/components/shared/JsObject/Editor/models/JsFunction.ts @@ -1,5 +1,5 @@ -import iJs from './iJs'; import type { JsFunction as JsFunctionType } from '../../toJsSchema'; +import iJs from './iJs'; import type iParentable from './iParentable'; class JsFunction extends iJs { readonly type = 'function'; diff --git a/src/components/shared/JsObject/Editor/models/JsNullish.ts b/src/components/shared/JsObject/Editor/models/JsNullish.ts index 1c82f8165..3cd0c048d 100644 --- a/src/components/shared/JsObject/Editor/models/JsNullish.ts +++ b/src/components/shared/JsObject/Editor/models/JsNullish.ts @@ -1,6 +1,6 @@ import { action, computed, observable } from 'mobx'; -import iJs from './iJs'; import type { JsNullish as JsNullishType } from '../../toJsSchema'; +import iJs from './iJs'; import type iParentable from './iParentable'; class JsNullish extends iJs { diff --git a/src/components/shared/JsObject/Editor/models/JsNumber.ts b/src/components/shared/JsObject/Editor/models/JsNumber.ts index 6a7b5c96c..b5c9a2e5a 100644 --- a/src/components/shared/JsObject/Editor/models/JsNumber.ts +++ b/src/components/shared/JsObject/Editor/models/JsNumber.ts @@ -1,6 +1,6 @@ import { action, computed, observable } from 'mobx'; -import iJs from './iJs'; import type { JsNumber as JsNumberType } from '../../toJsSchema'; +import iJs from './iJs'; import type iParentable from './iParentable'; class JsNumber extends iJs { diff --git a/src/components/shared/JsObject/Editor/models/JsObject.ts b/src/components/shared/JsObject/Editor/models/JsObject.ts index 518015632..ad1942d7d 100644 --- a/src/components/shared/JsObject/Editor/models/JsObject.ts +++ b/src/components/shared/JsObject/Editor/models/JsObject.ts @@ -1,5 +1,4 @@ import { computed } from 'mobx'; -import _ from 'es-toolkit/compat'; import type { JsObject as JsObjectType, JsParents, JsTypes } from '../../toJsSchema'; import iParentable from './iParentable'; diff --git a/src/components/shared/JsObject/Editor/models/JsRoot.ts b/src/components/shared/JsObject/Editor/models/JsRoot.ts index 14066b3af..0b95a5b02 100644 --- a/src/components/shared/JsObject/Editor/models/JsRoot.ts +++ b/src/components/shared/JsObject/Editor/models/JsRoot.ts @@ -1,6 +1,6 @@ import { action, computed, observable } from 'mobx'; +import { toJsSchema, type EditLevel, type JsRoot as JsRootType, type JsTypes } from '../../toJsSchema'; import iJs, { type JsModelType } from './iJs'; -import { type JsTypes, type JsRoot as JsRootType, toJsSchema, type EditLevel } from '../../toJsSchema'; import iParentable from './iParentable'; import { toModel } from './toModel'; diff --git a/src/components/shared/JsObject/Editor/models/JsString.ts b/src/components/shared/JsObject/Editor/models/JsString.ts index 53c7d7cab..1db2680d9 100644 --- a/src/components/shared/JsObject/Editor/models/JsString.ts +++ b/src/components/shared/JsObject/Editor/models/JsString.ts @@ -1,6 +1,6 @@ import { action, computed, observable } from 'mobx'; -import iJs from './iJs'; import type { JsString as JsStringType } from '../../toJsSchema'; +import iJs from './iJs'; import type iParentable from './iParentable'; class JsString extends iJs { diff --git a/src/components/shared/JsObject/Editor/models/iJs.ts b/src/components/shared/JsObject/Editor/models/iJs.ts index 4fca3efa2..6503713c2 100644 --- a/src/components/shared/JsObject/Editor/models/iJs.ts +++ b/src/components/shared/JsObject/Editor/models/iJs.ts @@ -1,15 +1,15 @@ +import _ from 'es-toolkit/compat'; import { action, computed, observable } from 'mobx'; -import type { EditLevel, JsTypes, JsValue, JsTypeName } from '../../toJsSchema'; -import JsNumber from './JsNumber'; -import JsBoolean from './JsBoolean'; -import JsString from './JsString'; -import JsObject from './JsObject'; +import type { EditLevel, JsTypeName, JsTypes, JsValue } from '../../toJsSchema'; +import iParentable from './iParentable'; import JsArray from './JsArray'; -import JsNullish from './JsNullish'; +import JsBoolean from './JsBoolean'; import JsFunction from './JsFunction'; -import _ from 'es-toolkit/compat'; +import JsNullish from './JsNullish'; +import JsNumber from './JsNumber'; +import JsObject from './JsObject'; +import JsString from './JsString'; import { castToType, toModel } from './toModel'; -import iParentable from './iParentable'; export type JsModelType = JsObject | JsString | JsNumber | JsArray | JsBoolean | JsNullish | JsFunction; diff --git a/src/components/shared/JsObject/Editor/models/iParentable.ts b/src/components/shared/JsObject/Editor/models/iParentable.ts index 532f72703..d651c4343 100644 --- a/src/components/shared/JsObject/Editor/models/iParentable.ts +++ b/src/components/shared/JsObject/Editor/models/iParentable.ts @@ -1,9 +1,8 @@ import { action, computed, observable } from 'mobx'; -import iJs, { type JsModelType } from './iJs'; -import { toModel } from './toModel'; import { JsParents, JsValue, sortValues } from '../../toJsSchema'; -import _ from 'es-toolkit/compat'; +import iJs, { type JsModelType } from './iJs'; import type JsRoot from './JsRoot'; +import { toModel } from './toModel'; abstract class iParentable extends iJs { abstract readonly type: T['type']; diff --git a/src/components/shared/JsObject/Editor/models/toModel.ts b/src/components/shared/JsObject/Editor/models/toModel.ts index 4fa0e752a..b5a0f5961 100644 --- a/src/components/shared/JsObject/Editor/models/toModel.ts +++ b/src/components/shared/JsObject/Editor/models/toModel.ts @@ -1,13 +1,13 @@ import _ from 'es-toolkit/compat'; -import type { JsModelType } from './iJs'; import type { JsValue } from '../../toJsSchema'; import JsArray from './JsArray'; -import JsNumber from './JsNumber'; -import JsString from './JsString'; import JsBoolean from './JsBoolean'; -import JsObject from './JsObject'; -import JsNullish from './JsNullish'; import JsFunction from './JsFunction'; +import JsNullish from './JsNullish'; +import JsNumber from './JsNumber'; +import JsObject from './JsObject'; +import JsString from './JsString'; +import type { JsModelType } from './iJs'; import iParentable from './iParentable'; export const toModel = (value: JsValue, parent: iParentable): JsModelType => { diff --git a/src/components/shared/JsObject/JsEditorPopup/index.tsx b/src/components/shared/JsObject/JsEditorPopup/index.tsx index 42e10f382..7ac0f4f3e 100644 --- a/src/components/shared/JsObject/JsEditorPopup/index.tsx +++ b/src/components/shared/JsObject/JsEditorPopup/index.tsx @@ -1,13 +1,12 @@ -import React from 'react'; -import _ from 'es-toolkit/compat'; -import Popup from 'reactjs-popup'; import { mdiCog } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; +import Card from '@tdev-components/shared/Card'; +import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import React from 'react'; +import Popup from 'reactjs-popup'; import type { PopupActions } from 'reactjs-popup/dist/types'; import type { Props as EditorProps } from '../Editor'; -import Card from '@tdev-components/shared/Card'; import JsObjectEditor from '../Editor'; -import { SIZE_S } from '@tdev-components/shared/iconSizes'; interface Props extends EditorProps { title?: string; diff --git a/src/components/shared/JsObject/Viewer/GenericField/GenericValue.tsx b/src/components/shared/JsObject/Viewer/GenericField/GenericValue.tsx index 407c34d56..d152dde74 100644 --- a/src/components/shared/JsObject/Viewer/GenericField/GenericValue.tsx +++ b/src/components/shared/JsObject/Viewer/GenericField/GenericValue.tsx @@ -1,9 +1,8 @@ -import React from 'react'; +import Badge from '@tdev-components/shared/Badge'; +import { IfmColors } from '@tdev-components/shared/Colors'; +import { GenericValue as GenericValueType } from '@tdev-components/shared/JsObject/toJsSchema'; import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import { GenericValue as GenericValueType } from '@tdev-components/shared/JsObject/toJsSchema'; -import { IfmColors } from '@tdev-components/shared/Colors'; -import Badge from '@tdev-components/shared/Badge'; interface Props { js: Omit; diff --git a/src/components/shared/JsObject/Viewer/GenericField/index.tsx b/src/components/shared/JsObject/Viewer/GenericField/index.tsx index 905b5a2a7..02de95311 100644 --- a/src/components/shared/JsObject/Viewer/GenericField/index.tsx +++ b/src/components/shared/JsObject/Viewer/GenericField/index.tsx @@ -1,8 +1,7 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { GenericValue as GenericValueType } from '@tdev-components/shared/JsObject/toJsSchema'; -import JsType from '@tdev-components/shared/JsObject/Viewer/JsType'; import GenericValue from '@tdev-components/shared/JsObject/Viewer/GenericField/GenericValue'; +import JsType from '@tdev-components/shared/JsObject/Viewer/JsType'; +import { observer } from 'mobx-react-lite'; export interface Props { js: GenericValueType; diff --git a/src/components/shared/JsObject/Viewer/JsArray/index.tsx b/src/components/shared/JsObject/Viewer/JsArray/index.tsx index dd5ef8f14..703e52e17 100644 --- a/src/components/shared/JsObject/Viewer/JsArray/index.tsx +++ b/src/components/shared/JsObject/Viewer/JsArray/index.tsx @@ -1,15 +1,14 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import styles from './styles.module.scss'; -import { JsArray as JsonArray } from '@tdev-components/shared/JsObject/toJsSchema'; -import JsType from '@tdev-components/shared/JsObject/Viewer/JsType'; -import clsx from 'clsx'; -import JsTypeSwitcher from '@tdev-components/shared/JsObject/Viewer/JsType/Switcher'; -import { CollapseAtContext } from '..'; -import Button from '@tdev-components/shared/Button'; import { mdiChevronDown, mdiChevronRight, mdiDotsHorizontal } from '@mdi/js'; import Icon from '@mdi/react'; +import Button from '@tdev-components/shared/Button'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; +import { JsArray as JsonArray } from '@tdev-components/shared/JsObject/toJsSchema'; +import JsType from '@tdev-components/shared/JsObject/Viewer/JsType'; +import JsTypeSwitcher from '@tdev-components/shared/JsObject/Viewer/JsType/Switcher'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { js: JsonArray; diff --git a/src/components/shared/JsObject/Viewer/JsFunction/index.tsx b/src/components/shared/JsObject/Viewer/JsFunction/index.tsx index 07a0fdd4d..66b9a10ef 100644 --- a/src/components/shared/JsObject/Viewer/JsFunction/index.tsx +++ b/src/components/shared/JsObject/Viewer/JsFunction/index.tsx @@ -1,11 +1,10 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { JsFunction } from '@tdev-components/shared/JsObject/toJsSchema'; import JsType from '@tdev-components/shared/JsObject/Viewer/JsType'; import CodeBlock from '@theme-original/CodeBlock'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import styles from './styles.module.scss'; -import useIsBrowser from '@docusaurus/useIsBrowser'; export interface Props { js: JsFunction; diff --git a/src/components/shared/JsObject/Viewer/JsObject/index.tsx b/src/components/shared/JsObject/Viewer/JsObject/index.tsx index d531286d6..108c63271 100644 --- a/src/components/shared/JsObject/Viewer/JsObject/index.tsx +++ b/src/components/shared/JsObject/Viewer/JsObject/index.tsx @@ -1,15 +1,15 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; -import JsType from '@tdev-components/shared/JsObject/Viewer/JsType'; -import { JsObject as JsObjectType } from '@tdev-components/shared/JsObject/toJsSchema'; -import JsSchemaViewer from '@tdev-components/shared/JsObject/Viewer/JsSchemaViewer'; -import Button from '@tdev-components/shared/Button'; import { mdiChevronDown, mdiChevronRight, mdiDotsHorizontal } from '@mdi/js'; import Icon from '@mdi/react'; +import Button from '@tdev-components/shared/Button'; import { SIZE_XS } from '@tdev-components/shared/iconSizes'; +import { JsObject as JsObjectType } from '@tdev-components/shared/JsObject/toJsSchema'; +import { CollapseAtContext } from '@tdev-components/shared/JsObject/Viewer'; +import JsSchemaViewer from '@tdev-components/shared/JsObject/Viewer/JsSchemaViewer'; +import JsType from '@tdev-components/shared/JsObject/Viewer/JsType'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; -import { CollapseAtContext } from '@tdev-components/shared/JsObject/Viewer'; interface Props { js: JsObjectType; diff --git a/src/components/shared/JsObject/Viewer/JsSchemaViewer.tsx b/src/components/shared/JsObject/Viewer/JsSchemaViewer.tsx index 5d0d95f38..d289eebce 100644 --- a/src/components/shared/JsObject/Viewer/JsSchemaViewer.tsx +++ b/src/components/shared/JsObject/Viewer/JsSchemaViewer.tsx @@ -1,9 +1,8 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { JsValue } from '@tdev-components/shared/JsObject/toJsSchema'; import JsTypeSwitcher from '@tdev-components/shared/JsObject/Viewer/JsType/Switcher'; -import styles from './styles.module.scss'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; export interface Props { schema: JsValue[]; diff --git a/src/components/shared/JsObject/Viewer/JsType/Switcher.tsx b/src/components/shared/JsObject/Viewer/JsType/Switcher.tsx index 895f85b55..793904696 100644 --- a/src/components/shared/JsObject/Viewer/JsType/Switcher.tsx +++ b/src/components/shared/JsObject/Viewer/JsType/Switcher.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { JsString, JsValue } from '@tdev-components/shared/JsObject/toJsSchema'; -import JsonArray from '@tdev-components/shared/JsObject/Viewer/JsArray'; -import JsObject from '@tdev-components/shared/JsObject/Viewer/JsObject'; import GenericField from '@tdev-components/shared/JsObject/Viewer/GenericField'; +import JsonArray from '@tdev-components/shared/JsObject/Viewer/JsArray'; import JsFunction from '@tdev-components/shared/JsObject/Viewer/JsFunction'; +import JsObject from '@tdev-components/shared/JsObject/Viewer/JsObject'; +import { observer } from 'mobx-react-lite'; export interface Props { js: JsValue; diff --git a/src/components/shared/JsObject/Viewer/JsType/index.tsx b/src/components/shared/JsObject/Viewer/JsType/index.tsx index 01ddd7ab0..df95c58e1 100644 --- a/src/components/shared/JsObject/Viewer/JsType/index.tsx +++ b/src/components/shared/JsObject/Viewer/JsType/index.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { JsValue } from '@tdev-components/shared/JsObject/toJsSchema'; import shared from '@tdev-components/shared/JsObject/Viewer/styles.module.scss'; -import { observer } from 'mobx-react-lite'; import { useTranslation } from '@tdev-hooks/useTranslation'; -import { JsValue } from '@tdev-components/shared/JsObject/toJsSchema'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { js: JsValue; diff --git a/src/components/shared/JsObject/Viewer/index.tsx b/src/components/shared/JsObject/Viewer/index.tsx index d6811daf2..e712a4b27 100644 --- a/src/components/shared/JsObject/Viewer/index.tsx +++ b/src/components/shared/JsObject/Viewer/index.tsx @@ -1,8 +1,8 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { JsTypes, toJsSchema } from '@tdev-components/shared/JsObject/toJsSchema'; import JsSchemaViewer from '@tdev-components/shared/JsObject/Viewer/JsSchemaViewer'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import styles from './styles.module.scss'; export interface Props { diff --git a/src/components/shared/NoAccess/index.tsx b/src/components/shared/NoAccess/index.tsx index b4ee1c13b..e4338f3de 100644 --- a/src/components/shared/NoAccess/index.tsx +++ b/src/components/shared/NoAccess/index.tsx @@ -1,9 +1,9 @@ -import React from 'react'; +import { mdiEmoticonSadOutline } from '@mdi/js'; +import Icon from '@mdi/react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import Icon from '@mdi/react'; -import { mdiEmoticonSadOutline } from '@mdi/js'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { size?: number; diff --git a/src/components/shared/PageStudentGroupFilter/index.tsx b/src/components/shared/PageStudentGroupFilter/index.tsx index 17e4a568a..abbff3b8f 100644 --- a/src/components/shared/PageStudentGroupFilter/index.tsx +++ b/src/components/shared/PageStudentGroupFilter/index.tsx @@ -1,12 +1,11 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import { mdiCollapseAll, mdiExpandAll } from '@mdi/js'; import { useStore } from '@tdev-hooks/useStore'; -import _ from 'es-toolkit/compat'; +import { observer } from 'mobx-react-lite'; import Button from '../Button'; -import { mdiCollapseAll, mdiExpandAll } from '@mdi/js'; +import styles from './styles.module.scss'; /** * Based on the current user and page, this component displays a list of diff --git a/src/components/shared/QrCode/QrGrid/index.tsx b/src/components/shared/QrCode/QrGrid/index.tsx index 4ce4eaf20..f7ff48b31 100644 --- a/src/components/shared/QrCode/QrGrid/index.tsx +++ b/src/components/shared/QrCode/QrGrid/index.tsx @@ -1,11 +1,11 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import QrCode, { Props as DefaultProps } from '..'; import { mdiDownload } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import QrCode, { Props as DefaultProps } from '..'; +import styles from './styles.module.scss'; interface Props extends Omit { title: string; diff --git a/src/components/shared/QrCode/index.tsx b/src/components/shared/QrCode/index.tsx index 17727fcbb..1d0d9fc57 100644 --- a/src/components/shared/QrCode/index.tsx +++ b/src/components/shared/QrCode/index.tsx @@ -1,14 +1,14 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; import styles from './styles.module.scss'; -import { QRCodeCanvas } from 'qrcode.react'; import Link from '@docusaurus/Link'; -import TextAreaInput from '@tdev-components/shared/TextAreaInput'; import useIsBrowser from '@docusaurus/useIsBrowser'; -import Button from '@tdev-components/shared/Button'; import { mdiDownload } from '@mdi/js'; +import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; +import TextAreaInput from '@tdev-components/shared/TextAreaInput'; +import { QRCodeCanvas } from 'qrcode.react'; import { createDownloadCanvas } from './createDownloadCanvas'; const MdiPathToBase64 = (path: string, color: string = '#306cce') => { diff --git a/src/components/shared/RequestFullscreen/index.tsx b/src/components/shared/RequestFullscreen/index.tsx index ffa5999fd..1a04124e8 100644 --- a/src/components/shared/RequestFullscreen/index.tsx +++ b/src/components/shared/RequestFullscreen/index.tsx @@ -1,11 +1,8 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { mdiFullscreen, mdiFullscreenExit } from '@mdi/js'; +import { useStore } from '@tdev-hooks/useStore'; import { observer } from 'mobx-react-lite'; import Button from '../Button'; -import { mdiFullscreen, mdiFullscreenExit } from '@mdi/js'; import { Color } from '../Colors'; -import { useStore } from '@tdev-hooks/useStore'; interface Props { targetId: string; diff --git a/src/components/shared/RequestPresentationMode/GroupSelector/index.tsx b/src/components/shared/RequestPresentationMode/GroupSelector/index.tsx index 1c764f483..dd0d8576d 100644 --- a/src/components/shared/RequestPresentationMode/GroupSelector/index.tsx +++ b/src/components/shared/RequestPresentationMode/GroupSelector/index.tsx @@ -1,14 +1,12 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; import { mdiClose } from '@mdi/js'; +import { DocumentType } from '@tdev-api/document'; +import Button from '@tdev-components/shared/Button'; import StudentGroup from '@tdev-models/StudentGroup'; import iDocument from '@tdev-models/iDocument'; -import { DocumentType } from '@tdev-api/document'; +import clsx from 'clsx'; import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; interface Props { group: StudentGroup; diff --git a/src/components/shared/RequestPresentationMode/index.tsx b/src/components/shared/RequestPresentationMode/index.tsx index 9f2f58905..a30633a19 100644 --- a/src/components/shared/RequestPresentationMode/index.tsx +++ b/src/components/shared/RequestPresentationMode/index.tsx @@ -1,13 +1,13 @@ -import React from 'react'; -import clsx from 'clsx'; -import { observer } from 'mobx-react-lite'; -import Button from '../Button'; import { mdiPresentationPlay, mdiProjectorScreenOffOutline } from '@mdi/js'; -import { Color } from '../Colors'; import { useStore } from '@tdev-hooks/useStore'; +import iDocument from '@tdev-models/iDocument'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; import Popup from 'reactjs-popup'; +import Button from '../Button'; import Card from '../Card'; -import iDocument from '@tdev-models/iDocument'; +import { Color } from '../Colors'; import GroupSelector from './GroupSelector'; interface Props { diff --git a/src/components/shared/SelectInput/index.tsx b/src/components/shared/SelectInput/index.tsx index 949c59351..56255f1db 100644 --- a/src/components/shared/SelectInput/index.tsx +++ b/src/components/shared/SelectInput/index.tsx @@ -1,7 +1,7 @@ +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import React from 'react'; import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import clsx from 'clsx'; interface Option { value: string; diff --git a/src/components/shared/SlideButton/index.tsx b/src/components/shared/SlideButton/index.tsx index 31f11bcf1..e40d9d3eb 100644 --- a/src/components/shared/SlideButton/index.tsx +++ b/src/components/shared/SlideButton/index.tsx @@ -1,11 +1,11 @@ -import React, { useRef, useState } from 'react'; -import styles from './styles.module.scss'; -import Icon from '@mdi/react'; import { mdiArrowRightBoldBox, mdiCheckCircle, mdiCloseCircle, mdiTimerSand } from '@mdi/js'; +import Icon from '@mdi/react'; import Button from '@tdev-components/shared/Button'; import { SIZE_S } from '@tdev-components/shared/iconSizes'; -import { observer } from 'mobx-react-lite'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import React, { useRef, useState } from 'react'; +import styles from './styles.module.scss'; const SLIDER_WIDTH = 320; // px const HANDLE_SIZE = 32; // px diff --git a/src/components/shared/Table/index.tsx b/src/components/shared/Table/index.tsx index 0f2390e30..4b36bf467 100644 --- a/src/components/shared/Table/index.tsx +++ b/src/components/shared/Table/index.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import clsx from 'clsx'; +import React from 'react'; import styles from './styles.module.scss'; interface HighlightedColumn { diff --git a/src/components/shared/TextAreaInput/index.tsx b/src/components/shared/TextAreaInput/index.tsx index bc2a244cf..f5fa6a079 100644 --- a/src/components/shared/TextAreaInput/index.tsx +++ b/src/components/shared/TextAreaInput/index.tsx @@ -1,10 +1,10 @@ -import React from 'react'; +import { mdiKeyboardTab } from '@mdi/js'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import React from 'react'; import Button from '../Button'; -import { mdiKeyboardTab } from '@mdi/js'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; +import styles from './styles.module.scss'; interface Props { defaultValue?: string; diff --git a/src/components/shared/TextInput/index.tsx b/src/components/shared/TextInput/index.tsx index e9961829d..5d9e6f91a 100644 --- a/src/components/shared/TextInput/index.tsx +++ b/src/components/shared/TextInput/index.tsx @@ -1,7 +1,7 @@ -import React, { HTMLInputTypeAttribute } from 'react'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; +import React, { HTMLInputTypeAttribute } from 'react'; +import styles from './styles.module.scss'; interface Props { id?: string; diff --git a/src/components/shared/WithTranslations.tsx b/src/components/shared/WithTranslations.tsx index 5ee6217bb..74c454ff5 100644 --- a/src/components/shared/WithTranslations.tsx +++ b/src/components/shared/WithTranslations.tsx @@ -1,5 +1,5 @@ -import React from 'react'; import { observer } from 'mobx-react-lite'; +import React from 'react'; export type Translation = Record React.ReactNode)> | ((val: string) => React.ReactNode); diff --git a/src/components/utils/CodeThemeToggle/index.tsx b/src/components/utils/CodeThemeToggle/index.tsx index 5bc1eef67..f344c697e 100644 --- a/src/components/utils/CodeThemeToggle/index.tsx +++ b/src/components/utils/CodeThemeToggle/index.tsx @@ -1,9 +1,9 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; import { mdiBackupRestore, mdiMoonWaxingCrescent, mdiThemeLightDark, mdiWhiteBalanceSunny } from '@mdi/js'; import Button from '@tdev-components/shared/Button'; import useCodeTheme from '@tdev-hooks/useCodeTheme'; +import clsx from 'clsx'; +import React from 'react'; +import styles from './styles.module.scss'; export const CodeThemeIcon = { light: mdiWhiteBalanceSunny, diff --git a/src/components/utils/DbActions/DbDestroy.tsx b/src/components/utils/DbActions/DbDestroy.tsx index 36c122eee..3887ae846 100644 --- a/src/components/utils/DbActions/DbDestroy.tsx +++ b/src/components/utils/DbActions/DbDestroy.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { mdiHarddiskRemove } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; import { localDb } from '@tdev-api/base'; -import customFields from '@tdev-components/utils/customFields'; import { Confirm } from '@tdev-components/shared/Button/Confirm'; +import customFields from '@tdev-components/utils/customFields'; +import { useStore } from '@tdev-hooks/useStore'; +import { observer } from 'mobx-react-lite'; const { tdevConfig } = customFields; diff --git a/src/components/utils/DbActions/DbExport.tsx b/src/components/utils/DbActions/DbExport.tsx index 19634a5ac..a02f6f61f 100644 --- a/src/components/utils/DbActions/DbExport.tsx +++ b/src/components/utils/DbActions/DbExport.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { mdiDatabaseExport } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; import { localDb } from '@tdev-api/base'; -import customFields from '@tdev-components/utils/customFields'; import Button from '@tdev-components/shared/Button'; +import customFields from '@tdev-components/utils/customFields'; +import { useStore } from '@tdev-hooks/useStore'; +import { observer } from 'mobx-react-lite'; const { tdevConfig } = customFields; diff --git a/src/components/utils/DbActions/DbImport.tsx b/src/components/utils/DbActions/DbImport.tsx index 563d3619e..4c7c80791 100644 --- a/src/components/utils/DbActions/DbImport.tsx +++ b/src/components/utils/DbActions/DbImport.tsx @@ -1,10 +1,9 @@ -import React from 'react'; -import { observer } from 'mobx-react-lite'; import { mdiAlertOutline, mdiDatabaseImport } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; -import { Confirm } from '@tdev-components/shared/Button/Confirm'; import { localDb } from '@tdev-api/base'; +import { Confirm } from '@tdev-components/shared/Button/Confirm'; import customFields from '@tdev-components/utils/customFields'; +import { useStore } from '@tdev-hooks/useStore'; +import { observer } from 'mobx-react-lite'; const { tdevConfig } = customFields; diff --git a/src/helpers/ensureDir.ts b/src/helpers/ensureDir.ts index 9e864ddff..476044ed9 100644 --- a/src/helpers/ensureDir.ts +++ b/src/helpers/ensureDir.ts @@ -1,5 +1,5 @@ import { promises as fs } from 'fs'; -import { dirname, sep, normalize } from 'path'; +import { dirname, normalize, sep } from 'path'; /** * Ensures that the directory for the given path exists. diff --git a/src/hooks/useCodeTheme.tsx b/src/hooks/useCodeTheme.tsx index 61aa1a1ab..ff96b9884 100644 --- a/src/hooks/useCodeTheme.tsx +++ b/src/hooks/useCodeTheme.tsx @@ -1,6 +1,6 @@ +import { useColorMode } from '@docusaurus/theme-common'; import { StorageKey } from '@tdev-stores/utils/Storage'; import useLocalStorage from './useLocalStorage'; -import { useColorMode } from '@docusaurus/theme-common'; const AceThemeMap = { light: 'xcode', diff --git a/src/hooks/useContextDocument.tsx b/src/hooks/useContextDocument.tsx index 4823c165d..7c2673121 100644 --- a/src/hooks/useContextDocument.tsx +++ b/src/hooks/useContextDocument.tsx @@ -1,7 +1,7 @@ import { ReactContextError } from '@docusaurus/theme-common'; -import { useContext } from 'react'; -import { DocContext } from '@tdev-components/documents/DocumentContext'; import { DocumentType, TypeModelMapping } from '@tdev-api/document'; +import { DocContext } from '@tdev-components/documents/DocumentContext'; +import { useContext } from 'react'; export function useDocument(): TypeModelMapping[T] { const context = useContext(DocContext); diff --git a/src/hooks/useContextDocumentRootId.tsx b/src/hooks/useContextDocumentRootId.tsx index d592faa07..e76f036af 100644 --- a/src/hooks/useContextDocumentRootId.tsx +++ b/src/hooks/useContextDocumentRootId.tsx @@ -1,6 +1,6 @@ -import React from 'react'; import { ReactContextError } from '@docusaurus/theme-common'; import { observer } from 'mobx-react-lite'; +import React from 'react'; export const DocRootIdContext = React.createContext(null); interface Props { diff --git a/src/hooks/useCreateDocument.ts b/src/hooks/useCreateDocument.ts index 01d776593..86df1dd68 100644 --- a/src/hooks/useCreateDocument.ts +++ b/src/hooks/useCreateDocument.ts @@ -1,11 +1,11 @@ -import React from 'react'; import { DocumentType } from '@tdev-api/document'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { Config } from '@tdev-api/documentRoot'; import { useDocumentRoot } from '@tdev-hooks/useDocumentRoot'; import { useStore } from '@tdev-hooks/useStore'; -import { Config } from '@tdev-api/documentRoot'; -import { v4 as uuidv4 } from 'uuid'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; import { runInAction } from 'mobx'; +import React from 'react'; +import { v4 as uuidv4 } from 'uuid'; export const DUMMY_DOCUMENT_ID = 'dummy' as const; diff --git a/src/hooks/useDocumentRoot.ts b/src/hooks/useDocumentRoot.ts index e000a2f37..566fd68a0 100644 --- a/src/hooks/useDocumentRoot.ts +++ b/src/hooks/useDocumentRoot.ts @@ -1,10 +1,10 @@ -import React from 'react'; import { Access, DocumentType } from '@tdev-api/document'; -import DocumentRoot, { MetaHasher, TypeMeta } from '@tdev-models/DocumentRoot'; -import { useStore } from '@tdev-hooks/useStore'; import { Config } from '@tdev-api/documentRoot'; -import { useDummyId } from './useDummyId'; +import { useStore } from '@tdev-hooks/useStore'; +import DocumentRoot, { MetaHasher, TypeMeta } from '@tdev-models/DocumentRoot'; import { reaction } from 'mobx'; +import React from 'react'; +import { useDummyId } from './useDummyId'; /** * 1. create a dummy documentRoot with default (meta) data diff --git a/src/hooks/useFirstMainDocument.ts b/src/hooks/useFirstMainDocument.ts index 8a574a00d..13e6d7a94 100644 --- a/src/hooks/useFirstMainDocument.ts +++ b/src/hooks/useFirstMainDocument.ts @@ -1,11 +1,11 @@ -import React from 'react'; import { DocumentType, TypeModelMapping } from '@tdev-api/document'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { Config } from '@tdev-api/documentRoot'; import { useDocumentRoot } from '@tdev-hooks/useDocumentRoot'; import { useStore } from '@tdev-hooks/useStore'; -import { Config } from '@tdev-api/documentRoot'; -import { useDummyId } from './useDummyId'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; import { reaction } from 'mobx'; +import React from 'react'; +import { useDummyId } from './useDummyId'; export const DUMMY_DOCUMENT_ID = 'dummy' as const; diff --git a/src/hooks/useFirstRealMainDocument.ts b/src/hooks/useFirstRealMainDocument.ts index f8686fb88..50c805e8f 100644 --- a/src/hooks/useFirstRealMainDocument.ts +++ b/src/hooks/useFirstRealMainDocument.ts @@ -1,7 +1,7 @@ import { DocumentType } from '@tdev-api/document'; +import { Config } from '@tdev-api/documentRoot'; import { TypeMeta } from '@tdev-models/DocumentRoot'; import { useFirstMainDocument } from './useFirstMainDocument'; -import { Config } from '@tdev-api/documentRoot'; /** * This hook provides access to the first main document of the rootDocument. diff --git a/src/hooks/useIsMobileView.ts b/src/hooks/useIsMobileView.ts index 556f9121c..38c6469d8 100644 --- a/src/hooks/useIsMobileView.ts +++ b/src/hooks/useIsMobileView.ts @@ -1,5 +1,5 @@ import _ from 'es-toolkit/compat'; -import { useState, useEffect } from 'react'; +import { useEffect, useState } from 'react'; const useIsMobileView = (mobileViewWidth: number = 768) => { const [isMobileView, setIsMobileView] = useState(false); diff --git a/src/hooks/useLinkedMetaModel.ts b/src/hooks/useLinkedMetaModel.ts index 78950eb06..0795a62d6 100644 --- a/src/hooks/useLinkedMetaModel.ts +++ b/src/hooks/useLinkedMetaModel.ts @@ -1,8 +1,7 @@ -import React from 'react'; -import { AssessableTypeModelMapping } from '@tdev-api/document'; -import { AssessableType } from '@tdev-api/document'; +import { AssessableType, AssessableTypeModelMapping } from '@tdev-api/document'; import { AssessableMeta } from '@tdev-models/documents/Assessable/AssessableMeta'; import iAssessable from '@tdev-models/documents/Assessable/iAssessable'; +import React from 'react'; const useLinkedMetaModel = ( doc: AssessableTypeModelMapping[Type] | undefined | null, diff --git a/src/hooks/useMdxComment.ts b/src/hooks/useMdxComment.ts index 322042049..9ba181404 100644 --- a/src/hooks/useMdxComment.ts +++ b/src/hooks/useMdxComment.ts @@ -1,7 +1,5 @@ -import { DocumentType } from '@tdev-api/document'; import { useStore } from '@tdev-hooks/useStore'; import MdxComment from '@tdev-models/documents/MdxComment'; -import _ from 'es-toolkit/compat'; /** * This hook provides access to the first main document of the rootDocument. diff --git a/src/hooks/useNestedAssessableDocumentBy.ts b/src/hooks/useNestedAssessableDocumentBy.ts index e38cd0e23..5310a97dd 100644 --- a/src/hooks/useNestedAssessableDocumentBy.ts +++ b/src/hooks/useNestedAssessableDocumentBy.ts @@ -1,14 +1,13 @@ -import React from 'react'; import type { AssessableType, AssessableTypeModelMapping, DocumentModelType } from '@tdev-api/document'; +import { Config } from '@tdev-api/documentRoot'; import { useDocumentRoot } from '@tdev-hooks/useDocumentRoot'; import { useStore } from '@tdev-hooks/useStore'; -import { Config } from '@tdev-api/documentRoot'; -import { useDummyId } from './useDummyId'; +import { AssessableMeta } from '@tdev-models/documents/Assessable/AssessableMeta'; import { reaction } from 'mobx'; +import React from 'react'; +import { useDummyId } from './useDummyId'; import { DUMMY_DOCUMENT_ID } from './useFirstMainDocument'; -import { AssessableMeta } from '@tdev-models/documents/Assessable/AssessableMeta'; import useLinkedMetaModel from './useLinkedMetaModel'; -import _ from 'es-toolkit/compat'; const access = {} as Config; diff --git a/src/hooks/useStore.ts b/src/hooks/useStore.ts index 1d036f17c..1462009ce 100644 --- a/src/hooks/useStore.ts +++ b/src/hooks/useStore.ts @@ -1,5 +1,5 @@ -import React from 'react'; import { rootStore, storesContext } from '@tdev-stores/rootStore'; +import React from 'react'; export const useStore = (store: T): (typeof rootStore)[T] => { return React.useContext(storesContext)[store]; diff --git a/src/hooks/useTranslation.ts b/src/hooks/useTranslation.ts index 201d08221..e6adb0a56 100644 --- a/src/hooks/useTranslation.ts +++ b/src/hooks/useTranslation.ts @@ -1,5 +1,5 @@ -import React, { useContext } from 'react'; import { TranslationsContext } from '@tdev-components/shared/WithTranslations'; +import React, { useContext } from 'react'; export function useTranslation(name?: string): React.ReactNode { const context = useContext(TranslationsContext); diff --git a/src/models/DocumentRoot.ts b/src/models/DocumentRoot.ts index ae47f2798..e8f510909 100644 --- a/src/models/DocumentRoot.ts +++ b/src/models/DocumentRoot.ts @@ -1,11 +1,11 @@ -import { action, computed, observable } from 'mobx'; -import { DocumentRootBase as DocumentRootProps } from '@tdev-api/documentRoot'; -import { DocumentRootStore } from '@tdev-stores/DocumentRootStore'; import { Access, DocumentType, TypeDataMapping, TypeModelMapping } from '@tdev-api/document'; -import { highestAccess, leveledAccess, NoneAccess, ROAccess, RWAccess } from './helpers/accessPolicy'; +import { DocumentRootBase as DocumentRootProps } from '@tdev-api/documentRoot'; import { isDummyId } from '@tdev-hooks/useDummyId'; +import { DocumentRootStore } from '@tdev-stores/DocumentRootStore'; import { orderBy } from 'es-toolkit/array'; import { Hashery } from 'hashery'; +import { action, computed, observable } from 'mobx'; +import { highestAccess, leveledAccess, NoneAccess, ROAccess, RWAccess } from './helpers/accessPolicy'; /** * removes react specific props from the object: diff --git a/src/models/Form/index.ts b/src/models/Form/index.ts index 893d62662..60fab9a9f 100644 --- a/src/models/Form/index.ts +++ b/src/models/Form/index.ts @@ -1,4 +1,3 @@ -import _ from 'es-toolkit/compat'; import { action, computed, observable, runInAction } from 'mobx'; import { computedFn } from 'mobx-utils'; import Field, { FormField } from './Field'; diff --git a/src/models/GroupPermission.ts b/src/models/GroupPermission.ts index bd57befab..d5533d67e 100644 --- a/src/models/GroupPermission.ts +++ b/src/models/GroupPermission.ts @@ -1,8 +1,8 @@ -import { action, computed, observable } from 'mobx'; import { Access } from '@tdev-api/document'; -import PermissionStore from '@tdev-stores/PermissionStore'; import { GroupPermission as GroupPermissionProps } from '@tdev-api/permission'; import User from '@tdev-models/User'; +import PermissionStore from '@tdev-stores/PermissionStore'; +import { action, computed, observable } from 'mobx'; class GroupPermission { readonly store: PermissionStore; diff --git a/src/models/Page.ts b/src/models/Page.ts index a8abbda3b..f37d6ad1d 100644 --- a/src/models/Page.ts +++ b/src/models/Page.ts @@ -2,15 +2,15 @@ * A Markdown or MDX Page */ -import { action, computed, observable, ObservableMap, observableRef } from 'mobx'; -import { AUTO_GENERATED_PAGE_PREFIX, PageStore } from '@tdev-stores/PageStore'; -import _ from 'es-toolkit/compat'; +import { mdiCheckCircleOutline, mdiSpeedometer, mdiSpeedometerMedium, mdiSpeedometerSlow } from '@mdi/js'; +import { DocumentType } from '@tdev-api/document'; +import { IfmColors } from '@tdev-components/shared/Colors'; import iDocument from '@tdev-models/iDocument'; import StudentGroup from '@tdev-models/StudentGroup'; -import { DocumentType } from '@tdev-api/document'; +import { AUTO_GENERATED_PAGE_PREFIX, PageStore } from '@tdev-stores/PageStore'; +import _ from 'es-toolkit/compat'; +import { action, computed, observable, ObservableMap, observableRef } from 'mobx'; import { iTaskableDocument } from './iTaskableDocument'; -import { mdiCheckCircleOutline, mdiSpeedometer, mdiSpeedometerMedium, mdiSpeedometerSlow } from '@mdi/js'; -import { IfmColors } from '@tdev-components/shared/Colors'; interface PageConfig { type: DocumentType; position: number; diff --git a/src/models/SideEffects/RandomState.ts b/src/models/SideEffects/RandomState.ts index 897c2090a..e7b41824a 100644 --- a/src/models/SideEffects/RandomState.ts +++ b/src/models/SideEffects/RandomState.ts @@ -1,8 +1,7 @@ -import { DocumentType, StateType, TypeDataMapping } from '@tdev-api/document'; -import iSideEffect from './iSideEffect'; -import _ from 'es-toolkit/compat'; +import { StateType, TypeDataMapping } from '@tdev-api/document'; import { UserStore } from '@tdev-stores/UserStore'; import { computed } from 'mobx'; +import iSideEffect from './iSideEffect'; const States: StateType[] = ['checked', 'question', 'unset', 'star', 'star-half', 'star-empty'] as const; diff --git a/src/models/StudentGroup.ts b/src/models/StudentGroup.ts index 8359de4dc..b4309efaa 100644 --- a/src/models/StudentGroup.ts +++ b/src/models/StudentGroup.ts @@ -1,11 +1,10 @@ -import { action, computed, observable, observableRef } from 'mobx'; +import { Access, type DocumentModelType, type TypeModelMapping } from '@tdev-api/document'; import { DocumentPresentation, StudentGroup as StudentGroupProps } from '@tdev-api/studentGroup'; -import { StudentGroupStore } from '@tdev-stores/StudentGroupStore'; import { formatDateTime } from '@tdev-models/helpers/date'; import User from '@tdev-models/User'; -import _ from 'es-toolkit/compat'; +import { StudentGroupStore } from '@tdev-stores/StudentGroupStore'; import { orderBy } from 'es-toolkit/array'; -import { Access, type TypeModelMapping, type DocumentModelType } from '@tdev-api/document'; +import { action, computed, observable, observableRef } from 'mobx'; import type DocumentRoot from './DocumentRoot'; class StudentGroup { diff --git a/src/models/User.ts b/src/models/User.ts index 6c1e1ac53..296c74096 100644 --- a/src/models/User.ts +++ b/src/models/User.ts @@ -1,7 +1,7 @@ -import { action, computed, observable } from 'mobx'; import { AuthProvider, Role, RoleAccessLevel, Session, User as UserProps } from '@tdev-api/user'; import { UserStore } from '@tdev-stores/UserStore'; import { orderBy } from 'es-toolkit/array'; +import { action, computed, observable } from 'mobx'; export default class User { readonly store: UserStore; diff --git a/src/models/UserPermission.ts b/src/models/UserPermission.ts index 58e86a95e..130c4a4da 100644 --- a/src/models/UserPermission.ts +++ b/src/models/UserPermission.ts @@ -1,8 +1,8 @@ -import { action, observable } from 'mobx'; import { Access } from '@tdev-api/document'; -import PermissionStore from '@tdev-stores/PermissionStore'; import { UserPermission as UserPermissionProps } from '@tdev-api/permission'; import User from '@tdev-models/User'; +import PermissionStore from '@tdev-stores/PermissionStore'; +import { action, observable } from 'mobx'; class UserPermission { readonly store: PermissionStore; diff --git a/src/models/documents/Assessable/AssessableMeta.ts b/src/models/documents/Assessable/AssessableMeta.ts index 986f7f9ce..cd8d7d2af 100644 --- a/src/models/documents/Assessable/AssessableMeta.ts +++ b/src/models/documents/Assessable/AssessableMeta.ts @@ -1,7 +1,7 @@ -import { type TypeDataMapping, type AssessableType } from '@tdev-api/document'; -import type { default as iAssessable, Assessement } from './iAssessable'; +import { type AssessableType, type TypeDataMapping } from '@tdev-api/document'; import { TypeMeta } from '@tdev-models/DocumentRoot'; import { observable } from 'mobx'; +import type { Assessement, default as iAssessable } from './iAssessable'; export type ExpandedOption = 'all' | 'correct' | 'selected' | 'none'; diff --git a/src/models/documents/Assessable/ChoiceAnswer.ts b/src/models/documents/Assessable/ChoiceAnswer.ts index 3d1c1a3c1..af70a8b4e 100644 --- a/src/models/documents/Assessable/ChoiceAnswer.ts +++ b/src/models/documents/Assessable/ChoiceAnswer.ts @@ -1,13 +1,13 @@ -import { TypeDataMapping, Document as DocumentProps } from '@tdev-api/document'; +import { mdiFrequentlyAskedQuestions, mdiMessageQuestionOutline } from '@mdi/js'; +import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; +import type { ChoiceAnswerProps } from '@tdev-components/documents/Assessable/ChoiceAnswer'; import { Source } from '@tdev-models/iDocument'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { action, computed, observable, observableRef } from 'mobx'; -import iAssessable from './iAssessable'; -import { range } from 'es-toolkit/math'; import { shuffle } from 'es-toolkit/array'; -import type { ChoiceAnswerProps } from '@tdev-components/documents/Assessable/ChoiceAnswer'; +import { range } from 'es-toolkit/math'; +import { action, computed, observable, observableRef } from 'mobx'; import { AssessableMeta } from './AssessableMeta'; -import { mdiFrequentlyAskedQuestions, mdiMessageQuestionOutline } from '@mdi/js'; +import iAssessable from './iAssessable'; export class ModelMeta extends AssessableMeta<'choice_answer'> implements AssessableMeta<'choice_answer'> { readonly type = 'choice_answer'; diff --git a/src/models/documents/Assessable/Quiz.ts b/src/models/documents/Assessable/Quiz.ts index beac63a0a..e56258eaa 100644 --- a/src/models/documents/Assessable/Quiz.ts +++ b/src/models/documents/Assessable/Quiz.ts @@ -1,14 +1,14 @@ -import { TypeDataMapping, Document as DocumentProps, AssessableType } from '@tdev-api/document'; +import { mdiTimelineQuestionOutline } from '@mdi/js'; +import { AssessableType, Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; +import type { Props as QuizProps } from '@tdev-components/documents/Assessable/Quiz'; +import { IfmColors } from '@tdev-components/shared/Colors'; import { Source } from '@tdev-models/iDocument'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { action, computed, observableRef } from 'mobx'; -import iAssessable, { Assessement, Correctness, CorrectnessColors } from './iAssessable'; -import { range } from 'es-toolkit/math'; import { shuffle } from 'es-toolkit/array'; -import type { Props as QuizProps } from '@tdev-components/documents/Assessable/Quiz'; +import { range } from 'es-toolkit/math'; +import { action, computed, observableRef } from 'mobx'; import { AssessableMeta } from './AssessableMeta'; -import { mdiTimelineQuestionOutline } from '@mdi/js'; -import { IfmColors } from '@tdev-components/shared/Colors'; +import iAssessable, { Assessement, Correctness, CorrectnessColors } from './iAssessable'; const DEFAULT_DATA = Object.freeze({ questionOrder: [], diff --git a/src/models/documents/Assessable/TrueFalseAnswer.ts b/src/models/documents/Assessable/TrueFalseAnswer.ts index c38124483..6e1791783 100644 --- a/src/models/documents/Assessable/TrueFalseAnswer.ts +++ b/src/models/documents/Assessable/TrueFalseAnswer.ts @@ -1,11 +1,11 @@ -import { TypeDataMapping, Document as DocumentProps } from '@tdev-api/document'; +import { mdiCommentAlertOutline } from '@mdi/js'; +import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; +import type { Props as TrueFalseProps } from '@tdev-components/documents/Assessable/TrueFalseAnswer'; import { Source } from '@tdev-models/iDocument'; import DocumentStore from '@tdev-stores/DocumentStore'; import { action, computed, observable } from 'mobx'; -import iAssessable from './iAssessable'; -import type { Props as TrueFalseProps } from '@tdev-components/documents/Assessable/TrueFalseAnswer'; import { AssessableMeta } from './AssessableMeta'; -import { mdiCommentAlertOutline } from '@mdi/js'; +import iAssessable from './iAssessable'; export class ModelMeta extends AssessableMeta<'true_false_answer'> diff --git a/src/models/documents/Assessable/iAssessable.ts b/src/models/documents/Assessable/iAssessable.ts index 19e5b49db..213169a4c 100644 --- a/src/models/documents/Assessable/iAssessable.ts +++ b/src/models/documents/Assessable/iAssessable.ts @@ -1,13 +1,12 @@ import { AssessableType, Document as DocumentProps } from '@tdev-api/document'; +import { IfmColors } from '@tdev-components/shared/Colors'; import iDocument from '@tdev-models/iDocument'; +import { iTaskableDocument } from '@tdev-models/iTaskableDocument'; import DocumentStore from '@tdev-stores/DocumentStore'; import { action, computed, observable, observableRef } from 'mobx'; import React from 'react'; import { AssessableMeta, ExpandedOption } from './AssessableMeta'; import Quiz from './Quiz'; -import { iTaskableDocument } from '@tdev-models/iTaskableDocument'; -import { mdiTooltipQuestionOutline } from '@mdi/js'; -import { IfmColors } from '@tdev-components/shared/Colors'; export enum Correctness { Correct = 'correct', diff --git a/src/models/documents/CmsText.ts b/src/models/documents/CmsText.ts index 29fa63512..51a64dfc2 100644 --- a/src/models/documents/CmsText.ts +++ b/src/models/documents/CmsText.ts @@ -1,8 +1,8 @@ -import { action, computed, observable } from 'mobx'; +import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; import iDocument, { Source } from '@tdev-models/iDocument'; -import { DocumentType, Document as DocumentProps, TypeDataMapping, Access } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { action, computed, observable } from 'mobx'; export interface MetaInit { default?: string; diff --git a/src/models/documents/Code.ts b/src/models/documents/Code.ts index bdecb9887..91070c4fc 100644 --- a/src/models/documents/Code.ts +++ b/src/models/documents/Code.ts @@ -1,8 +1,8 @@ import { Document as DocumentProps } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; -import { default as iScriptMeta } from './iCode/iCodeMeta'; import { Props as CodeEditorProps } from '@tdev-components/documents/CodeEditor'; +import DocumentStore from '@tdev-stores/DocumentStore'; import iCode from './iCode'; +import { default as iScriptMeta } from './iCode/iCodeMeta'; export class CodeMeta extends iScriptMeta<'code'> { constructor(props: Partial>) { diff --git a/src/models/documents/DynamicDocumentRoots/index.ts b/src/models/documents/DynamicDocumentRoots/index.ts index 71be98a8e..c13802d0a 100644 --- a/src/models/documents/DynamicDocumentRoots/index.ts +++ b/src/models/documents/DynamicDocumentRoots/index.ts @@ -1,14 +1,14 @@ -import { action, computed, observable } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; import { - Document as DocumentProps, - TypeDataMapping, Access, ContainerType, - ContainerTypeModelMapping + ContainerTypeModelMapping, + Document as DocumentProps, + TypeDataMapping } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; import DocumentRoot, { TypeMeta } from '@tdev-models/DocumentRoot'; +import iDocument, { Source } from '@tdev-models/iDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed, observable } from 'mobx'; import { v4 as uuidv4 } from 'uuid'; import { ContainerMeta } from './ContainerMeta'; diff --git a/src/models/documents/FileSystem/Directory.ts b/src/models/documents/FileSystem/Directory.ts index 50b1b9203..561818c07 100644 --- a/src/models/documents/FileSystem/Directory.ts +++ b/src/models/documents/FileSystem/Directory.ts @@ -1,10 +1,10 @@ -import { computed } from 'mobx'; -import { DocumentType, Document as DocumentProps } from '@tdev-api/document'; +import { Document as DocumentProps } from '@tdev-api/document'; +import { formatDateTime } from '@tdev-models/helpers/date'; import DocumentStore from '@tdev-stores/DocumentStore'; import _ from 'es-toolkit/compat'; +import { computed } from 'mobx'; import File from './File'; import iFileSystem, { DefaultName, iFSMeta, MetaInit } from './iFileSystem'; -import { formatDateTime } from '@tdev-models/helpers/date'; export class ModelMeta extends iFSMeta<'dir'> { constructor(props: Partial) { diff --git a/src/models/documents/FileSystem/File.ts b/src/models/documents/FileSystem/File.ts index ccb7928d5..9a81e4c3b 100644 --- a/src/models/documents/FileSystem/File.ts +++ b/src/models/documents/FileSystem/File.ts @@ -1,9 +1,8 @@ -import { computed } from 'mobx'; -import { DocumentType, Document as DocumentProps } from '@tdev-api/document'; +import { Document as DocumentProps } from '@tdev-api/document'; +import { formatDateTime } from '@tdev-models/helpers/date'; import DocumentStore from '@tdev-stores/DocumentStore'; -import _ from 'es-toolkit/compat'; +import { computed } from 'mobx'; import iFileSystem, { DefaultName, iFSMeta, MetaInit } from './iFileSystem'; -import { formatDateTime } from '@tdev-models/helpers/date'; export class ModelMeta extends iFSMeta<'file'> { constructor(props: Partial) { diff --git a/src/models/documents/FileSystem/iFileSystem.ts b/src/models/documents/FileSystem/iFileSystem.ts index 51c3485ce..c4eaf5eae 100644 --- a/src/models/documents/FileSystem/iFileSystem.ts +++ b/src/models/documents/FileSystem/iFileSystem.ts @@ -1,10 +1,9 @@ -import { action, computed, observable } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; -import { Document as DocumentProps, TypeDataMapping, Access, DocumentModelType } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; +import { DocumentModelType, Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; import { TypeMeta } from '@tdev-models/DocumentRoot'; import { formatDateTime } from '@tdev-models/helpers/date'; -import _ from 'es-toolkit/compat'; +import iDocument, { Source } from '@tdev-models/iDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed, observable } from 'mobx'; export interface MetaInit { readonly?: boolean; diff --git a/src/models/documents/MdxComment.ts b/src/models/documents/MdxComment.ts index 7512f0b4a..c1e44a2c4 100644 --- a/src/models/documents/MdxComment.ts +++ b/src/models/documents/MdxComment.ts @@ -1,14 +1,14 @@ -import { action, computed, observable } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; import { + DocumentModelType, Document as DocumentProps, - TypeDataMapping, MdxCommentData, - DocumentModelType + TypeDataMapping } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; import { Color } from '@tdev-components/shared/Colors'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; +import iDocument, { Source } from '@tdev-models/iDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed, observable } from 'mobx'; export interface MetaInit extends MdxCommentData {} diff --git a/src/models/documents/ProgressState/Step.ts b/src/models/documents/ProgressState/Step.ts index d9c5e32aa..3b8aed434 100644 --- a/src/models/documents/ProgressState/Step.ts +++ b/src/models/documents/ProgressState/Step.ts @@ -1,5 +1,3 @@ -import { action, computed, observable } from 'mobx'; -import ProgressState from '.'; import { mdiCheckCircle, mdiCircleMedium, @@ -9,6 +7,8 @@ import { } from '@mdi/js'; import { IfmColors } from '@tdev-components/shared/Colors'; import _ from 'es-toolkit/compat'; +import { action, computed, observable } from 'mobx'; +import ProgressState from '.'; export interface MetaInit { readonly?: boolean; pagePosition?: number; diff --git a/src/models/documents/ProgressState/index.ts b/src/models/documents/ProgressState/index.ts index 6fe174689..f329d0219 100644 --- a/src/models/documents/ProgressState/index.ts +++ b/src/models/documents/ProgressState/index.ts @@ -1,13 +1,13 @@ -import { action, computed, observable } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; -import { DocumentType, Document as DocumentProps, TypeDataMapping, Access } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; -import { RWAccess } from '@tdev-models/helpers/accessPolicy'; import { mdiCheckCircleOutline, mdiSpeedometer, mdiSpeedometerMedium, mdiSpeedometerSlow } from '@mdi/js'; +import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; import { IfmColors } from '@tdev-components/shared/Colors'; -import Step from './Step'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { RWAccess } from '@tdev-models/helpers/accessPolicy'; +import iDocument, { Source } from '@tdev-models/iDocument'; import type { iTaskableDocument } from '@tdev-models/iTaskableDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed, observable } from 'mobx'; +import Step from './Step'; export interface MetaInit { readonly?: boolean; diff --git a/src/models/documents/QuillV2/index.ts b/src/models/documents/QuillV2/index.ts index 5571473d6..09d849ef9 100644 --- a/src/models/documents/QuillV2/index.ts +++ b/src/models/documents/QuillV2/index.ts @@ -1,12 +1,12 @@ -import { action, computed, observableRef } from 'mobx'; +import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; import iDocument, { Source } from '@tdev-models/iDocument'; -import { Document as DocumentProps, TypeDataMapping, Access } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; -import { getToolbar, TOOLBAR, ToolbarModule, ToolbarOptions } from './helpers/toolbar'; -import { Delta } from 'quill/core'; import { ApiState } from '@tdev-stores/iStore'; import _ from 'es-toolkit/compat'; +import { action, computed, observableRef } from 'mobx'; +import { Delta } from 'quill/core'; +import { getToolbar, TOOLBAR, ToolbarModule, ToolbarOptions } from './helpers/toolbar'; export interface MetaInit { readonly?: boolean; diff --git a/src/models/documents/Restricted.ts b/src/models/documents/Restricted.ts index d847330ae..c4b195992 100644 --- a/src/models/documents/Restricted.ts +++ b/src/models/documents/Restricted.ts @@ -1,8 +1,8 @@ -import { action, computed } from 'mobx'; +import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; import iDocument, { Source } from '@tdev-models/iDocument'; -import { DocumentType, Document as DocumentProps, TypeDataMapping, Access } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { action, computed } from 'mobx'; export interface MetaInit { readonly?: boolean; diff --git a/src/models/documents/ScriptVersion.ts b/src/models/documents/ScriptVersion.ts index 54d06a96d..54deb5804 100644 --- a/src/models/documents/ScriptVersion.ts +++ b/src/models/documents/ScriptVersion.ts @@ -1,5 +1,5 @@ -import iDocument from '@tdev-models/iDocument'; import type { Document as DocumentProps, ScriptVersionData } from '@tdev-api/document'; +import iDocument from '@tdev-models/iDocument'; import DocumentStore from '@tdev-stores/DocumentStore'; import { computed } from 'mobx'; import type Script from './Code'; diff --git a/src/models/documents/Solution.ts b/src/models/documents/Solution.ts index 8df54635f..f262a7fc3 100644 --- a/src/models/documents/Solution.ts +++ b/src/models/documents/Solution.ts @@ -1,8 +1,8 @@ -import { action, computed } from 'mobx'; +import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; import iDocument, { Source } from '@tdev-models/iDocument'; -import { DocumentType, Document as DocumentProps, TypeDataMapping, Access } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { action, computed } from 'mobx'; export interface MetaInit { readonly?: boolean; diff --git a/src/models/documents/String.ts b/src/models/documents/String.ts index 15096dd8d..4ab759464 100644 --- a/src/models/documents/String.ts +++ b/src/models/documents/String.ts @@ -1,8 +1,8 @@ -import { action, computed, observable } from 'mobx'; +import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; import iDocument, { Source } from '@tdev-models/iDocument'; -import { DocumentType, Document as DocumentProps, TypeDataMapping, Access } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { action, computed, observable } from 'mobx'; export interface MetaInit { readonly?: boolean; diff --git a/src/models/documents/TaskState.ts b/src/models/documents/TaskState.ts index 16f4d3099..db9340767 100644 --- a/src/models/documents/TaskState.ts +++ b/src/models/documents/TaskState.ts @@ -1,18 +1,12 @@ -import { action, computed, observable } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; -import { - DocumentType, - Document as DocumentProps, - StateType, - TypeDataMapping, - Access -} from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; -import { RWAccess } from '@tdev-models/helpers/accessPolicy'; +import { Document as DocumentProps, StateType, TypeDataMapping } from '@tdev-api/document'; import { mdiIcon } from '@tdev-components/documents/TaskState'; import { mdiColor } from '@tdev-components/EditingOverview'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { RWAccess } from '@tdev-models/helpers/accessPolicy'; +import iDocument, { Source } from '@tdev-models/iDocument'; import type { iTaskableDocument } from '@tdev-models/iTaskableDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed, observable } from 'mobx'; export interface MetaInit { readonly?: boolean; diff --git a/src/models/documents/Unknown.ts b/src/models/documents/Unknown.ts index 3e866c165..66d062a5b 100644 --- a/src/models/documents/Unknown.ts +++ b/src/models/documents/Unknown.ts @@ -1,8 +1,8 @@ -import { action, computed } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; import { type Access, type Document as DocumentProps, type TypeDataMapping } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; import { TypeMeta } from '@tdev-models/DocumentRoot'; +import iDocument, { Source } from '@tdev-models/iDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed } from 'mobx'; interface BaseMetaProps { access?: Access; diff --git a/src/models/documents/_scaffold.ts b/src/models/documents/_scaffold.ts index 672d34651..f757404a7 100644 --- a/src/models/documents/_scaffold.ts +++ b/src/models/documents/_scaffold.ts @@ -1,8 +1,8 @@ -import { action, computed } from 'mobx'; -import iDocument, { Source } from '@tdev-models/iDocument'; import { Document as DocumentProps, TypeDataMapping } from '@tdev-api/document'; -import DocumentStore from '@tdev-stores/DocumentStore'; import { TypeMeta } from '@tdev-models/DocumentRoot'; +import iDocument, { Source } from '@tdev-models/iDocument'; +import DocumentStore from '@tdev-stores/DocumentStore'; +import { action, computed } from 'mobx'; export interface MetaInit { readonly?: boolean; diff --git a/src/models/documents/iCode/iCodeMeta.ts b/src/models/documents/iCode/iCodeMeta.ts index 92f3365cd..e22b2ab28 100644 --- a/src/models/documents/iCode/iCodeMeta.ts +++ b/src/models/documents/iCode/iCodeMeta.ts @@ -1,4 +1,4 @@ -import { TypeDataMapping, CodeType } from '@tdev-api/document'; +import { CodeType, TypeDataMapping } from '@tdev-api/document'; import { TypeMeta } from '@tdev-models/DocumentRoot'; import { MetaProps } from '@tdev/theme/CodeBlock'; import { computed } from 'mobx'; diff --git a/src/models/documents/iCode/index.ts b/src/models/documents/iCode/index.ts index 10a67f64c..fc9c16ec8 100644 --- a/src/models/documents/iCode/index.ts +++ b/src/models/documents/iCode/index.ts @@ -1,11 +1,11 @@ -import { action, computed, observable } from 'mobx'; +import { CodeType, Document as DocumentProps, ScriptVersionData, TypeDataMapping } from '@tdev-api/document'; import iDocument, { Source } from '@tdev-models/iDocument'; -import { Document as DocumentProps, TypeDataMapping, ScriptVersionData, CodeType } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; import { orderBy } from 'es-toolkit/array'; import { throttle } from 'es-toolkit/function'; -import iCodeMeta from './iCodeMeta'; +import { action, computed, observable } from 'mobx'; import ScriptVersion from '../ScriptVersion'; +import iCodeMeta from './iCodeMeta'; type Props = DocumentProps; diff --git a/src/models/iDocument.ts b/src/models/iDocument.ts index 9196cb34f..326dbc689 100644 --- a/src/models/iDocument.ts +++ b/src/models/iDocument.ts @@ -1,11 +1,11 @@ -import { action, computed, IReactionDisposer, observable, observableRef, reaction } from 'mobx'; -import { Document as DocumentProps, TypeDataMapping, DocumentType } from '@tdev-api/document'; +import { Document as DocumentProps, DocumentType, TypeDataMapping } from '@tdev-api/document'; +import { isDummyId, isTempId } from '@tdev-hooks/useDummyId'; import DocumentStore from '@tdev-stores/DocumentStore'; -import { debounce, isEqual, type DebouncedFunc } from 'es-toolkit/compat'; import { ApiState } from '@tdev-stores/iStore'; +import { debounce, isEqual, type DebouncedFunc } from 'es-toolkit/compat'; +import { action, computed, IReactionDisposer, observable, observableRef, reaction } from 'mobx'; import { NoneAccess, ROAccess, RWAccess } from './helpers/accessPolicy'; import type iSideEffect from './SideEffects/iSideEffect'; -import { isDummyId, isTempId } from '@tdev-hooks/useDummyId'; /** * normally, save only once all 1000ms diff --git a/src/models/iDocumentContainer.ts b/src/models/iDocumentContainer.ts index bbb4c3dbc..1dade2129 100644 --- a/src/models/iDocumentContainer.ts +++ b/src/models/iDocumentContainer.ts @@ -1,11 +1,10 @@ -import { action, computed, observable } from 'mobx'; -import { Document as DocumentProps, Access, ContainerType } from '@tdev-api/document'; +import { Access, ContainerType, Document as DocumentProps } from '@tdev-api/document'; import DocumentStore from '@tdev-stores/DocumentStore'; -import _ from 'es-toolkit/compat'; +import { action, computed, observable } from 'mobx'; +import DynamicDocumentRoots from './documents/DynamicDocumentRoots'; +import { ContainerMeta } from './documents/DynamicDocumentRoots/ContainerMeta'; import { NoneAccess, RWAccess, sharedAccess } from './helpers/accessPolicy'; import iDocument from './iDocument'; -import { ContainerMeta } from './documents/DynamicDocumentRoots/ContainerMeta'; -import DynamicDocumentRoots from './documents/DynamicDocumentRoots'; interface DocumentContainerData { name: string; diff --git a/src/pages/admin/index.tsx b/src/pages/admin/index.tsx index 70baae85e..11e65a725 100644 --- a/src/pages/admin/index.tsx +++ b/src/pages/admin/index.tsx @@ -1,10 +1,8 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import AdminPanel from '@tdev-components/Admin/AdminPanel'; import Layout from '@theme/Layout'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import _ from 'es-toolkit/compat'; -import AdminPanel from '@tdev-components/Admin/AdminPanel'; +import styles from './styles.module.scss'; const StudentGroups = observer(() => { return ( diff --git a/src/pages/excalidraw/index.tsx b/src/pages/excalidraw/index.tsx index c3855fb7b..05dd1424d 100644 --- a/src/pages/excalidraw/index.tsx +++ b/src/pages/excalidraw/index.tsx @@ -1,6 +1,6 @@ -import clsx from 'clsx'; -import Layout from '@theme/Layout'; import StandaloneEditor from '@tdev/excalidoc/ImageMarkupEditor/StandaloneEditor'; +import Layout from '@theme/Layout'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; import styles from './styles.module.scss'; diff --git a/src/pages/index.tsx b/src/pages/index.tsx index 990fcd6b2..3e374d17f 100644 --- a/src/pages/index.tsx +++ b/src/pages/index.tsx @@ -1,12 +1,12 @@ -import clsx from 'clsx'; import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; -import Layout from '@theme/Layout'; import HomepageFeatures from '@tdev-components/HomepageFeatures'; +import Layout from '@theme/Layout'; +import clsx from 'clsx'; -import styles from './index.module.css'; -import { useClassVersions } from '@tdev-components/HomepageCourses/useClassVersions'; import HomepageCourses from '@tdev-components/HomepageCourses'; +import { useClassVersions } from '@tdev-components/HomepageCourses/useClassVersions'; import { HomepageHeader } from '@tdev-components/HomepageHeader'; +import styles from './index.module.css'; const Home = (): React.ReactNode => { const { siteConfig } = useDocusaurusContext(); diff --git a/src/pages/login.tsx b/src/pages/login.tsx index de5d4a4f3..8cbfd5aa0 100644 --- a/src/pages/login.tsx +++ b/src/pages/login.tsx @@ -1,19 +1,18 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './login.module.scss'; -import Layout from '@theme/Layout'; -import { observer } from 'mobx-react-lite'; import { Redirect } from '@docusaurus/router'; -import { authClient } from '@tdev/auth-client'; -import Button from '@tdev-components/shared/Button'; -import { mdiEmail, mdiGithub, mdiLoading, mdiMicrosoft } from '@mdi/js'; import useBaseUrl from '@docusaurus/useBaseUrl'; +import { mdiEmail, mdiGithub, mdiLoading, mdiMicrosoft } from '@mdi/js'; import DefinitionList from '@tdev-components/DefinitionList'; +import { HomepageHeader } from '@tdev-components/HomepageHeader'; +import Alert from '@tdev-components/shared/Alert'; +import Button from '@tdev-components/shared/Button'; import CodeThemeToggle from '@tdev-components/utils/CodeThemeToggle'; import customFields from '@tdev-components/utils/customFields'; import { useStore } from '@tdev-hooks/useStore'; -import Alert from '@tdev-components/shared/Alert'; -import { HomepageHeader } from '@tdev-components/HomepageHeader'; +import { authClient } from '@tdev/auth-client'; +import Layout from '@theme/Layout'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import styles from './login.module.scss'; const { NO_AUTH } = customFields; const LoginPage = observer(() => { diff --git a/src/pages/signIn/index.tsx b/src/pages/signIn/index.tsx index 28781764d..c2e5d56cf 100644 --- a/src/pages/signIn/index.tsx +++ b/src/pages/signIn/index.tsx @@ -1,19 +1,19 @@ -import React from 'react'; -import clsx from 'clsx'; import Layout from '@theme/Layout'; +import clsx from 'clsx'; +import React from 'react'; -import styles from './styles.module.scss'; -import { authClient } from '@site/src/auth-client'; import { Redirect } from '@docusaurus/router'; +import { mdiLoading, mdiLogin } from '@mdi/js'; +import { authClient } from '@site/src/auth-client'; +import { HomepageHeader } from '@tdev-components/HomepageHeader'; +import Alert from '@tdev-components/shared/Alert'; +import Button from '@tdev-components/shared/Button'; +import { SIZE_M } from '@tdev-components/shared/iconSizes'; import TextInput from '@tdev-components/shared/TextInput'; -import { observer } from 'mobx-react-lite'; import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; import { action } from 'mobx'; -import Alert from '@tdev-components/shared/Alert'; -import { SIZE_M } from '@tdev-components/shared/iconSizes'; -import { mdiLoading, mdiLogin } from '@mdi/js'; -import { HomepageHeader } from '@tdev-components/HomepageHeader'; +import { observer } from 'mobx-react-lite'; +import styles from './styles.module.scss'; const SignIn = observer((): React.ReactNode => { const [email, setEmail] = React.useState(''); diff --git a/src/pages/studentGroups/index.tsx b/src/pages/studentGroups/index.tsx index 20b43d4b9..0289fdbff 100644 --- a/src/pages/studentGroups/index.tsx +++ b/src/pages/studentGroups/index.tsx @@ -1,10 +1,8 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import StudentGroupPanel from '@tdev-components/Admin/StudentGroupPanel'; import Layout from '@theme/Layout'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import _ from 'es-toolkit/compat'; -import StudentGroupPanel from '@tdev-components/Admin/StudentGroupPanel'; +import styles from './styles.module.scss'; const StudentGroups = observer(() => { return ( diff --git a/src/pages/user/ApiView.tsx b/src/pages/user/ApiView.tsx index 4a09e658e..efb2a3224 100644 --- a/src/pages/user/ApiView.tsx +++ b/src/pages/user/ApiView.tsx @@ -1,24 +1,21 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import Layout from '@theme/Layout'; -import { observer } from 'mobx-react-lite'; import { Redirect } from '@docusaurus/router'; import { mdiArrowRightThin, mdiCircle, mdiCloudQuestion, mdiDeleteEmptyOutline, mdiLogout } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; -import Loader from '@tdev-components/Loader'; -import DefinitionList from '@tdev-components/DefinitionList'; import Icon from '@mdi/react'; -import NavReloadRequest from '@tdev-components/Admin/ActionRequest/NavReloadRequest'; import { AuthProviderColor, AuthProviderIcons } from '@tdev-api/user'; -import { useIsLive } from '@tdev-hooks/useIsLive'; +import DefinitionList from '@tdev-components/DefinitionList'; +import Loader from '@tdev-components/Loader'; import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; import { SIZE_M, SIZE_XS } from '@tdev-components/shared/iconSizes'; -import { authClient } from '@tdev/auth-client'; import CodeThemeToggle from '@tdev-components/utils/CodeThemeToggle'; import customFields from '@tdev-components/utils/customFields'; +import { useIsLive } from '@tdev-hooks/useIsLive'; +import { useStore } from '@tdev-hooks/useStore'; +import { authClient } from '@tdev/auth-client'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import QuickGroupOverview from './QuickGroupOverview'; +import styles from './styles.module.scss'; const { OFFLINE_API } = customFields; diff --git a/src/pages/user/LocalDbView.tsx b/src/pages/user/LocalDbView.tsx index a84abec93..7d720e901 100644 --- a/src/pages/user/LocalDbView.tsx +++ b/src/pages/user/LocalDbView.tsx @@ -1,24 +1,23 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; +import useIsBrowser from '@docusaurus/useIsBrowser'; import { mdiArrowRightThin } from '@mdi/js'; -import { useStore } from '@tdev-hooks/useStore'; -import Button from '@tdev-components/shared/Button'; -import Loader from '@tdev-components/Loader'; -import DefinitionList from '@tdev-components/DefinitionList'; import Icon from '@mdi/react'; -import useIsBrowser from '@docusaurus/useIsBrowser'; +import { DEFAULT_OFFLINE_USER } from '@tdev-api/OfflineApi'; +import DefinitionList from '@tdev-components/DefinitionList'; +import Loader from '@tdev-components/Loader'; import Badge from '@tdev-components/shared/Badge'; +import Button from '@tdev-components/shared/Button'; +import { IfmColors } from '@tdev-components/shared/Colors'; import { SIZE_M } from '@tdev-components/shared/iconSizes'; import CodeThemeToggle from '@tdev-components/utils/CodeThemeToggle'; -import { DEFAULT_OFFLINE_USER } from '@tdev-api/OfflineApi'; import customFields from '@tdev-components/utils/customFields'; -import DbImport from '@tdev-components/utils/DbActions/DbImport'; -import DbExport from '@tdev-components/utils/DbActions/DbExport'; import DbDestroy from '@tdev-components/utils/DbActions/DbDestroy'; -import { IfmColors } from '@tdev-components/shared/Colors'; +import DbExport from '@tdev-components/utils/DbActions/DbExport'; +import DbImport from '@tdev-components/utils/DbActions/DbImport'; +import { useStore } from '@tdev-hooks/useStore'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; import QuickGroupOverview from './QuickGroupOverview'; +import styles from './styles.module.scss'; const { OFFLINE_API, tdevConfig } = customFields; diff --git a/src/pages/user/QuickGroupOverview/index.tsx b/src/pages/user/QuickGroupOverview/index.tsx index c903d859f..142a83245 100644 --- a/src/pages/user/QuickGroupOverview/index.tsx +++ b/src/pages/user/QuickGroupOverview/index.tsx @@ -1,16 +1,16 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; -import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; +import Link from '@docusaurus/Link'; +import useBaseUrl from '@docusaurus/useBaseUrl'; import NavReloadRequest from '@tdev-components/Admin/ActionRequest/NavReloadRequest'; import Badge from '@tdev-components/shared/Badge'; -import { orderBy } from 'es-toolkit/array'; -import StudentGroup from '@tdev-models/StudentGroup'; import Button from '@tdev-components/shared/Button'; -import useBaseUrl from '@docusaurus/useBaseUrl'; -import Link from '@docusaurus/Link'; +import { useStore } from '@tdev-hooks/useStore'; +import StudentGroup from '@tdev-models/StudentGroup'; +import clsx from 'clsx'; +import { orderBy } from 'es-toolkit/array'; import { action } from 'mobx'; +import { observer } from 'mobx-react-lite'; +import React from 'react'; +import styles from './styles.module.scss'; interface Props { groups: StudentGroup[]; diff --git a/src/pages/user/index.tsx b/src/pages/user/index.tsx index 702e22461..6e8cb4356 100644 --- a/src/pages/user/index.tsx +++ b/src/pages/user/index.tsx @@ -1,11 +1,10 @@ -import React from 'react'; -import clsx from 'clsx'; -import styles from './styles.module.scss'; +import { useStore } from '@tdev-hooks/useStore'; import Layout from '@theme/Layout'; +import clsx from 'clsx'; import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; import ApiView from './ApiView'; import LocalDbView from './LocalDbView'; +import styles from './styles.module.scss'; const UserPage = observer(() => { const sessionStore = useStore('sessionStore'); diff --git a/src/plugins/helpers.ts b/src/plugins/helpers.ts index b6ef69362..97e5be322 100644 --- a/src/plugins/helpers.ts +++ b/src/plugins/helpers.ts @@ -1,6 +1,6 @@ +import type { ArrayExpression, Directive, MemberExpression, ObjectExpression } from 'estree-jsx'; import { all as KnownCssProperties } from 'known-css-properties'; import { MdxJsxAttribute } from 'mdast-util-mdx'; -import type { ArrayExpression, Directive, MemberExpression, ObjectExpression } from 'estree-jsx'; // matches options in strings: "--width=200px --height=20%" -> {width: '20px', height='20%'} const OPTION_REGEX = /(^|\s+)--(?[a-zA-Z\-]+)\s*=\s*(?[\d\S-]+)/; const BOOLEAN_REGEX = /(^|\s+)--(?[a-zA-Z\-]+)\s*/; diff --git a/src/plugins/plugin-alias-configuration/index.ts b/src/plugins/plugin-alias-configuration/index.ts index 4ce6b797b..f3d73a1ca 100644 --- a/src/plugins/plugin-alias-configuration/index.ts +++ b/src/plugins/plugin-alias-configuration/index.ts @@ -1,5 +1,5 @@ -import path from 'path'; import type { LoadContext, Plugin } from '@docusaurus/types'; +import path from 'path'; const aliasConfigurationPlugin: Plugin = (context: LoadContext, options?: { websiteDir?: string }) => { const websiteDir = options?.websiteDir ? options.websiteDir : './website'; return { diff --git a/src/plugins/remark-code-as-attribute/plugin.ts b/src/plugins/remark-code-as-attribute/plugin.ts index c59fcf190..02b6f2fcb 100644 --- a/src/plugins/remark-code-as-attribute/plugin.ts +++ b/src/plugins/remark-code-as-attribute/plugin.ts @@ -1,6 +1,6 @@ -import type { Plugin, Transformer } from 'unified'; import type { Code, InlineCode, Root } from 'mdast'; import type { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; import { toJsxAttribute } from '../helpers'; export interface CodeAttributes { diff --git a/src/plugins/remark-code-as-attribute/tests/plugin.test.ts b/src/plugins/remark-code-as-attribute/tests/plugin.test.ts index 1bc55cbf8..4619e9980 100644 --- a/src/plugins/remark-code-as-attribute/tests/plugin.test.ts +++ b/src/plugins/remark-code-as-attribute/tests/plugin.test.ts @@ -1,10 +1,10 @@ +import { fileURLToPath } from 'node:url'; import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; +import { VFile } from 'vfile'; import { describe, expect, it } from 'vitest'; import { PluginOptions } from '../plugin'; -import { VFile } from 'vfile'; -import { fileURLToPath } from 'node:url'; const __filename = fileURLToPath(import.meta.url); const alignLeft = (content: string) => { diff --git a/src/plugins/remark-code-defbox/plugin.ts b/src/plugins/remark-code-defbox/plugin.ts index 53fc706f1..a22079886 100644 --- a/src/plugins/remark-code-defbox/plugin.ts +++ b/src/plugins/remark-code-defbox/plugin.ts @@ -1,6 +1,6 @@ -import type { Plugin, Transformer } from 'unified'; import { Paragraph, Root } from 'mdast'; import { MdxJsxFlowElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; interface PluginOptions { tagNames?: { diff --git a/src/plugins/remark-code-defbox/tests/plugin.test.ts b/src/plugins/remark-code-defbox/tests/plugin.test.ts index 3052793db..18a7c19ae 100644 --- a/src/plugins/remark-code-defbox/tests/plugin.test.ts +++ b/src/plugins/remark-code-defbox/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const alignLeft = (content: string) => { diff --git a/src/plugins/remark-comments/plugin.ts b/src/plugins/remark-comments/plugin.ts index 830a7a3c6..23c9bc52e 100644 --- a/src/plugins/remark-comments/plugin.ts +++ b/src/plugins/remark-comments/plugin.ts @@ -1,6 +1,6 @@ -import type { Plugin, Transformer } from 'unified'; import type { Root } from 'mdast'; import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; import { toJsxAttribute } from '../helpers'; const COMMENTABLE_BLOCK_TYPES = [ diff --git a/src/plugins/remark-comments/tests/plugin.test.ts b/src/plugins/remark-comments/tests/plugin.test.ts index eb38208ca..c9a68d9c8 100644 --- a/src/plugins/remark-comments/tests/plugin.test.ts +++ b/src/plugins/remark-comments/tests/plugin.test.ts @@ -1,8 +1,8 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; -import { describe, expect, it } from 'vitest'; +import remarkMdx from 'remark-mdx'; import { VFile } from 'vfile'; +import { describe, expect, it } from 'vitest'; import { PluginOptions } from '../plugin'; const alignLeft = (content: string) => { diff --git a/src/plugins/remark-deflist/plugin.ts b/src/plugins/remark-deflist/plugin.ts index c35ec9c06..1ea97737f 100644 --- a/src/plugins/remark-deflist/plugin.ts +++ b/src/plugins/remark-deflist/plugin.ts @@ -1,7 +1,7 @@ -import { visit, CONTINUE, SKIP, EXIT } from 'unist-util-visit'; -import type { Plugin, Transformer } from 'unified'; +import { Paragraph, Parent, PhrasingContent, Root, RootContent, Text } from 'mdast'; import type { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; -import { BlockContent, Paragraph, Parent, PhrasingContent, Root, RootContent, Text } from 'mdast'; +import type { Plugin, Transformer } from 'unified'; +import { CONTINUE, EXIT, SKIP, visit } from 'unist-util-visit'; // match to determine if the line is an opening tag const DD_REGEX = /(\r?\n):[ \t]+(.*?)/; diff --git a/src/plugins/remark-deflist/tests/plugin.test.ts b/src/plugins/remark-deflist/tests/plugin.test.ts index 31d5f2043..4ea71e6c1 100644 --- a/src/plugins/remark-deflist/tests/plugin.test.ts +++ b/src/plugins/remark-deflist/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const alignLeft = (content: string) => { diff --git a/src/plugins/remark-details/plugin.ts b/src/plugins/remark-details/plugin.ts index a3739d871..65a665e8b 100644 --- a/src/plugins/remark-details/plugin.ts +++ b/src/plugins/remark-details/plugin.ts @@ -1,7 +1,7 @@ -import { visit } from 'unist-util-visit'; -import type { Plugin, Transformer } from 'unified'; import type { BlockContent, Root, Text } from 'mdast'; import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; +import { visit } from 'unist-util-visit'; // TODO: How to type this? // TS doesn't enforce that only keys of directiveNames can be used in diff --git a/src/plugins/remark-details/tests/plugin.test.ts b/src/plugins/remark-details/tests/plugin.test.ts index 9f2d90323..9645ad5e2 100644 --- a/src/plugins/remark-details/tests/plugin.test.ts +++ b/src/plugins/remark-details/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; import { PluginOptions } from '../plugin'; diff --git a/src/plugins/remark-enumerate-components/plugin.ts b/src/plugins/remark-enumerate-components/plugin.ts index 42f81307a..56503af98 100644 --- a/src/plugins/remark-enumerate-components/plugin.ts +++ b/src/plugins/remark-enumerate-components/plugin.ts @@ -5,9 +5,9 @@ * LICENSE file in the root directory of this source tree. */ -import type { Plugin, Transformer } from 'unified'; -import type { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; import type { Root } from 'mdast'; +import type { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; import { toJsxAttribute } from '../helpers'; export interface PluginOptions { diff --git a/src/plugins/remark-enumerate-components/tests/plugin.test.ts b/src/plugins/remark-enumerate-components/tests/plugin.test.ts index 2267dde55..18b1ad316 100644 --- a/src/plugins/remark-enumerate-components/tests/plugin.test.ts +++ b/src/plugins/remark-enumerate-components/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const alignLeft = (content: string) => { diff --git a/src/plugins/remark-flex-cards/plugin.ts b/src/plugins/remark-flex-cards/plugin.ts index 6f6959a43..fa651d385 100644 --- a/src/plugins/remark-flex-cards/plugin.ts +++ b/src/plugins/remark-flex-cards/plugin.ts @@ -1,8 +1,8 @@ -import type { Plugin, Transformer } from 'unified'; import { Node, Root } from 'mdast'; -import { transformer } from './transformer'; import { MdxJsxFlowElement } from 'mdast-util-mdx-jsx'; +import type { Plugin, Transformer } from 'unified'; import { toJsxAttribute } from '../helpers'; +import { transformer } from './transformer'; export type ContainerDirectiveName = 'cards' | 'flex'; export const DirectiveCard = 'cards' as const; diff --git a/src/plugins/remark-flex-cards/tests/plugin.test.ts b/src/plugins/remark-flex-cards/tests/plugin.test.ts index 8fe103eed..6381c77c1 100644 --- a/src/plugins/remark-flex-cards/tests/plugin.test.ts +++ b/src/plugins/remark-flex-cards/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const process = async (content: string) => { diff --git a/src/plugins/remark-flex-cards/transformer.ts b/src/plugins/remark-flex-cards/transformer.ts index f248e7ae0..918802b04 100644 --- a/src/plugins/remark-flex-cards/transformer.ts +++ b/src/plugins/remark-flex-cards/transformer.ts @@ -1,10 +1,10 @@ -import { visit, SKIP } from 'unist-util-visit'; -import { Node, BlockContent, Image, Paragraph, Parent, PhrasingContent, Root, RootContent } from 'mdast'; -import type { MdxJsxFlowElement } from 'mdast-util-mdx'; +import _ from 'es-toolkit/compat'; +import { BlockContent, Image, Node, Paragraph, Parent, PhrasingContent, Root, RootContent } from 'mdast'; import { LeafDirective } from 'mdast-util-directive'; +import type { MdxJsxFlowElement } from 'mdast-util-mdx'; +import { SKIP, visit } from 'unist-util-visit'; import { Options, toJsxAttribute, transformAttributes } from '../helpers'; import { ContainerDirectiveName, DirectiveBreak, DirectiveCard, DirectiveFlex } from './plugin'; -import _ from 'es-toolkit/compat'; const MIN_WIDTH = '50px'; const configureFlexOptions = (options: Options, mergeWith?: Partial) => { diff --git a/src/plugins/remark-images/plugin.ts b/src/plugins/remark-images/plugin.ts index f68965842..7cc959314 100644 --- a/src/plugins/remark-images/plugin.ts +++ b/src/plugins/remark-images/plugin.ts @@ -1,10 +1,10 @@ -import type { Plugin, Transformer } from 'unified'; -import type { MdxJsxAttribute, MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; +import clsx from 'clsx'; +import { promises as fs } from 'fs'; import { Image, Parent, PhrasingContent, Root } from 'mdast'; +import type { MdxJsxAttribute, MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; import path from 'path'; -import { promises as fs } from 'fs'; +import type { Plugin, Transformer } from 'unified'; import { toJsxAttribute } from '../helpers'; -import clsx from 'clsx'; import { transformer } from './transformer'; const DEFAULT_TAG_NAMES = { diff --git a/src/plugins/remark-images/tests/plugin.test.ts b/src/plugins/remark-images/tests/plugin.test.ts index 84c8ca43b..5baceef66 100644 --- a/src/plugins/remark-images/tests/plugin.test.ts +++ b/src/plugins/remark-images/tests/plugin.test.ts @@ -1,14 +1,14 @@ -import { visit } from 'unist-util-visit'; +import { Parent } from 'mdast'; import type { MdxJsxTextElement } from 'mdast-util-mdx'; +import path from 'node:path'; +import { fileURLToPath } from 'node:url'; import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; +import { visit } from 'unist-util-visit'; +import { VFile } from 'vfile'; import { describe, expect, it } from 'vitest'; -import { fileURLToPath } from 'node:url'; import { CaptionVisitor } from '../plugin'; -import { VFile } from 'vfile'; -import { Parent } from 'mdast'; -import path from 'node:path'; const __filename = fileURLToPath(import.meta.url); diff --git a/src/plugins/remark-images/transformer.ts b/src/plugins/remark-images/transformer.ts index 810d8f4ff..2fa5dc5e9 100644 --- a/src/plugins/remark-images/transformer.ts +++ b/src/plugins/remark-images/transformer.ts @@ -1,6 +1,6 @@ -import { visit, SKIP, CONTINUE } from 'unist-util-visit'; -import type { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; import { BlockContent, Image, Parent, PhrasingContent, Root, RootContent } from 'mdast'; +import type { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx'; +import { CONTINUE, SKIP, visit } from 'unist-util-visit'; import { cleanedText, ParsedOptions, parseOptions } from '../helpers'; const trimText = (nodes: PhrasingContent[], location: 'start' | 'end') => { diff --git a/src/plugins/remark-kbd/plugin.ts b/src/plugins/remark-kbd/plugin.ts index 2922da42b..b298d20fd 100644 --- a/src/plugins/remark-kbd/plugin.ts +++ b/src/plugins/remark-kbd/plugin.ts @@ -1,7 +1,7 @@ -import { visit, CONTINUE, SKIP } from 'unist-util-visit'; -import type { Plugin, Transformer } from 'unified'; -import type { MdxJsxAttribute, MdxJsxTextElement } from 'mdast-util-mdx'; import { Parent, PhrasingContent, Root, RootContent, Text } from 'mdast'; +import type { MdxJsxTextElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; +import { CONTINUE, SKIP, visit } from 'unist-util-visit'; import { toJsxAttribute } from '../helpers'; type ActionStates = 'SPLIT_BRACKETS' | 'CREATE_KBD'; diff --git a/src/plugins/remark-kbd/tests/plugin.test.ts b/src/plugins/remark-kbd/tests/plugin.test.ts index c5f96def2..c119c582a 100644 --- a/src/plugins/remark-kbd/tests/plugin.test.ts +++ b/src/plugins/remark-kbd/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const process = async (content: string) => { diff --git a/src/plugins/remark-link-annotation/plugin.ts b/src/plugins/remark-link-annotation/plugin.ts index e33680d64..406c5d554 100644 --- a/src/plugins/remark-link-annotation/plugin.ts +++ b/src/plugins/remark-link-annotation/plugin.ts @@ -1,6 +1,6 @@ -import { visit } from 'unist-util-visit'; -import type { Plugin, Transformer } from 'unified'; import { Root, Text } from 'mdast'; +import type { Plugin, Transformer } from 'unified'; +import { visit } from 'unist-util-visit'; interface OptionsInput { prefix?: string | null; diff --git a/src/plugins/remark-link-annotation/tests/plugin.test.ts b/src/plugins/remark-link-annotation/tests/plugin.test.ts index f2a1e2492..896c6a3be 100644 --- a/src/plugins/remark-link-annotation/tests/plugin.test.ts +++ b/src/plugins/remark-link-annotation/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const process = async (content: string, config: { prefix?: string | null; postfix?: string | null } = {}) => { diff --git a/src/plugins/remark-mdi/plugin.ts b/src/plugins/remark-mdi/plugin.ts index 7cb83bfcf..0ca5ca499 100644 --- a/src/plugins/remark-mdi/plugin.ts +++ b/src/plugins/remark-mdi/plugin.ts @@ -1,9 +1,9 @@ -import { visit } from 'unist-util-visit'; +import _ from 'es-toolkit/compat'; +import { Root, Text } from 'mdast'; +import type { MdxjsEsm, MdxJsxTextElement } from 'mdast-util-mdx'; import type { Plugin, Transformer } from 'unified'; -import type { MdxJsxTextElement, MdxjsEsm } from 'mdast-util-mdx'; +import { visit } from 'unist-util-visit'; import { camelCased, captialize, Options, toJsxAttribute, transformAttributes } from '../helpers'; -import { Root, Text } from 'mdast'; -import _ from 'es-toolkit/compat'; // const MDI_PROPS = [ // { diff --git a/src/plugins/remark-mdi/tests/plugin.test.ts b/src/plugins/remark-mdi/tests/plugin.test.ts index d885df988..212718950 100644 --- a/src/plugins/remark-mdi/tests/plugin.test.ts +++ b/src/plugins/remark-mdi/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const process = async (content: string) => { diff --git a/src/plugins/remark-media/plugin.ts b/src/plugins/remark-media/plugin.ts index eb3bbb328..a01cf638e 100644 --- a/src/plugins/remark-media/plugin.ts +++ b/src/plugins/remark-media/plugin.ts @@ -1,8 +1,8 @@ -import { visit } from 'unist-util-visit'; -import type { Plugin, Transformer } from 'unified'; +import { Link, Root, Text } from 'mdast'; import type { MdxJsxFlowElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; +import { visit } from 'unist-util-visit'; import { requireDefaultMdastNode, toJsxAttribute, transformAttributes } from '../helpers'; -import { Link, Root, Text } from 'mdast'; export enum LeafDirectiveName { VIDEO = 'video', diff --git a/src/plugins/remark-media/tests/plugin.test.ts b/src/plugins/remark-media/tests/plugin.test.ts index 0e89fccda..966a17259 100644 --- a/src/plugins/remark-media/tests/plugin.test.ts +++ b/src/plugins/remark-media/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const alignLeft = (content: string) => { diff --git a/src/plugins/remark-page/plugin.ts b/src/plugins/remark-page/plugin.ts index 18d797035..88247a689 100644 --- a/src/plugins/remark-page/plugin.ts +++ b/src/plugins/remark-page/plugin.ts @@ -1,6 +1,6 @@ -import type { Plugin, Transformer } from 'unified'; -import type { MdxJsxFlowElement } from 'mdast-util-mdx'; import type { Root } from 'mdast'; +import type { MdxJsxFlowElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; import { toJsxAttribute } from '../helpers'; /** diff --git a/src/plugins/remark-page/tests/plugin.test.ts b/src/plugins/remark-page/tests/plugin.test.ts index b9c48f284..216a5fd65 100644 --- a/src/plugins/remark-page/tests/plugin.test.ts +++ b/src/plugins/remark-page/tests/plugin.test.ts @@ -1,8 +1,8 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; -import { describe, expect, it } from 'vitest'; +import remarkMdx from 'remark-mdx'; import { VFile } from 'vfile'; +import { describe, expect, it } from 'vitest'; const alignLeft = (content: string) => { return content diff --git a/src/plugins/remark-strong/plugin.ts b/src/plugins/remark-strong/plugin.ts index 316a77a6f..789d49db1 100644 --- a/src/plugins/remark-strong/plugin.ts +++ b/src/plugins/remark-strong/plugin.ts @@ -1,7 +1,7 @@ -import { visit } from 'unist-util-visit'; -import type { Plugin, Transformer } from 'unified'; -import type { MdxJsxTextElement } from 'mdast-util-mdx'; import type { Parent, PhrasingContent, Root, RootContent } from 'mdast'; +import type { MdxJsxTextElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; +import { visit } from 'unist-util-visit'; interface OptionsInput { tagName?: string; diff --git a/src/plugins/remark-strong/tests/plugin.test.ts b/src/plugins/remark-strong/tests/plugin.test.ts index c02eea591..d055a258a 100644 --- a/src/plugins/remark-strong/tests/plugin.test.ts +++ b/src/plugins/remark-strong/tests/plugin.test.ts @@ -1,6 +1,6 @@ import { remark } from 'remark'; -import remarkMdx from 'remark-mdx'; import remarkDirective from 'remark-directive'; +import remarkMdx from 'remark-mdx'; import { describe, expect, it } from 'vitest'; const alignLeft = (content: string) => { diff --git a/src/plugins/remark-transform-assessable-components/plugin.ts b/src/plugins/remark-transform-assessable-components/plugin.ts index fab136ae2..fb65edf2c 100644 --- a/src/plugins/remark-transform-assessable-components/plugin.ts +++ b/src/plugins/remark-transform-assessable-components/plugin.ts @@ -1,7 +1,7 @@ -import { visit } from 'unist-util-visit'; -import type { Plugin, Transformer } from 'unified'; -import type { Root, BlockContent, DefinitionContent } from 'mdast'; +import type { BlockContent, DefinitionContent, Root } from 'mdast'; import type { MdxJsxAttribute, MdxJsxExpressionAttribute, MdxJsxFlowElement } from 'mdast-util-mdx'; +import type { Plugin, Transformer } from 'unified'; +import { visit } from 'unist-util-visit'; import { toJsxAttribute, toMdxJsxExpressionAttribute } from '../helpers'; type FlowChildren = (BlockContent | DefinitionContent)[]; diff --git a/src/plugins/remark-transform-assessable-components/tests/plugin.test.ts b/src/plugins/remark-transform-assessable-components/tests/plugin.test.ts index 01f96088f..ff771a32d 100644 --- a/src/plugins/remark-transform-assessable-components/tests/plugin.test.ts +++ b/src/plugins/remark-transform-assessable-components/tests/plugin.test.ts @@ -1,10 +1,10 @@ +import { promises as fs } from 'fs'; +import path from 'path'; import { remark } from 'remark'; import remarkMdx from 'remark-mdx'; -import { VFile } from 'vfile'; import { fileURLToPath } from 'url'; +import { VFile } from 'vfile'; import { afterEach, describe, expect, it } from 'vitest'; -import path from 'path'; -import { promises as fs } from 'fs'; const __filename = fileURLToPath(import.meta.url); diff --git a/src/siteConfig/helpers.ts b/src/siteConfig/helpers.ts index b9793302b..4327f2385 100644 --- a/src/siteConfig/helpers.ts +++ b/src/siteConfig/helpers.ts @@ -1,6 +1,6 @@ import { createFileSync, readdirSync } from 'fs-extra'; -import { SiteConfig } from './siteConfig'; import path from 'path'; +import { SiteConfig } from './siteConfig'; const CWD = process.cwd(); export const DEFAULT_TDEV_NAME = 'tdev'; const DEFAULT_FILE_NAME = { diff --git a/src/siteConfig/markdownPluginConfigs.ts b/src/siteConfig/markdownPluginConfigs.ts index 3726ef0d3..d17cc8795 100644 --- a/src/siteConfig/markdownPluginConfigs.ts +++ b/src/siteConfig/markdownPluginConfigs.ts @@ -1,30 +1,30 @@ +import pageIndexPlugin, { + type PluginOptions as PageIndexPluginOptions +} from '@tdev/page-index/remark-plugin'; +import graphvizPlugin from '@tdev/remark-graphviz/remark-plugin'; +import pdfPlugin from '@tdev/remark-pdf/remark-plugin'; +import fs from 'fs'; import type { Code, Node } from 'mdast'; import type { LeafDirective } from 'mdast-util-directive'; -import strongPlugin, { transformer as captionVisitor } from '../plugins/remark-strong/plugin'; -import deflistPlugin from '../plugins/remark-deflist/plugin'; -import mdiPlugin from '../plugins/remark-mdi/plugin'; -import kbdPlugin from '../plugins/remark-kbd/plugin'; -import remarkMath from 'remark-math'; +import path from 'path'; import rehypeKatex from 'rehype-katex'; +import remarkMath from 'remark-math'; +import { getAnswerDocumentType } from '../components/Answer/helper.answer'; +import codeAsAttributePlugin from '../plugins/remark-code-as-attribute/plugin'; import defboxPlugin from '../plugins/remark-code-defbox/plugin'; +import commentPlugin from '../plugins/remark-comments/plugin'; +import deflistPlugin from '../plugins/remark-deflist/plugin'; +import detailsPlugin from '../plugins/remark-details/plugin'; +import enumerateAnswersPlugin from '../plugins/remark-enumerate-components/plugin'; import flexCardsPlugin from '../plugins/remark-flex-cards/plugin'; import imagePlugin, { CaptionVisitor } from '../plugins/remark-images/plugin'; +import kbdPlugin from '../plugins/remark-kbd/plugin'; import linkAnnotationPlugin from '../plugins/remark-link-annotation/plugin'; +import mdiPlugin from '../plugins/remark-mdi/plugin'; import mediaPlugin from '../plugins/remark-media/plugin'; -import detailsPlugin from '../plugins/remark-details/plugin'; import pagePlugin from '../plugins/remark-page/plugin'; -import pageIndexPlugin, { - type PluginOptions as PageIndexPluginOptions -} from '@tdev/page-index/remark-plugin'; -import graphvizPlugin from '@tdev/remark-graphviz/remark-plugin'; -import pdfPlugin from '@tdev/remark-pdf/remark-plugin'; -import codeAsAttributePlugin from '../plugins/remark-code-as-attribute/plugin'; -import commentPlugin from '../plugins/remark-comments/plugin'; -import enumerateAnswersPlugin from '../plugins/remark-enumerate-components/plugin'; +import strongPlugin, { transformer as captionVisitor } from '../plugins/remark-strong/plugin'; import transformAssessableComponentsPlugin from '../plugins/remark-transform-assessable-components/plugin'; -import { getAnswerDocumentType } from '../components/Answer/helper.answer'; -import fs from 'fs'; -import path from 'path'; export const flexCardsPluginConfig = [ flexCardsPlugin, diff --git a/src/siteConfig/pluginConfigs.ts b/src/siteConfig/pluginConfigs.ts index d66cfad9e..9b2c9e67f 100644 --- a/src/siteConfig/pluginConfigs.ts +++ b/src/siteConfig/pluginConfigs.ts @@ -1,8 +1,8 @@ -import dynamicRouterPlugin, { Config as DynamicRouteConfig } from '../plugins/plugin-dynamic-routes'; -import stackblitzRspackTarget from '../plugins/plugin-stackblitz-rspack-target'; -import aliasConfigurationPlugin from '../plugins/plugin-alias-configuration'; import type { PluginConfig } from '@docusaurus/types'; import { sentryWebpackPlugin } from '@sentry/webpack-plugin'; +import aliasConfigurationPlugin from '../plugins/plugin-alias-configuration'; +import dynamicRouterPlugin, { Config as DynamicRouteConfig } from '../plugins/plugin-dynamic-routes'; +import stackblitzRspackTarget from '../plugins/plugin-stackblitz-rspack-target'; import { SiteConfig } from './siteConfig'; // TODO: Consider bundling default / recommended plugins. diff --git a/src/siteConfig/siteConfig.d.ts b/src/siteConfig/siteConfig.d.ts index ea68ca6ec..e6511e652 100644 --- a/src/siteConfig/siteConfig.d.ts +++ b/src/siteConfig/siteConfig.d.ts @@ -2,10 +2,10 @@ import { FooterLinkItem, NavbarItem } from '@docusaurus/theme-common'; import type { PluginConfig, PluginOptions, RouteConfig } from '@docusaurus/types'; import { ConfigTransformer } from './transformers'; -import type { DeepPartial } from 'utility-types'; -import type { Options as DocsPluginOptions } from '@docusaurus/plugin-content-docs'; import type { Options as BlogPluginOptions } from '@docusaurus/plugin-content-blog'; +import type { Options as DocsPluginOptions } from '@docusaurus/plugin-content-docs'; import type { Options as PagesPluginOptions } from '@docusaurus/plugin-content-pages'; +import type { DeepPartial } from 'utility-types'; export type ShowEditThisPage = 'always' | 'never' | 'loggedIn' | 'teachers' | 'admins'; export type EditThisPageOption = 'github' | 'github-dev' | 'cms'; diff --git a/src/siteConfig/tests/transformers.test.ts b/src/siteConfig/tests/transformers.test.ts index 729a012e5..2d6529948 100644 --- a/src/siteConfig/tests/transformers.test.ts +++ b/src/siteConfig/tests/transformers.test.ts @@ -1,6 +1,6 @@ +import { Config } from '@docusaurus/types'; import { describe, expect, it } from 'vitest'; import { applyTransformers, ConfigTransformers } from '../transformers'; -import { Config } from '@docusaurus/types'; describe('applyTransformers', () => { it('appends a key to an empty config', () => { diff --git a/src/siteConfig/withSiteConfig.ts b/src/siteConfig/withSiteConfig.ts index 7885bd33b..c93d8de08 100644 --- a/src/siteConfig/withSiteConfig.ts +++ b/src/siteConfig/withSiteConfig.ts @@ -1,5 +1,5 @@ -import type { SiteConfig } from './siteConfig'; import path from 'path'; +import type { SiteConfig } from './siteConfig'; export const withSiteConfig = async (): Promise => { if (process.env.SITE_CONFIG_PATH) { diff --git a/src/stores/AdminStore.ts b/src/stores/AdminStore.ts index 5a168e135..dd642bbd5 100644 --- a/src/stores/AdminStore.ts +++ b/src/stores/AdminStore.ts @@ -1,19 +1,18 @@ -import { action, observable } from 'mobx'; -import { RootStore } from '@tdev-stores/rootStore'; -import _ from 'es-toolkit/compat'; -import iStore from '@tdev-stores/iStore'; import { AllowedAction, allowedActions as apiAllowedActions, - deleteAllowedAction as apiDeleteAllowedAction, createAllowedAction as apiCreateAllowedAction, + deleteAllowedAction as apiDeleteAllowedAction, + exportUserData, linkUserPassword, - revokeUserPassword, - exportUserData + revokeUserPassword } from '@tdev-api/admin'; import { DocumentType } from '@tdev-api/document'; +import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; import { authClient } from '@tdev/auth-client'; import { HttpStatusCode } from 'axios'; +import { action, observable } from 'mobx'; export class AdminStore extends iStore< `set-user-pw-${string}` | `revoke-user-pw-${string}` | `request-user-data-export-${string}` diff --git a/src/stores/AuthStore.ts b/src/stores/AuthStore.ts index 5577d0eee..66b05dd20 100644 --- a/src/stores/AuthStore.ts +++ b/src/stores/AuthStore.ts @@ -1,8 +1,7 @@ +import customFields from '@tdev-components/utils/customFields'; import { action, observable } from 'mobx'; -import _ from 'es-toolkit/compat'; -import type { RootStore } from './rootStore'; import { authClient } from '../auth-client'; -import customFields from '@tdev-components/utils/customFields'; +import type { RootStore } from './rootStore'; const { APP_URL } = customFields; export class AuthStore { diff --git a/src/stores/ComponentStore.ts b/src/stores/ComponentStore.ts index 0e440abab..236d449a0 100644 --- a/src/stores/ComponentStore.ts +++ b/src/stores/ComponentStore.ts @@ -1,23 +1,23 @@ -import { CodeMeta } from '@tdev-models/documents/Code'; -import { RootStore } from './rootStore'; import { type CodeType, - type DocumentType, - TypeModelMapping, type ContainerType, type ContainerTypeModelMapping, - TaskableType + type DocumentType, + TaskableType, + TypeModelMapping } from '@tdev-api/document'; +import { TypeMeta } from '@tdev-models/DocumentRoot'; +import { ModelMeta as ChoiceMeta } from '@tdev-models/documents/Assessable/ChoiceAnswer'; +import { ModelMeta as QuizMeta } from '@tdev-models/documents/Assessable/Quiz'; +import { ModelMeta as TrueFalseMeta } from '@tdev-models/documents/Assessable/TrueFalseAnswer'; +import { CodeMeta } from '@tdev-models/documents/Code'; import { ContainerMeta } from '@tdev-models/documents/DynamicDocumentRoots/ContainerMeta'; import iCodeMeta, { MetaInit } from '@tdev-models/documents/iCode/iCodeMeta'; -import { computed } from 'mobx'; -import React from 'react'; -import { TypeMeta } from '@tdev-models/DocumentRoot'; import { ModelMeta as ProgressStateMeta } from '@tdev-models/documents/ProgressState'; import { TaskMeta as TaskStateMeta } from '@tdev-models/documents/TaskState'; -import { ModelMeta as QuizMeta } from '@tdev-models/documents/Assessable/Quiz'; -import { ModelMeta as ChoiceMeta } from '@tdev-models/documents/Assessable/ChoiceAnswer'; -import { ModelMeta as TrueFalseMeta } from '@tdev-models/documents/Assessable/TrueFalseAnswer'; +import { computed } from 'mobx'; +import React from 'react'; +import { RootStore } from './rootStore'; export type LiveCode = `live_${string}`; diff --git a/src/stores/DocumentRootStore.ts b/src/stores/DocumentRootStore.ts index 951320e65..56b841a7d 100644 --- a/src/stores/DocumentRootStore.ts +++ b/src/stores/DocumentRootStore.ts @@ -1,29 +1,29 @@ -import { action, computed, observable, runInAction, transaction } from 'mobx'; -import { RootStore } from '@tdev-stores/rootStore'; -import { computedFn } from 'mobx-utils'; -import DocumentRoot, { TypeMeta } from '@tdev-models/DocumentRoot'; +import { DocumentType } from '@tdev-api/document'; import { + DocumentRoot as ApiDocumentRoot, Config, - create as apiCreate, DocumentRootUpdate, + create as apiCreate, remove as apiDelete, findManyFor as apiFindManyFor, - update as apiUpdate, - DocumentRoot as ApiDocumentRoot + update as apiUpdate } from '@tdev-api/documentRoot'; -import iStore from '@tdev-stores/iStore'; +import DocumentRoot, { TypeMeta } from '@tdev-models/DocumentRoot'; import GroupPermission from '@tdev-models/GroupPermission'; -import UserPermission from '@tdev-models/UserPermission'; -import { DocumentType } from '@tdev-api/document'; -import _ from 'es-toolkit/compat'; import User from '@tdev-models/User'; -import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; +import UserPermission from '@tdev-models/UserPermission'; import { CodeMeta } from '@tdev-models/documents/Code'; import { ModelMeta as MdxCommentMeta } from '@tdev-models/documents/MdxComment'; +import { ModelMeta as QuillV2Meta } from '@tdev-models/documents/QuillV2'; import { ModelMeta as RestrictedMeta } from '@tdev-models/documents/Restricted'; import { ModelMeta as SolutionMeta } from '@tdev-models/documents/Solution'; import { ModelMeta as StringMeta } from '@tdev-models/documents/String'; -import { ModelMeta as QuillV2Meta } from '@tdev-models/documents/QuillV2'; +import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; +import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; +import _ from 'es-toolkit/compat'; +import { action, computed, observable, runInAction, transaction } from 'mobx'; +import { computedFn } from 'mobx-utils'; import { CmsTextMeta } from '@tdev-models/documents/CmsText'; import { UnknownMeta } from '@tdev-models/documents/Unknown'; diff --git a/src/stores/DocumentStore.ts b/src/stores/DocumentStore.ts index 9d3aa8ad8..c0477ef2d 100644 --- a/src/stores/DocumentStore.ts +++ b/src/stores/DocumentStore.ts @@ -1,45 +1,45 @@ -import { action, computed, observable } from 'mobx'; -import { RootStore } from './rootStore'; -import { computedFn } from 'mobx-utils'; import { + Access, + ADMIN_EDITABLE_DOCUMENTS, allDocuments as apiAllDocuments, create as apiCreate, - Document as DocumentProps, - DocumentType, - DocumentModelType, remove as apiDelete, - TypeModelMapping, - update as apiUpdate, - ADMIN_EDITABLE_DOCUMENTS, linkTo as apiLinkTo, + update as apiUpdate, + DocumentModelType, + Document as DocumentProps, + DocumentType, Factory, - Access + TypeModelMapping } from '@tdev-api/document'; -import iStore from '@tdev-stores/iStore'; -import axios from 'axios'; -import { v4 as uuidv4 } from 'uuid'; -import iDocument, { Source } from '@tdev-models/iDocument'; -import ScriptVersion from '@tdev-models/documents/ScriptVersion'; import { ChangedDocument } from '@tdev-api/IoEventTypes'; -import String from '@tdev-models/documents/String'; -import QuillV2 from '@tdev-models/documents/QuillV2'; -import Solution from '@tdev-models/documents/Solution'; -import { RWAccess } from '@tdev-models/helpers/accessPolicy'; +import DocumentRoot, { MetaHasher } from '@tdev-models/DocumentRoot'; +import ChoiceAnswer from '@tdev-models/documents/Assessable/ChoiceAnswer'; +import Quiz from '@tdev-models/documents/Assessable/Quiz'; +import TrueFalseAnswer from '@tdev-models/documents/Assessable/TrueFalseAnswer'; +import CmsText from '@tdev-models/documents/CmsText'; +import Code from '@tdev-models/documents/Code'; +import DynamicDocumentRoots from '@tdev-models/documents/DynamicDocumentRoots'; import Directory from '@tdev-models/documents/FileSystem/Directory'; import File from '@tdev-models/documents/FileSystem/File'; import MdxComment from '@tdev-models/documents/MdxComment'; -import Restricted from '@tdev-models/documents/Restricted'; -import CmsText from '@tdev-models/documents/CmsText'; -import DynamicDocumentRoots from '@tdev-models/documents/DynamicDocumentRoots'; import ProgressState from '@tdev-models/documents/ProgressState'; +import QuillV2 from '@tdev-models/documents/QuillV2'; +import Restricted from '@tdev-models/documents/Restricted'; +import ScriptVersion from '@tdev-models/documents/ScriptVersion'; +import Solution from '@tdev-models/documents/Solution'; +import String from '@tdev-models/documents/String'; import TaskState from '@tdev-models/documents/TaskState'; -import Code from '@tdev-models/documents/Code'; +import { RWAccess } from '@tdev-models/helpers/accessPolicy'; +import iDocument, { Source } from '@tdev-models/iDocument'; import StudentGroup from '@tdev-models/StudentGroup'; -import DocumentRoot, { MetaHasher } from '@tdev-models/DocumentRoot'; -import ChoiceAnswer from '@tdev-models/documents/Assessable/ChoiceAnswer'; -import TrueFalseAnswer from '@tdev-models/documents/Assessable/TrueFalseAnswer'; -import Quiz from '@tdev-models/documents/Assessable/Quiz'; +import iStore from '@tdev-stores/iStore'; import { isStalledUpdate } from '@tdev/helpers/isStalledUpdate'; +import axios from 'axios'; +import { action, computed, observable } from 'mobx'; +import { computedFn } from 'mobx-utils'; +import { v4 as uuidv4 } from 'uuid'; +import { RootStore } from './rootStore'; const IsNotUniqueError = (error: any) => { try { diff --git a/src/stores/PageStore.ts b/src/stores/PageStore.ts index 9a65174e4..23c7590ca 100644 --- a/src/stores/PageStore.ts +++ b/src/stores/PageStore.ts @@ -1,14 +1,14 @@ -import { action, computed, observable, reaction, transaction, observableRef } from 'mobx'; -import iStore from '@tdev-stores/iStore'; -import { RootStore } from '@tdev-stores/rootStore'; -import Page from '@tdev-models/Page'; -import { computedFn } from 'mobx-utils'; -import { allDocuments as apiAllDocuments, DocumentType } from '@tdev-api/document'; import type { GlobalPluginData } from '@docusaurus/plugin-content-docs/client'; import siteConfig from '@generated/docusaurus.config'; +import globalData from '@generated/globalData'; +import { allDocuments as apiAllDocuments, DocumentType } from '@tdev-api/document'; +import Page from '@tdev-models/Page'; +import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; import { PageIndex } from '@tdev/page-index'; import { groupBy } from 'es-toolkit/array'; -import globalData from '@generated/globalData'; +import { action, computed, observable, observableRef, reaction, transaction } from 'mobx'; +import { computedFn } from 'mobx-utils'; const ensureTrailingSlash = (str: string) => { return str.endsWith('/') ? str : `${str}/`; }; diff --git a/src/stores/PermissionStore.ts b/src/stores/PermissionStore.ts index 4f7b9c0af..f2dea56a3 100644 --- a/src/stores/PermissionStore.ts +++ b/src/stores/PermissionStore.ts @@ -1,26 +1,26 @@ -import { action, observable } from 'mobx'; -import { RootStore } from '@tdev-stores/rootStore'; -import { computedFn } from 'mobx-utils'; -import UserPermission from '@tdev-models/UserPermission'; -import GroupPermission from '@tdev-models/GroupPermission'; -import iStore from '@tdev-stores/iStore'; +import { Access } from '@tdev-api/document'; import { GroupPermission as GroupPermissionProps, UserPermission as UserPermissionProps, + documentRootPermissions as apiDocumentRootPermissions, createGroupPermission as createGroupPermissionApi, createUserPermission as createUserPermissionApi, - updateGroupPermission as updateGroupPermissionApi, - updateUserPermission as updateUserPermissionApi, - deleteUserPermission as deleteUserPermissionApi, deleteGroupPermission as deleteGroupPermissionApi, - documentRootPermissions as apiDocumentRootPermissions + deleteUserPermission as deleteUserPermissionApi, + updateGroupPermission as updateGroupPermissionApi, + updateUserPermission as updateUserPermissionApi } from '@tdev-api/permission'; -import User from '@tdev-models/User'; -import { Access } from '@tdev-api/document'; -import StudentGroup from '@tdev-models/StudentGroup'; -import { AccessLevels, NoneAccess } from '@tdev-models/helpers/accessPolicy'; import DocumentRoot from '@tdev-models/DocumentRoot'; +import GroupPermission from '@tdev-models/GroupPermission'; +import StudentGroup from '@tdev-models/StudentGroup'; +import User from '@tdev-models/User'; +import UserPermission from '@tdev-models/UserPermission'; import { UnknownMeta } from '@tdev-models/documents/Unknown'; +import { AccessLevels, NoneAccess } from '@tdev-models/helpers/accessPolicy'; +import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; +import { action, observable } from 'mobx'; +import { computedFn } from 'mobx-utils'; class PermissionStore extends iStore<`update-${string}`> { readonly root: RootStore; diff --git a/src/stores/SessionStore.ts b/src/stores/SessionStore.ts index 6c9e846b2..b8cb21081 100644 --- a/src/stores/SessionStore.ts +++ b/src/stores/SessionStore.ts @@ -1,10 +1,10 @@ -import { action, observable } from 'mobx'; -import { RootStore } from '@tdev-stores/rootStore'; -import iStore from '@tdev-stores/iStore'; -import api from '@tdev-api/base'; import { mdiContentSaveOffOutline, mdiDatabaseSyncOutline, mdiHarddisk } from '@mdi/js'; +import api from '@tdev-api/base'; +import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; +import { action, observable } from 'mobx'; -export class SessionStore extends iStore<'checkLogin'> { +export class SessionStore extends iStore { readonly root: RootStore; @observable accessor initialized = false; diff --git a/src/stores/SocketDataStore.ts b/src/stores/SocketDataStore.ts index 16d77f679..a23b82e05 100644 --- a/src/stores/SocketDataStore.ts +++ b/src/stores/SocketDataStore.ts @@ -1,8 +1,18 @@ -import { RootStore } from '@tdev-stores/rootStore'; -import { io, Socket } from 'socket.io-client'; -import { action, observable, reaction, observableRef } from 'mobx'; import { default as api } from '@tdev-api/base'; +import { CmsSettings } from '@tdev-api/cms'; +import { DocumentRoot, DocumentRootUpdate } from '@tdev-api/documentRoot'; +import { GroupPermission, UserPermission } from '@tdev-api/permission'; +import { StudentGroup as ApiStudentGroup } from '@tdev-api/studentGroup'; +import { User } from '@tdev-api/user'; +import customFields from '@tdev-components/utils/customFields'; +import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; +import StudentGroup from '@tdev-models/StudentGroup'; import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; +import { authClient } from '@tdev/auth-client'; +import { action, observable, observableRef, reaction } from 'mobx'; +import { io, Socket } from 'socket.io-client'; +import { Document, DocumentType, type ViewStoreTypeMapping } from '../api/document'; import { Action, ChangedDocument, @@ -17,16 +27,6 @@ import { ServerToClientEvents, StreamedDynamicDocument } from '../api/IoEventTypes'; -import { DocumentRoot, DocumentRootUpdate } from '@tdev-api/documentRoot'; -import { GroupPermission, UserPermission } from '@tdev-api/permission'; -import { Document, DocumentType, type ViewStoreTypeMapping } from '../api/document'; -import { NoneAccess } from '@tdev-models/helpers/accessPolicy'; -import { CmsSettings } from '@tdev-api/cms'; -import { StudentGroup as ApiStudentGroup } from '@tdev-api/studentGroup'; -import StudentGroup from '@tdev-models/StudentGroup'; -import { authClient } from '@tdev/auth-client'; -import { User } from '@tdev-api/user'; -import customFields from '@tdev-components/utils/customFields'; const { OFFLINE_API, BACKEND_URL } = customFields; type TypedSocket = Socket; /** diff --git a/src/stores/StudentGroupStore.ts b/src/stores/StudentGroupStore.ts index 529be53ed..b292aa43e 100644 --- a/src/stores/StudentGroupStore.ts +++ b/src/stores/StudentGroupStore.ts @@ -1,20 +1,20 @@ -import { action, computed, observable } from 'mobx'; -import { RootStore } from '@tdev-stores/rootStore'; -import { computedFn } from 'mobx-utils'; import StudentGroup from '@tdev-models/StudentGroup'; import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; +import { orderBy } from 'es-toolkit/array'; +import { action, computed, observable } from 'mobx'; +import { computedFn } from 'mobx-utils'; import { - create as apiCreate, - all as apiAll, - update as apiUpdate, addUser as apiAddUser, - removeUser as apiRemoveUser, + all as apiAll, + create as apiCreate, destroy as apiDestroy, + removeUser as apiRemoveUser, setAdminRole as apiSetAdminRole, - StudentGroup as ApiStudentGroup + StudentGroup as ApiStudentGroup, + update as apiUpdate } from '../api/studentGroup'; import User from '../models/User'; -import { orderBy } from 'es-toolkit/array'; const NEEDS_REPLACEMENT_KEYS: (keyof ApiStudentGroup)[] = ['name', 'description']; diff --git a/src/stores/UserStore.ts b/src/stores/UserStore.ts index 9aaa00884..b2a71b546 100644 --- a/src/stores/UserStore.ts +++ b/src/stores/UserStore.ts @@ -1,12 +1,12 @@ -import { action, computed, observable } from 'mobx'; -import { User as UserProps, all as apiAll, currentUser, update as apiUpdate, Role } from '@tdev-api/user'; -import { RootStore } from '@tdev-stores/rootStore'; +import { all as apiAll, update as apiUpdate, currentUser, User as UserProps } from '@tdev-api/user'; +import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; import User from '@tdev-models/User'; -import _ from 'es-toolkit/compat'; +import iStore from '@tdev-stores/iStore'; +import { RootStore } from '@tdev-stores/rootStore'; import Storage, { PersistedData } from '@tdev-stores/utils/Storage'; +import _ from 'es-toolkit/compat'; +import { action, computed, observable } from 'mobx'; import { computedFn } from 'mobx-utils'; -import iStore from '@tdev-stores/iStore'; -import scheduleMicrotask from '@tdev-components/utils/scheduleMicrotask'; export class UserStore extends iStore<`update-${string}`> { readonly root: RootStore; diff --git a/src/stores/ViewStores/index.ts b/src/stores/ViewStores/index.ts index e3a8811e4..ce7e1e1ca 100644 --- a/src/stores/ViewStores/index.ts +++ b/src/stores/ViewStores/index.ts @@ -1,8 +1,8 @@ -import { ViewStoreType, ViewStore as ViewStores, ViewStoreTypeMapping } from '@tdev-api/document'; +import { ViewStore as ViewStores, ViewStoreType, ViewStoreTypeMapping } from '@tdev-api/document'; import { RootStore } from '@tdev-stores/rootStore'; import { action, computed, observable, observableRef } from 'mobx'; -import { PermissionsControlView } from './PermissionsControlView'; import { AdminView } from './AdminView'; +import { PermissionsControlView } from './PermissionsControlView'; export interface ViewStoreProps { store: ViewStoreTypeMapping[T]; diff --git a/src/stores/iStore.ts b/src/stores/iStore.ts index 059d94011..0ccc41c52 100644 --- a/src/stores/iStore.ts +++ b/src/stores/iStore.ts @@ -1,7 +1,7 @@ +import { RootStore } from '@tdev-stores/rootStore'; +import axios from 'axios'; import { action, observable } from 'mobx'; import { computedFn } from 'mobx-utils'; -import axios from 'axios'; -import { RootStore } from '@tdev-stores/rootStore'; export type ApiAction = `load` | `create-${string}` | `load-${string}` | `save-${string}` | `destroy-${string}`; diff --git a/src/stores/rootStore.ts b/src/stores/rootStore.ts index 9a0b5fb02..a34ff1fb1 100644 --- a/src/stores/rootStore.ts +++ b/src/stores/rootStore.ts @@ -1,15 +1,15 @@ -import React from 'react'; +import { AdminStore } from '@tdev-stores/AdminStore'; import { DocumentRootStore } from '@tdev-stores/DocumentRootStore'; -import { UserStore } from '@tdev-stores/UserStore'; -import { SessionStore } from '@tdev-stores/SessionStore'; -import { SocketDataStore } from '@tdev-stores/SocketDataStore'; -import { action } from 'mobx'; -import { StudentGroupStore } from '@tdev-stores/StudentGroupStore'; -import PermissionStore from '@tdev-stores/PermissionStore'; import DocumentStore from '@tdev-stores/DocumentStore'; import { PageStore } from '@tdev-stores/PageStore'; -import { AdminStore } from '@tdev-stores/AdminStore'; +import PermissionStore from '@tdev-stores/PermissionStore'; +import { SessionStore } from '@tdev-stores/SessionStore'; import SiteStore from '@tdev-stores/SiteStore'; +import { SocketDataStore } from '@tdev-stores/SocketDataStore'; +import { StudentGroupStore } from '@tdev-stores/StudentGroupStore'; +import { UserStore } from '@tdev-stores/UserStore'; +import { action } from 'mobx'; +import React from 'react'; import { AuthStore } from './AuthStore'; import ComponentStore from './ComponentStore'; import ViewStore from './ViewStores'; diff --git a/src/stores/utils/SessionStorage.ts b/src/stores/utils/SessionStorage.ts index 79eb62a1e..3a4c71416 100644 --- a/src/stores/utils/SessionStorage.ts +++ b/src/stores/utils/SessionStorage.ts @@ -1,7 +1,7 @@ +import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; import siteConfig from '@generated/docusaurus.config'; import _ from 'es-toolkit/compat'; import MemoryStorage from './MemoryStorage'; -import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; const getStorageKey = (key: string) => { return _.upperFirst(_.camelCase(`${key}${siteConfig.projectName || ''}`)); diff --git a/src/stores/utils/Storage.ts b/src/stores/utils/Storage.ts index caad20499..6ef97fa5f 100644 --- a/src/stores/utils/Storage.ts +++ b/src/stores/utils/Storage.ts @@ -1,8 +1,8 @@ -import { User } from '@tdev-api/user'; +import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; import siteConfig from '@generated/docusaurus.config'; +import { User } from '@tdev-api/user'; import _ from 'es-toolkit/compat'; import MemoryStorage from './MemoryStorage'; -import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; export type PersistedData = { user?: User; diff --git a/src/theme/Admonition/Types.tsx b/src/theme/Admonition/Types.tsx index 50a9a974c..a4a7e23cb 100644 --- a/src/theme/Admonition/Types.tsx +++ b/src/theme/Admonition/Types.tsx @@ -1,10 +1,10 @@ -import React from 'react'; import DefaultAdmonitionTypes from '@theme-original/Admonition/Types'; -import AdmonitionLayout from '@theme/Admonition/Layout'; +import IconInfo from '@theme/Admonition/Icon/Info'; import IconNote from '@theme/Admonition/Icon/Note'; import IconTip from '@theme/Admonition/Icon/Tip'; -import IconInfo from '@theme/Admonition/Icon/Info'; +import AdmonitionLayout from '@theme/Admonition/Layout'; import clsx from 'clsx'; +import React from 'react'; import styles from './types.module.scss'; // function FindingIcon() { diff --git a/src/theme/AnnouncementBar/index.tsx b/src/theme/AnnouncementBar/index.tsx index 1bd05cfba..4b2c3b2ac 100644 --- a/src/theme/AnnouncementBar/index.tsx +++ b/src/theme/AnnouncementBar/index.tsx @@ -1,10 +1,10 @@ -import React, { type ReactNode } from 'react'; -import AnnouncementBar from '@theme-original/AnnouncementBar'; -import type AnnouncementBarType from '@theme/AnnouncementBar'; import type { WrapperProps } from '@docusaurus/types'; import PresentationModal from '@tdev-components/PresentationPanel/PresentationModal'; -import { observer } from 'mobx-react-lite'; import { useStore } from '@tdev-hooks/useStore'; +import AnnouncementBar from '@theme-original/AnnouncementBar'; +import type AnnouncementBarType from '@theme/AnnouncementBar'; +import { observer } from 'mobx-react-lite'; +import { type ReactNode } from 'react'; type Props = WrapperProps; diff --git a/src/theme/CodeBlock/index.tsx b/src/theme/CodeBlock/index.tsx index 3e775ca3f..6ff4a5714 100644 --- a/src/theme/CodeBlock/index.tsx +++ b/src/theme/CodeBlock/index.tsx @@ -1,10 +1,10 @@ -import React from 'react'; -import CodeBlock from '@theme-original/CodeBlock'; -import type CodeBlockType from '@theme/CodeBlock'; -import type { WrapperProps } from '@docusaurus/types'; import BrowserOnly from '@docusaurus/BrowserOnly'; +import type { WrapperProps } from '@docusaurus/types'; import { CodeEditor } from '@tdev-components/documents/CodeEditor'; import { LiveCode } from '@tdev-stores/ComponentStore'; +import CodeBlock from '@theme-original/CodeBlock'; +import type CodeBlockType from '@theme/CodeBlock'; +import React from 'react'; export interface MetaProps { id?: string; diff --git a/src/theme/DocSidebarItem/index.tsx b/src/theme/DocSidebarItem/index.tsx index 29c85cbe5..2dd8bc62d 100644 --- a/src/theme/DocSidebarItem/index.tsx +++ b/src/theme/DocSidebarItem/index.tsx @@ -1,12 +1,12 @@ -import React, { type ReactNode } from 'react'; -import DocSidebarItem from '@theme-original/DocSidebarItem'; -import type DocSidebarItemType from '@theme/DocSidebarItem'; import type { WrapperProps } from '@docusaurus/types'; -import { observer } from 'mobx-react-lite'; import { useStore } from '@tdev-hooks/useStore'; +import TaskableState from '@tdev/page-index/components/TaskableState'; +import DocSidebarItem from '@theme-original/DocSidebarItem'; +import type DocSidebarItemType from '@theme/DocSidebarItem'; import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import { type ReactNode } from 'react'; import styles from './styles.module.scss'; -import TaskableState from '@tdev/page-index/components/TaskableState'; const ensureTrailingSlash = (path?: string) => { if (!path) { return ''; diff --git a/src/theme/EditThisPage/index.tsx b/src/theme/EditThisPage/index.tsx index d581a6edd..9b3b383c3 100644 --- a/src/theme/EditThisPage/index.tsx +++ b/src/theme/EditThisPage/index.tsx @@ -1,17 +1,17 @@ -import React, { type ReactNode } from 'react'; -import { ThemeClassNames } from '@docusaurus/theme-common'; import Link from '@docusaurus/Link'; -import styles from './styles.module.scss'; +import { useLocation } from '@docusaurus/router'; +import { ThemeClassNames } from '@docusaurus/theme-common'; import siteConfig from '@generated/docusaurus.config'; -import type { Props } from '@theme/EditThisPage'; -import Icon from '@mdi/react'; import { mdiGithub, mdiInfinity, mdiMicrosoftVisualStudioCode } from '@mdi/js'; -import clsx from 'clsx'; -import { observer } from 'mobx-react-lite'; +import Icon from '@mdi/react'; +import customFields from '@tdev-components/utils/customFields'; import { useStore } from '@tdev-hooks/useStore'; -import { useLocation } from '@docusaurus/router'; import type { EditThisPageOption } from '@tdev/siteConfig/siteConfig'; -import customFields from '@tdev-components/utils/customFields'; +import type { Props } from '@theme/EditThisPage'; +import clsx from 'clsx'; +import { observer } from 'mobx-react-lite'; +import { type ReactNode } from 'react'; +import styles from './styles.module.scss'; const { organizationName, projectName } = siteConfig; const { showEditThisPage, showEditThisPageOptions, editThisPageCmsUrl } = customFields; const DisplayBadgeFor = new Set( diff --git a/src/theme/MDXComponents.tsx b/src/theme/MDXComponents.tsx index d4ee087a9..aec0dfe56 100644 --- a/src/theme/MDXComponents.tsx +++ b/src/theme/MDXComponents.tsx @@ -1,20 +1,20 @@ // Import the original mapper -import MDXComponents from '@theme-original/MDXComponents'; -import DefinitionList from '@tdev-components/DefinitionList'; -import Tabs from '@theme/Tabs'; -import TabItem from '@theme/TabItem'; +import Answer from '@tdev-components/Answer'; import DefBox from '@tdev-components/CodeDefBox'; -import DefHeading from '@tdev-components/CodeDefBox/DefHeading'; import DefContent from '@tdev-components/CodeDefBox/DefContent'; -import Figure from '@tdev-components/Figure'; -import String from '@tdev-components/documents/String'; -import SourceRef from '@tdev-components/Figure/SourceRef'; -import Answer from '@tdev-components/Answer'; -import Solution from '@tdev-components/documents/Solution'; +import DefHeading from '@tdev-components/CodeDefBox/DefHeading'; +import DefinitionList from '@tdev-components/DefinitionList'; import MdxComment from '@tdev-components/documents/MdxComment'; -import MdxPage from '@tdev-components/MdxPage'; import QuillV2 from '@tdev-components/documents/QuillV2'; +import Solution from '@tdev-components/documents/Solution'; +import String from '@tdev-components/documents/String'; import TaskState from '@tdev-components/documents/TaskState'; +import Figure from '@tdev-components/Figure'; +import SourceRef from '@tdev-components/Figure/SourceRef'; +import MdxPage from '@tdev-components/MdxPage'; +import MDXComponents from '@theme-original/MDXComponents'; +import TabItem from '@theme/TabItem'; +import Tabs from '@theme/Tabs'; export default { // Re-use the default mapping diff --git a/src/theme/NavbarItem/ComponentTypes.tsx b/src/theme/NavbarItem/ComponentTypes.tsx index 99976a4b9..d0b8f4ce3 100644 --- a/src/theme/NavbarItem/ComponentTypes.tsx +++ b/src/theme/NavbarItem/ComponentTypes.tsx @@ -1,20 +1,20 @@ import DefaultNavbarItem from '@theme/NavbarItem/DefaultNavbarItem'; -import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem'; -import LocaleDropdownNavbarItem from '@theme/NavbarItem/LocaleDropdownNavbarItem'; -import SearchNavbarItem from '@theme/NavbarItem/SearchNavbarItem'; -import HtmlNavbarItem from '@theme/NavbarItem/HtmlNavbarItem'; import DocNavbarItem from '@theme/NavbarItem/DocNavbarItem'; import DocSidebarNavbarItem from '@theme/NavbarItem/DocSidebarNavbarItem'; -import DocsVersionNavbarItem from '@theme/NavbarItem/DocsVersionNavbarItem'; import DocsVersionDropdownNavbarItem from '@theme/NavbarItem/DocsVersionDropdownNavbarItem'; +import DocsVersionNavbarItem from '@theme/NavbarItem/DocsVersionNavbarItem'; +import DropdownNavbarItem from '@theme/NavbarItem/DropdownNavbarItem'; +import HtmlNavbarItem from '@theme/NavbarItem/HtmlNavbarItem'; +import LocaleDropdownNavbarItem from '@theme/NavbarItem/LocaleDropdownNavbarItem'; +import SearchNavbarItem from '@theme/NavbarItem/SearchNavbarItem'; -import type { ComponentTypesObject } from '@theme/NavbarItem/ComponentTypes'; -import LoginProfileButton from '@tdev-components/Navbar/LoginProfileButton'; -import AccountSwitcher from '@tdev-components/Navbar/AccountSwitcher'; import EditingOverview from '@tdev-components/EditingOverview'; -import RequestTarget from '@tdev-components/Navbar/RequestTarget'; -import PersonalSpaceOverlay from '@tdev-components/Navbar/PersonalSpaceOverlay'; +import AccountSwitcher from '@tdev-components/Navbar/AccountSwitcher'; import DevModeAccessLocalFS from '@tdev-components/Navbar/DevModeAccessLocalFS'; +import LoginProfileButton from '@tdev-components/Navbar/LoginProfileButton'; +import PersonalSpaceOverlay from '@tdev-components/Navbar/PersonalSpaceOverlay'; +import RequestTarget from '@tdev-components/Navbar/RequestTarget'; +import type { ComponentTypesObject } from '@theme/NavbarItem/ComponentTypes'; const ComponentTypes: ComponentTypesObject = { default: DefaultNavbarItem, diff --git a/src/theme/Root.tsx b/src/theme/Root.tsx index 35d582d32..9f7412cea 100644 --- a/src/theme/Root.tsx +++ b/src/theme/Root.tsx @@ -1,22 +1,22 @@ -import React from 'react'; -import { StoresProvider, rootStore } from '@tdev-stores/rootStore'; -import { enableStaticRendering, observer } from 'mobx-react-lite'; -import Head from '@docusaurus/Head'; -import siteConfig from '@generated/docusaurus.config'; -import { useStore } from '@tdev-hooks/useStore'; -import { reaction } from 'mobx'; -import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; -import { useHistory, useLocation } from '@docusaurus/router'; -import LoggedOutOverlay from '@tdev-components/LoggedOutOverlay'; -import { authClient } from '@tdev/auth-client'; -import { OfflineUser } from '@tdev-api/OfflineApi'; import ExecutionEnvironment from '@docusaurus/ExecutionEnvironment'; +import Head from '@docusaurus/Head'; import type { GlobalPluginData } from '@docusaurus/plugin-content-docs/client'; +import { useHistory, useLocation } from '@docusaurus/router'; +import useDocusaurusContext from '@docusaurus/useDocusaurusContext'; import { usePluginData } from '@docusaurus/useGlobalData'; -import { Hashery } from 'hashery'; -import customFields from '@tdev-components/utils/customFields'; +import siteConfig from '@generated/docusaurus.config'; import { localDb } from '@tdev-api/base'; +import { OfflineUser } from '@tdev-api/OfflineApi'; import { User } from '@tdev-api/user'; +import LoggedOutOverlay from '@tdev-components/LoggedOutOverlay'; +import customFields from '@tdev-components/utils/customFields'; +import { useStore } from '@tdev-hooks/useStore'; +import { StoresProvider, rootStore } from '@tdev-stores/rootStore'; +import { authClient } from '@tdev/auth-client'; +import { Hashery } from 'hashery'; +import { reaction } from 'mobx'; +import { enableStaticRendering, observer } from 'mobx-react-lite'; +import React from 'react'; const hasher = new Hashery({ cache: { enabled: true, maxSize: 5 } }); const { OFFLINE_API, SENTRY_DSN, APP_URL } = customFields; diff --git a/tdev-website/docs/intro/10-react/dice/components/Dice.tsx b/tdev-website/docs/intro/10-react/dice/components/Dice.tsx index 35310afb6..03d614212 100644 --- a/tdev-website/docs/intro/10-react/dice/components/Dice.tsx +++ b/tdev-website/docs/intro/10-react/dice/components/Dice.tsx @@ -1,6 +1,6 @@ +import clsx from 'clsx'; import React from 'react'; import styles from './Dice.module.css'; -import clsx from 'clsx'; const rollDice = () => { return Math.floor(Math.random() * 6) + 1; diff --git a/tdev-website/docs/intro/10-react/dice/components/DiceHistory.tsx b/tdev-website/docs/intro/10-react/dice/components/DiceHistory.tsx index 8a189ec65..d3908452d 100644 --- a/tdev-website/docs/intro/10-react/dice/components/DiceHistory.tsx +++ b/tdev-website/docs/intro/10-react/dice/components/DiceHistory.tsx @@ -1,6 +1,6 @@ +import clsx from 'clsx'; import React from 'react'; import styles from './Dice.module.css'; -import clsx from 'clsx'; const rollDice = () => { return Math.floor(Math.random() * 6) + 1; diff --git a/tdev-website/siteConfig.ts b/tdev-website/siteConfig.ts index 0d7287019..a6eeacee5 100644 --- a/tdev-website/siteConfig.ts +++ b/tdev-website/siteConfig.ts @@ -1,6 +1,13 @@ // This file is used to configure the teaching-dev page. import { SiteConfigProvider } from '@tdev/siteConfig/siteConfig'; +import { themes as prismThemes } from 'prism-react-renderer'; +import githubCmsPlugin from '../packages/hfr/github-cms/plugin'; +import { + recommendedBeforeDefaultRemarkPlugins, + recommendedRehypePlugins, + recommendedRemarkPlugins +} from '../src/siteConfig/markdownPluginConfigs'; import { accountSwitcher, blog, @@ -13,14 +20,7 @@ import { requestTarget, taskStateOverview } from '../src/siteConfig/navbarItems'; -import { themes as prismThemes } from 'prism-react-renderer'; import { brythonCodePluginConfig, yamlLoaderPluginConfig } from '../src/siteConfig/pluginConfigs'; -import githubCmsPlugin from '../packages/hfr/github-cms/plugin'; -import { - recommendedBeforeDefaultRemarkPlugins, - recommendedRehypePlugins, - recommendedRemarkPlugins -} from '../src/siteConfig/markdownPluginConfigs'; const getSiteConfig: SiteConfigProvider = () => { return { diff --git a/tdev-website/website/packages/pyodide-code/components/Clock/Pointer/index.tsx b/tdev-website/website/packages/pyodide-code/components/Clock/Pointer/index.tsx index ec0994fe3..1b3559074 100644 --- a/tdev-website/website/packages/pyodide-code/components/Clock/Pointer/index.tsx +++ b/tdev-website/website/packages/pyodide-code/components/Clock/Pointer/index.tsx @@ -1,7 +1,7 @@ +import { Clock } from '@tdev/packages/pyodide-code/models/Clock'; import clsx from 'clsx'; -import styles from '../styles.module.scss'; import { observer } from 'mobx-react-lite'; -import { Clock } from '@tdev/packages/pyodide-code/models/Clock'; +import styles from '../styles.module.scss'; interface Props { clock: Clock; diff --git a/tdev-website/website/packages/pyodide-code/components/Clock/index.tsx b/tdev-website/website/packages/pyodide-code/components/Clock/index.tsx index 991f815f4..39b095d37 100644 --- a/tdev-website/website/packages/pyodide-code/components/Clock/index.tsx +++ b/tdev-website/website/packages/pyodide-code/components/Clock/index.tsx @@ -1,11 +1,10 @@ +import Card from '@tdev-components/shared/Card'; +import CopyBadge from '@tdev-components/shared/CopyBadge'; +import { useStore } from '@tdev-hooks/useStore'; import clsx from 'clsx'; -import styles from './styles.module.scss'; import { observer } from 'mobx-react-lite'; -import { useStore } from '@tdev-hooks/useStore'; import Pointer from './Pointer'; -import Card from '@tdev-components/shared/Card'; -import CopyBadge from '@tdev-components/shared/CopyBadge'; -import React from 'react'; +import styles from './styles.module.scss'; interface Props { clockId: string; diff --git a/updateSync/dependencyCheck.ts b/updateSync/dependencyCheck.ts index 16b974108..1a53b3839 100644 --- a/updateSync/dependencyCheck.ts +++ b/updateSync/dependencyCheck.ts @@ -1,6 +1,6 @@ -import * as path from 'path'; +import { difference, intersection } from 'es-toolkit'; import * as fs from 'fs'; -import { intersection, difference } from 'es-toolkit'; +import * as path from 'path'; import { ReportBuilder } from './report'; interface PackageJson { diff --git a/updateSync/packageDocsSync/actions.ts b/updateSync/packageDocsSync/actions.ts index 5bfe1a862..34764c077 100644 --- a/updateSync/packageDocsSync/actions.ts +++ b/updateSync/packageDocsSync/actions.ts @@ -1,7 +1,7 @@ -import path from 'path'; +import { debounce } from 'es-toolkit/compat'; import fs from 'fs/promises'; import { load as yamlLoad } from 'js-yaml'; -import { debounce } from 'es-toolkit/compat'; +import path from 'path'; interface TdevPackageConfig { path: string; diff --git a/updateSync/packageDocsSync/index.ts b/updateSync/packageDocsSync/index.ts index bb675461f..5133bd01e 100644 --- a/updateSync/packageDocsSync/index.ts +++ b/updateSync/packageDocsSync/index.ts @@ -1,6 +1,6 @@ import fs from 'fs/promises'; -import { getPackageDocsConfigs, syncCategoryFile, syncDocsFolder } from './actions'; import path from 'path'; +import { getPackageDocsConfigs, syncCategoryFile, syncDocsFolder } from './actions'; const packageDocsSync = async (packageDir: string, destDir: string) => { const srcPath = path.resolve(process.cwd(), packageDir); diff --git a/updateSync/packageDocsSync/preBuild.ts b/updateSync/packageDocsSync/preBuild.ts index a938dc7f3..61afad104 100644 --- a/updateSync/packageDocsSync/preBuild.ts +++ b/updateSync/packageDocsSync/preBuild.ts @@ -1,5 +1,5 @@ -import path from 'path'; import minimist from 'minimist'; +import path from 'path'; import packageDocsSync from '.'; const argv = minimist(process.argv.slice(2), { string: ['src', 'dest'], diff --git a/updateSync/packageDocsSync/watch.ts b/updateSync/packageDocsSync/watch.ts index c9a9faef3..9852b1bc6 100644 --- a/updateSync/packageDocsSync/watch.ts +++ b/updateSync/packageDocsSync/watch.ts @@ -1,8 +1,8 @@ import chokidar from 'chokidar'; import minimist from 'minimist'; import path from 'path'; -import { getDebouncedSyncer, categoryFileLocation, packageInfo, syncCategoryFile } from './actions'; import packageDocsSync from '.'; +import { categoryFileLocation, getDebouncedSyncer, packageInfo, syncCategoryFile } from './actions'; const argv = minimist(process.argv.slice(2), { string: ['src', 'dest'], diff --git a/updateSync/updateTdev.ts b/updateSync/updateTdev.ts index fe3b06100..ae48bd558 100644 --- a/updateSync/updateTdev.ts +++ b/updateSync/updateTdev.ts @@ -1,13 +1,13 @@ -import * as fs from 'fs'; -import * as path from 'path'; import { exec as execCallback, execSync } from 'child_process'; -import { promisify } from 'util'; +import * as fs from 'fs'; import { load as yamlLoad } from 'js-yaml'; -import { Config, TrackedElementConfig } from './types'; -import { expandTilde } from './util'; import micromatch from 'micromatch'; +import * as path from 'path'; +import { promisify } from 'util'; import { calculateDependenciesDiff as determineDependenciesDiff } from './dependencyCheck'; import { ReportBuilder } from './report'; +import { Config, TrackedElementConfig } from './types'; +import { expandTilde } from './util'; const SYNC_MARKER_FILENAME = '.updateTdev'; const CONFIG_FILENAME = 'updateTdev.config.yaml'; diff --git a/updateSync/util.ts b/updateSync/util.ts index b20b70edf..6374a126f 100644 --- a/updateSync/util.ts +++ b/updateSync/util.ts @@ -1,5 +1,5 @@ -import * as path from 'path'; import * as os from 'os'; +import * as path from 'path'; export function expandTilde(filePath: string): string { if (filePath[0] === '~') {