diff --git a/.editorConfig b/.editorConfig new file mode 100644 index 000000000..986929406 --- /dev/null +++ b/.editorConfig @@ -0,0 +1,10 @@ +root = true + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 2 +indent_style = space +insert_final_newline = true +max_line_length = 120 +trim_trailing_whitespace = true \ No newline at end of file diff --git a/.github/workflows/automatic-aws-deployment.yml b/.github/workflows/automatic-aws-deployment.yml index 1b1610684..f5bffc140 100644 --- a/.github/workflows/automatic-aws-deployment.yml +++ b/.github/workflows/automatic-aws-deployment.yml @@ -21,7 +21,7 @@ jobs: - name: Setup pnpm uses: pnpm/action-setup@v4 with: - version: 9 + version: 9.1.3 - name: Install dependencies run: pnpm install --frozen-lockfile diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 59ca439bf..16cf77b11 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -20,7 +20,7 @@ jobs: - name: Setup Pnpm uses: pnpm/action-setup@v4 with: - version: 9 + version: 9.1.3 - name: Cache node modules id: cache-node diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index 079ea126f..25b76f7a8 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -14,13 +14,50 @@ jobs: - name: Install pnpm uses: pnpm/action-setup@v4 with: - version: 9 + version: 9.1.3 - name: Setup Node.js uses: actions/setup-node@v4 with: node-version: 21 + + - name: Cache node modules + id: cache-node + uses: actions/cache@v4 + with: + path: | + **/node_modules + key: ${{ runner.OS }}-node-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.OS }}-node- + - name: Install dependencies - run: pnpm install + if: steps.cache-node.outputs.cache-hit != 'true' + run: pnpm install --frozen-lockfile + + - name: Build tiki ui + id: cache-tiki-ui + uses: actions/cache@v4 + with: + path: packages/ui/dist + key: ${{runner.os}}-ui-${{hashFiles('packages/ui/package.json', 'packages/ui/src/**')}} + restore-keys: ${{runner.os}}-ui- + + - name: Build tiki icon + id: cache-tiki-icon + uses: actions/cache@v4 + with: + path: packages/icon/dist + key: ${{runner.os}}-icon-${{hashFiles('packages/icon/package.json', 'packages/icon/src/**')}} + restore-keys: ${{runner.os}}-icon- + + - name: Check ui cache hit + if: steps.cache-tiki-ui.outputs.cache-hit != 'true' + run: pnpm --filter ui build + + - name: Check icon cache hit + if: steps.cache-tiki-icon.outputs.cache-hit != 'true' + run: pnpm --filter icon build + - name: Run Chromatic id: chromatic uses: chromaui/action@v1 diff --git a/.github/workflows/storybook-deploy.yml b/.github/workflows/storybook-deploy.yml index 7d275b1f6..212f9fbc4 100644 --- a/.github/workflows/storybook-deploy.yml +++ b/.github/workflows/storybook-deploy.yml @@ -19,18 +19,53 @@ jobs: - name: Install Pnpm uses: pnpm/action-setup@v4 with: - version: 9 + version: 9.1.3 + + - name: Cache node modules + id: cache-node + uses: actions/cache@v4 + with: + path: | + **/node_modules + key: ${{ runner.OS }}-node-${{ hashFiles('**/pnpm-lock.yaml') }} + restore-keys: | + ${{ runner.OS }}-node- - name: Install dependencies + if: steps.cache-node.outputs.cache-hit != 'true' run: pnpm install --frozen-lockfile + - name: Build tiki ui + id: cache-tiki-ui + uses: actions/cache@v4 + with: + path: packages/ui/dist + key: ${{runner.os}}-ui-${{hashFiles('packages/ui/package.json', 'packages/ui/src/**')}} + restore-keys: ${{runner.os}}-ui- + + - name: Build tiki icon + id: cache-tiki-icon + uses: actions/cache@v4 + with: + path: packages/icon/dist + key: ${{runner.os}}-icon-${{hashFiles('packages/icon/package.json', 'packages/icon/src/**')}} + restore-keys: ${{runner.os}}-icon- + + - name: Check ui cache hit + if: steps.cache-tiki-ui.outputs.cache-hit != 'true' + run: pnpm --filter ui build + + - name: Check icon cache hit + if: steps.cache-tiki-icon.outputs.cache-hit != 'true' + run: pnpm --filter icon build + - name: Build - run: pnpm build-storybook + run: pnpm --filter client build-storybook - name: Deploy uses: peaceiris/actions-gh-pages@v4 with: - publish_dir: ./storybook-static + publish_dir: apps/client/storybook-static github_token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index 4384f5da3..ff1ceb0bb 100644 --- a/.gitignore +++ b/.gitignore @@ -22,6 +22,10 @@ dist-ssr *.njsproj *.sln *.sw? -.env + +**/next-env.d.ts +**/.env + *storybook.log storybook-static + diff --git a/.npmrc b/.npmrc new file mode 100644 index 000000000..72a52135a --- /dev/null +++ b/.npmrc @@ -0,0 +1 @@ +public-hoist-pattern=* diff --git a/.prettierrc b/.prettierrc deleted file mode 100644 index a64c0fad0..000000000 --- a/.prettierrc +++ /dev/null @@ -1,29 +0,0 @@ -{ - "plugins": ["@trivago/prettier-plugin-sort-imports"], - - "printWidth": 120, - "tabWidth": 2, - "semi": true, - "singleQuote": true, - "trailingComma": "es5", - "requirePragma": false, - "arrowParens": "always", - "bracketSameLine": true, - "endOfLine": "auto", - - "importOrder": [ - "^react(.*)", - "^@tanstack/(.*)$", - "^zustand(.*)", - "^axios(.*)", - "^msw(.*)", - "^@/common/(.*)$", - "^@/page/(.*)$", - "^@/shared/(.*)$", - "^@/story/(.*)$", - "^@/mock/(.*)$", - "^[./]" - ], - "importOrderSeparation": true, - "importOrderSortSpecifiers": true -} diff --git a/.storybook/main.ts b/.storybook/main.ts deleted file mode 100644 index c40f52d24..000000000 --- a/.storybook/main.ts +++ /dev/null @@ -1,35 +0,0 @@ -import type { StorybookConfig } from '@storybook/react-vite'; -import path from 'path'; - -const config: StorybookConfig = { - stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'], - addons: [ - '@storybook/addon-onboarding', - '@storybook/addon-links', - '@storybook/addon-essentials', - '@storybook/addon-a11y', - '@chromatic-com/storybook', - '@storybook/addon-interactions', - ], - core: { - builder: '@storybook/builder-vite', - }, - framework: { - name: '@storybook/react-vite', - options: {}, - }, - async viteFinal(config) { - if (config.resolve) { - config.resolve.alias = { - ...config.resolve.alias, - '@': path.resolve(__dirname, '../src'), - '@/common': path.resolve(__dirname, '../src/common'), - '@/page': path.resolve(__dirname, '../src/page'), - '@/shared': path.resolve(__dirname, '../src/shared'), - '@/stories': path.resolve(__dirname, '../src/stories'), - }; - } - return config; - }, -}; -export default config; diff --git a/.eslintrc.cjs b/apps/client/.eslintrc.cjs similarity index 100% rename from .eslintrc.cjs rename to apps/client/.eslintrc.cjs diff --git a/apps/client/.prettierrc b/apps/client/.prettierrc new file mode 100644 index 000000000..271cb772c --- /dev/null +++ b/apps/client/.prettierrc @@ -0,0 +1,31 @@ +{ + "plugins": ["@trivago/prettier-plugin-sort-imports"], + + "printWidth": 120, + "tabWidth": 2, + "semi": true, + "singleQuote": true, + "trailingComma": "es5", + "requirePragma": false, + "arrowParens": "always", + "bracketSameLine": true, + "endOfLine": "auto", + + "importOrder": [ + "^react(.*)", + "^@emtion/(.*)$", + "^@tanstack/(.*)$", + "^zustand(.*)", + "^axios(.*)", + "^msw(.*)", + "^@/common/(.*)$", + "^@/page/(.*)$", + "^@/shared/(.*)$", + "^@/story/(.*)$", + "^@/mock/(.*)$", + "^[./]" + ], + "importOrderSeparation": true, + "importOrderSortSpecifiers": true + } + \ No newline at end of file diff --git a/apps/client/.storybook/main.ts b/apps/client/.storybook/main.ts new file mode 100644 index 000000000..e2b4412cf --- /dev/null +++ b/apps/client/.storybook/main.ts @@ -0,0 +1,47 @@ +import type { StorybookConfig } from '@storybook/react-vite'; +import { dirname, join, resolve } from 'path'; + +/** + * This function is used to resolve the absolute path of a package. + * 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'))); +} +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-a11y'), + getAbsolutePath('@chromatic-com/storybook'), + ], + framework: { + name: getAbsolutePath('@storybook/react-vite'), + options: {}, + }, + docs: { + autodocs: 'tag', + }, + async viteFinal(config) { + const { mergeConfig } = await import('vite'); + + if (config.resolve) { + (config.resolve.preserveSymlinks = true), + (config.resolve.alias = { + ...config.resolve.alias, + '@': resolve(__dirname, '../src'), + '@/common': resolve(__dirname, '../src/common'), + '@/page': resolve(__dirname, '../src/page'), + '@/shared': resolve(__dirname, '../src/shared'), + }); + } + + return mergeConfig(config, { + optimizeDeps: ['@tiki/ui', '@tiki/icon'], + }); + }, +}; +export default config; diff --git a/.storybook/preview-head.html b/apps/client/.storybook/preview-head.html similarity index 100% rename from .storybook/preview-head.html rename to apps/client/.storybook/preview-head.html diff --git a/.storybook/preview.tsx b/apps/client/.storybook/preview.tsx similarity index 95% rename from .storybook/preview.tsx rename to apps/client/.storybook/preview.tsx index ad759be6d..38e1b8116 100644 --- a/.storybook/preview.tsx +++ b/apps/client/.storybook/preview.tsx @@ -1,5 +1,6 @@ import { Global, ThemeProvider } from '@emotion/react'; import type { Preview } from '@storybook/react'; +import { theme } from '@tiki/ui'; import React from 'react'; import { MemoryRouter } from 'react-router-dom'; @@ -7,7 +8,6 @@ import { MemoryRouter } from 'react-router-dom'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { GlobalStyle } from '../src/common/style/globalStyle'; -import { theme } from '../src/common/style/theme/theme'; const customViewports = { Default: { diff --git a/index.html b/apps/client/index.html similarity index 83% rename from index.html rename to apps/client/index.html index ad8ca5e73..8ab573f15 100644 --- a/index.html +++ b/apps/client/index.html @@ -2,7 +2,7 @@ - + diff --git a/apps/client/package.json b/apps/client/package.json new file mode 100644 index 000000000..10d161bc8 --- /dev/null +++ b/apps/client/package.json @@ -0,0 +1,71 @@ +{ + "name": "client", + "version": "0.0.0", + "private": true, + "type": "module", + "scripts": { + "build": "tsc && vite build", + "build-storybook": "storybook build", + "chromatic": "npx chromatic --project-token=chpt_f4088febbfb82b7", + "dev": "vite", + "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0", + "preview": "vite preview", + "storybook": "storybook dev -p 6006" + }, + "dependencies": { + "@sentry/react": "^8.22.0", + "@tanstack/react-query": "^5.49.2", + "@tanstack/react-query-devtools": "^5.49.2", + "@tiki/icon": "workspace:^", + "@tiki/ui": "workspace:^", + "@tiki/utils": "workspace:^", + "axios": "^1.7.2", + "framer-motion": "^11.11.11", + "mime": "^4.0.4", + "react-hook-form": "^7.53.1", + "react-router-dom": "^6.24.1" + }, + "devDependencies": { + "@chromatic-com/storybook": "^1.6.1", + "@eslint/js": "^9.6.0", + "@sentry/vite-plugin": "^2.21.1", + "@storybook/addon-a11y": "^8.2.6", + "@storybook/addon-essentials": "^8.2.6", + "@storybook/addon-interactions": "^8.2.6", + "@storybook/addon-links": "^8.2.6", + "@storybook/addon-onboarding": "^8.2.6", + "@storybook/blocks": "^8.2.6", + "@storybook/builder-vite": "^8.2.6", + "@storybook/react": "^8.2.6", + "@storybook/react-vite": "^8.2.6", + "@storybook/test": "^8.2.6", + "@tiki/tsconfig": "workspace:^", + "@trivago/prettier-plugin-sort-imports": "^4.3.0", + "@types/react-slick": "^0.23.13", + "@typescript-eslint/eslint-plugin": "^7.13.1", + "@typescript-eslint/parser": "^7.13.1", + "@vitejs/plugin-react": "^4.3.1", + "@vitejs/plugin-react-swc": "^3.5.0", + "chromatic": "^11.5.4", + "concurrently": "^9.0.1", + "eslint": "^8.57.0", + "eslint-config-prettier": "^9.1.0", + "eslint-import-resolver-typescript": "^3.6.1", + "eslint-plugin-import": "^2.29.1", + "eslint-plugin-jsx-a11y": "^6.9.0", + "eslint-plugin-prettier": "^5.1.3", + "eslint-plugin-react": "^7.34.3", + "eslint-plugin-react-hooks": "^4.6.2", + "eslint-plugin-react-refresh": "^0.4.7", + "eslint-plugin-storybook": "^0.8.0", + "globals": "^15.7.0", + "msw": "^2.3.1", + "prettier": "^3.3.2", + "rollup-plugin-visualizer": "^5.12.0", + "storybook": "^8.2.6", + "typescript-eslint": "^7.14.1", + "vite": "^5.3.2", + "vite-plugin-svgr": "^4.2.0", + "vite-tsconfig-paths": "^4.3.2" + } +} diff --git a/src/common/asset/svg/favicon.svg b/apps/client/public/favicon.svg similarity index 100% rename from src/common/asset/svg/favicon.svg rename to apps/client/public/favicon.svg diff --git a/public/font/subset-PretendardVariable.woff b/apps/client/public/font/subset-PretendardVariable.woff similarity index 100% rename from public/font/subset-PretendardVariable.woff rename to apps/client/public/font/subset-PretendardVariable.woff diff --git a/public/font/subset-PretendardVariable.woff2 b/apps/client/public/font/subset-PretendardVariable.woff2 similarity index 100% rename from public/font/subset-PretendardVariable.woff2 rename to apps/client/public/font/subset-PretendardVariable.woff2 diff --git a/public/img/advBannerClub1.png b/apps/client/public/img/advBannerClub1.png similarity index 100% rename from public/img/advBannerClub1.png rename to apps/client/public/img/advBannerClub1.png diff --git a/public/img/advBannerClub1.webp b/apps/client/public/img/advBannerClub1.webp similarity index 100% rename from public/img/advBannerClub1.webp rename to apps/client/public/img/advBannerClub1.webp diff --git a/public/img/advBannerClub2.png b/apps/client/public/img/advBannerClub2.png similarity index 100% rename from public/img/advBannerClub2.png rename to apps/client/public/img/advBannerClub2.png diff --git a/public/img/advBannerClub2.webp b/apps/client/public/img/advBannerClub2.webp similarity index 100% rename from public/img/advBannerClub2.webp rename to apps/client/public/img/advBannerClub2.webp diff --git a/public/img/advBannerClub3.png b/apps/client/public/img/advBannerClub3.png similarity index 100% rename from public/img/advBannerClub3.png rename to apps/client/public/img/advBannerClub3.png diff --git a/public/img/advBannerClub3.webp b/apps/client/public/img/advBannerClub3.webp similarity index 100% rename from public/img/advBannerClub3.webp rename to apps/client/public/img/advBannerClub3.webp diff --git a/public/img/advBannerClub4.png b/apps/client/public/img/advBannerClub4.png similarity index 100% rename from public/img/advBannerClub4.png rename to apps/client/public/img/advBannerClub4.png diff --git a/public/img/advBannerClub4.webp b/apps/client/public/img/advBannerClub4.webp similarity index 100% rename from public/img/advBannerClub4.webp rename to apps/client/public/img/advBannerClub4.webp diff --git a/public/mockServiceWorker.js b/apps/client/public/mockServiceWorker.js similarity index 100% rename from public/mockServiceWorker.js rename to apps/client/public/mockServiceWorker.js diff --git a/src/App.tsx b/apps/client/src/App.tsx similarity index 100% rename from src/App.tsx rename to apps/client/src/App.tsx diff --git a/src/common/asset/img/comingsoon.png b/apps/client/src/common/asset/img/comingsoon.png similarity index 100% rename from src/common/asset/img/comingsoon.png rename to apps/client/src/common/asset/img/comingsoon.png diff --git a/src/common/asset/img/error.png b/apps/client/src/common/asset/img/error.png similarity index 100% rename from src/common/asset/img/error.png rename to apps/client/src/common/asset/img/error.png diff --git a/src/common/asset/img/landing01.png b/apps/client/src/common/asset/img/landing01.png similarity index 100% rename from src/common/asset/img/landing01.png rename to apps/client/src/common/asset/img/landing01.png diff --git a/src/common/asset/img/landing01.webp b/apps/client/src/common/asset/img/landing01.webp similarity index 100% rename from src/common/asset/img/landing01.webp rename to apps/client/src/common/asset/img/landing01.webp diff --git a/src/common/asset/img/service01.png b/apps/client/src/common/asset/img/service01.png similarity index 100% rename from src/common/asset/img/service01.png rename to apps/client/src/common/asset/img/service01.png diff --git a/src/common/asset/img/service01.webp b/apps/client/src/common/asset/img/service01.webp similarity index 100% rename from src/common/asset/img/service01.webp rename to apps/client/src/common/asset/img/service01.webp diff --git a/src/common/asset/img/service02.png b/apps/client/src/common/asset/img/service02.png similarity index 100% rename from src/common/asset/img/service02.png rename to apps/client/src/common/asset/img/service02.png diff --git a/src/common/asset/img/service02.webp b/apps/client/src/common/asset/img/service02.webp similarity index 100% rename from src/common/asset/img/service02.webp rename to apps/client/src/common/asset/img/service02.webp diff --git a/src/common/asset/img/workspace_complete.png b/apps/client/src/common/asset/img/workspace_complete.png similarity index 100% rename from src/common/asset/img/workspace_complete.png rename to apps/client/src/common/asset/img/workspace_complete.png diff --git a/src/common/asset/img/workspace_complete.webp b/apps/client/src/common/asset/img/workspace_complete.webp similarity index 100% rename from src/common/asset/img/workspace_complete.webp rename to apps/client/src/common/asset/img/workspace_complete.webp diff --git a/src/shared/component/CachedImage/CachedImage.tsx b/apps/client/src/common/component/CachedImage/CachedImage.tsx similarity index 92% rename from src/shared/component/CachedImage/CachedImage.tsx rename to apps/client/src/common/component/CachedImage/CachedImage.tsx index 578659aa7..7ba3577ed 100644 --- a/src/shared/component/CachedImage/CachedImage.tsx +++ b/apps/client/src/common/component/CachedImage/CachedImage.tsx @@ -1,6 +1,6 @@ -import { HTMLAttributes } from 'react'; +import { useCachedImage } from '@tiki/utils'; -import useCachedImage from '@/common/hook/useCachedImage'; +import { HTMLAttributes } from 'react'; interface CachedImageProps extends HTMLAttributes { imageUrl: string; diff --git a/src/common/component/ErrorBoundary/ErrorBoundary.tsx b/apps/client/src/common/component/ErrorBoundary/ErrorBoundary.tsx similarity index 100% rename from src/common/component/ErrorBoundary/ErrorBoundary.tsx rename to apps/client/src/common/component/ErrorBoundary/ErrorBoundary.tsx diff --git a/src/common/router/Router.tsx b/apps/client/src/common/router/Router.tsx similarity index 100% rename from src/common/router/Router.tsx rename to apps/client/src/common/router/Router.tsx diff --git a/src/common/router/lazy.ts b/apps/client/src/common/router/lazy.ts similarity index 100% rename from src/common/router/lazy.ts rename to apps/client/src/common/router/lazy.ts diff --git a/src/common/style/ellipsis.ts b/apps/client/src/common/style/ellipsis.ts similarity index 100% rename from src/common/style/ellipsis.ts rename to apps/client/src/common/style/ellipsis.ts diff --git a/src/common/style/globalStyle.ts b/apps/client/src/common/style/globalStyle.ts similarity index 100% rename from src/common/style/globalStyle.ts rename to apps/client/src/common/style/globalStyle.ts diff --git a/src/common/style/theme/emotion.d.ts b/apps/client/src/common/style/theme/emotion.d.ts similarity index 100% rename from src/common/style/theme/emotion.d.ts rename to apps/client/src/common/style/theme/emotion.d.ts diff --git a/src/main.tsx b/apps/client/src/main.tsx similarity index 88% rename from src/main.tsx rename to apps/client/src/main.tsx index dd4b77495..14a7e481d 100644 --- a/src/main.tsx +++ b/apps/client/src/main.tsx @@ -1,4 +1,5 @@ import { Global, ThemeProvider } from '@emotion/react'; +import { ToastContainer, ToastProvider, theme } from '@tiki/ui'; import React from 'react'; import { createRoot } from 'react-dom/client'; @@ -6,11 +7,8 @@ import { createRoot } from 'react-dom/client'; import { QueryClient, QueryClientProvider } from '@tanstack/react-query'; import { ReactQueryDevtools } from '@tanstack/react-query-devtools'; -import ToastContainer from '@/common/component/ToastContainer/ToastContainer'; -import ToastProvider from '@/common/component/ToastContainer/ToastProvider'; import { AppRouter } from '@/common/router/Router'; import { GlobalStyle } from '@/common/style/globalStyle'; -import { theme } from '@/common/style/theme/theme'; import { worker } from '@/mock/browser'; diff --git a/src/mock/browser.ts b/apps/client/src/mock/browser.ts similarity index 100% rename from src/mock/browser.ts rename to apps/client/src/mock/browser.ts diff --git a/src/mock/data/drive.ts b/apps/client/src/mock/data/drive.ts similarity index 100% rename from src/mock/data/drive.ts rename to apps/client/src/mock/data/drive.ts diff --git a/src/mock/data/showCase.ts b/apps/client/src/mock/data/showCase.ts similarity index 100% rename from src/mock/data/showCase.ts rename to apps/client/src/mock/data/showCase.ts diff --git a/src/mock/data/term.ts b/apps/client/src/mock/data/term.ts similarity index 100% rename from src/mock/data/term.ts rename to apps/client/src/mock/data/term.ts diff --git a/src/mock/data/timeLine.ts b/apps/client/src/mock/data/timeLine.ts similarity index 100% rename from src/mock/data/timeLine.ts rename to apps/client/src/mock/data/timeLine.ts diff --git a/src/mock/handler/index.ts b/apps/client/src/mock/handler/index.ts similarity index 100% rename from src/mock/handler/index.ts rename to apps/client/src/mock/handler/index.ts diff --git a/src/mock/handler/showCase.ts b/apps/client/src/mock/handler/showCase.ts similarity index 100% rename from src/mock/handler/showCase.ts rename to apps/client/src/mock/handler/showCase.ts diff --git a/src/mock/handler/timeLine.ts b/apps/client/src/mock/handler/timeLine.ts similarity index 100% rename from src/mock/handler/timeLine.ts rename to apps/client/src/mock/handler/timeLine.ts diff --git a/src/mock/handler/workspace.ts b/apps/client/src/mock/handler/workspace.ts similarity index 100% rename from src/mock/handler/workspace.ts rename to apps/client/src/mock/handler/workspace.ts diff --git a/src/page/archiving/index/ArchivingPage.style.ts b/apps/client/src/page/archiving/index/ArchivingPage.style.ts similarity index 100% rename from src/page/archiving/index/ArchivingPage.style.ts rename to apps/client/src/page/archiving/index/ArchivingPage.style.ts diff --git a/src/page/archiving/index/ArchivingPage.tsx b/apps/client/src/page/archiving/index/ArchivingPage.tsx similarity index 96% rename from src/page/archiving/index/ArchivingPage.tsx rename to apps/client/src/page/archiving/index/ArchivingPage.tsx index b0f4901ee..63ac8111f 100644 --- a/src/page/archiving/index/ArchivingPage.tsx +++ b/apps/client/src/page/archiving/index/ArchivingPage.tsx @@ -1,9 +1,8 @@ +import { Button, Flex } from '@tiki/ui'; + import { Suspense, useEffect } from 'react'; import { useLocation } from 'react-router-dom'; -import Button from '@/common/component/Button/Button'; -import Flex from '@/common/component/Flex/Flex'; - import { contentStyle, pageStyle, timelineStyle } from '@/page/archiving/index/ArchivingPage.style'; import DateProvider from '@/page/archiving/index/DateProvider'; import TimeLine from '@/page/archiving/index/component/TimeLine'; diff --git a/src/page/archiving/index/DateProvider.tsx b/apps/client/src/page/archiving/index/DateProvider.tsx similarity index 100% rename from src/page/archiving/index/DateProvider.tsx rename to apps/client/src/page/archiving/index/DateProvider.tsx diff --git a/src/page/archiving/index/component/DocumentBar/DocumentBar.style.ts b/apps/client/src/page/archiving/index/component/DocumentBar/DocumentBar.style.ts similarity index 89% rename from src/page/archiving/index/component/DocumentBar/DocumentBar.style.ts rename to apps/client/src/page/archiving/index/component/DocumentBar/DocumentBar.style.ts index 615254574..398ed8cfc 100644 --- a/src/page/archiving/index/component/DocumentBar/DocumentBar.style.ts +++ b/apps/client/src/page/archiving/index/component/DocumentBar/DocumentBar.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const containerStyle = (blockSelected: string) => css({ diff --git a/src/page/archiving/index/component/DocumentBar/DocumentBar.tsx b/apps/client/src/page/archiving/index/component/DocumentBar/DocumentBar.tsx similarity index 92% rename from src/page/archiving/index/component/DocumentBar/DocumentBar.tsx rename to apps/client/src/page/archiving/index/component/DocumentBar/DocumentBar.tsx index 9b5c7ddee..fd4bf6304 100644 --- a/src/page/archiving/index/component/DocumentBar/DocumentBar.tsx +++ b/apps/client/src/page/archiving/index/component/DocumentBar/DocumentBar.tsx @@ -1,6 +1,6 @@ -import { ForwardedRef, forwardRef } from 'react'; +import { theme } from '@tiki/ui'; -import { theme } from '@/common/style/theme/theme'; +import { ForwardedRef, forwardRef } from 'react'; import { containerStyle } from '@/page/archiving/index/component/DocumentBar/DocumentBar.style'; import { Block } from '@/page/archiving/index/type/blockType'; diff --git a/src/page/archiving/index/component/DocumentBar/Item/Item.style.ts b/apps/client/src/page/archiving/index/component/DocumentBar/Item/Item.style.ts similarity index 93% rename from src/page/archiving/index/component/DocumentBar/Item/Item.style.ts rename to apps/client/src/page/archiving/index/component/DocumentBar/Item/Item.style.ts index 9a67ef4b0..c0e7593cf 100644 --- a/src/page/archiving/index/component/DocumentBar/Item/Item.style.ts +++ b/apps/client/src/page/archiving/index/component/DocumentBar/Item/Item.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const containerStyle = css({ display: 'flex', diff --git a/src/page/archiving/index/component/DocumentBar/Item/Item.tsx b/apps/client/src/page/archiving/index/component/DocumentBar/Item/Item.tsx similarity index 79% rename from src/page/archiving/index/component/DocumentBar/Item/Item.tsx rename to apps/client/src/page/archiving/index/component/DocumentBar/Item/Item.tsx index 67d5da42d..535e46ca1 100644 --- a/src/page/archiving/index/component/DocumentBar/Item/Item.tsx +++ b/apps/client/src/page/archiving/index/component/DocumentBar/Item/Item.tsx @@ -1,10 +1,8 @@ /* eslint-disable jsx-a11y/click-events-have-key-events */ -import { ReactNode } from 'react'; +import { IcDelete, IcDownload } from '@tiki/icon'; +import { Flex, Text } from '@tiki/ui'; -import TrashBox from '@/common/asset/svg/ic_delete.svg?react'; -import Download from '@/common/asset/svg/ic_download.svg?react'; -import Flex from '@/common/component/Flex/Flex'; -import Text from '@/common/component/Text/Text'; +import { ReactNode } from 'react'; import { containerStyle, fileNameStyle } from '@/page/archiving/index/component/DocumentBar/Item/Item.style'; import { downloadDocument } from '@/page/archiving/index/util/document'; @@ -50,8 +48,8 @@ const Item = ({ documentId, children, fileUrl, fileName }: ItemProps) => { {fileName} - - handleTrashBoxClick(e)} css={{ cursor: 'pointer' }} /> + + handleTrashBoxClick(e)} css={{ cursor: 'pointer' }} /> diff --git a/src/page/archiving/index/component/DocumentBar/Selected/Selected.style.ts b/apps/client/src/page/archiving/index/component/DocumentBar/Selected/Selected.style.ts similarity index 85% rename from src/page/archiving/index/component/DocumentBar/Selected/Selected.style.ts rename to apps/client/src/page/archiving/index/component/DocumentBar/Selected/Selected.style.ts index e5fb97f27..761477647 100644 --- a/src/page/archiving/index/component/DocumentBar/Selected/Selected.style.ts +++ b/apps/client/src/page/archiving/index/component/DocumentBar/Selected/Selected.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const blockNameStyle = css({ paddingRight: '0.4rem', diff --git a/src/page/archiving/index/component/DocumentBar/Selected/Selected.tsx b/apps/client/src/page/archiving/index/component/DocumentBar/Selected/Selected.tsx similarity index 89% rename from src/page/archiving/index/component/DocumentBar/Selected/Selected.tsx rename to apps/client/src/page/archiving/index/component/DocumentBar/Selected/Selected.tsx index f6d4706fb..37f73d7a7 100644 --- a/src/page/archiving/index/component/DocumentBar/Selected/Selected.tsx +++ b/apps/client/src/page/archiving/index/component/DocumentBar/Selected/Selected.tsx @@ -1,8 +1,4 @@ -import Button from '@/common/component/Button/Button'; -import Flex from '@/common/component/Flex/Flex'; -import Heading from '@/common/component/Heading/Heading'; -import Text from '@/common/component/Text/Text'; -import { theme } from '@/common/style/theme/theme'; +import { Button, Flex, Heading, Text, theme } from '@tiki/ui'; import DocumentItem from '@/page/archiving/index/component/DocumentBar/Item/Item'; import { blockNameStyle, deleteBtnStyle } from '@/page/archiving/index/component/DocumentBar/Selected/Selected.style'; diff --git a/src/page/archiving/index/component/DocumentBar/Sort/Sort.style.ts b/apps/client/src/page/archiving/index/component/DocumentBar/Sort/Sort.style.ts similarity index 93% rename from src/page/archiving/index/component/DocumentBar/Sort/Sort.style.ts rename to apps/client/src/page/archiving/index/component/DocumentBar/Sort/Sort.style.ts index 317ba0c90..463bfaff8 100644 --- a/src/page/archiving/index/component/DocumentBar/Sort/Sort.style.ts +++ b/apps/client/src/page/archiving/index/component/DocumentBar/Sort/Sort.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const buttonStyle = css({ display: 'flex', diff --git a/src/page/archiving/index/component/DocumentBar/Sort/Sort.tsx b/apps/client/src/page/archiving/index/component/DocumentBar/Sort/Sort.tsx similarity index 88% rename from src/page/archiving/index/component/DocumentBar/Sort/Sort.tsx rename to apps/client/src/page/archiving/index/component/DocumentBar/Sort/Sort.tsx index 334a9cedb..304ff9fb3 100644 --- a/src/page/archiving/index/component/DocumentBar/Sort/Sort.tsx +++ b/apps/client/src/page/archiving/index/component/DocumentBar/Sort/Sort.tsx @@ -1,7 +1,7 @@ -import { useEffect } from 'react'; +import { Select } from '@tiki/ui'; +import { useOutsideClick, useOverlay } from '@tiki/utils'; -import Select from '@/common/component/Select/Select'; -import { useOutsideClick, useOverlay } from '@/common/hook'; +import { useEffect } from 'react'; import { fontStyle } from '@/page/archiving/index/component/DocumentBar/Sort/Sort.style'; import { OPTIONS } from '@/page/archiving/index/constant/sortOption'; diff --git a/src/page/archiving/index/component/DocumentBar/Total/Total.tsx b/apps/client/src/page/archiving/index/component/DocumentBar/Total/Total.tsx similarity index 89% rename from src/page/archiving/index/component/DocumentBar/Total/Total.tsx rename to apps/client/src/page/archiving/index/component/DocumentBar/Total/Total.tsx index af14c4f3a..207bc8e8e 100644 --- a/src/page/archiving/index/component/DocumentBar/Total/Total.tsx +++ b/apps/client/src/page/archiving/index/component/DocumentBar/Total/Total.tsx @@ -1,10 +1,8 @@ -import { useState } from 'react'; +import { IcSearch } from '@tiki/icon'; +import { Flex, Input, Text } from '@tiki/ui'; +import { useDebounce } from '@tiki/utils'; -import SearchIc from '@/common/asset/svg/ic_search.svg?react'; -import Flex from '@/common/component/Flex/Flex'; -import Input from '@/common/component/Input/Input'; -import Text from '@/common/component/Text/Text'; -import { useDebounce } from '@/common/hook'; +import { useState } from 'react'; import Item from '@/page/archiving/index/component/DocumentBar/Item/Item'; import { blockNameStyle } from '@/page/archiving/index/component/DocumentBar/Item/Item.style'; @@ -41,7 +39,7 @@ const DocumentTotal = () => { } + LeftIcon={} onChange={(e) => { setSearchWord(e.target.value); }} diff --git a/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.style.ts similarity index 76% rename from src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.style.ts index 962604c7c..dfc61cc92 100644 --- a/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const periodStyle = css({ color: theme.colors.gray_800, diff --git a/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.tsx b/apps/client/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.tsx similarity index 76% rename from src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.tsx index 8280dbf57..d06302a23 100644 --- a/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.tsx @@ -1,8 +1,4 @@ -import DatePicker from '@/common/component/DatePicker'; -import Flex from '@/common/component/Flex/Flex'; -import Heading from '@/common/component/Heading/Heading'; -import Input from '@/common/component/Input/Input'; -import Text from '@/common/component/Text/Text'; +import { DatePicker, Flex, Heading, Input, Text } from '@tiki/ui'; import { periodStyle, titleInputStyle } from '@/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo.style'; import { formattingDate } from '@/page/archiving/index/util/date'; diff --git a/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.style.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.style.ts diff --git a/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.tsx b/apps/client/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.tsx similarity index 70% rename from src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.tsx index 34548bc6d..a4e4b25b9 100644 --- a/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.tsx @@ -1,6 +1,5 @@ -import IcArrowRight from '@/common/asset/svg/ic_subdirectory_arrow_right.svg?react'; -import Button from '@/common/component/Button/Button'; -import Flex from '@/common/component/Flex/Flex'; +import { IcSubdirectoryArrowRight } from '@tiki/icon'; +import { Button, Flex } from '@tiki/ui'; import { handoverNoteItemStyle } from '@/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem.style'; @@ -12,7 +11,7 @@ interface TaggedNoteItemProps { const TaggedNoteItem = ({ title, isEditable }: TaggedNoteItemProps) => { return ( - + diff --git a/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNotes.tsx b/apps/client/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNotes.tsx similarity index 84% rename from src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNotes.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNotes.tsx index be917a1a1..e33e8f5a6 100644 --- a/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNotes.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNotes.tsx @@ -1,6 +1,5 @@ -import IcNote from '@/common/asset/svg/ic_note_black.svg?react'; -import Flex from '@/common/component/Flex/Flex'; -import Text from '@/common/component/Text/Text'; +import { IcNoteBlack } from '@tiki/icon'; +import { Flex, Text } from '@tiki/ui'; import TaggedNoteItem from '@/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNoteItem/TaggedNoteItem'; import { listHeaderStyle } from '@/page/archiving/index/component/TimeBlockBar/TimeBlockBar.style'; @@ -20,7 +19,7 @@ const TaggedNotes = ({ isEditable }: TaggedNotesProps) => { return ( - + 태그된 인수인계 노트 diff --git a/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.style.ts similarity index 89% rename from src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.style.ts index c31beeb72..4efdef76e 100644 --- a/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const closeBtnStyle = css({ position: 'absolute', diff --git a/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.tsx b/apps/client/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.tsx similarity index 86% rename from src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.tsx index 452d239e9..af8a4fc55 100644 --- a/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/TimeBlockBar.tsx @@ -1,8 +1,7 @@ -import { useState } from 'react'; +import { IcClose } from '@tiki/icon'; +import { CommandButton, Flex } from '@tiki/ui'; -import CloseButton from '@/common/asset/svg/ic_close.svg?react'; -import CommandButton from '@/common/component/CommandButton/CommandButton'; -import Flex from '@/common/component/Flex/Flex'; +import { useState } from 'react'; import BlockInfo from '@/page/archiving/index/component/TimeBlockBar/BlockInfo/BlockInfo'; import TaggedNotes from '@/page/archiving/index/component/TimeBlockBar/TaggedNotes/TaggedNotes'; @@ -27,7 +26,7 @@ const TimeBlockBar = ({ content, onCloseDrawer }: TimeBlockBarProps) => { return ( content && (
- + diff --git a/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.style.ts similarity index 93% rename from src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.style.ts index be85e05f6..60bb13957 100644 --- a/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const containerStyle = css({ gap: '1.2rem', diff --git a/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.tsx b/apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.tsx similarity index 69% rename from src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.tsx index 20d570c9d..a8622f288 100644 --- a/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem.tsx @@ -1,7 +1,5 @@ -import CloseButton from '@/common/asset/svg/ic_close.svg?react'; -import IcPDF from '@/common/asset/svg/ic_pdf_file.svg?react'; -import Flex from '@/common/component/Flex/Flex'; -import Text from '@/common/component/Text/Text'; +import { IcClose, IcPdfFile } from '@tiki/icon'; +import { Flex, Text } from '@tiki/ui'; import { circleStyle, @@ -22,7 +20,7 @@ const FileItem = ({ title, capacity, isEditable }: FileItemProps) => {
  • - + @@ -34,7 +32,7 @@ const FileItem = ({ title, capacity, isEditable }: FileItemProps) => { - {isEditable && } + {isEditable && }
  • ); }; diff --git a/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/UploadedFiles.tsx b/apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/UploadedFiles.tsx similarity index 83% rename from src/page/archiving/index/component/TimeBlockBar/UploadedFiles/UploadedFiles.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/UploadedFiles.tsx index 2103196d4..384a306c3 100644 --- a/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/UploadedFiles.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockBar/UploadedFiles/UploadedFiles.tsx @@ -1,8 +1,5 @@ -import IcCloudUpload from '@/common/asset/svg/ic_cloud_upload.svg?react'; -import IcPaper from '@/common/asset/svg/ic_paper.svg?react'; -import Button from '@/common/component/Button/Button'; -import Flex from '@/common/component/Flex/Flex'; -import Text from '@/common/component/Text/Text'; +import { IcCloudUpload, IcPaper } from '@tiki/icon'; +import { Button, Flex, Text } from '@tiki/ui'; import { listHeaderStyle } from '@/page/archiving/index/component/TimeBlockBar/TimeBlockBar.style'; import FileItem from '@/page/archiving/index/component/TimeBlockBar/UploadedFiles/FileItem/FileItem'; diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.style.ts similarity index 87% rename from src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.style.ts index 916c8f21e..fa5e96ad0 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const buttonStyle = (isActive: boolean) => css({ diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.tsx similarity index 94% rename from src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.tsx index da1867160..5f8e59619 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/BlockModal.tsx @@ -1,9 +1,6 @@ -import { useState } from 'react'; +import { Button, Flex, Input, Text } from '@tiki/ui'; -import Button from '@/common/component/Button/Button'; -import Flex from '@/common/component/Flex/Flex'; -import Input from '@/common/component/Input/Input'; -import Text from '@/common/component/Text/Text'; +import { useState } from 'react'; import { buttonStyle, diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.style.ts similarity index 81% rename from src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.style.ts index c837bdec2..2f3c522d5 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const textStyle = css({ color: theme.colors.gray_500, diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.tsx similarity index 91% rename from src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.tsx index 2c6b594e4..fc61086b7 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Date/BlockDate.tsx @@ -1,8 +1,5 @@ import { css } from '@emotion/react'; - -import Flex from '@/common/component/Flex/Flex'; -import Input from '@/common/component/Input/Input'; -import SupportingText from '@/common/component/SupportingText/SupportingText'; +import { Flex, Input, SupportingText } from '@tiki/ui'; import { supportStyle, diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.style.ts similarity index 92% rename from src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.style.ts index c46b957b5..c4e73eaca 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const iconStyle = css({ display: 'flex', diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.tsx similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Block/Icon/BlockIcon.tsx diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.style.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.style.ts diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.tsx similarity index 80% rename from src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.tsx index 34e649bc5..c6f539db3 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Box/BlockBox.tsx @@ -1,7 +1,6 @@ -import { ReactNode } from 'react'; +import { Flex, Heading } from '@tiki/ui'; -import Flex from '@/common/component/Flex/Flex'; -import Heading from '@/common/component/Heading/Heading'; +import { ReactNode } from 'react'; interface BlockBoxProps { title: string; diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.style.ts similarity index 88% rename from src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.style.ts index df9f06239..4f5d9ff0c 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const boxStyle = css({ borderRadius: '8px', diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.tsx similarity index 92% rename from src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.tsx index 5bc71005c..23bb8cd68 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd.tsx @@ -1,8 +1,6 @@ -import { Dispatch, SetStateAction } from 'react'; +import { Button, Flex, Text } from '@tiki/ui'; -import Button from '@/common/component/Button/Button'; -import Flex from '@/common/component/Flex/Flex'; -import Text from '@/common/component/Text/Text'; +import { Dispatch, SetStateAction } from 'react'; import { boxStyle, diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.style.ts similarity index 83% rename from src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.style.ts index 0991959a7..55af7d710 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const borderStyle = css({ borderRadius: '8px', diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.tsx similarity index 67% rename from src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.tsx index bcd6c0d38..f29eff067 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem.tsx @@ -1,7 +1,5 @@ -import Delete from '@/common/asset/svg/ic_file_delete.svg?react'; -import Flex from '@/common/component/Flex/Flex'; -import Spinner from '@/common/component/Spinner/Spinner'; -import Text from '@/common/component/Text/Text'; +import { IcFileDelete } from '@tiki/icon'; +import { Flex, Spinner, Text } from '@tiki/ui'; import { borderStyle, @@ -25,7 +23,7 @@ const BlockItem = ({ title, onDelete, isUploading }: BlockItemProps) => { {isUploading ? ( ) : ( - + )}
    ); diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.style.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.style.ts similarity index 93% rename from src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.style.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.style.ts index 96e3fafc3..b54f61191 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const scrollStyle = css({ display: 'flex', diff --git a/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.tsx similarity index 96% rename from src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.tsx index 68004846a..7a18ca1ea 100644 --- a/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.tsx +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/component/Upload/UploadModal.tsx @@ -1,7 +1,7 @@ -import { useEffect, useState } from 'react'; +import { Button, Flex } from '@tiki/ui'; +import { useToastAction } from '@tiki/utils'; -import Button from '@/common/component/Button/Button'; -import Flex from '@/common/component/Flex/Flex'; +import { useEffect, useState } from 'react'; import BlockAdd from '@/page/archiving/index/component/TimeBlockModal/component/Upload/File/Add/BlockAdd'; import BlockItem from '@/page/archiving/index/component/TimeBlockModal/component/Upload/File/List/BlockItem'; @@ -19,7 +19,6 @@ import WorkSapceInfo from '@/shared/component/WorkSpaceModal/info/WorkSpaceInfo' import { useBlockContext } from '@/shared/hook/common/useBlockContext'; import { useInitializeTeamId } from '@/shared/hook/common/useInitializeTeamId'; import { useCloseModal } from '@/shared/store/modal'; -import { useToastAction } from '@/shared/store/toast'; interface UploadModalProps { isVisible: boolean; diff --git a/src/page/archiving/index/component/TimeBlockModal/constant/color.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/constant/color.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/constant/color.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/constant/color.ts diff --git a/src/page/archiving/index/component/TimeBlockModal/constant/error.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/constant/error.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/constant/error.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/constant/error.ts diff --git a/apps/client/src/page/archiving/index/component/TimeBlockModal/constant/iconBlock.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/constant/iconBlock.tsx new file mode 100644 index 000000000..89c0fc754 --- /dev/null +++ b/apps/client/src/page/archiving/index/component/TimeBlockModal/constant/iconBlock.tsx @@ -0,0 +1,35 @@ +import { IcAccounting, IcEvent, IcMeeting, IcNotice, IcStudy, IcTask } from '@tiki/icon'; + +import { ReactNode } from 'react'; + +type BlockIconType = { + name: string; + icon: ReactNode; +}; + +export const BLOCK_ICON: BlockIconType[] = [ + { + name: 'MEETING', + icon: , + }, + { + name: 'ACCOUNTING', + icon: , + }, + { + name: 'TASK', + icon: , + }, + { + name: 'NOTICE', + icon: , + }, + { + name: 'STUDY', + icon: , + }, + { + name: 'EVENT', + icon: , + }, +]; diff --git a/src/page/archiving/index/component/TimeBlockModal/hook/api/useDeleteFileMutation.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/hook/api/useDeleteFileMutation.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/hook/api/useDeleteFileMutation.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/hook/api/useDeleteFileMutation.ts diff --git a/src/page/archiving/index/component/TimeBlockModal/hook/api/usePostTimeBlockMutation.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/hook/api/usePostTimeBlockMutation.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/hook/api/usePostTimeBlockMutation.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/hook/api/usePostTimeBlockMutation.ts diff --git a/src/page/archiving/index/component/TimeBlockModal/hook/api/usePutUploadMutation.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/hook/api/usePutUploadMutation.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/hook/api/usePutUploadMutation.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/hook/api/usePutUploadMutation.ts diff --git a/src/page/archiving/index/component/TimeBlockModal/hook/common/useDateRange.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/hook/common/useDateRange.tsx similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/hook/common/useDateRange.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/hook/common/useDateRange.tsx diff --git a/src/page/archiving/index/component/TimeBlockModal/hook/common/useFile.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/hook/common/useFile.tsx similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/hook/common/useFile.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/hook/common/useFile.tsx diff --git a/src/page/archiving/index/component/TimeBlockModal/index.tsx b/apps/client/src/page/archiving/index/component/TimeBlockModal/index.tsx similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/index.tsx rename to apps/client/src/page/archiving/index/component/TimeBlockModal/index.tsx diff --git a/src/page/archiving/index/component/TimeBlockModal/type/blockType.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/type/blockType.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/type/blockType.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/type/blockType.ts diff --git a/src/page/archiving/index/component/TimeBlockModal/util/color.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/util/color.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/util/color.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/util/color.ts diff --git a/src/page/archiving/index/component/TimeBlockModal/util/date.ts b/apps/client/src/page/archiving/index/component/TimeBlockModal/util/date.ts similarity index 100% rename from src/page/archiving/index/component/TimeBlockModal/util/date.ts rename to apps/client/src/page/archiving/index/component/TimeBlockModal/util/date.ts diff --git a/src/page/archiving/index/component/TimeLine/Day/Day.style.ts b/apps/client/src/page/archiving/index/component/TimeLine/Day/Day.style.ts similarity index 96% rename from src/page/archiving/index/component/TimeLine/Day/Day.style.ts rename to apps/client/src/page/archiving/index/component/TimeLine/Day/Day.style.ts index fcfefb14a..8771c41aa 100644 --- a/src/page/archiving/index/component/TimeLine/Day/Day.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeLine/Day/Day.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const entireDayStyle = css({ display: 'flex', diff --git a/src/page/archiving/index/component/TimeLine/Day/Day.tsx b/apps/client/src/page/archiving/index/component/TimeLine/Day/Day.tsx similarity index 100% rename from src/page/archiving/index/component/TimeLine/Day/Day.tsx rename to apps/client/src/page/archiving/index/component/TimeLine/Day/Day.tsx diff --git a/src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.style.ts b/apps/client/src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.style.ts similarity index 96% rename from src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.style.ts rename to apps/client/src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.style.ts index d488ad516..e221c8fc6 100644 --- a/src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; import { BlockColor } from '@/page/archiving/index/type/color'; diff --git a/src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.tsx b/apps/client/src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.tsx similarity index 100% rename from src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.tsx rename to apps/client/src/page/archiving/index/component/TimeLine/TimeBlock/TimeBlock.tsx diff --git a/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.style.ts b/apps/client/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.style.ts similarity index 92% rename from src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.style.ts rename to apps/client/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.style.ts index ebe0cf6ee..cec5e3128 100644 --- a/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.style.ts +++ b/apps/client/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.style.ts @@ -1,6 +1,5 @@ import { css } from '@emotion/react'; - -import { theme } from '@/common/style/theme/theme'; +import { theme } from '@tiki/ui'; export const headerStyle = css({ position: 'sticky', diff --git a/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.tsx b/apps/client/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.tsx similarity index 74% rename from src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.tsx rename to apps/client/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.tsx index 3dcf003d6..42c3417f4 100644 --- a/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.tsx +++ b/apps/client/src/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.tsx @@ -1,6 +1,5 @@ -import ArrowLeft from '@/common/asset/svg/ic_arrow_back.svg?react'; -import ArrowRight from '@/common/asset/svg/ic_arrow_forward.svg?react'; -import Button from '@/common/component/Button/Button'; +import { IcArrowBack, IcArrowForward } from '@tiki/icon'; +import { Button } from '@tiki/ui'; import { useDateContext } from '@/page/archiving/index/DateProvider'; import { dateStyle, headerStyle } from '@/page/archiving/index/component/TimeLine/TimeLineHeader/TimeLineHeader.style'; @@ -11,13 +10,13 @@ const TimeLineHeader = () => { return (
    {currentYear}년 {currentMonth}월