💄 CV Match drawer beautification

This commit is contained in:
2021-06-29 11:56:29 -07:00
parent 0fa0e78faf
commit cb013f85d5
9 changed files with 695 additions and 499 deletions

View File

@@ -132,6 +132,10 @@ export const fetchComicVineMatches = (searchPayload) => (dispatch) => {
dispatch({
type: CV_SEARCH_SUCCESS,
searchResults: response.data,
searchQueryObject: {
issue: issueSearchQuery,
series: seriesSearchQuery,
},
});
});
{

File diff suppressed because it is too large Load Diff

View File

@@ -40,7 +40,7 @@ $border-color: red;
}
}
.card {
.generic-card {
max-width: 200px;
.truncate {
@@ -111,6 +111,20 @@ $border-color: red;
}
}
.comic-vine-match-drawer {
// comic detail drawer
.search-criteria-card {
width: 100%;
.card-content {
padding: 10px;
}
}
.field {
margin: 10px 0 0 0;
}
}
// comicvine search results
.search-results-container {
margin: 15px 0 0 0;
@@ -118,18 +132,20 @@ $border-color: red;
table {
width: 100%;
}
> :nth-of-type(odd) {
background-color: hsl(0, 0%, 98%);
tbody tr:nth-child(odd) {
background: #eee;
border-radius: 5px;
}
}
.search-result {
display: flex;
flex-direction: row;
padding: 10px;
margin: 0 0 10px 0;
.cover-image {
border-radius: 5px;
margin: 0 0 10px 0;
}
.search-result-details {
margin-left: 10px;

View File

@@ -21,7 +21,7 @@ class Card extends React.Component<IProps, IState> {
): JSX.Element => {
return (
<div>
<div className="card">
<div className="card generic-card">
<div>
<div className="card-image">
<figure className="image">

View File

@@ -1,4 +1,4 @@
import React, { useState, useEffect, useCallback } from "react";
import React, { useState, useEffect, useCallback, ReactElement } from "react";
import { useParams } from "react-router-dom";
import axios from "axios";
import Card from "./Card";
@@ -13,15 +13,19 @@ import { useDispatch, useSelector } from "react-redux";
type ComicDetailProps = {};
export const ComicDetail = ({}: ComicDetailProps) => {
export const ComicDetail = ({}: ComicDetailProps): ReactElement => {
const [page, setPage] = useState(1);
const [visible, setVisible] = useState(false);
const [comicDetail, setComicDetail] = useState<{
rawFileDetails: IExtractedComicBookCoverFile;
}>();
const comicVineSearchResults = useSelector(
(state: RootState) => state.comicInfo.searchResults,
);
const comicVineSearchQueryObject = useSelector(
(state: RootState) => state.comicInfo.searchQuery,
);
const { comicObjectId } = useParams<{ comicObjectId: string }>();
useEffect(() => {
@@ -45,7 +49,7 @@ export const ComicDetail = ({}: ComicDetailProps) => {
const openDrawerWithCVMatches = useCallback(() => {
setVisible(true);
dispatch(fetchComicVineMatches(comicDetail));
}, [dispatch, comicDetail, comicVineSearchResults]);
}, [dispatch, comicDetail]);
const onClose = () => {
setVisible(false);
@@ -77,7 +81,41 @@ export const ComicDetail = ({}: ComicDetailProps) => {
closable={false}
onClose={onClose}
visible={visible}
className="comic-vine-match-drawer"
>
{!isEmpty(comicVineSearchQueryObject) &&
!isUndefined(comicVineSearchQueryObject) ? (
<div className="card search-criteria-card">
<div className="card-content">
<p className="is-size-6">Searching against:</p>
<div className="field is-grouped is-grouped-multiline">
<div className="control">
<div className="tags has-addons">
<span className="tag">Title</span>
<span className="tag is-info">
{
comicVineSearchQueryObject.issue.searchParams
.searchTerms.name
}
</span>
</div>
</div>
<div className="control">
<div className="tags has-addons">
<span className="tag">Number</span>
<span className="tag is-info">
{
comicVineSearchQueryObject.issue.searchParams
.searchTerms.number
}
</span>
</div>
</div>
</div>
</div>
</div>
) : null}
<div className="search-results-container">
{!isEmpty(comicVineSearchResults) && (
<MatchResult matchData={comicVineSearchResults} />

View File

@@ -1,5 +1,4 @@
import React, { useState, useEffect, useCallback } from "react";
import { IComicVineSearchMatch, IFolderData } from "threetwo-ui-typings";
import React, { useEffect } from "react";
import { map } from "lodash";
interface MatchResultProps {
@@ -27,8 +26,26 @@ export const MatchResult = (props: MatchResultProps) => {
<img className="cover-image" src={match.image.thumb_url} />
</td>
<td className="search-result-details">
<h4>{match.name}</h4>
<h5>{match.volume.name}</h5>
<div className="is-size-5">{match.name}</div>
<div className="is-size-6">{match.volume.name}</div>
<div className="field is-grouped is-grouped-multiline">
<div className="control">
<div className="tags has-addons">
<span className="tag">Number</span>
<span className="tag is-primary">
{match.issue_number}
</span>
</div>
</div>
<div className="control">
<div className="tags has-addons">
<span className="tag">Type</span>
<span className="tag is-warning">
{match.resource_type}
</span>
</div>
</div>
</div>
</td>
</tr>
);

View File

@@ -4,6 +4,7 @@ import {
} from "../constants/action-types";
const initialState = {
searchResults: [],
searchQuery: {},
};
function comicinfoReducer(state = initialState, action) {
@@ -14,9 +15,11 @@ function comicinfoReducer(state = initialState, action) {
result: {},
};
case CV_SEARCH_SUCCESS:
console.log(action);
return {
...state,
searchResults: action.searchResults.results,
searchQuery: action.searchQueryObject,
};
default:
return state;