diff --git a/app-backend/dist/css/rdash-custom.css b/app-backend/dist/css/rdash-custom.css
index 60738da..0b22a46 100644
--- a/app-backend/dist/css/rdash-custom.css
+++ b/app-backend/dist/css/rdash-custom.css
@@ -10,14 +10,14 @@
white-space: pre-line;
}
.inline-loader {
- border: 3px solid #f3f3f3;
+ border: 1px solid #f3f3f3;
border-radius: 50%;
- border-top: 3px solid blue;
- border-bottom: 3px solid blue;
- width: 20px;
- height: 20px;
- -webkit-animation: spin-loader 2s linear infinite;
- animation: spin-loader 2s linear infinite;
+ border-top: 1px solid blue;
+ border-bottom: 1px solid blue;
+ width: 18px;
+ height: 18px;
+ -webkit-animation: spin-loader 0.8s linear infinite;
+ animation: spin-loader 0.8s linear infinite;
}
@-webkit-keyframes spin-loader {
0% {
diff --git a/app-backend/dist/js/dashboard.min.js b/app-backend/dist/js/dashboard.min.js
index e0d5b6f..a1d701e 100644
--- a/app-backend/dist/js/dashboard.min.js
+++ b/app-backend/dist/js/dashboard.min.js
@@ -652,124 +652,6 @@ angular.module('RDash')
}
});
-/**
- * File Upload Read Directive
- */
-
-angular
- .module('RDash')
- .directive("fileread", [function () {
- return {
- scope: {
- fileread: "="
- },
- link: function (scope, element, attributes) {
- element.bind("change", function (changeEvent) {
- scope.$apply(function () {
- scope.fileread = changeEvent.target.files[0];
- // or all selected files:
- // scope.fileread = changeEvent.target.files;
- });
- });
- }
- }
- }]);
-/**
- * Loading Directive
- * @see http://tobiasahlin.com/spinkit/
- */
-
-angular
- .module('RDash')
- .directive('rdLoading', rdLoading);
-
-function rdLoading() {
- var directive = {
- restrict: 'AE',
- template: ''
- };
- return directive;
-};
-/**
- * Widget Body Directive
- */
-
-angular
- .module('RDash')
- .directive('rdWidgetBody', rdWidgetBody);
-
-function rdWidgetBody() {
- var directive = {
- requires: '^rdWidget',
- scope: {
- loading: '=?',
- classes: '@?'
- },
- transclude: true,
- template: '',
- restrict: 'E'
- };
- return directive;
-};
-
-/**
- * Widget Footer Directive
- */
-
-angular
- .module('RDash')
- .directive('rdWidgetFooter', rdWidgetFooter);
-
-function rdWidgetFooter() {
- var directive = {
- requires: '^rdWidget',
- transclude: true,
- template: '',
- restrict: 'E'
- };
- return directive;
-};
-/**
- * Widget Header Directive
- */
-
-angular
- .module('RDash')
- .directive('rdWidgetHeader', rdWidgetTitle);
-
-function rdWidgetTitle() {
- var directive = {
- requires: '^rdWidget',
- scope: {
- title: '@',
- icon: '@'
- },
- transclude: true,
- template: '',
- restrict: 'E'
- };
- return directive;
-};
-/**
- * Widget Directive
- */
-
-angular
- .module('RDash')
- .directive('rdWidget', rdWidget);
-
-function rdWidget() {
- var directive = {
- transclude: true,
- template: '',
- restrict: 'EA'
- };
- return directive;
-
- function link(scope, element, attrs) {
- /* */
- }
-};
/**
* Alerts Controller
*/
@@ -1649,4 +1531,122 @@ function SettingsCtrl($scope, $cookieStore, $rootScope, pageDefinitions,
}());
-}
\ No newline at end of file
+}
+/**
+ * File Upload Read Directive
+ */
+
+angular
+ .module('RDash')
+ .directive("fileread", [function () {
+ return {
+ scope: {
+ fileread: "="
+ },
+ link: function (scope, element, attributes) {
+ element.bind("change", function (changeEvent) {
+ scope.$apply(function () {
+ scope.fileread = changeEvent.target.files[0];
+ // or all selected files:
+ // scope.fileread = changeEvent.target.files;
+ });
+ });
+ }
+ }
+ }]);
+/**
+ * Loading Directive
+ * @see http://tobiasahlin.com/spinkit/
+ */
+
+angular
+ .module('RDash')
+ .directive('rdLoading', rdLoading);
+
+function rdLoading() {
+ var directive = {
+ restrict: 'AE',
+ template: ''
+ };
+ return directive;
+};
+/**
+ * Widget Body Directive
+ */
+
+angular
+ .module('RDash')
+ .directive('rdWidgetBody', rdWidgetBody);
+
+function rdWidgetBody() {
+ var directive = {
+ requires: '^rdWidget',
+ scope: {
+ loading: '=?',
+ classes: '@?'
+ },
+ transclude: true,
+ template: '',
+ restrict: 'E'
+ };
+ return directive;
+};
+
+/**
+ * Widget Footer Directive
+ */
+
+angular
+ .module('RDash')
+ .directive('rdWidgetFooter', rdWidgetFooter);
+
+function rdWidgetFooter() {
+ var directive = {
+ requires: '^rdWidget',
+ transclude: true,
+ template: '',
+ restrict: 'E'
+ };
+ return directive;
+};
+/**
+ * Widget Header Directive
+ */
+
+angular
+ .module('RDash')
+ .directive('rdWidgetHeader', rdWidgetTitle);
+
+function rdWidgetTitle() {
+ var directive = {
+ requires: '^rdWidget',
+ scope: {
+ title: '@',
+ icon: '@'
+ },
+ transclude: true,
+ template: '',
+ restrict: 'E'
+ };
+ return directive;
+};
+/**
+ * Widget Directive
+ */
+
+angular
+ .module('RDash')
+ .directive('rdWidget', rdWidget);
+
+function rdWidget() {
+ var directive = {
+ transclude: true,
+ template: '',
+ restrict: 'EA'
+ };
+ return directive;
+
+ function link(scope, element, attrs) {
+ /* */
+ }
+};
\ No newline at end of file
diff --git a/app-backend/dist/templates/apps.html b/app-backend/dist/templates/apps.html
index f061d13..2995465 100644
--- a/app-backend/dist/templates/apps.html
+++ b/app-backend/dist/templates/apps.html
@@ -215,8 +215,22 @@
Deployed at {{app.deployedTimeStamp}}
- You can deploy your app using the Captain command line tool (recommended) or via this web interface. No matter
- what approach you choose, you need to provide 'captain-definition' file. See docs for more details.
+ Make sure that you have a 'captain-definition' file in your project. See
+ docs for more details.
+
+ Method 1 (RECOMMENDED)
+
+ Use CLI deploy command. This is the best method as it's the only method that reports potential build failures
+ to you.
+ Read here
+
+
+ Method 2: Tarball
+
+
+ You can simiply create a tarball (
+ .tar) of your project and upload it here via upload button.
+
@@ -237,11 +251,13 @@
-
- Deploy from Github/Bitbucket
-
+
+
+ Method 3: Deploy from Github/Bitbucket
+
- POST Webhook:
+ Enter your repository information in the form and save. Then copy the URL in the box as a webhook on Github, Bitbuck and
+ etc. Once you push a commit, CaptainDuckDuck starts a new build.
{{app.appPushWebhook.pushWebhookToken?(rootDomainWithProtocol+'/api/v1/user/webhooks/triggerbuild?namespace=captain&token='+app.appPushWebhook.pushWebhookToken):
'** Add repo info and save for this webhook to appear **'}}
@@ -277,13 +293,18 @@
-
-
-
- Building the image. This might take a few minutes...
-
+
+
+
+
+
+
+ Building the image. This might take a few minutes...
+
+
- You can deploy your app using the Captain command line tool (recommended) or via this web interface. No matter
- what approach you choose, you need to provide 'captain-definition' file. See docs for more details.
+ Make sure that you have a 'captain-definition' file in your project. See
+ docs for more details.
+
+ Method 1 (RECOMMENDED)
+
+ Use CLI deploy command. This is the best method as it's the only method that reports potential build failures
+ to you.
+ Read here
+
+
+ Method 2: Tarball
+
+
+ You can simiply create a tarball (
+ .tar) of your project and upload it here via upload button.
+
@@ -238,11 +252,13 @@
-
- Deploy from Github/Bitbucket
-
+
+
+ Method 3: Deploy from Github/Bitbucket
+
- POST Webhook:
+ Enter your repository information in the form and save. Then copy the URL in the box as a webhook on Github, Bitbuck and
+ etc. Once you push a commit, CaptainDuckDuck starts a new build.
{{app.appPushWebhook.pushWebhookToken?(rootDomainWithProtocol+'/api/v1/user/webhooks/triggerbuild?namespace=captain&token='+app.appPushWebhook.pushWebhookToken):
'** Add repo info and save for this webhook to appear **'}}
@@ -278,13 +294,18 @@
-
-
-
- Building the image. This might take a few minutes...
-
+
+
+
+
+
+
+ Building the image. This might take a few minutes...
+
+