From 1cdcb5c65cab532cec0137d656142e9b2a022c3d Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:19:22 +0800 Subject: [PATCH 01/23] feat(user): add user file --- public/add-user.html | 121 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 public/add-user.html diff --git a/public/add-user.html b/public/add-user.html new file mode 100644 index 0000000..7a73b78 --- /dev/null +++ b/public/add-user.html @@ -0,0 +1,121 @@ + + + + + + + + Crun + + + + + + + + + + + + + +
+
+
+
+ + + + +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
Roles
+
Command
+
Group
+
Execution
+
+
+
+
+
+ + + + + + + + From 651f4cc72867bb7c3bedebfc38c8b80f09aea2ff Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:29:16 +0800 Subject: [PATCH 02/23] feat(npm): added select2 dependency --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index a06a86e..69acdff 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,8 @@ "rand-token": "^0.2.1", "react": "^15.4.1", "react-dom": "^15.4.1", - "redux": "^3.6.0" + "redux": "^3.6.0", + "select2": "^4.0.3" }, "eslintConfig": { "extends": "google", From b7c73db57c4c8c818eaedcdf203b0ea11efe0043 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:29:47 +0800 Subject: [PATCH 03/23] feat(select2): added new task select2 --- gulpfile.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 7244595..50ce6c1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,7 +12,8 @@ let tasks = [ 'bootstrap-css-lib', 'bootstrap-fonts-lib', 'font-awesome-lib.js', - 'font-awesome-fonts-lib' + 'font-awesome-fonts-lib', + 'select2-css-lib' ]; tasks.forEach(function(name) { @@ -38,5 +39,6 @@ gulp.task('default', [ 'bootstrap-css-lib', 'bootstrap-fonts-lib', 'font-awesome-lib.js', - 'font-awesome-fonts-lib' + 'font-awesome-fonts-lib', + 'select2-css-lib' ]); From f110065e8c07cda559d9e77d15fde29eaeb1d9db Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:30:24 +0800 Subject: [PATCH 04/23] feat(select2): added select2 library --- gulp/tasks/select2-css-lib.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 gulp/tasks/select2-css-lib.js diff --git a/gulp/tasks/select2-css-lib.js b/gulp/tasks/select2-css-lib.js new file mode 100644 index 0000000..edb6dab --- /dev/null +++ b/gulp/tasks/select2-css-lib.js @@ -0,0 +1,8 @@ +var gulp = require('gulp'); +var rename = require('gulp-rename'); + +module.exports = function() { + return gulp.src('node_modules/select2/dist/css/select2.min.css') + .pipe(rename('select2.css')) + .pipe(gulp.dest('public/dist/css/lib')); +}; \ No newline at end of file From a7f8af53e741944f05c6dd1603597dd2313bfc40 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:35:02 +0800 Subject: [PATCH 05/23] feat(select2): select2 js --- gulp/tasks/select2-js-lib.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 gulp/tasks/select2-js-lib.js diff --git a/gulp/tasks/select2-js-lib.js b/gulp/tasks/select2-js-lib.js new file mode 100644 index 0000000..d983f99 --- /dev/null +++ b/gulp/tasks/select2-js-lib.js @@ -0,0 +1,8 @@ +var gulp = require('gulp'); +var rename = require('gulp-rename'); + +module.exports = function() { + return gulp.src('node_modules/select2/dist/js/select2.min.js') + .pipe(rename('select2.js')) + .pipe(gulp.dest('public/dist/css/lib')); +}; \ No newline at end of file From 415bcc76c5c5d34baa0b7e7989b925feb96f5a41 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:35:23 +0800 Subject: [PATCH 06/23] feat(npm): added select2 js task --- gulpfile.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 50ce6c1..83f5857 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -13,7 +13,8 @@ let tasks = [ 'bootstrap-fonts-lib', 'font-awesome-lib.js', 'font-awesome-fonts-lib', - 'select2-css-lib' + 'select2-css-lib', + 'select2-js-lib' ]; tasks.forEach(function(name) { @@ -40,5 +41,6 @@ gulp.task('default', [ 'bootstrap-fonts-lib', 'font-awesome-lib.js', 'font-awesome-fonts-lib', - 'select2-css-lib' + 'select2-css-lib', + 'select2-js-lib' ]); From 0c29afee95d5da8fdbfd14900bcc4e5fd0c9d472 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:45:18 +0800 Subject: [PATCH 07/23] feat(js): added custom javascript --- public/src/js/custom.js | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 public/src/js/custom.js diff --git a/public/src/js/custom.js b/public/src/js/custom.js new file mode 100644 index 0000000..87da08d --- /dev/null +++ b/public/src/js/custom.js @@ -0,0 +1,6 @@ +$(document).ready(function(){ + + // temp function (ui purposes) + $('.select2').select2(); + +}); \ No newline at end of file From b0704d803d47873a7f5318d77bea9524eab25838 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:45:48 +0800 Subject: [PATCH 08/23] feat(select2): hotfix directory error --- gulp/tasks/select2-js-lib.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gulp/tasks/select2-js-lib.js b/gulp/tasks/select2-js-lib.js index d983f99..49589e7 100644 --- a/gulp/tasks/select2-js-lib.js +++ b/gulp/tasks/select2-js-lib.js @@ -4,5 +4,5 @@ var rename = require('gulp-rename'); module.exports = function() { return gulp.src('node_modules/select2/dist/js/select2.min.js') .pipe(rename('select2.js')) - .pipe(gulp.dest('public/dist/css/lib')); + .pipe(gulp.dest('public/dist/js/lib')); }; \ No newline at end of file From 18a4110e968949489d41080a07b7ebfd474d3904 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 14:48:26 +0800 Subject: [PATCH 09/23] feat(user): added select2 in the form --- public/add-user.html | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/public/add-user.html b/public/add-user.html index 7a73b78..62016ff 100644 --- a/public/add-user.html +++ b/public/add-user.html @@ -9,6 +9,7 @@ + @@ -91,7 +92,7 @@
- @@ -99,6 +100,14 @@
+
+
+ +
+
+ +
+
@@ -117,5 +126,7 @@ + + From 2ddbb08fa9363823fdbc96a82366234e8d37cc7e Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 15:05:22 +0800 Subject: [PATCH 10/23] feat(user): added user edit file --- public/edit-user.html | 121 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 121 insertions(+) create mode 100644 public/edit-user.html diff --git a/public/edit-user.html b/public/edit-user.html new file mode 100644 index 0000000..e177a51 --- /dev/null +++ b/public/edit-user.html @@ -0,0 +1,121 @@ + + + + + + + + Crun + + + + + + + + + + + + + + +
+
+
+
+ + + + +
+
+
+

Edit User

+
+
+ +
+ +
+
+
+
+ +
+
+ +
+
+
+
+
+
Roles
+
Command
+
Group
+
Execution
+
+
+
+
+
+ + + + + + + + + + From 4981beb7507453230e87873a4b5169d20ed15858 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 15:05:37 +0800 Subject: [PATCH 11/23] feat(user): user header --- public/add-user.html | 1 + 1 file changed, 1 insertion(+) diff --git a/public/add-user.html b/public/add-user.html index 62016ff..ccc8481 100644 --- a/public/add-user.html +++ b/public/add-user.html @@ -76,6 +76,7 @@
+

Add User

From 938b7a63da00dbaa9351c7da96468acd4d145a4a Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 15:37:46 +0800 Subject: [PATCH 12/23] feat(role): added role list --- public/index.html | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 194e82e..d83429e 100644 --- a/public/index.html +++ b/public/index.html @@ -108,7 +108,38 @@
-
Roles
+
+
+ + + + + + + + + + + + + +
NameCreated AtCreated ByAction
Admin01/01/2016John + + +
+ +
+
+ +
+
+ +
+
Command
Group
Execution
From 34c51843033169059eca008f0e0298bc3f415a0c Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 15:38:10 +0800 Subject: [PATCH 13/23] feat(role): added add role page --- public/add-role.html | 171 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 171 insertions(+) create mode 100644 public/add-role.html diff --git a/public/add-role.html b/public/add-role.html new file mode 100644 index 0000000..fb86c91 --- /dev/null +++ b/public/add-role.html @@ -0,0 +1,171 @@ + + + + + + + + Crun + + + + + + + + + + + + + + +
+
+
+
+ + + + +
+
+
+

Add Role

+
+
+ +
+ +
+
+
+ +
+
+
+ +
+
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
+
+
+
+
Roles
+
Command
+
Group
+
Execution
+
+
+
+
+
+ + + + + + + + + + From 144efc0699d3f1dae2d43d5f7b39f4519bf198c8 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 15:54:40 +0800 Subject: [PATCH 14/23] feat(command): added command list --- public/index.html | 63 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 61 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index d83429e..8f02405 100644 --- a/public/index.html +++ b/public/index.html @@ -134,13 +134,72 @@
- + +
+
+ +
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + +
NameCreated AtCreated ByAction
Deploy onewallet staging01/01/2016user123 + + +
Deploy ab staging01/01/2016user123 + + +
Deploy AMS v2 Staging01/01/2016user123 + + +
+ +
+
+
-
Command
Group
Execution
From e0776c4bcbd68d817bfe2be0cb06b81e1462b8b4 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 16:06:28 +0800 Subject: [PATCH 15/23] feat(command): added add command file --- public/add-command.html | 149 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 149 insertions(+) create mode 100644 public/add-command.html diff --git a/public/add-command.html b/public/add-command.html new file mode 100644 index 0000000..65072ba --- /dev/null +++ b/public/add-command.html @@ -0,0 +1,149 @@ + + + + + + + + Crun + + + + + + + + + + + + + + +
+
+
+
+ + + + +
+
+
+

Add Command

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
+
+ + +
+
+
+
+ +
+
+ +
+
+ + +
+
+
+
+ +
+
+ +
+
+
+
+
+
Roles
+
Command
+
Group
+
Execution
+
+
+
+
+
+ + + + + + + + + + From 25abddc303eb9da1f2a89f689af5cf5c479830a9 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 16:50:13 +0800 Subject: [PATCH 16/23] feat(group): added group list --- public/index.html | 72 +++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 70 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index 8f02405..15b8151 100644 --- a/public/index.html +++ b/public/index.html @@ -141,7 +141,7 @@
-
+
@@ -200,7 +200,75 @@ -
Group
+
+
+
Name
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
NameCreated AtCreated ByAction
Deploy onewallet staging01/01/2016user123 + + + +
Deploy ab staging01/01/2016user123 + + + +
Deploy AMS v2 Staging01/01/2016user123 + + + +
+ +
+
+ +
+
+ +
+
Execution
From 327e6a58ed8c50731fa3e2a7a19731e413fe9a0b Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 16:50:30 +0800 Subject: [PATCH 17/23] feat(group): added add group file --- public/add-group.html | 154 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 154 insertions(+) create mode 100644 public/add-group.html diff --git a/public/add-group.html b/public/add-group.html new file mode 100644 index 0000000..025a711 --- /dev/null +++ b/public/add-group.html @@ -0,0 +1,154 @@ + + + + + + + + Crun + + + + + + + + + + + + + + +
+
+
+
+ + + + +
+
+
+

Add Group

+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+
+ +
+
+ +
+
+
+
Roles
+
Command
+
Group
+
Execution
+
+
+
+
+
+ + + + + + + + + + From a6051d271fd289e48b24509d73200903bd1cc2ea Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Wed, 7 Dec 2016 17:58:03 +0800 Subject: [PATCH 18/23] feat(execution): added execution list --- public/index.html | 53 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 52 insertions(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 15b8151..b873f3c 100644 --- a/public/index.html +++ b/public/index.html @@ -269,7 +269,58 @@ -
Execution
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
StatusStarted AtElapsed Time
+ + Deploy onewallet staging (Execution ID: b3c9fe13f81a8f489960299ad3b296c5a03a1e85) + + Started01/01/2016 5:38PM8 secs
+ + Deploy AMS v2 Staging (Execution ID: ddf710378c4a301ecd4a7db1f0797a53364d754d) + + Pending01/01/2016 5:38PM3 mins
+ + Deploy ab staging (Execution ID: f86d13dad7aee5a605fbb9844975e9b8f48c3812) + + Finished01/01/2016 5:38PM2 hrs
+ +
+
+ +
+
+ +
+
From d99b46c8d3ef2cdd8b3995f149372c484ba8985a Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Thu, 8 Dec 2016 10:58:41 +0800 Subject: [PATCH 19/23] feat(command): hotfix add command UI --- public/add-command.html | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/public/add-command.html b/public/add-command.html index 65072ba..94298c2 100644 --- a/public/add-command.html +++ b/public/add-command.html @@ -98,18 +98,14 @@

Add Command

+ +
-
- - -
-
-
-
+
-
+
@@ -118,10 +114,8 @@

Add Command

-
+
-
-
From 4679921d949dfa25d65744f74e12eb9e5734d0a3 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Thu, 8 Dec 2016 10:59:06 +0800 Subject: [PATCH 20/23] feat(group): hotfix add group UI --- public/add-group.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/add-group.html b/public/add-group.html index 025a711..7cddb81 100644 --- a/public/add-group.html +++ b/public/add-group.html @@ -122,10 +122,8 @@

Add Group

-
+
-
-
From 08ead715075d0758a7707e62fc26b88eef3f10d8 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Thu, 8 Dec 2016 10:59:35 +0800 Subject: [PATCH 21/23] feat(execution): added new views for execution --- public/index.html | 84 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 77 insertions(+), 7 deletions(-) diff --git a/public/index.html b/public/index.html index b873f3c..3a2f5ba 100644 --- a/public/index.html +++ b/public/index.html @@ -273,7 +273,7 @@
- + @@ -312,12 +312,82 @@
Queue #1 Status Started At Elapsed Time
- -
-
- -
-
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Queue #2StatusStarted AtElapsed Time
+ Deploy onewallet staging (Execution ID: b3c9fe13f81a8f489960299ad3b296c5a03a1e85) + Started01/01/2016 5:38PM8 secs
+ + Deploy AMS v2 Staging (Execution ID: ddf710378c4a301ecd4a7db1f0797a53364d754d) + + Pending01/01/2016 5:38PM3 mins
+ Deploy ab staging (Execution ID: f86d13dad7aee5a605fbb9844975e9b8f48c3812) + Finished01/01/2016 5:38PM2 hrs
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Queue #3StatusStarted AtElapsed Time
+ Deploy onewallet staging (Execution ID: b3c9fe13f81a8f489960299ad3b296c5a03a1e85) + Started01/01/2016 5:38PM8 secs
+ Deploy AMS v2 Staging (Execution ID: ddf710378c4a301ecd4a7db1f0797a53364d754d) + Pending01/01/2016 5:38PM3 mins
+ Deploy ab staging (Execution ID: f86d13dad7aee5a605fbb9844975e9b8f48c3812) + Finished01/01/2016 5:38PM2 hrs
From 53cbacf5bd7d569e864e3f76b154d523200e95ba Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Thu, 8 Dec 2016 10:59:52 +0800 Subject: [PATCH 22/23] feat(user): hotfix add user UI --- public/add-user.html | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/public/add-user.html b/public/add-user.html index ccc8481..affb627 100644 --- a/public/add-user.html +++ b/public/add-user.html @@ -102,10 +102,8 @@

Add User

-
+
-
-
From 322384c53f2fdb6b4c1417a1eb88d37fc35a9252 Mon Sep 17 00:00:00 2001 From: Frank Mendez Date: Thu, 8 Dec 2016 11:00:07 +0800 Subject: [PATCH 23/23] feat(role): hotfix add role UI --- public/add-role.html | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/public/add-role.html b/public/add-role.html index fb86c91..1e55bf6 100644 --- a/public/add-role.html +++ b/public/add-role.html @@ -85,10 +85,10 @@

Add Role

- +
-
+
@@ -140,10 +140,8 @@

Add Role

-
+
-
-