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

Fix: home QA #292

Merged
merged 1 commit into from
Jan 29, 2024
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
3 changes: 3 additions & 0 deletions src/assets/homeIcons/home/searchIcon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/Home/Onboarding/Onboarding.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
@include typography(headline);
.modal {
position: absolute;
top: 50%;
top: 45%;
left: 50%;

width: 31.1rem;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Home/TabBar/TabBar.module.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

background-color: $neutral0;

z-index: 10;
z-index: 1000;

.icons {
display: flex;
Expand Down
5 changes: 3 additions & 2 deletions src/components/Home/TabBar/TabBar.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import {AiOutlineBell} from 'react-icons/ai';
import {IoSearchSharp} from 'react-icons/io5';
import {Link} from 'react-router-dom';

import styles from './TabBar.module.scss';

import {useGetAlarm} from '@/hooks/Notification/useNotification';

import SearchIcon from '@/assets/homeIcons/home/searchIcon.svg?react';

import {Alarmprop} from '@/types/alarm';

function TabBar({onAlarmOpen, isAlarmOpen}: Alarmprop) {
Expand All @@ -20,7 +21,7 @@ function TabBar({onAlarmOpen, isAlarmOpen}: Alarmprop) {
<div className={styles.container}>
<div className={styles.icons}>
<Link to='/search'>
<IoSearchSharp />
<SearchIcon style={{textAlign: 'center', paddingTop: '2px', width: '24px'}} />
</Link>
<button onClick={onAlarmOpen} className={styles.icons__wrapper}>
<AiOutlineBell />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ interface PropsType {
function CardHaveVote({data}: PropsType) {
const [slideLocation, setSlideLocation] = useState<number>(0);
const [componentRef, size] = useComponentSize();
const counts = data.voteResponse.length;
return (
<div className={styles.container}>
<SlideButton
Expand All @@ -45,7 +46,7 @@ function CardHaveVote({data}: PropsType) {
: '날짜 미정';

return (
<div className={styles.vote_box} key={data.voteId}>
<div className={styles.vote_box} key={data.voteId} style={{width: counts === 1 ? '100%' : '30.8rem'}}>
<div className={styles.contents}>
<div className={styles.text_box}>
<p className={styles.vote_title}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@

color: $neutral900;

@include typography(button);
@include typography(subTitle);
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
@use "@/sass" as *;
@use '@/sass' as *;

.container {
@include slide_button_container;

.slide_box {
padding: 0 20px;
@include slide_list_container;
gap: 8px;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
}
}
.slide_box {
padding: 0 20px;
@include slide_list_container;
gap: 8px;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
@use '@/sass' as *;

.container {
width: 14rem;
min-height: 5.6rem;

display: flex;
Expand All @@ -14,5 +13,5 @@

color: $neutral900;

@include typography(button);
@include typography(subTitle);
}
Loading