Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Supplemental files #206

Merged
merged 10 commits into from
Jul 24, 2023
Merged

Supplemental files #206

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b08360f
Initial work for adding supplemental files component
Dananji Jul 12, 2023
5e23494
Make component match behavior of avalon item view page
cjcolvar Jul 12, 2023
b7caa7c
Include transcript and caption files from supplementing annotations a…
cjcolvar Jul 14, 2023
eaab3e7
Fix tests and add more
cjcolvar Jul 14, 2023
881154f
Fix CSS in demo site tabs
Dananji Jul 17, 2023
b43a8c7
DRY up conditional render
cjcolvar Jul 17, 2023
42caf74
Add new tests and fix unique keys for list elements
Dananji Jul 18, 2023
dfbd016
Reabsed from main and fixed broken code from rebase
Dananji Jul 18, 2023
91ae28b
Edit styleguidist documentation
Dananji Jul 18, 2023
c380707
Remove hasFiles from state in component, remove redundant row element…
Dananji Jul 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions demo/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import MediaPlayer from '@Components/MediaPlayer/MediaPlayer';
import StructuredNavigation from '@Components/StructuredNavigation/StructuredNavigation';
import Transcript from '@Components/Transcript/Transcript';
import MetadataDisplay from '@Components/MetadataDisplay/MetadataDisplay';
import SupplementalFiles from '@Components/SupplementalFiles/SupplementalFiles';
import './app.scss';
import 'video.js/dist/video-js.css';
import '../dist/ramp.css';
Expand Down Expand Up @@ -66,7 +67,9 @@ const App = ({ manifestURL }) => {
manifestUrl={manifestUrl}
>
<div className="iiif-player-demo">
<MediaPlayer enableFileDownload={true} />
<div className="components-row">
<MediaPlayer enableFileDownload={true} />
</div>
<div className="components-row">
<StructuredNavigation />
<div className="tabs">
Expand Down Expand Up @@ -98,7 +101,14 @@ const App = ({ manifestURL }) => {
]}
/>
</Tab>

<Tab
activeTab={activeTab == 'Files'}
key={'Files'}
label={'Files'}
onClick={handleShowTab}
>
<SupplementalFiles showHeading={false} />
</Tab>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion demo/app.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ div.iiif-player-demo {
position: relative;
display: flex;
border-radius: 0.5rem 0.5rem 0 0;
overflow: hidden;
}

.tab-nav {
Expand Down Expand Up @@ -58,6 +57,7 @@ div.iiif-player-demo {
.tab-content {
position: absolute;
border: 1px solid #d3d3d3;
height: max-content;

left: 0;
bottom: 0;
Expand Down
2 changes: 0 additions & 2 deletions docs/build/bundle.6aeab273.js
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions docs/build/bundle.f732a839.js
View file
Open in desktop

Large diffs are not rendered by default.

0 docs/build/bundle.6aeab273.js.LICENSE.txt → docs/build/bundle.f732a839.js.LICENSE.txt
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion docs/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@
</head>
<body>
<div id="rsg-root"></div>
<script src="build/bundle.6aeab273.js"></script>
<script src="build/bundle.f732a839.js"></script>
</body>
</html>
8 changes: 6 additions & 2 deletions docs/manifests/dev/volleyball-for-boys.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"id": "http://localhost:6060/manifest/volleyball-for-boys.json",
"type": "Manifest",
"label": {
"en": ["Volleyball for Boys"]
"en": [
"Volleyball for Boys"
]
},
"annotations": [
{
Expand All @@ -19,7 +21,9 @@
"type": "Text",
"format": "plain/txt",
"label": {
"en": ["Text Transcript"]
"en": [
"Text Transcript (machine-generated)"
]
}
},
"target": "http://localhost:6060/manifest/volleyball-for-boys/canvas"
Expand Down
2 changes: 1 addition & 1 deletion docs/manifests/lunchroom_manners.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/manifests/prod/volleyball-for-boys.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"format": "plain/txt",
"label": {
"en": [
"Text Transcript"
"Text Transcript (machine-generated)"
]
}
},
Expand Down
3 changes: 3 additions & 0 deletions public/manifests/lunchroom_manners.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ export default {
height: 360,
width: 480,
duration: 572.034,
label: {
en: ["Lunchroom Manners"]
},
placeholderCanvas: {
id: `${url_suffix}/manifests/lunchroom_manners/canvas/1/placeholder`,
type: "Canvas",
Expand Down
2 changes: 1 addition & 1 deletion src/components/MetadataDisplay/MetadataDisplay.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ describe('MetadataDisplay component', () => {
});
render(<MetadataDisp />);
expect(screen.queryByTestId('metadata-display')).toBeInTheDocument();
expect(screen.getByText('No valid Metadata is in the Manifest'));
expect(screen.getByText('No valid Metadata is in the Manifest')).toBeInTheDocument();
});
});
Loading