diff --git a/src/client/assets/scss/App.scss b/src/client/assets/scss/App.scss index 0c68bad..884b0b8 100644 --- a/src/client/assets/scss/App.scss +++ b/src/client/assets/scss/App.scss @@ -25,11 +25,8 @@ $border-color: red; } .card { - border: 1px solid color(srgb 0.767 0.861 0.848); - margin: 0 10rem 10rem 0; - div { - margin: 10px; - border: 1px solid red; + img { + max-width: 200px; } } diff --git a/src/client/components/Card.tsx b/src/client/components/Card.tsx index 6fcf2eb..9662709 100644 --- a/src/client/components/Card.tsx +++ b/src/client/components/Card.tsx @@ -7,62 +7,45 @@ import { walkFolder } from "../actions/fileops.actions"; interface IProps { comicBookCoversMetadata: any; } -interface IState { - comicBookCoversMetadata: any[]; -} +interface IState {} class Card extends React.Component { constructor(props) { super(props); - this.state = { - comicBookCoversMetadata: [], - }; } - public fetchComicBookCoversData = (metadata) => { - this.setState((prevState) => { - // Get previous state - const { comicBookCoversMetadata } = prevState; - - // Add new item to array - comicBookCoversMetadata.push(metadata); - - // Return new state - return { comicBookCoversMetadata }; - }); - }; - - public drawCoverCard = () => { - console.log("cover card", this.state.comicBookCoversMetadata); - if (this.state.comicBookCoversMetadata.length >= 1) { - return map(this.state.comicBookCoversMetadata, (metadata) => { - return
{JSON.stringify(metadata)}
; - }); + private removeLeadingPeriod = (string) => { + if (string.charAt(0) == ".") { + string = string.substr(1); } + return string; }; - public async componentDidMount() { - const extractionOptions = { - sourceFolder: "./comics", - extractTarget: "cover", - targetExtractionFolder: "./userdata/covers", - extractionMode: "bulk", - paginationOptions: { - pageLimit: 25, - page: 1, - }, - }; - const walkedFolders = await walkFolder("./comics"); - socket.emit("call", { - action: "getComicCovers", - params: { - extractionOptions, - walkedFolders, - }, - opts: { garam: "pasha" }, + public drawCoverCard = (metadata) => { + return map(metadata, (item) => { + return ( +
+
+
+ Placeholder image +
+
+
+
{item.name}
+
+
+ ); }); - socket.on("comicBookCoverMetadata", this.fetchComicBookCoversData); - } + }; + public render() { - return
{this.drawCoverCard()}
; + return
{this.drawCoverCard(this.props.comicBookCoversMetadata)}
; } } diff --git a/src/client/components/Card2.tsx b/src/client/components/Card2.tsx deleted file mode 100644 index fddb129..0000000 --- a/src/client/components/Card2.tsx +++ /dev/null @@ -1,28 +0,0 @@ -import * as React from "react"; -import { IFolderData } from "../shared/interfaces/comicinfo.interfaces"; -import { isArray, map, isUndefined, isEmpty, flatten } from "lodash"; -import { socket } from "./Import"; -import { walkFolder } from "../actions/fileops.actions"; - -interface IProps { - comicBookCoversMetadata: any; -} -interface IState {} - -class Card extends React.Component { - constructor(props) { - super(props); - } - - public drawCoverCard = (metadata) => { - return map(metadata, (item) => { - return
{JSON.stringify(item)}
; - }); - }; - - public render() { - return
{this.drawCoverCard(this.props.comicBookCoversMetadata)}
; - } -} - -export default Card; diff --git a/src/client/components/Import.tsx b/src/client/components/Import.tsx index 93e6d06..21595a3 100644 --- a/src/client/components/Import.tsx +++ b/src/client/components/Import.tsx @@ -3,7 +3,7 @@ import _ from "lodash"; import { connect } from "react-redux"; import { fetchComicBookMetadata } from "../actions/fileops.actions"; import { IFolderData } from "../shared/interfaces/comicinfo.interfaces"; -import Card from "./Card2"; +import Card from "./Card"; import { io } from "socket.io-client"; interface IProps { @@ -40,11 +40,11 @@ class Import extends React.Component { }); } - public componentDidMount() { + public initiateSocketConnection = () => { if (typeof this.props.path !== "undefined") { this.props.fetchComicMetadata(); } - } + }; public render() { return ( @@ -71,7 +71,10 @@ class Import extends React.Component {

-