offline mode display

mtgatool · Dec 3, 2023 · 74b7ec6 · 74b7ec6
1 parent e104355
commit 74b7ec6
Show file tree

Hide file tree

Showing 10 changed files with 58,775 additions and 61,255 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "lodash": "^4.17.21",
     "match-sorter": "^6.3.0",
     "mathjs": "^9.3.0",
-    "mtgatool-db": "^2.1.10",
+    "mtgatool-db": "^2.1.11",
     "mtgatool-shared": "^2.2.0",
     "qrcode": "^1.5.1",
     "queue": "^6.0.2",
@@ -201,4 +201,4 @@
     "type": "git",
     "url": "https://github.com/mtgatool/mtgatool-desktop.git"
   }
-}
+}
diff --git a/public/tooldb-worker/index.js b/public/tooldb-worker/index.js
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
@@ -156,7 +156,9 @@ export default function TopBar(props: TopBarProps): JSX.Element {
     </div>
   );
 
-  const isOffline = <div className="unlink" title="You are not logged-in." />;
+  const isOffline = (
+    <div className="unlink" title="You are not connected to any servers." />
+  );
 
   return (
     <div

diff --git a/src/info.json b/src/info.json
@@ -1 +1 @@
-{"version":"6.4.4","branch":"dev","timestamp":1700961911431}
+{"version":"6.4.5","branch":"dev","timestamp":1701130024029}
diff --git a/src/redux/slices/rendererSlice.ts b/src/redux/slices/rendererSlice.ts
@@ -29,7 +29,7 @@ export const initialRendererState = {
   loading: false,
   logCompletion: 0,
   noLog: false,
-  offline: false,
+  offline: true,
   loginState: LOGIN_AUTH,
   patreon: {
     patreon: false,

diff --git a/src/scss/topBar.scss b/src/scss/topBar.scss
@@ -106,4 +106,14 @@
 
 .top-button-mac.close:active {
   background-color: #ca4e4a;
+}
+
+.unlink {
+  background-repeat: no-repeat;
+  background-position: center;
+  margin-right: 0px !important;
+  width: 32px;
+  // height: 100%;
+  background-size: contain;
+  background-image: url(../assets/images/unlink.png);
 }
diff --git a/tooldb-worker/package-lock.json b/tooldb-worker/package-lock.json
diff --git a/tooldb-worker/package.json b/tooldb-worker/package.json
@@ -10,7 +10,7 @@
   "license": "ISC",
   "dependencies": {
     "automerge": "^1.0.1-preview.7",
-    "mtgatool-db": "^2.1.10",
+    "mtgatool-db": "^2.1.11",
     "mtgatool-shared": "^2.2.0"
   }
 }
diff --git a/tooldb-worker/toolDbWorker.ts b/tooldb-worker/toolDbWorker.ts
@@ -18,6 +18,7 @@ import login from "./login";
 import pushToExplore from "./pushToExplore";
 import pushToLiveFeed from "./pushToLivefeed";
 import queryKeys from "./queryKeys";
+import reduxAction from "./reduxAction";
 import removeHost from "./removeHost";
 import signup from "./signup";
 
@@ -73,7 +74,8 @@ toolDb.store.get(SAVED_PEERS_KEY, (err, savedData) => {
 
 toolDb.onConnect = () => {
   const networkModule = toolDb.network as ToolDbNetwork;
-  console.warn("ToolDb connected!");
+  reduxAction("SET_OFFLINE", false);
+
   self.postMessage({ type: "CONNECTED" });
   toolDb.store.put(
     SERVERS_KEY,
@@ -82,6 +84,10 @@ toolDb.onConnect = () => {
   );
 };
 
+toolDb.onDisconnect = () => {
+  reduxAction("SET_OFFLINE", true);
+};
+
 self.toolDb = toolDb;
 
 self.globalData = {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		{"version":"6.4.4","branch":"dev","timestamp":1700961911431}
		{"version":"6.4.5","branch":"dev","timestamp":1701130024029}