-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #336 from Bamdoliro/develop
Release - user v1.0.4
- Loading branch information
Showing
55 changed files
with
731 additions
and
525 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 |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| name: Support Review | ||
|
|
||
| on: | ||
| pull_request: | ||
| types: [opened] | ||
|
|
||
| jobs: | ||
| comment_for_supporting_review: | ||
| runs-on: ubuntu-latest | ||
| name: Comment for supporting review | ||
| steps: | ||
| - name: Checkout | ||
| uses: actions/checkout@v3 | ||
|
|
||
| - name: Comment PR | ||
| uses: thollander/actions-comment-pull-request@v2 | ||
| with: | ||
| message: | | ||
| ## 이렇게 리뷰해주세요. | ||
| ### 🖐️ 규칙 | ||
| 1. **왜** 개선이 필요한지 충분히 설명해주세요. | ||
| 2. 답을 알려주기보다는 **스스로 고민하고 개선 방법을 선택**할 수 있게 해주세요. | ||
| 3. 코드를 **깔끔하게 유지**하고, **일관되게 구현**하도록 안내해 주세요. | ||
| 4. 리뷰 과정이 숙제검사가 아닌 **학습과정**으로 느낄 수 있게 리뷰해 주세요. | ||
| 5. 리뷰를 위한 리뷰를 하지 마세요. 피드백 할 게 없으면 **칭찬**해 주세요. | ||
| ### 🥬 우선순위 | ||
| 리뷰 중요도에 따라 다음과 같은 prefix를 붙여주세요. | ||
| > 예시 - P5) 쓸모없는 주석 삭제해주세요. | ||
| - P1: 꼭 반영해주세요 (Request changes) | ||
| - P2: 적극적으로 고려해주세요 (Request changes) | ||
| - P3: 웬만하면 반영해 주세요 (Comment) | ||
| - P4: 반영해도 좋고 넘어가도 좋습니다 (Approve) | ||
| - P5: 그냥 사소한 의견입니다 (Approve) |
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
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,49 @@ | ||
| 'use client'; | ||
|
|
||
| import FaqTable from '@/components/faq/FaqTable/FaqTable'; | ||
| import AppLayout from '@/layouts/AppLayout'; | ||
| import { Button, Column, Dropdown, Row, SearchInput, Text } from '@maru/ui'; | ||
| import { flex } from '@maru/utils'; | ||
| import { styled } from 'styled-components'; | ||
|
|
||
| const FaqPage = () => { | ||
| return ( | ||
| <AppLayout> | ||
| <StyledFaqPage> | ||
| <Text fontType="H1">자주 묻는 질문</Text> | ||
| <Column gap={36}> | ||
| <Row justifyContent="space-between"> | ||
| <Button size="SMALL" icon="ADD_ICON"> | ||
| 자주 묻는 질문 작성 | ||
| </Button> | ||
| <Row gap={16}> | ||
| <Dropdown | ||
| data={[]} | ||
| size="SMALL" | ||
| width={140} | ||
| placeholder="카테고리" | ||
| onChange={() => console.log('이잉')} | ||
| name="category" | ||
| /> | ||
| <Row gap={8}> | ||
| <SearchInput placeholder="검색어를 입력하세요." /> | ||
| <Button size="SMALL">검색</Button> | ||
| </Row> | ||
| </Row> | ||
| </Row> | ||
| </Column> | ||
| <FaqTable /> | ||
| </StyledFaqPage> | ||
| </AppLayout> | ||
| ); | ||
| }; | ||
|
|
||
| export default FaqPage; | ||
|
|
||
| const StyledFaqPage = styled.div` | ||
| ${flex({ flexDirection: 'column' })} | ||
| gap: 40px; | ||
| width: 100%; | ||
| height: 100%; | ||
| padding: 64px 75px; | ||
| `; |
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 |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import { flex } from '@maru/utils'; | ||
| import styled from 'styled-components'; | ||
| import FaqTableHeader from './FaqTableHeader/FaqTableHeader'; | ||
| import FaqTableItem from './FaqTableItem/FaqTableItem'; | ||
|
|
||
| const FaqTable = () => { | ||
| return ( | ||
| <StyledFaqTable> | ||
| <FaqTableHeader /> | ||
| <FaqTableItem | ||
| id={1} | ||
| title="부산소마고 기숙사 왜 이꼬라지 인가요?" | ||
| category="기타" | ||
| createdAt="2022-05-07T10:35:57" | ||
| /> | ||
| </StyledFaqTable> | ||
| ); | ||
| }; | ||
|
|
||
| export default FaqTable; | ||
|
|
||
| const StyledFaqTable = styled.div` | ||
| ${flex({ flexDirection: 'column' })}; | ||
| gap: 12px; | ||
| width: 100%; | ||
| height: 100%; | ||
| `; |
27 changes: 27 additions & 0 deletions
27
apps/admin/src/components/faq/FaqTable/FaqTableHeader/FaqTableHeader.tsx
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,27 @@ | ||
| import ListHeader from '@/components/common/ListHeader/ListHeader'; | ||
| import { Row, Text } from '@maru/ui'; | ||
|
|
||
| const FaqTableHeader = () => { | ||
| return ( | ||
| <ListHeader> | ||
| <Row gap={48}> | ||
| <Text fontType="p2" width={50}> | ||
| 번호 | ||
| </Text> | ||
| <Text fontType="p2" width={400}> | ||
| 제목 | ||
| </Text> | ||
| </Row> | ||
| <Row gap={184}> | ||
| <Text fontType="p2" width={120}> | ||
| 카테고리 | ||
| </Text> | ||
| <Text fontType="p2" width={120}> | ||
| 게시일 | ||
| </Text> | ||
| </Row> | ||
| </ListHeader> | ||
| ); | ||
| }; | ||
|
|
||
| export default FaqTableHeader; |
35 changes: 35 additions & 0 deletions
35
apps/admin/src/components/faq/FaqTable/FaqTableItem/FaqTableItem.tsx
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,35 @@ | ||
| import ListItem from '@/components/common/ListItem/ListItem'; | ||
| import { Text, Row } from '@maru/ui'; | ||
| import { formatCreatedAt } from '@maru/utils'; | ||
|
|
||
| interface Props { | ||
| id: number; | ||
| title: string; | ||
| category: string; | ||
| createdAt: string; | ||
| } | ||
|
|
||
| const FaqTableItem = ({ id, title, category, createdAt }: Props) => { | ||
| return ( | ||
| <ListItem> | ||
| <Row gap={48}> | ||
| <Text fontType="p2" width={50} ellipsis> | ||
| {id} | ||
| </Text> | ||
| <Text fontType="p2" width={400} ellipsis> | ||
| {title} | ||
| </Text> | ||
| </Row> | ||
| <Row gap={184}> | ||
| <Text fontType="p2" width={120} ellipsis> | ||
| {category} | ||
| </Text> | ||
| <Text fontType="p2" width={120} ellipsis> | ||
| {formatCreatedAt(createdAt)} | ||
| </Text> | ||
| </Row> | ||
| </ListItem> | ||
| ); | ||
| }; | ||
|
|
||
| export default FaqTableItem; |
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
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.