Skip to content

Commit

Permalink
Update Clover, remove Nectar, Bloom.
Browse files Browse the repository at this point in the history
  • Loading branch information
mathewjordan committed Sep 13, 2023
1 parent 483a9e6 commit fcf54c8
Show file tree
Hide file tree
Showing 11 changed files with 308 additions and 1,998 deletions.
1 change: 1 addition & 0 deletions global.d.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
declare module "@/.canopy*";
declare module "@samvera/clover-iiif*";
2,228 changes: 270 additions & 1,958 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@
"@radix-ui/react-dialog": "^1.0.2",
"@radix-ui/react-icons": "^1.1.1",
"@radix-ui/themes": "^1.1.2",
"@samvera/bloom-iiif": "^0.5.0",
"@samvera/clover-iiif": "^1.14.1",
"@samvera/nectar-iiif": "^0.0.20",
"@samvera/clover-iiif": "^2.1.0",
"@stitches/react": "^1.2.8",
"axios": "^0.24.0",
"clsx": "^1.1.1",
Expand Down
2 changes: 1 addition & 1 deletion src/components/Card/Card.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { LazyMotion, MotionConfig, domAnimation, m } from "framer-motion";
import { useEffect, useState } from "react";

import Figure from "@/components/Figure/Figure";
import { Label } from "@samvera/nectar-iiif";
import { Label } from "@samvera/clover-iiif/primitives";
import Link from "next/link";
import { getJsonByURI } from "@/lib/utils";
import { getPresentation3 } from "@/lib/iiif/context";
Expand Down
2 changes: 1 addition & 1 deletion src/components/Header/Header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Content, Title, Wrapper } from "@/components/Header/Header.styled";
import React, { useEffect, useState } from "react";

import { HamburgerMenuIcon } from "@radix-ui/react-icons";
import { Label } from "@samvera/nectar-iiif";
import { Label } from "@samvera/clover-iiif/primitives";
import Link from "next/link";
import Locale from "@/components/Shared/Locale/Locale";
import Nav from "@/components/Nav/Nav";
Expand Down
6 changes: 4 additions & 2 deletions src/components/Hero/Hero.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,15 @@ import "swiper/css";
import "swiper/css/effect-fade";
import "swiper/css/navigation";
import "swiper/css/pagination";

import { Autoplay, EffectFade, Keyboard, Navigation } from "swiper";
import { Label, Thumbnail } from "@samvera/nectar-iiif";
import { Label, Thumbnail } from "@samvera/clover-iiif/primitives";
import { Swiper, SwiperSlide } from "swiper/react";

import Container from "../Shared/Container";
import { HeroStyled } from "@/components/Hero/Hero.styled";
import Link from "next/link";
import React from "react";
import Container from "../Shared/Container";

interface HeroProps {
collection?: any;
Expand Down
4 changes: 2 additions & 2 deletions src/components/Map/Map.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import {
Popup,
TileLayer,
} from "react-leaflet";
import { Label, Thumbnail } from "@samvera/nectar-iiif";
import { Label, Thumbnail } from "@samvera/clover-iiif/primitives";
import { useEffect, useRef, useState } from "react";

import Container from "../Shared/Container";
Expand Down Expand Up @@ -90,7 +90,7 @@ const Map: React.FC<MapProps> = ({ manifests }) => {
<Popup>
<figure>
<Link href={item.slug}>
<Thumbnail thumbnail={item.thumbnail} />
<Thumbnail thumbnail={item.thumbnail} />{" "}
<figcaption>
<Container className="slide-inner" isFlex>
<Label
Expand Down
24 changes: 7 additions & 17 deletions src/components/Viewer/Slider.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
import React from "react";
import dynamic from "next/dynamic";
import "swiper/css";

import CloverSlider from "@samvera/clover-iiif/slider";
import React from "react";
import { SliderStyled } from "./Slider.styled";
import { SwiperProps } from "swiper/react";
import { gr } from "@/styles/helpers/goldenRatio";
import { rem } from "@/styles/global";
import { width } from "@/styles/theme/media";
import { SliderStyled } from "./Slider.styled";
import { SwiperProps } from "swiper/react";

type SwiperBreakpoints = SwiperProps["breakpoints"];

Expand Down Expand Up @@ -44,22 +45,11 @@ const breakpoints: SwiperBreakpoints = {
},
};

const BloomIIIF: React.ComponentType<{
collectionId: string;
options: {
breakpoints: SwiperBreakpoints;
enablePreview: boolean;
};
}> = dynamic(() => import("@samvera/bloom-iiif"), {
ssr: false,
});

const Slider = ({ collectionId }: { collectionId: string }) => (
<SliderStyled>
<BloomIIIF
collectionId={collectionId}
<CloverSlider
iiifContent={collectionId}
options={{
enablePreview: false,
breakpoints: breakpoints,
}}
/>
Expand Down
24 changes: 15 additions & 9 deletions src/components/Viewer/Viewer.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,16 @@
import React from "react";
import dynamic from "next/dynamic";

const Clover: React.ComponentType<{
const CloverViewer: React.ComponentType<{
customTheme: any;
id: string;
iiifContent: string;
options: any;
}> = dynamic(() => import("@samvera/clover-iiif"), {
ssr: false,
});
}> = dynamic(
() => import("@samvera/clover-iiif").then((Clover) => Clover.Viewer),
{
ssr: false,
}
);

const customTheme = {
colors: {
Expand Down Expand Up @@ -35,15 +38,18 @@ const defaultOptions = {
scrollToZoom: false,
},
},
renderAbout: false,
informationPanel: {
open: false,
renderAbout: false,
renderToggle: false,
},
showTitle: false,
showIIIFBadge: false,
showInformationToggle: false,
};

const Viewer = ({ id, options }: { id: string; options?: any }) => (
<Clover
id={id}
<CloverViewer
iiifContent={id}
options={{ ...defaultOptions, ...options }}
customTheme={customTheme}
/>
Expand Down
9 changes: 5 additions & 4 deletions src/components/Work/Inner.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,15 @@ import {
Metadata,
RequiredStatement,
Summary,
} from "@samvera/nectar-iiif";
} from "@samvera/clover-iiif/primitives";
import { StyledWorkInner, WorkData } from "@/components/Work/Inner.styled";

import { DefinitionListWrapper } from "../Shared/DefinitionList.styled";
import FACETS from "@/.canopy/facets";
import Link from "next/link";
import React from "react";
import Heading from "@/components/Shared/Heading/Heading";
import { DefinitionListWrapper } from "../Shared/DefinitionList.styled";
import Link from "next/link";
import { Manifest } from "@iiif/presentation-3";
import React from "react";

interface ValueAsListItemProps {
searchParam: string;
Expand Down
2 changes: 1 addition & 1 deletion src/pages/search.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Facets from "@/components/Facets/Facets";
import Layout from "@/components/layout";
import { LocaleString } from "@/hooks/useLocale";
import SearchResults from "@/components/Search/Results";
import { Summary } from "@samvera/nectar-iiif";
import { Summary } from "@samvera/clover-iiif/primitives";
import { headerHeight } from "@/styles/global";
import { searchRequest } from "@/lib/search/request";
import { useCanopyState } from "@/context/canopy";
Expand Down

0 comments on commit fcf54c8

Please sign in to comment.