diff --git a/bundle/src/index.js b/bundle/src/index.js
index 7b6d940a..fc15e484 100644
--- a/bundle/src/index.js
+++ b/bundle/src/index.js
@@ -22,10 +22,12 @@ const {
BASE_URL = `http://0.0.0.0:${PORT}`,
ROLLBAR_SERVER_TOKEN,
NODE_ENV = 'development',
- CONSOLE = 'my-joy-instances'
+ // CONSOLE = 'my-joy-instances'
} = process.env;
-const Ui = require(CONSOLE);
+const Ui = require('my-joy-instances');
+// const Instances = require('my-joy-instances');
+// const Images = require('my-joy-images');
const server = Hapi.server({
compression: {
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 7d497a0a..216a00f6 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,7 @@
{
"name": "joyent-icons",
"version": "5.0.0",
+ "private": true,
"license": "MPL-2.0",
"repository": "github:yldio/joyent-portal",
"main": "dist/umd/index.js",
diff --git a/packages/logos/package.json b/packages/logos/package.json
index 43aee564..1ccb72df 100644
--- a/packages/logos/package.json
+++ b/packages/logos/package.json
@@ -1,6 +1,7 @@
{
"name": "joyent-logo-assets",
"version": "1.0.0",
+ "private": true,
"license": "MPL-2.0",
"repository": "github:yldio/joyent-portal",
"main": "dist/umd/index.js",
diff --git a/packages/my-joy-images/.npmignore b/packages/my-joy-images/.npmignore
index c6ab8320..1f4d8165 100644
--- a/packages/my-joy-images/.npmignore
+++ b/packages/my-joy-images/.npmignore
@@ -23,4 +23,5 @@ yarn-error.log*
!lib/app
-!dist
\ No newline at end of file
+!dist
+!build
\ No newline at end of file
diff --git a/packages/my-joy-images/package.json b/packages/my-joy-images/package.json
index 2c72f917..1a77040f 100644
--- a/packages/my-joy-images/package.json
+++ b/packages/my-joy-images/package.json
@@ -1,8 +1,8 @@
{
"name": "my-joy-images",
- "version": "1.0.0",
- "license": "MPL-2.0",
+ "version": "1.1.6",
"private": true,
+ "license": "MPL-2.0",
"repository": "github:yldio/joyent-portal",
"main": "lib/index.js",
"scripts": {
@@ -29,8 +29,8 @@
"declarative-redux-form": "^2.0.8",
"force-array": "^3.1.0",
"fuse.js": "^3.2.0",
- "hapi-render-react": "^2.1.0",
- "hapi-render-react-joyent-document": "^4.2.3",
+ "hapi-render-react": "^2.2.0",
+ "hapi-render-react-joyent-document": "^4.4.0",
"joyent-logo-assets": "^1.0.0",
"joyent-react-styled-flexboxgrid": "^2.2.3",
"joyent-ui-toolkit": "^5.0.0",
diff --git a/packages/my-joy-images/src/_document.js b/packages/my-joy-images/src/_document.js
index 7926d32b..38915d57 100644
--- a/packages/my-joy-images/src/_document.js
+++ b/packages/my-joy-images/src/_document.js
@@ -8,6 +8,7 @@ const { default: createClient } = require('./state/apollo-client');
const { default: createStore } = require('./state/redux-store');
const indexFile = path.join(__dirname, '../../build/index.html');
+const assets = require('../../build/asset-manifest.json');
const getState = request => {
const { req } = request.raw;
@@ -31,4 +32,9 @@ const getState = request => {
};
};
-module.exports = Document({ indexFile, getState });
+module.exports = Document({
+ namespace: 'images/',
+ assets,
+ indexFile,
+ getState
+});
diff --git a/packages/my-joy-images/src/components/image.js b/packages/my-joy-images/src/components/image.js
index 732ae624..422ae086 100644
--- a/packages/my-joy-images/src/components/image.js
+++ b/packages/my-joy-images/src/components/image.js
@@ -23,6 +23,7 @@ import {
StatusLoader
} from 'joyent-ui-toolkit';
+import GLOBAL from '@state/global';
import { ImageType, OS } from '@root/constants';
const A = styled(Anchor)`
@@ -78,7 +79,7 @@ export const Image = ({
onCreateInstance
}) => (
-
+
{removing ? (
@@ -95,7 +96,7 @@ export const Image = ({
height: '24'
})}
-
+
{name}
@@ -124,7 +125,7 @@ export const Image = ({
diff --git a/packages/my-joy-images/src/components/summary.js b/packages/my-joy-images/src/components/summary.js
index f57d1049..464dbffa 100644
--- a/packages/my-joy-images/src/components/summary.js
+++ b/packages/my-joy-images/src/components/summary.js
@@ -24,6 +24,7 @@ import {
Input
} from 'joyent-ui-toolkit';
+import GLOBAL from '@state/global';
import { ImageType, OS } from '@root/constants';
const { SmallOnly, Medium } = QueryBreakpoints;
@@ -115,7 +116,7 @@ export default withTheme(({ theme = {}, onRemove, removing, ...image }) => (