From bb8e713d291c414cd0f20fc489424e73ff97412e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?nicole=20miko=C5=82ajczyk?= Date: Tue, 27 Jan 2026 15:44:28 +0100 Subject: [PATCH] pl-fe: rename pages so they make more sense MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: nicole mikołajczyk --- .../chats-page.tsx} | 8 ++++---- .../components/blankslate-empty.tsx | 0 .../components/blankslate-with-chats.tsx | 0 .../components/chats-page-chat.tsx} | 4 ++-- .../components/chats-page-empty.tsx} | 4 ++-- .../components/chats-page-new.tsx} | 7 ++----- .../components/chats-page-settings.tsx} | 4 ++-- .../components/chats-page-shoutbox.tsx} | 4 ++-- .../components/chats-page-sidebar.tsx} | 4 ++-- .../pl-fe/src/features/ui/router/index.tsx | 20 +++++++++---------- packages/pl-fe/src/pages/chats/chats.tsx | 2 +- 11 files changed, 27 insertions(+), 30 deletions(-) rename packages/pl-fe/src/features/chats/components/{chat-page/chat-page.tsx => chats-page/chats-page.tsx} (93%) rename packages/pl-fe/src/features/chats/components/{chat-page => chats-page}/components/blankslate-empty.tsx (100%) rename packages/pl-fe/src/features/chats/components/{chat-page => chats-page}/components/blankslate-with-chats.tsx (100%) rename packages/pl-fe/src/features/chats/components/{chat-page/components/chat-page-chat.tsx => chats-page/components/chats-page-chat.tsx} (98%) rename packages/pl-fe/src/features/chats/components/{chat-page/components/chat-page-main.tsx => chats-page/components/chats-page-empty.tsx} (85%) rename packages/pl-fe/src/features/chats/components/{chat-page/components/chat-page-new.tsx => chats-page/components/chats-page-new.tsx} (90%) rename packages/pl-fe/src/features/chats/components/{chat-page/components/chat-page-settings.tsx => chats-page/components/chats-page-settings.tsx} (98%) rename packages/pl-fe/src/features/chats/components/{chat-page/components/chat-page-shoutbox.tsx => chats-page/components/chats-page-shoutbox.tsx} (96%) rename packages/pl-fe/src/features/chats/components/{chat-page/components/chat-page-sidebar.tsx => chats-page/components/chats-page-sidebar.tsx} (96%) diff --git a/packages/pl-fe/src/features/chats/components/chat-page/chat-page.tsx b/packages/pl-fe/src/features/chats/components/chats-page/chats-page.tsx similarity index 93% rename from packages/pl-fe/src/features/chats/components/chat-page/chat-page.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/chats-page.tsx index 39ce0223d..a352d78fe 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/chat-page.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/chats-page.tsx @@ -6,9 +6,9 @@ import Stack from 'pl-fe/components/ui/stack'; import { chatsEmptyRoute } from 'pl-fe/features/ui/router'; import { useChats } from 'pl-fe/queries/chats'; -import ChatPageSidebar from './components/chat-page-sidebar'; +import ChatsPageSidebar from './components/chats-page-sidebar'; -const ChatPage: React.FC = () => { +const ChatsPage: React.FC = () => { const { chatsQuery: { data: chats } } = useChats(); const isSidebarHidden = !useMatch({ from: chatsEmptyRoute.id, shouldThrow: false }) || chats?.length === 0; @@ -57,7 +57,7 @@ const ChatPage: React.FC = () => { 'hidden sm:block': isSidebarHidden, })} > - + { ); }; -export { ChatPage as default }; +export { ChatsPage as default }; diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/blankslate-empty.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-empty.tsx similarity index 100% rename from packages/pl-fe/src/features/chats/components/chat-page/components/blankslate-empty.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-empty.tsx diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/blankslate-with-chats.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-with-chats.tsx similarity index 100% rename from packages/pl-fe/src/features/chats/components/chat-page/components/blankslate-with-chats.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/components/blankslate-with-chats.tsx diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-chat.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-chat.tsx similarity index 98% rename from packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-chat.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-chat.tsx index a9f2e36b2..cb0d5983f 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-chat.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-chat.tsx @@ -32,7 +32,7 @@ const messages = defineMessages({ leaveChat: { id: 'chat_settings.options.leave_chat', defaultMessage: 'Leave chat' }, }); -const ChatPageMain = () => { +const ChatsPageChat = () => { const intl = useIntl(); const features = useFeatures(); const navigate = useNavigate(); @@ -153,4 +153,4 @@ const ChatPageMain = () => { ); }; -export { ChatPageMain as default }; +export { ChatsPageChat as default }; diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-main.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-empty.tsx similarity index 85% rename from packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-main.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-empty.tsx index deebd725b..d0188cf4a 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-main.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-empty.tsx @@ -5,7 +5,7 @@ import { useChats } from 'pl-fe/queries/chats'; import BlankslateEmpty from './blankslate-empty'; import BlankslateWithChats from './blankslate-with-chats'; -const ChatPageMain = () => { +const ChatsPageEmpty = () => { const { chatsQuery: { data: chats, isLoading } } = useChats(); if (isLoading) { @@ -19,4 +19,4 @@ const ChatPageMain = () => { return ; }; -export { ChatPageMain as default }; +export { ChatsPageEmpty as default }; diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-new.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-new.tsx similarity index 90% rename from packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-new.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-new.tsx index 68e4a7988..049fadd06 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-new.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-new.tsx @@ -13,11 +13,8 @@ const messages = defineMessages({ title: { id: 'chat.new_message.title', defaultMessage: 'New Message' }, }); -interface IChatPageNew { -} - /** New message form to create a chat. */ -const ChatPageNew: React.FC = () => { +const ChatsPageNew: React.FC = () => { const intl = useIntl(); const navigate = useNavigate(); @@ -40,4 +37,4 @@ const ChatPageNew: React.FC = () => { ); }; -export { ChatPageNew as default }; +export { ChatsPageNew as default }; diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-settings.tsx similarity index 98% rename from packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-settings.tsx index c74e83b0e..b09dbb50a 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-settings.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-settings.tsx @@ -30,7 +30,7 @@ const messages = defineMessages({ submit: { id: 'chat.page_settings.submit', defaultMessage: 'Save' }, }); -const ChatPageSettings = () => { +const ChatsPageSettings = () => { const { account } = useOwnAccount(); const intl = useIntl(); const navigate = useNavigate(); @@ -98,4 +98,4 @@ const ChatPageSettings = () => { ); }; -export { ChatPageSettings as default }; +export { ChatsPageSettings as default }; diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-shoutbox.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-shoutbox.tsx similarity index 96% rename from packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-shoutbox.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-shoutbox.tsx index 417701f63..6c4c659ef 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-shoutbox.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-shoutbox.tsx @@ -12,7 +12,7 @@ import { usePlFeConfig } from 'pl-fe/hooks/use-pl-fe-config'; import Shoutbox from '../../shoutbox'; -const ChatPageShoutbox = () => { +const ChatsPageShoutbox = () => { const navigate = useNavigate(); const instance = useInstance(); const { logo } = usePlFeConfig(); @@ -48,4 +48,4 @@ const ChatPageShoutbox = () => { ); }; -export { ChatPageShoutbox as default }; +export { ChatsPageShoutbox as default }; diff --git a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-sidebar.tsx similarity index 96% rename from packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx rename to packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-sidebar.tsx index 918d6244f..651496224 100644 --- a/packages/pl-fe/src/features/chats/components/chat-page/components/chat-page-sidebar.tsx +++ b/packages/pl-fe/src/features/chats/components/chats-page/components/chats-page-sidebar.tsx @@ -15,7 +15,7 @@ const messages = defineMessages({ title: { id: 'column.chats', defaultMessage: 'Chats' }, }); -const ChatPageSidebar = () => { +const ChatsPageSidebar = () => { const intl = useIntl(); const navigate = useNavigate(); @@ -64,4 +64,4 @@ const ChatPageSidebar = () => { ); }; -export { ChatPageSidebar as default }; +export { ChatsPageSidebar as default }; diff --git a/packages/pl-fe/src/features/ui/router/index.tsx b/packages/pl-fe/src/features/ui/router/index.tsx index 43deae3a7..12087a923 100644 --- a/packages/pl-fe/src/features/ui/router/index.tsx +++ b/packages/pl-fe/src/features/ui/router/index.tsx @@ -39,11 +39,11 @@ import StatusLayout from 'pl-fe/layouts/status-layout'; import { instanceInitialState } from 'pl-fe/reducers/instance'; import { isStandalone } from 'pl-fe/utils/state'; -import ChatPageChat from '../../chats/components/chat-page/components/chat-page-chat'; -import ChatPageMain from '../../chats/components/chat-page/components/chat-page-main'; -import ChatPageNew from '../../chats/components/chat-page/components/chat-page-new'; -import ChatPageSettings from '../../chats/components/chat-page/components/chat-page-settings'; -import ChatPageShoutbox from '../../chats/components/chat-page/components/chat-page-shoutbox'; +import ChatsPageChat from '../../chats/components/chats-page/components/chats-page-chat'; +import ChatsPageEmpty from '../../chats/components/chats-page/components/chats-page-empty'; +import ChatsPageNew from '../../chats/components/chats-page/components/chats-page-new'; +import ChatsPageSettings from '../../chats/components/chats-page/components/chats-page-settings'; +import ChatsPageShoutbox from '../../chats/components/chats-page/components/chats-page-shoutbox'; import ColumnLoading from '../components/column-loading'; import { AboutPage, @@ -567,31 +567,31 @@ export const chatsRoute = createRoute({ export const chatsNewRoute = createRoute({ getParentRoute: () => chatsRoute, path: '/new', - component: ChatPageNew, + component: ChatsPageNew, }); export const chatsSettingsRoute = createRoute({ getParentRoute: () => chatsRoute, path: '/settings', - component: ChatPageSettings, + component: ChatsPageSettings, }); export const shoutboxRoute = createRoute({ getParentRoute: () => chatsRoute, path: '/shoutbox', - component: ChatPageShoutbox, + component: ChatsPageShoutbox, }); export const chatRoute = createRoute({ getParentRoute: () => chatsRoute, path: '/$chatId', - component: ChatPageChat, + component: ChatsPageChat, }); export const chatsEmptyRoute = createRoute({ getParentRoute: () => chatsRoute, path: '/', - component: ChatPageMain, + component: ChatsPageEmpty, }); // Follow requests and blocks diff --git a/packages/pl-fe/src/pages/chats/chats.tsx b/packages/pl-fe/src/pages/chats/chats.tsx index f4fc07594..2ed12584a 100644 --- a/packages/pl-fe/src/pages/chats/chats.tsx +++ b/packages/pl-fe/src/pages/chats/chats.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { ChatProvider } from 'pl-fe/contexts/chat-context'; -import ChatPage from 'pl-fe/features/chats/components/chat-page/chat-page'; +import ChatPage from 'pl-fe/features/chats/components/chats-page/chats-page'; const ChatIndex: React.FC = () => (