mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-06 16:36:47 +02:00
Code Issues Releases Wiki Activity

fix: move UserSearchResult to common

Browse Source
This commit is contained in:
Sami Mazouz
2024-09-28 12:52:04 +01:00
parent 124b7968f2
commit 35f76bce60
9 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
framework/core/js/src/forum/components/UserSearchResult.tsx → framework/core/js/src/common/components/UserSearchResult.tsx
View File

2
framework/core/js/src/common/components/UserSelectionModal.tsx
View File

@@ -9,7 +9,7 @@ import Button from './Button';
import LoadingIndicator from './LoadingIndicator'; import LoadingIndicator from './LoadingIndicator';
import { throttle } from '../utils/throttleDebounce'; import { throttle } from '../utils/throttleDebounce';
import InfoTile from './InfoTile'; import InfoTile from './InfoTile';
import UserSearchResult from '../../forum/components/UserSearchResult'; import UserSearchResult from '../../common/components/UserSearchResult';
import Pill from './Pill'; import Pill from './Pill';
export interface IUserSelectionModalAttrs extends IFormModalAttrs { export interface IUserSelectionModalAttrs extends IFormModalAttrs {

2
framework/core/js/src/common/extenders/Model.ts
View File

@@ -1,5 +1,5 @@
import IExtender, { IExtensionModule } from './IExtender'; import IExtender, { IExtensionModule } from './IExtender';
import Application from '../Application'; import type Application from '../Application';
import ActualModel from '../Model'; import ActualModel from '../Model';
export default class Model implements IExtender { export default class Model implements IExtender {

3
framework/core/js/src/common/extenders/Routes.ts
View File

@@ -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'; import IExtender, { IExtensionModule } from './IExtender';
type HelperRoute = (...args: any) => string; type HelperRoute = (...args: any) => string;

2
framework/core/js/src/common/extenders/Store.ts
View File

@@ -1,4 +1,4 @@
import Application from '../Application'; import type Application from '../Application';
import IExtender, { IExtensionModule } from './IExtender'; import IExtender, { IExtensionModule } from './IExtender';
import Model from '../Model'; import Model from '../Model';

2
framework/core/js/src/common/extenders/ThemeMode.ts
View File

@@ -1,4 +1,4 @@
import Application from '../Application'; import type Application from '../Application';
import IExtender, { IExtensionModule } from './IExtender'; import IExtender, { IExtensionModule } from './IExtender';
import ThemeModeComponent, { type ColorSchemeData } from '../components/ThemeMode'; import ThemeModeComponent, { type ColorSchemeData } from '../components/ThemeMode';

2
framework/core/js/src/forum/app.ts
View File

@@ -1,5 +1,7 @@
import Forum from './ForumApplication'; import Forum from './ForumApplication';
console.error('No');
const app = new Forum(); const app = new Forum();
// @ts-expect-error We need to do this for backwards compatibility purposes. // @ts-expect-error We need to do this for backwards compatibility purposes.

7
framework/core/js/src/forum/components/PostsUserPage.tsx
View File

@@ -1,11 +1,4 @@
import app from '../../forum/app';
import UserPage, { IUserPageAttrs } from './UserPage'; 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 Mithril from 'mithril';
import type User from '../../common/models/User'; import type User from '../../common/models/User';
import PostListState from '../states/PostListState'; import PostListState from '../states/PostListState';

7
framework/core/js/src/forum/components/UsersSearchSource.tsx
View File

@@ -1,15 +1,10 @@
import type Mithril from 'mithril'; import type Mithril from 'mithril';
import app from '../app'; 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 type User from '../../common/models/User';
import Avatar from '../../common/components/Avatar';
import type { SearchSource } from './Search'; import type { SearchSource } from './Search';
import extractText from '../../common/utils/extractText'; import extractText from '../../common/utils/extractText';
import listItems from '../../common/helpers/listItems'; import UserSearchResult from '../../common/components/UserSearchResult';
import UserSearchResult from './UserSearchResult';
/** /**
* The `UsersSearchSource` finds and displays user search results in the search * The `UsersSearchSource` finds and displays user search results in the search