diff --git a/packages/console-app/config.yml b/packages/console-app/config.yml deleted file mode 100644 index edbba2d..0000000 --- a/packages/console-app/config.yml +++ /dev/null @@ -1,37 +0,0 @@ -# -# NODE_ENV === production -# NOTE: Set CONFIG_FILE to swap out this config file. -# - -app: - title: 'Console' - org': 'DxOS' - theme: 'dark' - website: 'https://dxos.org' - publicUrl: '/console' - -api: - path: '/api' - intervalLog: 5000 - pollInterval: 10000 - -system: - debug: 'dxos:console:*' - -routes: - app: - server: '/app' - - wns: - server: '/dxos/wns/api' - webui: '/dxos/wns/console' - - signal: - api: '/dxos/signal' - - ipfs: - server: '/dxos/ipfs/api' - gateway: '/dxos/ipfs/gateway' - - wellknown: - endpoint: '/.well-known/dxos' diff --git a/packages/console-app/src/client.js b/packages/console-app/src/client.js index e67a25d..55a1043 100644 --- a/packages/console-app/src/client.js +++ b/packages/console-app/src/client.js @@ -8,7 +8,7 @@ import { InMemoryCache } from 'apollo-cache-inmemory'; import { createResolvers } from './resolvers'; -const defaultServer = `${window.location.origin}`; +const defaultServer = `${window.location.host}`; export const graphqlApi = config => { const { api: { server = defaultServer, port = '', path = '/api' } } = config; diff --git a/packages/console-app/src/containers/StatusBar.js b/packages/console-app/src/containers/StatusBar.js index 98c0cac..ffb258a 100644 --- a/packages/console-app/src/containers/StatusBar.js +++ b/packages/console-app/src/containers/StatusBar.js @@ -111,6 +111,9 @@ const StatusBar = () => {
{name} ({version})
{moment(buildDate).format('L')}
+
+ +
diff --git a/packages/console-app/src/containers/VersionCheck.js b/packages/console-app/src/containers/VersionCheck.js index 623271d..9629c26 100644 --- a/packages/console-app/src/containers/VersionCheck.js +++ b/packages/console-app/src/containers/VersionCheck.js @@ -27,7 +27,7 @@ const useStyles = makeStyles(theme => ({ const VersionCheck = () => { const classes = useStyles(); const [{ current, latest }, setUpgrade] = useState({}); - const statusRespone = useQueryStatusReducer(useQuery(SYSTEM_STATUS)); + const statusResponse = useQueryStatusReducer(useQuery(SYSTEM_STATUS)); const wnsResponse = useQueryStatusReducer(useQuery(WNS_RECORDS, { pollInterval: CHECK_INTERVAL, variables: { attributes: { type: 'wrn:resource' } } @@ -35,8 +35,8 @@ const VersionCheck = () => { // Check version. useEffect(() => { - if (statusRespone && wnsResponse) { - const statusData = JSON.parse(statusRespone.system_status.json); + if (statusResponse && wnsResponse) { + const statusData = JSON.parse(statusResponse.system_status.json); const wnsData = JSON.parse(wnsResponse.wns_records.json); const current = get(statusData, 'dxos.xbox.version', '0.0.0'); @@ -51,9 +51,13 @@ const VersionCheck = () => { } }); + console.error('ZZZZZ', current, latest); + setUpgrade({ current, latest: latest !== current ? latest : undefined }); + } else { + console.error('YYY', current, latest); } - }, [status, wnsResponse]); + }, [statusResponse, wnsResponse]); // TODO(burdon): Link to Github page with upgrade info. return ( @@ -62,7 +66,7 @@ const VersionCheck = () => {
SYS: {current}
)} {latest && ( -
LATEST: {latest}
+
(LATEST: {latest})
)} ); diff --git a/packages/console-app/src/version.json b/packages/console-app/src/version.json index d9354a6..8beb821 100644 --- a/packages/console-app/src/version.json +++ b/packages/console-app/src/version.json @@ -1,7 +1,7 @@ { "build": { "name": "@dxos/console-app", - "buildDate": "2020-06-13T04:50:21.878Z", - "version": "1.0.0-beta.4" + "buildDate": "2020-06-13T05:18:32.994Z", + "version": "1.0.0-beta.5" } }