Skip to content

Commit

Permalink
feat: setup eclint while generating + eclint fix all
Browse files Browse the repository at this point in the history
  • Loading branch information
moul committed Sep 5, 2019
1 parent 71620bf commit 6dc691d
Show file tree
Hide file tree
Showing 78 changed files with 4,857 additions and 4,038 deletions.
2 changes: 1 addition & 1 deletion .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ Dockerfile
vendor/
.gitignore
.dockerignore
docker-compose.yml
docker-compose.yml
23 changes: 19 additions & 4 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,27 @@ trim_trailing_whitespace = true
indent_style = space
indent_size = 4

[Makefile]
[*.mod]
indent_style = tab

[{Makefile,**.mk}]
indent_style = tab

[*.go]
indent_style = tab

[*.css]
indent_size = 2

[*.proto]
indent_size = 2

[*.ftl]
indent_size = 2

[*.toml]
indent_size = 2

[*.swift]
indent_size = 4

Expand All @@ -30,16 +42,19 @@ indent_size = 2
block_comment_start = /*
block_comment_end = */

[*.html]
[*.{html,htm}]
indent_size = 2

[*.bat]
end_of_line = crlf

[*.{json,yml}]
[*.{yml,yaml}]
indent_size = 2

[*.json]
indent_size = 2

[.{babelrc,eslintrc}]
[.{babelrc,eslintrc,prettierrc}]
indent_size = 2

[{Fastfile,.buckconfig,BUCK}]
Expand Down
2 changes: 1 addition & 1 deletion .prod/keycloak/.gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
.env
/data/
/data/
2 changes: 1 addition & 1 deletion .prod/keycloak/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ services:
networks:
keycloak-internal:
service-proxy:
external: true
external: true
2 changes: 1 addition & 1 deletion .prod/keycloak/themes/pathwar/README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
Pathwar Theme
Pathwar Theme
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ header .navbar {
}

.navbar-pf .navbar-utility {
right: 20px;
right: 20px;
top: -34px;
font-size: 12px;
}
Expand Down Expand Up @@ -101,7 +101,7 @@ header .navbar {
}

.bs-sidebar ul li.active a:hover {
border-right: none;
border-right: none;
}


Expand Down Expand Up @@ -274,4 +274,4 @@ hr + .form-horizontal {
font-size: 16px;
padding: 10px;
margin: 50px 0;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ th.w-40 {

.sidebar-pf .nav-pills > li > a:hover{
background: #393f44;
border-color:#292e34;
border-color:#292e34;
border-left-color: #393f44;
color: #fff;
}
Expand Down
2 changes: 1 addition & 1 deletion .prod/keycloak/themes/pathwar/admin/theme.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
parent=base
import=common/keycloak
styles=lib/patternfly/css/patternfly.css node_modules/select2/select2.css css/styles.css lib/angular/treeview/css/angular.treeview.css node_modules/text-security/dist/text-security.css
styles=lib/patternfly/css/patternfly.css node_modules/select2/select2.css css/styles.css lib/angular/treeview/css/angular.treeview.css node_modules/text-security/dist/text-security.css

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@ Here is a simple example.
```html
<div
data-angular-treeview="true"
data-tree-id="abc"
data-tree-model="treedata"
data-node-id="id"
data-node-label="label"
data-node-children="children" >
data-tree-id="abc"
data-tree-model="treedata"
data-node-id="id"
data-node-label="label"
data-node-children="children" >
</div>
```

Example model:

```javascript
$scope.treedata =
$scope.treedata =
[
{ "label" : "User", "id" : "role1", "children" : [
{ "label" : "subUser1", "id" : "role11", "children" : [] },
{ "label" : "subUser2", "id" : "role12", "children" : [
{ "label" : "subUser2-1", "id" : "role121", "children" : [
{ "label" : "subUser2-1-1", "id" : "role1211", "children" : [] },
{ "label" : "subUser2-1-2", "id" : "role1212", "children" : [] }
]}
]}
]},
{ "label" : "Admin", "id" : "role2", "children" : [] },
{ "label" : "Guest", "id" : "role3", "children" : [] }
];
{ "label" : "User", "id" : "role1", "children" : [
{ "label" : "subUser1", "id" : "role11", "children" : [] },
{ "label" : "subUser2", "id" : "role12", "children" : [
{ "label" : "subUser2-1", "id" : "role121", "children" : [
{ "label" : "subUser2-1-1", "id" : "role1211", "children" : [] },
{ "label" : "subUser2-1-2", "id" : "role1212", "children" : [] }
]}
]}
]},
{ "label" : "Admin", "id" : "role2", "children" : [] },
{ "label" : "Guest", "id" : "role3", "children" : [] }
];
```

## Selection
Expand Down
Original file line number Diff line number Diff line change
@@ -1,50 +1,50 @@
/*
@license Angular Treeview version 0.1.6
ⓒ 2013 AHN JAE-HA http://github.com/eu81273/angular.treeview
License: MIT
[TREE attribute]
angular-treeview: the treeview directive
tree-id : each tree's unique id.
tree-model : the tree model on $scope.
node-id : each node's id
node-label : each node's label
node-children: each node's children
<div
data-angular-treeview="true"
data-tree-id="tree"
data-tree-model="roleList"
data-node-id="roleId"
data-node-label="roleName"
data-node-children="children" >
</div>
*/
@license Angular Treeview version 0.1.6
ⓒ 2013 AHN JAE-HA http://github.com/eu81273/angular.treeview
License: MIT
[TREE attribute]
angular-treeview: the treeview directive
tree-id : each tree's unique id.
tree-model : the tree model on $scope.
node-id : each node's id
node-label : each node's label
node-children: each node's children
<div
data-angular-treeview="true"
data-tree-id="tree"
data-tree-model="roleList"
data-node-id="roleId"
data-node-label="roleName"
data-node-children="children" >
</div>
*/

(function ( angular ) {
'use strict';
'use strict';

angular.module( 'angularTreeview', [] ).directive( 'treeModel', ['$compile', function( $compile ) {
return {
restrict: 'A',
link: function ( scope, element, attrs ) {
//tree id
var treeId = attrs.treeId;
angular.module( 'angularTreeview', [] ).directive( 'treeModel', ['$compile', function( $compile ) {
return {
restrict: 'A',
link: function ( scope, element, attrs ) {
//tree id
var treeId = attrs.treeId;

//tree model
var treeModel = attrs.treeModel;
//tree model
var treeModel = attrs.treeModel;

//node id
var nodeId = attrs.nodeId || 'id';
//node id
var nodeId = attrs.nodeId || 'id';

//node label
var nodeLabel = attrs.nodeLabel || 'label';
//node label
var nodeLabel = attrs.nodeLabel || 'label';

//children
var nodeChildren = attrs.nodeChildren || 'children';
//children
var nodeChildren = attrs.nodeChildren || 'children';

//tree template
//tree template

var template =
'<ul>' +
Expand All @@ -57,41 +57,41 @@


//check tree id, tree model
if( treeId && treeModel ) {
//root node
if( attrs.angularTreeview ) {
//create tree object if not exists
scope[treeId] = scope[treeId] || {};

//if node head clicks,
scope[treeId].selectNodeHead = scope[treeId].selectNodeHead || function( selectedNode ){

//Collapse or Expand
selectedNode.collapsed = !selectedNode.collapsed;
if( treeId && treeModel ) {
//root node
if( attrs.angularTreeview ) {

//create tree object if not exists
scope[treeId] = scope[treeId] || {};

//if node head clicks,
scope[treeId].selectNodeHead = scope[treeId].selectNodeHead || function( selectedNode ){

//Collapse or Expand
selectedNode.collapsed = !selectedNode.collapsed;
scope[treeId].selectNodeLabel(selectedNode);
};

//if node label clicks,
scope[treeId].selectNodeLabel = scope[treeId].selectNodeLabel || function( selectedNode ){

//remove highlight from previous node
if( scope[treeId].currentNode && scope[treeId].currentNode.selected ) {
scope[treeId].currentNode.selected = undefined;
}

//set highlight to selected node
selectedNode.selected = 'selected';

//set currentNode
scope[treeId].currentNode = selectedNode;
};
}

//Rendering template.
element.html('').append( $compile( template )( scope ) );
}
}
};
}]);
};

//if node label clicks,
scope[treeId].selectNodeLabel = scope[treeId].selectNodeLabel || function( selectedNode ){

//remove highlight from previous node
if( scope[treeId].currentNode && scope[treeId].currentNode.selected ) {
scope[treeId].currentNode.selected = undefined;
}

//set highlight to selected node
selectedNode.selected = 'selected';

//set currentNode
scope[treeId].currentNode = selectedNode;
};
}

//Rendering template.
element.html('').append( $compile( template )( scope ) );
}
}
};
}]);
})( angular );

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ div[angular-treeview] {
div[tree-model] ul {
margin: 0;
padding: 0;
list-style: none;
list-style: none;
border: none;
overflow: hidden;
}
Expand Down Expand Up @@ -95,5 +95,3 @@ div[tree-model] li .cut {
background-repeat: no-repeat;
cursor: pointer;
}


Loading

0 comments on commit 6dc691d

Please sign in to comment.