-
Notifications
You must be signed in to change notification settings - Fork 37
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 #37 from JUNGYUN-Daegu/FE-dev
[Team05 - Q, eve] issue-tracker 2주차 PR
- Loading branch information
Showing
68 changed files
with
3,821 additions
and
24,758 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 |
|---|---|---|
|
|
@@ -13,6 +13,7 @@ | |
|
|
||
| # misc | ||
| .DS_Store | ||
| .env | ||
| .env.local | ||
| .env.development.local | ||
| .env.test.local | ||
|
|
||
Large diffs are not rendered by default.
Oops, something went wrong.
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 |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| import styled from 'styled-components'; | ||
|
|
||
| import { Textarea } from '@chakra-ui/textarea'; | ||
| import { contentsInputStyle } from '@components/newIssue/style'; | ||
| import { ReactComponent as FileIcon } from '@assets/file.svg'; | ||
|
|
||
| function CommonTextArea() { | ||
| return ( | ||
| <Description> | ||
| <Textarea {...contentsInputStyle} /> | ||
| <Span>띄어쓰기 포함 \d\d 자</Span> | ||
| <ImageUploadWrap> | ||
| <FileIcon /> | ||
| <span>파일 첨부하기</span> | ||
| </ImageUploadWrap> | ||
| </Description> | ||
| ); | ||
| } | ||
|
|
||
| export default CommonTextArea; | ||
|
|
||
| const Description = styled.div` | ||
| width: 880px; | ||
| position: relative; | ||
| background: ${({ theme }) => theme.colors.gr_inputBackground}; | ||
| border-radius: ${({ theme }) => theme.radii['2xl']}; | ||
| `; | ||
|
|
||
| const Span = styled.div` | ||
| right: 30px; | ||
| bottom: 72px; | ||
| font-size: ${({ theme }) => theme.fontSizes.xs}; | ||
| font-weight: ${({ theme }) => theme.fontWeights.medium}; | ||
| color: ${({ theme }) => theme.colors.label}; | ||
| position: absolute; | ||
| `; | ||
|
|
||
| const ImageUploadWrap = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| padding: 16px 24px; | ||
| height: 52px; | ||
| color: ${({ theme }) => theme.colors.label}; | ||
| font-weight: ${({ theme }) => theme.fontWeights.bold}; | ||
| border-top: 1px dotted ${({ theme }) => theme.colors.gr_line}; | ||
| cursor: pointer; | ||
| span { | ||
| padding-left: 10px; | ||
| } | ||
| `; |
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
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,108 @@ | ||
| import styled from 'styled-components'; | ||
|
|
||
| import { Skeleton, SkeletonCircle } from '@chakra-ui/skeleton'; | ||
| import { Avatar } from '@chakra-ui/avatar'; | ||
|
|
||
| // 프로필 이미지 스켈레톤 | ||
| export const ProfileSkeleton = <SkeletonCircle size="10" isLoaded={false} />; | ||
|
|
||
| // 라벨 스켈레톤 | ||
| export const LabelSkeleton = <Skeleton height="20px" borderRadius="16px" />; | ||
| export function LabelSkeleton() { | ||
| return <Skeleton height="20px" width="40px" borderRadius="16px" />; | ||
| } | ||
|
|
||
| export function IssueSkeleton() { | ||
| return ( | ||
| <IssueWrap> | ||
| <IssueContainer> | ||
| <StyledDiv> | ||
| <CheckBox type="checkbox" name="issueCheckBox" /> | ||
| <IssueTitle> | ||
| <Skeleton height="20px" width="100px" /> | ||
| <Skeleton height="20px" width="60px" /> | ||
| <Skeleton height="20px" width="60px" /> | ||
| </IssueTitle> | ||
| </StyledDiv> | ||
| <Description> | ||
| <Skeleton height="20px" width="30px" /> | ||
| <Skeleton height="20px" width="80px" /> | ||
| <Skeleton height="20px" width="80px" /> | ||
| </Description> | ||
| </IssueContainer> | ||
| <AvatarContainer> | ||
| <AvatarBox> | ||
| <Avatar className="avatar" size="sm" src="./janmang.jpeg" /> | ||
| </AvatarBox> | ||
| </AvatarContainer> | ||
| </IssueWrap> | ||
| ); | ||
| } | ||
|
|
||
| interface AvatarPos { | ||
| pos?: string | undefined; | ||
| } | ||
|
|
||
| const IssueWrap = styled.div` | ||
| display: flex; | ||
| justify-content: space-between; | ||
| align-items: center; | ||
| background: ${({ theme }) => theme.colors.gr_offWhite}; | ||
| `; | ||
|
|
||
| const IssueContainer = styled.div` | ||
| display: flex; | ||
| flex-direction: column; | ||
| justify-content: center; | ||
| width: 878; | ||
| height: 100px; | ||
| padding: 16px 0 16px 32px; | ||
| position: relative; | ||
| `; | ||
|
|
||
| const AvatarContainer = styled.div` | ||
| display: flex; | ||
| justify-content: flex-end; | ||
| margin-right: 30px; | ||
| width: 76px; | ||
| height: 32px; | ||
| position: relative; | ||
| `; | ||
|
|
||
| const AvatarBox = styled.div<AvatarPos>` | ||
| width: auto; | ||
| position: absolute; | ||
| right: ${({ pos }) => pos || '32px'}; | ||
| `; | ||
|
|
||
| const IssueTitle = styled.div` | ||
| display: flex; | ||
| align-items: center; | ||
| height: 32px; | ||
| div { | ||
| margin: 0 4px 0 12px; | ||
| } | ||
| `; | ||
|
|
||
| const StyledDiv = styled.div` | ||
| display: flex; | ||
| width: 100%; | ||
| justify-content: flex-start; | ||
| align-items: center; | ||
| `; | ||
|
|
||
| const CheckBox = styled.input` | ||
| width: 16px; | ||
| height: 16px; | ||
| `; | ||
|
|
||
| const Description = styled.div` | ||
| margin: 8px 0 0 28px; | ||
| display: flex; | ||
| justify-content: flex-start; | ||
| align-items: center; | ||
| div { | ||
| margin-right: 16px; | ||
| } | ||
| `; |
Oops, something went wrong.