From 3da30bfb28d5af68ddf2f687fc91674f9d6c35fb Mon Sep 17 00:00:00 2001 From: Karthick <102132250+KarthickXola@users.noreply.github.com> Date: Wed, 14 Feb 2024 13:35:35 +0530 Subject: [PATCH 01/10] X2-8931 Make a Purchase>Questionnaire: No Highlights Reflected When Pressing Tab to Move To Another Field (#306) removed important --- src/components/Forms/BaseInput.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Forms/BaseInput.jsx b/src/components/Forms/BaseInput.jsx index 50ab733f..fcae9708 100644 --- a/src/components/Forms/BaseInput.jsx +++ b/src/components/Forms/BaseInput.jsx @@ -25,7 +25,7 @@ export const BaseInput = ({ as: Tag, size = "medium", isError, className, isRequ sizes[size], isError ? "!focus:border-danger !border-danger focus:ring-0 focus:ring-danger" - : "!border-gray-light focus:border-primary focus:ring-0 focus:ring-primary", + : "border-gray-light focus:border-primary focus:ring-0 focus:ring-primary", className, )} value={value} From 78657b50f7ad75d000f97cae806dc76554e4e78b Mon Sep 17 00:00:00 2001 From: Tanushree Chakravarty Date: Wed, 14 Feb 2024 13:56:52 +0530 Subject: [PATCH 02/10] 2.1.42 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3f90c862..e322465e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@xola/ui-kit", - "version": "2.1.41", + "version": "2.1.42", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@xola/ui-kit", - "version": "2.1.41", + "version": "2.1.42", "license": "MIT", "dependencies": { "@headlessui/react": "^1.4.0", diff --git a/package.json b/package.json index c75d4b2a..793f62c6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@xola/ui-kit", - "version": "2.1.41", + "version": "2.1.42", "description": "Xola UI Kit", "license": "MIT", "files": [ From 13ce67f0e3fa6677bb87a49bc5b09a965bb0da8c Mon Sep 17 00:00:00 2001 From: Rushi Vishavadia Date: Mon, 19 Feb 2024 09:13:21 +0530 Subject: [PATCH 03/10] Extract icons into separate package @xola/icons (#302) --- .github/workflows/chromatic.yml | 4 +- .github/workflows/deploy-icons.yml | 30 +++ .github/workflows/deploy.yml | 46 ++-- .github/workflows/eslint-annotate.yml | 57 ----- .github/workflows/eslint.yml | 83 ++++--- .github/workflows/publish.yml | 6 +- README.md | 11 +- package.json | 4 + src/components/Alert.jsx | 2 +- src/components/Buttons/SubmitButton.jsx | 2 +- src/components/DatePicker/NavbarElement.jsx | 5 +- src/components/Drawer.jsx | 2 +- src/components/Modal.jsx | 4 +- src/components/Screens/Login.jsx | 6 +- src/components/Search.jsx | 2 +- src/components/Sidebar/Sidebar.Account.jsx | 4 +- src/components/Sidebar/Sidebar.Link.jsx | 2 +- src/components/Sidebar/Sidebar.jsx | 6 +- src/components/Spinner.jsx | 2 +- src/components/Tag.jsx | 2 +- src/helpers/flash.jsx | 2 +- src/icons/README.md | 18 ++ src/icons/index.js | 215 +++++++++++++++++ src/icons/package-lock.json | 190 +++++++++++++++ src/icons/package.json | 42 ++++ src/icons/{ => src}/AccountIcon.jsx | 2 +- src/icons/{ => src}/AddNoteIcon.jsx | 2 +- src/icons/{ => src}/AddSquareIcon.jsx | 2 +- src/icons/{ => src}/AnnounceIcon.jsx | 2 +- src/icons/{ => src}/AppIcon.jsx | 2 +- src/icons/{ => src}/ArchiveIcon.jsx | 2 +- src/icons/{ => src}/ArrowCcwIcon.jsx | 2 +- src/icons/{ => src}/ArrowCwIcon.jsx | 2 +- src/icons/{ => src}/ArrowDownIcon.jsx | 2 +- src/icons/{ => src}/ArrowRightIcon.jsx | 2 +- src/icons/{ => src}/ArrowTopRightIcon.jsx | 2 +- src/icons/{ => src}/ArrowUpIcon.jsx | 2 +- src/icons/{ => src}/AtIcon.jsx | 2 +- src/icons/{ => src}/BalloonIcon.jsx | 2 +- src/icons/{ => src}/BankCheckIcon.jsx | 2 +- src/icons/{ => src}/BarGraphIcon.jsx | 2 +- src/icons/{ => src}/BellIcon.jsx | 2 +- src/icons/{ => src}/BookIcon.jsx | 2 +- src/icons/{ => src}/BookmarkIcon.jsx | 2 +- src/icons/{ => src}/BoxIcon.jsx | 2 +- src/icons/{ => src}/BriefcaseIcon.jsx | 2 +- src/icons/{ => src}/BugIcon.tsx | 2 +- src/icons/{ => src}/ButtonCodeIcon.jsx | 2 +- src/icons/{ => src}/CakeIcon.jsx | 2 +- src/icons/{ => src}/CalendarDayIcon.jsx | 2 +- src/icons/{ => src}/CalendarIcon.jsx | 2 +- src/icons/{ => src}/CalendarMonthIcon.jsx | 2 +- src/icons/{ => src}/CalendarWeekIcon.jsx | 2 +- src/icons/{ => src}/CapacityIcon.jsx | 2 +- src/icons/{ => src}/CardAltIcon.jsx | 2 +- src/icons/{ => src}/CardIcon.jsx | 2 +- src/icons/{ => src}/CartIcon.jsx | 2 +- src/icons/{ => src}/CashIcon.jsx | 2 +- src/icons/{ => src}/CheckIcon.jsx | 2 +- src/icons/{ => src}/CheckboxIcon.jsx | 2 +- src/icons/{ => src}/ChecklistIcon.jsx | 2 +- src/icons/{ => src}/ChevronDownIcon.jsx | 2 +- src/icons/{ => src}/ChevronLeftIcon.jsx | 2 +- src/icons/{ => src}/ChevronRightIcon.jsx | 2 +- src/icons/{ => src}/ChevronUpIcon.jsx | 2 +- src/icons/{ => src}/ChipIcon.jsx | 2 +- src/icons/{ => src}/CircleCheckIcon.jsx | 2 +- src/icons/{ => src}/CircleCrossIcon.jsx | 2 +- src/icons/{ => src}/CircleCrownIcon.jsx | 2 +- src/icons/{ => src}/CircleDollarIcon.jsx | 2 +- src/icons/{ => src}/CircleDotIcon.jsx | 2 +- src/icons/{ => src}/CircleInfinityIcon.jsx | 2 +- src/icons/{ => src}/CircleInfoIcon.jsx | 2 +- src/icons/{ => src}/CircleKeyIcon.jsx | 2 +- src/icons/{ => src}/CircleNotch.jsx | 4 +- src/icons/{ => src}/CirclePauseIcon.jsx | 2 +- src/icons/{ => src}/CirclePlusIcon.jsx | 2 +- src/icons/{ => src}/CircleSubtractIcon.jsx | 2 +- src/icons/{ => src}/ClipboardIcon.jsx | 2 +- src/icons/{ => src}/ClockAltIcon.jsx | 2 +- src/icons/{ => src}/ClockIcon.jsx | 2 +- src/icons/{ => src}/ClockManualIcon.jsx | 2 +- src/icons/{ => src}/CloseIcon.jsx | 2 +- src/icons/{ => src}/CollapseIcon.jsx | 2 +- src/icons/{ => src}/CommentAltIcon.jsx | 2 +- src/icons/{ => src}/CommentIcon.jsx | 2 +- src/icons/{ => src}/CompassIcon.jsx | 2 +- src/icons/{ => src}/CopyIcon.jsx | 2 +- src/icons/{ => src}/CouponIcon.jsx | 2 +- src/icons/{ => src}/CreditCards/AmexIcon.jsx | 2 +- .../{ => src}/CreditCards/DinersClubIcon.jsx | 2 +- .../{ => src}/CreditCards/DiscoverIcon.jsx | 2 +- .../{ => src}/CreditCards/MaestroIcon.jsx | 2 +- .../{ => src}/CreditCards/MasterCardIcon.jsx | 2 +- src/icons/{ => src}/CreditCards/VisaIcon.jsx | 2 +- src/icons/{ => src}/CrmIcon.jsx | 2 +- src/icons/{ => src}/CrownIcon.jsx | 2 +- src/icons/{ => src}/DashboardIcon.jsx | 2 +- src/icons/{ => src}/DecreaseIcon.jsx | 2 +- src/icons/{ => src}/DepositIcon.jsx | 2 +- src/icons/{ => src}/DisabledIcon.jsx | 2 +- src/icons/{ => src}/DisputeIcon.jsx | 2 +- src/icons/{ => src}/DoubleCheckIcon.jsx | 2 +- src/icons/{ => src}/DownArrowIcon.jsx | 2 +- src/icons/{ => src}/DownloadIcon.jsx | 2 +- src/icons/{ => src}/DropdownIcon.jsx | 2 +- src/icons/{ => src}/DumbbellIcon.jsx | 2 +- src/icons/{ => src}/DuplicateIcon.jsx | 2 +- src/icons/{ => src}/DurationIcon.jsx | 2 +- src/icons/{ => src}/EditIcon.jsx | 2 +- src/icons/{ => src}/EditNoteIcon.jsx | 2 +- src/icons/{ => src}/EditNotesIcon.jsx | 2 +- src/icons/{ => src}/EllipsisIcon.jsx | 2 +- src/icons/{ => src}/EmailCheckedIcon.jsx | 2 +- src/icons/{ => src}/EmailIcon.jsx | 2 +- src/icons/{ => src}/EmailResendIcon.jsx | 2 +- src/icons/{ => src}/EmailSendIcon.jsx | 2 +- src/icons/{ => src}/EmptyChecklistIcon.jsx | 2 +- src/icons/{ => src}/EquipmentIcon.jsx | 2 +- src/icons/{ => src}/ExportIcon.jsx | 2 +- src/icons/{ => src}/EyeClosedIcon.jsx | 2 +- src/icons/{ => src}/EyeIcon.jsx | 2 +- src/icons/{ => src}/FaceNeutralIcon.jsx | 2 +- src/icons/{ => src}/FaceSadIcon.jsx | 2 +- src/icons/{ => src}/FaceSmileIcon.jsx | 2 +- src/icons/{ => src}/FeedbackLightBulbIcon.jsx | 2 +- src/icons/{ => src}/FilterIcon.jsx | 2 +- src/icons/{ => src}/FilterIconOld.jsx | 2 +- src/icons/{ => src}/FlagIcon.jsx | 2 +- src/icons/{ => src}/FlexFee2Icon.jsx | 2 +- src/icons/{ => src}/FlexFeeIcon.jsx | 2 +- src/icons/{ => src}/FoodIcon.jsx | 2 +- src/icons/{ => src}/ForkIcon.jsx | 2 +- src/icons/{ => src}/GiftIcon.jsx | 2 +- src/icons/{ => src}/GlobeIcon.jsx | 2 +- src/icons/{ => src}/HandIcon.jsx | 2 +- src/icons/{ => src}/HandshakeIcon.jsx | 2 +- src/icons/{ => src}/HelpCenterIcon.jsx | 2 +- src/icons/{ => src}/HouseIcon.jsx | 2 +- src/icons/{ => src}/ImageIcon.jsx | 2 +- src/icons/{ => src}/InfinityIcon.jsx | 2 +- src/icons/{ => src}/InvoiceIcon.jsx | 2 +- src/icons/{ => src}/KeyIcon.jsx | 2 +- src/icons/{ => src}/KioskIcon.jsx | 2 +- src/icons/{ => src}/LabelIcon.jsx | 2 +- src/icons/{ => src}/LightIcon.jsx | 2 +- src/icons/{ => src}/LightningIcon.jsx | 2 +- src/icons/{ => src}/LinkIcon.jsx | 2 +- src/icons/{ => src}/LockIcon.jsx | 2 +- src/icons/{ => src}/Logos/FacebookIcon.jsx | 2 +- src/icons/{ => src}/Logos/InstagramIcon.jsx | 2 +- src/icons/{ => src}/Logos/SnapchatIcon.jsx | 2 +- src/icons/{ => src}/Logos/TikTokIcon.jsx | 2 +- src/icons/{ => src}/Logos/TripadvisorIcon.jsx | 2 +- src/icons/{ => src}/Logos/TwitterIcon.jsx | 2 +- src/icons/{ => src}/Logos/XIcon.jsx | 2 +- src/icons/{ => src}/Logos/YelpIcon.jsx | 2 +- src/icons/{ => src}/LogoutIcon.jsx | 2 +- src/icons/{ => src}/MagicIcon.jsx | 2 +- src/icons/{ => src}/MedicalIcon.jsx | 2 +- src/icons/{ => src}/MegaphoneIcon.jsx | 2 +- src/icons/{ => src}/MenuIcon.jsx | 2 +- src/icons/{ => src}/MinusIcon.jsx | 2 +- src/icons/{ => src}/MixedChecklistIcon.jsx | 2 +- src/icons/{ => src}/MobileIcon.jsx | 2 +- .../{ => src}/MobileStore/AppStoreBadge.jsx | 2 +- .../{ => src}/MobileStore/PlayMarketBadge.jsx | 2 +- src/icons/{ => src}/MoneyAddIcon.jsx | 2 +- src/icons/{ => src}/MoneyBackIcon.jsx | 2 +- src/icons/{ => src}/MoneyIcon.jsx | 2 +- src/icons/{ => src}/MountainIcon.jsx | 2 +- src/icons/{ => src}/MouseIcon.jsx | 2 +- src/icons/{ => src}/PassIcon.jsx | 2 +- src/icons/{ => src}/PauseIcon.jsx | 2 +- src/icons/{ => src}/PenIcon.jsx | 2 +- src/icons/{ => src}/PhoneIcon.jsx | 2 +- src/icons/{ => src}/PhotosIcon.jsx | 2 +- src/icons/{ => src}/PiggyBankIcon.jsx | 2 +- src/icons/{ => src}/PinIcon.jsx | 2 +- src/icons/{ => src}/PipeIcon.jsx | 2 +- src/icons/{ => src}/PlayIcon.jsx | 2 +- src/icons/{ => src}/PlusIcon.jsx | 2 +- src/icons/{ => src}/PolicyIcon.jsx | 2 +- src/icons/{ => src}/PrintIcon.jsx | 2 +- src/icons/{ => src}/ProductsIcon.jsx | 2 +- src/icons/{ => src}/QuestionIcon.jsx | 2 +- src/icons/{ => src}/QuestionnaireIcon.jsx | 2 +- src/icons/{ => src}/ReceiptIcon.jsx | 2 +- src/icons/{ => src}/ReceptionBellIcon.jsx | 2 +- .../{ => src}/ReceptionBellMoneyIcon.jsx | 2 +- src/icons/{ => src}/RefreshIcon.jsx | 2 +- src/icons/{ => src}/RefundIcon.jsx | 2 +- src/icons/{ => src}/RosterIcon.jsx | 2 +- src/icons/{ => src}/RoundedSquareIcon.jsx | 2 +- src/icons/{ => src}/RulerIcon.jsx | 2 +- src/icons/{ => src}/SearchAltIcon.jsx | 2 +- src/icons/{ => src}/SearchIcon.jsx | 2 +- src/icons/{ => src}/SendIcon.jsx | 2 +- src/icons/{ => src}/SeniorIcon.jsx | 2 +- src/icons/{ => src}/SeniorV2Icon.jsx | 2 +- src/icons/{ => src}/SeniorV3Icon.jsx | 2 +- src/icons/{ => src}/ServiceIcon.jsx | 2 +- src/icons/{ => src}/SettingsIcon.jsx | 2 +- src/icons/{ => src}/ShapesIcon.jsx | 2 +- src/icons/{ => src}/ShareIcon.jsx | 2 +- src/icons/{ => src}/ShirtIcon.jsx | 2 +- src/icons/{ => src}/ShoppingBagIcon.jsx | 2 +- src/icons/{ => src}/SplitPaymentIcon.jsx | 2 +- src/icons/{ => src}/StackIcon.jsx | 2 +- src/icons/{ => src}/StarFilledIcon.jsx | 2 +- src/icons/{ => src}/StarIcon.jsx | 2 +- src/icons/{ => src}/StoreCreditIcon.jsx | 2 +- src/icons/{ => src}/TaxIcon.jsx | 2 +- src/icons/{ => src}/ThumbsDownIcon.jsx | 2 +- src/icons/{ => src}/ThumbsUpIcon.jsx | 2 +- src/icons/{ => src}/TicketIcon.jsx | 2 +- src/icons/{ => src}/TransferArrowIcon.jsx | 2 +- src/icons/{ => src}/TrashIcon.jsx | 2 +- .../Tutorials/TutorialsBadgeIcon.jsx | 0 .../Tutorials/TutorialsButtonIcon.jsx | 0 .../Tutorials/TutorialsSquareIcon.jsx | 0 src/icons/{ => src}/UnlinkIcon.jsx | 2 +- src/icons/{ => src}/UserAddIcon.jsx | 2 +- src/icons/{ => src}/UserChangedIcon.jsx | 2 +- src/icons/{ => src}/UserIcon.jsx | 2 +- src/icons/{ => src}/UserSubtractIcon.jsx | 2 +- src/icons/{ => src}/VeteranIcon.jsx | 2 +- src/icons/{ => src}/ViewNotesIcon.jsx | 2 +- src/icons/{ => src}/VoucherIcon.jsx | 2 +- src/icons/{ => src}/WaitlistIcon.jsx | 2 +- src/icons/{ => src}/WarningDiamondIcon.jsx | 2 +- src/icons/{ => src}/WarningIcon.jsx | 2 +- src/icons/{ => src}/WarningTriangleIcon.jsx | 2 +- src/icons/{ => src}/WeightIcon.jsx | 2 +- src/icons/{ => src}/WifiIcon.jsx | 2 +- src/icons/{ => src}/WriteIcon.jsx | 2 +- src/icons/{ => src}/XolaBotIcon.jsx | 2 +- src/icons/{ => src}/XrayIcon.jsx | 2 +- src/{ => icons/src}/helpers/icon.jsx | 2 +- src/icons/{ => src/helpers}/iconSizes.js | 0 .../src}/images/CircleCrossImage.jsx | 0 .../src}/images/CirclePlusImage.jsx | 0 src/{ => icons/src}/images/ComputerImage.jsx | 0 src/{ => icons/src}/images/EmvImage.jsx | 0 src/{ => icons/src}/images/ExpediaImage.jsx | 0 src/{ => icons/src}/images/VerifoneImage.jsx | 0 src/{ => icons/src}/images/XolaLogo.jsx | 0 src/{ => icons/src}/images/XolaLogoCircle.jsx | 0 src/{ => icons/src}/images/XolaLogoSimple.jsx | 0 src/index.js | 221 +----------------- src/stories/Media/Icons.stories.js | 2 +- src/stories/Media/Images.stories.js | 4 +- 252 files changed, 832 insertions(+), 566 deletions(-) create mode 100644 .github/workflows/deploy-icons.yml delete mode 100644 .github/workflows/eslint-annotate.yml create mode 100644 src/icons/README.md create mode 100644 src/icons/index.js create mode 100644 src/icons/package-lock.json create mode 100644 src/icons/package.json rename src/icons/{ => src}/AccountIcon.jsx (93%) rename src/icons/{ => src}/AddNoteIcon.jsx (92%) rename src/icons/{ => src}/AddSquareIcon.jsx (94%) rename src/icons/{ => src}/AnnounceIcon.jsx (94%) rename src/icons/{ => src}/AppIcon.jsx (94%) rename src/icons/{ => src}/ArchiveIcon.jsx (94%) rename src/icons/{ => src}/ArrowCcwIcon.jsx (94%) rename src/icons/{ => src}/ArrowCwIcon.jsx (93%) rename src/icons/{ => src}/ArrowDownIcon.jsx (91%) rename src/icons/{ => src}/ArrowRightIcon.jsx (91%) rename src/icons/{ => src}/ArrowTopRightIcon.jsx (94%) rename src/icons/{ => src}/ArrowUpIcon.jsx (91%) rename src/icons/{ => src}/AtIcon.jsx (93%) rename src/icons/{ => src}/BalloonIcon.jsx (92%) rename src/icons/{ => src}/BankCheckIcon.jsx (95%) rename src/icons/{ => src}/BarGraphIcon.jsx (94%) rename src/icons/{ => src}/BellIcon.jsx (95%) rename src/icons/{ => src}/BookIcon.jsx (95%) rename src/icons/{ => src}/BookmarkIcon.jsx (94%) rename src/icons/{ => src}/BoxIcon.jsx (95%) rename src/icons/{ => src}/BriefcaseIcon.jsx (95%) rename src/icons/{ => src}/BugIcon.tsx (97%) rename src/icons/{ => src}/ButtonCodeIcon.jsx (96%) rename src/icons/{ => src}/CakeIcon.jsx (97%) rename src/icons/{ => src}/CalendarDayIcon.jsx (94%) rename src/icons/{ => src}/CalendarIcon.jsx (93%) rename src/icons/{ => src}/CalendarMonthIcon.jsx (96%) rename src/icons/{ => src}/CalendarWeekIcon.jsx (94%) rename src/icons/{ => src}/CapacityIcon.jsx (92%) rename src/icons/{ => src}/CardAltIcon.jsx (93%) rename src/icons/{ => src}/CardIcon.jsx (92%) rename src/icons/{ => src}/CartIcon.jsx (94%) rename src/icons/{ => src}/CashIcon.jsx (96%) rename src/icons/{ => src}/CheckIcon.jsx (89%) rename src/icons/{ => src}/CheckboxIcon.jsx (93%) rename src/icons/{ => src}/ChecklistIcon.jsx (91%) rename src/icons/{ => src}/ChevronDownIcon.jsx (89%) rename src/icons/{ => src}/ChevronLeftIcon.jsx (89%) rename src/icons/{ => src}/ChevronRightIcon.jsx (89%) rename src/icons/{ => src}/ChevronUpIcon.jsx (89%) rename src/icons/{ => src}/ChipIcon.jsx (95%) rename src/icons/{ => src}/CircleCheckIcon.jsx (92%) rename src/icons/{ => src}/CircleCrossIcon.jsx (92%) rename src/icons/{ => src}/CircleCrownIcon.jsx (95%) rename src/icons/{ => src}/CircleDollarIcon.jsx (94%) rename src/icons/{ => src}/CircleDotIcon.jsx (93%) rename src/icons/{ => src}/CircleInfinityIcon.jsx (95%) rename src/icons/{ => src}/CircleInfoIcon.jsx (93%) rename src/icons/{ => src}/CircleKeyIcon.jsx (94%) rename src/icons/{ => src}/CircleNotch.jsx (81%) rename src/icons/{ => src}/CirclePauseIcon.jsx (91%) rename src/icons/{ => src}/CirclePlusIcon.jsx (91%) rename src/icons/{ => src}/CircleSubtractIcon.jsx (91%) rename src/icons/{ => src}/ClipboardIcon.jsx (94%) rename src/icons/{ => src}/ClockAltIcon.jsx (92%) rename src/icons/{ => src}/ClockIcon.jsx (93%) rename src/icons/{ => src}/ClockManualIcon.jsx (96%) rename src/icons/{ => src}/CloseIcon.jsx (93%) rename src/icons/{ => src}/CollapseIcon.jsx (92%) rename src/icons/{ => src}/CommentAltIcon.jsx (92%) rename src/icons/{ => src}/CommentIcon.jsx (93%) rename src/icons/{ => src}/CompassIcon.jsx (95%) rename src/icons/{ => src}/CopyIcon.jsx (94%) rename src/icons/{ => src}/CouponIcon.jsx (94%) rename src/icons/{ => src}/CreditCards/AmexIcon.jsx (95%) rename src/icons/{ => src}/CreditCards/DinersClubIcon.jsx (95%) rename src/icons/{ => src}/CreditCards/DiscoverIcon.jsx (97%) rename src/icons/{ => src}/CreditCards/MaestroIcon.jsx (95%) rename src/icons/{ => src}/CreditCards/MasterCardIcon.jsx (96%) rename src/icons/{ => src}/CreditCards/VisaIcon.jsx (96%) rename src/icons/{ => src}/CrmIcon.jsx (97%) rename src/icons/{ => src}/CrownIcon.jsx (93%) rename src/icons/{ => src}/DashboardIcon.jsx (93%) rename src/icons/{ => src}/DecreaseIcon.jsx (95%) rename src/icons/{ => src}/DepositIcon.jsx (93%) rename src/icons/{ => src}/DisabledIcon.jsx (91%) rename src/icons/{ => src}/DisputeIcon.jsx (94%) rename src/icons/{ => src}/DoubleCheckIcon.jsx (92%) rename src/icons/{ => src}/DownArrowIcon.jsx (91%) rename src/icons/{ => src}/DownloadIcon.jsx (91%) rename src/icons/{ => src}/DropdownIcon.jsx (95%) rename src/icons/{ => src}/DumbbellIcon.jsx (97%) rename src/icons/{ => src}/DuplicateIcon.jsx (95%) rename src/icons/{ => src}/DurationIcon.jsx (93%) rename src/icons/{ => src}/EditIcon.jsx (92%) rename src/icons/{ => src}/EditNoteIcon.jsx (94%) rename src/icons/{ => src}/EditNotesIcon.jsx (93%) rename src/icons/{ => src}/EllipsisIcon.jsx (91%) rename src/icons/{ => src}/EmailCheckedIcon.jsx (96%) rename src/icons/{ => src}/EmailIcon.jsx (94%) rename src/icons/{ => src}/EmailResendIcon.jsx (95%) rename src/icons/{ => src}/EmailSendIcon.jsx (94%) rename src/icons/{ => src}/EmptyChecklistIcon.jsx (95%) rename src/icons/{ => src}/EquipmentIcon.jsx (94%) rename src/icons/{ => src}/ExportIcon.jsx (94%) rename src/icons/{ => src}/EyeClosedIcon.jsx (95%) rename src/icons/{ => src}/EyeIcon.jsx (95%) rename src/icons/{ => src}/FaceNeutralIcon.jsx (95%) rename src/icons/{ => src}/FaceSadIcon.jsx (95%) rename src/icons/{ => src}/FaceSmileIcon.jsx (96%) rename src/icons/{ => src}/FeedbackLightBulbIcon.jsx (97%) rename src/icons/{ => src}/FilterIcon.jsx (92%) rename src/icons/{ => src}/FilterIconOld.jsx (94%) rename src/icons/{ => src}/FlagIcon.jsx (93%) rename src/icons/{ => src}/FlexFee2Icon.jsx (96%) rename src/icons/{ => src}/FlexFeeIcon.jsx (95%) rename src/icons/{ => src}/FoodIcon.jsx (95%) rename src/icons/{ => src}/ForkIcon.jsx (91%) rename src/icons/{ => src}/GiftIcon.jsx (96%) rename src/icons/{ => src}/GlobeIcon.jsx (94%) rename src/icons/{ => src}/HandIcon.jsx (95%) rename src/icons/{ => src}/HandshakeIcon.jsx (96%) rename src/icons/{ => src}/HelpCenterIcon.jsx (96%) rename src/icons/{ => src}/HouseIcon.jsx (94%) rename src/icons/{ => src}/ImageIcon.jsx (95%) rename src/icons/{ => src}/InfinityIcon.jsx (92%) rename src/icons/{ => src}/InvoiceIcon.jsx (96%) rename src/icons/{ => src}/KeyIcon.jsx (95%) rename src/icons/{ => src}/KioskIcon.jsx (92%) rename src/icons/{ => src}/LabelIcon.jsx (87%) rename src/icons/{ => src}/LightIcon.jsx (94%) rename src/icons/{ => src}/LightningIcon.jsx (95%) rename src/icons/{ => src}/LinkIcon.jsx (95%) rename src/icons/{ => src}/LockIcon.jsx (93%) rename src/icons/{ => src}/Logos/FacebookIcon.jsx (91%) rename src/icons/{ => src}/Logos/InstagramIcon.jsx (96%) rename src/icons/{ => src}/Logos/SnapchatIcon.jsx (95%) rename src/icons/{ => src}/Logos/TikTokIcon.jsx (92%) rename src/icons/{ => src}/Logos/TripadvisorIcon.jsx (94%) rename src/icons/{ => src}/Logos/TwitterIcon.jsx (94%) rename src/icons/{ => src}/Logos/XIcon.jsx (91%) rename src/icons/{ => src}/Logos/YelpIcon.jsx (96%) rename src/icons/{ => src}/LogoutIcon.jsx (95%) rename src/icons/{ => src}/MagicIcon.jsx (96%) rename src/icons/{ => src}/MedicalIcon.jsx (94%) rename src/icons/{ => src}/MegaphoneIcon.jsx (94%) rename src/icons/{ => src}/MenuIcon.jsx (89%) rename src/icons/{ => src}/MinusIcon.jsx (91%) rename src/icons/{ => src}/MixedChecklistIcon.jsx (94%) rename src/icons/{ => src}/MobileIcon.jsx (95%) rename src/icons/{ => src}/MobileStore/AppStoreBadge.jsx (99%) rename src/icons/{ => src}/MobileStore/PlayMarketBadge.jsx (99%) rename src/icons/{ => src}/MoneyAddIcon.jsx (93%) rename src/icons/{ => src}/MoneyBackIcon.jsx (95%) rename src/icons/{ => src}/MoneyIcon.jsx (92%) rename src/icons/{ => src}/MountainIcon.jsx (95%) rename src/icons/{ => src}/MouseIcon.jsx (94%) rename src/icons/{ => src}/PassIcon.jsx (96%) rename src/icons/{ => src}/PauseIcon.jsx (88%) rename src/icons/{ => src}/PenIcon.jsx (92%) rename src/icons/{ => src}/PhoneIcon.jsx (94%) rename src/icons/{ => src}/PhotosIcon.jsx (96%) rename src/icons/{ => src}/PiggyBankIcon.jsx (96%) rename src/icons/{ => src}/PinIcon.jsx (94%) rename src/icons/{ => src}/PipeIcon.jsx (88%) rename src/icons/{ => src}/PlayIcon.jsx (95%) rename src/icons/{ => src}/PlusIcon.jsx (88%) rename src/icons/{ => src}/PolicyIcon.jsx (94%) rename src/icons/{ => src}/PrintIcon.jsx (94%) rename src/icons/{ => src}/ProductsIcon.jsx (93%) rename src/icons/{ => src}/QuestionIcon.jsx (95%) rename src/icons/{ => src}/QuestionnaireIcon.jsx (94%) rename src/icons/{ => src}/ReceiptIcon.jsx (93%) rename src/icons/{ => src}/ReceptionBellIcon.jsx (92%) rename src/icons/{ => src}/ReceptionBellMoneyIcon.jsx (94%) rename src/icons/{ => src}/RefreshIcon.jsx (94%) rename src/icons/{ => src}/RefundIcon.jsx (94%) rename src/icons/{ => src}/RosterIcon.jsx (92%) rename src/icons/{ => src}/RoundedSquareIcon.jsx (91%) rename src/icons/{ => src}/RulerIcon.jsx (93%) rename src/icons/{ => src}/SearchAltIcon.jsx (94%) rename src/icons/{ => src}/SearchIcon.jsx (91%) rename src/icons/{ => src}/SendIcon.jsx (92%) rename src/icons/{ => src}/SeniorIcon.jsx (93%) rename src/icons/{ => src}/SeniorV2Icon.jsx (92%) rename src/icons/{ => src}/SeniorV3Icon.jsx (91%) rename src/icons/{ => src}/ServiceIcon.jsx (91%) rename src/icons/{ => src}/SettingsIcon.jsx (93%) rename src/icons/{ => src}/ShapesIcon.jsx (96%) rename src/icons/{ => src}/ShareIcon.jsx (91%) rename src/icons/{ => src}/ShirtIcon.jsx (94%) rename src/icons/{ => src}/ShoppingBagIcon.jsx (95%) rename src/icons/{ => src}/SplitPaymentIcon.jsx (94%) rename src/icons/{ => src}/StackIcon.jsx (95%) rename src/icons/{ => src}/StarFilledIcon.jsx (94%) rename src/icons/{ => src}/StarIcon.jsx (94%) rename src/icons/{ => src}/StoreCreditIcon.jsx (94%) rename src/icons/{ => src}/TaxIcon.jsx (96%) rename src/icons/{ => src}/ThumbsDownIcon.jsx (95%) rename src/icons/{ => src}/ThumbsUpIcon.jsx (94%) rename src/icons/{ => src}/TicketIcon.jsx (93%) rename src/icons/{ => src}/TransferArrowIcon.jsx (92%) rename src/icons/{ => src}/TrashIcon.jsx (95%) rename src/icons/{ => src}/Tutorials/TutorialsBadgeIcon.jsx (100%) rename src/icons/{ => src}/Tutorials/TutorialsButtonIcon.jsx (100%) rename src/icons/{ => src}/Tutorials/TutorialsSquareIcon.jsx (100%) rename src/icons/{ => src}/UnlinkIcon.jsx (92%) rename src/icons/{ => src}/UserAddIcon.jsx (93%) rename src/icons/{ => src}/UserChangedIcon.jsx (95%) rename src/icons/{ => src}/UserIcon.jsx (93%) rename src/icons/{ => src}/UserSubtractIcon.jsx (94%) rename src/icons/{ => src}/VeteranIcon.jsx (94%) rename src/icons/{ => src}/ViewNotesIcon.jsx (96%) rename src/icons/{ => src}/VoucherIcon.jsx (94%) rename src/icons/{ => src}/WaitlistIcon.jsx (96%) rename src/icons/{ => src}/WarningDiamondIcon.jsx (95%) rename src/icons/{ => src}/WarningIcon.jsx (95%) rename src/icons/{ => src}/WarningTriangleIcon.jsx (94%) rename src/icons/{ => src}/WeightIcon.jsx (95%) rename src/icons/{ => src}/WifiIcon.jsx (92%) rename src/icons/{ => src}/WriteIcon.jsx (93%) rename src/icons/{ => src}/XolaBotIcon.jsx (95%) rename src/icons/{ => src}/XrayIcon.jsx (93%) rename src/{ => icons/src}/helpers/icon.jsx (90%) rename src/icons/{ => src/helpers}/iconSizes.js (100%) rename src/{ => icons/src}/images/CircleCrossImage.jsx (100%) rename src/{ => icons/src}/images/CirclePlusImage.jsx (100%) rename src/{ => icons/src}/images/ComputerImage.jsx (100%) rename src/{ => icons/src}/images/EmvImage.jsx (100%) rename src/{ => icons/src}/images/ExpediaImage.jsx (100%) rename src/{ => icons/src}/images/VerifoneImage.jsx (100%) rename src/{ => icons/src}/images/XolaLogo.jsx (100%) rename src/{ => icons/src}/images/XolaLogoCircle.jsx (100%) rename src/{ => icons/src}/images/XolaLogoSimple.jsx (100%) diff --git a/.github/workflows/chromatic.yml b/.github/workflows/chromatic.yml index c61f8820..737f937b 100644 --- a/.github/workflows/chromatic.yml +++ b/.github/workflows/chromatic.yml @@ -15,7 +15,9 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 16 + cache: "npm" + cache-dependency-path: "package-lock.json" - name: Install dependencies run: npm ci diff --git a/.github/workflows/deploy-icons.yml b/.github/workflows/deploy-icons.yml new file mode 100644 index 00000000..42fa3be0 --- /dev/null +++ b/.github/workflows/deploy-icons.yml @@ -0,0 +1,30 @@ +# For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages +name: Publish @xola/icons + +on: + workflow_dispatch: + inputs: + tag: + description: "Tag version" + default: latest + required: true + +jobs: + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-node@v3 + with: + node-version: 16 + cache: "npm" + cache-dependency-path: "package-lock.json" + registry-url: https://registry.npmjs.org/ + + - run: cd src/icons && pwd && npm ci + + - name: Publish to @xola/icons + run: cd src/icons && pwd && npm publish --tag ${{ github.event.inputs.tag }} + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index cf8080ae..48a0f51b 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,25 +1,31 @@ # For more information see: https://docs.github.com/en/actions/publishing-packages/publishing-nodejs-packages -name: Node.js Package +name: Publish @xola/ui-kit on: - workflow_dispatch: - inputs: - tag: - description: "Tag version" - default: latest - required: true + workflow_dispatch: + inputs: + tag: + description: "Tag version" + default: latest + required: true jobs: - publish: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-node@v3 - with: - node-version: 16 - registry-url: https://registry.npmjs.org/ - - run: npm ci - - run: npm run build - - run: npm publish --tag ${{ github.event.inputs.tag }} - env: - NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} + publish: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-node@v3 + with: + node-version: 16 + cache: "npm" + cache-dependency-path: "package-lock.json" + registry-url: https://registry.npmjs.org/ + + - run: npm ci + + - run: npm run build + + - run: npm publish --tag ${{ github.event.inputs.tag }} + env: + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} diff --git a/.github/workflows/eslint-annotate.yml b/.github/workflows/eslint-annotate.yml deleted file mode 100644 index d6b9d303..00000000 --- a/.github/workflows/eslint-annotate.yml +++ /dev/null @@ -1,57 +0,0 @@ -name: Annotate ES Lint Results - -on: - push: - pull_request_target: - types: [assigned, opened, synchronize, reopened] - -env: - DISABLE_PROGRESS: true - -concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true - -jobs: - GenerateReport: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - with: - token: "${{ secrets.ES_LINT_TOKEN }}" - ref: ${{github.event.pull_request.head.sha}} - repository: ${{github.event.pull_request.head.repo.full_name}} - persist-credential: false - - - name: Node.JS 16 - uses: actions/setup-node@v2 - with: - node-version: 16 - cache: "npm" - - # - run: git config --global url."https://${{ secrets.ES_LINT_TOKEN }}@github.com/".insteadOf ssh://git@github.com/ - - - name: Install Node Dependencies - run: npm ci - env: - CI: TRUE - - - name: Save Code Linting Report to JSON - # This is to show failures in Github pull request using the action below - run: npm run lint:report - continue-on-error: true - env: - DISABLE_PROGRESS: true - - - name: Annotate Code Linting Results - uses: ataylorme/eslint-annotate-action@1.2.0 - with: - repo-token: "${{ secrets.GITHUB_TOKEN }}" - report-json: "eslint_report.json" - - - name: Upload ESLint report - uses: actions/upload-artifact@v2 - with: - name: eslint_report.json - path: eslint_report.json diff --git a/.github/workflows/eslint.yml b/.github/workflows/eslint.yml index 10fda4a7..4dc7b19d 100644 --- a/.github/workflows/eslint.yml +++ b/.github/workflows/eslint.yml @@ -1,39 +1,60 @@ -name: Run ES Lint +name: Lint on: - push: - pull_request_target: - types: [assigned, opened, synchronize, reopened] + push: + # Runs against the workflow and code from the merge commit + # pull_request: + # types: [ opened, synchronize, reopened ] + # Runs against the workflow and code from the base of the pull request + pull_request_target: + types: [opened, synchronize, reopened] env: - DISABLE_PROGRESS: true + DISABLE_PROGRESS: true concurrency: - group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} - cancel-in-progress: true + group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }} + cancel-in-progress: true jobs: - RunLint: - runs-on: ubuntu-latest - - steps: - - uses: actions/checkout@v2 - with: - token: "${{ secrets.ES_LINT_TOKEN }}" - ref: ${{github.event.pull_request.head.sha}} - repository: ${{github.event.pull_request.head.repo.full_name}} - - - name: Node.JS 16 - uses: actions/setup-node@v2 - with: - node-version: 16 - - - name: Install Node Dependencies - run: npm ci - env: - CI: TRUE - - - name: Lint Report - # This is to show the failures in Github actions - run: npm run lint - continue-on-error: true + Lint: + name: ⚡ ES Lint + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v3 + with: + token: "${{ secrets.ES_LINT_TOKEN }}" + ref: ${{github.event.pull_request.head.sha}} + repository: ${{github.event.pull_request.head.repo.full_name}} + + - name: Node.JS 16 + uses: actions/setup-node@v3 + with: + node-version: 16 + cache: "npm" + cache-dependency-path: "package-lock.json" + + - name: Install Node Dependencies + run: npm ci + + - name: Save Code Linting Report to JSON + # This is to show failures in GitHub pull request using the action below + run: npm run lint:report + continue-on-error: true + + - name: Annotate Code Linting Results + uses: ataylorme/eslint-annotate-action@2.2.0 + with: + check-name: "View Lint Report" + markdown-report-on-step-summary: true + repo-token: "${{ secrets.GITHUB_TOKEN }}" + report-json: "eslint_report.json" + +# # OPTIONAL: save a copy of the usage report for download or use in another job +# # Save a copy of the usage report for download or use in another job +# - name: Upload ESLint report +# uses: actions/upload-artifact@v3 +# with: +# name: eslint_report.json +# path: eslint_report.json diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 02e74304..cdbfadfb 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -1,4 +1,4 @@ -name: Publish to GitHub Pages +name: Publish UI Kit Storybook on: push: @@ -14,7 +14,9 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: 16 + node-version: 16 + cache: "npm" + cache-dependency-path: "package-lock.json" - name: Install dependencies run: npm ci diff --git a/README.md b/README.md index 410e2fe4..e57d9fb0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,13 @@ ## Xola UI Kit -Xola's React component library with Tailwind CSS for the next generation of Xola apps. See a preview at https://ui.xola.io +Xola's React component library with Tailwind CSS for the next generation of Xola apps. + +This repository is published as two pieces: + +1. [@xola/ui-kit](https://www.npmjs.com/package/@xola/ui-kit) +2. [@xola/icons](https://www.npmjs.com/package/@xola/icons) + +It's storybook is publicly published at [ui.xola.io](https://ui.xola.io). The icons can be previewed there as well. ### Requirements @@ -151,7 +158,7 @@ Install [np](https://github.com/sindresorhus/np#readme) which will help you publ npm -g install np ``` -Once you're ready, run this command to publish your package +Once you're ready, run this command to publish your package ```bash npm run build diff --git a/package.json b/package.json index 793f62c6..bf386546 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,10 @@ "version": "2.1.42", "description": "Xola UI Kit", "license": "MIT", + "repository": { + "type": "git", + "url": "git://github.com/xola/ui-kit.git" + }, "files": [ "build", "index.css", diff --git a/src/components/Alert.jsx b/src/components/Alert.jsx index 57ba381c..6a715c71 100644 --- a/src/components/Alert.jsx +++ b/src/components/Alert.jsx @@ -1,7 +1,7 @@ import clsx from "clsx"; import PropTypes from "prop-types"; import React from "react"; -import { CloseIcon } from "../icons/CloseIcon"; +import { CloseIcon } from "../icons"; const colors = { primary: "bg-primary-lighter text-black", diff --git a/src/components/Buttons/SubmitButton.jsx b/src/components/Buttons/SubmitButton.jsx index ef90f042..f1876e26 100644 --- a/src/components/Buttons/SubmitButton.jsx +++ b/src/components/Buttons/SubmitButton.jsx @@ -3,7 +3,7 @@ import clsx from "clsx"; import PropTypes from "prop-types"; import React, { useState, useEffect } from "react"; import { Spinner } from "../Spinner"; -import { CheckIcon } from "../../icons/CheckIcon"; +import { CheckIcon } from "../../icons"; import { Button, colors } from "./Button"; const loadingColors = { diff --git a/src/components/DatePicker/NavbarElement.jsx b/src/components/DatePicker/NavbarElement.jsx index cdefe15c..1cd76f6d 100644 --- a/src/components/DatePicker/NavbarElement.jsx +++ b/src/components/DatePicker/NavbarElement.jsx @@ -1,15 +1,14 @@ import clsx from "clsx"; import PropTypes from "prop-types"; import React from "react"; -import { ChevronLeftIcon } from "../../icons/ChevronLeftIcon"; -import { ChevronRightIcon } from "../../icons/ChevronRightIcon"; +import { ChevronLeftIcon, ChevronRightIcon } from "../../icons"; /** * Render the custom left & right arrows to change the current month. */ export const NavbarElement = ({ onPreviousClick, onNextClick, className, showNextButton, showPreviousButton }) => { return ( -
+
diff --git a/src/components/Drawer.jsx b/src/components/Drawer.jsx index 08d30ead..fb5c4ab7 100644 --- a/src/components/Drawer.jsx +++ b/src/components/Drawer.jsx @@ -2,7 +2,7 @@ import { Dialog, Transition } from "@headlessui/react"; import clsx from "clsx"; import PropTypes from "prop-types"; import React, { Fragment } from "react"; -import { CloseIcon } from "../icons/CloseIcon"; +import { CloseIcon } from "../icons"; import { Button } from "./Buttons/Button"; const sizes = { diff --git a/src/components/Modal.jsx b/src/components/Modal.jsx index 4e06c2f6..a582ab3e 100644 --- a/src/components/Modal.jsx +++ b/src/components/Modal.jsx @@ -2,7 +2,7 @@ import { Dialog, Transition } from "@headlessui/react"; import clsx from "clsx"; import PropTypes from "prop-types"; import React, { Fragment } from "react"; -import { CloseIcon } from "../icons/CloseIcon"; +import { CloseIcon } from "../icons"; const sizes = { small: "max-w-100", // 400px @@ -110,7 +110,7 @@ export const Modal = ({ {onClose ? (