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

Feat/#127 프로필 및 채널에 이미지 추가 #130

Merged
merged 6 commits into from
Sep 11, 2023
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 @@ -6,20 +6,20 @@ describe('채널 테스트', () => {
const initalState: ChannelCircleProps = {
channelLink: 'ab5gx',
title: '부경대 총장기',
category: 0,
gameCategory: 0,
customChannelIndex: 0,
};

it('채널 이름을 가진 컴포넌트가 있다.', () => {
render(<ChannelCircle {...initalState} />);
const nameEl = screen.getByText('부경대 총장기');
const nameEl = screen.getByText('부경');
expect(nameEl).toBeInTheDocument();
});

const initalState2 = {
channelLink: 'ab5gx',
title: '부경대 총장기',
category: 0,
gameCategory: 0,
imgSrc: '1.jpeg',
customChannelIndex: 1,
};
Expand Down
2 changes: 1 addition & 1 deletion src/@types/channelCircle.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
export interface ChannelCircleProps {
channelLink: string;
title: string;
category: number;
gameCategory: number;
imgSrc?: string;
customChannelIndex: number;
}
57 changes: 32 additions & 25 deletions src/components/Sidebar/ChannelBar/ChannelBar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -38,31 +38,38 @@ const ChannelBar = ({ channels, updateSelectedChannel }: ChannelBarProps) => {
{(provided, snapshot) => (
<DropContainer ref={provided.innerRef} {...provided.droppableProps}>
{channels &&
channels.map(({ channelLink, title, category, customChannelIndex }, index) => (
<Draggable draggableId={'channel-' + channelLink} index={index} key={channelLink}>
{(provided, snapshot) => (
<div
ref={provided.innerRef}
{...provided.draggableProps}
{...provided.dragHandleProps}
css={css`
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;
`}
onClick={() => updateSelectedChannel(channelLink)}
>
<ChannelCircle
channelLink={channelLink}
title={title}
category={category}
customChannelIndex={customChannelIndex}
/>
</div>
)}
</Draggable>
))}
channels.map(
({ channelLink, title, gameCategory, customChannelIndex, imgSrc }, index) => (
<Draggable
draggableId={'channel-' + channelLink}
index={index}
key={channelLink}
>
{(provided, snapshot) => (
<div
ref={provided.innerRef}
{...provided.draggableProps}
{...provided.dragHandleProps}
css={css`
margin: 0 auto;
display: flex;
align-items: center;
justify-content: center;
`}
onClick={() => updateSelectedChannel(channelLink)}
>
<ChannelCircle
channelLink={channelLink}
title={title}
gameCategory={gameCategory}
customChannelIndex={customChannelIndex}
imgSrc={imgSrc}
/>
</div>
)}
</Draggable>
),
)}
{provided.placeholder}
</DropContainer>
)}
Expand Down
10 changes: 6 additions & 4 deletions src/components/Sidebar/ChannelCircle/ChannelCircle.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,14 @@ import { ChannelCircleProps } from 'src/@types/channelCircle';
const ChannelCircle = ({
channelLink,
title,
category,
gameCategory,
imgSrc,
customChannelIndex,
}: ChannelCircleProps) => {
return (
<ChannelBtn url={imgSrc}>
<ChannelName>{title}</ChannelName>
<ChannelGame>{GameEnum[category]}</ChannelGame>
<ChannelName>{imgSrc ? '' : title.substring(0, 2)}</ChannelName>
<ChannelGame>{GameEnum[gameCategory]}</ChannelGame>
</ChannelBtn>
);
};
Expand Down Expand Up @@ -43,7 +43,9 @@ const ChannelBtn = styled.div<{ url?: string }>`
prop.url &&
css`
background-image: url(${prop.url});
background-size: cover;
background-size: 100% 75%;
background-position: center top;
background-repeat: no-repeat;
`}

&:hover {
Expand Down
14 changes: 11 additions & 3 deletions src/components/providers/ProfileProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,17 @@ import { Profile } from '@type/profile';
import authAPI from '@apis/authAPI';
import Cookies from 'js-cookie';

interface ProfileAPI {
nickName: string;
profileImageUrl: string;
}

interface ProfileProviderProps {
children: React.ReactNode;
}

const fetchProfile = async () => {
const res = await authAPI<Profile>({
const res = await authAPI<ProfileAPI>({
method: 'get',
url: '/api/member/profile',
});
Expand All @@ -26,7 +31,7 @@ const ProfileProvider = ({ children }: ProfileProviderProps) => {
const [profile, setProfile] = useState<Profile | null>(null);

// 유저의 프로필 가져오기
const profileQuery = useQuery<Profile>({
const profileQuery = useQuery<ProfileAPI>({
queryKey: ['getProfile'],
queryFn: fetchProfile,
enabled: isHaveAccessToken ? true : false, // 액세스 토큰이 있으면 query 요청
Expand All @@ -35,7 +40,10 @@ const ProfileProvider = ({ children }: ProfileProviderProps) => {
// 프로필 데이터를 가져왔다면
useEffect(() => {
if (profileQuery.data) {
setProfile({ ...profileQuery.data });
setProfile({
nickname: profileQuery.data.nickName,
profileUrl: profileQuery.data?.profileImageUrl,
});
}
}, [profileQuery.data]);

Expand Down