forked from mash-up-kr/MAC_Web
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* setting: 폴더이름 오타수정 * 라우팅 및 레이아웃 추가 (mash-up-kr#10) * wip: 라우터 추가 * etc: commit prefix 추가 * wip: 라우팅, 공통 레이아웃 추가 * styled theme작성 (mash-up-kr#11) * setting: (mash-up-kr#8) styled components에 theme주입 및 폰트적용 * setting: (mash-up-kr#8) media주입 * 컨플릭트 해결 및 assets 추가 (mash-up-kr#12) * wip: 라우터 추가 * wip: 라우팅, 공통 레이아웃 추가 * etc: 컨플리트 해결 * etc: added assets * feat: svg컴포넌트 작성 (mash-up-kr#13) * feat: svg컴포넌트 작성 * feat: lodash-es 모듈 추가 * 레이아웃 css 추가 (mash-up-kr#14) * wip: 라우터 추가 * wip: 라우팅, 공통 레이아웃 추가 * etc: assets 추가 * wip: layout css 추가 * feat: answer type 추가(mash-up-kr#2) * answer list UI 추가(mash-up-kr#2) *wip: answer component 추가 *wip: answer list component 추가 * merge develop feature/answerlist (mash-up-kr#2) * feat: like button state 추가(mash-up-kr#2) * answer place holder 추가(mash-up-kr#2) wip: place holder style 추가 * Feature/layout (mash-up-kr#15) * setting: 폴더이름 오타수정 * 라우팅 및 레이아웃 추가 (mash-up-kr#10) * wip: 라우터 추가 * etc: commit prefix 추가 * wip: 라우팅, 공통 레이아웃 추가 * styled theme작성 (mash-up-kr#11) * setting: (mash-up-kr#8) styled components에 theme주입 및 폰트적용 * setting: (mash-up-kr#8) media주입 * 컨플릭트 해결 및 assets 추가 (mash-up-kr#12) * wip: 라우터 추가 * wip: 라우팅, 공통 레이아웃 추가 * etc: 컨플리트 해결 * etc: added assets * feat: svg컴포넌트 작성 (mash-up-kr#13) * feat: svg컴포넌트 작성 * feat: lodash-es 모듈 추가 * wip: 라우터 추가 * wip: 라우팅, 공통 레이아웃 추가 * etc: assets 추가 * wip: layout css 추가 * feat: 카드 UI 완성 Co-authored-by: danivelop <[email protected]> Co-authored-by: danivelop <[email protected]> * feat: (mash-up-kr#6) 고민리스트 UI작성 (mash-up-kr#16) * 답변 리스트 UI 수정 (mash-up-kr#2) * feat: AnswerItem UI 수정 * wip: AnswerList UI 수정 * pr 피드백 반영 *refact: colors 적용 *refact: array key 추가 *refact: 프래그먼트 제거 * concern 리덕스 및 saga로직 작성 (mash-up-kr#19) * feat: 모델 작성 및 redux util 작성 * concern reducer 및 saga로직 작성 Co-authored-by: danivelop <[email protected]> Co-authored-by: danivelop <[email protected]> Co-authored-by: godjoy <[email protected]> Co-authored-by: godjoy <[email protected]>
- Loading branch information
1 parent
51608c6
commit e91a0ea
Showing
56 changed files
with
1,575 additions
and
49 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -8,6 +8,7 @@ | |
- hot-fix 핫 버그 수정 | ||
- bug-fix 버그 수정 | ||
- refactor 기능 수정 추가 및 코드 수정 | ||
- wip 작업 중일 때 | ||
|
||
#### Commit Prefix | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,17 @@ | ||
import React from 'react' | ||
import { BrowserRouter } from 'react-router-dom' | ||
import { GlobalStyle } from 'global-styles' | ||
import Routes from 'Routes' | ||
|
||
function App() { | ||
return <div>hello world!</div> | ||
return ( | ||
<> | ||
<BrowserRouter> | ||
<Routes /> | ||
</BrowserRouter> | ||
<GlobalStyle /> | ||
</> | ||
) | ||
} | ||
|
||
export default App |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
import React, { FC } from 'react' | ||
import { | ||
Route, | ||
RouteComponentProps, | ||
Switch, | ||
withRouter, | ||
} from 'react-router-dom' | ||
import Concerns from 'pages/Concerns' | ||
import Concern from 'pages/Concern' | ||
|
||
const Routes: FC<RouteComponentProps> = () => { | ||
return ( | ||
<Switch> | ||
<Route exact path="/concerns" component={Concerns} /> | ||
<Route exact path="/concern/:edit" component={Concern} /> | ||
</Switch> | ||
) | ||
} | ||
|
||
export default withRouter(Routes) |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Oops, something went wrong.