frishi/threetwo
1
0
Fork 0
Code Issues 9 Pull Requests 6 Actions Packages Projects Releases 2 Wiki Activity

Merge branch 'master' into service-statuses

Browse Source
This commit is contained in:
Rishi Ghan
2023-01-19 21:12:06 -08:00
committed by GitHub
parent 25b706c4f2 a8b52d0ac6
commit b8f0b5426e
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 15 KiB

1
src/client/components/Library/Library.tsx
View File

@@ -253,6 +253,7 @@ export const Library = (): ReactElement => {
</div> </div>
</div> </div>
)} )}
</div> </div>
</section> </section>
); );

4
src/client/components/Navbar.tsx
View File

@@ -11,6 +11,7 @@ const Navbar: React.FunctionComponent = (props) => {
(state: RootState) => state.airdcpp.downloadProgressData, (state: RootState) => state.airdcpp.downloadProgressData,
); );
const airDCPPSocketConnectionStatus = useSelector( const airDCPPSocketConnectionStatus = useSelector(
(state: RootState) => state.airdcpp.isAirDCPPSocketConnected, (state: RootState) => state.airdcpp.isAirDCPPSocketConnected,
); );
@@ -89,8 +90,7 @@ const Navbar: React.FunctionComponent = (props) => {
<div className="navbar-dropdown is-right"> <div className="navbar-dropdown is-right">
<a className="navbar-item"> <a className="navbar-item">
<DownloadProgressTick data={downloadProgressTick} /> <DownloadProgressTick data={downloadProgressTick} />
</a> </a> </div>
</div>
) : null} ) : null}
</div> </div>
{/* AirDC++ socket connection status */} {/* AirDC++ socket connection status */}

5
src/client/context/AirDCPPSocket.tsx
View File

@@ -14,7 +14,7 @@ const AirDCPPSocketContextProvider = ({ children }) => {
airDCPPState: { airDCPPState: {
settings: settingsObject, settings: settingsObject,
socket: {}, socket: {},
socketConnectionInformation: {}, socketConectionInformation: {},
}, },
}); });
}; };
@@ -61,6 +61,7 @@ const AirDCPPSocketContextProvider = ({ children }) => {
password: `${host.password}`, password: `${host.password}`,
}); });
// connect and disconnect handlers // connect and disconnect handlers
initializedAirDCPPSocket.onConnected = (sessionInfo) => { initializedAirDCPPSocket.onConnected = (sessionInfo) => {
dispatch(toggleAirDCPPSocketConnectionStatus("connected", sessionInfo)); dispatch(toggleAirDCPPSocketConnectionStatus("connected", sessionInfo));
@@ -86,6 +87,8 @@ const AirDCPPSocketContextProvider = ({ children }) => {
); );
// update the state with the new socket connection information // update the state with the new socket connection information
persistSettings({ persistSettings({
...airDCPPState, ...airDCPPState,
airDCPPState: { airDCPPState: {

12
yarn.lock
View File

@@ -11993,9 +11993,9 @@ json2mq@^0.2.0:
string-convert "^0.2.0" string-convert "^0.2.0"
json5@^1.0.1: json5@^1.0.1:
version "1.0.1" version "1.0.2"
resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe" resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.2.tgz#63d98d60f21b313b77c4d6da18bfa69d80e1d593"
integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow== integrity sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==
dependencies: dependencies:
minimist "^1.2.0" minimist "^1.2.0"
@@ -12959,9 +12959,9 @@ minimist-options@4.1.0:
kind-of "^6.0.3" kind-of "^6.0.3"
minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6: minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.3, minimist@^1.2.5, minimist@^1.2.6:
version "1.2.6" version "1.2.7"
resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.7.tgz#daa1c4d91f507390437c6a8bc01078e7000c4d18"
integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== integrity sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==
minipass-collect@^1.0.2: minipass-collect@^1.0.2:
version "1.0.2" version "1.0.2"