Merge pull request 'Update package version' (#56) from zramsay-patch-2 into main

Reviewed-on: cerc-io/laconic-console#56

.gitea/workflows/publish.yaml

@@ -0,0 +1,39 @@
+name: Publish npm package to gitea
+on:
+  release:
+    types: [published]
+jobs:
+  npm_publish:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        node-version: [ 18.x ]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+      - name: Download yarn
+        run: |
+          curl -fsSL -o /usr/local/bin/yarn https://github.com/yarnpkg/yarn/releases/download/v1.22.21/yarn-1.22.21.js
+          chmod +x /usr/local/bin/yarn
+      - name: Install jq
+        run: |
+          apt update && apt install -y jq
+      - name: Use Node.js ${{ matrix.node-version }}
+        uses: actions/setup-node@v3
+        with:
+          node-version: ${{ matrix.node-version }}
+      - run: yarn
+      - name: Run yarn build
+        run: |
+          LACONIC_HOSTED_CONFIG_FILE=config-hosted.yml yarn dist
+      - name: Configure git.vdb.to npm registry
+        run: |
+          npm config set registry https://git.vdb.to/api/packages/cerc-io/npm/
+      - name: Authenticate to git.vdb.to registry
+        run: |
+          npm config set -- '//git.vdb.to/api/packages/cerc-io/npm/:_authToken' "${{ secrets.CICD_PUBLISH_TOKEN }}"
+      - name: npm publish
+        run: |
+          npm publish

.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>

.idea/console.iml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
-      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
-      <excludeFolder url="file://$MODULE_DIR$/temp" />
-      <excludeFolder url="file://$MODULE_DIR$/tmp" />
-    </content>
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

.idea/inspectionProfiles/Project_Default.xml

@@ -1,11 +0,0 @@
-<component name="InspectionProjectProfileManager">
-  <profile version="1.0">
-    <option name="myName" value="Project Default" />
-    <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="SpellCheckingInspection" enabled="false" level="TYPO" enabled_by_default="false">
-      <option name="processCode" value="true" />
-      <option name="processLiterals" value="true" />
-      <option name="processComments" value="true" />
-    </inspection_tool>
-  </profile>
-</component>

.idea/jsLibraryMappings.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptLibraryMappings">
-    <includedPredefinedLibrary name="Node.js Core" />
-  </component>
-</project>

.idea/misc.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="JavaScriptSettings">
-    <option name="languageLevel" value="JSX" />
-  </component>
-</project>

.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/console.iml" filepath="$PROJECT_DIR$/.idea/console.iml" />
-    </modules>
-  </component>
-</project>

.idea/runConfigurations/client.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="client" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/packages/console-app/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="start" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>

.idea/runConfigurations/server.xml

@@ -1,12 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="server" type="js.build_tools.npm">
-    <package-json value="$PROJECT_DIR$/packages/console-server/package.json" />
-    <command value="run" />
-    <scripts>
-      <script value="start" />
-    </scripts>
-    <node-interpreter value="project" />
-    <envs />
-    <method v="2" />
-  </configuration>
-</component>

.idea/vcs.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>

.npmrc

@@ -1,2 +0,0 @@
-@cerc-io:registry=https://git.vdb.to/api/packages/cerc-io/npm/
-@lirewine:registry=https://git.vdb.to/api/packages/cerc-io/npm/

README.md

@@ -1,29 +1,27 @@
 # Console
 
-Laconic Kubenet GraphQL server and console application.
+Laconic console application.
 
 User interface for submitting and reading records registered on Laconic.
 
-![Console](./docs/images/console.png)
-
 ## Development
 
 * Clone the required repos:
-  * [laconicd](https://github.com/cerc-io/laconicd)
+  * [laconicd](https://git.vdb.to/cerc-io/laconicd)
 
     ```bash
-    git clone git@github.com:cerc-io/laconicd.git
+    git clone git@git.vdb.to:cerc-io/laconicd.git
     ```
 
 * Run the `laconicd` chain:
-  * In [laconicd](https://github.com/cerc-io/laconicd) repo, start the chain
+  * In [laconicd](https://git.vdb.to/cerc-io/laconicd) repo, start the chain
 
     ```bash
-    ./init.sh
+    ./scripts/init.sh clean
     ```
 
 * Run the laconic-console app
-  * In [laconic-console](https://github.com/cerc-io/laconic-console) repo, install dependencies
+  * From the root of this repo, run:
 
     ```bash
     yarn
@@ -40,27 +38,23 @@ User interface for submitting and reading records registered on Laconic.
 
     This can be ignored as it is an error for installing optional dependency
 
-  * Change directory to [packages/console-app](https://github.com/cerc-io/laconic-console/tree/main/packages/console-app) and start the react app
+  * Start the app:
 
       ```bash
-      # Change directory
-      cd packages/console-app/
-      
-      # Start app
       CONFIG_FILE=config-local.yml yarn start
       ```
 
-  * Open console-app at <http://localhost:8080>
+  * Open console at <http://localhost:8080>
 
-  * To view records in the app, test suite in laconic-sdk can be run
+  * To view records in the console, the test suite in registry-sdk can be run
 
-    * Clone the [laconic-sdk](https://github.com/cerc-io/laconic-sdk) repo:
+    * Clone the [registry-sdk](https://git.vdb.to/cerc-io/registry-sdk) repo:
 
       ```bash
-      git clone git@github.com:cerc-io/laconic-sdk.git
+      git clone git@git.vdb.to:cerc-io/registry-sdk.git
       ```
 
-    * In [laconic-sdk](https://github.com/cerc-io/laconic-sdk) repo, copy [.env.example](https://github.com/cerc-io/laconic-sdk/blob/main/.env.example) file and create a `.env` file
+    * In [registry-sdk](https://git.vdb.to/cerc-io/registry-sdk) repo, copy [.env.example](https://git.vdb.to/cerc-io/registry-sdk/blob/main/.env.example) file and create a `.env` file
 
       ```bash
       cp .env.example .env
@@ -69,7 +63,7 @@ User interface for submitting and reading records registered on Laconic.
     * Export the private key using:
 
       ```bash
-      laconicd keys export mykey --unarmored-hex --unsafe
+      laconicd keys export alice --keyring-backend test  --unarmored-hex --unsafe
       ```
 
     * Copy the private key exported above and assign it to variable `PRIVATE_KEY` in the `.env` file.
@@ -80,12 +74,12 @@ User interface for submitting and reading records registered on Laconic.
       yarn
       ```
 
-    * Run the tests in laconic-sdk repo:
+    * Run the tests in registry-sdk repo:
 
       ```bash
       yarn test
       ```
 
-      *NOTE*: One test from [util.test.ts](https://github.com/cerc-io/laconic-sdk/blob/main/src/util.test.ts) fails as mentioned in the [PR](https://github.com/cerc-io/laconic-sdk/pull/5#issuecomment-1299572012)
+      *NOTE*: One test from [util.test.ts](https://git.vdb.to/cerc-io/registry-sdk/blob/main/src/util.test.ts) fails as mentioned in the [PR](https://git.vdb.to/cerc-io/registry-sdk/pull/5#issuecomment-1299572012)
 
-    * Open console-app at <http://localhost:8080> to view the records.
+    * Open console at <http://localhost:8080> to view the records.

babel.config.js

@@ -12,7 +12,6 @@ module.exports = {
     'import-graphql',
     'inline-json-import',
 
-    '@babel/plugin-proposal-class-properties',
-    '@babel/plugin-proposal-export-default-from'
+    '@babel/plugin-proposal-class-properties'
   ]
 };

config-hosted.yml

@@ -0,0 +1,42 @@
+#
+# NODE_ENV=development
+# NOTE: Set CONFIG_FILE to swap out this config file.
+#
+
+# TODO: write a tool to automated insertion of the template strings in files like this.
+
+app:
+  title: 'Console'
+  org': 'Laconic'
+  theme: 'dark'
+  website: 'LACONIC_HOSTED_CONFIG_app_website' # e.g. https://laconic.com
+  publicUrl: '/console'
+
+api:
+  server: 'LACONIC_HOSTED_CONFIG_api_server' # e.g. http://127.0.0.1:9004
+  path: '/api'
+  intervalLog: 5000
+  pollInterval: 10000
+
+system:
+  debug: 'laconic:console:*'
+
+services:
+  app:
+    prefix: '/app'
+    server: 'LACONIC_HOSTED_CONFIG_services_app_server' # e.g. http://127.0.0.1:5999
+
+  wns:
+    server: 'LACONIC_HOSTED_CONFIG_services_wns_server' # e.g. http://127.0.0.1:9473/api
+    webui: 'LACONIC_HOSTED_CONFIG_services_wns_webui' # e.g. http://127.0.0.1:9473/console
+
+  signal:
+    server: 'LACONIC_HOSTED_CONFIG_services_signal_server' # e.g. ws://127.0.0.1:4000
+    api: 'LACONIC_HOSTED_CONFIG_services_signal_api' # e.g. http://127.0.0.1:4000/api
+
+  ipfs:
+    server: 'LACONIC_HOSTED_CONFIG_services_ipfs_server' # e.g. http://127.0.0.1:5001
+    gateway: 'LACONIC_HOSTED_CONFIG_services_ipfs_gateway' # e.g. http://127.0.0.1:8888/ipfs/
+
+  wellknown:
+    endpoint: 'LACONIC_HOSTED_CONFIG_services_wellknown_endpoint' # e.g. http://127.0.0.1:9000/.well-known/laconic

config-local.yml

@@ -5,7 +5,7 @@
 
 app:
   title: 'Console'
-  org': 'Laconic'
+  org: 'Laconic'
   theme: 'dark'
   website: 'https://laconic.com'
   publicUrl: '/console'

lerna.json

@@ -1,5 +0,0 @@
-{
-  "version": "1.2.9",
-  "useWorkspaces": true,
-  "npmClient": "yarn"
-}

package.json

@@ -1,69 +1,91 @@
 {
-  "name": "laconic-console",
-  "version": "1.2.9-alpha.0",
+  "name": "@cerc-io/console-app",
+  "version": "0.2.2",
   "description": "Laconic Console",
-  "main": "index.js",
-  "private": true,
+  "repository": "https://github.com/cerc-io/laconic-console",
+  "main": "dist/es/index.js",
+  "files": [
+    "dist/*", "src/*"
+  ],
   "scripts": {
-    "build": "lerna run build",
-    "clean": "lerna run clean",
-    "lint": "lerna run lint",
-    "lint:fix": "lerna run lint -- --fix",
-    "lint:staged": "lint-staged",
-    "sort-package-json": "lerna exec npx sort-package-json",
-    "test": "lerna run test"
+    "analyzer": "webpack --config webpack-analyzer.config.js",
+    "build": "yarn dist",
+    "build:babel": "babel ./src --out-dir ./dist/es --ignore \"**/*.test.js\" --source-maps inline",
+    "clean": "rm -rf dist",
+    "updatever": "scripts/update_version.sh > src/version.json",
+    "dist": "yarn clean && yarn updatever && yarn build:babel && CONFIG_FILE=${LACONIC_HOSTED_CONFIG_FILE:-config-production.yml} webpack",
+    "lint": "semistandard 'src/**/*.js'",
+    "start": "CONFIG_FILE=${CONFIG_FILE:-config-testnet.yml} VERBOSE=true webpack-dev-server --mode development",
+    "test": "jest --rootDir ./src --passWithNoTests --no-cache"
   },
   "author": "",
-  "license": "AGPLv3",
-  "workspaces": {
-    "packages": [
-      "packages/*"
-    ]
-  },
+  "license": "GPL-3.0",
   "browserslist": [
-    "> 5%"
+    "> 2%"
   ],
   "jest": {
     "testEnvironment": "node"
   },
   "dependencies": {
-    "lerna": "^3.19.0"
+    "@apollo/client": "^3.7.10",
+    "@apollo/react-components": "^4.0.0",
+    "@apollo/react-hooks": "^4.0.0",
+    "@babel/runtime": "^7.21.0",
+    "@cerc-io/registry-sdk": "^0.2.2",
+    "@lirewine/debug": "1.0.0-beta.78",
+    "@lirewine/gem-core": "1.0.0-beta.28",
+    "@lirewine/react-ux": "1.1.0-beta.1",
+    "@material-ui/core": "^4.12.4",
+    "@material-ui/icons": "^4.11.3",
+    "@material-ui/lab": "^4.0.0-alpha.61",
+    "@rehooks/component-size": "^1.0.3",
+    "@visx/network": "^1.0.0",
+    "@visx/tooltip": "^1.0.0",
+    "@visx/zoom": "^1.0.0",
+    "build-url": "^2.0.0",
+    "clsx": "^1.1.0",
+    "compare-versions": "^3.6.0",
+    "d3-force": "^2.1.1",
+    "debug": "^4.1.1",
+    "graphql-tag": "^2.10.3",
+    "lodash.defaultsdeep": "^4.6.1",
+    "lodash.get": "^4.4.2",
+    "moment": "^2.26.0",
+    "node-polyfill-webpack-plugin": "^2.0.1",
+    "react": "^16.12.0",
+    "react-dom": "^16.12.0",
+    "react-router": "^5.3.4",
+    "react-router-dom": "^5.3.4",
+    "source-map-support": "^0.5.12"
   },
   "devDependencies": {
-    "babel-eslint": "^10.0.3",
-    "eslint": "^6.7.2",
-    "eslint-config-semistandard": "^15.0.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-loader": "^3.0.3",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^23.13.1",
-    "eslint-plugin-jsdoc": "^21.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^4.0.1",
-    "lint-staged": "^9.5.0",
-    "pre-commit": "^1.2.2",
-    "webpack-cli": "^3.3.11"
+    "@babel/cli": "7.21.0",
+    "@babel/core": "^7.21.0",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-react": "^7.18.6",
+    "@webpack-cli/info": "^2.0.1",
+    "babel-jest": "^29.5.0",
+    "babel-loader": "^9.1.2",
+    "babel-plugin-import-graphql": "^2.7.0",
+    "babel-plugin-inline-import": "^3.0.0",
+    "babel-plugin-inline-json-import": "^0.3.2",
+    "dotenv-webpack": "^8.0.1",
+    "graphql": "^15.0.0",
+    "html-webpack-plugin": "^5.5.0",
+    "jest": "^29.5.0",
+    "webpack": "^5.76.2",
+    "webpack-bundle-analyzer": "^4.8.0",
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.13.1",
+    "webpack-merge": "^5.8.0",
+    "webpack-version-file-plugin": "^0.5.0",
+    "yaml-loader": "^0.8.0"
   },
-  "eslintConfig": {
-    "parser": "babel-eslint",
-    "extends": [
-      "plugin:jest/recommended",
-      "semistandard"
-    ],
-    "plugins": [
-      "babel"
-    ],
-    "rules": {
-      "babel/semi": 1
-    }
+  "peerDependencies": {
+    "react": "16.12.0",
+    "react-dom": "^16.12.0"
   },
-  "semistandard": {
-    "parser": "babel-eslint",
-    "env": [
-      "jest",
-      "node",
-      "browser"
-    ]
+  "publishConfig": {
+    "access": "public"
   }
 }

packages/console-app/README.md

@@ -1,58 +0,0 @@
-# Console
-
-Apollo GraphQL client.
-
-## Usage
-
-First start the server:
-
-```bash
-  cd packages/console-server
-  yarn start
-```
-
-Then start the Webpack devserver.
-
-```bash
-  cd packages/console-app
-  yarn start
-```
-
-Then load the app: http://localhost:8080.
-
-## Using a KUBE
-
-To use your KUBE for testing, rather than running all the services locally, specify a different
-config file when starting: `config-kube.yml`, which connects to `kube.local` for all services.
-
-For example:
-
-```javascript
-  cd packages/console-app
-  CONFIG_FILE=config-kube.yml yarn start
-```
-
-## Deploy
-
-```bash
-  yarn build
-```
-
-This creates the following folders:
-
-```
-/dist
-  /es               # Module imports.
-  /production       # Production build.
-```
-
-NOTE: GQL and Production files and exported and may be used by the server.
-
-```javascript
-import SYSTEM_STATUS from '@cerc-io/console-app/src/gql/system_status.graphql';
-
-...
-
-const file = path.join(__dirname + '../../../../node_modules/@cerc-io/console-app/dist/production', 'index.html');
-res.sendFile(file);
-```

packages/console-app/package.json

@@ -1,133 +0,0 @@
-{
-  "name": "@cerc-io/console-app",
-  "version": "1.2.9",
-  "description": "Kubenet Console Client",
-  "repository": "https://github.com/cerc-io/laconic-console",
-  "main": "dist/es/index.js",
-  "files": [
-    "src/gql"
-  ],
-  "scripts": {
-    "analyzer": "webpack --config webpack-analyzer.config.js",
-    "build": "yarn dist",
-    "build:babel": "babel ./src --out-dir ./dist/es --ignore \"**/*.test.js\" --source-maps inline",
-    "clean": "rm -rf dist",
-    "dist": "yarn clean && yarn build:babel && CONFIG_FILE=config-production.yml webpack",
-    "lint": "semistandard 'src/**/*.js'",
-    "start": "CONFIG_FILE=${CONFIG_FILE:-config-testnet.yml} VERBOSE=true webpack-dev-server --mode development",
-    "test": "jest --rootDir ./src --passWithNoTests --no-cache"
-  },
-  "author": "",
-  "license": "GPL-3.0",
-  "browserslist": [
-    "> 2%"
-  ],
-  "jest": {
-    "testEnvironment": "node"
-  },
-  "dependencies": {
-    "@apollo/react-components": "^3.1.5",
-    "@apollo/react-hooks": "^3.1.5",
-    "@babel/runtime": "^7.8.7",
-    "@cerc-io/laconic-sdk": "0.1.4",
-    "@lirewine/debug": "1.0.0-beta.78",
-    "@lirewine/gem-core": "1.0.0-beta.28",
-    "@lirewine/react-ux": "1.1.0-beta.0",
-    "@material-ui/core": "^4.10.0",
-    "@material-ui/icons": "^4.9.1",
-    "@material-ui/lab": "^4.0.0-alpha.54",
-    "@rehooks/component-size": "^1.0.3",
-    "@visx/network": "^1.0.0",
-    "@visx/tooltip": "^1.0.0",
-    "@visx/zoom": "^1.0.0",
-    "apollo-cache-inmemory": "^1.6.6",
-    "apollo-client": "^2.6.10",
-    "apollo-link": "^1.2.14",
-    "apollo-link-http": "^1.5.17",
-    "build-url": "^2.0.0",
-    "clsx": "^1.1.0",
-    "compare-versions": "^3.6.0",
-    "d3-force": "^2.1.1",
-    "debug": "^4.1.1",
-    "graphql-tag": "^2.10.3",
-    "lodash.defaultsdeep": "^4.6.1",
-    "lodash.get": "^4.4.2",
-    "moment": "^2.26.0",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
-    "react-router": "^5.2.0",
-    "react-router-dom": "^5.2.0",
-    "source-map-support": "^0.5.12"
-  },
-  "devDependencies": {
-    "@babel/cli": "7.4.4",
-    "@babel/core": "^7.4.5",
-    "@babel/node": "^7.8.7",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-export-default-from": "^7.8.3",
-    "@babel/preset-env": "^7.4.5",
-    "@babel/preset-react": "^7.0.0",
-    "@webpack-cli/info": "^0.2.0",
-    "@webpack-cli/init": "^0.3.0",
-    "babel-eslint": "^10.0.2",
-    "babel-jest": "^24.8.0",
-    "babel-loader": "^8.0.0",
-    "babel-plugin-add-module-exports": "^1.0.2",
-    "babel-plugin-import-graphql": "^2.7.0",
-    "babel-plugin-inline-import": "^3.0.0",
-    "babel-plugin-inline-json-import": "^0.3.2",
-    "dotenv-webpack": "^1.8.0",
-    "eslint": "^6.7.2",
-    "eslint-config-semistandard": "^15.0.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-config-standard-jsx": "^8.1.0",
-    "eslint-loader": "^3.0.3",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jest": "^23.13.1",
-    "eslint-plugin-jsdoc": "^21.0.0",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-standard": "^4.0.1",
-    "graphql": "^15.0.0",
-    "html-webpack-plugin": "^4.3.0",
-    "jest": "^24.8.0",
-    "react-scripts": "^3.4.1",
-    "semistandard": "^14.2.0",
-    "webpack": "^4.41.2",
-    "webpack-bundle-analyzer": "^3.6.0",
-    "webpack-cli": "^3.3.11",
-    "webpack-dev-server": "^3.11.0",
-    "webpack-merge": "^4.2.2",
-    "webpack-version-file-plugin": "^0.4.0",
-    "yaml-loader": "^0.6.0"
-  },
-  "peerDependencies": {
-    "react": "16.12.0",
-    "react-dom": "^16.12.0"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "eslintConfig": {
-    "parser": "babel-eslint",
-    "extends": [
-      "plugin:jest/recommended",
-      "semistandard",
-      "standard-jsx"
-    ],
-    "plugins": [
-      "babel"
-    ],
-    "rules": {
-      "babel/semi": 1
-    }
-  },
-  "semistandard": {
-    "parser": "babel-eslint",
-    "env": [
-      "jest",
-      "node",
-      "browser"
-    ]
-  }
-}

packages/console-app/public/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title><%= title %></title>
-  </head>
-  <body>
-    <div id="root"></div>
-  </body>
-</html>

packages/console-app/src/components/AppBar.js

@@ -1,84 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import React from 'react';
-import { makeStyles } from '@material-ui/core';
-import MuiAppBar from '@material-ui/core/AppBar';
-import Link from '@material-ui/core/Link';
-import Toolbar from '@material-ui/core/Toolbar';
-import Typography from '@material-ui/core/Typography';
-import blueGrey from '@material-ui/core/colors/blueGrey';
-// import GraphQLIcon from '@material-ui/icons/Adb';
-
-// import LaconicIcon from '../icons/Laconic';
-// import { graphqlApi } from '../client';
-
-const useStyles = makeStyles((theme) => ({
-  offset: theme.mixins.denseToolbar,
-
-  logo: {
-    marginRight: theme.spacing(2),
-    color: theme.palette.grey[800],
-
-    '& svg': {
-      width: 100,
-      height: 48
-    }
-  },
-
-  logoLink: {
-    lineHeight: 0
-  },
-
-  title: {
-    display: 'flex',
-    flex: 1,
-    marginTop: 2,
-    color: theme.palette.grey[800]
-  },
-
-  link: {
-    color: blueGrey[900]
-  }
-}));
-
-const AppBar = ({ config }) => {
-  const classes = useStyles();
-
-  return (
-    <>
-      <MuiAppBar position='fixed' elevation={0}>
-        <Toolbar>
-          <Link classes={{ root: classes.logoLink }} href='/'>
-            {/* <div className={classes.logo}>
-              <LaconicIcon />
-            </div> */}
-            <div className={classes.title}>
-              <Typography variant='h6'>Laconic</Typography>
-            </div>
-          </Link>
-          &nbsp;
-          <div className={classes.title}>
-            <Typography variant='h6'>{config.app.title}</Typography>
-          </div>
-          {/* <div>
-            <Link
-              className={classes.link}
-              href={graphqlApi(config)}
-              rel='noreferrer'
-              target='_blank'
-              title='Console GraphQL'
-            >
-              <GraphQLIcon />
-            </Link>
-          </div> */}
-        </Toolbar>
-      </MuiAppBar>
-
-      <div className={classes.offset} />
-    </>
-  );
-};
-
-export default AppBar;

packages/console-app/src/components/Json.js

@@ -1,26 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import React from 'react';
-import { makeStyles } from '@material-ui/core';
-
-import { JsonTreeView } from '@lirewine/react-ux';
-
-import { omitDeep } from '../util/omit';
-
-const useStyles = makeStyles(() => ({
-  root: {
-    flex: 1
-  }
-}));
-
-const Json = ({ data }) => {
-  const classes = useStyles();
-
-  return (
-    <JsonTreeView className={classes.root} data={omitDeep(data, '__typename')} />
-  );
-};
-
-export default Json;

packages/console-app/src/components/Sidebar.js

@@ -1,100 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import clsx from 'clsx';
-import React from 'react';
-import { useHistory, useParams } from 'react-router';
-// import { useQuery } from '@apollo/react-hooks';
-
-import { makeStyles } from '@material-ui/core';
-import List from '@material-ui/core/List';
-import ListItem from '@material-ui/core/ListItem';
-import ListItemIcon from '@material-ui/core/ListItemIcon';
-import LinkIcon from '@material-ui/icons/ExitToApp';
-import ListItemText from '@material-ui/core/ListItemText';
-
-// import EXTENSIONS from '../gql/extensions.graphql';
-// import { useQueryStatusReducer } from '../hooks';
-
-const useStyles = makeStyles(theme => ({
-  root: {
-    display: 'flex',
-    flex: 1,
-    flexDirection: 'column',
-    justifyContent: 'space-between'
-  },
-
-  list: {
-    padding: 0
-  },
-
-  icon: {
-    minWidth: 40,
-    color: theme.palette.grey[500]
-  },
-
-  selected: {
-    color: theme.palette.primary.main
-  },
-
-  expand: {
-    flex: 1
-  }
-}));
-
-const Sidebar = ({ modules: { services, settings } }) => {
-  const classes = useStyles();
-  const history = useHistory();
-  const { module } = useParams();
-
-  // const { data: extensionsData } = useQueryStatusReducer(useQuery(EXTENSIONS));
-  // const extensions = extensionsData ? JSON.parse(extensionsData.extensions.json) : [];
-  const extensions = [];
-
-  const isSelected = path => path === `/${module}`;
-
-  const Modules = ({ modules }) => (
-    <List aria-label='items' className={classes.list}>
-      {modules.map(({ path, title, icon: Icon }) => (
-        <ListItem button selected={isSelected(path)} key={path} onClick={() => history.push(path)}>
-          <ListItemIcon classes={{ root: classes.icon }}>
-            <Icon className={clsx(classes.icon, isSelected(path) && classes.selected)} />
-          </ListItemIcon>
-          <ListItemText primary={title} />
-        </ListItem>
-      ))}
-    </List>
-  );
-
-  const Extensions = ({ extensions }) => (
-    <List aria-label='items' className={classes.list}>
-      {extensions.map(({ url, title }) => {
-        url = url
-          .replace('%HOST%', window.location.host)
-          .replace('%PORT%', window.location.port)
-          .replace('%PROTOCOL%', window.location.protocol);
-        return (
-          <ListItem button key={url} onClick={() => { window.location = url; return true; }}>
-            <ListItemIcon classes={{ root: classes.icon }}>
-              <LinkIcon className={clsx(classes.icon)} />
-            </ListItemIcon>
-            <ListItemText primary={title} />
-          </ListItem>
-        );
-      }
-      )}
-    </List>
-  );
-
-  return (
-    <div className={classes.root}>
-      <Modules modules={services} />
-      <Extensions extensions={extensions} />
-      <div className={classes.expand} />
-      <Modules modules={settings} />
-    </div>
-  );
-};
-
-export default Sidebar;

packages/console-app/src/components/Toolbar.js

@@ -1,32 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import React from 'react';
-import { makeStyles } from '@material-ui/core';
-import MuiToolbar from '@material-ui/core/Toolbar';
-
-const useStyles = makeStyles(theme => ({
-  toolbar: {
-    display: 'flex',
-    justifyContent: 'space-between',
-    whiteSpace: 'nowrap',
-
-    '& > button': {
-      margin: theme.spacing(0.5)
-    }
-  }
-}));
-
-// TODO(burdon): Tabs.
-const Toolbar = ({ children }) => {
-  const classes = useStyles();
-
-  return (
-    <MuiToolbar disableGutters className={classes.toolbar}>
-      {children}
-    </MuiToolbar>
-  );
-};
-
-export default Toolbar;

packages/console-app/src/icons/Logo.js

@@ -1,37 +0,0 @@
-//
-// Copyright 2020 DXOS.org
-//
-
-import React from 'react';
-import SvgIcon from '@material-ui/core/SvgIcon';
-
-// TODO(burdon): Fixed color?
-
-const Icon = (props) => (
-  <SvgIcon {...props} viewBox='0 0 256 256'>
-    <g transform='matrix(1,0,0,1,-160,-124)'>
-      <path
-        d='M282.254,147.134L195.254,194.589C191.399,196.692 189,200.732 189,205.124L189,298.876C189,303.268 191.399,307.308 195.254,309.411L282.254,356.866C285.836,358.819 290.164,358.819 293.746,356.866L380.746,309.411C384.601,307.308 387,303.268 387,298.876L387,205.124C387,200.732 384.601,196.692 380.746,194.589L293.746,147.134C290.164,145.181 285.836,145.181 282.254,147.134Z'
-        style={{ fill: 'none', fillRule: 'nonzero', stroke: 'rgb(0,68,121)', strokeWidth: '12px' }}
-      />
-      <path
-        d='M288,252L216,216'
-        style={{ fill: 'none', fillRule: 'nonzero', stroke: 'rgb(0,68,121)', strokeWidth: '8px', strokeLinejoin: 'round' }}
-      />
-      <path
-        d='M216,288L288,252'
-        style={{ fill: 'none', fillRule: 'nonzero', stroke: 'rgb(0,68,121)', strokeWidth: '8px', strokeLinejoin: 'round' }}
-      />
-      <path
-        d='M360,288L288,252'
-        style={{ fill: 'none', fillRule: 'nonzero', stroke: 'rgb(0,68,121)', strokeWidth: '8px', strokeLinejoin: 'round' }}
-      />
-      <path
-        d='M360,216L288,252'
-        style={{ fill: 'none', fillRule: 'nonzero', stroke: 'rgb(0,68,121)', strokeWidth: '8px', strokeLinejoin: 'round' }}
-      />
-    </g>
-  </SvgIcon>
-);
-
-export default Icon;

packages/console-app/src/theme.js

@@ -1,79 +0,0 @@
-//
-// Copyright 2019 DXOS.org
-//
-
-import { createTheme as createMuiTheme } from '@material-ui/core/styles';
-import teal from '@material-ui/core/colors/teal';
-import orange from '@material-ui/core/colors/orange';
-
-export const createTheme = (theme) => createMuiTheme({
-
-  // https://material-ui.com/system/shadows
-  shadows: ['none'],
-
-  // https://stackoverflow.com/questions/60567673/reactjs-material-ui-theme-mixins-toolbar-offset-is-not-adapting-when-toolbar
-  mixins: {
-    denseToolbar: {
-      height: 48
-    }
-  },
-
-  // https://material-ui.com/customization/globals/#default-props
-  props: {
-    MuiButtonBase: {
-      disableRipple: true
-    },
-    MuiButton: {
-      size: 'small'
-    },
-    MuiFilledInput: {
-      margin: 'dense'
-    },
-    MuiFormControl: {
-      margin: 'dense'
-    },
-    MuiFormHelperText: {
-      margin: 'dense'
-    },
-    MuiIconButton: {
-      size: 'small'
-    },
-    MuiInputBase: {
-      margin: 'dense'
-    },
-    MuiInputLabel: {
-      margin: 'dense'
-    },
-    MuiTable: {
-      size: 'small'
-    },
-    MuiTextField: {
-      margin: 'dense'
-    },
-    MuiToolbar: {
-      variant: 'dense'
-    }
-  },
-
-  // https://material-ui.com/customization/palette/
-  palette: theme === 'dark' ? {
-    type: 'dark',
-    primary: orange
-  } : {
-    primary: teal
-  },
-
-  // https://material-ui.com/customization/theming/#theme-configuration-variables
-
-  // https://material-ui.com/customization/globals/
-  overrides: {
-    MuiCssBaseline: {
-      '@global': {
-        body: {
-          margin: 0,
-          overflow: 'hidden'
-        }
-      }
-    }
-  }
-});

packages/console-app/src/version.json

@@ -1,7 +0,0 @@
-{
-  "build": {
-    "name":      "@cerc-io/console-app",
-    "buildDate": "2020-12-19T03:06:08.492Z",
-    "version":   "1.2.9-alpha.1"
-  }
-}

packages/console-app/version.ejs

@@ -1,7 +0,0 @@
-{
-  "build": {
-    "name":      "<%= package.name %>",
-    "buildDate": "<%= currentTime.toISOString() %>",
-    "version":   "<%= package.version %>"
-  }
-}

public/index.html

@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+
+<head>
+  <meta charset="utf-8" />
+  <title>Laconic | Console</title>
+  <link rel="preconnect" href="https://fonts.googleapis.com" />
+  <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
+  <link
+    href="https://fonts.googleapis.com/css2?family=DM+Mono:ital,wght@0,300;0,400;0,500;1,300;1,400;1,500&display=swap"
+    rel="stylesheet" />
+</head>
+
+<body>
+  <div id="root"></div>
+</body>
+
+</html>

scripts/update_version.sh

@@ -0,0 +1,8 @@
+#/bin/bash
+
+
+NAME=`cat package.json | jq '.name'`
+VERSION=`cat package.json | jq '.version'`
+DATE=`date --rfc-3339=seconds`
+
+echo '{"build": {}}' | jq ".build.name = $NAME" | jq ".build.version = $VERSION" | jq ".build.buildDate = \"$DATE\""

src/client.js

@@ -2,10 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { ApolloClient } from 'apollo-client';
-import { ApolloLink } from 'apollo-link';
-import { createHttpLink } from 'apollo-link-http';
-import { InMemoryCache } from 'apollo-cache-inmemory';
+import { ApolloClient, InMemoryCache, ApolloLink, HttpLink } from '@apollo/client';
 
 import { createResolvers } from './resolvers';
 import { getServiceUrl } from './util/config';
@@ -28,7 +25,7 @@ export const graphqlApi = config => {
  */
 export const clientFactory = config => {
   // https://www.apollographql.com/docs/link/
-  const defaultLink = createHttpLink({
+  const defaultLink = new HttpLink({
     uri: graphqlApi(config),
 
     // TODO(burdon): Authentication: send signed message to server (from client wallet).
@@ -39,7 +36,7 @@ export const clientFactory = config => {
   });
 
   const serviceLinks = {
-    signal: createHttpLink({
+    signal: new HttpLink({
       uri: getServiceUrl(config, 'signal.api')
     })
   };

src/components/AppBar.js

@@ -0,0 +1,94 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import React from "react";
+import { makeStyles } from "@material-ui/core";
+import MuiAppBar from "@material-ui/core/AppBar";
+import Divider from "@material-ui/core/Divider";
+import Link from "@material-ui/core/Link";
+import Toolbar from "@material-ui/core/Toolbar";
+import Typography from "@material-ui/core/Typography";
+import blueGrey from "@material-ui/core/colors/blueGrey";
+// import GraphQLIcon from '@material-ui/icons/Adb';
+
+import LaconicIcon from "../icons/Logo";
+// import { graphqlApi } from '../client';
+
+const useStyles = makeStyles((theme) => ({
+  offset: theme.mixins.denseToolbar,
+
+  logo: {
+    marginRight: theme.spacing(2),
+    color: theme.palette.grey[800],
+
+    "& svg": {
+      width: 100,
+      height: 48,
+    },
+  },
+
+  logoLink: {
+    lineHeight: 0,
+  },
+
+  title: {
+    display: "flex",
+    flex: 1,
+    marginTop: 2,
+    color: "#FBFBFB",
+  },
+
+  link: {
+    color: blueGrey[900],
+  },
+
+  divider: {
+    backgroundColor: theme.palette.text.primary,
+    width: "1px",
+    height: "20px",
+    alignSelf: "center",
+    marginRight: 14,
+  },
+}));
+
+const AppBar = ({ config }) => {
+  const classes = useStyles();
+
+  return (
+    <>
+      <MuiAppBar position="fixed" elevation={0} color="primary">
+        <Toolbar>
+          <Link classes={{ root: classes.logoLink }} href="/">
+            <div className={classes.logo}>
+              <LaconicIcon />
+            </div>
+          </Link>
+          <Divider
+            orientation="vertical"
+            flexItem
+            className={classes.divider}
+          />
+          <div className={classes.title}>
+            <Typography variant="h6">{config.app.title}</Typography>
+          </div>
+          {/* <div>
+            <Link
+              className={classes.link}
+              href={graphqlApi(config)}
+              rel='noreferrer'
+              target='_blank'
+              title='Console GraphQL'
+            >
+              <GraphQLIcon />
+            </Link>
+          </div> */}
+        </Toolbar>
+      </MuiAppBar>
+
+      <div className={classes.offset} />
+    </>
+  );
+};
+
+export default AppBar;

src/components/AppLink.js

@@ -31,9 +31,9 @@ const getAppUrl = (config, { wrn }) => {
  * @param {string} name
  * @param {string} [text]
  */
-const AppLink = ({ config, crn, text }) => {
-  const fullURL = getAppUrl(config, { crn });
-  return <Link href={fullURL} target={crn}>{text || crn}</Link>;
+const AppLink = ({ config, lrn, text }) => {
+  const fullURL = getAppUrl(config, { lrn });
+  return <Link href={fullURL} target={lrn}>{text || lrn}</Link>;
 };
 
 export default AppLink;

src/components/Json.js

@@ -0,0 +1,38 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import React from "react";
+import { makeStyles } from "@material-ui/core";
+
+import { JsonTreeView } from "@lirewine/react-ux";
+
+import { omitDeep } from "../util/omit";
+
+const useStyles = makeStyles(() => ({
+  root: {
+    flex: 1,
+  },
+}));
+const useTreeStyles = makeStyles(
+  (theme) => ({
+    colorPrimary: {
+      color: theme.palette.secondary.main,
+    },
+  }),
+  { name: "MuiTypography" },
+);
+
+const Json = ({ data }) => {
+  const classes = useStyles();
+  useTreeStyles();
+
+  return (
+    <JsonTreeView
+      className={classes.root}
+      data={omitDeep(data, "__typename")}
+    />
+  );
+};
+
+export default Json;

src/components/Panel.js

@@ -5,7 +5,7 @@
 import React from 'react';
 import { makeStyles } from '@material-ui/core';
 
-const useStyles = makeStyles(() => ({
+const useStyles = makeStyles(theme => ({
   root: {
     display: 'flex',
     flexDirection: 'column',
@@ -17,7 +17,8 @@ const useStyles = makeStyles(() => ({
     display: 'flex',
     flexDirection: 'column',
     flex: 1,
-    overflow: 'hidden'
+    overflow: 'hidden',
+    backgroundColor: theme.palette.background.paper,
   }
 }));
 

src/components/QueryLink.js

@@ -10,8 +10,41 @@ import LinkIcon from '@material-ui/icons/ExitToApp';
 import { getServiceUrl } from '../util/config';
 
 const QUERY = `
-  query {
-    getRecordsByIds(ids: [ "%ID%" ]) {
+  fragment ValueParts on Value {
+    ... on BooleanValue {
+      bool: value
+    }
+    ... on IntValue {
+      int: value
+    }
+    ... on FloatValue {
+      float: value
+    }
+    ... on StringValue {
+      string: value
+    }
+    ... on BytesValue {
+      bytes: value
+    }
+    ... on LinkValue {
+      link: value
+    }
+  }
+
+  fragment AttrParts on Attribute {
+    key
+    value {
+      ...ValueParts
+      ... on ArrayValue {
+        value {
+          ...ValueParts
+        }
+      }
+    }
+  }
+
+  {
+    getRecordsByIds(ids: ["%ID%"]) {
       id
       names
       bondId
@@ -19,12 +52,12 @@ const QUERY = `
       expiryTime
       owners
       attributes {
-        key
+        ...AttrParts
         value {
-          string
-          json
-          reference {
-            id
+          ... on MapValue {
+            map: value {
+              ...AttrParts
+            }
           }
         }
       }

src/components/Sidebar.js

@@ -0,0 +1,138 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import clsx from "clsx";
+import React from "react";
+import { useHistory, useParams } from "react-router";
+// import { useQuery } from '@apollo/react-hooks';
+
+import { makeStyles } from "@material-ui/core";
+import List from "@material-ui/core/List";
+import ListItem from "@material-ui/core/ListItem";
+import ListItemIcon from "@material-ui/core/ListItemIcon";
+import LinkIcon from "@material-ui/icons/ExitToApp";
+import ListItemText from "@material-ui/core/ListItemText";
+
+// import EXTENSIONS from '../gql/extensions.graphql';
+// import { useQueryStatusReducer } from '../hooks';
+
+const useStyles = makeStyles((theme) => ({
+  root: {
+    display: "flex",
+    flex: 1,
+    flexDirection: "column",
+    justifyContent: "space-between",
+  },
+
+  list: {
+    padding: 0,
+  },
+
+  listItem: {
+    display: "flex",
+    alignItems: "center",
+    backgroundColor: theme.palette.background.default,
+  },
+
+  selected: {
+    backgroundColor: theme.palette.background.secondary,
+  },
+
+  itemText: {
+    fontFamily: '"DM Mono", monospace',
+    fontWeight: 400,
+  },
+
+  icon: {
+    minWidth: 40,
+    color: theme.palette.grey[500],
+  },
+
+  selected: {
+    color: theme.palette.text.primary,
+  },
+
+  expand: {
+    flex: 1,
+  },
+}));
+
+const Sidebar = ({ modules: { services, settings } }) => {
+  const classes = useStyles();
+  const history = useHistory();
+  const { module } = useParams();
+
+  // const { data: extensionsData } = useQueryStatusReducer(useQuery(EXTENSIONS));
+  // const extensions = extensionsData ? JSON.parse(extensionsData.extensions.json) : [];
+  const extensions = [];
+
+  const isSelected = (path) => path === `/${module}`;
+
+  const Modules = ({ modules }) => (
+    <List aria-label="items" className={classes.list}>
+      {modules.map(({ path, title, icon: Icon }) => (
+        <ListItem
+          button
+          selected={isSelected(path)}
+          key={path}
+          onClick={() => history.push(path)}
+          classes={{ root: classes.listItem, selected: classes.selected }}
+        >
+          <ListItemIcon classes={{ root: classes.icon }}>
+            <Icon
+              className={clsx(
+                classes.icon,
+                isSelected(path) && classes.selected,
+              )}
+            />
+          </ListItemIcon>
+          <ListItemText
+            primary={title.toUpperCase()}
+            classes={{ primary: classes.itemText }}
+          />
+        </ListItem>
+      ))}
+    </List>
+  );
+
+  const Extensions = ({ extensions }) => (
+    <List aria-label="items" className={classes.list}>
+      {extensions.map(({ url, title }) => {
+        url = url
+          .replace("%HOST%", window.location.host)
+          .replace("%PORT%", window.location.port)
+          .replace("%PROTOCOL%", window.location.protocol);
+        return (
+          <ListItem
+            button
+            key={url}
+            onClick={() => {
+              window.location = url;
+              return true;
+            }}
+          >
+            <ListItemIcon classes={{ root: classes.icon }}>
+              <LinkIcon className={clsx(classes.icon)} />
+            </ListItemIcon>
+            <ListItemText
+              primary={title.toUpperCase()}
+              classes={{ primary: classes.itemText }}
+            />
+          </ListItem>
+        );
+      })}
+    </List>
+  );
+
+  return (
+    <div className={classes.root}>
+      <Modules modules={services} />
+      <Extensions extensions={extensions} />
+      <div className={classes.expand} />
+      <Modules modules={settings} />
+    </div>
+  );
+};
+
+export default Sidebar;

src/components/Toolbar.js

@@ -0,0 +1,33 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import React from "react";
+import { makeStyles } from "@material-ui/core";
+import MuiToolbar from "@material-ui/core/Toolbar";
+
+const useStyles = makeStyles((theme) => ({
+  toolbar: {
+    display: "flex",
+    justifyContent: "space-between",
+    whiteSpace: "nowrap",
+
+    "& > button": {
+      margin: theme.spacing(0.5),
+    },
+    color: "primary",
+  },
+}));
+
+// TODO(burdon): Tabs.
+const Toolbar = ({ children }) => {
+  const classes = useStyles();
+
+  return (
+    <MuiToolbar disableGutters className={classes.toolbar}>
+      {children}
+    </MuiToolbar>
+  );
+};
+
+export default Toolbar;

src/containers/StatusBar.js

@@ -28,7 +28,10 @@ const useStyles = makeStyles((theme) => ({
     flexDirection: 'row',
     flex: 1,
     justifyContent: 'space-between',
-    backgroundColor: grey[900],
+    backgroundColor: theme.palette.background.default,
+    borderTop: 1,
+    borderTopColor: "rgba(255, 255, 255, 0.12)",
+    borderTopStyle: "solid",
     color: grey[400]
   },
   left: {

src/containers/panels/registry/Registry.js

@@ -2,43 +2,48 @@
 // Copyright 2020 DXOS.org
 //
 
-import React, { useState } from 'react';
-import { makeStyles } from '@material-ui/core';
-import Paper from '@material-ui/core/Paper';
-import Tab from '@material-ui/core/Tab';
-import Tabs from '@material-ui/core/Tabs';
-import TabContext from '@material-ui/lab/TabContext';
+import React, { useState } from "react";
+import { makeStyles } from "@material-ui/core";
+import Paper from "@material-ui/core/Paper";
+import Tab from "@material-ui/core/Tab";
+import Tabs from "@material-ui/core/Tabs";
+import TabContext from "@material-ui/lab/TabContext";
 
-import Panel from '../../../components/Panel';
-import Toolbar from '../../../components/Toolbar';
+import Panel from "../../../components/Panel";
+import Toolbar from "../../../components/Toolbar";
 // import LogPoller from '../../../components/LogPoller';
 
-import RegistryLookup, { LookupType } from './RegistryLookup';
-import RegistryStatus from './RegistryStatus';
-import RegistryRecords from './RegistryRecords';
+import RegistryLookup, { LookupType } from "./RegistryLookup";
+import RegistryStatus from "./RegistryStatus";
+import RegistryRecords from "./RegistryRecords";
 // import RegistryRecords, { RecordType } from './RegistryRecords';
 
-const TAB_RECORDS = 'records';
-const TAB_STATUS = 'status';
-const TAB_LOOKUP = 'lookup';
+const TAB_RECORDS = "records";
+const TAB_STATUS = "status";
+const TAB_LOOKUP = "lookup";
 // const TAB_LOG = 'log';
 
 const useStyles = makeStyles(() => ({
   expand: {
-    flex: 1
+    flex: 1,
   },
 
   panel: {
-    display: 'flex',
-    overflowY: 'scroll',
-    flex: 1
+    display: "flex",
+    overflowY: "scroll",
+    flex: 1,
   },
 
   paper: {
-    display: 'flex',
-    overflow: 'hidden',
-    flex: 1
-  }
+    display: "flex",
+    overflow: "hidden",
+    flex: 1,
+  },
+
+  tabs: {
+    fontFamily: '"DM Mono", monospace',
+    fontWeight: 400,
+  },
 }));
 
 const Registry = () => {
@@ -51,10 +56,14 @@ const Registry = () => {
     <Panel
       toolbar={
         <Toolbar>
-          <Tabs value={tab} onChange={(_, value) => setTab(value)}>
-            <Tab value={TAB_RECORDS} label='Records' />
-            <Tab value={TAB_LOOKUP} label='Lookup' />
-            <Tab value={TAB_STATUS} label='Status' />
+          <Tabs
+            value={tab}
+            onChange={(_, value) => setTab(value)}
+            indicatorColor="primary"
+          >
+            <Tab value={TAB_RECORDS} label="Records" className={classes.tabs} />
+            <Tab value={TAB_LOOKUP} label="Lookup" className={classes.tabs} />
+            <Tab value={TAB_STATUS} label="Status" className={classes.tabs} />
             {/* <Tab value={TAB_LOG} label='Log' /> */}
           </Tabs>
 

src/containers/panels/registry/RegistryLookup.js

@@ -37,7 +37,7 @@ const useStyles = makeStyles(theme => ({
 
 const types = [
   { key: 'authority', label: 'Authority' },
-  { key: 'crn', label: 'CRN' }
+  { key: 'lrn', label: 'LRN' }
 ];
 
 export const LookupType = ({ scope = types[0].key, onChange }) => {
@@ -87,7 +87,7 @@ const RegistryLookup = ({ scope }) => {
   const getNames = () => {
     let ret;
     switch (scope) {
-      case 'crn': {
+      case 'lrn': {
         ret = [];
         records.forEach(item => ret.push(...(item.names || [])));
         break;
@@ -99,8 +99,8 @@ const RegistryLookup = ({ scope }) => {
         const names = new Set();
         for (const record of records) {
           for (const name of (record.names || [])) {
-            // TODO(telackey): We need a general purpose CRN handling library.
-            names.add(name.replace('crn://', '').split('/')[0]);
+            // TODO(telackey): We need a general purpose LRN handling library.
+            names.add(name.replace('lrn://', '').split('/')[0]);
           }
         }
         ret = Array.from(names.values());
@@ -120,7 +120,7 @@ const RegistryLookup = ({ scope }) => {
 
     let result;
     switch (scope) {
-      case 'crn':
+      case 'lrn':
         result = await registry.lookupNames([newInputValue], true);
         break;
 

src/containers/panels/registry/RegistryRecords.js

@@ -31,13 +31,13 @@ const useStyles = makeStyles(theme => ({
 
 const types = [
   { key: null, label: 'ALL' },
-  { key: 'crn:kube', label: 'Kube' },
-  { key: 'crn:service', label: 'Service' },
-  { key: 'crn:app', label: 'App' },
-  { key: 'crn:bot', label: 'Bot' },
-  { key: 'crn:bot-factory', label: 'Bot Factory' },
-  { key: 'crn:file', label: 'File' },
-  { key: 'crn:type', label: 'Type' }
+  { key: 'lrn:kube', label: 'Kube' },
+  { key: 'lrn:service', label: 'Service' },
+  { key: 'lrn:app', label: 'App' },
+  { key: 'lrn:bot', label: 'Bot' },
+  { key: 'lrn:bot-factory', label: 'Bot Factory' },
+  { key: 'lrn:file', label: 'File' },
+  { key: 'lrn:type', label: 'Type' }
 ];
 
 export const RecordType = ({ type = types[0].key, onChange }) => {
@@ -104,12 +104,12 @@ const RegistryRecords = ({ type }) => {
               pkgLink = (<PackageLink config={config} type={type} pkg={pkg} />);
             }
 
-            if (type === 'crn:app') {
+            if (type === 'lrn:app') {
               appLinks = (
                 <>
-                  {(names || []).map(crn =>
-                    <div key={crn}>
-                      <AppLink config={config} crn={crn} />
+                  {(names || []).map(lrn =>
+                    <div key={lrn}>
+                      <AppLink config={config} lrn={lrn} />
                     </div>
                   )}
                 </>

src/hooks/registry.js

@@ -2,7 +2,7 @@
 // Copyright 2020 DXOS.org
 //
 
-import { Registry } from '@cerc-io/laconic-sdk';
+import { Registry } from '@cerc-io/registry-sdk';
 
 import { getServiceUrl } from '../util/config';
 

src/icons/Logo.js

@@ -0,0 +1,49 @@
+//
+// Copyright 2020 DXOS.org
+//
+
+import React from "react";
+import SvgIcon from "@material-ui/core/SvgIcon";
+
+// TODO(burdon): Fixed color?
+
+const Icon = (props) => (
+  <SvgIcon {...props} viewBox="0 0 115 20">
+    <path
+      fill-rule="evenodd"
+      clip-rule="evenodd"
+      d="M3.37388 10.5194C5.70149 8.19185 7.14225 4.97748 7.1416 1.42853C7.14246 0.94681 7.11586 0.470456 7.063 0L-0.000488281 0.000643078L-0.000273922 13.5723C-0.000917354 15.2174 0.62632 16.863 1.88091 18.1175C3.1356 19.3721 4.78235 20.0001 6.42772 19.9993L6.42729 19.9997L19.9995 20L19.999 12.9355C19.5296 12.8838 19.0532 12.857 18.5704 12.8569C15.0224 12.8574 11.8079 14.298 9.48026 16.6255C7.78654 18.2768 5.07093 18.2771 3.39812 16.6043C1.72638 14.9325 1.72562 12.2161 3.37388 10.5194ZM18.5344 1.46863C16.5837 -0.481929 13.4146 -0.48268 11.4633 1.46863C9.512 3.41984 9.51276 6.58895 11.4633 8.53941C13.415 10.491 16.5831 10.4907 18.5344 8.53941C20.4857 6.5882 20.4861 3.42016 18.5344 1.46863Z"
+      fill="#FBFBFB"
+    />
+    <path
+      d="M31.4741 18.5838H39.2552V16.3302H34.075V1.41351H31.4741V18.5838Z"
+      fill="#FBFBFB"
+    />
+    <path
+      d="M49.8108 1.41351H45.4976L40.9893 18.5838H43.6769L44.8039 14.2913H50.3744L51.5014 18.5838H54.3191L49.8108 1.41351ZM45.3458 12.145L47.6 3.2593H47.6866L49.8541 12.145H45.3458Z"
+      fill="#FBFBFB"
+    />
+    <path
+      d="M62.9292 8.06885H65.9636C65.9636 3.17534 64.3813 1.07196 60.6967 1.07196C56.8169 1.07196 55.1479 3.73341 55.1479 9.97909C55.1479 16.2462 56.8169 18.9291 60.6967 18.9291C64.3813 18.9291 65.9636 16.8901 65.9853 12.1468H62.9508C62.9292 15.8599 62.474 16.7828 60.6967 16.7828C58.6593 16.7828 58.1607 15.4307 58.1824 9.97909C58.1824 4.54896 58.6809 3.19678 60.6967 3.21823C62.474 3.21823 62.9292 4.18413 62.9292 8.06885Z"
+      fill="#FBFBFB"
+    />
+    <path
+      d="M73.7781 1.07209C77.7229 1.09364 79.4135 3.77643 79.4135 10.0007C79.4135 16.2249 77.7229 18.9078 73.7781 18.9292C69.8117 18.9507 68.1211 16.2678 68.1211 10.0007C68.1211 3.73354 69.8117 1.05064 73.7781 1.07209ZM71.1555 10.0007C71.1555 15.4308 71.6757 16.783 73.7781 16.783C75.8589 16.783 76.3791 15.4308 76.3791 10.0007C76.3791 4.54909 75.8589 3.19691 73.7781 3.21847C71.6757 3.23992 71.1555 4.59209 71.1555 10.0007Z"
+      fill="#FBFBFB"
+    />
+    <path
+      d="M85.0819 18.5624L82.481 18.5838V1.41351H87.0544L91.3243 15.4073H91.3676V1.41351H93.968V18.5838H89.677L85.1254 3.51689H85.0819V18.5624Z"
+      fill="#FBFBFB"
+    />
+    <path
+      d="M100.468 1.41351H97.8677V18.5838H100.468V1.41351Z"
+      fill="#FBFBFB"
+    />
+    <path
+      d="M111.139 8.06885H114.174C114.174 3.17534 112.591 1.07196 108.906 1.07196C105.028 1.07196 103.358 3.73341 103.358 9.97909C103.358 16.2462 105.028 18.9291 108.906 18.9291C112.591 18.9291 114.174 16.8901 114.195 12.1468H111.161C111.139 15.8599 110.684 16.7828 108.906 16.7828C106.869 16.7828 106.371 15.4307 106.393 9.97909C106.393 4.54896 106.891 3.19678 108.906 3.21823C110.684 3.21823 111.139 4.18413 111.139 8.06885Z"
+      fill="#FBFBFB"
+    />
+  </SvgIcon>
+);
+
+export default Icon;