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(home, start-relay-question): 잘못된 폰트 컬러 지정 오류 수정 #114

Merged
merged 6 commits into from
Aug 22, 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
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ export const useInActiveEventMutation = ({ options }: Args = {}) => {

export async function inactiveEvent(params: Params): Promise<{}> {
const { eventId } = params;
const data = await Http.PATCH<Params, {}>(`/v1/events/${eventId}/inactive`, {});
const data = await Http.PATCH<Params, {}>(`/v1/events/${eventId}/inactivate`, {});
return data;
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Txt } from '@sambad/sds/components';
import { borderRadiusVariants } from '@sds/theme';
import Link from 'next/link';

import { MemberType } from '../../../../common/apis/schema/useGetProgressingQuestionQuery.type';
import { Avatar } from '../../../../common/components/Avatar/Avatar';
import { MemberType } from '@/home/common/apis/schema/useGetProgressingQuestionQuery.type';
import { Avatar } from '@/home/common/components/Avatar/Avatar';

interface GatherMemberProfileProps {
member: MemberType;
Expand All @@ -24,7 +25,12 @@ export const GatherMemberProfile = ({ member }: GatherMemberProfileProps) => {
}}
>
<div css={{ alignItems: 'center', display: 'flex' }}>
<Avatar imageUrl={profileImageFileUrl} width={40} height={40} css={{ borderRadius: '50%' }} />
<Avatar
imageUrl={profileImageFileUrl}
width={40}
height={40}
css={{ borderRadius: borderRadiusVariants.round, objectFit: 'cover' }}
/>
<Txt typography="title2" css={{ marginLeft: '12px' }}>
{name}
</Txt>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'use client';

import { Txt } from '@sambad/sds/components';
import { colors } from '@sds/theme';

import { GatherMemberProfileList } from '../components/GatherMemberProfile/GatherMemberProfileList';
import { useGatherMemberProfileListService } from '../services/useGatherMemberProfileListService';
Expand All @@ -14,7 +15,7 @@ export const GatherMemberProfileListContainer = () => {

return (
<section css={{ width: '100%', padding: '18px 20px 112px' }}>
<Txt as="p" typography="subtitle1" css={{ marginBottom: '14px' }}>
<Txt as="p" typography="subtitle1" color={colors.grey800} css={{ marginBottom: '14px' }}>
모임원 프로필
</Txt>
<GatherMemberProfileList memberList={gatherMemberList} />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { Txt } from '@sambad/sds/components';
import { colors, borderRadiusVariants } from '@sambad/sds/theme';
import { borderRadiusVariants, colors } from '@sambad/sds/theme';
import { AngleRightIcon } from '@sds/components/Icon/assets/AngleRight';
import Link from 'next/link';

import { AngleRightIcon } from '../../../../../../../core/sds/src/components/Icon/assets/AngleRight';
import { TopPreviousQuestionType } from '../../../../common/apis/schema/useGetPreviousQuestionListQuery.type';
import { TopPreviousQuestionType } from '@/home/common/apis/schema/useGetPreviousQuestionListQuery.type';

interface HomePreviousQuestionItemProps {
meetingId?: number;
Expand Down Expand Up @@ -31,7 +31,9 @@ export const HomePreviousQuestionItem = ({ question }: HomePreviousQuestionItemP
<div css={{ flex: '1' }}>
<Txt as="p" typography="heading3" color={colors.tertiary500} css={{ marginBottom: '4px' }}>
{content}
<Txt typography="title2">이/가 가장 많았어요.</Txt>
<Txt typography="title2" color={colors.black}>
이/가 가장 많았어요.
</Txt>
</Txt>
<Txt as="p" typography="body3" color={colors.grey600} css={{ marginBottom: '8px' }}>
{title}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export const TopPreviousQuestionListContainer = () => {
<Txt
as="p"
typography="subtitle1"
color={colors.grey800}
css={{ display: 'flex', justifyContent: 'space-between', alignItems: 'center', marginBottom: '12px' }}
>
이전 질문
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Txt } from '@sambad/sds/components';
import { colors } from '@sds/theme';
import Link from 'next/link';
import { HTMLAttributes } from 'react';

Expand All @@ -16,7 +17,7 @@ export const GatherName = ({ gatherName, profileImage, ...rest }: GatherNameProp
<Txt typography="heading1" color="#ff7664" as="h1" css={{ marginBottom: '4px' }}>
{gatherName}
</Txt>
<Txt typography="heading2" as="h2">
<Txt typography="heading2" color={colors.black} as="h2">
모임원들과 더 가까워져 볼까요?
</Txt>
</div>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Txt } from '@sambad/sds/components';
import { colors } from '@sds/theme';
import { HTMLAttributes, ReactNode } from 'react';

interface ProgressingQuestionInfoProps extends HTMLAttributes<HTMLDivElement> {
Expand All @@ -8,7 +9,7 @@ interface ProgressingQuestionInfoProps extends HTMLAttributes<HTMLDivElement> {
export const ProgressingQuestionInfo = ({ renderQuestion, ...rest }: ProgressingQuestionInfoProps) => {
return (
<div {...rest}>
<Txt typography="subtitle1" as="p" css={{ marginBottom: '8px' }}>
<Txt typography="subtitle1" color={colors.black} as="p" css={{ marginBottom: '8px' }}>
진행 중인 릴레이 질문
</Txt>
{renderQuestion}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@ export const QuestionDetail = ({
}: QuestionDetailProps) => {
return (
<div css={wrapperCss}>
<Txt typography="heading3" fontWeight="bold">
<Txt typography="heading3" color={colors.black} fontWeight="bold">
질문 미리보기
</Txt>
<div css={imageWrapperCss}>
<Image src={imageUrl} alt={title} width={64} height={64} />
</div>
<Txt typography="heading2" fontWeight="bold" css={{ textAlign: 'center' }}>
<Txt typography="heading2" color={colors.black} fontWeight="bold" css={{ textAlign: 'center' }}>
{title}
</Txt>
<Txt color={colors.grey500} typography="title4" fontWeight="medium" css={answerExampleTextCss}>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Txt } from '@sambad/sds/components';
import { colors } from '@sds/theme';
import Image from 'next/image';
import { useRouter, useSearchParams } from 'next/navigation';

Expand Down Expand Up @@ -47,7 +48,7 @@ export const Questioner = ({ meetingId, meetingMemberId, imageUrl, name }: Quest
<div css={imgWrapperCss}>
<Image src={imageUrl} alt={name} width={40} height={40} />
</div>
<Txt typography="title2" fontWeight="medium">
<Txt typography="title2" color={colors.black} fontWeight="medium">
{name}
</Txt>
</li>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { css } from '@emotion/react';
import { Button, Txt } from '@sambad/sds/components';
import { size } from '@sambad/sds/theme';
import { colors, size } from '@sambad/sds/theme';
import Image from 'next/image';

import { RelayRePickQuestioner } from '../../../../assets/RelayRePickQuestioner';
Expand Down Expand Up @@ -30,7 +30,7 @@ export const QuestionerDetail = ({
<div css={imgWrapperCss}>
<Image src={imageUrl} alt={name} width={80} height={80} />
</div>
<Txt typography="heading2" fontWeight="bold" css={nameCss}>
<Txt typography="heading2" color={colors.black} fontWeight="bold" css={nameCss}>
{name}
</Txt>
<div css={buttonWrapperCss}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const QuestionList = () => {
return (
<section>
<div css={questionTextBoxCss}>
<Txt typography="heading1" fontWeight="bold">
<Txt typography="heading1" color={colors.black} fontWeight="bold">
어떤 질문으로 물어볼까요?
</Txt>
</div>
Expand Down Expand Up @@ -74,7 +74,7 @@ const NextQuestionerList = () => {
return (
<section>
<div css={questionTextBoxCss}>
<Txt typography="heading1" fontWeight="bold">
<Txt typography="heading1" color={colors.black} fontWeight="bold">
다음 릴레이 질문인은 <br />
누구로 할까요?
</Txt>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,9 @@ export const Profile = ({ profileImageUrl }: ProfileProps) => {
return (
<section css={profileSectionCss}>
<div css={profileIntroductionCss}>
<Txt typography="heading1">이번 릴레이 질문인은 바로 나!</Txt>
<Txt typography="heading1" color={colors.black} fontWeight="bold">
이번 릴레이 질문인은 바로 나!
</Txt>
<Txt color={colors.grey600} style={{ textAlign: 'center' }}>
릴레이 질문을 통해서 모임원들에게
<br /> 궁금한 질문을 물어보세요
Expand Down