From 7b116048bfd18e1075b119ee5a6707a1dcb1e845 Mon Sep 17 00:00:00 2001 From: Alexandra Goff Date: Tue, 14 Feb 2023 14:52:43 -0700 Subject: [PATCH] [C] consolidate library imports --- components/atomic/Accordion/index.js | 3 --- components/atomic/ExternalLink/index.js | 3 --- components/atomic/Figure/index.js | 3 --- components/atomic/Link/index.js | 3 --- components/atomic/ResponsiveImage/index.js | 3 --- components/atomic/Tile/index.js | 9 ++++++--- .../atomic/Tile/patterns/InvestigationTile/index.js | 2 +- components/atomic/Tile/patterns/SlideTile/index.js | 9 ++++++--- components/atomic/index.js | 11 ----------- components/auth/AuthorizePage/index.js | 3 +-- components/auth/AuthorizePage/styles.js | 2 +- components/content-blocks/AccordionGroup/index.js | 3 +-- components/content-blocks/Callout/CalloutQuote.js | 3 +-- components/content-blocks/Callout/CalloutTwoTone.js | 2 +- components/content-blocks/Callout/styles.js | 2 +- components/content-blocks/Contact/index.js | 3 +-- components/content-blocks/DownloadList/index.js | 3 +-- components/content-blocks/GridBlock/index.js | 3 +-- components/content-blocks/Image/index.js | 4 +--- components/content-blocks/Link/index.js | 3 +-- components/content-blocks/SlideBlock/index.js | 2 +- components/content-blocks/Video/index.js | 3 +-- components/dynamic/EventList/index.js | 9 ++++++--- components/dynamic/GlossaryList/index.js | 3 +-- components/dynamic/JobList/index.js | 9 ++++++--- components/dynamic/NewsList/index.js | 3 +-- components/dynamic/RelatedList/index.js | 3 +-- components/dynamic/SearchList/index.js | 3 +-- components/dynamic/SlideshowList/index.js | 3 +-- components/dynamic/StaffList/index.js | 3 +-- components/dynamic/TempList/index.js | 10 ++++++---- components/form/AuthModalPasswordField/index.js | 2 +- components/form/index.js | 10 ---------- components/global/ContactInfo/index.js | 2 +- components/global/Footer/ContactForm.js | 2 +- components/global/Footer/Nav.js | 2 +- components/global/Footer/Social.js | 3 +-- components/global/Footer/index.js | 2 +- components/global/Header/Hamburger.js | 2 +- components/global/Header/LanguageSelect/styles.js | 2 +- components/global/Header/NavItem.js | 2 +- components/global/Header/NavItemWithChildren.js | 2 +- components/global/Header/SearchBar.js | 2 +- components/global/Header/UserNav/index.js | 2 +- components/layout/InvestigationHero/index.js | 3 +-- components/layout/SharePopup/index.js | 2 +- components/layout/SiblingNavigation/index.js | 3 +-- components/layout/StepNavigation/index.js | 3 +-- components/layout/StepNavigation/styles.js | 2 +- components/layout/Tabs/index.js | 2 +- components/modal/ActivateModal/index.js | 2 +- components/modal/ActivateModal/styles.js | 2 +- components/modal/AuthModal/index.js | 2 +- components/modal/AuthModal/styles.js | 2 +- components/modal/BasicModal/index.js | 2 +- components/modal/BasicModal/styles.js | 2 +- components/modal/ConfirmModal/index.js | 2 +- components/modal/ConfirmModal/styles.js | 2 +- components/modal/ForgotPasswordModal/index.js | 3 +-- components/modal/ForgotPasswordModal/styles.js | 2 +- components/modal/RegisterModal/JoinForm/index.js | 4 ++-- components/modal/RegisterModal/JoinForm/styles.js | 2 +- components/modal/RegisterModal/RegisterForm/index.js | 4 ++-- components/modal/RegisterModal/RegisterForm/styles.js | 2 +- components/modal/RegisterModal/index.js | 2 +- components/modal/SSOModal/index.js | 2 +- components/modal/SSOModal/styles.js | 2 +- components/modal/SetPasswordModal/index.js | 4 ++-- components/modal/SetPasswordModal/styles.js | 2 +- components/modal/SignInModal/index.js | 11 +++++++++-- components/modal/SignInModal/styles.js | 2 +- components/page/FilterBar/index.js | 3 +-- components/page/Hero/index.js | 2 +- components/page/Pagination/index.js | 3 +-- components/svg/IconComposer/index.js | 3 --- components/templates/GalleryPage/index.js | 11 ++++++----- components/templates/GlossaryPage/index.js | 8 +++++--- components/templates/HomePage/index.js | 2 +- components/templates/NewsPage/index.js | 8 +++++--- components/templates/SlideshowPage/index.js | 4 ++-- components/templates/StaffPage/index.js | 2 +- components/templates/UserProfilePage/PasswordForm.js | 2 +- .../UserProfilePage/ProfilePreferencesForm.js | 2 +- components/templates/UserProfilePage/index.js | 4 +--- components/templates/UserProfilePage/styles.js | 3 +-- 85 files changed, 127 insertions(+), 166 deletions(-) delete mode 100644 components/atomic/Accordion/index.js delete mode 100644 components/atomic/ExternalLink/index.js delete mode 100644 components/atomic/Figure/index.js delete mode 100644 components/atomic/Link/index.js delete mode 100644 components/atomic/ResponsiveImage/index.js delete mode 100644 components/svg/IconComposer/index.js diff --git a/components/atomic/Accordion/index.js b/components/atomic/Accordion/index.js deleted file mode 100644 index f09ddde7..00000000 --- a/components/atomic/Accordion/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import { Accordion } from "@rubin-epo/epo-react-lib"; - -export default Accordion; diff --git a/components/atomic/ExternalLink/index.js b/components/atomic/ExternalLink/index.js deleted file mode 100644 index 8b0e17a4..00000000 --- a/components/atomic/ExternalLink/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import { ExternalLink } from "@rubin-epo/epo-react-lib"; - -export default ExternalLink; diff --git a/components/atomic/Figure/index.js b/components/atomic/Figure/index.js deleted file mode 100644 index 25d2ef16..00000000 --- a/components/atomic/Figure/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import { Figure } from "@rubin-epo/epo-react-lib"; - -export default Figure; diff --git a/components/atomic/Link/index.js b/components/atomic/Link/index.js deleted file mode 100644 index 00818f35..00000000 --- a/components/atomic/Link/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import { Link } from "@rubin-epo/epo-react-lib"; - -export default Link; diff --git a/components/atomic/ResponsiveImage/index.js b/components/atomic/ResponsiveImage/index.js deleted file mode 100644 index fb7c91d5..00000000 --- a/components/atomic/ResponsiveImage/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import { ResponsiveImage } from "@rubin-epo/epo-react-lib"; - -export default ResponsiveImage; diff --git a/components/atomic/Tile/index.js b/components/atomic/Tile/index.js index 116b7e55..ff08ee2c 100644 --- a/components/atomic/Tile/index.js +++ b/components/atomic/Tile/index.js @@ -1,12 +1,15 @@ import PropTypes from "prop-types"; import { useUID } from "react-uid"; import classNames from "classnames"; -import ResponsiveImage from "@/atomic/ResponsiveImage"; -import { Image, MixedLink } from "@/components/atomic/"; +import { + ResponsiveImage, + Image, + MixedLink, + IconComposer, +} from "@rubin-epo/epo-react-lib"; import { mixedLinkShape } from "@/shapes/link"; import { useGlobalData } from "@/lib/utils"; import * as Styled from "./styles"; -import IconComposer from "@/components/svg/IconComposer"; const Tile = ({ className, diff --git a/components/atomic/Tile/patterns/InvestigationTile/index.js b/components/atomic/Tile/patterns/InvestigationTile/index.js index 4572ace1..dbd5334a 100644 --- a/components/atomic/Tile/patterns/InvestigationTile/index.js +++ b/components/atomic/Tile/patterns/InvestigationTile/index.js @@ -1,6 +1,6 @@ import PropTypes from "prop-types"; import { useUID } from "react-uid"; -import { Image } from "@/components/atomic/"; +import { Image } from "@rubin-epo/epo-react-lib"; import * as Styled from "./styles"; import { useTranslation } from "react-i18next"; import { useDamAssetAsImage } from "@/lib/utils"; diff --git a/components/atomic/Tile/patterns/SlideTile/index.js b/components/atomic/Tile/patterns/SlideTile/index.js index 838841af..34207145 100644 --- a/components/atomic/Tile/patterns/SlideTile/index.js +++ b/components/atomic/Tile/patterns/SlideTile/index.js @@ -1,12 +1,15 @@ import PropTypes from "prop-types"; import { useUID } from "react-uid"; import classNames from "classnames"; -import ResponsiveImage from "@/atomic/ResponsiveImage"; -import { Image, MixedLink } from "@/components/atomic/"; +import { + ResponsiveImage, + Image, + MixedLink, + IconComposer, +} from "@rubin-epo/epo-react-lib"; import { mixedLinkShape } from "@/shapes/link"; import { useGlobalData } from "@/lib/utils"; import * as Styled from "./styles"; -import IconComposer from "@/components/svg/IconComposer"; const SlideTile = ({ className, diff --git a/components/atomic/index.js b/components/atomic/index.js index 0ccfd437..5cae5761 100644 --- a/components/atomic/index.js +++ b/components/atomic/index.js @@ -3,14 +3,3 @@ export { default as Tile } from "./Tile"; export { default as InvestigationTile } from "./Tile/patterns/InvestigationTile"; export { default as SlideTile } from "./Tile/patterns/SlideTile"; export { default as Share } from "./Share"; - -export { - Button, - Buttonish, - ExpandToggle, - Figure, - Image, - MixedLink, - Link, - Video, -} from "@rubin-epo/epo-react-lib"; diff --git a/components/auth/AuthorizePage/index.js b/components/auth/AuthorizePage/index.js index 553996b1..cc0b3358 100644 --- a/components/auth/AuthorizePage/index.js +++ b/components/auth/AuthorizePage/index.js @@ -3,8 +3,7 @@ import { Trans, useTranslation } from "react-i18next"; import { useRouter } from "next/router"; import { useAuthModal } from "@/hooks"; import { useAuthenticationContext } from "@/contexts/Authentication"; -import { Container } from "@rubin-epo/epo-react-lib"; -import { Button, Buttonish } from "@/components/atomic"; +import { Button, Buttonish, Container } from "@rubin-epo/epo-react-lib"; import * as Styled from "./styles"; const AUTHORIZED_TYPES = { diff --git a/components/auth/AuthorizePage/styles.js b/components/auth/AuthorizePage/styles.js index f25c5371..f405958b 100644 --- a/components/auth/AuthorizePage/styles.js +++ b/components/auth/AuthorizePage/styles.js @@ -1,6 +1,6 @@ import styled from "styled-components"; import { fluidScale } from "@/styles/globalStyles"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const AuthButtons = styled(BaseFormButtons)` margin-block: ${fluidScale("30px", "20px")}; diff --git a/components/content-blocks/AccordionGroup/index.js b/components/content-blocks/AccordionGroup/index.js index e4f13d73..a87daa5a 100644 --- a/components/content-blocks/AccordionGroup/index.js +++ b/components/content-blocks/AccordionGroup/index.js @@ -1,7 +1,6 @@ import PropTypes from "prop-types"; import styled from "styled-components"; -import { Container } from "@rubin-epo/epo-react-lib"; -import Accordion from "@/atomic/Accordion"; +import { Accordion, Container } from "@rubin-epo/epo-react-lib"; export default function AccordionGroup({ header, accordions }) { return ( diff --git a/components/content-blocks/Callout/CalloutQuote.js b/components/content-blocks/Callout/CalloutQuote.js index f1c96d2d..5ef40f5e 100644 --- a/components/content-blocks/Callout/CalloutQuote.js +++ b/components/content-blocks/Callout/CalloutQuote.js @@ -1,13 +1,12 @@ import PropTypes from "prop-types"; import imageShape from "@/shapes/image"; import { linksShape } from "@/shapes/link"; -import { Container } from "@rubin-epo/epo-react-lib"; +import { Container, Buttonish } from "@rubin-epo/epo-react-lib"; import * as Styled from "./CalloutQuote/styles"; import StudentsSvg from "./CalloutQuote/StudentsSvg"; import StudentsMobileSvg from "./CalloutQuote/StudentsMobileSvg"; import EducatorsSvg from "./CalloutQuote/EducatorsSvg"; import EducatorsMobileSvg from "./CalloutQuote/EducatorsMobileSvg"; -import { Buttonish } from "@/components/atomic"; export default function CalloutQuote({ callout }) { const { header, text, links, quote, attribution, imageQuote, colorScheme } = diff --git a/components/content-blocks/Callout/CalloutTwoTone.js b/components/content-blocks/Callout/CalloutTwoTone.js index 8b67d4f5..df01bbde 100644 --- a/components/content-blocks/Callout/CalloutTwoTone.js +++ b/components/content-blocks/Callout/CalloutTwoTone.js @@ -12,7 +12,7 @@ import { StyledBackgroundImage, StyledTwoToneImage, } from "./styles"; -import ResponsiveImage from "@/components/atomic/ResponsiveImage"; +import { ResponsiveImage } from "@rubin-epo/epo-react-lib"; import { useDamAssetAsImage } from "@/lib/utils"; export default function CalloutTwoTone({ callout }) { diff --git a/components/content-blocks/Callout/styles.js b/components/content-blocks/Callout/styles.js index 1855c202..a026119e 100644 --- a/components/content-blocks/Callout/styles.js +++ b/components/content-blocks/Callout/styles.js @@ -1,4 +1,4 @@ -import { Image, MixedLink } from "@/components/atomic/"; +import { Image, MixedLink } from "@rubin-epo/epo-react-lib"; import styled from "styled-components"; import { fluidScale, diff --git a/components/content-blocks/Contact/index.js b/components/content-blocks/Contact/index.js index 4f710ae4..621ac8c3 100644 --- a/components/content-blocks/Contact/index.js +++ b/components/content-blocks/Contact/index.js @@ -1,9 +1,8 @@ import PropTypes from "prop-types"; import styled from "styled-components"; import ContactInfo from "@/global/ContactInfo"; -import { Container } from "@rubin-epo/epo-react-lib"; import internalLinkShape from "@/shapes/link"; -import { Buttonish } from "@/components/atomic"; +import { Buttonish, Container } from "@rubin-epo/epo-react-lib"; export default function ContactContentBlock({ header, pageEntry, linkText }) { const showLink = pageEntry && pageEntry.length > 0; return ( diff --git a/components/content-blocks/DownloadList/index.js b/components/content-blocks/DownloadList/index.js index a7630e00..a9701b4f 100644 --- a/components/content-blocks/DownloadList/index.js +++ b/components/content-blocks/DownloadList/index.js @@ -1,8 +1,7 @@ import PropTypes from "prop-types"; import { fileSize } from "@/helpers"; import * as Styled from "./styles"; -import { Container } from "@rubin-epo/epo-react-lib"; -import { Buttonish } from "@/components/atomic"; +import { Buttonish, Container } from "@rubin-epo/epo-react-lib"; export default function DownloadList({ assetsList, ...props }) { function getIcon(kind) { diff --git a/components/content-blocks/GridBlock/index.js b/components/content-blocks/GridBlock/index.js index 72d0e26e..65642c1d 100644 --- a/components/content-blocks/GridBlock/index.js +++ b/components/content-blocks/GridBlock/index.js @@ -1,7 +1,6 @@ import PropTypes from "prop-types"; import styled from "styled-components"; -import { Container } from "@rubin-epo/epo-react-lib"; -import { MixedLink } from "@/components/atomic/"; +import { Container, MixedLink } from "@rubin-epo/epo-react-lib"; import { mixedLinkShape } from "@/shapes/link"; import CTAGrid from "./CTAGrid"; import MainGrid from "./MainGrid"; diff --git a/components/content-blocks/Image/index.js b/components/content-blocks/Image/index.js index 4320ae55..00073c66 100644 --- a/components/content-blocks/Image/index.js +++ b/components/content-blocks/Image/index.js @@ -1,8 +1,6 @@ import PropTypes from "prop-types"; -import { Image } from "@/components/atomic/"; import imageShape from "@/shapes/image"; -import { Container } from "@rubin-epo/epo-react-lib"; -import { Figure } from "@/components/atomic"; +import { Container, Figure, Image } from "@rubin-epo/epo-react-lib"; import * as Styled from "./styles"; export default function ImageContentBlock({ image, caption, floatDirection }) { diff --git a/components/content-blocks/Link/index.js b/components/content-blocks/Link/index.js index efff506c..323e1e84 100644 --- a/components/content-blocks/Link/index.js +++ b/components/content-blocks/Link/index.js @@ -1,6 +1,5 @@ import PropTypes from "prop-types"; -import { MixedLink } from "@/components/atomic/"; -import { Container } from "@rubin-epo/epo-react-lib"; +import { Container, MixedLink } from "@rubin-epo/epo-react-lib"; import { mixedLinkShape } from "@/shapes/link"; export default function LinkContentBlock({ mixedLink, url, text }) { diff --git a/components/content-blocks/SlideBlock/index.js b/components/content-blocks/SlideBlock/index.js index 1d1e57f1..c386bcce 100644 --- a/components/content-blocks/SlideBlock/index.js +++ b/components/content-blocks/SlideBlock/index.js @@ -5,6 +5,7 @@ import { useTranslation } from "react-i18next"; import { CarouselLayout as Carousel, Container, + MixedLink, } from "@rubin-epo/epo-react-lib"; import { SlideTile } from "@/components/atomic"; import { @@ -12,7 +13,6 @@ import { normalizeItemData, useListForBlock, } from "@/lib/utils"; -import { MixedLink } from "@/components/atomic/"; import { mixedLinkShape } from "@/components/shapes/link"; const SlideBlock = ({ diff --git a/components/content-blocks/Video/index.js b/components/content-blocks/Video/index.js index fca6e4a4..9276f48e 100644 --- a/components/content-blocks/Video/index.js +++ b/components/content-blocks/Video/index.js @@ -1,6 +1,5 @@ import PropTypes from "prop-types"; -import { Container } from "@rubin-epo/epo-react-lib"; -import { Video, Figure } from "@/components/atomic"; +import { Container, Video, Figure } from "@rubin-epo/epo-react-lib"; import { useIsMounted } from "@/hooks"; export default function VideoBlock({ caption, url }) { diff --git a/components/dynamic/EventList/index.js b/components/dynamic/EventList/index.js index b878a632..b5b20483 100644 --- a/components/dynamic/EventList/index.js +++ b/components/dynamic/EventList/index.js @@ -1,6 +1,11 @@ import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; -import { Container, Grid } from "@rubin-epo/epo-react-lib"; +import { + Container, + Grid, + Buttonish, + IconComposer, +} from "@rubin-epo/epo-react-lib"; import DataList from "@/dynamic/DataList"; import Tile from "@/atomic/Tile"; import Pagination from "@/page/Pagination"; @@ -10,8 +15,6 @@ import { makeDateObject, useGlobalData, } from "@/lib/utils"; -import IconComposer from "@/svg/IconComposer"; -import { Buttonish } from "@/components/atomic"; import * as Styled from "./styles"; const EventList = ({ diff --git a/components/dynamic/GlossaryList/index.js b/components/dynamic/GlossaryList/index.js index 04016020..8710cbd0 100644 --- a/components/dynamic/GlossaryList/index.js +++ b/components/dynamic/GlossaryList/index.js @@ -1,9 +1,8 @@ import { useState } from "react"; import groupBy from "lodash/groupBy"; import sortBy from "lodash/sortBy"; -import { MixedLink } from "@/components/atomic/"; import DataList from "@/dynamic/DataList"; -import { Columns, Container } from "@rubin-epo/epo-react-lib"; +import { Columns, Container, MixedLink } from "@rubin-epo/epo-react-lib"; import * as Styled from "./styles"; // eslint-disable-next-line react/prop-types diff --git a/components/dynamic/JobList/index.js b/components/dynamic/JobList/index.js index eb5d1fb4..10857a29 100644 --- a/components/dynamic/JobList/index.js +++ b/components/dynamic/JobList/index.js @@ -1,14 +1,17 @@ import PropTypes from "prop-types"; import styled from "styled-components"; import { useTranslation } from "react-i18next"; -import { Container, Grid } from "@rubin-epo/epo-react-lib"; +import { + Container, + Grid, + Buttonish, + IconComposer, +} from "@rubin-epo/epo-react-lib"; import DataList from "@/dynamic/DataList"; import Tile from "@/atomic/Tile"; import Pagination from "@/page/Pagination"; -import IconComposer from "@/svg/IconComposer"; import { checkIfBetweenDates, createLocationString } from "@/lib/utils"; import { fluidScale } from "@/styles/globalStyles"; -import { Buttonish } from "@/components/atomic"; const JobList = ({ button, diff --git a/components/dynamic/NewsList/index.js b/components/dynamic/NewsList/index.js index cecdac2e..135c0aa2 100644 --- a/components/dynamic/NewsList/index.js +++ b/components/dynamic/NewsList/index.js @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import styled from "styled-components"; import { useTranslation } from "react-i18next"; -import { Container, Grid } from "@rubin-epo/epo-react-lib"; +import { Container, Grid, Buttonish } from "@rubin-epo/epo-react-lib"; import DataList from "@/dynamic/DataList"; import Tile from "@/atomic/Tile"; import Pagination from "@/page/Pagination"; @@ -11,7 +11,6 @@ import { useGlobalData, } from "@/lib/utils"; import { fluidScale } from "@/styles/globalStyles"; -import { Buttonish } from "@/components/atomic"; const NewsList = ({ button, diff --git a/components/dynamic/RelatedList/index.js b/components/dynamic/RelatedList/index.js index 6079fc03..a22d6b4e 100644 --- a/components/dynamic/RelatedList/index.js +++ b/components/dynamic/RelatedList/index.js @@ -2,12 +2,11 @@ import PropTypes from "prop-types"; import styled from "styled-components"; import { useTranslation } from "react-i18next"; import striptags from "striptags"; -import { Container, Grid } from "@rubin-epo/epo-react-lib"; +import { Container, Grid, Buttonish } from "@rubin-epo/epo-react-lib"; import DataList from "@/dynamic/DataList"; import Tile from "@/atomic/Tile"; import Pagination from "@/page/Pagination"; import { fluidScale } from "@/styles/globalStyles"; -import { Buttonish } from "@/components/atomic"; const RelatedList = ({ button, diff --git a/components/dynamic/SearchList/index.js b/components/dynamic/SearchList/index.js index 5626bf20..306b4122 100644 --- a/components/dynamic/SearchList/index.js +++ b/components/dynamic/SearchList/index.js @@ -11,8 +11,7 @@ import { } from "@/lib/utils"; import { fluidScale } from "@/styles/globalStyles"; import Breadcrumbs from "@/components/page/Breadcrumbs"; -import { Buttonish } from "@/components/atomic"; -import { Container, Grid } from "@rubin-epo/epo-react-lib"; +import { Container, Grid, Buttonish } from "@rubin-epo/epo-react-lib"; import DataList from "@/dynamic/DataList"; import Tile from "@/atomic/Tile"; import Pagination from "@/page/Pagination"; diff --git a/components/dynamic/SlideshowList/index.js b/components/dynamic/SlideshowList/index.js index 12cc88ac..3ace08d6 100644 --- a/components/dynamic/SlideshowList/index.js +++ b/components/dynamic/SlideshowList/index.js @@ -2,12 +2,11 @@ import PropTypes from "prop-types"; import styled from "styled-components"; import striptags from "striptags"; import { useTranslation } from "react-i18next"; -import { Container, Grid } from "@rubin-epo/epo-react-lib"; +import { Container, Grid, Buttonish } from "@rubin-epo/epo-react-lib"; import DataList from "@/dynamic/DataList"; import Tile from "@/atomic/Tile"; import Pagination from "@/page/Pagination"; import { fluidScale } from "@/styles/globalStyles"; -import { Buttonish } from "@/components/atomic"; const SlideshowList = ({ button, diff --git a/components/dynamic/StaffList/index.js b/components/dynamic/StaffList/index.js index 25d64dd8..e2deb310 100644 --- a/components/dynamic/StaffList/index.js +++ b/components/dynamic/StaffList/index.js @@ -1,11 +1,10 @@ import PropTypes from "prop-types"; import styled from "styled-components"; -import { Container, Grid } from "@rubin-epo/epo-react-lib"; +import { Container, Grid, Buttonish } from "@rubin-epo/epo-react-lib"; import DataList from "@/dynamic/DataList"; import Tile from "@/atomic/Tile"; import Pagination from "@/page/Pagination"; import { fluidScale } from "@/styles/globalStyles"; -import { Buttonish } from "@/components/atomic"; const StaffList = ({ component, diff --git a/components/dynamic/TempList/index.js b/components/dynamic/TempList/index.js index 7d570c81..0e07199b 100644 --- a/components/dynamic/TempList/index.js +++ b/components/dynamic/TempList/index.js @@ -2,13 +2,15 @@ import React from "react"; import styled from "styled-components"; import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; -import { Container } from "@rubin-epo/epo-react-lib"; -import { MixedLink } from "@/components/atomic/"; +import { + Container, + ResponsiveImage, + MixedLink, + IconComposer, +} from "@rubin-epo/epo-react-lib"; import { respond } from "@/styles/globalStyles"; import { allData } from "./data"; import { mixedLinkShape } from "@/components/shapes/link"; -import IconComposer from "@/components/svg/IconComposer"; -import ResponsiveImage from "@/components/atomic/ResponsiveImage"; const Alert = ({ data }) => { const { t } = useTranslation(); diff --git a/components/form/AuthModalPasswordField/index.js b/components/form/AuthModalPasswordField/index.js index 6c49c787..4922f1a7 100644 --- a/components/form/AuthModalPasswordField/index.js +++ b/components/form/AuthModalPasswordField/index.js @@ -1,5 +1,5 @@ import { useTranslation } from "react-i18next"; -import { Password, FormField } from "@/components/form"; +import { Password, FormField } from "@rubin-epo/epo-react-lib"; import { forwardRef } from "react"; const PATTERN = [ diff --git a/components/form/index.js b/components/form/index.js index 3c0e6af5..00d689a6 100644 --- a/components/form/index.js +++ b/components/form/index.js @@ -1,11 +1 @@ export { default as PasswordField } from "./AuthModalPasswordField"; - -export { - Error, - FormButtons, - FormField, - Input, - Password, - Select, - Switch, -} from "@rubin-epo/epo-react-lib"; diff --git a/components/global/ContactInfo/index.js b/components/global/ContactInfo/index.js index 74175a72..d5e04460 100644 --- a/components/global/ContactInfo/index.js +++ b/components/global/ContactInfo/index.js @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import classNames from "classnames"; import GlobalDataContext from "@/contexts/GlobalData"; -import IconComposer from "@/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; export default function ContactInfo({ className }) { return ( diff --git a/components/global/Footer/ContactForm.js b/components/global/Footer/ContactForm.js index a02945da..9d598e93 100644 --- a/components/global/Footer/ContactForm.js +++ b/components/global/Footer/ContactForm.js @@ -2,7 +2,7 @@ import { useState, useRef } from "react"; import PropTypes from "prop-types"; import classNames from "classnames"; import { useTranslation } from "react-i18next"; -import IconComposer from "@/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; const EMAIL_ID = "footerContactEmail"; const TOPIC_ID = "footerContactTopic"; diff --git a/components/global/Footer/Nav.js b/components/global/Footer/Nav.js index 2f16ef62..04348cb7 100644 --- a/components/global/Footer/Nav.js +++ b/components/global/Footer/Nav.js @@ -1,4 +1,4 @@ -import { MixedLink } from "@/components/atomic/"; +import { MixedLink } from "@rubin-epo/epo-react-lib"; import { linksShape } from "@/shapes/link"; export default function Nav({ links }) { diff --git a/components/global/Footer/Social.js b/components/global/Footer/Social.js index bdca7c69..c70725e0 100644 --- a/components/global/Footer/Social.js +++ b/components/global/Footer/Social.js @@ -1,7 +1,6 @@ import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; -import IconComposer from "@/svg/IconComposer"; -import ExternalLink from "@/atomic/ExternalLink"; +import { ExternalLink, IconComposer } from "@rubin-epo/epo-react-lib"; import { capitalize } from "@/helpers"; import { socialInfoShape } from "@/shapes/siteInfo"; diff --git a/components/global/Footer/index.js b/components/global/Footer/index.js index 9e8bf678..0b02a742 100644 --- a/components/global/Footer/index.js +++ b/components/global/Footer/index.js @@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next"; import Social from "./Social"; import Nav from "./Nav"; import ContactForm from "./ContactForm"; -import { Image } from "@/components/atomic/"; +import { Image } from "@rubin-epo/epo-react-lib"; import { socialInfoShape } from "@/shapes/siteInfo"; import footerContentShape from "@/shapes/footerContent"; diff --git a/components/global/Header/Hamburger.js b/components/global/Header/Hamburger.js index 36e07ccc..cbba97de 100644 --- a/components/global/Header/Hamburger.js +++ b/components/global/Header/Hamburger.js @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import classNames from "classnames"; import { useTranslation } from "react-i18next"; -import IconComposer from "@/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; export default function Hamburger({ mobileNavActive, onClick }) { const { t } = useTranslation(); diff --git a/components/global/Header/LanguageSelect/styles.js b/components/global/Header/LanguageSelect/styles.js index 3e35ee20..9c7050c6 100644 --- a/components/global/Header/LanguageSelect/styles.js +++ b/components/global/Header/LanguageSelect/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { Switch as FormSwitch } from "@/components/form"; +import { Switch as FormSwitch } from "@rubin-epo/epo-react-lib"; import { respond, BREAK_HEADER_LAYOUT } from "@/styles/globalStyles"; export const Fieldset = styled.fieldset` diff --git a/components/global/Header/NavItem.js b/components/global/Header/NavItem.js index a4632a26..f5f1cfa6 100644 --- a/components/global/Header/NavItem.js +++ b/components/global/Header/NavItem.js @@ -1,7 +1,7 @@ import PropTypes from "prop-types"; import Link from "next/link"; import classNames from "classnames"; -import IconComposer from "@/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; function NavItem({ href, onClick, title, theme, className, icon }) { // eslint-disable-next-line react/prop-types diff --git a/components/global/Header/NavItemWithChildren.js b/components/global/Header/NavItemWithChildren.js index 1ca49cb0..e0a0d6cd 100644 --- a/components/global/Header/NavItemWithChildren.js +++ b/components/global/Header/NavItemWithChildren.js @@ -2,7 +2,7 @@ import { useRef } from "react"; import PropTypes from "prop-types"; import classNames from "classnames"; import Subnavigation from "./Subnavigation"; -import IconComposer from "@/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; import { useKeyDownEvent, useFocusTrap } from "@/hooks"; import internalLinkShape, { internalLinkInternalShape } from "@/shapes/link"; diff --git a/components/global/Header/SearchBar.js b/components/global/Header/SearchBar.js index 4eb21925..41f48475 100644 --- a/components/global/Header/SearchBar.js +++ b/components/global/Header/SearchBar.js @@ -3,7 +3,7 @@ import { useRouter } from "next/router"; import classNames from "classnames"; import { useTranslation } from "react-i18next"; import { useOnClickOutside, useKeyDownEvent } from "@/hooks/listeners"; -import IconComposer from "@/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; import { getSiteString } from "@/lib/utils"; const INPUT_ID = "headerSearchBar"; diff --git a/components/global/Header/UserNav/index.js b/components/global/Header/UserNav/index.js index 6ff71b3e..33451e10 100644 --- a/components/global/Header/UserNav/index.js +++ b/components/global/Header/UserNav/index.js @@ -2,7 +2,7 @@ import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; import { Popover, Portal } from "@headlessui/react"; import { useAuthModal, useBoundingBox } from "@/hooks"; -import IconComposer from "@/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; import { useAuthenticationContext } from "@/contexts/Authentication"; import * as Styled from "./styles"; diff --git a/components/layout/InvestigationHero/index.js b/components/layout/InvestigationHero/index.js index 0986ef76..36b0e4d2 100644 --- a/components/layout/InvestigationHero/index.js +++ b/components/layout/InvestigationHero/index.js @@ -1,7 +1,6 @@ import PropTypes from "prop-types"; import * as Styled from "./styles"; -import { Button, Image } from "@/components/atomic"; -import IconComposer from "@/components/svg/IconComposer"; +import { Button, Image, IconComposer } from "@rubin-epo/epo-react-lib"; import T from "@/page/Translate"; import { useDamAssetAsImage } from "@/lib/utils"; diff --git a/components/layout/SharePopup/index.js b/components/layout/SharePopup/index.js index 508d862b..95581b5f 100644 --- a/components/layout/SharePopup/index.js +++ b/components/layout/SharePopup/index.js @@ -4,7 +4,7 @@ import { Popover } from "@headlessui/react"; import { usePopper } from "react-popper"; import { useTranslation } from "react-i18next"; import ShareButtons from "@/atomic/Share"; -import IconComposer from "@/components/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; import * as Styled from "./styles"; import { isAbsoluteUrl } from "@/helpers"; diff --git a/components/layout/SiblingNavigation/index.js b/components/layout/SiblingNavigation/index.js index 6ed5cd3a..b5813fb4 100644 --- a/components/layout/SiblingNavigation/index.js +++ b/components/layout/SiblingNavigation/index.js @@ -1,7 +1,6 @@ import PropTypes from "prop-types"; -import { Button } from "@/components/atomic"; import T from "@/page/Translate"; -import { Container, Grid } from "@rubin-epo/epo-react-lib"; +import { Container, Grid, Button } from "@rubin-epo/epo-react-lib"; export default function SiblingNavigation({ siblings, parent }) { if (!siblings) return null; diff --git a/components/layout/StepNavigation/index.js b/components/layout/StepNavigation/index.js index 2857f95d..d642dcc6 100644 --- a/components/layout/StepNavigation/index.js +++ b/components/layout/StepNavigation/index.js @@ -1,12 +1,11 @@ import { useState, useEffect } from "react"; import PropTypes from "prop-types"; import classNames from "classnames"; -import { ExpandToggle } from "@/components/atomic/"; +import { ExpandToggle, Container } from "@rubin-epo/epo-react-lib"; import useToggle from "@/hooks/useToggle"; import { tokens } from "@/styles/globalStyles"; import { stripUnit } from "@castiron/style-mixins/dist/base"; import useResizeObserver from "use-resize-observer"; -import { Container } from "@rubin-epo/epo-react-lib"; import * as Styled from "./styles"; const BREAKPOINT = stripUnit(tokens.BREAK_PHABLET); diff --git a/components/layout/StepNavigation/styles.js b/components/layout/StepNavigation/styles.js index 1e5b138b..da00f23b 100644 --- a/components/layout/StepNavigation/styles.js +++ b/components/layout/StepNavigation/styles.js @@ -1,6 +1,6 @@ import { fluidScale, pxToEm, respond, tokens } from "@/styles/globalStyles"; import styled from "styled-components"; -import { MixedLink } from "@/components/atomic/"; +import { MixedLink } from "@rubin-epo/epo-react-lib"; export const Wrapper = styled.div` display: flex; diff --git a/components/layout/Tabs/index.js b/components/layout/Tabs/index.js index 46aa6cbe..69c67f53 100644 --- a/components/layout/Tabs/index.js +++ b/components/layout/Tabs/index.js @@ -2,7 +2,7 @@ import React, { useState, useRef, Children, cloneElement } from "react"; import PropTypes from "prop-types"; import styled from "styled-components"; import { respond } from "@/styles/globalStyles"; -import IconComposer from "@/components/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; const Tabs = ({ children, labels, defaultTab = 0 }) => { const [active, setActive] = useState(defaultTab); diff --git a/components/modal/ActivateModal/index.js b/components/modal/ActivateModal/index.js index 8cbe3cab..0f8b894c 100644 --- a/components/modal/ActivateModal/index.js +++ b/components/modal/ActivateModal/index.js @@ -3,7 +3,7 @@ import { useTranslation } from "react-i18next"; import { useRouter } from "next/router"; import { useAuthenticationContext } from "@/contexts/Authentication"; import useAuthModal from "@/hooks/useAuthModal"; -import { Button } from "@/components/atomic"; +import { Button } from "@rubin-epo/epo-react-lib"; import AuthModal from "../AuthModal"; import * as Styled from "./styles"; diff --git a/components/modal/ActivateModal/styles.js b/components/modal/ActivateModal/styles.js index b5ed92f5..7753be80 100644 --- a/components/modal/ActivateModal/styles.js +++ b/components/modal/ActivateModal/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const FormButtons = styled(BaseFormButtons)` margin-block-start: 30px; diff --git a/components/modal/AuthModal/index.js b/components/modal/AuthModal/index.js index 97260305..8fd6bf03 100644 --- a/components/modal/AuthModal/index.js +++ b/components/modal/AuthModal/index.js @@ -1,6 +1,6 @@ import PropTypes from "prop-types"; import Image from "next/legacy/image"; -import IconComposer from "@/components/svg/IconComposer"; +import { IconComposer } from "@rubin-epo/epo-react-lib"; import * as Styled from "./styles"; export default function AuthModal({ diff --git a/components/modal/AuthModal/styles.js b/components/modal/AuthModal/styles.js index 61dec02c..c685c157 100644 --- a/components/modal/AuthModal/styles.js +++ b/components/modal/AuthModal/styles.js @@ -6,7 +6,7 @@ import { zStack, } from "@/styles/globalStyles"; import { Dialog as BaseDialog } from "@headlessui/react"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const Overlay = styled(BaseDialog.Overlay)` background-color: rgba(0, 0, 0, 0.7); diff --git a/components/modal/BasicModal/index.js b/components/modal/BasicModal/index.js index 926c799c..c2f530b2 100644 --- a/components/modal/BasicModal/index.js +++ b/components/modal/BasicModal/index.js @@ -1,6 +1,6 @@ import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; -import { Button } from "@/components/atomic"; +import { Button } from "@rubin-epo/epo-react-lib"; import AuthModal from "../AuthModal"; import * as Styled from "./styles"; diff --git a/components/modal/BasicModal/styles.js b/components/modal/BasicModal/styles.js index b5ed92f5..7753be80 100644 --- a/components/modal/BasicModal/styles.js +++ b/components/modal/BasicModal/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const FormButtons = styled(BaseFormButtons)` margin-block-start: 30px; diff --git a/components/modal/ConfirmModal/index.js b/components/modal/ConfirmModal/index.js index ee25fb04..1cb93829 100644 --- a/components/modal/ConfirmModal/index.js +++ b/components/modal/ConfirmModal/index.js @@ -1,6 +1,6 @@ import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; -import { Button } from "@/components/atomic"; +import { Button } from "@rubin-epo/epo-react-lib"; import AuthModal from "../AuthModal"; import * as Styled from "./styles"; diff --git a/components/modal/ConfirmModal/styles.js b/components/modal/ConfirmModal/styles.js index b5ed92f5..7753be80 100644 --- a/components/modal/ConfirmModal/styles.js +++ b/components/modal/ConfirmModal/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const FormButtons = styled(BaseFormButtons)` margin-block-start: 30px; diff --git a/components/modal/ForgotPasswordModal/index.js b/components/modal/ForgotPasswordModal/index.js index e2ae67b3..de59692c 100644 --- a/components/modal/ForgotPasswordModal/index.js +++ b/components/modal/ForgotPasswordModal/index.js @@ -4,8 +4,7 @@ import { useRouter } from "next/router"; import { useForm } from "react-hook-form"; import { useAuthenticationContext } from "@/contexts/Authentication"; import useAuthModal from "@/hooks/useAuthModal"; -import { Button } from "@/components/atomic"; -import { Input, FormField } from "@/components/form"; +import { Button, FormField, Input } from "@rubin-epo/epo-react-lib"; import AuthModal from "../AuthModal"; import * as Styled from "./styles"; diff --git a/components/modal/ForgotPasswordModal/styles.js b/components/modal/ForgotPasswordModal/styles.js index 261178bc..3dc1642f 100644 --- a/components/modal/ForgotPasswordModal/styles.js +++ b/components/modal/ForgotPasswordModal/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const Form = styled.form` margin-block-start: 30px; diff --git a/components/modal/RegisterModal/JoinForm/index.js b/components/modal/RegisterModal/JoinForm/index.js index 1518e6db..b28c012a 100644 --- a/components/modal/RegisterModal/JoinForm/index.js +++ b/components/modal/RegisterModal/JoinForm/index.js @@ -1,8 +1,8 @@ import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; import Link from "next/link"; -// import { Button, Link as BaseLink, SSOButton } from "@/components/atomic"; -import { Link as BaseLink, SSOButton } from "@/components/atomic"; +import { Link as BaseLink } from "@rubin-epo/epo-react-lib"; +import { SSOButton } from "@/components/atomic"; import useAuthModal from "@/hooks/useAuthModal"; import { useAuthenticationContext } from "@/contexts/Authentication"; import AuthModal from "../../AuthModal"; diff --git a/components/modal/RegisterModal/JoinForm/styles.js b/components/modal/RegisterModal/JoinForm/styles.js index ccc88c6b..28525004 100644 --- a/components/modal/RegisterModal/JoinForm/styles.js +++ b/components/modal/RegisterModal/JoinForm/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; import { fluidScale } from "@/styles/globalStyles"; export const JoinAsButtons = styled(BaseFormButtons)` diff --git a/components/modal/RegisterModal/RegisterForm/index.js b/components/modal/RegisterModal/RegisterForm/index.js index b73ae5c7..8a51f772 100644 --- a/components/modal/RegisterModal/RegisterForm/index.js +++ b/components/modal/RegisterModal/RegisterForm/index.js @@ -2,8 +2,8 @@ import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; import { useForm } from "react-hook-form"; import { useAuthenticationContext } from "@/contexts/Authentication"; -import { Button } from "@/components/atomic"; -import { Error, FormField, Input, PasswordField } from "@/components/form"; +import { Button, Error, FormField, Input } from "@rubin-epo/epo-react-lib"; +import { PasswordField } from "@/components/form/index.js"; import * as Styled from "./styles"; import AuthModal from "../../AuthModal"; diff --git a/components/modal/RegisterModal/RegisterForm/styles.js b/components/modal/RegisterModal/RegisterForm/styles.js index 410470b6..c7238535 100644 --- a/components/modal/RegisterModal/RegisterForm/styles.js +++ b/components/modal/RegisterModal/RegisterForm/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const Form = styled.form` margin-block-start: 30px; diff --git a/components/modal/RegisterModal/index.js b/components/modal/RegisterModal/index.js index c64349c6..88100231 100644 --- a/components/modal/RegisterModal/index.js +++ b/components/modal/RegisterModal/index.js @@ -3,7 +3,7 @@ import { useTranslation, Trans } from "react-i18next"; import { useAuthenticationContext } from "@/contexts/Authentication"; import RegisterForm from "./RegisterForm"; import useAuthModal from "@/hooks/useAuthModal"; -import { Button } from "@/components/atomic"; +import { Button } from "@rubin-epo/epo-react-lib"; import AuthModal from "../AuthModal"; import JoinForm from "./JoinForm"; import * as Styled from "./RegisterForm/styles"; diff --git a/components/modal/SSOModal/index.js b/components/modal/SSOModal/index.js index 2e7544d3..ada73dae 100644 --- a/components/modal/SSOModal/index.js +++ b/components/modal/SSOModal/index.js @@ -2,7 +2,7 @@ import { useRouter } from "next/router"; import { useTranslation, Trans } from "react-i18next"; import { useAuthenticationContext } from "@/contexts/Authentication"; import useAuthModal from "@/hooks/useAuthModal"; -import { Button } from "@/components/atomic"; +import { Button } from "@rubin-epo/epo-react-lib"; import AuthModal from "../AuthModal"; import * as Styled from "./styles"; diff --git a/components/modal/SSOModal/styles.js b/components/modal/SSOModal/styles.js index 3ac79e24..16486d9d 100644 --- a/components/modal/SSOModal/styles.js +++ b/components/modal/SSOModal/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const FormButtons = styled(BaseFormButtons)` margin-block-start: 44px; diff --git a/components/modal/SetPasswordModal/index.js b/components/modal/SetPasswordModal/index.js index d1163864..0cc61389 100644 --- a/components/modal/SetPasswordModal/index.js +++ b/components/modal/SetPasswordModal/index.js @@ -4,8 +4,8 @@ import { useRouter } from "next/router"; import { useForm } from "react-hook-form"; import { useAuthenticationContext } from "@/contexts/Authentication"; import useAuthModal from "@/hooks/useAuthModal"; -import { Button } from "@/components/atomic"; -import { PasswordField, Error } from "@/components/form"; +import { Button, Error } from "@rubin-epo/epo-react-lib"; +import { PasswordField } from "@/components/form/index.js"; import AuthModal from "../AuthModal"; import * as Styled from "./styles"; diff --git a/components/modal/SetPasswordModal/styles.js b/components/modal/SetPasswordModal/styles.js index 261178bc..3dc1642f 100644 --- a/components/modal/SetPasswordModal/styles.js +++ b/components/modal/SetPasswordModal/styles.js @@ -1,5 +1,5 @@ import styled from "styled-components"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const Form = styled.form` margin-block-start: 30px; diff --git a/components/modal/SignInModal/index.js b/components/modal/SignInModal/index.js index d4af849e..8230eb26 100644 --- a/components/modal/SignInModal/index.js +++ b/components/modal/SignInModal/index.js @@ -5,8 +5,15 @@ import Link from "next/link"; import { useForm } from "react-hook-form"; import { useAuthenticationContext } from "@/contexts/Authentication"; import useAuthModal from "@/hooks/useAuthModal"; -import { Link as BaseLink, Button, SSOButton } from "@/components/atomic"; -import { Input, FormField, Error, Password } from "@/components/form"; +import { SSOButton } from "@/components/atomic"; +import { + Link as BaseLink, + Button, + Input, + FormField, + Error, + Password, +} from "@rubin-epo/epo-react-lib"; import AuthModal from "../AuthModal"; import * as Styled from "./styles"; diff --git a/components/modal/SignInModal/styles.js b/components/modal/SignInModal/styles.js index ec05ba66..5d6a36ee 100644 --- a/components/modal/SignInModal/styles.js +++ b/components/modal/SignInModal/styles.js @@ -1,6 +1,6 @@ import styled from "styled-components"; import { fluidScale } from "@/styles/globalStyles"; -import { FormButtons as BaseFormButtons } from "@/components/form"; +import { FormButtons as BaseFormButtons } from "@rubin-epo/epo-react-lib"; export const SignInAsButtons = styled(BaseFormButtons)` margin-block: ${fluidScale("30px", "20px")}; diff --git a/components/page/FilterBar/index.js b/components/page/FilterBar/index.js index 35b28f75..064a75c0 100644 --- a/components/page/FilterBar/index.js +++ b/components/page/FilterBar/index.js @@ -9,7 +9,7 @@ import { respond, } from "@/styles/globalStyles"; import { useTranslation } from "react-i18next"; -import { MixedLink } from "@/components/atomic/"; +import { MixedLink, IconComposer } from "@rubin-epo/epo-react-lib"; import T from "@/page/Translate"; import { useOnClickOutside } from "@/hooks/listeners"; import { @@ -19,7 +19,6 @@ import { useGlobalData, } from "@/lib/utils"; import withLiveRegionChange from "@/hoc/withLiveRegionChange"; -import IconComposer from "@/components/svg/IconComposer"; const FilterBar = ({ filterType, setLiveRegionMessage }) => { const { t } = useTranslation(); diff --git a/components/page/Hero/index.js b/components/page/Hero/index.js index 9e775c3d..ef11b003 100644 --- a/components/page/Hero/index.js +++ b/components/page/Hero/index.js @@ -1,6 +1,6 @@ import PropTypes from "prop-types"; import styled from "styled-components"; -import { Image } from "@/components/atomic/"; +import { Image } from "@rubin-epo/epo-react-lib"; import imageShape from "@/shapes/image"; import { fluidScale, containerFullBleed } from "@/styles/globalStyles"; diff --git a/components/page/Pagination/index.js b/components/page/Pagination/index.js index b751faab..9a443487 100644 --- a/components/page/Pagination/index.js +++ b/components/page/Pagination/index.js @@ -2,8 +2,7 @@ import React from "react"; import styled from "styled-components"; import { useTranslation } from "react-i18next"; import PropTypes from "prop-types"; -import { Container } from "@rubin-epo/epo-react-lib"; -import { MixedLink } from "@/components/atomic/"; +import { Container, MixedLink } from "@rubin-epo/epo-react-lib"; import T from "@/page/Translate"; import { usePathData } from "@/lib/utils"; import { layoutGrid, respond } from "@/styles/globalStyles"; diff --git a/components/svg/IconComposer/index.js b/components/svg/IconComposer/index.js deleted file mode 100644 index dad397d3..00000000 --- a/components/svg/IconComposer/index.js +++ /dev/null @@ -1,3 +0,0 @@ -import { IconComposer } from "@rubin-epo/epo-react-lib"; - -export default IconComposer; diff --git a/components/templates/GalleryPage/index.js b/components/templates/GalleryPage/index.js index 31bb84ce..28178934 100644 --- a/components/templates/GalleryPage/index.js +++ b/components/templates/GalleryPage/index.js @@ -12,11 +12,12 @@ import { } from "@/lib/utils"; import Body from "@/global/Body"; import Breadcrumbs from "@/page/Breadcrumbs"; -import { Container } from "@rubin-epo/epo-react-lib"; -import ResponsiveImage from "@/atomic/ResponsiveImage"; -import { Video } from "@/components/atomic"; -import Accordion from "@/atomic/Accordion"; -import { Buttonish } from "@/components/atomic"; +import { + Container, + ResponsiveImage, + Buttonish, + Accordion, +} from "@rubin-epo/epo-react-lib"; import { containerNarrow, respond } from "@/styles/globalStyles"; export default function GalleryPage({ diff --git a/components/templates/GlossaryPage/index.js b/components/templates/GlossaryPage/index.js index 3f8370fb..a46d3503 100644 --- a/components/templates/GlossaryPage/index.js +++ b/components/templates/GlossaryPage/index.js @@ -2,10 +2,12 @@ import PropTypes from "prop-types"; import Body from "@/global/Body"; import Breadcrumbs from "@/page/Breadcrumbs"; import { useCustomBreadcrumbs, useDamAssetAsImage } from "@/lib/utils"; -import { Container } from "@rubin-epo/epo-react-lib"; +import { + Container, + ResponsiveImage, + Buttonish, +} from "@rubin-epo/epo-react-lib"; import { Share } from "@/content-blocks"; -import { Buttonish } from "@/components/atomic"; -import ResponsiveImage from "@/atomic/ResponsiveImage"; import { useTranslation } from "react-i18next"; export default function GlossaryPage({ data }) { diff --git a/components/templates/HomePage/index.js b/components/templates/HomePage/index.js index 70663778..cb5e3c6d 100644 --- a/components/templates/HomePage/index.js +++ b/components/templates/HomePage/index.js @@ -5,7 +5,7 @@ import Body from "@/global/Body"; import ContentBlockFactory from "@/factories/ContentBlockFactory"; import Hero from "@/page/Hero"; import { respond } from "@/styles/globalStyles"; -import { Buttonish, MixedLink } from "@/components/atomic"; +import { Buttonish, MixedLink } from "@rubin-epo/epo-react-lib"; import { makeDateString, makeTruncatedString } from "@/lib/utils"; import { SlideBlock } from "@/components/content-blocks"; import Tabs from "@/components/layout/Tabs"; diff --git a/components/templates/NewsPage/index.js b/components/templates/NewsPage/index.js index db6e0e7b..ddfe1d33 100644 --- a/components/templates/NewsPage/index.js +++ b/components/templates/NewsPage/index.js @@ -5,13 +5,15 @@ import { useTranslation } from "react-i18next"; import { useCustomBreadcrumbs, useDateString } from "@/lib/utils"; import Body from "@/global/Body"; import ContentBlockFactory from "@/factories/ContentBlockFactory"; -import { Container } from "@rubin-epo/epo-react-lib"; +import { + Container, + ResponsiveImage, + IconComposer, +} from "@rubin-epo/epo-react-lib"; import { Share } from "@/content-blocks"; import Breadcrumbs from "@/page/Breadcrumbs"; import Hero from "@/page/Hero"; import NewsList from "@/dynamic/NewsList"; -import ResponsiveImage from "@/atomic/ResponsiveImage"; -import IconComposer from "@/components/svg/IconComposer"; import { containerWide, containerFullBleed, diff --git a/components/templates/SlideshowPage/index.js b/components/templates/SlideshowPage/index.js index d02612c0..000d341e 100644 --- a/components/templates/SlideshowPage/index.js +++ b/components/templates/SlideshowPage/index.js @@ -9,9 +9,9 @@ import Breadcrumbs from "@/page/Breadcrumbs"; import { CarouselLayout as Carousel, Container, + ResponsiveImage, + Buttonish, } from "@rubin-epo/epo-react-lib"; -import ResponsiveImage from "@/atomic/ResponsiveImage"; -import { Buttonish } from "@/components/atomic"; import { containerFull, respond } from "@/styles/globalStyles"; export default function SlideshowPage({ diff --git a/components/templates/StaffPage/index.js b/components/templates/StaffPage/index.js index 050563d5..d1fcd817 100644 --- a/components/templates/StaffPage/index.js +++ b/components/templates/StaffPage/index.js @@ -7,7 +7,7 @@ import { Share } from "@/content-blocks"; import StaffList from "@/dynamic/StaffList"; import ContentBlockFactory from "@/factories/ContentBlockFactory"; import NestedContext from "@/contexts/Nested"; -import { Image } from "@/components/atomic/"; +import { Image } from "@rubin-epo/epo-react-lib"; import Breadcrumbs from "@/page/Breadcrumbs"; import PageContent from "@/page/PageContent"; import * as Styled from "./styles"; diff --git a/components/templates/UserProfilePage/PasswordForm.js b/components/templates/UserProfilePage/PasswordForm.js index f469db17..2b23945f 100644 --- a/components/templates/UserProfilePage/PasswordForm.js +++ b/components/templates/UserProfilePage/PasswordForm.js @@ -2,7 +2,7 @@ import { useState, useEffect } from "react"; import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; import { useForm } from "react-hook-form"; -import { Password, Error } from "@/components/form"; +import { Password, Error } from "@rubin-epo/epo-react-lib"; import { updatePassword } from "@/lib/api/auth"; import * as Styled from "./styles"; diff --git a/components/templates/UserProfilePage/ProfilePreferencesForm.js b/components/templates/UserProfilePage/ProfilePreferencesForm.js index acd10dc9..a885b008 100644 --- a/components/templates/UserProfilePage/ProfilePreferencesForm.js +++ b/components/templates/UserProfilePage/ProfilePreferencesForm.js @@ -2,7 +2,7 @@ import { useState, useEffect } from "react"; import PropTypes from "prop-types"; import { useTranslation } from "react-i18next"; import { useForm } from "react-hook-form"; -import { Input, Select, Switch, Error } from "@/components/form"; +import { Input, Select, Switch, Error } from "@rubin-epo/epo-react-lib"; import { updateUser } from "@/lib/api/auth"; import * as Styled from "./styles"; diff --git a/components/templates/UserProfilePage/index.js b/components/templates/UserProfilePage/index.js index 19f83dfd..ec511621 100644 --- a/components/templates/UserProfilePage/index.js +++ b/components/templates/UserProfilePage/index.js @@ -3,11 +3,9 @@ import PropTypes from "prop-types"; import { useTranslation, Trans } from "react-i18next"; import Body from "@/global/Body"; import { useIsMounted } from "@/hooks"; -import { Container } from "@rubin-epo/epo-react-lib"; -import IconComposer from "@/components/svg/IconComposer"; import AuthorizePage from "@/components/auth/AuthorizePage"; import { useAuthenticationContext } from "@/contexts/Authentication"; -import { Button } from "@/components/atomic"; +import { Button, Container, IconComposer } from "@rubin-epo/epo-react-lib"; import { BasicModal, ConfirmModal } from "@/components/modal"; import ProfilePreferencesForm from "./ProfilePreferencesForm"; import PasswordForm from "./PasswordForm"; diff --git a/components/templates/UserProfilePage/styles.js b/components/templates/UserProfilePage/styles.js index 794b5127..8a71f3c2 100644 --- a/components/templates/UserProfilePage/styles.js +++ b/components/templates/UserProfilePage/styles.js @@ -1,6 +1,5 @@ import styled from "styled-components"; -import { Button as AtomicButton } from "@/components/atomic"; -import { FormField } from "@/components/form"; +import { Button as AtomicButton, FormField } from "@rubin-epo/epo-react-lib"; import { fluidScale, respond } from "@/styles/globalStyles"; const BREAKPOINT = "600px";