diff --git a/.gitignore b/.gitignore index 8ffb97a..a02598a 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ comics/ docs/ userdata/ dist/ +storybook-static/* src/client/assets/scss/App.css /server/ node_modules/ diff --git a/package.json b/package.json index 2973973..6bc655f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "threetwo", - "version": "0.0.2", - "description": "ThreeTwo! A comic book curator.", + "version": "0.1.0", + "description": "ThreeTwo! A good comic book curator.", "main": "server/index.js", "typings": "server/index.js", "scripts": { @@ -19,7 +19,6 @@ "@dnd-kit/sortable": "^7.0.2", "@dnd-kit/utilities": "^3.2.1", "@fortawesome/fontawesome-free": "^6.3.0", - "@redux-devtools/extension": "^3.2.5", "@rollup/plugin-node-resolve": "^15.0.1", "@tanstack/react-query": "^5.0.5", "@tanstack/react-table": "^8.9.3", @@ -31,6 +30,7 @@ "axios-cache-interceptor": "^1.0.1", "axios-rate-limit": "^1.3.0", "babel-plugin-styled-components": "^2.1.4", + "blaze-slider": "^1.9.3", "date-fns": "^2.28.0", "dayjs": "^1.10.6", "ellipsize": "^0.5.1", @@ -64,7 +64,6 @@ "react-sliding-pane": "^7.1.0", "react-textarea-autosize": "^8.3.4", "reapop": "^4.2.1", - "slick-carousel": "^1.8.1", "socket.io-client": "^4.3.2", "styled-components": "^6.1.0", "threetwo-ui-typings": "^1.0.14", @@ -118,8 +117,11 @@ "rimraf": "^4.1.3", "sass": "^1.69.5", "storybook": "^7.3.2", - "tailwindcss": "^3.3.5", + "tailwindcss": "^3.4.1", "tui-jsdoc-template": "^1.2.2", "typescript": "^5.1.6" + }, + "resolutions": { + "jackspeak": "2.1.1" } } diff --git a/src/client/components/ComicDetail/ComicVineDetails.tsx b/src/client/components/ComicDetail/ComicVineDetails.tsx index b1cce81..f7fbf56 100644 --- a/src/client/components/ComicDetail/ComicVineDetails.tsx +++ b/src/client/components/ComicDetail/ComicVineDetails.tsx @@ -21,7 +21,7 @@ export const ComicVineDetails = (props): ReactElement => { // cardContainerStyle={{ maxWidth: 200 }} /> -
+
{/* Title */} @@ -50,7 +50,7 @@ export const ComicVineDetails = (props): ReactElement => {
{/* Publisher details */} -
+
Published by{" "} {data.volumeInformation.publisher.name}
diff --git a/src/client/components/Dashboard/PullList.tsx b/src/client/components/Dashboard/PullList.tsx index 033be81..4cc872d 100644 --- a/src/client/components/Dashboard/PullList.tsx +++ b/src/client/components/Dashboard/PullList.tsx @@ -2,7 +2,6 @@ import { isNil, map } from "lodash"; import React, { createRef, ReactElement, useCallback, useEffect } from "react"; import Card from "../shared/Carda"; import Header from "../shared/Header"; -import Masonry from "react-masonry-css"; import { useDispatch, useSelector } from "react-redux"; import { getWeeklyPullList } from "../../actions/comicinfo.actions"; import { importToDB } from "../../actions/fileops.actions"; @@ -89,9 +88,11 @@ export const PullList = ({ issues }: PullListProps): ReactElement => { return ( <>
-
+
{/* select week */}
diff --git a/src/client/components/Dashboard/WantedComicsList.tsx b/src/client/components/Dashboard/WantedComicsList.tsx index d66dcd1..dc4d95c 100644 --- a/src/client/components/Dashboard/WantedComicsList.tsx +++ b/src/client/components/Dashboard/WantedComicsList.tsx @@ -13,7 +13,6 @@ type WantedComicsListProps = { export const WantedComicsList = ({ comics, }: WantedComicsListProps): ReactElement => { - console.log("yolo", comics); const navigate = useNavigate(); const navigateToWantedComics = (row) => { navigate(`/wanted/all`); @@ -66,6 +65,28 @@ export const WantedComicsList = ({ title={issueName ? titleElement : No Name} >
+ {/* Issue type */} + {isComicBookMetadataAvailable && + !isNil( + detectIssueTypes(comicvine.volumeInformation.description), + ) ? ( +
+ + + + + + + { + detectIssueTypes( + comicvine.volumeInformation.description, + ).displayName + } + + +
+ ) : null} + {/* comicVine metadata presence */} {isComicBookMetadataAvailable && ( )} - {/* Issue type */} - {isComicBookMetadataAvailable && - !isNil( - detectIssueTypes(comicvine.volumeInformation.description), - ) ? ( - - { - detectIssueTypes( - comicvine.volumeInformation.description, - ).displayName - } - - ) : null}
); diff --git a/src/client/components/Dashboard/ZeroState.tsx b/src/client/components/Dashboard/ZeroState.tsx index 129ec1e..e061846 100644 --- a/src/client/components/Dashboard/ZeroState.tsx +++ b/src/client/components/Dashboard/ZeroState.tsx @@ -6,8 +6,8 @@ interface ZeroStateProps { } const ZeroState: React.FunctionComponent = (props) => { return ( -
-
+
+

{props.header}

{props.message}
diff --git a/src/client/components/Settings/Settings.tsx b/src/client/components/Settings/Settings.tsx index bfb5dde..eeb590b 100644 --- a/src/client/components/Settings/Settings.tsx +++ b/src/client/components/Settings/Settings.tsx @@ -69,7 +69,7 @@ export const Settings = (props: ISettingsProps): ReactElement => {
-
+