-
Notifications
You must be signed in to change notification settings - Fork 1
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
[FEAT] 공통 컴포넌트 아이콘 SVG 삽입 #296
Merged
+496
−155
Merged
Changes from 11 commits
Commits
Show all changes
24 commits
Select commit
Hold shift + click to select a range
40b7a15
기존 아이콘 V1 파일 분리
jeeminyi 2ebe218
V2 아이콘 추가
jeeminyi 4282e04
아이콘 사이즈 설정
jeeminyi 5629fde
fix: 오타 수정
jeeminyi 7da5db7
fix: 경로 오류 수정
jeeminyi dffa58f
fix: V2 파일 경로 수정
jeeminyi fc5d3c1
fit: 바보짓 원복
jeeminyi 33b83db
fix: Icn 객체 수정
jeeminyi ced2976
fix: 빌드 오류 수정
jeeminyi 9b3d099
fix: 파일 수정
jeeminyi 433eca7
fix: svg 타입 설정
wrryu09 9911991
docs: 아이콘 스토리북 추가
wrryu09 69c1ce7
fix: 색상 currentColor로 수정
jeeminyi 56a4f66
hotfix: 충돌 해결
jeeminyi 8484b73
hotfix: 충돌 해결
jeeminyi 08817fe
Merge branch 'develop' into feat/#286/icon-components
jeeminyi ca75a3c
fix: 충돌 그만
jeeminyi 0bf8402
fix: 끝
jeeminyi 84a720f
fix: svg 타입 설정
jeeminyi ebeaa35
fix: V2 파일 경로 수정
jeeminyi 383282f
fit: 바보짓 원복
jeeminyi de0f696
fix: 충돌 해결
jeeminyi 7d72785
hotfix: 마지막
jeeminyi 6d7b143
hotfix: 충돌 해결
jeeminyi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
import Icn_arrow_narrow_right from '@/assets/svg/V1/arrow-narrow-right.svg'; | ||
import Arrow_up from '@/assets/svg/V1/arrow-up.svg'; | ||
import Icn_calander from '@/assets/svg/V1/calendar-minus-01.svg'; | ||
import ClockCheck from '@/assets/svg/V1/clock-check.svg'; | ||
import Icn_date_clock from '@/assets/svg/V1/clock.svg'; | ||
import Dashboard_Complete from '@/assets/svg/V1/Dashboard_Complete_Icon.svg'; | ||
import DashboardPostpone from '@/assets/svg/V1/Dashboard_Postpone_Icon.svg'; | ||
import DashboardProgress from '@/assets/svg/V1/Dashboard_Progress_Icon.svg'; | ||
import DeleteIcon from '@/assets/svg/V1/Delete.svg'; | ||
import DoneIcon from '@/assets/svg/V1/DoneIcon.svg'; | ||
import TimelineDelete from '@/assets/svg/V1/ic_delete.svg'; | ||
import Icn_selectbox_selected from '@/assets/svg/V1/ic_selectbox_selected.svg'; | ||
import Icn_selectbox_Unselected from '@/assets/svg/V1/ic_selectbox_unselected.svg'; | ||
import IcnArrangeCalendar from '@/assets/svg/V1/icn_arrange_calendar.svg'; | ||
import IcnArrangeLeft from '@/assets/svg/V1/icn_arrange_left.svg'; | ||
import IcnArrangeRight from '@/assets/svg/V1/icn_arrange_right.svg'; | ||
import IcnArrangeSet from '@/assets/svg/V1/icn_arrange_set.svg'; | ||
import Icn_clock from '@/assets/svg/V1/icn_clock.svg'; | ||
import IcnFile from '@/assets/svg/V1/icn_file.svg'; | ||
import Icn_hover_indicator from '@/assets/svg/V1/icn_hover_indicator.svg'; | ||
import Icn_nav_calendar from '@/assets/svg/V1/icn_nav_calendar.svg'; | ||
import Icn_nav_dashboard from '@/assets/svg/V1/icn_nav_dashboard.svg'; | ||
import Icn_nav_setting from '@/assets/svg/V1/icn_nav_setting.svg'; | ||
import Icn_nav_today from '@/assets/svg/V1/icn_nav_today.svg'; | ||
import Icn_line from '@/assets/svg/V1/line164.svg'; | ||
import plus_circle from '@/assets/svg/V1/plus-circle.svg'; | ||
import PlusArrow from '@/assets/svg/V1/PlusArrow.svg'; | ||
import ProgressIcon from '@/assets/svg/V1/ProgressIcon.svg'; | ||
import Refresh from '@/assets/svg/V1/refresh.svg'; | ||
import SelectedBox from '@/assets/svg/V1/Selectbox_Selected.svg'; | ||
import UnselectedBox from '@/assets/svg/V1/Selectbox_Unselected.svg'; | ||
import SettingCheck1 from '@/assets/svg/V1/SettingCheck1.svg'; | ||
import SettingCheck2 from '@/assets/svg/V1/SettingCheck2Icon.svg'; | ||
import SettingCheck3 from '@/assets/svg/V1/SettingCheck3Icon.svg'; | ||
import SettingCheck4 from '@/assets/svg/V1/SettingCheck4Icon.svg'; | ||
import SettingProgress from '@/assets/svg/V1/SettingProgressIcon.svg'; | ||
import SettingX from '@/assets/svg/V1/SettingXIcon.svg'; | ||
import IcnXCricle from '@/assets/svg/V1/x-circle.svg'; | ||
|
||
const Icons = { | ||
Icn_clock, | ||
Icn_arrow_narrow_right, | ||
Icn_calander, | ||
Icn_date_clock, | ||
Icn_line, | ||
IcnXCricle, | ||
Icn_hover_indicator, | ||
IcnFile, | ||
Navbar: { | ||
Icn_nav_calendar, | ||
Icn_nav_dashboard, | ||
Icn_nav_setting, | ||
Icn_nav_today, | ||
}, | ||
ArrangeBtn: { | ||
IcnArrangeRight, | ||
IcnArrangeLeft, | ||
IcnArrangeSet, | ||
IcnArrangeCalendar, | ||
}, | ||
Arrow_up, | ||
Refresh, | ||
SelectedBox, | ||
UnselectedBox, | ||
PlusArrow, | ||
DeleteIcon, | ||
SettingIcons: { | ||
SettingCheck1, | ||
SettingCheck2, | ||
SettingCheck3, | ||
SettingCheck4, | ||
}, | ||
SettingX, | ||
SettingProgress, | ||
DoneIcon, | ||
ProgressIcon, | ||
TimelineDelete, | ||
ClockCheck, | ||
plus_circle, | ||
Icn_selectbox_selected, | ||
Icn_selectbox_Unselected, | ||
Dashboard_Complete, | ||
DashboardPostpone, | ||
DashboardProgress, | ||
}; | ||
|
||
export default Icons; |
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
여기 import 다 오류나네요! 이렇게 바꿔주세요!!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
아 기존 V2파일 추가하면서 ?react 부분을 깜빡했었네요! ㅜㅜ
?react가 붙어야 svg 파일들을 리액트 컴포넌트로 사용할 수 있는거로 알고 있는데 V1 경로만 추가해두면 될 것 같아요!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
이 부분 참고해주세요!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
아 저걸 적용하면 저 부분 생략하고도 컴포넌트로 활용 가능하다는 말잉었군요! 잘못 이해했습니다... 수정해둘게용!!