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

[JR-892] 전체적인 qa 작업 #213

Merged
merged 8 commits into from
Oct 23, 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
Binary file removed apps/jurumarble/public/images/AImg.png
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed apps/jurumarble/public/images/exe1.png
Binary file not shown.
Binary file removed apps/jurumarble/public/images/exe2.png
Binary file not shown.
Binary file modified apps/jurumarble/public/images/howToReportImage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 2 additions & 3 deletions apps/jurumarble/public/images/index.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
export { default as EmptyAImg } from './AImg.png';
export { default as ExImg1 } from './exe1.png';
export { default as ExImg2 } from './exe2.png';
export { default as DrinkImage } from './DrinkImage.png';
export { default as mainBanner } from './mainBanner.png';
export { default as DrinkCapacityLow } from './DrinkCapacityLow.png';
Expand All @@ -19,3 +16,5 @@ export { default as mobileSelectOnboarding } from './mobileSelectOnboarding.png'
export { default as mobileMoveOnboarding } from './mobileMoveOnboarding.png';
export { default as mobileDetailOnboarding } from './mobileDetailOnboarding.png';
export { default as drinkStamp } from './drinkStamp.png';
export { default as noSearchResult } from './noSearchResult.png';
export { default as drinkWhiteImage } from './drinkWhiteImage.png';
Binary file added apps/jurumarble/public/images/noSearchResult.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ function DrinkCommentContainer() {
return <div>에러</div>;
}
if (!comments) {
return <div>데이터 없음</div>;
return <></>;
}

const commentList = comments.pages.flatMap((page) => page.content);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ const FlexRow = styled.div`
`;

const FlexBetweenRow = styled.div`
padding: 20px 0 32px 0;
padding: 20px 0;
display: flex;
gap: 8px;
justify-content: space-between;
Expand Down
16 changes: 11 additions & 5 deletions apps/jurumarble/src/app/help/page.module.css
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
.container {
background-color: var(--bg_02);
padding: 20px 20px 60px 20px;
padding-top: 20px;
height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
}

.mt-6 {
margin-top: 6px;
.text-align-center {
text-align: center;
}

.image-wrapper {
position: relative;
width: 100%;
aspect-ratio: 1;
margin-top: 18px;
}

.mt-6 {
margin-top: 6px;
}

.mt-40 {
margin-top: 40px;
}
8 changes: 4 additions & 4 deletions apps/jurumarble/src/app/help/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -33,18 +33,18 @@ function HelpPage() {
고객센터
</SideButtonHeader>
<div className={cx('container')}>
<div className={cx('headline02')}>불쾌한 투표/댓글이 있으신가요?</div>
<div className={cx('body_long03', 'mt-6')}>
<div className={cx('headline03')}>불쾌한 투표/댓글이 있으신가요?</div>
<div className={cx('body_long03', 'text-align-center')}>
우측 상단에 점 세개 버튼을 눌러서 <br />
신고 버튼을 누르면 신고할 수 있습니다.
</div>
<div className={cx('image-wrapper')}>
<Image src={howToReportImage} fill alt="온보딩" />
<Image src={howToReportImage} width={335} height={470} alt="온보딩" />
</div>
<div className={cx('headline02', 'mt-40')}>
그외 다른 도움이 필요하신가요?
</div>
<div className={cx('body_long03', 'mt-6')}>
<div className={cx('body_long03', 'mt-6', 'text-align-center')}>
서비스 제휴와 광고 등은 아래의 이메일로 문의해주세요. <br />
[email protected]
</div>
Expand Down
4 changes: 2 additions & 2 deletions apps/jurumarble/src/app/map/components/MapContainer.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { Button } from 'components/button';
import Path from 'lib/Path';
import Image from 'next/image';
import { useRouter } from 'next/navigation';
import { ExImg1 } from 'public/images';
import { drinkWhiteImage } from 'public/images';
import { CustomOverlayMap, Map, MapMarker } from 'react-kakao-maps-sdk';
import { SvgIcPrev } from 'src/assets/icons/components';
import SvgIcMyLocationFloating from 'src/assets/icons/ic_my_location_floating.svg';
Expand Down Expand Up @@ -296,7 +296,7 @@ const MapContainer = () => {
id: drinkId,
name: name,
manufacturer: manufacturer,
image: image || (ExImg1 as unknown as string),
image: image || (drinkWhiteImage as unknown as string),
}}
onClickReplaceDrinkInfo={() => {
setChangeMapCenter(latitude, longitude);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
import { useMutation, useQuery, useQueryClient } from '@tanstack/react-query';
import { useMutation, useQuery } from '@tanstack/react-query';
import {
getNotificationListAPI,
readNotificationAPI,
Expand All @@ -24,32 +24,13 @@ export default function useNotificationService() {
...notification,
createdAt: formatDate(notification.createdAt),
})),
staleTime: 0,
},
);

const queryClient = useQueryClient();

const { mutate: readNotification } = useMutation(
(notificationId: ReadNotificationProps) =>
readNotificationAPI(notificationId),
{
async onMutate(notificationId) {
await queryClient.cancelQueries(getQueryKey);
const previousData = queryClient.getQueryData(getQueryKey);
queryClient.setQueryData(getQueryKey, (old: any) => [
old,
notificationId,
]);
return { previousData };
},
onError(err, notificationId, context) {
queryClient.setQueryData(getQueryKey, context?.previousData);
},

onSettled() {
queryClient.invalidateQueries({ queryKey: getQueryKey });
},
},
);

return { notificationList, isLoading, readNotification };
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function CommentContainer({ postId, region }: Props) {
return <div>에러</div>;
}
if (!comments) {
return <div>데이터 없음</div>;
return <></>;
}

const commentList = comments.pages.flatMap((page) => page.content);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ function SearchRestaurantModal({
}
>
<TitleStyled>
{selectedRestaurant ? '음식점 검색' : '이미지 선택'}
{selectedRestaurant ? '이미지 선택' : '음식점 검색'}
</TitleStyled>
</VoteHeader>
<Container>
Expand Down Expand Up @@ -197,7 +197,7 @@ const RestaurantList = styled.ul`
flex-direction: column;
margin-top: 8px;
overflow: auto;
height: 70vh;
height: 80vh;
`;

const FoodImageList = styled.ul`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { media } from 'lib/styles';
import depths from 'lib/styles/depths';
import Image from 'next/image';
import { useRouter } from 'next/navigation';
import { ExImg1 } from 'public/images';
import { drinkWhiteImage } from 'public/images';
import { SvgIcCheck } from 'src/assets/icons/components';
import styled, { css } from 'styled-components';

Expand All @@ -22,7 +22,7 @@ type Direction = 'left' | 'right';
// }, [imageB]);

const getSafeImage = (image: string) =>
image.includes('http') ? image : ExImg1;
image.includes('http') ? image : drinkWhiteImage;

interface Props {
titleA: string;
Expand Down
2 changes: 1 addition & 1 deletion apps/jurumarble/src/app/vote/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function VoteHomePage() {
* @TODO 여러번 뜨는 현상 지속시 삭제
*/
params.get('isSuccess') &&
toast.success('정상적으로 투표가 등록되었습니다!.', {
toast.success('정상적으로 투표가 등록되었습니다.', {
toastId: 'voteSuccess',
});

Expand Down
Loading