Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

♻️ refactor: move app page to the (main) layout group #2297

Merged
merged 2 commits into from
Apr 29, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
🐛 fix: Fix path
  • Loading branch information
canisminor1990 committed Apr 29, 2024
commit 1ed5807adfe0950f6c8ba3ffde6d97e960957b2d
3 changes: 2 additions & 1 deletion src/app/(main)/chat/(desktop)/features/SideBar/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ import { createStyles } from 'antd-style';
import dynamic from 'next/dynamic';
import { memo } from 'react';

import TopicListContent from '@/app/(main)/chat/features/TopicListContent';
import SafeSpacing from '@/components/SafeSpacing';
import { CHAT_SIDEBAR_WIDTH } from '@/const/layoutTokens';
import { useGlobalStore } from '@/store/global';
import { featureFlagsSelectors, useServerConfigStore } from '@/store/serverConfig';
import { useSessionStore } from '@/store/session';
import { sessionSelectors } from '@/store/session/selectors';

import TopicListContent from '../../../features/TopicListContent';

const SystemRole = dynamic(() => import('./SystemRole'));

const useStyles = createStyles(({ css, token }) => ({
Expand Down
2 changes: 1 addition & 1 deletion src/app/(main)/market/features/TagList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Skeleton } from 'antd';
import { Suspense, memo } from 'react';
import { Flexbox } from 'react-layout-kit';

import Inner from '@/app/(main)/market/features/TagList/Inner';
import Inner from './Inner';

const TagList = memo(() => {
return (
Expand Down
3 changes: 2 additions & 1 deletion src/app/(main)/settings/about/Analytics.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@ import { memo } from 'react';
import { useTranslation } from 'react-i18next';
import { Flexbox } from 'react-layout-kit';

import { useStyles } from '@/app/(main)/settings/about/style';
import { useUserStore } from '@/store/user';
import { preferenceSelectors } from '@/store/user/selectors';

import { useStyles } from './style';

const Analytics = memo(() => {
const { t } = useTranslation('setting');
const { styles } = useStyles();
Expand Down
2 changes: 1 addition & 1 deletion src/app/(main)/settings/sync/WebRTC/ChannelNameInput.tsx
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

这个改成相对路径可能也更合适

Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { LucideDices } from 'lucide-react';
import { memo, useState } from 'react';
import { useTranslation } from 'react-i18next';

import { generateRandomRoomName } from '@/app/(main)/settings/sync/util';
import { generateRandomRoomName } from '../util';

interface ChannelNameInputProps extends Omit<InputProps, 'form'> {
form: FormInstance;
Expand Down
2 changes: 1 addition & 1 deletion src/app/(main)/welcome/(mobile)/index.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { memo } from 'react';
import { Center, Flexbox } from 'react-layout-kit';

import Banner from '@/app/(main)/welcome/features/Banner';
import Banner from '../features/Banner';

const Showcase = memo(() => (
<Flexbox align={'center'} justify={'center'} style={{ height: 'calc(100% - 44px)' }}>
Expand Down
Loading