diff --git a/src/client/assets/scss/App.scss b/src/client/assets/scss/App.scss index d87ca12..9fa1857 100644 --- a/src/client/assets/scss/App.scss +++ b/src/client/assets/scss/App.scss @@ -346,6 +346,9 @@ $size-8: 0.9rem; .search-result { margin: 0 0 10px 0; + padding: 1em; + border-radius: 10px; + background: #F2F1F9; .cover-image { border-radius: 5px; } @@ -357,19 +360,20 @@ $size-8: 0.9rem; } } .volume-information { - margin-top: -2em; + margin-top: -2.5em; width: 80%; - background: $white-ter; + background: #FDECD1; border-radius: 10px; } .vertical-line { position: relative; - top: -10px; - border: 1px solid #CCC; + top: -25px; + left: 1.5rem; + border: 2px dotted #CCC; width:20px; - height:25px; + min-height:25px; - border-color: transparent transparent #999 #999; + border-color: transparent transparent #F3A22D #F3A22D; border-bottom-left-radius: 10px; } diff --git a/src/client/components/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx b/src/client/components/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx index 34faf8a..7476a42 100644 --- a/src/client/components/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx +++ b/src/client/components/AirDCPPSettings/AirDCPPSettingsConfirmation.tsx @@ -7,9 +7,7 @@ export const AirDCPPSettingsConfirmation = (settingsObject): ReactElement => {
- - - + Connected
{settings._id}
diff --git a/src/client/components/MatchResult.tsx b/src/client/components/MatchResult.tsx index 811eae5..3da6161 100644 --- a/src/client/components/MatchResult.tsx +++ b/src/client/components/MatchResult.tsx @@ -25,7 +25,7 @@ export const MatchResult = (props: MatchResultProps) => { <> {map(props.matchData, (match, idx) => { return ( -
+
{
-
{match.name}
@@ -55,21 +54,15 @@ export const MatchResult = (props: MatchResultProps) => {
- +
+ {match.deck} +
-
+
{
-
{match.volume.name}
+
{match.volume.name}
-
Total Issues @@ -100,9 +92,21 @@ export const MatchResult = (props: MatchResultProps) => {
- -
+ +
+
+
+ +
); diff --git a/src/client/shared/utils/filenameparser.utils.ts b/src/client/shared/utils/filenameparser.utils.ts index 3f0a720..6e6722b 100644 --- a/src/client/shared/utils/filenameparser.utils.ts +++ b/src/client/shared/utils/filenameparser.utils.ts @@ -132,7 +132,7 @@ export const tokenize = (inputString: string) => { } // replace special characters with... nothing - inputString = inputString.replace(/[^a-zA-Z0-9 ]/gm, ""); + inputString = inputString.replace(/[^a-zA-Z0-9(\+?\s?\-?\'?)]/gm, ""); // regexes to match constituent parts of the search string // and isolate the search terms @@ -152,8 +152,8 @@ export const tokenize = (inputString: string) => { inputString.replace(/([^\d]+)(\s*(of|de|di|von|van|z)\s*#*\d+)/gi, ""); - inputString = voca.replace(inputString, /_.-# /gi, ""); - inputString = nlp(inputString).text("normal").trim(); + // inputString = voca.replace(inputString, /_.-# /gi, ""); + // inputString = nlp(inputString).text("normal").trim(); const sentenceToProcess = sentence[0].normal.replace(/_/g, " "); const normalizedSentence = nlp(sentenceToProcess) @@ -161,6 +161,7 @@ export const tokenize = (inputString: string) => { .trim() .split(" "); + console.log(inputString) const queryObject = { comicbook_identifier_tokens: { inputString,