fix: move UserSearchResult to common

flarum · Sep 28, 2024 · 35f76bc · 35f76bc
1 parent 124b796
commit 35f76bc
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 18 deletions.
diff --git a/...src/forum/components/UserSearchResult.tsx → ...rc/common/components/UserSearchResult.tsx b/...src/forum/components/UserSearchResult.tsx → ...rc/common/components/UserSearchResult.tsx
diff --git a/framework/core/js/src/common/components/UserSelectionModal.tsx b/framework/core/js/src/common/components/UserSelectionModal.tsx
@@ -9,7 +9,7 @@ import Button from './Button';
 import LoadingIndicator from './LoadingIndicator';
 import { throttle } from '../utils/throttleDebounce';
 import InfoTile from './InfoTile';
-import UserSearchResult from '../../forum/components/UserSearchResult';
+import UserSearchResult from '../../common/components/UserSearchResult';
 import Pill from './Pill';
 
 export interface IUserSelectionModalAttrs extends IFormModalAttrs {

diff --git a/framework/core/js/src/common/extenders/Model.ts b/framework/core/js/src/common/extenders/Model.ts
@@ -1,5 +1,5 @@
 import IExtender, { IExtensionModule } from './IExtender';
-import Application from '../Application';
+import type Application from '../Application';
 import ActualModel from '../Model';
 
 export default class Model implements IExtender {

diff --git a/framework/core/js/src/common/extenders/Routes.ts b/framework/core/js/src/common/extenders/Routes.ts
@@ -1,4 +1,5 @@
-import Application, { AsyncNewComponent, FlarumGenericRoute, NewComponent } from '../Application';
+import type Application from '../Application';
+import type { AsyncNewComponent, FlarumGenericRoute, NewComponent } from '../Application';
 import IExtender, { IExtensionModule } from './IExtender';
 
 type HelperRoute = (...args: any) => string;

diff --git a/framework/core/js/src/common/extenders/Store.ts b/framework/core/js/src/common/extenders/Store.ts
@@ -1,4 +1,4 @@
-import Application from '../Application';
+import type Application from '../Application';
 import IExtender, { IExtensionModule } from './IExtender';
 import Model from '../Model';
 

diff --git a/framework/core/js/src/common/extenders/ThemeMode.ts b/framework/core/js/src/common/extenders/ThemeMode.ts
@@ -1,4 +1,4 @@
-import Application from '../Application';
+import type Application from '../Application';
 import IExtender, { IExtensionModule } from './IExtender';
 import ThemeModeComponent, { type ColorSchemeData } from '../components/ThemeMode';
 

diff --git a/framework/core/js/src/forum/app.ts b/framework/core/js/src/forum/app.ts
@@ -1,5 +1,7 @@
 import Forum from './ForumApplication';
 
+console.error('No');
+
 const app = new Forum();
 
 // @ts-expect-error We need to do this for backwards compatibility purposes.

diff --git a/framework/core/js/src/forum/components/PostsUserPage.tsx b/framework/core/js/src/forum/components/PostsUserPage.tsx
@@ -1,11 +1,4 @@
-import app from '../../forum/app';
 import UserPage, { IUserPageAttrs } from './UserPage';
-import LoadingIndicator from '../../common/components/LoadingIndicator';
-import Button from '../../common/components/Button';
-import Link from '../../common/components/Link';
-import Placeholder from '../../common/components/Placeholder';
-import CommentPost from './CommentPost';
-import type Post from '../../common/models/Post';
 import type Mithril from 'mithril';
 import type User from '../../common/models/User';
 import PostListState from '../states/PostListState';

diff --git a/framework/core/js/src/forum/components/UsersSearchSource.tsx b/framework/core/js/src/forum/components/UsersSearchSource.tsx
@@ -1,15 +1,10 @@
 import type Mithril from 'mithril';
 
 import app from '../app';
-import highlight from '../../common/helpers/highlight';
-import username from '../../common/helpers/username';
-import Link from '../../common/components/Link';
 import type User from '../../common/models/User';
-import Avatar from '../../common/components/Avatar';
 import type { SearchSource } from './Search';
 import extractText from '../../common/utils/extractText';
-import listItems from '../../common/helpers/listItems';
-import UserSearchResult from './UserSearchResult';
+import UserSearchResult from '../../common/components/UserSearchResult';
 
 /**
  * The `UsersSearchSource` finds and displays user search results in the search