Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
7f780d5
[Merge] feature/3-기본-세팅을 develop으로 머지
HANTAEDONG Dec 10, 2024
afc4dea
[Merge] 6-MSW-도입 브랜치를 develop 브랜치로 merge
dlcks0601 Dec 12, 2024
4acbc7c
[Fix] msw 오류해결
HANTAEDONG Dec 13, 2024
3b79236
[Feat] Avator스타일과 스타일북 구현
HANTAEDONG Dec 13, 2024
9c9a5fe
[Feat] 마이페이지 라우팅
HANTAEDONG Dec 13, 2024
c5f600a
[Move] atoms 폴더를 component/ui/atoms로 이동
HANTAEDONG Dec 13, 2024
ad731ce
[Chore] vite-plugin-svgr 설치
HANTAEDONG Dec 13, 2024
c95de11
[Style] 헤더와 기본 레이아웃 퍼블리싱
HANTAEDONG Dec 13, 2024
a9a9c84
[Rename] Avator를 ts에서 tsx로 변경
HANTAEDONG Dec 13, 2024
37ab6e7
[Feat] GlobalStyle 도입(border-box, pretendard폰트 도입) 및 적용
HANTAEDONG Dec 13, 2024
c1fb515
[Add] 마이페이지 하위 페이지 추가
HANTAEDONG Dec 13, 2024
095981e
[Refactor] 라우터에 마이페이지 하위 페이지 추가
HANTAEDONG Dec 13, 2024
ecb1ac6
[Refactor] 마이페이지 구현중
HANTAEDONG Dec 13, 2024
9120414
[Merge] feature/9-로그인-회원가입-구현 브랜치 develop에 병합
dlcks0601 Dec 14, 2024
2f598ee
[Style] 마이페이지 와이어프레임 퍼블리싱
HANTAEDONG Dec 14, 2024
d999a72
[Merge] feature/13-로그인-회원가입-리팩토링 브랜치 develop 브랜치로 병합
dlcks0601 Dec 14, 2024
2ad41f3
[Refactor] 라우팅 오류 해결
HANTAEDONG Dec 15, 2024
bc542ee
[Merge] feature/8-mypage를 develop으로 병합
HANTAEDONG Dec 15, 2024
237f32c
[Fix] 충돌 해결
HANTAEDONG Dec 15, 2024
a8d53b1
[Merge] feature/17-메인-컨텐츠-구현 브랜치 develop 브랜치에 병합
dlcks0601 Dec 15, 2024
dfebdb7
[Merge] 충돌로 인한 원격 develop 브랜치를 로컬 develop 브랜치에 병합
dlcks0601 Dec 15, 2024
d9ff7b5
[Merge] feature/19-login 브랜치 develop 브랜치에 병합
dlcks0601 Dec 16, 2024
53ab22a
충돌해결
HongbiKo Dec 17, 2024
742a015
[Merge] feature/23-mainpage-design 브랜치를 develop 브랜치에 병합
dlcks0601 Dec 17, 2024
f889996
[Merge] feature/25-adminpage 브랜치 develop 브랜치로 병합
dlcks0601 Dec 17, 2024
924aa24
[Merge] feature/27-code-refactor 브랜치 develop 브랜치에 병합
dlcks0601 Dec 18, 2024
65893a3
[Merge] feature/29-admin-user-management 브랜치 develop 브랜치로 병합
dlcks0601 Dec 19, 2024
874c8ee
[Merge] feature/32-user-delete 브랜치 develop 브랜치로 병합
dlcks0601 Dec 19, 2024
6f48cf6
[Merge] feature/5-Rich-Text-Editor-도입을 develop으로 병합
HANTAEDONG Dec 19, 2024
acc0493
Merge branch 'develop' of https://github.com/QnABoard/front into develop
HANTAEDONG Dec 19, 2024
d4aa863
[Merge] develop 브랜치를 feature/8-mypage로 병합
HANTAEDONG Dec 19, 2024
ef1ee19
[Feat] 마이페이지 소개 작성 및 수정 구현
HANTAEDONG Dec 20, 2024
4407d6d
[Feat] 마이페이지 좋아요한 게시글 페이지 구현
HANTAEDONG Dec 20, 2024
e16dd37
[Feat] 유저 인트로 수정 구현 완
HANTAEDONG Dec 20, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ dist
dist-ssr
*.local

# Environment variables
.env

# Editor directories and files
.vscode/*
!.vscode/extensions.json
Expand All @@ -22,3 +25,5 @@ dist-ssr
*.njsproj
*.sln
*.sw?

*storybook.log
16 changes: 16 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import type { StorybookConfig } from '@storybook/react-vite';

const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(js|jsx|mjs|ts|tsx)'],
addons: [
'@storybook/addon-onboarding',
'@storybook/addon-essentials',
'@chromatic-com/storybook',
'@storybook/addon-interactions',
],
framework: {
name: '@storybook/react-vite',
options: {},
},
};
export default config;
15 changes: 15 additions & 0 deletions .storybook/preview.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import type { Preview } from '@storybook/react';
import '../src/styles/reset.css';

const preview: Preview = {
parameters: {
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/i,
},
},
},
};

export default preview;
3 changes: 2 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
<!doctype html>
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/vite.svg" />

<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vite + React + TS</title>
</head>
Expand Down
41 changes: 37 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,61 @@
"build": "tsc -b && vite build",
"lint": "eslint .",
"preview": "vite preview",
"prepare": "husky"
"prepare": "husky",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build"
},
"dependencies": {
"@heroicons/react": "^2.2.0",
"@reduxjs/toolkit": "^2.4.0",
"@tanstack/react-query": "^5.62.2",
"@types/quill": "^2.0.14",
"@types/react-redux": "^7.1.34",
"axios": "^1.7.9",
"dompurify": "^3.2.3",
"jwt-decode": "^4.0.0",
"quill": "^2.0.3",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.54.1",
"react-quill": "^2.0.0",
"react-redux": "^9.1.2",
"react-router": "^7.0.2",
"redux-persist": "^6.0.0",
"styled-components": "^6.1.13"
},
"devDependencies": {
"@chromatic-com/storybook": "^3.2.2",
"@eslint/js": "^9.15.0",
"@types/react": "^18.3.12",
"@types/react-dom": "^18.3.1",
"@storybook/addon-essentials": "^8.4.7",
"@storybook/addon-interactions": "^8.4.7",
"@storybook/addon-onboarding": "^8.4.7",
"@storybook/blocks": "^8.4.7",
"@storybook/react": "^8.4.7",
"@storybook/react-vite": "^8.4.7",
"@storybook/test": "^8.4.7",
"@types/jwt-decode": "^3.1.0",
"@types/react": "^18.3.14",
"@types/react-dom": "^18.3.2",
"@types/redux-persist": "^4.3.1",
"@vitejs/plugin-react": "^4.3.4",
"eslint": "^9.15.0",
"eslint-plugin-react-hooks": "^5.0.0",
"eslint-plugin-react-refresh": "^0.4.14",
"eslint-plugin-storybook": "^0.11.1",
"globals": "^15.12.0",
"husky": "^9.1.7",
"msw": "^2.6.8",
"storybook": "^8.4.7",
"typescript": "~5.6.2",
"typescript-eslint": "^8.15.0",
"vite": "^6.0.1"
"vite": "^6.0.3",
"vite-plugin-svgr": "^4.3.0",
"vitest": "^2.1.8"
},
"eslintConfig": {
"extends": [
"plugin:storybook/recommended"
]
}
}
Loading