fix merge conflicts

packages/db/lib/generators/index.ts

@@ -2,7 +2,6 @@
 export * from './allAttributes'
 export * from './attributeCategory'
 export * from './attributesByCategory'
-export * from './common'
 export * from './langs'
 export * from './namespaces'
 export * from './permission'

packages/db/prisma/data-migrations/index.ts

@@ -11,20 +11,15 @@ export * from './2023-04-10_social-media-services'
 export * from './2023-04-11_basic-phone-types'
 export * from './2023-04-11_permissions-attributes'
 export * from './2023-04-21_badge-render-field'
-export * from './2023-04-25_attr-supp-schemas/!schemas'
 export * from './2023-04-25_attr-supp-schemas/index'
 export * from './2023-04-26_attr-supp-interpolation/index'
 export * from './2023-05-05_enabled-countries'
 export * from './2023-05-08_permissions'
-export * from './2023-05-18_update-published-deleted/!DataTypes'
-export * from './2023-05-18_update-published-deleted/!generate'
 export * from './2023-05-18_update-published-deleted/index'
 export * from './2023-05-18_user-permissions'
 export * from './2023-05-19_reviews-countries'
 export * from './2023-05-22_add-crowdin-ids/index'
-export * from './2023-06-05_1-leaderfocus-attrib/!transform'
 export * from './2023-06-05_1-leaderfocus-attrib/index'
-export * from './2023-06-05_2-add-tags/!prepare'
 export * from './2023-06-05_2-add-tags/index'
 export * from './2023-06-06_tags-for-new-orgs/index'
 export * from './2023-06-07_update-tag'
@@ -33,23 +28,19 @@ export * from './2023-06-08_update-law-practice-opts'
 export * from './2023-06-09_duplicate-websites/index'
 export * from './2023-06-12_survey-options'
 export * from './2023-06-13_user-type'
-export * from './2023-06-14_remote-tags/!prepare'
 export * from './2023-06-14_remote-tags/index'
 export * from './2023-06-20_tags-for-suggestions'
 export * from './2023-06-21_update-sourceid'
 export * from './2023-06-26_active-country'
 export * from './2023-06-27_add-crowdin-ids/index'
 export * from './2023-07-12_1-add-remote-tags/index'
 export * from './2023-07-12_2-leader-focus-attribs/index'
-export * from './2023-07-12_3-update-tags-attributes/!types'
 export * from './2023-07-12_3-update-tags-attributes/index'
 export * from './2023-07-17_SWT-update'
 export * from './2023-07-19_district-data-corrections/index'
-export * from './2023-07-24_add-crisis-resources/!data'
 export * from './2023-07-24_add-crisis-resources/index'
 export * from './2023-07-26_intl-crisis-sorting'
 export * from './2023-07-31_crisis-support-tags'
-export * from './2023-07-31_national-crisis-resources/!data'
 export * from './2023-07-31_national-crisis-resources/index'
 export * from './2023-08-07_permissions'
 export * from './2023-09-11_fix-unsupported-attrib-data/index'
@@ -62,9 +53,6 @@ export * from './2023-09-20_fix-access-instructions/index'
 export * from './2023-09-20_update-services'
 export * from './2023-09-22_service-areas'
 export * from './2023-09-22_update-alerts/index'
-export * from './2023-10-23_add-suggested-orgs/!load'
-export * from './2023-10-23_add-suggested-orgs/!prep'
-export * from './2023-10-23_add-suggested-orgs/!schemas'
 export * from './2023-10-23_add-suggested-orgs/index'
 export * from './2023-10-25_service-tag-updates'
 export * from './2023-10-27_tlc-service-updates'

packages/ui/components/core/index.tsx

@@ -1,45 +1,24 @@
 // codegen:start {preset: barrel, include: ./*.ts*, exclude: "*.stories.*"}
 export * from './ActionButtons'
-export * from './ActionButtons.stories'
 export * from './AlertMessage'
-export * from './AlertMessage.stories'
 export * from './AntiHateMessage'
-export * from './AntiHateMessage.stories'
 export * from './Badge'
-export * from './Badge.stories'
 export * from './Breadcrumb'
-export * from './Breadcrumb.stories'
 export * from './Button'
-export * from './Button.stories'
 export * from './GoogleMap'
-export * from './GoogleMap.stories'
 export * from './LangPicker'
-export * from './LangPicker.stories'
 export * from './Link'
 export * from './MobileNav'
-export * from './MobileNav.stories'
 export * from './PageLoadProgress'
 export * from './Pagination'
-export * from './Pagination.stories'
 export * from './Rating'
-export * from './Rating.stories'
 export * from './SearchBox'
-export * from './SearchBox.stories'
 export * from './SearchDistance'
-export * from './SearchDistance.stories'
 export * from './SearchResultCard'
-export * from './SearchResultCard.stories'
 export * from './SocialLink'
-export * from './SocialLink.stories'
-export * from './Tabs.stories'
 export * from './Toolbar'
-export * from './Toolbar.stories'
 export * from './UserAvatar'
-export * from './UserAvatar.stories'
 export * from './UserMenu'
-export * from './UserMenu.stories'
 export * from './UserReview'
-export * from './UserReview.stories'
 export * from './UserReviewSubmit'
-export * from './UserReviewSubmit.stories'
 // codegen:end

packages/ui/components/data-display/index.ts

@@ -1,7 +1,5 @@
 // codegen:start {preset: barrel, include: ./*.ts*, exclude: "*.stories.*"}
 export * from './AccessInfo'
 export * from './ContactInfo'
-export * from './ContactInfo.stories'
 export * from './Hours'
-export * from './Hours.stories'
 // codegen:end

packages/ui/components/sections/index.ts

@@ -1,25 +1,14 @@
 // codegen:start {preset: barrel, include: ./*.tsx, exclude: "*.stories.tsx"}
 export * from './CallOut'
-export * from './CallOut.stories'
 export * from './Contact'
-export * from './Contact.stories'
 export * from './Footer'
-export * from './Footer.stories'
 export * from './Hero'
-export * from './Hero.stories'
 export * from './ListingBasicInfo'
 export * from './LocationCard'
-export * from './LocationCard.stories'
 export * from './Navbar'
-export * from './Navbar.stories'
 export * from './Photos'
-export * from './Photos.stories'
 export * from './Reviews'
-export * from './Reviews.stories'
 export * from './SearchResultSidebar'
-export * from './SearchResultSidebar.stories'
 export * from './ServicesInfo'
-export * from './ServicesInfo.stories'
 export * from './VisitCard'
-export * from './VisitCard.stories'
 // codegen:end

packages/ui/hooks/index.ts

@@ -5,12 +5,10 @@ export * from './useFreeText'
 export * from './useGoogleMapMarker'
 export * from './useGoogleMaps'
 export * from './useNewNotification'
-export * from './useNewNotification.stories'
 export * from './useOrgInfo'
 export * from './usePhoneNumber'
 export * from './useScreenSize'
 export * from './useSearchState'
 export * from './useShake'
-export * from './useShake.stories'
 export * from './useSlug'
 // codegen:end

packages/ui/layouts/index.tsx

@@ -1,4 +1,3 @@
 // codegen:start {preset: barrel, include: ./*.ts*, exclude: "*.stories.*"}
 export * from './BodyGrid'
-export * from './BodyGrid.stories'
 // codegen:end

packages/ui/modals/index.ts

@@ -1,32 +1,19 @@
 // codegen:start {preset: barrel, include: './{*,*/index}.ts*', exclude: "*.stories.tsx"}
 export * from './AccountVerified'
-export * from './AccountVerified.stories'
 export * from './ClaimOrg'
-export * from './ClaimOrg.stories'
 export * from './CreateNewList'
-export * from './CreateNewList.stories'
 export * from './DeleteModal'
-export * from './DeleteModal.stories'
 export * from './Example'
-export * from './Example.stories'
 export * from './ForgotPassword'
-export * from './ForgotPassword.stories'
 export * from './GenericContent'
 export * from './LoginSignUp/index'
 export * from './ModalTitle'
-export * from './ModalTitle.stories'
 export * from './MoreFilter'
-export * from './MoreFilter.stories'
 export * from './PrivacyStatement'
-export * from './PrivacyStatement.stories'
 export * from './QuickPromotion'
-export * from './QuickPromotion.stories'
 export * from './ResetPassword'
-export * from './ResetPassword.stories'
 export * from './Review'
-export * from './Review.stories'
 export * from './Service'
-export * from './Service.stories'
 export * from './ServiceFilter/index'
 export * from './UserSurvey/index'
 // codegen:end