| {destination} |
+
+
+ |
{source} |
Change
@@ -121,6 +203,9 @@ var ContainerSettingsVolumes = React.createClass({
{mounts}
+
);
diff --git a/src/components/Containers.react.js b/src/components/Containers.react.js
old mode 100644
new mode 100755
index e333938f2..1703c97a0
--- a/src/components/Containers.react.js
+++ b/src/components/Containers.react.js
@@ -8,6 +8,7 @@ import Header from './Header.react';
import metrics from '../utils/MetricsUtil';
import {shell} from 'electron';
import machine from '../utils/DockerMachineUtil';
+import docker from '../utils/DockerUtil';
var Containers = React.createClass({
contextTypes: {
@@ -112,7 +113,19 @@ var Containers = React.createClass({
metrics.track('Opened Issue Reporter', {
from: 'app'
});
- shell.openExternal('https://github.com/docker/kitematic');
+ shell.openExternal('https://github.com/docker/kitematic/issues/new');
+ },
+
+ refreshContainerList: function ($event) {
+ let btn = $event.target;
+ btn.disabled = true;
+ btn.className += ' refreshing';
+ docker.fetchAllContainers();
+ // rotate for one second
+ setTimeout(() => {
+ btn.className = 'btn btn-action btn-refresh';
+ btn.disabled = false;
+ }, 1000);
},
render: function () {
@@ -129,6 +142,9 @@ var Containers = React.createClass({
Containers
+
New
diff --git a/src/components/Header.react.js b/src/components/Header.react.js
old mode 100644
new mode 100755
diff --git a/src/components/ImageCard.react.js b/src/components/ImageCard.react.js
old mode 100644
new mode 100755
index b3ce231ae..4632f97d2
--- a/src/components/ImageCard.react.js
+++ b/src/components/ImageCard.react.js
@@ -178,7 +178,9 @@ var ImageCard = React.createClass({
} else if (this.state.tags.length === 0) {
tags = No Tags ;
} else {
- var tagDisplay = this.state.tags.filter(tag => tag.name.includes(this.state.searchTag)).map((tag) => {
+ var tagDisplay = this.state.tags.filter(
+ tag => (typeof tag === 'string' ? tag : tag.name).includes(this.state.searchTag)
+ ).map((tag) => {
let t = '';
if (tag.name) {
t = tag.name;
diff --git a/src/components/Loading.react.js b/src/components/Loading.react.js
old mode 100644
new mode 100755
diff --git a/src/components/NewContainerSearch.react.js b/src/components/NewContainerSearch.react.js
old mode 100644
new mode 100755
index ef81c309a..33de63011
--- a/src/components/NewContainerSearch.react.js
+++ b/src/components/NewContainerSearch.react.js
@@ -222,7 +222,7 @@ module.exports = React.createClass({
} else if (filter === 'userrepos' && !accountStore.getState().username) {
results = (
- Log In or Sign Up to access your Docker Hub repositories.
+ Log In to access your Docker Hub repositories.
);
diff --git a/src/components/Preferences.react.js b/src/components/Preferences.react.js
old mode 100644
new mode 100755
diff --git a/src/components/Radial.react.js b/src/components/Radial.react.js
old mode 100644
new mode 100755
diff --git a/src/components/Setup.react.js b/src/components/Setup.react.js
old mode 100644
new mode 100755
diff --git a/src/main.js b/src/main.js
old mode 100644
new mode 100755
diff --git a/src/main.js.map b/src/main.js.map
old mode 100644
new mode 100755
diff --git a/src/main.ts b/src/main.ts
old mode 100644
new mode 100755
diff --git a/src/menutemplate.js b/src/menutemplate.js
old mode 100644
new mode 100755
diff --git a/src/router.js b/src/router.js
old mode 100644
new mode 100755
diff --git a/src/routes.js b/src/routes.js
old mode 100644
new mode 100755
index dbb8c4135..bf7c5bae6
--- a/src/routes.js
+++ b/src/routes.js
@@ -1,7 +1,6 @@
import React from 'react/addons';
import Setup from './components/Setup.react';
import Account from './components/Account.react';
-import AccountSignup from './components/AccountSignup.react';
import AccountLogin from './components/AccountLogin.react';
import Containers from './components/Containers.react';
import ContainerDetails from './components/ContainerDetails.react';
@@ -33,7 +32,6 @@ var App = React.createClass({
var routes = (
-
diff --git a/src/stores/AccountStore.js b/src/stores/AccountStore.js
old mode 100644
new mode 100755
index c6f9b3ca9..d200e1df1
--- a/src/stores/AccountStore.js
+++ b/src/stores/AccountStore.js
@@ -37,13 +37,6 @@ class AccountStore {
});
}
- signup () {
- this.setState({
- loading: true,
- errors: {}
- });
- }
-
loggedin ({username, verified}) {
this.setState({username, verified, errors: {}, loading: false});
}
diff --git a/src/stores/ContainerStore.js b/src/stores/ContainerStore.js
old mode 100644
new mode 100755
diff --git a/src/stores/ImageStore.js b/src/stores/ImageStore.js
old mode 100644
new mode 100755
diff --git a/src/stores/NetworkStore.js b/src/stores/NetworkStore.js
old mode 100644
new mode 100755
diff --git a/src/stores/RepositoryStore.js b/src/stores/RepositoryStore.js
old mode 100644
new mode 100755
diff --git a/src/stores/SetupStore.js b/src/stores/SetupStore.js
old mode 100644
new mode 100755
diff --git a/src/stores/TagStore.js b/src/stores/TagStore.js
old mode 100644
new mode 100755
diff --git a/src/utils/ContainerUtil.js b/src/utils/ContainerUtil.js
old mode 100644
new mode 100755
diff --git a/src/utils/DockerMachineUtil.js b/src/utils/DockerMachineUtil.js
old mode 100644
new mode 100755
diff --git a/src/utils/DockerUtil.js b/src/utils/DockerUtil.js
old mode 100644
new mode 100755
diff --git a/src/utils/HubUtil.js b/src/utils/HubUtil.js
old mode 100644
new mode 100755
index dce1ac7b4..a0a16cb0f
--- a/src/utils/HubUtil.js
+++ b/src/utils/HubUtil.js
@@ -114,7 +114,7 @@ module.exports = {
return;
}
- let data = JSON.parse(body);
+ let data = body;
if (response.statusCode === 200) {
if (data.token) {
@@ -131,6 +131,9 @@ module.exports = {
accountServerActions.errors({errors: {detail: 'Did not receive login token.'}});
if (callback) { callback(new Error('Did not receive login token.')); }
}
+ } else if (response.statusCode === 400) {
+ accountServerActions.errors({errors: data});
+ if (callback) { callback(new Error(data.detail)); }
} else if (response.statusCode === 401) {
if (data && data.detail && data.detail.indexOf('Account not active yet') !== -1) {
accountServerActions.loggedin({username, verified: false});
@@ -143,12 +146,18 @@ module.exports = {
accountServerActions.errors({errors: data});
if (callback) { callback(new Error(data.detail)); }
}
+ } else {
+ accountServerActions.errors({errors: {detail: 'Сan not parse the server response.'}});
+ if (callback) { callback(new Error('Сan not parse the server response.')); }
}
});
},
auth: function (username, password, callback) {
- request.post(`${HUB2_ENDPOINT}/users/login/`, {form: {username, password}}, (error, response, body) => {
+ request.post(`${HUB2_ENDPOINT}/users/login/`, {
+ body: {username: username, password: password},
+ json: true
+ }, (error, response, body) => {
callback(error, response, body);
});
},
@@ -166,33 +175,5 @@ module.exports = {
creds: function (config) {
return new Buffer(config, 'base64').toString().split(/:(.+)?/).slice(0, 2);
- },
-
- // Signs up and places a token under ~/.dockercfg and saves a jwt to localstore
- signup: function (username, password, email, subscribe) {
- request.post(`${HUB2_ENDPOINT}/users/signup/`, {
- form: {
- username,
- password,
- email,
- subscribe
- }
- }, (err, response, body) => {
- if (response && response.statusCode === 204) {
- accountServerActions.signedup({username, verified: false});
- accountServerActions.prompted({prompted: true});
- localStorage.setItem('auth.username', username);
- localStorage.setItem('auth.verified', false);
- localStorage.setItem('auth.config', new Buffer(username + ':' + password).toString('base64'));
- metrics.track('Successfully Signed Up');
- } else {
- let data = JSON.parse(body);
- let errors = {};
- for (let key in data) {
- errors[key] = data[key][0];
- }
- accountServerActions.errors({errors});
- }
- });
- },
+ }
};
diff --git a/src/utils/MetricsUtil.js b/src/utils/MetricsUtil.js
old mode 100644
new mode 100755
diff --git a/src/utils/RegHubUtil.js b/src/utils/RegHubUtil.js
old mode 100644
new mode 100755
diff --git a/src/utils/SetupUtil.js b/src/utils/SetupUtil.js
old mode 100644
new mode 100755
diff --git a/src/utils/Util.js b/src/utils/Util.js
old mode 100644
new mode 100755
diff --git a/src/utils/VirtualBoxUtil.js b/src/utils/VirtualBoxUtil.js
old mode 100644
new mode 100755
diff --git a/src/utils/WebUtil.js b/src/utils/WebUtil.js
old mode 100644
new mode 100755
diff --git a/styles/animation.less b/styles/animation.less
old mode 100644
new mode 100755
diff --git a/styles/container-home.less b/styles/container-home.less
old mode 100644
new mode 100755
diff --git a/styles/container-logs.less b/styles/container-logs.less
old mode 100644
new mode 100755
diff --git a/styles/container-progress.less b/styles/container-progress.less
old mode 100644
new mode 100755
diff --git a/styles/container-settings.less b/styles/container-settings.less
old mode 100644
new mode 100755
diff --git a/styles/header.less b/styles/header.less
old mode 100644
new mode 100755
diff --git a/styles/icons.less b/styles/icons.less
old mode 100644
new mode 100755
diff --git a/styles/layout.less b/styles/layout.less
old mode 100644
new mode 100755
diff --git a/styles/left-panel.less b/styles/left-panel.less
old mode 100644
new mode 100755
index e2940aec4..03629a5bb
--- a/styles/left-panel.less
+++ b/styles/left-panel.less
@@ -1,5 +1,12 @@
/* Sidebar */
+
+@-webkit-keyframes spin {
+ 100% {
+ -webkit-transform: rotate(360deg);
+ }
+}
+
.sidebar {
background-color: white;
margin: 0;
@@ -26,6 +33,15 @@
display: inline-block;
position: relative;
}
+ .btn-refresh {
+ border: 0;
+ margin: 2px;
+ font-size: 1.6em;
+ cursor: pointer;
+ &.refreshing {
+ -webkit-animation: spin 1s linear infinite;
+ }
+}
.create {
display: flex;
flex: 1 auto;
diff --git a/styles/loading.less b/styles/loading.less
old mode 100644
new mode 100755
diff --git a/styles/main.less b/styles/main.less
old mode 100644
new mode 100755
diff --git a/styles/mixins.less b/styles/mixins.less
old mode 100644
new mode 100755
diff --git a/styles/new-container.less b/styles/new-container.less
old mode 100644
new mode 100755
diff --git a/styles/preferences.less b/styles/preferences.less
old mode 100644
new mode 100755
diff --git a/styles/radial.less b/styles/radial.less
old mode 100644
new mode 100755
diff --git a/styles/retina.less b/styles/retina.less
old mode 100644
new mode 100755
diff --git a/styles/right-panel.less b/styles/right-panel.less
old mode 100644
new mode 100755
diff --git a/styles/setup.less b/styles/setup.less
old mode 100644
new mode 100755
diff --git a/styles/spinner.less b/styles/spinner.less
old mode 100644
new mode 100755
diff --git a/styles/theme.less b/styles/theme.less
old mode 100644
new mode 100755
diff --git a/styles/variables.less b/styles/variables.less
old mode 100644
new mode 100755
diff --git a/tsconfig.json b/tsconfig.json
old mode 100644
new mode 100755
diff --git a/tslint.json b/tslint.json
old mode 100644
new mode 100755
diff --git a/util/Info.plist b/util/Info.plist
old mode 100644
new mode 100755
diff --git a/util/kitematic.icns b/util/kitematic.icns
old mode 100644
new mode 100755
diff --git a/util/kitematic.ico b/util/kitematic.ico
old mode 100644
new mode 100755
diff --git a/util/kitematic.png b/util/kitematic.png
old mode 100644
new mode 100755
diff --git a/util/loading.gif b/util/loading.gif
old mode 100644
new mode 100755
diff --git a/util/prepare.js b/util/prepare.js
old mode 100644
new mode 100755
diff --git a/util/reset.ps1 b/util/reset.ps1
old mode 100644
new mode 100755
diff --git a/util/setup.ico b/util/setup.ico
old mode 100644
new mode 100755
diff --git a/util/testenv.js b/util/testenv.js
old mode 100644
new mode 100755
|