diff --git a/src/client/actions/fileops.actions.tsx b/src/client/actions/fileops.actions.tsx index cb5c74a..536aa5b 100644 --- a/src/client/actions/fileops.actions.tsx +++ b/src/client/actions/fileops.actions.tsx @@ -22,6 +22,7 @@ import { import { refineQuery } from "../shared/utils/filenameparser.utils"; import sortBy from "array-sort-by"; import { success } from "react-notification-system-redux"; +import { isNil } from "lodash"; export async function walkFolder(path: string): Promise> { return axios @@ -187,9 +188,20 @@ export const fetchComicVineMatches = }, }) .then((response) => { + console.log(response); + let matches: any = []; + if ( + !isNil(response.data.results) && + response.data.results.length === 1 + ) { + matches = response.data.results; + } else { + matches = response.data.map((match) => match); + } + console.log(matches); dispatch({ type: CV_SEARCH_SUCCESS, - searchResults: response.data.results, + searchResults: matches, searchQueryObject: { issue: issueSearchQuery, series: seriesSearchQuery, diff --git a/src/client/assets/scss/App.scss b/src/client/assets/scss/App.scss index b08d57f..d87ca12 100644 --- a/src/client/assets/scss/App.scss +++ b/src/client/assets/scss/App.scss @@ -344,30 +344,35 @@ $size-8: 0.9rem; margin: 15px 0 0 0; overflow: hidden; - table { - width: 100%; - tbody tr:nth-child(odd) { - background: #f6f6f6; - border-radius: 5px; - } - } - .search-result { - display: flex; - flex-direction: row; - padding: 10px; margin: 0 0 10px 0; - .cover-image { border-radius: 5px; } .search-result-details { - width: 100%; + + .score { float: right; } - margin-left: 10px; } + .volume-information { + margin-top: -2em; + width: 80%; + background: $white-ter; + border-radius: 10px; + } + .vertical-line { + position: relative; + top: -10px; + border: 1px solid #CCC; + width:20px; + height:25px; + + border-color: transparent transparent #999 #999; + border-bottom-left-radius: 10px; + } + } } diff --git a/src/client/components/MatchResult.tsx b/src/client/components/MatchResult.tsx index bcc613c..811eae5 100644 --- a/src/client/components/MatchResult.tsx +++ b/src/client/components/MatchResult.tsx @@ -13,6 +13,7 @@ const handleBrokenImage = (e) => { }; export const MatchResult = (props: MatchResultProps) => { + console.log(props); const dispatch = useDispatch(); const applyCVMatch = useCallback( (match, comicObjectId) => { @@ -22,64 +23,90 @@ export const MatchResult = (props: MatchResultProps) => { ); return ( <> - - - - - - - - {map(props.matchData, (match, idx) => { - return ( - - - - - ); - })} - -
- - -
- {parseFloat(match.score).toFixed(2)} -
-
{match.name}
-
{match.volume.name}
+ {map(props.matchData, (match, idx) => { + return ( +
+
+
+ +
-
-
-
- Number - - {match.issue_number} - -
+
+ +
{match.name}
+ +
+
+
+ Number + + {match.issue_number} +
-
-
- Type - - {match.resource_type} - -
+
+
+
+ Cover Date + {match.cover_date} +
+
+
+ +
+
+ +
+ +
+
+ +
+ +
+
{match.volume.name}
+
+ +
+
+ Total Issues + + {match.volumeInformation.results.count_of_issues} +
- -
+
+
+ Publisher + + {match.volumeInformation.results.publisher.name} + +
+
+ + + + + + + ); + })} ); };