miklo
/
soapbox
sforkowany z mirror/soapbox
1
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Packages Projekty Wydania Wiki Aktywność

Re-organize folders

revert-fa4bd20d
Chewbacca 2022-10-17 08:34:19 -04:00
rodzic 65a8bf9aa1
commit 1007a2797e
10 zmienionych plików z 23 dodań i 22 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
app/soapbox/features/chats/components/__tests__/chat-pane-header.test.tsx
Wyświetl plik

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

2
app/soapbox/features/chats/components/__tests__/chat-widget.test.tsx
Wyświetl plik

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

14
app/soapbox/features/chats/components/chat-page/components/chat-page-main.tsx
Wyświetl plik

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

4
app/soapbox/features/chats/components/chat-pane/chat-pane.tsx
Wyświetl plik

@ -7,11 +7,11 @@ import { useDebounce, useFeatures } from 'soapbox/hooks';
import { IChat, useChats } from 'soapbox/queries/chats';
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 ChatSearch from '../chat-search/chat-search';
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 Blankslate from './blankslate';

2
app/soapbox/features/chats/components/chat-search/chat-search.tsx
Wyświetl plik

@ -12,7 +12,7 @@ import { queryClient } from 'soapbox/queries/client';
import useAccountSearch from 'soapbox/queries/search';
import { ChatKeys } from '../../../../queries/chats';
import ChatPaneHeader from '../chat-pane-header';
import ChatPaneHeader from '../chat-widget/chat-pane-header';
import { Pane } from '../ui';
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
Wyświetl plik

10
app/soapbox/features/chats/components/chat-settings.tsx → app/soapbox/features/chats/components/chat-widget/chat-settings.tsx
Wyświetl plik

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

2
app/soapbox/features/chats/components/chat-widget.tsx → app/soapbox/features/chats/components/chat-widget/chat-widget.tsx
Wyświetl plik

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

3
app/soapbox/features/chats/components/chat-window.tsx → app/soapbox/features/chats/components/chat-widget/chat-window.tsx
Wyświetl plik

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

2
app/soapbox/features/ui/util/async-components.ts
Wyświetl plik

@ -291,7 +291,7 @@ export function ChatIndex() {
}
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() {