* Fix wrapping when too many hosts are shown (#207)

* Update npm packages, fixes CVE-2019-10757

* Revert some breaking packages

* Major overhaul

- Docker buildx support in CI
- Cypress API Testing in CI
- Restructured folder layout (insert clean face meme)
- Added Swagger documentation and validate API against that (to be completed)
- Use common base image for all supported archs, which includes updated nginx with ipv6 support
- Updated certbot and changes required for it
- Large amount of Hosts names will wrap in UI
- Updated packages for frontend
- Version bump 2.1.0

* Updated documentation

* Fix JWT expire time going crazy. Now set to 1day

* Backend JS formatting rules

* Remove v1 importer, I doubt anyone is using v1 anymore

* Added backend formatting rules and enforce them
in Jenkins builds

* Fix CI, doesn't need a tty

* Thanks bcrypt. Why can't you just be normal.

* Cleanup after syntax check

Co-authored-by: Marcelo Castagna <margaale@users.noreply.github.com>
This commit is contained in:
jc21
2020-02-19 15:55:06 +11:00
committed by GitHub
parent bf036cbb88
commit bb0f4bfa62
517 changed files with 26256 additions and 11724 deletions

View File

@ -0,0 +1,31 @@
<div class="container">
<div class="d-flex">
<a class="navbar-brand" href="/">
<img src="/images/favicons/favicon-32x32.png" border="0"> &nbsp; <%- i18n('main', 'app') %>
</a>
<div class="d-flex align-items-center order-lg-2 ml-auto">
<div class="dropdown">
<a href="#" class="nav-link pr-0 leading-none" data-toggle="dropdown">
<span class="avatar" style="background-image: url(<%- getUserField('avatar', '/images/default-avatar.jpg') %>)"></span>
<span class="ml-2 d-none d-lg-block">
<span class="text-default"><%- getUserField('nickname', null) || getUserField('name', i18n('main', 'unknown-user')) %></span>
<small class="text-muted d-block mt-1"><%- getRole() %></small>
</span>
</a>
<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
<a class="dropdown-item edit-details" href="#">
<i class="dropdown-icon fe fe-user"></i> <%- i18n('users', 'edit-details') %>
</a>
<a class="dropdown-item change-password" href="#">
<i class="dropdown-icon fe fe-lock"></i> <%- i18n('users', 'change-password') %>
</a>
<div class="dropdown-divider"></div>
<a class="dropdown-item logout" href="/logout">
<i class="dropdown-icon fe fe-log-out"></i> <%- getLogoutText() %>
</a>
</div>
</div>
</div>
</div>
</div>

View File

@ -0,0 +1,67 @@
const $ = require('jquery');
const Mn = require('backbone.marionette');
const i18n = require('../../i18n');
const Cache = require('../../cache');
const Controller = require('../../controller');
const Tokens = require('../../tokens');
const template = require('./main.ejs');
module.exports = Mn.View.extend({
id: 'header',
className: 'header',
template: template,
ui: {
link: 'a',
details: 'a.edit-details',
password: 'a.change-password'
},
events: {
'click @ui.details': function (e) {
e.preventDefault();
Controller.showUserForm(Cache.User);
},
'click @ui.password': function (e) {
e.preventDefault();
Controller.showUserPasswordForm(Cache.User);
},
'click @ui.link': function (e) {
e.preventDefault();
let href = $(e.currentTarget).attr('href');
switch (href) {
case '/':
Controller.showDashboard();
break;
case '/logout':
Controller.logout();
break;
}
}
},
templateContext: {
getUserField: function (field, default_val) {
return Cache.User.get(field) || default_val;
},
getRole: function () {
return i18n('roles', Cache.User.isAdmin() ? 'admin' : 'user');
},
getLogoutText: function () {
if (Tokens.getTokenCount() > 1) {
return i18n('main', 'sign-in-as', {name: Tokens.getNextTokenName()});
}
return i18n('str', 'sign-out');
}
},
initialize: function () {
this.listenTo(Cache.User, 'change', this.render);
}
});