Skip to content

Commit de91a6d

Browse files
HarrySeopHarrySeop
authored
Merge pull request #292 from StarSync-FE/develop
📦Chore: main으로 배포
2 parents c7130c4 + 807c480 commit de91a6d

21 files changed

Lines changed: 249 additions & 161 deletions

File tree

‎index.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="UTF-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>Fandom-K | StarSync</title>
6+
<title>StarSync</title>
77
<link rel="icon" type="image/svg+xml" href="/favicon.ico" />
88
<link rel="stylesheet" as="style" crossorigin href="https://cdn.jsdelivr.net/gh/orioncactus/pretendard@v1.3.9/dist/web/static/pretendard.min.css" />
99
<style>

‎public/default-og.png‎

193 KB
Loading

‎src/api/chart.js‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ import { ENDPOINTS } from '@/constants/api';
22
import { requestGet } from '@/utils/api';
33

44
async function fetchCharts({ gender = 'female', limit = 10, cursor = 0 }) {
5-
const url = `${ENDPOINTS.GET_CHART}?gender=${gender}&pageSize=${limit}&cursor=${cursor}`;
5+
const url = `${ENDPOINTS.GET_CHART(gender)}?gender=${gender}&pageSize=${limit}&cursor=${cursor}`;
6+
console.log(url);
67
return requestGet(url);
78
}
89

‎src/components/carousel/Carousel.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ const Carousel = ({ data, setModalType, setSelectedIndex }) => {
6767
</div>
6868
))
6969
) : (
70-
<div css={S.notthingTitle}>현재 등록된 후원이 없습니다.</div>
70+
<div css={S.nothingTitle}>현재 등록된 후원이 없습니다.</div>
7171
)}
7272
</div>
7373
</div>

‎src/components/carousel/carousel.styles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ export const navigationButton = (isRight) => css`
7474
transform: translateY(-125%);
7575
`;
7676

77-
export const notthingTitle = css`
77+
export const nothingTitle = css`
7878
display: flex;
7979
justify-content: center;
8080
align-items: center;

‎src/components/charge/charge.styles.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { css } from '@emotion/react';
22
import media from '@/styles/responsive';
3-
import { chargeButtonFlow, moreheartbeat } from '@/utils/animation';
3+
import { chargeButtonFlow, moreHeartbeat } from '@/styles/animation';
44

55
export const creditWrapper = css`
66
display: flex;
@@ -73,7 +73,7 @@ export const buttonStyle = css`
7373
7474
&:hover {
7575
opacity: 0.9;
76-
animation: ${moreheartbeat} 1.5s ease-in-out; /* 애니메이션 흐름 */
76+
animation: ${moreHeartbeat} 1.5s ease-in-out; /* 애니메이션 흐름 */
7777
}
7878
7979
&:active {

‎src/components/chart/chart.styles.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { css } from '@emotion/react';
22
import media from '@/styles/responsive';
3-
import { voteButtonFlow, rotateWithPause, heartbeat } from '@/utils/animation';
3+
import { voteButtonFlow, rotateWithPause, heartbeat } from '@/styles/animation';
44

55
export const flexCenter = css`
66
display: flex;

‎src/components/chart/fetchData.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ export const fetchData = async (
3030
try {
3131
setIsLoading(true);
3232
const response = await requestGet(
33-
`${ENDPOINTS.GET_CHART}?gender=${gender}&pageSize=${pageSize}&cursor=${cursor}`,
33+
`${ENDPOINTS.GET_CHART(gender)}?gender=${gender}&pageSize=${pageSize}&cursor=${cursor}`,
3434
controller ? { signal: controller.signal } : undefined,
3535
);
3636
const newData = response?.idols || [];

‎src/components/list/ListModal.jsx‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
import {
2-
CreditChargeModal,
3-
CreditLackModal,
4-
DonationModal,
5-
Modal,
6-
VoteModal,
7-
} from '@/components/modals';
1+
import { CreditChargeModal, CreditLackModal, DonationModal, VoteModal } from '@/components/modals';
2+
import { Modal } from '@/components/template/modal';
83

94
const ListModal = ({
105
modalType,

‎src/components/modals/commonModal/index.js‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)