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

[Fix] - 미완성 파트 TODO 작성 #15

Merged
merged 1 commit into from
Nov 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
19 changes: 17 additions & 2 deletions src/components/create/TeamButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,25 @@ export default function TeamButton() {
return (
<S.Container>
<S.Button onClick={decrement} disabled={count === 0}>
-
<span
style={{
paddingBottom: "0.25rem",
}}
>
-
</span>
</S.Button>
<S.PersonNum>{count} 명</S.PersonNum>
<S.Button onClick={increment}>+</S.Button>
<S.Button onClick={increment}>
<span
style={{
paddingBottom: "0.25rem",
paddingLeft: "0.05rem",
}}
>
+
</span>
</S.Button>
</S.Container>
);
}
8 changes: 4 additions & 4 deletions src/components/create/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ export const Button = styled.button`
display: flex;
align-items: center;
justify-content: center;
width: 65px;
height: 65px;
width: 4rem;
height: 4rem;
border-radius: 50%;
background: #ced4da;
color: #343a40;
text-align: center;
font-family: Pretendard;
font-size: 36px;
font-weight: 600;
font-size: 30px;
text-align: center;
`;

export const PersonNum = styled.span`
Expand Down
4 changes: 3 additions & 1 deletion src/components/invite/profile/DeactivatedProfile.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
import * as S from "./style";
import { useNavigate } from "react-router-dom";

export default function DeactivatedProfile() {
const navigate = useNavigate();
const handleClick = () => {
window.location.href = "#";
navigate("/personal");
};

return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/invite/profile/style.ts
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export const DeactivatedContainer = styled.div`
border: 2px dashed #dee2e6;
background: #fff;
padding: 18px;

cursor: pointer;
@media (max-width: 360px) {
width: 280px;
}
Expand Down
7 changes: 3 additions & 4 deletions src/pages/confirm/Confirm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ const Confirm: React.FC = () => {
<InputContainer label="팀명" defaultText="팀명을 적어주세요!" />
<InputContainer
label="우리팀만의 규칙"
defaultText="1. 매일 데일리 스크럼 진행하기
2. 본인의 의견 확실하게 밝히기
3. 시간 나면 온라인 모각코 같이 진행하기"
defaultText="1. 규칙을 적어주세요!"
isTextArea={true}
/>
<InputContainer
Expand All @@ -30,9 +28,10 @@ const Confirm: React.FC = () => {
/>
</Wrapper>
</Wrapper>
<Button name="동기화 끝내기" link={`/next`} $width="100%" />
<Button name="동기화 끝내기" link={`/share`} $width="100%" />
</Container>
);
// TODO - Post로 최종 결과 등록 후 최종 공유 페이지 이동 로직
};

export default Confirm;
2 changes: 1 addition & 1 deletion src/pages/create/Create.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ const Create: React.FC = () => {
</Container>

<ButtonLayout>
<Button type="submit" link="" name="팀 동기화 시작하기" />
<Button type="submit" link="/invite" name="팀 동기화 시작하기" />
</ButtonLayout>
</>
);
Expand Down
7 changes: 6 additions & 1 deletion src/pages/invite/Invite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,14 @@ const Invite: React.FC = () => {
<DeactivatedProfile />
</ProfileList>
</Section>
<Button link="" name="팀원들과 동기화하기" />
<Button link="/result" name="팀원들과 동기화하기" />
</Container>
);
// TODO - 미등록 프로필 누르면 등록하는 페이지로
// TODO - 서버로 받은 UUID로 고유 페이지 생성
// TODO - 서버로 부터 등록받은 유저 받아와서 mapping
// TODO - 전 인원 미등록 시 disabled
// TODO - 전 인원 등록 후 버튼 클릭 시 GPT 관련 API요청
};

export default Invite;
2 changes: 1 addition & 1 deletion src/pages/result/Result.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ const Result: React.FC = () => {
</Wrapper>
</Wrapper>

<Button name="다음" link={`/next`} $width="100%" />
<Button name="다음" link={`/confirm`} $width="100%" />
</Container>
);
};
Expand Down
3 changes: 3 additions & 0 deletions src/pages/test/Test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,13 @@ const Test: React.FC = () => {
onClick={() => {
console.log("최종 선택된 내용:", selectedContent); // 최종 선택된 버튼의 인덱스 출력
}}
link="/invite"
/>
)}
</S.TestContainer>
);
// TODO - 25개 데이터 가지고 있기
// TODO - mapping해서 서버에 등록해주기
};

export default Test;