Skip to content

Commit

Permalink
Merge pull request #233 from boostcampwm2023/FE/feature/#232-배포전-에러-수정
Browse files Browse the repository at this point in the history
fix: build할 때 에러나는 부분 수정
  • Loading branch information
Doosies authored Nov 23, 2023
2 parents 5f009b8 + ff8424e commit d463d50
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 8 deletions.
5 changes: 3 additions & 2 deletions frontend/src/business/hooks/useOverlay/useOverlay.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useContext, useEffect, useMemo, useState } from 'react';

import { OverlayContext } from './OverlayProvider';
import { CreateOverlayElement } from './types';
import { useContext, useEffect, useMemo, useState } from 'react';

// overlay element를 구분하기 위한 id
let elementId = 1;
Expand All @@ -12,7 +13,7 @@ export default function useOverlay() {
}

const [id] = useState(() => String(elementId++));
const [opened, setOpened] = useState(true);
const [opened] = useState(true);

const { mount, unmount } = context;

Expand Down
6 changes: 4 additions & 2 deletions frontend/src/business/hooks/useShareButtons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,12 @@ import { Kakao } from '@business/services/Kakao';

import { downloadImage } from '@utils/downloadImage';

import { IconColor } from '@constants/colors';

type ShareButton = {
text?: string;
icon?: string;
iconColor?: string;
iconColor?: IconColor;
onClick?: () => void;
tooltip?: string;
};
Expand Down Expand Up @@ -38,7 +40,7 @@ export function useShareButtons({ cardUrl, resultSharePageRef }: useShareButtonP
kakao: {
text: '카카오톡 공유',
icon: 'simple-icons:kakaotalk',
iconColor: '#FEE500',
iconColor: 'kakaoIcon',
onClick: share2Kakao,
},
download: {
Expand Down
4 changes: 2 additions & 2 deletions frontend/src/components/Buttons/IconButton.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { iconColors } from '@constants/colors';
import { IconColor, iconColors } from '@constants/colors';

import { Icon } from '@iconify/react';

Expand All @@ -8,7 +8,7 @@ export interface IconButton {
id?: string;
text?: string;
icon?: string;
iconColor?: keyof typeof iconColors;
iconColor?: IconColor;
onClick?: () => void;
}

Expand Down
2 changes: 0 additions & 2 deletions frontend/src/components/TarotSpread/TarotSpread.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import Background from '../Background';
import { useEffect, useMemo, useRef, useState } from 'react';

import { shuffledArray } from '@utils/array';

import TarotCard from './TarotCard';

interface TarotSpreadProps {
Expand Down
2 changes: 2 additions & 0 deletions frontend/src/constants/colors.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,6 @@ export const iconColors = {
textDefault: 'text-default',
textWeak: 'text-weak',
textWhite: 'text-white-default',
kakaoIcon: 'kakao-icon',
};
export type IconColor = keyof typeof iconColors;
1 change: 1 addition & 0 deletions frontend/tailwind.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ export default {
'.text-default': { color: '#5E6E76' },
'.text-weak': { color: '#879298' },
'.text-white-default': { color: '#FFFFFF' },
'.kakao-icon': { color: '#FEE500' },
'.display-bold24': themeBase.bold_L,
'.display-bold16': themeBase.bold_M,
'.display-bold14': themeBase.bold_R,
Expand Down

0 comments on commit d463d50

Please sign in to comment.