Merge branch 'main' of https://github.com/msdio/skill-set-generator

Author: msdio

src/Router.tsx

@@ -1,5 +1,5 @@
 import Loading from 'components/loading';
-import RequireState from 'components/requireState';
+import RequireState from 'components/require-state';
 import Cute404 from 'pages/page404/Cute404';
 import { lazy } from 'react';
 import { Route, Routes } from 'react-router-dom';

…ts/BackgroundCircle/BackgroundCircle.tsx …s/background-circle/BackgroundCircle.tsxsrc/components/BackgroundCircle/BackgroundCircle.tsx renamed to src/components/background-circle/BackgroundCircle.tsx src/components/BackgroundCircle/BackgroundCircle.tsx renamed to src/components/background-circle/BackgroundCircle.tsx

@@ -1,5 +1,5 @@
 import { Box, Button, Typography } from '@mui/material';
-import BackgroundCircle from 'components/BackgroundCircle';
+import BackgroundCircle from 'components/background-circle';
 import DraggableIcon from 'components/draggable-icon';
 import Input from 'components/input';
 import { JavascriptIcon, NodeJSIcon, ReactIcon, SpringIcon } from 'constants/icons';

src/components/BackgroundCircle/index.ts src/components/background-circle/index.tssrc/components/BackgroundCircle/index.ts renamed to src/components/background-circle/index.ts

@@ -1,5 +1,5 @@
 import { Box, Container, Typography, useMediaQuery } from '@mui/material';
-import BackgroundCircle from 'components/BackgroundCircle';
+import BackgroundCircle from 'components/background-circle';
 import Header from 'components/header';
 import StackContainer from 'components/stack-container';
 import { useLocation } from 'react-router-dom';

src/components/landing/Landing.tsx

@@ -1,7 +1,7 @@
 import styled from '@emotion/styled';
 import { Box, Button } from '@mui/material';
 import useMediaQuery from '@mui/material/useMediaQuery';
-import BackgroundCircle from 'components/BackgroundCircle';
+import BackgroundCircle from 'components/background-circle';
 import ButtonOptions from 'components/button-options/ButtonOptions';
 import Header from 'components/header';
 import { Link, useLocation, useNavigate } from 'react-router-dom';

…components/requireState/RequireState.tsx …omponents/require-state/RequireState.tsxsrc/components/requireState/RequireState.tsx renamed to src/components/require-state/RequireState.tsx src/components/requireState/RequireState.tsx renamed to src/components/require-state/RequireState.tsx

@@ -0,0 +1,27 @@
+export const colors = {
+  p: {
+    '1': '#0066ff',
+    '2': '#3385ff',
+    '3': '#66a3ff',
+    '4': '#99c2ff',
+    '5': '#cce0ff',
+    '6': '#e6f0ff',
+    '7': '#f0f6ff',
+    '8': '#f5f9ff',
+  },
+
+  cg: {
+    '1': '#0A1320',
+    '2': '#1A2339',
+    '3': '#364261',
+    '4': '#4B597D',
+    '5': '#7886AA',
+    '6': '#B3BACD',
+  },
+
+  info: {
+    light: '#F9F9F9',
+    main: '#8A8A8A',
+    dark: '#444A52',
+  },
+};

src/components/requireState/index.ts src/components/require-state/index.tssrc/components/requireState/index.ts renamed to src/components/require-state/index.ts

@@ -1,52 +1,11 @@
 import { createTheme } from '@mui/material/styles';
 
-export const theme = createTheme({
-  typography: {
-    fontFamily: [
-      'Pretendard Variable',
-      'Pretendard',
-      '-apple-system',
-      'BlinkMacSystemFont',
-      'system-ui',
-      'Roboto',
-      'Helvetica Neue',
-      'Segoe UI',
-      'Apple SD Gothic Neo',
-      'Noto Sans KR',
-      'Malgun Gothic',
-      'Apple Color Emoji',
-      'Segoe UI Emoji',
-      'Segoe UI Symbol',
-      'sans-serif',
-    ].join(','),
-  },
-  palette: {
-    p: {
-      '1': '#0066ff',
-      '2': '#3385ff',
-      '3': '#66a3ff',
-      '4': '#99c2ff',
-      '5': '#cce0ff',
-      '6': '#e6f0ff',
-      '7': '#f0f6ff',
-      '8': '#f5f9ff',
-    },
-
-    cg: {
-      '1': '#0A1320',
-      '2': '#1A2339',
-      '3': '#364261',
-      '4': '#4B597D',
-      '5': '#7886AA',
-      '6': '#B3BACD',
-    },
+import { colors } from './color';
+import { typos } from './typo';
 
-    info: {
-      light: '#F9F9F9',
-      main: '#8A8A8A',
-      dark: '#444A52',
-    },
-  },
+export const theme = createTheme({
+  typography: typos,
+  palette: colors,
   components: {
     MuiAutocomplete: {
       styleOverrides: {