Compare commits
9 Commits
dcpp-socke
...
dev
| Author | SHA1 | Date | |
|---|---|---|---|
| 9ce219386e | |||
| 0d41b57d18 | |||
| bf6f18c5d5 | |||
| f8aff2bb1b | |||
| 85f8532ccd | |||
| 70e883dff3 | |||
| 1efc56d889 | |||
| 2ee0e85f92 | |||
| 592da9bd2a |
Binary file not shown.
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 1.1 KiB |
@@ -2,6 +2,7 @@ import React, { ReactElement } from "react";
|
|||||||
import Card from "../Carda";
|
import Card from "../Carda";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import ellipsize from "ellipsize";
|
import ellipsize from "ellipsize";
|
||||||
|
import { escapePoundSymbol } from "../../shared/utils/formatting.utils";
|
||||||
import { isEmpty, isNil, isUndefined, map } from "lodash";
|
import { isEmpty, isNil, isUndefined, map } from "lodash";
|
||||||
import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
|
import { detectIssueTypes } from "../../shared/utils/tradepaperback.utils";
|
||||||
import Masonry from "react-masonry-css";
|
import Masonry from "react-masonry-css";
|
||||||
@@ -51,6 +52,7 @@ export const RecentlyImported = ({
|
|||||||
},
|
},
|
||||||
idx,
|
idx,
|
||||||
) => {
|
) => {
|
||||||
|
console.log(comicvine);
|
||||||
const { issueName, url } = determineCoverFile({
|
const { issueName, url } = determineCoverFile({
|
||||||
rawFileDetails,
|
rawFileDetails,
|
||||||
comicvine,
|
comicvine,
|
||||||
@@ -62,6 +64,7 @@ export const RecentlyImported = ({
|
|||||||
comicInfo,
|
comicInfo,
|
||||||
locg,
|
locg,
|
||||||
});
|
});
|
||||||
|
console.log(name);
|
||||||
const isComicBookMetadataAvailable =
|
const isComicBookMetadataAvailable =
|
||||||
!isUndefined(comicvine) &&
|
!isUndefined(comicvine) &&
|
||||||
!isUndefined(comicvine.volumeInformation);
|
!isUndefined(comicvine.volumeInformation);
|
||||||
|
|||||||
@@ -208,13 +208,14 @@ export const Library = (): ReactElement => {
|
|||||||
// ImportStatus.propTypes = {
|
// ImportStatus.propTypes = {
|
||||||
// value: PropTypes.bool.isRequired,
|
// value: PropTypes.bool.isRequired,
|
||||||
// };
|
// };
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<section className="container">
|
<section className="container">
|
||||||
<div className="section">
|
<div className="section">
|
||||||
<div className="header-area">
|
<div className="header-area">
|
||||||
<h1 className="title">Library</h1>
|
<h1 className="title">Library</h1>
|
||||||
</div>
|
</div>
|
||||||
{!isEmpty(searchResults) ? (
|
{!isUndefined(searchResults.hits) && (
|
||||||
<div>
|
<div>
|
||||||
<div className="library">
|
<div className="library">
|
||||||
<T2Table
|
<T2Table
|
||||||
@@ -229,25 +230,7 @@ export const Library = (): ReactElement => {
|
|||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
): <div className="columns">
|
|
||||||
<div className="column is-two-thirds">
|
|
||||||
<article className="message is-link">
|
|
||||||
<div className="message-body">
|
|
||||||
No comics were found in the library, Elasticsearch reports no
|
|
||||||
indices. Try importing a few comics into the library and come
|
|
||||||
back.
|
|
||||||
</div>
|
|
||||||
</article>
|
|
||||||
<pre>
|
|
||||||
{!isUndefined(searchError.data) &&
|
|
||||||
JSON.stringify(
|
|
||||||
searchError.data.meta.body.error.root_cause,
|
|
||||||
null,
|
|
||||||
4,
|
|
||||||
)}
|
)}
|
||||||
</pre>
|
|
||||||
</div>
|
|
||||||
</div> }
|
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,17 +1,15 @@
|
|||||||
import React, { useContext } from "react";
|
import React from "react";
|
||||||
import { SearchBar } from "./GlobalSearchBar/SearchBar";
|
import { SearchBar } from "./GlobalSearchBar/SearchBar";
|
||||||
import { DownloadProgressTick } from "./ComicDetail/DownloadProgressTick";
|
import { DownloadProgressTick } from "./ComicDetail/DownloadProgressTick";
|
||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { useSelector } from "react-redux";
|
import { useSelector } from "react-redux";
|
||||||
import { isUndefined, isEmpty } from "lodash";
|
import { isUndefined } from "lodash";
|
||||||
import { AirDCPPSocketContext } from "../context/AirDCPPSocket";
|
|
||||||
|
|
||||||
const Navbar: React.FunctionComponent = (props) => {
|
const Navbar: React.FunctionComponent = (props) => {
|
||||||
const downloadProgressTick = useSelector(
|
const downloadProgressTick = useSelector(
|
||||||
(state: RootState) => state.airdcpp.downloadProgressData,
|
(state: RootState) => state.airdcpp.downloadProgressData,
|
||||||
);
|
);
|
||||||
const airDCPPConfiguration = useContext(AirDCPPSocketContext);
|
|
||||||
console.log(airDCPPConfiguration)
|
|
||||||
return (
|
return (
|
||||||
<nav className="navbar is-fixed-top">
|
<nav className="navbar is-fixed-top">
|
||||||
<div className="navbar-brand">
|
<div className="navbar-brand">
|
||||||
@@ -82,23 +80,10 @@ console.log(airDCPPConfiguration)
|
|||||||
<div className="navbar-dropdown download-progress-meter">
|
<div className="navbar-dropdown download-progress-meter">
|
||||||
<a className="navbar-item">
|
<a className="navbar-item">
|
||||||
<DownloadProgressTick data={downloadProgressTick} />
|
<DownloadProgressTick data={downloadProgressTick} />
|
||||||
</a> </div>
|
</a>
|
||||||
|
</div>
|
||||||
) : null}
|
) : null}
|
||||||
</div>
|
</div>
|
||||||
{/* AirDC++ socket connection status */}
|
|
||||||
<div className="navbar-item has-dropdown is-hoverable">
|
|
||||||
<a className="navbar-link is-arrowless has-text-success">
|
|
||||||
{!isEmpty(airDCPPConfiguration.airDCPPState.socketConnectionInformation) ? (
|
|
||||||
<i className="fa-solid fa-bolt"></i>) : null}
|
|
||||||
</a>
|
|
||||||
<div className="navbar-dropdown download-progress-meter">
|
|
||||||
<a className="navbar-item">
|
|
||||||
<pre>{JSON.stringify(airDCPPConfiguration.airDCPPState.socketConnectionInformation, null, 2)}</pre>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
|
|
||||||
<div className="navbar-item has-dropdown is-hoverable is-mega">
|
<div className="navbar-item has-dropdown is-hoverable is-mega">
|
||||||
<div className="navbar-link flex">Blog</div>
|
<div className="navbar-link flex">Blog</div>
|
||||||
<div id="blogDropdown" className="navbar-dropdown">
|
<div id="blogDropdown" className="navbar-dropdown">
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ const AirDCPPSocketContextProvider = ({ children }) => {
|
|||||||
airDCPPState: {
|
airDCPPState: {
|
||||||
settings: settingsObject,
|
settings: settingsObject,
|
||||||
socket: {},
|
socket: {},
|
||||||
socketConectionInformation: {},
|
socketConnectionInformation: {},
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
@@ -56,12 +56,11 @@ const AirDCPPSocketContextProvider = ({ children }) => {
|
|||||||
hostname: `${host.hostname}:${host.port}`,
|
hostname: `${host.hostname}:${host.port}`,
|
||||||
});
|
});
|
||||||
|
|
||||||
let socketConnectionInformation = await initializedAirDCPPSocket.connect(
|
const socketConnectionInformation = await initializedAirDCPPSocket.connect(
|
||||||
`${host.username}`,
|
`${host.username}`,
|
||||||
`${host.password}`,
|
`${host.password}`,
|
||||||
true,
|
true,
|
||||||
);
|
);
|
||||||
|
|
||||||
persistSettings({
|
persistSettings({
|
||||||
...airDCPPState,
|
...airDCPPState,
|
||||||
airDCPPState: {
|
airDCPPState: {
|
||||||
|
|||||||
Reference in New Issue
Block a user