From 875f6f26063fd2c4ec5cf1d2715f704ecdbe860b Mon Sep 17 00:00:00 2001 From: Roland Date: Mon, 19 Dec 2022 10:40:01 -0700 Subject: [PATCH] Creating ebook details modal for ebook card. Linking to epub reader when possible in ebook card. --- app/src/App.js | 4 +-- app/src/components/Files.js | 47 ++++++++++++++++++++++++++++--- app/src/components/VideoPlayer.js | 15 +++++----- modules/videos/models.py | 1 - nginx.conf | 4 +++ wrolpi/files/models.py | 1 + 6 files changed, 57 insertions(+), 15 deletions(-) diff --git a/app/src/App.js b/app/src/App.js index 22d7efde..fa946790 100644 --- a/app/src/App.js +++ b/app/src/App.js @@ -20,10 +20,10 @@ import {Dashboard} from "./Dashboard"; import {Donate} from "./components/Donate"; function PageNotFound() { - return ( + return

Page Not Found!

The page you requested cannot be found

-
) +
} function Dot() { diff --git a/app/src/components/Files.js b/app/src/components/Files.js index 4c324309..85f55b7c 100644 --- a/app/src/components/Files.js +++ b/app/src/components/Files.js @@ -1,6 +1,7 @@ import React, {useContext} from "react"; import FileBrowser from 'react-keyed-file-browser'; import { + Button as SButton, CardContent, CardDescription, CardHeader, @@ -9,7 +10,9 @@ import { Container, Divider, Dropdown, + Header as SHeader, Image, + Modal, PlaceholderLine, TableCell, TableHeaderCell, @@ -150,29 +153,65 @@ function EbookCard({file}) { let {ebook, suffix} = file; const downloadUrl = `/download/${encodeURIComponent(file.path)}`; - const viewerUrl = `/epub.html?url=${downloadUrl}`; const isEpub = file['mimetype'].startsWith('application/epub'); + const viewerUrl = isEpub ? `/epub.html?url=${downloadUrl}` : null; let cover = ; if (ebook && ebook.cover_path) { const coverSrc = `/media/${encodeURIComponent(ebook.cover_path)}`; - cover = ; + cover = ; } suffix = suffix ? _.trimStart(suffix, '.').toUpperCase() : null; + const downloadButton = + + ; + + const detailsButton =