Merge pull request #1 from luckfunc/deploy

luckfunc · web-flow · commit 097dce1a4c2d · 2024-08-11T22:56:40.000+08:00
merge deploy
diff --git a/src/App.tsx b/src/App.tsx
@@ -1,5 +1,5 @@
-import { Container, Sidebar } from '@/layouts';
-import { useAvatarOption } from '@/hooks';
+import { Container, Sidebar } from '@layouts';
+import { useAvatarOption } from '@hooks';
 import './App.less';
 
 export default function App() {
diff --git a/src/components/action-bar/index.tsx b/src/components/action-bar/index.tsx
@@ -1,10 +1,9 @@
 import { useDispatch } from 'react-redux';
-import { ActionType } from '@/enums';
-import IconBack from '../../assets/icons/icon-back.svg';
-import IconFlip from '../../assets/icons/icon-flip.svg';
-import IconNext from '../../assets/icons/icon-next.svg';
-// import { AppState } from '../../types';
-import './style.less'
+import { ActionType } from '@enums';
+import IconBack from '@assets/icons/icon-back.svg';
+import IconFlip from '@assets/icons/icon-flip.svg';
+import IconNext from '@assets/icons/icon-next.svg';
+import './style.less';
 
 interface IProps {
     flipped: boolean
diff --git a/src/components/color-list-item/index.tsx b/src/components/color-list-item/index.tsx
@@ -1,5 +1,5 @@
-import { SETTINGS } from '@/constants';
-import { AvatarOption } from '@/types';
+import { SETTINGS } from '@constants';
+import { AvatarOption } from '@types';
 
 interface IProps {
     avatarOption: AvatarOption
diff --git a/src/components/configurator/index.tsx b/src/components/configurator/index.tsx
@@ -1,5 +1,5 @@
 import PerfectScrollbar from '../perfect-scrollbar';
-import { AvatarOption } from '@/types';
+import { AvatarOption } from '@types';
 import './style.less';
 
 interface IProps {
diff --git a/src/components/logo/index.tsx b/src/components/logo/index.tsx
@@ -1,5 +1,4 @@
-// import React from 'react';
-import logoSvg from '../../assets/logo.svg';
+import logoSvg from '@assets/logo.svg';
 
 export default function Logo() {
     return <img src={logoSvg} alt="logo" />;
diff --git a/src/components/perfect-scrollbar/index.tsx b/src/components/perfect-scrollbar/index.tsx
@@ -1,9 +1,9 @@
 import { useEffect, useRef, useState } from 'react';
-import { SectionWrapper, ColorListItem, WrapperShapeItem } from '@/components';
-import { AvatarOption } from '@/types';
-import { BeardShape, WidgetShape, WidgetType } from '@/enums';
-import { getWidgets } from '@/utils';
-import { AVATAR_LAYER, SETTINGS } from '@/constants';
+import { ColorListItem, SectionWrapper, WrapperShapeItem } from '@components';
+import { AvatarOption } from '@types';
+import { BeardShape, WidgetShape, WidgetType } from '@enums';
+import { getWidgets } from '@utils';
+import { AVATAR_LAYER, SETTINGS } from '@constants';
 
 interface IProps {
     avatarOption: AvatarOption
diff --git a/src/components/react-color-avatar/index.tsx b/src/components/react-color-avatar/index.tsx
@@ -1,9 +1,9 @@
 import { CSSProperties, RefObject, useEffect, useState } from 'react';
-import { Background } from '@/components/widgets';
-import { WidgetShape, WidgetType, WrapperShape } from '@/enums';
-import { AvatarOption, Widget } from '@/types';
-import { AVATAR_LAYER, NONE } from '@/constants';
-import { widgetData } from '@/utils/dynamic-data';
+import { Background } from '@components/widgets';
+import { WidgetShape, WidgetType, WrapperShape } from '@enums';
+import { AvatarOption, Widget } from '@types';
+import { AVATAR_LAYER, NONE } from '@constants';
+import { widgetData } from '@utils/dynamic-data';
 import './style.less';
 
 interface IReactColorAvatarProps {
diff --git a/src/components/section-wrapper/index.tsx b/src/components/section-wrapper/index.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import './style.less'
+import './style.less';
 
 interface IProps {
     title?: string
diff --git a/src/components/widgets/background/index.tsx b/src/components/widgets/background/index.tsx
@@ -1,4 +1,4 @@
-import { AvatarOption } from '@/types';
+import { AvatarOption } from '@types';
 import './style.less';
 
 interface BackgroundProps {
diff --git a/src/components/wrapper-shape-item/index.tsx b/src/components/wrapper-shape-item/index.tsx
@@ -1,6 +1,6 @@
-import { SETTINGS } from '@/constants';
-import { WrapperShape } from '@/enums';
-import { AvatarOption } from '@/types';
+import { SETTINGS } from '@constants';
+import { WrapperShape } from '@enums';
+import { AvatarOption } from '@types';
 
 interface IProps {
     avatarOption: AvatarOption
diff --git a/src/constants/index.ts b/src/constants/index.ts
@@ -1,4 +1,4 @@
-import { AvatarOption, AvatarSettings } from '@/types';
+import { AvatarOption, AvatarSettings } from '@types';
 import {
     BeardShape,
     ClothesShape,
@@ -14,7 +14,7 @@ import {
     TopsShape,
     WidgetType,
     WrapperShape
-} from '@/enums';
+} from '@enums';
 
 export const AVATAR_LAYER: Readonly<{
     [key in `${WidgetType}`]: { zIndex: number }
diff --git a/src/hooks/useAvatarOption/index.ts b/src/hooks/useAvatarOption/index.ts
@@ -1,6 +1,6 @@
 import { useDispatch, useSelector } from 'react-redux';
-import { SET_AVATAR_OPTION } from '@/store/mutation-type';
-import type { AppState, AvatarOption } from '@/types';
+import { SET_AVATAR_OPTION } from '@store/mutation-type';
+import type { AppState, AvatarOption } from '@types';
 
 export default function useAvatarOption() {
     const avatarOption = useSelector((state: AppState) => state.history.present);
diff --git a/src/hooks/useSideBar/index.ts b/src/hooks/useSideBar/index.ts
@@ -1,6 +1,6 @@
 import { useDispatch, useSelector } from 'react-redux';
-import { SET_SIDER_STATUS } from '@/store/mutation-type';
-import { AppState } from '@/types';
+import { SET_SIDER_STATUS } from '@store/mutation-type';
+import { AppState } from '@types';
 
 export default function useSideBar() {
     const isCollapsed = useSelector((state: AppState) => state.isCollapsed);
diff --git a/src/layouts/container/index.tsx b/src/layouts/container/index.tsx
@@ -1,9 +1,9 @@
 import { useRef, useState } from 'react';
-import { ActionBar, ReactColorAvatar } from '@/components';
-import { Header, Footer } from '@/layouts';
-import { AvatarOption } from '@/types';
-import { getRandomAvatarOption, getSpecialAvatarOption } from '@/utils';
-import { DOWNLOAD_DELAY, NOT_COMPATIBLE_AGENTS, TRIGGER_PROBABILITY } from '@/constants';
+import { ActionBar, ReactColorAvatar } from '@components';
+import { Footer, Header } from '@layouts';
+import { AvatarOption } from '@types';
+import { getRandomAvatarOption, getSpecialAvatarOption } from '@utils';
+import { DOWNLOAD_DELAY, NOT_COMPATIBLE_AGENTS, TRIGGER_PROBABILITY } from '@constants';
 import { name } from '../../../package.json';
 import './style.less';
 
diff --git a/src/layouts/footer/index.tsx b/src/layouts/footer/index.tsx
@@ -1,5 +1,5 @@
 import { version } from '../../../package.json';
-import './style.less'
+import './style.less';
 
 export default function Footer() {
     return (
diff --git a/src/layouts/header/index.tsx b/src/layouts/header/index.tsx
@@ -1,6 +1,6 @@
-import { Logo } from '@/components';
-import IconGitHub from '../../assets/icons/icon-github.svg';
-import './style.less'
+import { Logo } from '@components';
+import IconGitHub from '@assets/icons/icon-github.svg';
+import './style.less';
 
 export default function Header() {
     return (
diff --git a/src/layouts/index.ts b/src/layouts/index.ts
@@ -1,7 +1,7 @@
-import Container from '@/layouts/container';
-import Footer from '@/layouts/footer';
-import Header from '@/layouts/header';
-import Sidebar from '@/layouts/sidebar';
+import Container from '@layouts/container';
+import Footer from '@layouts/footer';
+import Header from '@layouts/header';
+import Sidebar from '@layouts/sidebar';
 
 export {
     Container,
diff --git a/src/layouts/sidebar/index.tsx b/src/layouts/sidebar/index.tsx
@@ -1,7 +1,7 @@
-import { Configurator } from '@/components';
-import { AvatarOption } from '@/types';
-import { useSideBar } from '@/hooks';
-import IconRight from '../../assets/icons/icon-right.svg';
+import { Configurator } from '@components';
+import { AvatarOption } from '@types';
+import { useSideBar } from '@hooks';
+import IconRight from '@assets/icons/icon-right.svg';
 import './style.less';
 
 interface IProps {
diff --git a/src/store/index.ts b/src/store/index.ts
@@ -1,8 +1,8 @@
 import { combineReducers, legacy_createStore } from 'redux';
-import { getRandomAvatarOption } from '@/utils';
-import { WrapperShape } from '@/enums';
-import { SCREEN } from '@/constants';
-import { ActionTypes } from '@/types';
+import { getRandomAvatarOption } from '@utils';
+import { WrapperShape } from '@enums';
+import { SCREEN } from '@constants';
+import { ActionTypes } from '@types';
 import { REDO, SET_AVATAR_OPTION, SET_SIDER_STATUS, UNDO } from './mutation-type';
 
 
diff --git a/src/types/index.ts b/src/types/index.ts
@@ -1,5 +1,5 @@
-import { type NONE } from '@/constants'
-import { REDO, SET_AVATAR_OPTION, SET_SIDER_STATUS, UNDO } from '@/store/mutation-type';
+import { type NONE } from '@constants';
+import { REDO, SET_AVATAR_OPTION, SET_SIDER_STATUS, UNDO } from '@store/mutation-type';
 import {
     type BeardShape,
     type ClothesShape,
@@ -13,8 +13,8 @@ import {
     type MouthShape,
     type NoseShape,
     type TopsShape,
-    type WrapperShape,
-} from '@/enums'
+    type WrapperShape
+} from '@enums';
 
 export type None = typeof NONE
 
diff --git a/src/utils/dynamic-data.ts b/src/utils/dynamic-data.ts
@@ -10,8 +10,8 @@ import {
     MouthShape,
     NoseShape,
     TopsShape,
-    WidgetType,
-} from '@/enums'
+    WidgetType
+} from '@enums';
 
 /** @internal */
 type Data = Readonly<{
diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -1,6 +1,6 @@
-import { AvatarOption, None } from '@/types';
-import { AVATAR_LAYER, NONE, SETTINGS, SPECIAL_AVATARS } from '@/constants';
-import { BeardShape, EarringsShape, Gender, GlassesShape, TopsShape, WidgetType } from '@/enums';
+import { AvatarOption, None } from '@types';
+import { AVATAR_LAYER, NONE, SETTINGS, SPECIAL_AVATARS } from '@constants';
+import { BeardShape, EarringsShape, Gender, GlassesShape, TopsShape, WidgetType } from '@enums';
 import { previewData } from './dynamic-data';
 
 function getRandomValue<Item = unknown>(
diff --git a/tsconfig.json b/tsconfig.json
@@ -22,7 +22,25 @@
 
     /* Path */
     "paths": {
-      "@/*": ["./src/*"]
+      "@": ["./src"],
+      "@assets/*": ["./src/assets/*"],
+      "@assets": ["./src/assets"],
+      "@utils/*": ["./src/utils/*"],
+      "@utils": ["./src/utils"],
+      "@hooks/*": ["./src/hooks/*"],
+      "@hooks": ["./src/hooks"],
+      "@components/*": ["./src/components/*"],
+      "@components": ["./src/components"],
+      "@constants/*": ["./src/constants/*"],
+      "@constants": ["./src/constants"],
+      "@types/*": ["./src/types/*"],
+      "@types": ["./src/types"],
+      "@layouts/*": ["./src/layouts/*"],
+      "@layouts": ["./src/layouts"],
+      "@enums/*": ["./src/enums/*"],
+      "@enums": ["./src/enums"],
+      "@store/*": ["./src/store/*"],
+      "@store": ["./src/store"],
     }
   },
   "include": ["src"],
diff --git a/vite.config.ts b/vite.config.ts
@@ -6,7 +6,26 @@ export default defineConfig({
   plugins: [react()],
   resolve: {
     alias: {
-      '@': '/src'
+      '@': '/src',
+      '@assets': '/src/assets',
+      '@assets/*': '/src/assets/*',
+      'assets/*': '/src/assets/*',
+      '@utils': '/src/utils',
+      '@utils/*': '/src/utils/*',
+      '@hooks': '/src/hooks',
+      '@hooks/*': '/src/hooks/*',
+      '@components': '/src/components',
+      '@components/*': '/src/components/*',
+      '@constants': '/src/constants',
+      '@constants/*': '/src/constants/*',
+      '@types': '/src/types',
+      '@types/*': '/src/types/*',
+      '@layouts': '/src/layouts',
+      '@layouts/*': '/src/layouts/*',
+      '@store': '/src/store',
+      '@store/*': '/src/store/*',
+      '@enums': '/src/enums',
+      '@enums/*': '/src/enums/*',
     }
   }
 })

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { AvatarOption } from '@/types';`
	`1`	`+import { AvatarOption } from '@types';`
`2`	`2`	`import './style.less';`
`3`	`3`
`4`	`4`	`interface BackgroundProps {`