diff --git a/packages/console-app/config.yml b/packages/console-app/config.yml index 150b1c4..6f30af7 100644 --- a/packages/console-app/config.yml +++ b/packages/console-app/config.yml @@ -29,13 +29,30 @@ services: webui: 'http://127.0.0.1:9473/webui' signal: - server: 'http://127.0.0.1:4000' + server: 'ws://127.0.0.1:4000' api: 'http://127.0.0.1:4000' ipfs: - server: '/ip4/127.0.0.1/tcp/5001' - gateway: '/ip4//127.0.0.1:8888/ipfs/' - webui: 'http://127.0.0.1:5001/webui' + server: 'https://127.0.0.1:5001' + gateway: 'http://127.0.0.1:8888' wellknown: endpoint: 'http://127.0.0.1:9000/.well-known/dxos' + +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 11ce974..1a79462 100644 --- a/packages/console-app/src/client.js +++ b/packages/console-app/src/client.js @@ -8,12 +8,12 @@ import { InMemoryCache } from 'apollo-cache-inmemory'; import { createResolvers } from './resolvers'; -const defaultServer = `${window.location.protocol}//${window.location.hostname}`; +const defaultServer = `${window.location.origin}/${window.location.pathname}` export const graphqlApi = config => { - const { api: { server = defaultServer, port = 80, path = '/graphql' } } = config; + const { api: { server = defaultServer, path = '/api/graphql' } } = config; - return `${server}:${port}${path}`; + return `${server}${path}`; }; /** diff --git a/packages/console-app/src/version.json b/packages/console-app/src/version.json index a7f299b..b81b53e 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-11T06:21:53.153Z", + "buildDate": "2020-06-11T15:58:26.701Z", "version": "1.0.0-beta.0" } }