🔧 Some UI flourishes

This commit is contained in:
2022-04-05 01:18:03 -07:00
parent 89ca89752c
commit 0d0fd948b5
3 changed files with 18 additions and 19 deletions

View File

@@ -141,13 +141,15 @@ pre {
.generic-card { .generic-card {
display: inline-block; display: inline-block;
background-color: #fff; background-color: #fff;
border-bottom-left-radius: 0.3rem; border-top-left-radius: 0.4rem;
border-bottom-right-radius: 0.3rem; border-top-right-radius: 0.4rem;
border-bottom-left-radius: 0.4rem;
border-bottom-right-radius: 0.4rem;
box-shadow: 1px 8px 23px 7px rgba(0, 0, 0, 0.12); box-shadow: 1px 8px 23px 7px rgba(0, 0, 0, 0.12);
.green-border { .green-border {
border: 1px dotted #168b64; border: 1px dotted #168b64;
border-radius: 0.3rem; border-radius: 0.4rem;
} }
.truncate { .truncate {

View File

@@ -8,7 +8,7 @@ import React, {
import PropTypes from "prop-types"; import PropTypes from "prop-types";
import { useNavigate } from "react-router-dom"; import { useNavigate } from "react-router-dom";
import T2Table from "../shared/T2Table"; import T2Table from "../shared/T2Table";
import { isEmpty, isNil, isUndefined } from "lodash"; import { isEmpty, isNil, isNull, isUndefined } from "lodash";
import RawFileDetails from "./RawFileDetails"; import RawFileDetails from "./RawFileDetails";
import ComicVineDetails from "./ComicVineDetails"; import ComicVineDetails from "./ComicVineDetails";
import SearchBar from "./SearchBar"; import SearchBar from "./SearchBar";
@@ -25,14 +25,13 @@ interface IComicBookLibraryProps {
export const Library = (data: IComicBookLibraryProps): ReactElement => { export const Library = (data: IComicBookLibraryProps): ReactElement => {
const { searchResults } = data.data; const { searchResults } = data.data;
console.log(searchResults);
// programatically navigate to comic detail // programatically navigate to comic detail
const navigate = useNavigate(); const navigate = useNavigate();
const navigateToComicDetail = (row) => { const navigateToComicDetail = (row) => {
navigate(`/comic/details/${row.original._id}`); navigate(`/comic/details/${row.original._id}`);
}; };
const ImportStatus = ({ value }) => { const ImportStatus = (value) => {
return value ? ( return value ? (
<div className="comicvine-metadata"> <div className="comicvine-metadata">
<dl> <dl>
@@ -67,18 +66,13 @@ export const Library = (data: IComicBookLibraryProps): ReactElement => {
</div> </div>
</dl> </dl>
</div> </div>
) : ( ) : null;
<span className="is-size-7">No ComicInfo.xml</span>
);
}; };
const WantedStatus = ({ value }) => { const WantedStatus = ({ value }) => {
console.log(value);
return !value ? <span className="tag is-info is-light">Wanted</span> : null; return !value ? <span className="tag is-info is-light">Wanted</span> : null;
}; };
console.log(searchResults);
// return null;
const columns = useMemo( const columns = useMemo(
() => [ () => [
{ {
@@ -97,7 +91,7 @@ export const Library = (data: IComicBookLibraryProps): ReactElement => {
: row._source.sourcedMetadata, : row._source.sourcedMetadata,
Cell: ({ value }) => { Cell: ({ value }) => {
// If no CV info available, use raw file metadata // If no CV info available, use raw file metadata
if (!isNil(value.rawFileDetails.cover)) { if (!isUndefined(value.rawFileDetails)) {
return <RawFileDetails data={value} />; return <RawFileDetails data={value} />;
} }
// If CV metadata available, show it // If CV metadata available, show it
@@ -112,7 +106,12 @@ export const Library = (data: IComicBookLibraryProps): ReactElement => {
accessor: "_source.sourcedMetadata.comicInfo", accessor: "_source.sourcedMetadata.comicInfo",
minWidth: 300, minWidth: 300,
align: "right", align: "right",
Cell: ImportStatus, Cell: ({ value }) =>
!isEmpty(value) ? (
<ImportStatus data={value} />
) : (
<span className="tag">No ComicInfo.xml</span>
),
}, },
], ],
}, },
@@ -142,9 +141,9 @@ export const Library = (data: IComicBookLibraryProps): ReactElement => {
[], [],
); );
ImportStatus.propTypes = { // ImportStatus.propTypes = {
value: PropTypes.bool.isRequired, // value: PropTypes.bool.isRequired,
}; // };
const dispatch = useDispatch(); const dispatch = useDispatch();
const goToNextPage = useCallback((pageIndex, pageSize) => { const goToNextPage = useCallback((pageIndex, pageSize) => {

View File

@@ -29,8 +29,6 @@ const LibraryContainer = () => {
(state: RootState) => state.fileOps.librarySearchError, (state: RootState) => state.fileOps.librarySearchError,
); );
console.log(searchError);
return !isEmpty(searchResults) ? ( return !isEmpty(searchResults) ? (
<Library data={{ searchResults }} /> <Library data={{ searchResults }} />
) : ( ) : (