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.

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

✨ Feat: 로딩 스피너 #58

Merged
merged 5 commits into from
May 11, 2024
Merged

✨ Feat: 로딩 스피너 #58

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1dcd9bf
📦️ Chore: 로딩스피너 세팅
JayChae May 10, 2024
4a49556
✨ Feat: 로딩 스피너 적용
JayChae May 10, 2024
64ae45e
🔨 Refactor: 스피너 주석
JayChae May 10, 2024
dff4a3a
✨ Feat: svg 컴포넌트로 수정
JayChae May 11, 2024
b265f76
📦️ Chore: 메인 머지 충돌 해결
JayChae May 11, 2024
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 src/assets/images/spinner.gif
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.
8 changes: 8 additions & 0 deletions src/components/LoadingSpinner/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react';
import spinner from '@/assets/images/spinner.gif';

const LoadingSpinner = () => {
return <img src={spinner} style={{ height: '100%' }} />;
};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

props로 크기 같은 거 주는 거 있으면 좋을 거 같아요

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

width랑 height 주는 방식으로 해보겠습니다


export default LoadingSpinner;
9 changes: 8 additions & 1 deletion src/pages/ListPage/MonthlyChart/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import CustomButton from '@/components/CustomButton';
import Chart from '@/assets/icons/Chart';
import { boys, girls } from './mock';
import useSetNumOfItemsToShow from '@/hooks/useSetNumberOfItemsToShow';
import LoadingSpinner from '@/components/LoadingSpinner';

const MonthlyChart = () => {
const [idolList, setIdolList] = useState([]);
Expand Down Expand Up @@ -44,7 +45,7 @@ const MonthlyChart = () => {
name: '추가 버튼 눌렀구나',
totalVotes: 1000,
profilePicture:
'https://sprint-fe-project.s3.ap-northeast-2.amazonaws.com/Fandom-K/idol/1714613892649/ive1.jpeg',
'https://sprint-fe-project.s3.ap-northeast-2.amazonaws.com/Fandom-K/idol/1714613892649/ive1.jpeg',
},
];
setIdolList(newArr);
Expand All @@ -71,6 +72,12 @@ const MonthlyChart = () => {
<div className={styles.moreButton}>
<CustomButton btnText="더보기" onClick={handleMoreBtn} />
</div>
{/* <div className={styles.loading_spinner}>
<LoadingSpinner />
</div>
<div className={styles.moreButton}>
<CustomButton btnText={<LoadingSpinner />} disabled={true} />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

boolean 값으로 props 넘기는건 true 일 때 그냥 아래처럼 적으셔도 됩니다!

<CustomButton btnText={<LoadingSpinner />} disabled />

</div> */}
</div>
);
};
Expand Down
8 changes: 8 additions & 0 deletions src/pages/ListPage/MonthlyChart/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,3 +119,11 @@
background: #ffffff1a;
}
}

.loading_spinner{
min-height: 418px;
display: flex;
align-items: center;
justify-content: center;

}
5 changes: 3 additions & 2 deletions src/pages/TestPage/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,18 @@ import Modal from '@/components/Modal';
import ModalHeader from '@/components/Modal/components/ModalHeader';
// import ModalMobileHeader from '@/components/Modal/components/ModalMobileHeader';
import Profile from '@/components/Profile';
import LoadingSpinner from '@/components/LoadingSpinner';

const TestPage = () => {
const [isOpen, openModal, closeModal] = useModal();

return (
<div style={{ backgroundColor: 'black' }}>
<Header />
<LoadingSpinner />
<div
style={{ display: 'flex', justifyContent: 'center', padding: '24px' }}
>
</div>
></div>
<div style={{ display: 'flex', alignItems: 'center' }}>
<Profile
clicked
Expand Down