Skip to content

Commit

Permalink
๐Ÿšจย Fix: ๋ฐฐํฌ ์ „ ๋นŒ๋“œ ๋‹จ๊ณ„์—์„œ ๋ฐœ๊ฒฌํ•œ ์˜ค๋ฅ˜ ์ˆ˜์ •
Browse files Browse the repository at this point in the history
๐Ÿšจย Fix: ๋ฐฐํฌ ์ „ ๋นŒ๋“œ ๋‹จ๊ณ„์—์„œ ๋ฐœ๊ฒฌํ•œ ์˜ค๋ฅ˜ ์ˆ˜์ •
  • Loading branch information
sscoderati authored Sep 25, 2023
2 parents 167173f + 302283c commit 0a639b4
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 11 deletions.
3 changes: 2 additions & 1 deletion src/components/Badge/DotBadge.style.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import styled from '@emotion/styled';
import { color } from '@styles/colors';

interface SuperProps {
position: 'top' | 'middle' | 'bottom';
color: string;
color: keyof typeof color;
badgeSize?: number;
}

Expand Down
3 changes: 2 additions & 1 deletion src/components/Badge/DotBadge.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import { BadgeContainer, Super } from './DotBadge.style';
import { color } from '@styles/colors';

interface BadgeProps {
children: React.ReactNode;
dot: boolean;
color: string;
color: keyof typeof color;
position: 'top' | 'middle' | 'bottom';
badgeSize?: number;
}
Expand Down
3 changes: 2 additions & 1 deletion src/components/Button/Button.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { StyledButton } from './Buttons.style';
import { color } from '@styles/colors';

interface ButtonProps {
width: number;
Expand All @@ -7,7 +8,7 @@ interface ButtonProps {
label?: string;
handleClick?: () => void;
bold?: boolean;
textColor?: string;
textColor?: keyof typeof color;
fontSize?: number;
borderRadius?: number;
children?: React.ReactNode;
Expand Down
3 changes: 2 additions & 1 deletion src/components/Button/Buttons.style.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import styled from '@emotion/styled';
import { color } from '@styles/colors';

export const StyledButton = styled.button<{
width: number;
Expand All @@ -7,7 +8,7 @@ export const StyledButton = styled.button<{
bold?: boolean;
borderRadius?: number;
fontSize?: number;
textColor?: string;
textColor?: keyof typeof color;
}>`
cursor: pointer;
width: ${({ width }) => width}px;
Expand Down
2 changes: 1 addition & 1 deletion src/components/Link/Link.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ interface LinkProps {
children: React.ReactNode;
pageLink: string;
size: number;
color: string;
state: State;
color: keyof typeof color;
}

Expand Down
3 changes: 2 additions & 1 deletion src/components/ThemePicker/PickerNextButton.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Icon } from '@components/Icon';
import { StyledNextButton } from './ThemePicker.style';
import { color } from '@styles/colors';

interface PickerNextButtonProps {
color: string;
color: keyof typeof color;
clickNextButton: (move: number) => void;
}

Expand Down
3 changes: 2 additions & 1 deletion src/components/ThemePicker/PickerPreviousButton.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import { Icon } from '@components/Icon';
import { StyledPreviousButton } from './ThemePicker.style';
import { color } from '@styles/colors';

interface PickerPreviousButtonProps {
color: string;
color: keyof typeof color;
clickPrevButton: (move: number) => void;
}

Expand Down
4 changes: 2 additions & 2 deletions src/pages/layout/components/SearchResultPost.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useQuery, useQueries } from '@tanstack/react-query';
import { searchAll } from '@apis/search';
import { getUser } from '@apis/user';
import { User } from '@/types';
import { EditedPost, User } from '@/types';
import { PostPreview } from '@components/PostPreview';
import filterPostData from '../utils/filterPostData';
import { FILTER } from '../constants';
Expand Down Expand Up @@ -55,7 +55,7 @@ const SearchResultPost = ({

return (
<PostPreview
post={post}
post={post as EditedPost}
key={_id}
totalLikes={likes.length}
totalComments={comments.length}
Expand Down
2 changes: 1 addition & 1 deletion src/pages/login/components/GoToSignUp.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const GoToSignUp = () => {
<Icon
name={'arrow_forward'}
size={14}
color={'red'}
color={'redVivid'}
/>
&nbsp;
<Link
Expand Down
2 changes: 1 addition & 1 deletion src/utils/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import formatTime from './formatTime';
import getMyFollowData from './getMyFollowData';
import getMyFollowData from '@utils/GetMyFollowData';
import getTotalMeditationTime from './getTotalMeditationTime';

export { formatTime, getMyFollowData, getTotalMeditationTime };

0 comments on commit 0a639b4

Please sign in to comment.