fix: refactor components structure

x1unix · Jan 21, 2024 · 1cf7a70 · 1cf7a70
1 parent 90f4364
commit 1cf7a70
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 22 deletions.
diff --git a/...c/components/layout/Panel/PanelAction.css → ...lements/panel/PanelAction/PanelAction.css b/...c/components/layout/Panel/PanelAction.css → ...lements/panel/PanelAction/PanelAction.css
diff --git a/...c/components/layout/Panel/PanelAction.tsx → ...lements/panel/PanelAction/PanelAction.tsx b/...c/components/layout/Panel/PanelAction.tsx → ...lements/panel/PanelAction/PanelAction.tsx
diff --git a/web/src/components/elements/panel/PanelAction/index.ts b/web/src/components/elements/panel/PanelAction/index.ts
@@ -0,0 +1 @@
+export * from './PanelAction';
diff --git a/...c/components/layout/Panel/PanelHeader.css → ...lements/panel/PanelHeader/PanelHeader.css b/...c/components/layout/Panel/PanelHeader.css → ...lements/panel/PanelHeader/PanelHeader.css
diff --git a/...c/components/layout/Panel/PanelHeader.tsx → ...lements/panel/PanelHeader/PanelHeader.tsx b/...c/components/layout/Panel/PanelHeader.tsx → ...lements/panel/PanelHeader/PanelHeader.tsx
@@ -1,6 +1,6 @@
 import React, {useContext} from 'react';
 import {ITheme, ThemeContext} from '@fluentui/react';
-import {PanelAction, PanelActionProps} from '~/components/layout/Panel/PanelAction';
+import { PanelAction, type PanelActionProps } from '../PanelAction';
 import './PanelHeader.css';
 
 interface Props {

diff --git a/web/src/components/elements/panel/PanelHeader/index.ts b/web/src/components/elements/panel/PanelHeader/index.ts
@@ -0,0 +1 @@
+export * from './PanelHeader';
diff --git a/web/src/components/elements/tabs/TabHeader/TabHeader.module.css b/web/src/components/elements/tabs/TabHeader/TabHeader.module.css
diff --git a/web/src/components/elements/tabs/TabHeader/TabHeader.tsx b/web/src/components/elements/tabs/TabHeader/TabHeader.tsx
diff --git a/web/src/components/elements/tabs/TabLabel/TabLabel.module.css b/web/src/components/elements/tabs/TabLabel/TabLabel.module.css
diff --git a/web/src/components/elements/tabs/TabLabel/TabLabel.tsx b/web/src/components/elements/tabs/TabLabel/TabLabel.tsx
diff --git a/web/src/components/features/inspector/InspectorPanel/InspectorPanel.tsx b/web/src/components/features/inspector/InspectorPanel/InspectorPanel.tsx
@@ -9,8 +9,8 @@ import {
   VscSplitVertical
 } from 'react-icons/vsc';
 
-import { RunOutput } from '../RunOutput';
-import { PanelHeader } from '~/components/layout/Panel/PanelHeader';
+import { ConnectedRunOutput } from '../RunOutput';
+import { PanelHeader } from '~/components/elements/panel/PanelHeader';
 import {LayoutType, DEFAULT_PANEL_HEIGHT, DEFAULT_PANEL_WIDTH} from '~/styles/layout';
 import './InspectorPanel.css';
 
@@ -116,7 +116,7 @@ export const InspectorPanel: React.FC<Props> = ({
         }}
       />
       <div className="InspectorPanel__container" hidden={isCollapsed}>
-        <RunOutput />
+        <ConnectedRunOutput />
       </div>
     </Resizable>
   );

diff --git a/web/src/components/features/inspector/RunOutput/RunOutput.tsx b/web/src/components/features/inspector/RunOutput/RunOutput.tsx
@@ -21,7 +21,7 @@ interface StateProps {
   terminal: TerminalState
 }
 
-const RunOutputBase: React.FC<StateProps & OwnProps> = ({ status, monaco, terminal }) => {
+const RunOutput: React.FC<StateProps & OwnProps> = ({ status, monaco, terminal }) => {
   const theme = useTheme();
   const { fontSize, renderingBackend } = terminal.settings;
   const styles = useMemo(() => {
@@ -74,9 +74,9 @@ const RunOutputBase: React.FC<StateProps & OwnProps> = ({ status, monaco, termin
   )
 }
 
-export const RunOutput = connect<StateProps, OwnProps>((
+export const ConnectedRunOutput = connect<StateProps, OwnProps>((
   { status, monaco, terminal }
 ) => ({
   status, monaco, terminal
-}))(RunOutputBase);
+}))(RunOutput);
 
diff --git a/web/src/components/layout/StatusBar/StatusBar.tsx b/web/src/components/layout/StatusBar/StatusBar.tsx
@@ -92,7 +92,7 @@ const getStatusItem = ({loading, running, lastError}: StateProps) => {
 }
 
 
-const StatusBarBase: React.FC<Props> = ({
+const StatusBar: React.FC<Props> = ({
   loading,
   running,
   lastError,
@@ -152,7 +152,7 @@ const StatusBarBase: React.FC<Props> = ({
   );
 };
 
-export const StatusBar = connect<StateProps, OwnProps>(
+export const ConnectedStatusBar = connect<StateProps, OwnProps>(
   ({status}) => {
     const {
       loading,
@@ -162,4 +162,4 @@ export const StatusBar = connect<StateProps, OwnProps>(
     } = status!;
     return { loading, lastError, running, markers };
   }
-)(StatusBarBase);
+)(StatusBar);
diff --git a/web/src/components/pages/PlaygroundPage/PlaygroundPage.tsx b/web/src/components/pages/PlaygroundPage/PlaygroundPage.tsx
@@ -12,7 +12,7 @@ import { FlexContainer } from '~/components/features/editor/FlexContainer';
 import { InspectorPanel } from '~/components/features/inspector/InspectorPanel/InspectorPanel';
 import { NotificationHost } from "~/components/modals/Notification";
 import { Layout } from '~/components/layout/Layout/Layout';
-import { StatusBar } from '~/components/layout/StatusBar';
+import { ConnectedStatusBar } from '~/components/layout/StatusBar';
 
 import './PlaygroundPage.css';
 
@@ -47,7 +47,7 @@ export const PlaygroundPage = connect(({ panel }: any) => ({ panelProps: panel }
         />
         <NotificationHost />
       </Layout>
-      <StatusBar />
+      <ConnectedStatusBar />
     </div>
   );
 });