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

[BUILD FAIL] [Feat/#299] 최적의 회의시간 뷰 인원수 Chip과 Tooltip 추가 및 방장 페이지 관련 수정 #316

Merged
merged 8 commits into from
Aug 20, 2024
3 changes: 3 additions & 0 deletions src/assets/svgs/dropdown.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions src/assets/svgs/dropup.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/assets/svgs/member.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/assets/svgs/tooltipArrow.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/components/Icon/icon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,10 @@ import { ReactComponent as Circle2Ic } from 'assets/svgs/circle2.svg';
import { ReactComponent as Circle3Ic } from 'assets/svgs/circle3.svg';
import { ReactComponent as ClockIc } from 'assets/svgs/clock.svg';
import { ReactComponent as CloseIc } from 'assets/svgs/close.svg';
import { ReactComponent as DropDown } from 'assets/svgs/dropdown.svg';
import { ReactComponent as DropDownIc } from 'assets/svgs/dropDownBtn.svg';
import { ReactComponent as DropdownWhite } from 'assets/svgs/dropdownWhite.svg';
import { ReactComponent as DropUp } from 'assets/svgs/dropup.svg';
import { ReactComponent as DropUpIc } from 'assets/svgs/dropUpBtn.svg';
import { ReactComponent as DropupWhite } from 'assets/svgs/dropupWhite.svg';
import { ReactComponent as ExitIc } from 'assets/svgs/exitIcon.svg';
Expand All @@ -15,6 +17,7 @@ import { ReactComponent as InputErrorIc } from 'assets/svgs/inputErrorBtn.svg';
import { ReactComponent as LinkIc } from 'assets/svgs/linkIcon.svg';
import { ReactComponent as LinkTooltipIc } from 'assets/svgs/linkTooltip.svg';
import { ReactComponent as MainLogoIc } from 'assets/svgs/mainLogo.svg';
import { ReactComponent as Member } from 'assets/svgs/member.svg';
import { ReactComponent as OfflinePlaceIc } from 'assets/svgs/offlinePlace.svg';
import { ReactComponent as OnlinePlaceIc } from 'assets/svgs/onlinePlace.svg';
import { ReactComponent as PasswordEyeIc } from 'assets/svgs/passwordEye.svg';
Expand Down Expand Up @@ -58,4 +61,12 @@ export {
TimeIc,
TooltipArrowIc,
Wave,
Circle1Ic,
Circle2Ic,
Circle3Ic,
CloseIc,
DropUp,
DropDown,
Member,
TooltipArrowIc,
};
23 changes: 17 additions & 6 deletions src/pages/bestMeetTime/ChooseBestTime.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -43,26 +43,37 @@ const ChangeViewPicker = styled.div<{ $isClicked: boolean }>`
margin-top: 2.5rem;
${({ theme }) => theme.fonts.body2};
border-bottom: 2px solid;
border-color: ${({ $isClicked, theme, id }) =>
id === 'best'
? $isClicked
? theme.colors.main1
: theme.colors.grey5
: $isClicked
? theme.colors.grey5
: theme.colors.main1};
width: 18.7rem;
height: 3.5rem;
color: ${({ $isClicked, theme, id }) =>
id === 'best'
? $isClicked
? theme.colors.main1
: theme.colors.grey4
? theme.colors.white
: theme.colors.grey5
: $isClicked
? theme.colors.grey4
: theme.colors.main1};
? theme.colors.grey5
: theme.colors.white};
${({ $isClicked, theme, id }) =>
id === 'best'
? $isClicked
? theme.colors.main1
? theme.colors.white
: theme.colors.grey4
: $isClicked
? theme.colors.grey4
: theme.colors.main1};
: theme.colors.white};
`;
const ViewContainer = styled.div`
display: flex;
align-items: center;
width: 100%;
margin-top: 3.6rem;
margin-bottom: 16.4rem;
`;
95 changes: 0 additions & 95 deletions src/pages/bestMeetTime/components/AlternativeCard.tsx

This file was deleted.

Loading
Loading