Skip to content

Commit

Permalink
chore: 회원가입 전화번호 placeholder 수정 (#1477)
Browse files Browse the repository at this point in the history 
* chore: 전화번호 placeholder 수정

* revert: 메인 홈 끝말잇기 되돌리기

* chore: 활동 후기 임시 주석 처리
  • Loading branch information
@seojisoosoo
seojisoosoo authored Jul 24, 2024
1 parent eaa9d62 commit ae2e153
Show file tree
Hide file tree
Showing 4 changed files with 67 additions and 73 deletions.
2 changes: 1 addition & 1 deletion src/components/auth/register/verify/view/ByPhoneView.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ const ByPhoneView: FC<ByPhoneProps> = (props) => {
<InputArea onSubmit={handleSubmitPhone}>
<StyledPhoneInput
name='phone'
placeholder='010-XXXX-XXXX'
placeholder='010XXXXXXXX'
error={(phone !== '' && !isPhoneValid) || type === 'phoneError'}
autoFocus
value={phone}
Expand Down
4 changes: 1 addition & 3 deletions src/components/common/Banner/ActiveBannerSlot.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
import styled from '@emotion/styled';
import { FC } from 'react';

import { ClosingCeremonyBanner } from '@/components/common/Banner/ClosingCeremonyBanner';

interface ActiveBannerSlotProps {}

const ActiveBannerSlot: FC<ActiveBannerSlotProps> = ({}) => {
return (
<StyledActiveBanner>
{/* 이 밑에 노출할 배너를 넣으세요. */}
<ClosingCeremonyBanner />
{/* <ClosingCeremonyBanner /> */}
{/* ==== */}
</StyledActiveBanner>
);
Expand Down
129 changes: 64 additions & 65 deletions src/components/wordchain/WordchainEntry/WordChainEntry.tsx
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
import styled from '@emotion/styled';
import { colors } from '@sopt-makers/colors';
import { fonts } from '@sopt-makers/fonts';
import { Flex } from '@toss/emotion-utils';
import Link from 'next/link';
import { FC } from 'react';

import { useGetEntryWordchain } from '@/api/endpoint/wordchain/getWordchain';
import Loading from '@/components/common/Loading';
import Responsive from '@/components/common/Responsive';
Expand All @@ -17,6 +10,12 @@ import IconMessageChat from '@/public/icons/icon-message-chat.svg';
import { MOBILE_MEDIA_QUERY } from '@/styles/mediaQuery';
import { textStyles } from '@/styles/typography';
import { SwitchCase } from '@/utils/components/switch-case/SwitchCase';
import styled from '@emotion/styled';
import { colors } from '@sopt-makers/colors';
import { fonts } from '@sopt-makers/fonts';
import { Flex } from '@toss/emotion-utils';
import Link from 'next/link';
import { FC } from 'react';

interface WordChainEntryProps {
className?: string;
Expand Down Expand Up @@ -46,17 +45,17 @@ const WordChainEntry: FC<WordChainEntryProps> = ({ className }) => {
{wordList && (
<>
<LeftSection>
{/* <Responsive only='desktop'>
<Responsive only='desktop'>
<StyledIconMessageChat />
</Responsive> */}
</Responsive>
<div style={{ width: '100%' }}>
<TitleWrapper>
<SwitchCase
value={status}
caseBy={{
start: (
<>
{/* <Responsive only='desktop'>
<Responsive only='desktop'>
{lastWinner ? (
<StyledTitle>
{lastWinner?.roomId}번째 우승자는
Expand All @@ -71,76 +70,76 @@ const WordChainEntry: FC<WordChainEntryProps> = ({ className }) => {
</StyledTitle>
)}
</Responsive>
<MobileResponsive only='mobile'> */}
<GotoWordChainWrapper>
<GotoWordChainContents>
<Flex align='center' style={{ gap: 4 }}>
<StyledIconMessageChat />
<GotoWordChainTitle>끝말잇기</GotoWordChainTitle>
</Flex>
{lastWinner ? (
<GotoWordChainSub>
이번 우승자는 <LastWord>{lastWinner?.winner.name}</LastWord>님 입니다! '
{data.nextSyllable}'(으)로 시작하는 단어는?
</GotoWordChainSub>
) : (
<GotoWordChainSub>우승하고 명예의 전당에 올라가보세요!</GotoWordChainSub>
)}
</GotoWordChainContents>
<div style={{ minWidth: 20 }}>
<ArrowIcon width={20} height={20} />
</div>
</GotoWordChainWrapper>
{/* </MobileResponsive> */}
<MobileResponsive only='mobile'>
<GotoWordChainWrapper>
<GotoWordChainContents>
<Flex align='center' style={{ gap: 4 }}>
<StyledIconMessageChat />
<GotoWordChainTitle>끝말잇기</GotoWordChainTitle>
</Flex>
{lastWinner ? (
<GotoWordChainSub>
이번 우승자는 <LastWord>{lastWinner?.winner.name}</LastWord>님 입니다! '
{data.nextSyllable}'(으)로 시작하는 단어는?
</GotoWordChainSub>
) : (
<GotoWordChainSub>우승하고 명예의 전당에 올라가보세요!</GotoWordChainSub>
)}
</GotoWordChainContents>
<div style={{ minWidth: 20 }}>
<ArrowIcon width={20} height={20} />
</div>
</GotoWordChainWrapper>
</MobileResponsive>
</>
),
progress: (
<>
{/* <Responsive only='desktop'>
<Responsive only='desktop'>
<StyledTitle>
현재 {`'${data?.currentWinner?.name}'`}님이 <br />
끝말잇기를 이기고 있어요!
</StyledTitle>
</Responsive>
<MobileResponsive only='mobile'> */}
<GotoWordChainWrapper>
<GotoWordChainContents>
<Flex align='center' style={{ gap: 4 }}>
<StyledIconMessageChat />
<GotoWordChainTitle>끝말잇기</GotoWordChainTitle>
</Flex>
{lastWord != null && (
<GotoWordChainSub>
{`${data?.currentWinner?.name}`}님이 <LastWord>{data.nextSyllable}</LastWord>(으)로
끝냈어요. 끝말을 이어주세요!
</GotoWordChainSub>
)}
</GotoWordChainContents>
<div style={{ minWidth: 20 }}>
<ArrowIcon width={20} height={20} />
</div>
</GotoWordChainWrapper>
{/* </MobileResponsive> */}
<MobileResponsive only='mobile'>
<GotoWordChainWrapper>
<GotoWordChainContents>
<Flex align='center' style={{ gap: 4 }}>
<StyledIconMessageChat />
<GotoWordChainTitle>끝말잇기</GotoWordChainTitle>
</Flex>
{lastWord != null && (
<GotoWordChainSub>
{`${data?.currentWinner?.name}`}님이 <LastWord>{data.nextSyllable}</LastWord>(으)로
끝냈어요. 끝말을 이어주세요!
</GotoWordChainSub>
)}
</GotoWordChainContents>
<div style={{ minWidth: 20 }}>
<ArrowIcon width={20} height={20} />
</div>
</GotoWordChainWrapper>
</MobileResponsive>
</>
),
}}
/>
</TitleWrapper>
{/* <Responsive only='desktop'>
<Responsive only='desktop'>
<WordchainText>
{(lastWinner?.roomId ?? 0) + 1}번째 끝말잇기 우승자 도전하러 가기
<ArrowIcon />
</WordchainText>
</Responsive> */}
</Responsive>
</div>
</LeftSection>
<RightSection isStart={status === 'start'}>
{/* <Responsive only='desktop'>
<Responsive only='desktop'>
<WordWrapper>
{status === 'start' && <WordchainMessage type='startWord' word={data.nextSyllable} />}
{lastUser && <WordchainMessage type='word' word={data.nextSyllable} user={lastUser} />}
</WordWrapper>
</Responsive> */}
</Responsive>
</RightSection>
</>
)}
Expand All @@ -157,7 +156,7 @@ const LoadingContainer = styled.div`
width: 100%;
height: 92px;
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
height: 91.5px;
}
`;
Expand All @@ -177,7 +176,7 @@ const Container = styled(Link)`
background-color: ${colors.gray800};
}
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
flex-direction: column;
align-items: center;
justify-content: center;
Expand All @@ -196,15 +195,15 @@ const Container = styled(Link)`

const TitleWrapper = styled.div`
white-space: nowrap;
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
display: flex;
gap: 4px;
align-items: center;
}
`;

const StyledIconMessageChat = styled(IconMessageChat)`
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
width: 20px;
height: 20px;
}
Expand All @@ -214,7 +213,7 @@ const LeftSection = styled.div`
display: flex;
gap: 12px;
width: 100%;
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
display: contents;
gap: 0;
}
Expand All @@ -224,7 +223,7 @@ const StyledTitle = styled(Text)`
display: block;
${fonts.HEADING_18_B}
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
margin: 0;
${textStyles.SUIT_20_B};
}
Expand All @@ -238,7 +237,7 @@ const WordchainText = styled(Text)`
white-space: nowrap;
${fonts.LABEL_12_SB}
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
display: flex;
align-items: center;
justify-content: center;
Expand All @@ -262,7 +261,7 @@ const RightSection = styled.div<{ isStart: boolean }>`
justify-content: ${({ isStart }) => (isStart ? 'flex-start' : 'flex-end')};
width: 100%;
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
gap: 10px;
margin-top: 16px;
}
Expand All @@ -286,7 +285,7 @@ const GotoWordChainWrapper = styled.aside`
padding: 16px;
width: 100%;
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
gap: 8px;
border-radius: 14px;
padding: 18px 17px;
Expand All @@ -302,7 +301,7 @@ const GotoWordChainContents = styled.div`
display: flex;
gap: 20px;
@media ${TEMPORARY_MEDIA_QUERY} {
@media ${MOBILE_MEDIA_QUERY} {
gap: 16px;
}
`;
Expand Down
5 changes: 1 addition & 4 deletions src/pages/remember/index.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,13 @@ import styled from '@emotion/styled';
import { FC } from 'react';

import AuthRequired from '@/components/auth/AuthRequired';
import RememberPage from '@/components/remember';
import { MOBILE_MEDIA_QUERY } from '@/styles/mediaQuery';
import { setLayout } from '@/utils/layout';

const Remember34Page: FC = () => {
return (
<AuthRequired>
<StyledRemember34Page>
<RememberPage />
</StyledRemember34Page>
<StyledRemember34Page>{/* <RememberPage /> */}</StyledRemember34Page>
</AuthRequired>
);
};
Expand Down

0 comments on commit ae2e153

Please sign in to comment.