Skip to content

fix: emptyLoadingPage styled-component props $추가, 미디어쿼리 경고로 인한 screen… #189

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
YouD0313 merged 1 commit into from
Feb 2, 2025
Merged

fix: emptyLoadingPage styled-component props $추가, 미디어쿼리 경고로 인한 screen… #189

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 62 additions & 3 deletions package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
"react-textarea-autosize": "^8.5.7",
"sanitize.css": "^13.0.0",
"styled-components": "^6.1.13",
"vite-plugin-compression": "^0.5.1",
"zod": "^3.24.1",
"zustand": "^5.0.2"
},
Expand Down Expand Up @@ -67,6 +66,7 @@
"typescript": "~5.6.2",
"typescript-eslint": "^8.18.2",
"vite": "^6.0.5",
"vite-plugin-compression": "^0.5.1",
"vitest": "^2.1.8"
},
"eslintConfig": {
Expand Down
8 changes: 4 additions & 4 deletions src/components/common/emptyLoadingPage/EmptyLoadingPage.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ export const Container = styled.div<EmptyLoadingPageProps>`
width: 100%;
height: ${({ height }) => height};

@media screen ${({ theme }) => theme.mediaQuery.tablet} {
height: ${({ tHeight }) => tHeight};
@media ${({ theme }) => theme.mediaQuery.tablet} {
height: ${({ $tHeight }) => $tHeight};
}

@media screen ${({ theme }) => theme.mediaQuery.mobile} {
height: ${({ mHeight }) => mHeight};
@media ${({ theme }) => theme.mediaQuery.mobile} {
height: ${({ $mHeight }) => $mHeight};
}
`;
12 changes: 6 additions & 6 deletions src/components/common/emptyLoadingPage/EmptyLoadingPage.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@ import * as S from './EmptyLoadingPage.styled';

export interface EmptyLoadingPageProps {
height: string;
tHeight: string;
mHeight: string;
$tHeight: string;
$mHeight: string;
}

export default function EmptyLoadingPage({
height,
tHeight,
mHeight,
$tHeight,
$mHeight,
}: EmptyLoadingPageProps) {
return (
<S.Container
height={height}
tHeight={tHeight}
mHeight={mHeight}
$tHeight={$tHeight}
$mHeight={$mHeight}
></S.Container>
);
}
4 changes: 2 additions & 2 deletions src/components/common/layout/Layout.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ export const LayoutContainer = styled.div`
max-width: ${({ theme }) => theme.layout.width.desktop};
padding: 0 120px;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
padding: 0 60px;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
padding: 0;
}
`;
4 changes: 2 additions & 2 deletions src/components/common/noResultPage/NoResultPage.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const Container = styled.div<Pick<NoResultPageProps, 'height'>>`
justify-content: center;
align-items: center;

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
height: ${({ height }) => `calc(${height}*0.5)`};
}
`;
Expand All @@ -25,7 +25,7 @@ export const Wrapper = styled.div`
export const Title = styled.span`
font-size: 1.5rem;

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
font-size: 1rem;
}
`;
12 changes: 6 additions & 6 deletions src/components/common/skillTagBox/SkillTagBox.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@ export const Container = styled.div<Pick<SkillTagBoxProps, 'width'>>`
background-color: ${({ theme }) => theme.color.white};
padding: 2rem;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
padding: 1.5rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
border-radius: ${({ theme }) => theme.borderRadius.primary};
padding: 1rem;
}
Expand Down Expand Up @@ -55,7 +55,7 @@ export const ResetButton = styled.button`
transition: all 100ms ease-in;
}

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
padding: 0.4rem;
gap: 0.4rem;
svg {
Expand All @@ -67,7 +67,7 @@ export const ResetButton = styled.button`
}
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
padding: 0.2rem;
gap: 0.2rem;
svg {
Expand All @@ -79,11 +79,11 @@ export const ResetButton = styled.button`
export const ResetSpan = styled.span`
font-size: 1rem;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
font-size: 0.9rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
font-size: 0.7rem;
}
`;
4 changes: 2 additions & 2 deletions src/components/common/skillTagBox/skillTag/SkillTag.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const Wrapper = styled.div<{ $select: boolean }>`
transition: all 100ms ease-in-out;
}

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
padding: 0.4rem;
gap: 0.4rem;
font-size: 0.9rem;
Expand All @@ -31,7 +31,7 @@ export const Wrapper = styled.div<{ $select: boolean }>`
}
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
padding: 0.2rem;
gap: 0.2rem;
font-size: 0.8rem;
Expand Down
4 changes: 2 additions & 2 deletions src/components/common/skillTagBox/skillTag/skillTagImg/SkillTagImg.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ export const SkillImg = styled.img<Pick<SkillTagImgProps, '$select'>>`
border: 1px solid
${({ theme, $select }) => ($select ? 'none' : theme.color.border)};

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
width: 2rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
width: 1.5rem;
}
`;
8 changes: 4 additions & 4 deletions src/components/home/projectCardLists/ProjectCardLists.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ export const CardListTitleWrapper = styled.div``;
export const CardListTitle = styled.h1`
padding: 6rem 0 2rem 0;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
padding: 4rem 0 2rem 0;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
padding: 2rem 0 2rem 0;
font-size: 1.5rem;
}
Expand All @@ -32,13 +32,13 @@ export const Wrapper = styled.div<{ $flex: boolean }>`
width: 100%;
}

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
grid-template-columns: ${({ $flex }) =>
$flex ? '' : 'repeat(auto-fit, minmax(40%, 1fr))'};
gap: 2rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
width: 100%;
grid-template-columns: ${({ $flex }) =>
$flex ? '' : 'repeat(auto-fit, minmax(50%, 1fr))'};
Expand Down
2 changes: 1 addition & 1 deletion src/components/home/projectCardLists/ProjectCardLists.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ export default function ProjectCardLists() {

if (isLoading)
return (
<EmptyLoadingPage height='115.2rem' tHeight='142rem' mHeight='275rem' />
<EmptyLoadingPage height='115.2rem' $tHeight='142rem' $mHeight='275rem' />
);

return (
Expand Down
8 changes: 4 additions & 4 deletions src/components/home/projectCardLists/cardList/CardList.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export const Container = styled.article`
flex-direction: column;
gap: 1rem;

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
padding: 1.5rem;
gap: 0.5rem;
height: 18rem;
Expand Down Expand Up @@ -105,7 +105,7 @@ export const StatusWrapper = styled.div`
export const BeginnerImg = styled.img`
width: 2rem;

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
width: 1.5rem;
}
`;
Expand All @@ -119,7 +119,7 @@ export const ViewWrapper = styled.div`
color: #5f5f5f;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
svg {
width: 1rem;
}
Expand All @@ -130,7 +130,7 @@ export const ViewCount = styled.span`
flex-direction: row;
color: #5f5f5f;

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
align-items: end;
font-size: 0.9rem;
}
Expand Down
6 changes: 3 additions & 3 deletions src/components/home/projectCardLists/pagination/Pagination.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const Wrapper = styled.div`
width: 1.5rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
gap: 0.8rem;
svg {
width: 1rem;
Expand All @@ -38,7 +38,7 @@ export const Pagination = styled.button<{ $select: boolean }>`
$select ? theme.color.navy : 'initial'};
color: ${({ $select, theme }) => ($select ? theme.color.white : 'initial')};

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
width: 1rem;
height: 1rem;
font-size: 1rem;
Expand All @@ -51,7 +51,7 @@ export const PaginationDoubleButton = styled.button`
font-size: 1.1rem;
font-weight: 500;

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
font-size: 1rem;
}
`;
12 changes: 6 additions & 6 deletions src/components/home/projectStats/ProjectStats.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,25 +3,25 @@ import styled from 'styled-components';
export const Container = styled.section`
padding: 8rem 0;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
padding: 3rem 0;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
padding: 2rem 0;
}
`;
export const Wrapper = styled.div`
width: 100%;
display: grid;
grid-template-columns: repeat(auto-fill, minmax(30%, auto));
grid-template-columns: repeat(auto-fit, minmax(30%, auto));
justify-content: space-evenly;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
grid-template-columns: repeat(auto-fill, minmax(30%, auto));
@media ${({ theme }) => theme.mediaQuery.mobile} {
grid-template-columns: repeat(auto-fit, minmax(30%, auto));
gap: 1rem;
padding: 0;
}
Expand Down
16 changes: 8 additions & 8 deletions src/components/home/projectStats/projectStat/ProjectStat.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ export const Container = styled.div`
align-items: center;
gap: 1rem;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
gap: 0.5rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
padding-left: 1rem;
gap: 0.3rem;
align-items: start;
Expand All @@ -22,11 +22,11 @@ export const Border = styled.div`
height: 4rem;
background-color: ${({ theme }) => theme.color.navy};

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
height: 3rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
width: 0.1rem;
}
`;
Expand All @@ -37,11 +37,11 @@ export const StatNumber = styled.div`
font-size: 2rem;
font-weight: bold;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
font-size: 1.5rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
font-size: 1rem;
}
`;
Expand All @@ -50,10 +50,10 @@ export const StatTitle = styled.div`
font-size: 1.25rem;
font-weight: 500;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
font-size: 1rem;
}
@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
font-size: 0.8rem;
}
`;
4 changes: 2 additions & 2 deletions src/components/home/searchFiltering/SearchFiltering.styled.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@ export const Wrapper = styled.div`
align-items: center;
position: relative;

@media screen and ${({ theme }) => theme.mediaQuery.tablet} {
@media ${({ theme }) => theme.mediaQuery.tablet} {
flex-direction: column;
align-items: flex-end;
gap: 1.5rem;
}

@media screen and ${({ theme }) => theme.mediaQuery.mobile} {
@media ${({ theme }) => theme.mediaQuery.mobile} {
gap: 1rem;
}
`;
Loading