Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

1차 dev->main #33

Merged
merged 117 commits into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
117 commits
Select commit Hold shift + click to select a range
aaf56dc
:sparkles: storybook chromatic 자동 배포
leeks9653 Aug 23, 2023
4c04b59
:bug: yaml 파일 수정
leeks9653 Aug 23, 2023
359872b
:bug: 크로마틱 배포yaml 수정
leeks9653 Aug 23, 2023
8e5445d
:bug: 크로마틱 배포 버그 수정...
leeks9653 Aug 23, 2023
4303347
:bug: 크로마틱 배포 버그 수정 중...
leeks9653 Aug 23, 2023
f44d99a
:bug: 크로마틱 배포 yaml 수정.....
leeks9653 Aug 23, 2023
8e15fa0
:sparkles: svg, components 폴더 생성
leeks9653 Aug 28, 2023
82324b2
:sparkles: 버튼 컴포넌트 개발
leeks9653 Aug 29, 2023
af747ac
:memo: 스토리북 파일 수정
leeks9653 Aug 29, 2023
3483815
:zap: 세팅 수정
leeks9653 Aug 29, 2023
3ac1770
Merge pull request #1 from 8princesses/feat/button
leeks9653 Aug 30, 2023
aaf179c
:sparkles: Top Bar 컴포넌트 추가 (#2)
ckhe1215 Aug 31, 2023
106787a
:sparkles: upcoming stock 진행 중
leeks9653 Aug 31, 2023
c8cae0e
:art: 변경된 폰트 적용
leeks9653 Aug 31, 2023
d7338a3
:sparkles: upcoming stock 개발 중
leeks9653 Aug 31, 2023
6f579c2
:art: 버튼 컴포넌트 width 기본값 수정, type에 설명 추가
leeks9653 Aug 31, 2023
957a575
:sparkles: Scope bar (#3)
ckhe1215 Sep 1, 2023
de43117
Merge pull request #6 from 8princesses/feat/button
leeks9653 Sep 4, 2023
55d2641
Merge pull request #5 from 8princesses/fix/font
leeks9653 Sep 4, 2023
d843bcd
Merge branch 'develop' into feat/upcoming-stock
leeks9653 Sep 5, 2023
817a962
:lipstick: upcoming stock, storybook에 pretendard 폰트 적용
leeks9653 Sep 5, 2023
d69f0cb
:sparkles: badge 컴포넌트 완료
leeks9653 Sep 5, 2023
76a476d
:sparkles: 전체 레이아웃 모바일 화면으로 적용되게 수정
leeks9653 Sep 5, 2023
cfbb8af
Merge pull request #9 from 8princesses/feat/root-layout
leeks9653 Sep 5, 2023
7618452
Merge pull request #8 from 8princesses/feat/badge
leeks9653 Sep 5, 2023
9a01cea
Merge branch 'develop' into feat/upcoming-stock
leeks9653 Sep 5, 2023
bf875ac
:sparkles: upcoming stock card 보유 증권사 목록 출력하는 기능 제외하고 개발 완료
leeks9653 Sep 5, 2023
80cb550
:sparkles: Feat: 종료된 공모주 (#7)
ckhe1215 Sep 5, 2023
b0e49d3
:bug: 숫자 3자리 콤마, 원 적용
leeks9653 Sep 6, 2023
d5ed3c4
Merge branch 'develop' into feat/upcoming-stock
leeks9653 Sep 7, 2023
3282833
Merge pull request #10 from 8princesses/feat/upcoming-stock
leeks9653 Sep 7, 2023
9b9a204
:sparkles: 공모주 상세 페이지 ing
leeks9653 Sep 7, 2023
a214615
Merge branch 'develop' into feat/detail
leeks9653 Sep 7, 2023
1cdb01e
:sparkles: 상세 레이아웃, title 완료
leeks9653 Sep 11, 2023
303dced
✨ Feat: 홈 페이지 (#11)
ckhe1215 Sep 12, 2023
18c9a6e
:sparkles: 상세화면 레이아웃
leeks9653 Sep 13, 2023
6f99c7d
feat: 주관사 정보 박스 퍼블리싱 ing
leeks9653 Sep 13, 2023
77446e4
fix: letter-spacing 추
leeks9653 Sep 13, 2023
cbd8579
:fire: registry 테스트로 찍어둔 콘솔 제
leeks9653 Sep 13, 2023
e2b0cff
Merge pull request #13 from 8princesses/fix/font
leeks9653 Sep 13, 2023
6030d5a
:zap: tap 메뉴 완료 , 버튼 컴포넌트 속성 에러 수정
leeks9653 Sep 16, 2023
86a455d
feat: 공모 정보 카드 ing
leeks9653 Sep 16, 2023
53efd09
Merge branch 'develop' into feat/detail
leeks9653 Sep 16, 2023
1343cf3
:bug: 세미콜론 안붙여 letter-spacing적용 안되는 이슈 수정
leeks9653 Sep 16, 2023
03c9112
Merge pull request #15 from 8princesses/fix/font
leeks9653 Sep 17, 2023
4a913cb
:zap: story file 이름 변경
leeks9653 Sep 17, 2023
b42c0a9
:zap: 탭 메뉴의 옵션 길이 type 지정
leeks9653 Sep 17, 2023
75df3e4
Merge pull request #14 from 8princesses/fix/tap-menu
leeks9653 Sep 17, 2023
c4a8954
Merge branch 'develop' into feat/detail
leeks9653 Sep 17, 2023
3f355c5
:sparkles: 탭메뉴 개발 ing
leeks9653 Sep 17, 2023
f8db9eb
:sparkles: Feat: 바텀시트 증권사 리스트 컴포넌트 생성
ckhe1215 Sep 17, 2023
99dc41a
:lipstick: Style: 버튼 폰트 정보를 인자로 받아오도록 수정
ckhe1215 Sep 17, 2023
76eca28
:sparkles: 바텀시트 컨텐츠 완성
ckhe1215 Sep 18, 2023
7180094
:art: 코드 포맷 수정
ckhe1215 Sep 18, 2023
c225f76
:bug: 빌드오류나는부분 수정
ckhe1215 Sep 28, 2023
3771a06
:sparkles: 상세 수정사항 적용, 컴포넌트 추
leeks9653 Sep 28, 2023
9f4290b
:sparkles: 공모 일정 기획 수정사항 적용 완료
leeks9653 Sep 28, 2023
55fdc7f
:lipstick: SVG에onclick, css등 설정 가능하게 수정, 하은님 수정사힝 적용
leeks9653 Sep 28, 2023
a4b8844
:sparkles: 공모주 상세 페이지 ing
leeks9653 Sep 7, 2023
2b9253a
:sparkles: 상세 레이아웃, title 완료
leeks9653 Sep 11, 2023
8b174f6
:sparkles: 상세화면 레이아웃
leeks9653 Sep 13, 2023
dc15482
feat: 주관사 정보 박스 퍼블리싱 ing
leeks9653 Sep 13, 2023
ea47707
:fire: registry 테스트로 찍어둔 콘솔 제
leeks9653 Sep 13, 2023
a8d513c
feat: 공모 정보 카드 ing
leeks9653 Sep 16, 2023
5ab2d07
:sparkles: 탭메뉴 개발 ing
leeks9653 Sep 17, 2023
72c321b
:sparkles: 상세 수정사항 적용, 컴포넌트 추
leeks9653 Sep 28, 2023
b54870f
:sparkles: 공모 일정 기획 수정사항 적용 완료
leeks9653 Sep 28, 2023
b979661
:lipstick: SVG에onclick, css등 설정 가능하게 수정, 하은님 수정사힝 적용
leeks9653 Sep 28, 2023
428266b
마이페이지 퍼블리싱 완료 (#18)
ckhe1215 Oct 3, 2023
0242f09
:bug: Fix: 스토리북에서 router 빌드 에러 나는 부분 수정
ckhe1215 Oct 3, 2023
6b29b9b
:sparkles: progress bar
leeks9653 Oct 8, 2023
8f00163
:sparkles: 워크쓰루 ing
leeks9653 Oct 8, 2023
00b1685
Merge pull request #22 from 8princesses/feat/progress-bar
leeks9653 Oct 12, 2023
8812f24
:sparkles: login ing
leeks9653 Oct 14, 2023
3c0c827
Feat/intersting stock (#20)
ckhe1215 Oct 14, 2023
3c78d4b
:recycle: merge develop
leeks9653 Oct 14, 2023
27f6b1c
Merge branch 'develop' into feat/detail
leeks9653 Oct 14, 2023
e74a0d8
Feat/my account (#24)
ckhe1215 Oct 14, 2023
ce45ab5
Merge branch 'develop' into feat/detail
leeks9653 Oct 14, 2023
fcc050e
:bug: Story book 에러 수정
ckhe1215 Oct 14, 2023
6fa4d22
:sparkles: ing
leeks9653 Oct 14, 2023
e6a6203
:sparkles: ing
leeks9653 Oct 15, 2023
758a03e
:sparkles: checkbox
leeks9653 Oct 15, 2023
26bdb12
Merge pull request #25 from 8princesses/feat/check-box
leeks9653 Oct 15, 2023
9ff1e4e
:sparkles: sign-up
leeks9653 Oct 15, 2023
f8e138e
Merge branch 'develop' into feat/work-through
leeks9653 Oct 15, 2023
5cfca86
:sparkles: 로그인 완료
leeks9653 Oct 16, 2023
081e177
:sparkles: env url 추
leeks9653 Oct 16, 2023
bc3bcf2
Merge pull request #26 from 8princesses/feat/work-through
leeks9653 Oct 18, 2023
04ceb8d
:sparkles: 홈 / 관심공모주 (#27)
ckhe1215 Oct 21, 2023
de928ad
Merge branch 'develop' into feat/detail
leeks9653 Oct 21, 2023
ab70132
Merge branch 'develop' into feat/detail
leeks9653 Oct 21, 2023
424352d
fix: 필요없는 콘솔 제
leeks9653 Oct 21, 2023
f0fab9a
:sparkles: onboarding
leeks9653 Oct 22, 2023
928765b
:bug: 윈도우/안드로이드 플레이스토어 링크 제공하도록 수정
ckhe1215 Oct 21, 2023
fce59fe
:bug: Fix: import 잘못된 부분 수정
ckhe1215 Oct 21, 2023
219f5ef
:sparkles: 10개 더보기
ckhe1215 Oct 21, 2023
9220c1f
:bug: 빌드오류 발생하는 부분 수정
ckhe1215 Oct 21, 2023
3867571
:fire: 안쓰는 파일 삭제
ckhe1215 Oct 22, 2023
b67f46c
:sparkles: 상세 api호출 후 데이터 매핑 완료, 관심 공모주 적용
leeks9653 Oct 22, 2023
27ce493
:sparkles: merge develop
leeks9653 Oct 22, 2023
f115ae0
Merge branch 'develop' into feat/on-boarding
leeks9653 Oct 22, 2023
6a45632
:bug: 기관투자 경쟁률 %에 :1로 변경
leeks9653 Oct 22, 2023
a200e9b
Merge pull request #30 from 8princesses/feat/detail
leeks9653 Oct 22, 2023
5a080ad
:sparkles: 마이페이지 이름/이메일 출력
ckhe1215 Oct 22, 2023
b5bd9fa
:sparkles: 은행 선택 완료
leeks9653 Oct 22, 2023
c401fe5
:sparkles: 로그아웃, 회원탈퇴
ckhe1215 Oct 23, 2023
e0a8b27
:sparkles: 새로고침 없애고 토스트 추가, 관심공모주 탭 변경될때 refetch
ckhe1215 Oct 23, 2023
b9c8b8e
:sparkles: 온보딩 계좌 등록 퍼블리싱 완료
leeks9653 Oct 24, 2023
3a04916
Merge pull request #31 from 8princesses/feat/member-info
leeks9653 Oct 24, 2023
ed0604f
:sparkles: merge develop
leeks9653 Oct 24, 2023
729fa61
:lipstick: 닫는 중괄호 추
leeks9653 Oct 24, 2023
a9a69ef
:bug: 파일 이름 오
leeks9653 Oct 24, 2023
2b74a6e
:bug: 파일 이름 원상복구
leeks9653 Oct 24, 2023
1f8edb9
:sparkles: 온보딩 완료, CustomDateSelect 공통으로 사용할 수 있도록 수정, 수정으 로 인한 사이드 이…
leeks9653 Oct 24, 2023
b912a3a
:fire: 필요없는 DateSelect 제
leeks9653 Oct 24, 2023
269087f
Merge pull request #32 from 8princesses/feat/on-boarding
leeks9653 Oct 25, 2023
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
2 changes: 2 additions & 0 deletions .env.development
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
NEXT_PUBLIC_API_URL=https://api.modumozu.com/
NEXT_PUBLIC_KAKAO_KEY="5d83cd0432c767f46c20dceb0f8f3947"
2 changes: 1 addition & 1 deletion .env.production
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NEXT_PUBLIC_API_URL=URL
NEXT_PUBLIC_API_URL=https://api.modumozu.com/
6 changes: 2 additions & 4 deletions .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
{
"extends": [
"next/core-web-vitals",
"plugin:storybook/recommended"
]
"extends": ["next/core-web-vitals", "plugin:storybook/recommended"],
"ignorePatterns": ["src/stories"]
}
26 changes: 26 additions & 0 deletions .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Workflow name
name: "Chromatic Deployment"

# Event for the workflow
on:
push:
branches:
- develop

# List of jobs
jobs:
test:
# Operating System
runs-on: ubuntu-latest
# Job steps
steps:
- uses: actions/checkout@v1
- run: npm i -g pnpm
- run: pnpm install
#👇 Adds Chromatic as a step in the workflow
- uses: chromaui/action@v1
# Options required for Chromatic's GitHub Action
with:
#👇 Chromatic projectToken, see https://storybook.js.org/tutorials/intro-to-storybook/react/ko/deploy/ to obtain it
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
token: ${{ secrets.GITHUB_TOKEN }}
14 changes: 14 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import type { StorybookConfig } from "@storybook/nextjs";
import TsconfigPathsPlugin from "tsconfig-paths-webpack-plugin";

const config: StorybookConfig = {
stories: ["../src/**/*.mdx", "../src/**/*.stories.@(js|jsx|mjs|ts|tsx)"],
Expand All @@ -7,6 +8,7 @@ const config: StorybookConfig = {
"@storybook/addon-essentials",
"@storybook/addon-onboarding",
"@storybook/addon-interactions",
"@storybook/addon-viewport",
],
framework: {
name: "@storybook/nextjs",
Expand All @@ -15,5 +17,17 @@ const config: StorybookConfig = {
docs: {
autodocs: "tag",
},
staticDirs: ["../src/app"],
webpackFinal: async (config) => {
if (config.resolve) {
config.resolve.plugins = [
...(config.resolve.plugins || []),
new TsconfigPathsPlugin({
extensions: config.resolve.extensions,
}),
];
}
return config;
},
};
export default config;
15 changes: 0 additions & 15 deletions .storybook/preview.ts

This file was deleted.

30 changes: 30 additions & 0 deletions .storybook/preview.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import type { Preview } from "@storybook/react";
import React from "react";
import { INITIAL_VIEWPORTS } from "@storybook/addon-viewport/preview";
import "../src/app/globals.css";

const preview: Preview = {
parameters: {
actions: { argTypesRegex: "^on[A-Z].*" },
controls: {
matchers: {
color: /(background|color)$/i,
date: /Date$/,
},
},
viewport: {
viewports: INITIAL_VIEWPORTS,
defaultViewport: "iphone12",
},
},

decorators: [
(Story) => (
<>
<Story />
</>
),
],
};

export default preview;
408 changes: 408 additions & 0 deletions build-storybook.log

Large diffs are not rendered by default.

11 changes: 9 additions & 2 deletions next.config.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
/** @type {import('next').NextConfig} */
const nextConfig = {}
const nextConfig = {
compiler: {
styledComponents: true,
},
images: {
domains: ["d2u3dcdbebyaiu.cloudfront.net", "teamblindstatics.s3.ap-northeast-1.amazonaws.com"],
},
};

module.exports = nextConfig
module.exports = nextConfig;
17 changes: 14 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,23 @@
"lint": "next lint",
"storybook": "storybook dev -p 6006",
"build-storybook": "storybook build",
"preinstall": "npx only-allow pnpm"
"preinstall": "npx only-allow pnpm",
"chromatic": "npx chromatic --project-token=chpt_a2dbd92234c64c2"
},
"dependencies": {
"@storybook/addon-viewport": "^7.4.0",
"@tanstack/react-query": "^4.36.1",
"@types/node": "20.4.10",
"@types/react": "18.2.20",
"@types/react-dom": "18.2.7",
"axios": "^1.4.0",
"dayjs": "^1.11.10",
"eslint": "8.47.0",
"eslint-config-next": "13.4.13",
"korean-business-day": "^3.1.0",
"next": "13.4.13",
"react": "18.2.0",
"react-datepicker": "^4.19.0",
"react-dom": "18.2.0",
"recoil": "^0.7.7",
"styled-components": "^6.0.7",
Expand All @@ -35,7 +41,12 @@
"@storybook/react": "^7.2.3",
"@storybook/test-runner": "^0.13.0",
"@storybook/testing-library": "^0.2.0",
"@types/react-datepicker": "^4.15.1",
"chromatic": "^6.23.0",
"eslint-plugin-storybook": "^0.6.13",
"storybook": "^7.2.3"
}
"storybook": "^7.2.3",
"tsconfig-paths-webpack-plugin": "^4.1.0"
},
"readme": "ERROR: No README data found!",
"_id": "[email protected]"
}
Loading