Skip to content

Commit

Permalink
Merge pull request #36 from miguelfc/dependency_upgrade
Browse files Browse the repository at this point in the history 
Dependency upgrade
  • Loading branch information
@miguelfc
miguelfc authored Apr 23, 2017
2 parents 6484801 + 42e0a62 commit aae5eb5
Show file tree
Hide file tree
Showing 12 changed files with 63 additions and 92 deletions.
42 changes: 18 additions & 24 deletions marble-core/bower.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,44 +21,38 @@
],
"dependencies": {
"rdash-ui": "1.0.*",
"font-awesome": "~4.5.0",
"font-awesome": "4.7.0",
"bootstrap": "~3.3.5",
"angular-bootstrap-datetimepicker": "~0.4",
"metisMenu": "1.1.3",
"angular-ui-grid": "3.0.7",
"angular-ui-grid": "4.0.3",
"open-sans-fontface": "1.4.2",
"metisMenu": "2.7.0",

"jquery": "3.1.0",
"datatables": "1.10.7",
"datatables-plugins": "1.10.7",
"angular-datatables": "0.5.0",
"jquery": "2.2.4",

"angular-loading-bar": "0.8.0",
"angular-toggle-switch": "1.3.0",
"angularjs": "1.4.7",
"angular-ui-router": "0.2.15",
"angular-ui-router-title": "0.0.4",
"angularjs": "1.6.4",
"angular-ui-router": "0.4.2",
"angular-ui-router-title": "0.1.1",
"json3": "3.3.2",
"oclazyload": "1.0.5",
"oclazyload": "1.1.0",
"angular-bootstrap": "0.14.3",
"es5-shim": "4.1.13",
"angular-resource": "1.4.7",
"angular-cookies": "1.4.6",
"angular-sanitize": "1.4.7",
"angular-animate": "1.4.7",
"angular-touch": "1.4.7",
"angular-route": "1.4.7",
"angular-chart.js": "0.8.5",
"ng-file-upload": "9.0.13",
"chartist": "0.9.4",
"angular-chartist.js": "3.3.9"

"es5-shim": "4.5.9",
"angular-resource": "1.6.4",
"angular-cookies": "1.6.4",
"angular-sanitize": "1.6.4",
"angular-animate": "1.6.4",
"angular-touch": "1.6.4",
"angular-route": "1.6.4",
"angular-chart.js": "1.1.0",
"ng-file-upload": "12.2.13"
},
"repository": {
"type": "git",
"url": "https://github.com/rdash/rdash-angular"
},
"resolutions": {
"angular": "~1.4.7"
"angular": "1.6.4"
}
}
5 changes: 1 addition & 4 deletions marble-core/src/main/resources/web/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
<link rel="stylesheet" type="text/css" href="components/angular-loading-bar/build/loading-bar.min.css" />
<link rel="stylesheet" type="text/css" href="components/font-awesome/css/font-awesome.min.css" />
<link rel="stylesheet" type="text/css" href="components/angular-ui-grid/ui-grid.min.css" />
<!-- <link rel="stylesheet" type="text/css" href="components/chartist/dist/chartist.min.css" />-->
<link rel="stylesheet" type="text/css" href="components/angular-toggle-switch/angular-toggle-switch.css" />
<!-- <link rel="stylesheet" type="text/css" href="components/angular-chart.js/dist/angular-chart.min.css" />-->
<!--
<link rel="stylesheet" type="text/css" href="css/main.css" />
<link rel="stylesheet" type="text/css" href="css/sb-admin-2.css" />
Expand All @@ -34,7 +32,6 @@

<!-- SCRIPTS -->
<!-- build:js lib/js/main.min.js -->
<!-- TODO Remove jquery from here -->
<script type="text/javascript" src="components/jquery/dist/jquery.min.js"></script>
<script type="text/javascript" src="components/angularjs/angular.js"></script>
<script type="text/javascript" src="components/bootstrap/dist/js/bootstrap.min.js"></script>
Expand All @@ -59,7 +56,7 @@
-->

<!-- Google Charts -->
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-google-chart/0.0.11/ng-google-chart.js"
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-google-chart/0.1.0/ng-google-chart.js"
type="text/javascript"></script>

<!-- Custom Scripts -->
Expand Down
18 changes: 4 additions & 14 deletions marble-core/src/main/resources/web/js/controllers/chart/chartListController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,6 @@ angular
$scope.tableState.page = "0";
$scope.tableState.sort = "";

$scope.view = function(chartId) {
$state.go('dashboard.chart.view', {
'chartId' : chartId
});
};

$scope.viewTopic = function(topicName) {
$state.go('dashboard.topic.view', {
'topicName' : topicName
});
};

$scope.gridOptions = {
data : 'gridData',
rowHeight : 40,
Expand All @@ -36,7 +24,7 @@ angular
{
field : 'topicName',
displayName : 'Topic',
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.viewTopic(row.entity.topicName)" class="btn btn-default"><i class="fa fa-tags fa-fw"></i><span class="hidden-xs hidden-sm"> {{row.entity.topicName}}</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.topic.view({topicName: row.entity.topicName})" class="btn btn-default"><i class="fa fa-tags fa-fw"></i><span class="hidden-xs hidden-sm"> {{row.entity.topicName}}</span></a></div>'
},
{
field : 'name',
Expand All @@ -61,7 +49,7 @@ angular
name : 'actions',
displayName : 'Actions',
enableFiltering : false,
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.view(row.entity.id)" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.chart.view({chartId: row.entity.id})" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
} ],
onRegisterApi : function(gridApi) {
$scope.gridApi = gridApi;
Expand Down Expand Up @@ -90,6 +78,8 @@ angular
$scope.gridApi.pagination.on.paginationChanged($scope, function(newPage, pageSize) {
$scope.tableState.size = pageSize;
$scope.tableState.page = newPage - 1;
$scope.gridOptions.minRowsToShow = pageSize;
$scope.gridOptions.virtualizationThreshold = pageSize;
updateTable($scope);
});
}
Expand Down
18 changes: 4 additions & 14 deletions marble-core/src/main/resources/web/js/controllers/job/jobListController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ function ($scope, $compile, $state, JobsSearchByTopicNameFactory) {
$scope.tableState.page = "0";
$scope.tableState.sort = "";

$scope.view = function(jobId) {
$state.go('dashboard.job.view', {
'jobId' : jobId
});
};

$scope.viewTopic = function(topicName) {
$state.go('dashboard.topic.view', {
'topicName' : topicName
});
};

$scope.gridOptions = {
data : 'gridData',
rowHeight : 40,
Expand All @@ -34,7 +22,7 @@ function ($scope, $compile, $state, JobsSearchByTopicNameFactory) {
{
field : 'topicName',
displayName : 'Topic',
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.viewTopic(row.entity.topicName)" class="btn btn-default"><i class="fa fa-tags fa-fw"></i><span class="hidden-xs hidden-sm"> {{row.entity.topicName}}</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.topic.view({topicName: row.entity.topicName})" class="btn btn-default"><i class="fa fa-tags fa-fw"></i><span class="hidden-xs hidden-sm"> {{row.entity.topicName}}</span></a></div>'
},
{
field : 'type',
Expand All @@ -57,7 +45,7 @@ function ($scope, $compile, $state, JobsSearchByTopicNameFactory) {
name : 'actions',
displayName : 'Actions',
enableFiltering : false,
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.view(row.entity.id)" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.job.view({jobId: row.entity.id})" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
} ],
onRegisterApi : function(gridApi) {
$scope.gridApi = gridApi;
Expand Down Expand Up @@ -87,6 +75,8 @@ function ($scope, $compile, $state, JobsSearchByTopicNameFactory) {
newPage, pageSize) {
$scope.tableState.size = pageSize;
$scope.tableState.page = newPage - 1;
$scope.gridOptions.minRowsToShow = pageSize;
$scope.gridOptions.virtualizationThreshold = pageSize;
updateTable($scope);
});
}
Expand Down
2 changes: 1 addition & 1 deletion marble-core/src/main/resources/web/js/controllers/login/loginController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ angular.module('marbleCoreApp').constant('AuthLevels', {
$scope.logout = function() {
Auth.logout();
this.currentUser = {};
$state.go('home', {}, { reload: true });
$state.go('dashboard.home', {}, { reload: true });
}

$scope.auth = function(credentials) {
Expand Down
18 changes: 4 additions & 14 deletions marble-core/src/main/resources/web/js/controllers/post/postListController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,6 @@ function ($scope, $compile, $state, PostsSearchByTopicNameFactory) {
$scope.tableState.page = "0";
$scope.tableState.sort = "";

$scope.view = function(postId) {
$state.go('dashboard.post.view', {
'postId' : postId
});
};

$scope.viewTopic = function(topicName) {
$state.go('dashboard.topic.view', {
'topicName' : topicName
});
};

$scope.gridOptions = {
data : 'gridData',
rowHeight : 40,
Expand All @@ -34,7 +22,7 @@ function ($scope, $compile, $state, PostsSearchByTopicNameFactory) {
{
field : 'topicName',
displayName : 'Topic',
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.viewTopic(row.entity.topicName)" class="btn btn-default"><i class="fa fa-tags fa-fw"></i><span class="hidden-xs hidden-sm"> {{row.entity.topicName}}</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.topic.view({topicName: row.entity.topicName})" class="btn btn-default"><i class="fa fa-tags fa-fw"></i><span class="hidden-xs hidden-sm"> {{row.entity.topicName}}</span></a></div>'
},
{
field : 'text',
Expand All @@ -52,7 +40,7 @@ function ($scope, $compile, $state, PostsSearchByTopicNameFactory) {
name : 'actions',
displayName : 'Actions',
enableFiltering : false,
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.view(row.entity.id)" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.post.view({postId: row.entity.id})" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
} ],
onRegisterApi : function(gridApi) {
$scope.gridApi = gridApi;
Expand Down Expand Up @@ -82,6 +70,8 @@ function ($scope, $compile, $state, PostsSearchByTopicNameFactory) {
newPage, pageSize) {
$scope.tableState.size = pageSize;
$scope.tableState.page = newPage - 1;
$scope.gridOptions.minRowsToShow = pageSize;
$scope.gridOptions.virtualizationThreshold = pageSize;
updateTable($scope);
});
}
Expand Down
10 changes: 3 additions & 7 deletions ...in/resources/web/js/controllers/settings/generalProperty/generalPropertyListController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ function ($scope, $compile, $state, $timeout, GeneralPropertiesSearchByNameFacto
$scope.tableState.page = "0";
$scope.tableState.sort = "";

$scope.edit = function(generalPropertyName) {
$state.go('dashboard.settings.generalProperty.view', {
'generalPropertyName' : generalPropertyName
});
};

$scope.create = function() {
$state.go('dashboard.settings.generalProperty.create');
};
Expand Down Expand Up @@ -42,7 +36,7 @@ function ($scope, $compile, $state, $timeout, GeneralPropertiesSearchByNameFacto
name : 'actions',
displayName : 'Actions',
enableFiltering : false,
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.edit(row.entity.name)" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.settings.generalProperty.view({generalPropertyName: row.entity.name})" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
} ],
onRegisterApi : function(gridApi) {
$scope.gridApi = gridApi;
Expand Down Expand Up @@ -71,6 +65,8 @@ function ($scope, $compile, $state, $timeout, GeneralPropertiesSearchByNameFacto
newPage, pageSize) {
$scope.tableState.size = pageSize;
$scope.tableState.page = newPage - 1;
$scope.gridOptions.minRowsToShow = pageSize;
$scope.gridOptions.virtualizationThreshold = pageSize;
updateTable($scope);
});
}
Expand Down
10 changes: 3 additions & 7 deletions ...c/main/resources/web/js/controllers/settings/twitterApiKey/twitterApiKeyListController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,6 @@ function ($scope, $compile, $state, TwitterApiKeysFactory) {
$scope.tableState.page = "0";
$scope.tableState.sort = "";

$scope.edit = function(twitterApiKeyName) {
$state.go('dashboard.settings.twitterApiKey.view', {
'twitterApiKeyName' : twitterApiKeyName
});
};

$scope.create = function() {
$state.go('dashboard.settings.twitterApiKey.create');
};
Expand All @@ -37,7 +31,7 @@ function ($scope, $compile, $state, TwitterApiKeysFactory) {
{
name : 'actions',
displayName : 'Actions',
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.edit(row.entity.id)" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.settings.twitterApiKey.view({twitterApiKeyName: row.entity.id})" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
} ],
onRegisterApi : function(gridApi) {
$scope.gridApi = gridApi;
Expand All @@ -56,6 +50,8 @@ function ($scope, $compile, $state, TwitterApiKeysFactory) {
newPage, pageSize) {
$scope.tableState.size = pageSize;
$scope.tableState.page = newPage - 1;
$scope.gridOptions.minRowsToShow = pageSize;
$scope.gridOptions.virtualizationThreshold = pageSize;
updateTable($scope);
});
}
Expand Down
10 changes: 3 additions & 7 deletions marble-core/src/main/resources/web/js/controllers/topic/topicListController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,6 @@ function ($scope, $compile, $state, TopicsFactory, TopicsSearchByNameFactory) {
$scope.tableState.page = "0";
$scope.tableState.sort = "";

$scope.edit = function(topicName) {
$state.go('dashboard.topic.view', {
'topicName' : topicName
});
};

$scope.create = function() {
$state.go('dashboard.topic.create');
};
Expand Down Expand Up @@ -42,7 +36,7 @@ function ($scope, $compile, $state, TopicsFactory, TopicsSearchByNameFactory) {
name : 'actions',
displayName : 'Actions',
enableFiltering : false,
cellTemplate : '<div class="grid-action-cell"><a data-ng-click="grid.appScope.edit(row.entity.name)" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
cellTemplate : '<div class="grid-action-cell"><a ui-sref="dashboard.topic.view({topicName: row.entity.name})" class="btn btn-default"><i class="fa fa-info-circle"></i><span class="hidden-xs hidden-sm"> Details</span></a></div>'
} ],
onRegisterApi : function(gridApi) {
$scope.gridApi = gridApi;
Expand Down Expand Up @@ -72,6 +66,8 @@ function ($scope, $compile, $state, TopicsFactory, TopicsSearchByNameFactory) {
newPage, pageSize) {
$scope.tableState.size = pageSize;
$scope.tableState.page = newPage - 1;
$scope.gridOptions.minRowsToShow = pageSize;
$scope.gridOptions.virtualizationThreshold = pageSize;
updateTable($scope);
});
}
Expand Down
14 changes: 14 additions & 0 deletions marble-core/src/main/resources/web/sass/styles.sass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -342,10 +342,24 @@ body
.ui-grid
border: 1px solid #D4D4D4
border-radius: 2px
height: auto !important

.ui-grid-viewport
//height: auto !important
.ui-grid-cell-contents
padding: 8px

.ui-grid-pager-panel
position: relative
left: 0
bottom: 0
width: 100%
padding-top: 13px
padding-bottom: 3px
box-sizing: content-box
display: inline-block

/* Custom Navbar
.navbar-default
Expand Down
4 changes: 4 additions & 0 deletions marble-core/src/main/resources/web/templates/views/job/view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,10 @@ <h1 class="page-header">
<th>Type</th>
<td id="type">{{job.type}}</td>
</tr>
<tr>
<th>Topic</th>
<td id="topicName">{{job.topicName}}</td>
</tr>
<tr>
<th>Created At</th>
<td id="createdAt" data-ng-bind="job.createdAt | date:'yyyy-MM-dd HH:mm:ss (Z)'"></td>
Expand Down
4 changes: 4 additions & 0 deletions marble-model/src/main/java/org/marble/model/domain/model/Topic.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@

import org.hibernate.validator.constraints.NotEmpty;
import org.marble.model.model.JobParameters;
import org.marble.util.LongSerializer;
import org.springframework.data.annotation.Id;
import org.springframework.data.mongodb.core.mapping.Document;

import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;

@Document(collection = "topics")
@JsonIgnoreProperties({ "changeSet", "executions" })
Expand All @@ -32,9 +34,11 @@ public class Topic implements Serializable {
private String keywords;

@Digits(fraction = 0, integer = 24)
@JsonSerialize(using = LongSerializer.class)
private Long upperLimit;

@Digits(fraction = 0, integer = 24)
@JsonSerialize(using = LongSerializer.class)
private Long lowerLimit;

@Pattern(regexp = "[a-zA-Z]{2}|")
Expand Down

1 comment on commit aae5eb5

@miguelfc
Copy link
Owner Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixes #35

Please sign in to comment.