[C] consolidate library imports

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,

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";

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,

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";

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 = {

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")};

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 (

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 } =

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 }) {

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,

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 (

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) {

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";

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 }) {

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 }) {

components/content-blocks/SlideBlock/index.js

@@ -5,14 +5,14 @@ import { useTranslation } from "react-i18next";
 import {
   CarouselLayout as Carousel,
   Container,
+  MixedLink,
 } from "@rubin-epo/epo-react-lib";
 import { SlideTile } from "@/components/atomic";
 import {
   makeTruncatedString,
   normalizeItemData,
   useListForBlock,
 } from "@/lib/utils";
-import { MixedLink } from "@/components/atomic/";
 import { mixedLinkShape } from "@/components/shapes/link";
 
 const SlideBlock = ({

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 }) {

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 = ({

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

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,

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,

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,

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";

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,

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,

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();

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 = [

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";

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 (

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";

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 }) {