Skip to content
Snippets Groups Projects
Commit 59f4fe10 authored by Cédric Moreau's avatar Cédric Moreau
Browse files

Logs moved to an external location

parent f6c89008
Branches
Tags
No related merge requests found
...@@ -12,7 +12,7 @@ module.exports = ($scope, ws, UIUtils) => { ...@@ -12,7 +12,7 @@ module.exports = ($scope, ws, UIUtils) => {
if (!localStorage.getItem('log_warn')) localStorage.setItem('log_warn', true); if (!localStorage.getItem('log_warn')) localStorage.setItem('log_warn', true);
if (!localStorage.getItem('log_info')) localStorage.setItem('log_info', true); if (!localStorage.getItem('log_info')) localStorage.setItem('log_info', true);
$scope.logsSize = 100; $scope.logsSize = parseInt(localStorage.getItem('log_size')) || 100;
$scope.logs = _.range(0, $scope.logsSize).map(() => ""); $scope.logs = _.range(0, $scope.logsSize).map(() => "");
$scope.logsString = ""; $scope.logsString = "";
$scope.follow = true; $scope.follow = true;
...@@ -32,7 +32,8 @@ module.exports = ($scope, ws, UIUtils) => { ...@@ -32,7 +32,8 @@ module.exports = ($scope, ws, UIUtils) => {
}); });
}); });
$scope.$watch('logsSize', () => { $scope.$watch('logsSize', (newValue) => {
localStorage.setItem('log_size', newValue);
addLogs({ value: [] }, true); addLogs({ value: [] }, true);
}); });
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
"top.menu.overview": "Home", "top.menu.overview": "Home",
"top.menu.graphs": "Graphs", "top.menu.graphs": "Graphs",
"top.menu.settings": "Settings", "top.menu.settings": "Settings",
"top.menu.logs": "Logs",
"general.server.started": "Server started", "general.server.started": "Server started",
"general.server.stopped": "Server stopped", "general.server.stopped": "Server stopped",
"general.choose_option": "Choose your option", "general.choose_option": "Choose your option",
......
...@@ -115,12 +115,6 @@ module.exports = (app) => { ...@@ -115,12 +115,6 @@ module.exports = (app) => {
controller: 'OverviewController' controller: 'OverviewController'
}). }).
state('main.home.logs', {
url: '/logs',
template: require('views/main/home/tabs/logs'),
controller: 'LogsController'
}).
state('main.settings', { state('main.settings', {
abstract: true, abstract: true,
url: '/settings', url: '/settings',
...@@ -218,6 +212,15 @@ module.exports = (app) => { ...@@ -218,6 +212,15 @@ module.exports = (app) => {
// controller: 'CurrencyController' // controller: 'CurrencyController'
//}). //}).
state('logs', {
url: '/logs',
template: require('views/logs'),
resolve: {
ws: (BMA) => BMA.webmin.ws()
},
controller: 'LogsController'
}).
state('error', { state('error', {
url: '/error\?err', url: '/error\?err',
template: require('views/error'), template: require('views/error'),
......
...@@ -135,9 +135,21 @@ blockquote ...@@ -135,9 +135,21 @@ blockquote
.tabs .tab.disabled a .tabs .tab.disabled a
color #9EA8AC color #9EA8AC
#card-logs
position fixed
margin: 0
width 90%
label
margin-right 30px
#logs #logs
font-size 12px font-size 12px
max-height 400px padding 10px
padding-top 200px
margin 0
overflow: auto
height 100%
#logs p #logs p
line-height 21px line-height 21px
...@@ -147,10 +159,6 @@ blockquote ...@@ -147,10 +159,6 @@ blockquote
#follow-logs #follow-logs
float right float right
.logs
label
margin-right 30px
.log-level.info .log-level.info
color: blue color: blue
......
extends menu.jade
block content
.card#card-logs
.card-action.left-align
p
input#follow-logs.filled-in(type="checkbox" ng-model="follow")
label(for="follow-logs") {{ 'home.tabs.logs.follow.logs' | translate }}
input#pause-logs.filled-in(type="checkbox" ng-model="pause")
label(for="pause-logs") {{ 'home.tabs.logs.pause.logs' | translate }}
input#level-error.filled-in(type="checkbox" ng-model="levels.error")
label(for="level-error") {{ 'home.tabs.logs.level.error' | translate }}
input#level-warn.filled-in(type="checkbox" ng-model="levels.warn")
label(for="level-warn") {{ 'home.tabs.logs.level.warn' | translate }}
input#level-info.filled-in(type="checkbox" ng-model="levels.info")
label(for="level-info") {{ 'home.tabs.logs.level.info' | translate }}
input#level-debug.filled-in(type="checkbox" ng-model="levels.debug")
label(for="level-debug") {{ 'home.tabs.logs.level.debug' | translate }}
input#level-trace.filled-in(type="checkbox" ng-model="levels.trace")
label(for="level-trace") {{ 'home.tabs.logs.level.trace' | translate }}
p {{ 'graphs.blockchain.range' | translate }}
.range-field
input(type="range" min="10" max="10000" ng-model="logsSize" ng-mouseup="changeSize()")
pre#logs
p(ng-repeat="log in logs track by $index")
span.log-time {{ log.timestamp }} 
span.log-level(class="{{ log.level }}") {{ log.level }} 
span.log-msg(class="{{ log.level }}") {{ log.msg }}
...@@ -7,8 +7,8 @@ main.home-main.main-screen ...@@ -7,8 +7,8 @@ main.home-main.main-screen
li.tab.col.s3: a(href="#main.home.overview") li.tab.col.s3: a(href="#main.home.overview")
i.fa.fa-photo   i.fa.fa-photo  
= " {{ 'home.tabs.overview' | translate }}" = " {{ 'home.tabs.overview' | translate }}"
li.tab.col.s3: a(href="#main.home.logs") //li.tab.col.s3: a(href="#main.home.logs")
i.fa.fa-newspaper-o   // i.fa.fa-newspaper-o  
= " {{ 'home.tabs.logs' | translate }}" // = " {{ 'home.tabs.logs' | translate }}"
div.ui-scrollable(ui-view="") div.ui-scrollable(ui-view="")
\ No newline at end of file
...@@ -31,6 +31,10 @@ block content ...@@ -31,6 +31,10 @@ block content
a.waves-effect.waves-light(ui-sref="main.settings.data") a.waves-effect.waves-light(ui-sref="main.settings.data")
i.fa.fa-2x.fa-gear.left i.fa.fa-2x.fa-gear.left
span {{ 'top.menu.settings' | translate }} span {{ 'top.menu.settings' | translate }}
li
a.waves-effect.waves-light(ui-sref="logs" target="_blank")
i.fa.fa-2x.fa-align-left.left
span {{ 'top.menu.logs' | translate }}
ul.right ul.right
li: a.waves-effect.waves-light.dropdown-button(href="#!" data-activates="serveractions"): i.material-icons more_vert li: a.waves-effect.waves-light.dropdown-button(href="#!" data-activates="serveractions"): i.material-icons more_vert
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment