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 dir from page to app and remove .page suffix #236

Merged
merged 4 commits into from
Sep 26, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
2 changes: 1 addition & 1 deletion next.config.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ const withPWA = nextPWA({
/** @type {import('next').NextConfig} */
const nextConfig = {
reactStrictMode: true,
pageExtensions: ['page.tsx', 'api.ts'],
pageExtensions: ['tsx', 'api.ts'],
transpilePackages: ['@lobehub/ui'],
webpack(config) {
config.experiments = {
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
"@types/react": "^18",
"@types/react-dom": "^18",
"@types/systemjs": "^6.13.2",
"@types/testing-library__jest-dom": "^6",
"@types/uuid": "^9",
"@umijs/lint": "^4",
"@vitest/coverage-v8": "latest",
Expand Down
2 changes: 1 addition & 1 deletion src/pages/chat/index.tsx → src/app/chat/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';
import Conversation from './features/Conversation';
import Header from './features/Header';
import SideBar from './features/Sidebar';
import DesktopLayout from './layout';
import MobileLayout from './layout.mobile';
import DesktopLayout from './layout.pc';

const Chat = memo(() => {
const { mobile } = useResponsive();
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ import { memo } from 'react';
import { Flexbox } from 'react-layout-kit';

import AppMobileLayout from '@/layout/AppMobileLayout';
import Header from '@/pages/chat/features/Header';
import { useSessionStore } from '@/store/session';
import { agentSelectors } from '@/store/session/selectors';
import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';

import Conversation from '../features/Conversation';
import Header from '../features/Header';
import SideBar from '../features/Sidebar';

const Chat = memo(() => {
Expand Down
7 changes: 0 additions & 7 deletions src/app/chat/mobile/page.page.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Page from '@/pages/chat';
import Page from './index';

const Index = () => {
return <Page />;
Expand Down
2 changes: 1 addition & 1 deletion src/app/page.page.tsx → src/app/chat/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Page from '@/pages/home';
import Page from './index';

const Index = () => {
return <Page />;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import { useSessionStore } from '@/store/session';
import { agentSelectors } from '@/store/session/selectors';
import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';

import DesktopLayout from './layout';
import MobileLayout from './layout.mobile';
import DesktopLayout from './layout.pc';

const EditPage = memo(() => {
const { mobile } = useResponsive();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Flexbox } from 'react-layout-kit';
import SafeSpacing from '@/components/SafeSpacing';
import { HEADER_HEIGHT } from '@/const/layoutTokens';

import ChatLayout from '../layout';
import ChatLayout from '../layout.pc';
import Header from './features/Header';

const DesktopLayout = memo<PropsWithChildren>(({ children }) => {
Expand Down
7 changes: 0 additions & 7 deletions src/app/chat/settings/page.page.tsx

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Page from '@/pages/market';
import Page from './index';

const Index = () => {
return <Page />;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/pages/home/index.tsx → src/app/home/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import { memo } from 'react';

import Loading from '@/pages/home/Loading';
import {
useEffectAfterSessionHydrated,
useSessionHydrated,
Expand All @@ -11,6 +10,7 @@ import {
import { sessionSelectors } from '@/store/session/selectors';

import Welcome from '../welcome';
import Loading from './Loading';

const Home = memo(() => {
const hydrated = useSessionHydrated();
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -3,13 +3,13 @@ import { memo, useState } from 'react';
import { useTranslation } from 'react-i18next';
import { Flexbox } from 'react-layout-kit';

import TokenTag from '@/pages/market/features/SideBar/AgentInfo/TokenTag';
import { useMarketStore } from '@/store/market';

import AgentCardBanner from '../../AgentCard/AgentCardBanner';
import Comment from './Comment';
import Header from './Header';
import Loading from './Loading';
import TokenTag from './TokenTag';
import { useStyles } from './style';

enum InfoTabs {
Expand Down
2 changes: 1 addition & 1 deletion src/pages/market/index.tsx → src/app/market/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';

import AgentCard from './features/AgentCard';
import AgentSearchBar from './features/AgentSearchBar';
import DesktopLayout from './layout';
import MobileLayout from './layout.mobile';
import DesktopLayout from './layout.pc';

const Market = memo(() => {
const { t } = useTranslation('common');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ import { ReactNode, memo } from 'react';
import { Flexbox } from 'react-layout-kit';

import AppMobileLayout from '@/layout/AppMobileLayout';
import SideBar from '@/pages/market/features/SideBar';
import { useSwitchSideBarOnInit } from '@/store/global';

import Header from './features/Header';
import SideBar from './features/SideBar';

const MarketLayout = memo<{ children: ReactNode }>(({ children }) => {
useSwitchSideBarOnInit('market');
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion src/app/welcome/page.page.tsx → src/app/market/page.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Page from '@/pages/welcome';
import Page from './index';

const Index = () => {
return <Page />;
Expand Down
7 changes: 7 additions & 0 deletions src/app/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Page from './home';

const Index = () => {
return <Page />;
};

export default Index;
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { useSwitchSideBarOnInit } from '@/store/global';
import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';

import Settings from './features/Settings';
import DesktopLayout from './layout';
import MobileLayout from './layout.mobile';
import DesktopLayout from './layout.pc';

const Setting = memo(() => {
const { mobile } = useResponsive();
Expand Down
File renamed without changes.
7 changes: 0 additions & 7 deletions src/app/settings/page.page.tsx

This file was deleted.

7 changes: 7 additions & 0 deletions src/app/settings/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Page from './index';

const Index = () => {
return <Page />;
};

export default Index;
2 changes: 1 addition & 1 deletion src/pages/welcome/index.tsx → src/app/welcome/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import { genSiteHeadTitle } from '@/utils/genSiteHeadTitle';

import Banner from './features/Banner';
import Footer from './features/Footer';
import Layout from './layout';
import Mobile from './layout.mobile';
import Layout from './layout.pc';

const Welcome = memo(() => {
const { mobile } = useResponsive();
Expand Down
File renamed without changes.
File renamed without changes.
7 changes: 7 additions & 0 deletions src/app/welcome/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import Page from './index';

const Index = () => {
return <Page />;
};

export default Index;