Merge pull request #470 from Bamdoliro/develop

Release - user v1.0.8

.czrc

@@ -0,0 +1,3 @@
+{
+  "path": "cz-conventional-changelog"
+}

.eslintignore

@@ -0,0 +1,5 @@
+.vscode
+.eslintrc.js
+node_modules
+esm
+dist

.github/CODEOWNERS

@@ -1 +1 @@
-*.* @Bamdoliro/maru-frontend
+* @SEOKKAMONI @arkk20000

.husky/commit-msg

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+pnpm commitlint --edit $1

.husky/pre-commit

@@ -0,0 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
+pnpm lint-staged

.lintstagedrc

@@ -0,0 +1,3 @@
+{
+  "*.{ts,tsx}": ["prettier --write"]
+}

.nvmrc

@@ -0,0 +1 @@
+v20.8.1

.prettierrc

@@ -0,0 +1,14 @@
+{
+    "arrowParens": "always",
+    "bracketSameLine": false,
+    "bracketSpacing": true,
+    "endOfLine": "lf",
+    "jsxSingleQuote": false,
+    "printWidth": 90,
+    "proseWrap": "preserve",
+    "quoteProps": "as-needed",
+    "semi": true,
+    "singleQuote": true,
+    "tabWidth": 2,
+    "trailingComma": "es5"
+  }

README.md

@@ -1,13 +1,12 @@
 ![image](https://github.com/Bamdoliro/marururu/assets/102123549/07bb8be6-a90d-48c2-a282-ba05dec78ec3)
 
-
 # 마루(maru)
 
 마루는 밤돌이로에서 개발 중인 부산소프트웨어마이스터 고등학교의 입학 전형 시스템이에요. <br>
 마루는 입학 과정에 있어서 선생님들과 학생들을 편리하게 하는 것을 목적으로 개발하고 있어요.
 
--   [**apps**](https://github.com/Bamdoliro/marururu/tree/develop/apps): 마루의 admin, user 등 다양한 웹이 들어가요. 대표적인 예시로 [user](https://github.com/Bamdoliro/marururu/tree/develop/apps/user)
--   [**packages**](https://github.com/Bamdoliro/marururu/tree/develop/packages): 마루의 개발을 도와줄 다양한 라이브러리들이 들어가요. 대표적인 예시로 [@maru/ui](https://github.com/Bamdoliro/marururu/tree/develop/packages/maru-ui), [@maru/theme](https://github.com/Bamdoliro/marururu/tree/develop/packages/maru-theme)
+- [**apps**](https://github.com/Bamdoliro/marururu/tree/develop/apps): 마루의 admin, user 등 다양한 웹이 들어가요. 대표적인 예시로 [user](https://github.com/Bamdoliro/marururu/tree/develop/apps/user), [admin](https://github.com/Bamdoliro/marururu/tree/develop/apps/admin)
+- [**packages**](https://github.com/Bamdoliro/marururu/tree/develop/packages): 마루의 개발을 도와줄 다양한 라이브러리들이 들어가요. 대표적인 예시로 [@maru/ui](https://github.com/Bamdoliro/marururu/tree/develop/packages/ui), [@maru/design-token](https://github.com/Bamdoliro/marururu/tree/develop/packages/theme)
 
 ## 라이선스
 

apps/admin/.eslintrc.js

@@ -1,5 +1,4 @@
 module.exports = {
-    root: true,
-    // This tells ESLint to load the config from the package `eslint-config-custom`
-    extends: ['@maru/eslint/common', '@maru/eslint/query', 'plugin:storybook/recommended'],
+  root: true,
+  extends: ['@maru/eslint-config/react-ts-noimport', 'plugin:@next/next/recommended'],
 };

apps/admin/.storybook/main.ts

@@ -8,36 +8,36 @@ import TsconfigPathsPlugin from 'tsconfig-paths-webpack-plugin';
  * It is needed in projects that use Yarn PnP or are set up within a monorepo.
  */
 function getAbsolutePath(value: string): any {
-    return dirname(require.resolve(join(value, 'package.json')));
+  return dirname(require.resolve(join(value, 'package.json')));
 }
 const config: StorybookConfig = {
-    stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
-    addons: [
-        getAbsolutePath('@storybook/addon-links'),
-        getAbsolutePath('@storybook/addon-essentials'),
-        getAbsolutePath('@storybook/addon-onboarding'),
-        getAbsolutePath('@storybook/addon-interactions'),
-        getAbsolutePath('@storybook/addon-styling'),
-    ],
-    framework: {
-        name: getAbsolutePath('@storybook/nextjs'),
-        options: {},
-    },
-    docs: {
-        autodocs: 'tag',
-    },
-    staticDirs: ['../public'],
-    webpackFinal: async (config) => {
-        if (config.resolve) {
-            config.resolve.plugins = [
-                ...(config.resolve.plugins || []),
-                new TsconfigPathsPlugin({
-                    extensions: config.resolve.extensions,
-                }),
-            ];
-        }
+  stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
+  addons: [
+    getAbsolutePath('@storybook/addon-links'),
+    getAbsolutePath('@storybook/addon-essentials'),
+    getAbsolutePath('@storybook/addon-onboarding'),
+    getAbsolutePath('@storybook/addon-interactions'),
+    getAbsolutePath('@storybook/addon-styling'),
+  ],
+  framework: {
+    name: getAbsolutePath('@storybook/nextjs'),
+    options: {},
+  },
+  docs: {
+    autodocs: 'tag',
+  },
+  staticDirs: ['../public'],
+  webpackFinal: async (config) => {
+    if (config.resolve) {
+      config.resolve.plugins = [
+        ...(config.resolve.plugins || []),
+        new TsconfigPathsPlugin({
+          extensions: config.resolve.extensions,
+        }),
+      ];
+    }
 
-        return config;
-    },
+    return config;
+  },
 };
 export default config;

apps/admin/.storybook/preview.ts

@@ -1,23 +1,23 @@
-import { GlobalStyle } from '@maru/theme';
+import { GlobalStyle } from '@maru/design-token';
 import { withThemeFromJSXProvider } from '@storybook/addon-styling';
 import type { Preview } from '@storybook/react';
 
 export const decorators = [
-    withThemeFromJSXProvider({
-        GlobalStyles: GlobalStyle, // Adds your GlobalStyle component to all stories
-    }),
+  withThemeFromJSXProvider({
+    GlobalStyles: GlobalStyle, // Adds your GlobalStyle component to all stories
+  }),
 ];
 
 const preview: Preview = {
-    parameters: {
-        actions: { argTypesRegex: '^on[A-Z].*' },
-        controls: {
-            matchers: {
-                color: /(background|color)$/i,
-                date: /Date$/,
-            },
-        },
+  parameters: {
+    actions: { argTypesRegex: '^on[A-Z].*' },
+    controls: {
+      matchers: {
+        color: /(background|color)$/i,
+        date: /Date$/,
+      },
     },
+  },
 };
 
 export default preview;

apps/admin/next.config.js

@@ -1,9 +1,9 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-    transpilePackages: ['@maru/theme'],
-    images: {
-        domains: ['s3.ap-northeast-2.amazonaws.com'],
-    },
+  transpilePackages: ['@maru/design-token'],
+  images: {
+    domains: ['s3.ap-northeast-2.amazonaws.com'],
+  },
 };
 
 module.exports = nextConfig;

apps/admin/package.json

@@ -11,8 +11,9 @@
     "build-storybook": "storybook build"
   },
   "devDependencies": {
-    "@maru/eslint": "workspace:*",
+    "@maru/eslint-config": "workspace:*",
     "@maru/tsconfig": "workspace:*",
+    "@next/eslint-plugin-next": "^14.0.0",
     "@storybook/addon-essentials": "^7.3.1",
     "@storybook/addon-interactions": "^7.3.1",
     "@storybook/addon-links": "^7.3.1",
@@ -26,7 +27,6 @@
     "@types/react": "18.2.13",
     "@types/react-dom": "18.2.6",
     "@types/styled-components": "^5.1.26",
-    "babel-plugin-styled-components": "^2.1.4",
     "eslint-plugin-storybook": "^0.6.13",
     "msw": "^1.2.2",
     "storybook": "^7.3.1",
@@ -37,14 +37,14 @@
   "dependencies": {
     "@maru/hooks": "workspace:*",
     "@maru/icon": "workspace:*",
-    "@maru/theme": "workspace:*",
+    "@maru/design-token": "workspace:*",
     "@maru/ui": "workspace:*",
     "@maru/utils": "workspace:*",
     "@tanstack/react-query": "^4.32.6",
     "@tanstack/react-query-devtools": "^4.32.6",
     "@toss/react": "^1.5.0",
     "@toss/use-overlay": "^1.3.6",
-    "axios": "^1.4.0",
+    "axios": "^1.6.0",
     "next": "13.5.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",

apps/admin/src/apis/instance/instance.ts

@@ -1,27 +1,27 @@
 import axios from 'axios';
 
 export const maru = axios.create({
-    baseURL: process.env.NEXT_PUBLIC_BASE_URL,
-    timeout: 15000,
-    headers: {
-        'Content-Type': 'application/json',
-    },
+  baseURL: process.env.NEXT_PUBLIC_BASE_URL,
+  timeout: 15000,
+  headers: {
+    'Content-Type': 'application/json',
+  },
 });
 
 maru.interceptors.request.use(
-    (config) => {
-        return config;
-    },
-    (error) => {
-        return Promise.reject(error);
-    },
+  (config) => {
+    return config;
+  },
+  (error) => {
+    return Promise.reject(error);
+  }
 );
 
 maru.interceptors.response.use(
-    (response) => {
-        return response;
-    },
-    async (error) => {
-        return Promise.reject(error);
-    },
+  (response) => {
+    return response;
+  },
+  async (error) => {
+    return Promise.reject(error);
+  }
 );

apps/admin/src/apis/storage/storage.ts

@@ -1,11 +1,11 @@
 type LocalStorageKey = 'access-token' | 'refresh-token';
 export class Storage {
-    static getItem(key: LocalStorageKey) {
-        return typeof window !== 'undefined' ? localStorage.getItem(key) : null;
-    }
+  static getItem(key: LocalStorageKey) {
+    return typeof window !== 'undefined' ? localStorage.getItem(key) : null;
+  }
 
-    static setItem(key: LocalStorageKey, value: string) {
-        if (typeof window === 'undefined') return;
-        localStorage.setItem(key, value);
-    }
+  static setItem(key: LocalStorageKey, value: string) {
+    if (typeof window === 'undefined') return;
+    localStorage.setItem(key, value);
+  }
 }