From 25b706c4f23314afcd3786f53cfa7ee3e892a0a6 Mon Sep 17 00:00:00 2001
From: Rishi Ghan <rishi.ghan@gmail.com>
Date: Thu, 19 Jan 2023 21:07:07 -0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=94=8C=20Cleaned=20up=20styling=20for=20A?=
 =?UTF-8?q?irDC++=20socket=20status?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/client/actions/airdcpp.actions.tsx |  4 +-
 src/client/assets/scss/App.scss        |  4 ++
 src/client/components/Navbar.tsx       | 66 +++++++++++++++++++++-----
 src/client/context/AirDCPPSocket.tsx   | 10 +++-
 src/client/reducers/airdcpp.reducer.ts |  4 ++
 5 files changed, 74 insertions(+), 14 deletions(-)

diff --git a/src/client/actions/airdcpp.actions.tsx b/src/client/actions/airdcpp.actions.tsx
index b279a78..b4e99c1 100644
--- a/src/client/actions/airdcpp.actions.tsx
+++ b/src/client/actions/airdcpp.actions.tsx
@@ -38,18 +38,20 @@ function sleep(ms: number): Promise<NodeJS.Timeout> {
 }
 
 export const toggleAirDCPPSocketConnectionStatus =
-  (status: String) => async (dispatch) => {
+  (status: String, payload?: any) => async (dispatch) => {
     console.log("sanul", status);
     switch (status) {
       case "connected":
         dispatch({
           type: AIRDCPP_SOCKET_CONNECTED,
+          data: payload,
         });
         break;
 
       case "disconnected":
         dispatch({
           type: AIRDCPP_SOCKET_DISCONNECTED,
+          data: payload,
         });
         break;
 
diff --git a/src/client/assets/scss/App.scss b/src/client/assets/scss/App.scss
index 1bc5cf6..efb9b6b 100644
--- a/src/client/assets/scss/App.scss
+++ b/src/client/assets/scss/App.scss
@@ -62,6 +62,10 @@ pre {
     margin-left: -300px;
     min-width: 500px;
   }
+  .airdcpp-status {
+    min-width: 300px;
+    line-height: 1.7rem;
+  }
   body {
     background: #454a59;
   }
diff --git a/src/client/components/Navbar.tsx b/src/client/components/Navbar.tsx
index 095a5c0..4be184b 100644
--- a/src/client/components/Navbar.tsx
+++ b/src/client/components/Navbar.tsx
@@ -4,16 +4,22 @@ import { DownloadProgressTick } from "./ComicDetail/DownloadProgressTick";
 import { Link } from "react-router-dom";
 import { useSelector } from "react-redux";
 import { isUndefined } from "lodash";
+import { format, fromUnixTime } from "date-fns";
 
 const Navbar: React.FunctionComponent = (props) => {
   const downloadProgressTick = useSelector(
     (state: RootState) => state.airdcpp.downloadProgressData,
   );
 
-  const airDCPPSocketConnectionStatus = useSelector((state: RootState) => {
-    console.log(state);
-    return state.airdcpp.isAirDCPPSocketConnected;
-  });
+  const airDCPPSocketConnectionStatus = useSelector(
+    (state: RootState) => state.airdcpp.isAirDCPPSocketConnected,
+  );
+  const airDCPPSessionInfo = useSelector(
+    (state: RootState) => state.airdcpp.airDCPPSessionInfo,
+  );
+  const socketDisconnectionReason = useSelector(
+    (state: RootState) => state.airdcpp.socketDisconnectionReason,
+  );
 
   return (
     <nav className="navbar is-fixed-top">
@@ -80,7 +86,7 @@ const Navbar: React.FunctionComponent = (props) => {
               {downloadProgressTick && <div className="pulsating-circle"></div>}
             </a>
             {!isUndefined(downloadProgressTick) ? (
-              <div className="navbar-dropdown download-progress-meter">
+              <div className="navbar-dropdown is-right">
                 <a className="navbar-item">
                   <DownloadProgressTick data={downloadProgressTick} />
                 </a>
@@ -90,13 +96,51 @@ const Navbar: React.FunctionComponent = (props) => {
           {/* AirDC++ socket connection status */}
           <div className="navbar-item has-dropdown is-hoverable">
             {airDCPPSocketConnectionStatus ? (
-              <a className="navbar-link is-arrowless has-text-success">
-                <i className="fa-solid fa-bolt"></i>
-              </a>
+              <>
+                <a className="navbar-link is-arrowless has-text-success">
+                  <i className="fa-solid fa-bolt"></i>
+                </a>
+                <div className="navbar-dropdown pt-4 pr-2 pl-2 is-right airdcpp-status">
+                  {/* AirDC++ Session Information */}
+
+                  <p>
+                    Last login was{" "}
+                    <span className="tag">
+                      {format(
+                        fromUnixTime(airDCPPSessionInfo.user.last_login),
+                        "dd MMMM, yyyy",
+                      )}
+                    </span>
+                  </p>
+                  <hr className="navbar-divider" />
+                  <p>
+                    <span className="tag has-text-success">
+                      {airDCPPSessionInfo.user.username}
+                    </span>
+                    connected to{" "}
+                    <span className="tag has-text-success">
+                      {airDCPPSessionInfo.system_info.client_version}
+                    </span>{" "}
+                    with session ID{" "}
+                    <span className="tag has-text-success">
+                      {airDCPPSessionInfo.session_id}
+                    </span>
+                  </p>
+
+                  {/* <pre>{JSON.stringify(airDCPPSessionInfo, null, 2)}</pre> */}
+                </div>
+              </>
             ) : (
-              <a className="navbar-link is-arrowless has-text-danger">
-                <i className="fa-solid fa-bolt"></i>
-              </a>
+              <>
+                <a className="navbar-link is-arrowless has-text-danger">
+                  <i className="fa-solid fa-bolt"></i>
+                </a>
+                <div className="navbar-dropdown pr-2 pl-2 is-right">
+                  <pre>
+                    {JSON.stringify(socketDisconnectionReason, null, 2)}
+                  </pre>
+                </div>
+              </>
             )}
           </div>
 
diff --git a/src/client/context/AirDCPPSocket.tsx b/src/client/context/AirDCPPSocket.tsx
index 103c774..610b664 100644
--- a/src/client/context/AirDCPPSocket.tsx
+++ b/src/client/context/AirDCPPSocket.tsx
@@ -63,14 +63,20 @@ const AirDCPPSocketContextProvider = ({ children }) => {
 
     // connect and disconnect handlers
     initializedAirDCPPSocket.onConnected = (sessionInfo) => {
-      dispatch(toggleAirDCPPSocketConnectionStatus("connected"));
+      dispatch(toggleAirDCPPSocketConnectionStatus("connected", sessionInfo));
     };
     initializedAirDCPPSocket.onDisconnected = async (
       reason,
       code,
       wasClean,
     ) => {
-      dispatch(toggleAirDCPPSocketConnectionStatus("disconnected"));
+      dispatch(
+        toggleAirDCPPSocketConnectionStatus("disconnected", {
+          reason,
+          code,
+          wasClean,
+        }),
+      );
     };
 
     const socketConnectionInformation = await initializedAirDCPPSocket.connect(
diff --git a/src/client/reducers/airdcpp.reducer.ts b/src/client/reducers/airdcpp.reducer.ts
index 5370bca..28d4df9 100644
--- a/src/client/reducers/airdcpp.reducer.ts
+++ b/src/client/reducers/airdcpp.reducer.ts
@@ -27,6 +27,8 @@ const initialState = {
   bundles: [],
   transfers: [],
   isAirDCPPSocketConnected: false,
+  airDCPPSessionInfo: {},
+  socketDisconnectionReason: {},
 };
 
 function airdcppReducer(state = initialState, action) {
@@ -103,12 +105,14 @@ function airdcppReducer(state = initialState, action) {
       return {
         ...state,
         isAirDCPPSocketConnected: true,
+        airDCPPSessionInfo: action.data,
       };
 
     case AIRDCPP_SOCKET_DISCONNECTED:
       return {
         ...state,
         isAirDCPPSocketConnected: false,
+        socketDisconnectionReason: action.data,
       };
     case LOCATION_CHANGE:
       return {