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

[base -> develop] 8차 MVP #205

Merged
merged 50 commits into from
Oct 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
84404dd
feat: 공연 참가자 입력 UI 일부 구현
Puterism Oct 1, 2024
2c46666
feat: 출연진 정보 등록 데스크탑 디자인 Ui 추가
alstn2468 Oct 5, 2024
4933c08
feat: 목록 추가 삭제 기능 추가
alstn2468 Oct 5, 2024
456febc
feat: 버튼 비활성화 추가
alstn2468 Oct 5, 2024
a2b3ca8
feat: 서버에서 프로필 정보 가져와서 폼에 세팅하는 동작 추가
alstn2468 Oct 5, 2024
8980d2c
feat: 팀명 에러 노출 추가 및 간격 수정
alstn2468 Oct 5, 2024
d769189
feat: 팀명 입력창 너비 조정
alstn2468 Oct 5, 2024
4145bb9
feat: 팀 조회 관련 타입 추가
alstn2468 Oct 5, 2024
e63f0b8
feat: 다이얼로그 닫는 과정까지 추가
alstn2468 Oct 5, 2024
ffde691
feat: 공연 생성 페이지 출연진 정보 스타일 수정 및 데이터 연결
alstn2468 Oct 5, 2024
ff9ec64
feat: 편집 및 팀 삭제 기능 동작 적용
alstn2468 Oct 5, 2024
04fc0fe
feat: 팀원, 팀 CRUD 컨펌 정책 반영
alstn2468 Oct 5, 2024
24e50bb
feat: 슈퍼 어드민 티켓 관련 query 추가
hexdrinker Oct 5, 2024
2c7d541
feat: 공연 생성시 팀 생성 되도록 설정
alstn2468 Oct 5, 2024
46746ce
feat: 공인 정보 페이지에서 동작 할 수 있도록 컴포넌트 구성
alstn2468 Oct 5, 2024
e339388
feat: 공연 정보 페이지에서는 쿼리 캐시 이용해서 새로 노출
alstn2468 Oct 5, 2024
6b8b7d6
feat: id도 타입에 추가
alstn2468 Oct 5, 2024
1d91f03
feat: 바뀐 필드 수정 및 반영
alstn2468 Oct 6, 2024
54e5a15
feat: 슈드민 BaseBadge 추가
hexdrinker Oct 6, 2024
4d24c17
feat: 슈드민 티켓 생성, 삭제 관련 mutation 추가
hexdrinker Oct 6, 2024
ed2145b
feat: 슈드민 티켓 생성 Form 컴포넌트 추가
hexdrinker Oct 6, 2024
bffa867
feat: 슈드민 초청 티켓 코드 리스트 컴포넌트 추가
hexdrinker Oct 6, 2024
88ee1c2
feat: Promise 이용해서 에러 처리 추가
alstn2468 Oct 6, 2024
3966ddc
feat: 공연 생성 페이지 Promise 미사용 부분 반영
alstn2468 Oct 6, 2024
47ff9dd
Merge pull request #204 from Nexters/feature/cast-info
alstn2468 Oct 6, 2024
ecd7532
feat: rc-picker 추가
hexdrinker Oct 6, 2024
ed1dac8
feat: 슈드민 티켓 판매 정보 수정 mutation 추가
hexdrinker Oct 6, 2024
809e024
feat: 슈드민 티켓 페이지 작업
hexdrinker Oct 6, 2024
bdfd4e6
Merge branch 'base/mvp-8th' into feat/super-admin-ticket-managing
hexdrinker Oct 6, 2024
29b4c11
fix: 슈퍼 어드민 환경설정 값 수정
hexdrinker Oct 6, 2024
3140324
Merge pull request #207 from Nexters/fix/super-admin-env
hexdrinker Oct 6, 2024
4fe5cbc
feat: 인풋 에러 메세지 볼 수 있도록 설정
alstn2468 Oct 7, 2024
fcf460c
feat: 팀원 추가 했을 때 대응
alstn2468 Oct 7, 2024
52f46d5
fix: 인풋 스타일 이슈 및 업데이트 관련 로직 수정
alstn2468 Oct 7, 2024
ae5da7a
Merge pull request #208 from Nexters/fix/desktop-cast-info-qa-issue
alstn2468 Oct 7, 2024
2428184
feat: Tab UI 추가
alstn2468 Oct 7, 2024
6be3ad1
feat: Tab을 별도의 컴포넌트로 분리
alstn2468 Oct 7, 2024
a70c391
feat: 출연진 정보 있을 때 대응
alstn2468 Oct 7, 2024
b3ddd7e
feat: 출연진 정보 없는 경우 대응
alstn2468 Oct 7, 2024
45c6d8f
refac: 컴포넌트 분리
alstn2468 Oct 7, 2024
6b3bde7
feat: 공연 상세 페이지에도 반영
alstn2468 Oct 7, 2024
9990fab
feat: 탭 하단 보더 추가
alstn2468 Oct 7, 2024
b65b631
Merge pull request #209 from Nexters/feat/preview-cast-info
alstn2468 Oct 7, 2024
144e26a
Merge pull request #206 from Nexters/feat/super-admin-ticket-managing
hexdrinker Oct 10, 2024
56b9f1e
fix: 미리보기 열리면 뒤에 스크롤 방지
alstn2468 Oct 10, 2024
6ba61ee
fix: 출연진 정보 여백 조정
alstn2468 Oct 10, 2024
fc565b8
fix: 버튼 비활성화 조건 추가
alstn2468 Oct 10, 2024
67064cb
fix: 등록 다이얼로그 모바일 살짝 대응
alstn2468 Oct 10, 2024
7e65a24
feat: 모바일 등록하기 버튼 대응
alstn2468 Oct 10, 2024
b9fe5fa
Merge pull request #210 from Nexters/fix/cast-info-qa
alstn2468 Oct 10, 2024
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
89 changes: 89 additions & 0 deletions .pnp.cjs

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

5 changes: 4 additions & 1 deletion apps/admin/src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import {
} from './pages';
import ShowAddPage from './pages/ShowAddPage';
import { Suspense } from 'react';
import { domAnimation, LazyMotion } from 'framer-motion';

setDefaultOptions({ locale: ko });

Expand Down Expand Up @@ -142,7 +143,9 @@ const routes: RouteObject[] = [
element: (
<QueryClientProvider>
<BooltiUIProvider>
<Outlet />
<LazyMotion features={domAnimation}>
<Outlet />
</LazyMotion>
</BooltiUIProvider>
</QueryClientProvider>
),
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import styled from '@emotion/styled'
import { mq_lg } from '@boolti/ui'
import styled from '@emotion/styled';
import { mq_lg } from '@boolti/ui';

interface LabelProps {
required?: boolean;
Expand All @@ -17,15 +17,15 @@ const LinkForm = styled.form`
${mq_lg} {
padding: 0;
}
`
`;

const LinkFormControl = styled.div`
margin-bottom: 28px;

& > div {
width: 100%;
}
`
`;

const LinkFormButtonWrapper = styled.div<LinkFormButtonWrapperProps>`
display: flex;
Expand All @@ -35,15 +35,15 @@ const LinkFormButtonWrapper = styled.div<LinkFormButtonWrapperProps>`
margin-top: 4px;

button {
width: ${({ isEditMode }) => isEditMode ? 'auto' : '100%'};
width: ${({ isEditMode }) => (isEditMode ? 'auto' : '100%')};
}

${mq_lg} {
button {
width: auto;
}
}
`
`;

const Label = styled.label<LabelProps>`
${({ theme }) => theme.typo.b3};
Expand All @@ -53,7 +53,7 @@ const Label = styled.label<LabelProps>`
position: relative;

&::after {
content: ${({ required }) => (required ? "'*'" : "none")};
content: ${({ required }) => (required ? "'*'" : 'none')};
color: ${({ theme }) => theme.palette.status.error};
${({ theme }) => theme.typo.b1};
line-height: 22px;
Expand All @@ -66,12 +66,12 @@ const LinkDeleteButton = styled.button`
line-height: 22px;
text-decoration: underline;
cursor: pointer;
`
`;

export default {
LinkForm,
LinkFormControl,
LinkFormButtonWrapper,
Label,
LinkDeleteButton
}
LinkDeleteButton,
};
25 changes: 17 additions & 8 deletions apps/admin/src/components/LinkFormDialogContent/index.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
import { useForm } from 'react-hook-form';
import Styled from './LinkFormDialogContent.styles';
import { Button, TextField } from '@boolti/ui';
import { UserProfileLink } from '@boolti/api';
import { UserLink } from '@boolti/api';

export type LinkFormInputs = UserProfileLink;
export type LinkFormInputs = UserLink;

interface LinkFormDialogContentProps {
defaultValues?: LinkFormInputs;
onSubmit: (data: LinkFormInputs) => void;
onDelete?: () => void;
}

const LinkFormDialogContent = ({ defaultValues, onSubmit, onDelete }: LinkFormDialogContentProps) => {
const LinkFormDialogContent = ({
defaultValues,
onSubmit,
onDelete,
}: LinkFormDialogContentProps) => {
const linkForm = useForm<LinkFormInputs>({
defaultValues
defaultValues,
});

const isEditMode = !!defaultValues;
Expand All @@ -23,7 +27,7 @@ const LinkFormDialogContent = ({ defaultValues, onSubmit, onDelete }: LinkFormDi
title: data.title.trim(),
link: data.link.trim(),
});
}
};

return (
<Styled.LinkForm onSubmit={linkForm.handleSubmit(submitHandler)}>
Expand All @@ -47,7 +51,12 @@ const LinkFormDialogContent = ({ defaultValues, onSubmit, onDelete }: LinkFormDi
/>
</Styled.LinkFormControl>
<Styled.LinkFormButtonWrapper isEditMode={isEditMode}>
<Button size="bold" colorTheme="primary" type="submit" disabled={!linkForm.formState.isValid}>
<Button
size="bold"
colorTheme="primary"
type="submit"
disabled={!linkForm.formState.isValid}
>
저장하기
</Button>
{isEditMode && onDelete && (
Expand All @@ -57,7 +66,7 @@ const LinkFormDialogContent = ({ defaultValues, onSubmit, onDelete }: LinkFormDi
)}
</Styled.LinkFormButtonWrapper>
</Styled.LinkForm>
)
}
);
};

export default LinkFormDialogContent;
Loading
Loading