Skip to content

Commit

Permalink
Merge pull request #79 from Gosrock/dev
Browse files Browse the repository at this point in the history
프로덕션 배포 준비
  • Loading branch information
9yujin authored Aug 17, 2022
2 parents 45104b7 + e045594 commit d5e15fd
Show file tree
Hide file tree
Showing 9 changed files with 14,387 additions and 12,537 deletions.
11 changes: 4 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,11 @@

<br/>

## 4. 기획, 디자인
## 4. 웹페이지 뷰

- [Figma 링크](https://www.figma.com/file/J6HVLxWGuCFgAQUCdWBUsT/%EA%B3%A0%EC%8A%A4%EB%9D%BD-%ED%8B%B0%EC%BC%93%EC%98%88%EB%A7%A4?node-id=2026%3A6310)
- [관련 포스팅](https://9yujin.tistory.com/56?category=1025360)

<br/>

## 5. 뷰

<details>
<summary><h4>로그인, 인증</h4></summary>
<div>
Expand Down Expand Up @@ -94,7 +91,7 @@

<br/>

## 6. 폴더 구조
## 5. 폴더 구조

```bash
├── .github # 액션 워크플로우 세팅
Expand All @@ -117,7 +114,7 @@

<br/>

## 7. 참여자
## 6. 참여자
<table>
<tr align="center">
<td><B>Leader • Front-end • UI/UX<B></td>
Expand Down
66 changes: 66 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/components/landing/InfoSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ const InfoSection = ({ isPC }: { isPC: boolean }) => {
채널로 연락 부탁드립니다.
</li>
<li>
입금은 하루이내로 수동으로 확인되며, 마이페이지에서 입금 여부를
확인할 수 있습니다.
입금은 하루 이내 운영진들의 수작업으로 확인되며, 마이페이지에서
입금 여부를 확인할 수 있습니다.
</li>
<li>
입장 시 QRcode를 통해 티켓의 유효 여부를 확인합니다. 입장 전
Expand Down
1 change: 1 addition & 0 deletions src/components/modal/Account.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ const Button = styled.button`
justify-content: space-between;
align-items: center;
padding: 12px;
cursor: default;
& > div {
text-align: left;
Expand Down
4 changes: 2 additions & 2 deletions src/components/modal/Location.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ const Location = ({ closeModal }: LocationProps) => {
>
<div>
<p>
<span>DAY1</span> YB 공연
<span>DAY2</span> OB 공연
</p>
<p>드림홀 (서교동 양화로 64)</p>
<p>얼라이브홀 (서교동 독막로7길 20)</p>
</div>
<ArrowShort />
</Button>
Expand Down
5 changes: 4 additions & 1 deletion src/components/mypage/orderList/NotExistTickets.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ export default NotExistTickets;

const Wrapper = styled.div`
width: 100%;
height: calc(100vh - 160px);
height: calc(100% - 160px);
position: fixed;
overflow: hidden;
display: flex;
justify-content: center;
Expand Down
3 changes: 3 additions & 0 deletions src/components/mypage/talk/TalkInput.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,9 @@ const Title = styled.div<{ isOpen: boolean }>`
cursor: pointer;
}
}
svg {
cursor: pointer;
}
`;

const InputWindow = styled.div<{ isOpen: boolean }>`
Expand Down
7 changes: 5 additions & 2 deletions src/pages/common/NotFound.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,11 @@ const NotFound = () => {
export default NotFound;

const Wrapper = styled.div`
width: 100vw;
height: 100vh;
width: 100%;
height: 100%;
position: fixed;
overflow: hidden;
display: flex;
justify-content: center;
Expand Down
Loading

0 comments on commit d5e15fd

Please sign in to comment.