Skip to content

Release: v2.0.1 #525

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.

Sign up for GitHub

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

Merged
iamjooon2 merged 4 commits into from
Oct 20, 2023
Merged

Release: v2.0.1 #525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7d4558
feat: 강아지 깨우기 μ΄μŠ€ν„°μ—κ·Έ μΆ”κ°€ (#518)
HyeryongChoi Oct 19, 2023
9a433a1
fix/#519: λ¦¬λ·°μš”μ•½ μΊμ‹œ λ¬΄νš¨ν™” 쿼리킀 μˆ˜μ • (#520)
HyeryongChoi Oct 19, 2023
987a9da
feat: 강아지 깨웠을 λ•Œ λ°°λ„ˆμ΄λ―Έμ§€ λ³€κ²½ (#522)
HyeryongChoi Oct 19, 2023
89397b8
hotfix: 리뷰 μ„œλ¨Έλ¦¬ 차트 캐싱 였λ₯˜ μˆ˜μ • (#524)
n0eyes Oct 19, 2023
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 added frontend/src/assets/webp/landing_banner_awake.webp
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions frontend/src/hooks/query/review.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { FOOD_QUERY_KEY } from './food';
const QUERY_KEY = {
reviewItem: 'reviewItem',
reviewList: (petFoodId: string) => ['reviewList', petFoodId, location.search],
reviewSummary: 'reviewSummary',
reviewSummary: (petFoodId: string) => ['reviewSummary', petFoodId],
reviewListMeta: 'reviewListMeta',
};

Expand Down Expand Up @@ -62,7 +62,7 @@ export const useAddReviewMutation = () => {
mutationFn: postReview,
onSuccess: (_, { petFoodId }) => {
queryClient.invalidateQueries(QUERY_KEY.reviewList(petFoodId));
queryClient.invalidateQueries([QUERY_KEY.reviewSummary]);
queryClient.invalidateQueries(QUERY_KEY.reviewSummary(petFoodId));
queryClient.invalidateQueries(FOOD_QUERY_KEY.foodDetail(petFoodId));

alert('리뷰 μž‘μ„±μ΄ μ™„λ£Œλ˜μ—ˆμŠ΅λ‹ˆλ‹€.');
Expand All @@ -82,7 +82,7 @@ export const useEditReviewMutation = () => {
mutationFn: putReview,
onSuccess: (_, { petFoodId }) => {
queryClient.invalidateQueries(QUERY_KEY.reviewList(petFoodId));
queryClient.invalidateQueries([QUERY_KEY.reviewSummary]);
queryClient.invalidateQueries(QUERY_KEY.reviewSummary(petFoodId));
queryClient.invalidateQueries(FOOD_QUERY_KEY.foodDetail(petFoodId));

alert('리뷰 μˆ˜μ •μ΄ μ™„λ£Œλ˜μ—ˆμŠ΅λ‹ˆλ‹€.');
Expand All @@ -101,7 +101,7 @@ export const useRemoveReviewMutation = () => {
mutationFn: deleteReview,
onSuccess: (_, { petFoodId }) => {
queryClient.invalidateQueries(QUERY_KEY.reviewList(petFoodId));
queryClient.invalidateQueries([QUERY_KEY.reviewSummary]);
queryClient.invalidateQueries(QUERY_KEY.reviewSummary(petFoodId));
queryClient.invalidateQueries(FOOD_QUERY_KEY.foodDetail(petFoodId));
},
});
Expand All @@ -111,7 +111,7 @@ export const useRemoveReviewMutation = () => {

export const useReviewSummaryQuery = (payload: Parameter<typeof getReviewSummary>) => {
const { data, ...restQuery } = useQuery({
queryKey: [QUERY_KEY.reviewSummary],
queryKey: QUERY_KEY.reviewSummary(payload.petFoodId),
queryFn: () => getReviewSummary(payload),
});

Expand Down
31 changes: 24 additions & 7 deletions frontend/src/pages/Landing/Landing.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,39 @@
import { Suspense, useState } from 'react';
import { useState } from 'react';
import styled from 'styled-components';

import ZipgoBannerPng from '@/assets/webp/landing_banner.webp';
import ZipgoBanner from '@/assets/webp/landing_banner.webp';
import ZipgoBannerAwake from '@/assets/webp/landing_banner_awake.webp';
import Header from '@/components/@common/Header/Header';
import Template from '@/components/@common/Template';
import FilterBottomSheet from '@/components/Food/FilterBottomSheet/FilterBottomSheet';
import FoodList from '@/components/Food/FoodList/FoodList';
import FoodSelectionGuideBanner from '@/components/FoodSelectionGuideBanner/FoodSelectionGuideBanner';
import { useToast } from '@/context/Toast/ToastContext';

const TARGET_NUMBER = 100;

let startTime: Date | undefined;
let endTime: Date | undefined;

const Landing = () => {
const { toast } = useToast();

const [dogTouchCount, setDogTouchCount] = useState<number>(1);
const isDogAwake = dogTouchCount > TARGET_NUMBER;

const onTouchDog = () => {
if (dogTouchCount % 10 === 0) {
if (dogTouchCount === 1) {
startTime = new Date();
toast.info(`강아지λ₯Ό ${dogTouchCount}번 μ“°λ‹€λ“¬μ—ˆμ–΄μš”.`);
} else if (dogTouchCount === TARGET_NUMBER && startTime) {
endTime = new Date();
toast.success(`${(+endTime - +startTime) / 1000}초 λ§Œμ— 강아지λ₯Ό κΉ¨μ› μ–΄μš”!`);
} else if (TARGET_NUMBER - dogTouchCount === 10) {
toast.warning('강아지λ₯Ό κΉ¨μš°μ§€ μ•Šκ²Œ μ‘°μ‹¬ν•˜μ„Έμš”!');
} else {
} else if (dogTouchCount < TARGET_NUMBER) {
toast.info(`강아지λ₯Ό ${dogTouchCount}번 μ“°λ‹€λ“¬μ—ˆμ–΄μš”.`);
}
setDogTouchCount(prev => prev + 1);

if (dogTouchCount <= TARGET_NUMBER) setDogTouchCount(prev => prev + 1);
};

return (
Expand All @@ -38,7 +51,11 @@ const Landing = () => {
<BannerTitle>μ§‘μ‚¬μ˜κ³ λ―Ό</BannerTitle>
</TitleContainer>
</BannerText>
<BannerImg src={ZipgoBannerPng} onClick={onTouchDog} alt="μ§‘μ‚¬μ˜κ³ λ―Ό λ°°λ„ˆ 이미지" />
<BannerImg
src={isDogAwake ? ZipgoBannerAwake : ZipgoBanner}
onClick={onTouchDog}
alt="μ§‘μ‚¬μ˜κ³ λ―Ό λ°°λ„ˆ 이미지"
/>
</BannerSection>
<ListSection>
<FilterBottomSheet />
Expand Down