moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Re-organize folders

This commit is contained in:
Chewbacca 2022-10-17 08:34:19 -04:00
parent 65a8bf9aa1
commit 1007a2797e
10 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/soapbox/features/chats/components/__tests__/chat-pane-header.test.tsx
View File

@ -2,10 +2,10 @@ import userEvent from '@testing-library/user-event';
import React from 'react'; import React from 'react';
import { render, screen } from '../../../../jest/test-helpers'; import { render, screen } from '../../../../jest/test-helpers';
import ChatPaneHeader from '../chat-pane-header'; import ChatPaneHeader from '../chat-widget/chat-pane-header';
describe('<ChatPaneHeader />', () => { describe('<ChatPaneHeader />', () => {
it('handles the onToggle prop', async() => { it('handles the onToggle prop', async () => {
const mockFn = jest.fn(); const mockFn = jest.fn();
render(<ChatPaneHeader title='title' onToggle={mockFn} isOpen />); render(<ChatPaneHeader title='title' onToggle={mockFn} isOpen />);
@ -64,7 +64,7 @@ describe('<ChatPaneHeader />', () => {
}); });
describe('secondaryAction prop', () => { describe('secondaryAction prop', () => {
it('handles the secondaryAction callback', async() => { it('handles the secondaryAction callback', async () => {
const mockFn = jest.fn(); const mockFn = jest.fn();
render( render(
<ChatPaneHeader <ChatPaneHeader

2
app/soapbox/features/chats/components/__tests__/chat-widget.test.tsx
View File

@ -5,7 +5,7 @@ import { Route, Switch } from 'react-router-dom';
import { normalizeAccount } from 'soapbox/normalizers'; import { normalizeAccount } from 'soapbox/normalizers';
import { render, rootState } from '../../../../jest/test-helpers'; import { render, rootState } from '../../../../jest/test-helpers';
import ChatWidget from '../chat-widget'; import ChatWidget from '../chat-widget/chat-widget';
const id = '1'; const id = '1';
const account = normalizeAccount({ const account = normalizeAccount({

14
app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx
View File

@ -113,15 +113,15 @@ const ChatPageMain = () => {
children={null} children={null}
/> />
<MenuList className='w-80 py-6'> <MenuList className='w-80'>
<Stack space={4} className='w-5/6 mx-auto'> <Stack space={4} className='px-6 py-5'>
<Stack alignItems='center' space={2}> <HStack alignItems='center' space={3}>
<Avatar src={chat.account.avatar_static} size={75} /> <Avatar src={chat.account.avatar_static} size={50} />
<Stack> <Stack>
<Text size='lg' weight='semibold' align='center'>{chat.account.display_name}</Text> <Text weight='semibold'>{chat.account.display_name}</Text>
<Text theme='primary' align='center'>@{chat.account.acct}</Text> <Text size='sm' theme='primary'>@{chat.account.acct}</Text>
</Stack> </Stack>
</Stack> </HStack>
<Divider /> <Divider />

4
app/soapbox/features/chats/components/chat-pane/chat-pane.tsx
View File

@ -7,11 +7,11 @@ import { useDebounce, useFeatures } from 'soapbox/hooks';
import { IChat, useChats } from 'soapbox/queries/chats'; import { IChat, useChats } from 'soapbox/queries/chats';
import ChatList from '../chat-list'; import ChatList from '../chat-list';
import ChatPaneHeader from '../chat-pane-header'; import ChatPaneHeader from '../chat-widget/chat-pane-header';
import ChatSearchInput from '../chat-search-input'; import ChatSearchInput from '../chat-search-input';
import ChatSearch from '../chat-search/chat-search'; import ChatSearch from '../chat-search/chat-search';
import EmptyResultsBlankslate from '../chat-search/empty-results-blankslate'; import EmptyResultsBlankslate from '../chat-search/empty-results-blankslate';
import ChatWindow from '../chat-window'; import ChatWindow from '../chat-widget/chat-window';
import { Pane } from '../ui'; import { Pane } from '../ui';
import Blankslate from './blankslate'; import Blankslate from './blankslate';

2
app/soapbox/features/chats/components/chat-search/chat-search.tsx
View File

@ -12,7 +12,7 @@ import { queryClient } from 'soapbox/queries/client';
import useAccountSearch from 'soapbox/queries/search'; import useAccountSearch from 'soapbox/queries/search';
import { ChatKeys } from '../../../../queries/chats'; import { ChatKeys } from '../../../../queries/chats';
import ChatPaneHeader from '../chat-pane-header'; import ChatPaneHeader from '../chat-widget/chat-pane-header';
import { Pane } from '../ui'; import { Pane } from '../ui';
import Blankslate from './blankslate'; import Blankslate from './blankslate';

0
app/soapbox/features/chats/components/chat-pane-header.tsx → app/soapbox/features/chats/components/chat-widget/chat-pane-header.tsx
View File

10
app/soapbox/features/chats/components/chat-settings.tsx → app/soapbox/features/chats/components/chat-widget/chat-settings.tsx
View File

@ -92,13 +92,13 @@ const ChatSettings = () => {
/> />
<Stack space={4} className='w-5/6 mx-auto'> <Stack space={4} className='w-5/6 mx-auto'>
<Stack alignItems='center' space={2}> <HStack alignItems='center' space={3}>
<Avatar src={chat.account.avatar_static} size={75} /> <Avatar src={chat.account.avatar_static} size={50} />
<Stack> <Stack>
<Text size='lg' weight='semibold' align='center'>{chat.account.display_name}</Text> <Text weight='semibold'>{chat.account.display_name}</Text>
<Text theme='primary' align='center'>@{chat.account.acct}</Text> <Text size='sm' theme='primary'>@{chat.account.acct}</Text>
</Stack> </Stack>
</Stack> </HStack>
<Divider /> <Divider />

2
app/soapbox/features/chats/components/chat-widget.tsx → app/soapbox/features/chats/components/chat-widget/chat-widget.tsx
View File

@ -4,7 +4,7 @@ import { useHistory } from 'react-router-dom';
import { ChatProvider } from 'soapbox/contexts/chat-context'; import { ChatProvider } from 'soapbox/contexts/chat-context';
import { useOwnAccount } from 'soapbox/hooks'; import { useOwnAccount } from 'soapbox/hooks';
import ChatPane from './chat-pane/chat-pane'; import ChatPane from '../chat-pane/chat-pane';
const ChatWidget = () => { const ChatWidget = () => {
const account = useOwnAccount(); const account = useOwnAccount();

3
app/soapbox/features/chats/components/chat-window.tsx → app/soapbox/features/chats/components/chat-widget/chat-window.tsx
View File

@ -5,7 +5,8 @@ import { Avatar, HStack, Icon, Stack, Text } from 'soapbox/components/ui';
import VerificationBadge from 'soapbox/components/verification_badge'; import VerificationBadge from 'soapbox/components/verification_badge';
import { useChatContext } from 'soapbox/contexts/chat-context'; import { useChatContext } from 'soapbox/contexts/chat-context';
import Chat from './chat'; import Chat from '../chat';
import ChatPaneHeader from './chat-pane-header'; import ChatPaneHeader from './chat-pane-header';
import ChatSettings from './chat-settings'; import ChatSettings from './chat-settings';

2
app/soapbox/features/ui/util/async-components.ts
View File

@ -291,7 +291,7 @@ export function ChatIndex() {
} }
export function ChatWidget() { export function ChatWidget() {
return import(/* webpackChunkName: "features/chats/components/chat-widget" */'../../chats/components/chat-widget'); return import(/* webpackChunkName: "features/chats/components/chat-widget" */'../../chats/components/chat-widget/chat-widget');
} }
export function ServerInfo() { export function ServerInfo() {