Move each component in lib into separate folder

mullvad · Feb 3, 2025 · 025b0e5 · 025b0e5
1 parent e0d2a14
commit 025b0e5
Show file tree

Hide file tree

Showing 29 changed files with 33 additions and 29 deletions.
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/atoms/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/atoms/index.ts
diff --git a/...rc/renderer/lib/components/layout/Box.tsx → ...n/src/renderer/lib/components/box/Box.tsx b/...rc/renderer/lib/components/layout/Box.tsx → ...n/src/renderer/lib/components/box/Box.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import { Layout, LayoutProps } from './Layout';
+import { Layout, LayoutProps } from '../layout';
 
 interface BoxProps extends LayoutProps {
   $width?: string;

diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/box/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/box/index.ts
@@ -0,0 +1 @@
+export * from './Box';
diff --git a/...derer/lib/components/molecules/Button.tsx → ...renderer/lib/components/button/Button.tsx b/...derer/lib/components/molecules/Button.tsx → ...renderer/lib/components/button/Button.tsx
@@ -3,7 +3,7 @@ import styled from 'styled-components';
 
 import { Colors, Radius, Spacings } from '../../foundations';
 import { buttonReset } from '../../styles';
-import { Flex } from '../layout';
+import { Flex } from '../flex';
 import { BodySmallSemiBold } from '../typography';
 
 export interface ButtonProps extends React.ButtonHTMLAttributes<HTMLButtonElement> {

diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/button/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/button/index.ts
@@ -0,0 +1 @@
+export * from './Button';
diff --git a/...derer/lib/components/layout/Container.tsx → ...er/lib/components/container/Container.tsx b/...derer/lib/components/layout/Container.tsx → ...er/lib/components/container/Container.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { Spacings } from '../../foundations';
-import { Flex, FlexProps } from './Flex';
+import { FlexProps, Flex } from '../flex';
 
 export interface ContainerProps extends FlexProps {
   size?: '3' | '4';

diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/container/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/container/index.ts
@@ -0,0 +1 @@
+export * from './Container';
diff --git a/...c/renderer/lib/components/layout/Flex.tsx → ...src/renderer/lib/components/flex/Flex.tsx b/...c/renderer/lib/components/layout/Flex.tsx → ...src/renderer/lib/components/flex/Flex.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import styled from 'styled-components';
 
 import { Spacings } from '../../foundations';
-import { Layout, LayoutProps } from './Layout';
+import { Layout, LayoutProps } from '../layout';
 
 export interface FlexProps extends LayoutProps {
   $gap?: Spacings;

diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/flex/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/flex/index.ts
@@ -0,0 +1 @@
+export * from './Flex';
diff --git a/...r/lib/components/molecules/IconButton.tsx → ...lib/components/icon-button/IconButton.tsx b/...r/lib/components/molecules/IconButton.tsx → ...lib/components/icon-button/IconButton.tsx
diff --git a/...enderer/lib/components/molecules/index.ts → ...derer/lib/components/icon-button/index.ts b/...enderer/lib/components/molecules/index.ts → ...derer/lib/components/icon-button/index.ts
@@ -1,2 +1 @@
-export * from './Button';
 export * from './IconButton';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/index.ts
@@ -1,5 +1,11 @@
+export * from './box';
+export * from './button';
+export * from './container';
+export * from './flex';
+export * from './icon-button';
 export * from './layout';
-export * from './atoms';
+export * from './logo';
+export * from './main-header';
+export * from './navigation-header';
+export * from './theme';
 export * from './typography';
-export * from './molecules';
-export * from './organisms';
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/layout/index.ts
@@ -1,5 +1 @@
-export * from './Box';
-export * from './Container';
-export * from './Flex';
 export * from './Layout';
-export * from './Theme';
diff --git a/...nderer/lib/components/atoms/logo/Logo.tsx → ...src/renderer/lib/components/logo/Logo.tsx b/...nderer/lib/components/atoms/logo/Logo.tsx → ...src/renderer/lib/components/logo/Logo.tsx
@@ -1,6 +1,6 @@
-import ImageView from '../../../../components/ImageView';
-import { Spacings } from '../../../foundations';
-import { Flex } from '../../layout';
+import ImageView from '../../../components/ImageView';
+import { Spacings } from '../../foundations';
+import { Flex } from '../flex';
 
 export interface LogoProps {
   variant?: 'icon' | 'text' | 'both';

diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/logo/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/logo/index.ts
@@ -0,0 +1 @@
+export * from './Logo';
diff --git a/...ents/organisms/main-header/MainHeader.tsx → ...lib/components/main-header/MainHeader.tsx b/...ents/organisms/main-header/MainHeader.tsx → ...lib/components/main-header/MainHeader.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
-import { Colors, Spacings } from '../../../foundations';
-import { TransientProps } from '../../../types';
-import { Flex } from '../../layout';
+import { Colors, Spacings } from '../../foundations';
+import { TransientProps } from '../../types';
+import { Flex } from '../flex';
 import { MainHeaderIconButton } from './components';
 
 export type HeaderProps = React.PropsWithChildren<{

diff --git a/...eader/components/MainHeaderIconButton.tsx → ...eader/components/MainHeaderIconButton.tsx b/...eader/components/MainHeaderIconButton.tsx → ...eader/components/MainHeaderIconButton.tsx
@@ -1,4 +1,4 @@
-import { IconButton, IconButtonProps } from '../../../molecules';
+import { IconButton, IconButtonProps } from '../../icon-button';
 
 export const MainHeaderIconButton = (props: IconButtonProps) => {
   return <IconButton variant="secondary" {...props} />;

diff --git a/...organisms/main-header/components/index.ts → ...omponents/main-header/components/index.ts b/...organisms/main-header/components/index.ts → ...omponents/main-header/components/index.ts
diff --git a/...components/organisms/main-header/index.ts → ...derer/lib/components/main-header/index.ts b/...components/organisms/main-header/index.ts → ...derer/lib/components/main-header/index.ts
diff --git a/...ms/navigation-header/NavigationHeader.tsx → ...ts/navigation-header/NavigationHeader.tsx b/...ms/navigation-header/NavigationHeader.tsx → ...ts/navigation-header/NavigationHeader.tsx
@@ -1,8 +1,8 @@
 import styled from 'styled-components';
 
-import { Colors, Spacings } from '../../../foundations';
-import { TransientProps } from '../../../types';
-import { Flex } from '../../layout';
+import { Colors, Spacings } from '../../foundations';
+import { TransientProps } from '../../types';
+import { Flex } from '../flex';
 import {
   NavigationHeaderButtonGroup,
   NavigationHeaderIconButton,

diff --git a/...gation-header/NavigationHeaderContext.tsx → ...gation-header/NavigationHeaderContext.tsx b/...gation-header/NavigationHeaderContext.tsx → ...gation-header/NavigationHeaderContext.tsx
diff --git a/...omponents/NavigationHeaderButtonGroup.tsx → ...omponents/NavigationHeaderButtonGroup.tsx b/...omponents/NavigationHeaderButtonGroup.tsx → ...omponents/NavigationHeaderButtonGroup.tsx
@@ -1,7 +1,7 @@
 import styled from 'styled-components';
 
-import { Spacings } from '../../../../foundations';
-import { Flex } from '../../../layout';
+import { Spacings } from '../../../foundations';
+import { Flex } from '../../flex';
 
 export const NavigationHeaderButtonGroup = styled(Flex).attrs({
   $gap: Spacings.spacing6,

diff --git a/...components/NavigationHeaderIconButton.tsx → ...components/NavigationHeaderIconButton.tsx b/...components/NavigationHeaderIconButton.tsx → ...components/NavigationHeaderIconButton.tsx
@@ -1,4 +1,4 @@
-import { IconButton, IconButtonProps } from '../../../molecules';
+import { IconButton, IconButtonProps } from '../../icon-button';
 
 export const NavigationHeaderIconButton = (props: IconButtonProps) => {
   return <IconButton variant="secondary" {...props} />;

diff --git a/...ader/components/NavigationHeaderTitle.tsx → ...ader/components/NavigationHeaderTitle.tsx b/...ader/components/NavigationHeaderTitle.tsx → ...ader/components/NavigationHeaderTitle.tsx
@@ -1,6 +1,6 @@
 import styled from 'styled-components';
 
-import { TitleMedium } from '../../../typography';
+import { TitleMedium } from '../../typography';
 import { useNavigationHeader } from '../NavigationHeaderContext';
 
 export interface NavigationHeaderTitleProps {

diff --git a/...sms/navigation-header/components/index.ts → ...nts/navigation-header/components/index.ts b/...sms/navigation-header/components/index.ts → ...nts/navigation-header/components/index.ts
diff --git a/...ents/organisms/navigation-header/index.ts → ...lib/components/navigation-header/index.ts b/...ents/organisms/navigation-header/index.ts → ...lib/components/navigation-header/index.ts
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/organisms/index.ts
diff --git a/.../renderer/lib/components/layout/Theme.tsx → ...c/renderer/lib/components/theme/Theme.tsx b/.../renderer/lib/components/layout/Theme.tsx → ...c/renderer/lib/components/theme/Theme.tsx
diff --git a/desktop/packages/mullvad-vpn/src/renderer/lib/components/theme/index.ts b/desktop/packages/mullvad-vpn/src/renderer/lib/components/theme/index.ts
@@ -0,0 +1 @@
+export * from './Theme';
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		export * from './Button';
		export * from './IconButton';