3.0.1-rc-1

csprance · Aug 24, 2019 · ae7edcc · ae7edcc
1 parent 84e225f
commit ae7edcc
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 30 deletions.
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "misrcon",
   "productName": "MisRCON",
-  "version": "3.0.1-dev-16",
+  "version": "3.0.1-rc-1",
   "description": "RCON Tool and Map for Miscreated game.",
   "main": "src/index.ts",
   "scripts": {

diff --git a/src/components/ListItemLink.tsx b/src/components/ListItemLink.tsx
@@ -8,10 +8,13 @@ interface Props {
   primary: string;
   // Link to
   to: string;
+  // is it clickable
+  disabled?: boolean;
   // What the current path is
   currentPath: string;
 }
 const ListItemLink: React.FunctionComponent<Props> = ({
+  disabled = false,
   primary,
   to,
   currentPath
@@ -22,7 +25,12 @@ const ListItemLink: React.FunctionComponent<Props> = ({
 
   return (
     // @ts-ignore
-    <ListItem selected={currentPath === to} button component={renderLink}>
+    <ListItem
+      disabled={disabled}
+      selected={currentPath === to}
+      button
+      component={renderLink}
+    >
       <ListItemText primary={primary} />
     </ListItem>
   );

diff --git a/src/containers/NavigationBar.tsx b/src/containers/NavigationBar.tsx
@@ -90,33 +90,34 @@ const NavigationBar: React.FunctionComponent<Props> = ({ location }) => {
           to={'/help'}
           primary={'# Help'}
         />
-        {activeServer.selfHosted ? (
-          <ListItemLink
-            currentPath={location.pathname}
-            to={'/hosting'}
-            primary={'# Hosting'}
-          />
-        ) : (
-          ''
-        )}
-        {activeServer.selfHosted ? (
-          <ListItemLink
-            currentPath={location.pathname}
-            to={'/logs'}
-            primary={'# Logs'}
-          />
-        ) : (
-          ''
-        )}
-        {activeServer.selfHosted ? (
-          <ListItemLink
-            currentPath={location.pathname}
-            to={'/chat'}
-            primary={'# Chat'}
-          />
-        ) : (
-          ''
-        )}
+        {/*TODO: Enable these when they work */}
+        {/*{activeServer.selfHosted ? (*/}
+        {/*  <ListItemLink*/}
+        {/*    currentPath={location.pathname}*/}
+        {/*    to={'/hosting'}*/}
+        {/*    primary={'# Hosting'}*/}
+        {/*  />*/}
+        {/*) : (*/}
+        {/*  ''*/}
+        {/*)}*/}
+        {/*{activeServer.selfHosted ? (*/}
+        {/*  <ListItemLink*/}
+        {/*    currentPath={location.pathname}*/}
+        {/*    to={'/logs'}*/}
+        {/*    primary={'# Logs'}*/}
+        {/*  />*/}
+        {/*) : (*/}
+        {/*  ''*/}
+        {/*)}*/}
+        {/*{activeServer.selfHosted ? (*/}
+        {/*  <ListItemLink*/}
+        {/*    currentPath={location.pathname}*/}
+        {/*    to={'/chat'}*/}
+        {/*    primary={'# Chat'}*/}
+        {/*  />*/}
+        {/*) : (*/}
+        {/*  ''*/}
+        {/*)}*/}
       </List>
     </Wrapper>
   );

diff --git a/src/redux/app/selectors.ts b/src/redux/app/selectors.ts
@@ -64,7 +64,7 @@ export const terminalThemeSelector = createSelector(
 
 export const updateNeededSelector = createSelector(
   appStateSelector,
-  app => app.remoteVersion !== app.localVersion
+  app => app.remoteVersion === app.localVersion
 );
 
 export const firstRunSelector = createSelector(