From feaa0e51bd9316dc6aec0431194edc78f71e9aa5 Mon Sep 17 00:00:00 2001 From: Jamie Curnow Date: Wed, 8 May 2019 15:24:57 +1000 Subject: [PATCH] Removed use strict --- src/backend/app.js | 2 -- src/backend/db.js | 2 -- src/backend/importer.js | 4 +--- src/backend/internal/access-list.js | 2 -- src/backend/internal/audit-log.js | 2 -- src/backend/internal/dead-host.js | 2 -- src/backend/internal/ip_ranges.js | 3 --- src/backend/internal/nginx.js | 8 ++++---- src/backend/internal/redirection-host.js | 2 -- src/backend/internal/report.js | 2 -- src/backend/internal/stream.js | 2 -- src/backend/internal/token.js | 2 -- src/backend/internal/user.js | 2 -- src/backend/lib/access.js | 2 -- src/backend/lib/error.js | 2 -- src/backend/lib/express/cors.js | 2 -- src/backend/lib/express/jwt-decode.js | 2 -- src/backend/lib/express/jwt.js | 2 -- src/backend/lib/express/pagination.js | 2 -- src/backend/lib/express/user-id-from-me.js | 2 -- src/backend/lib/helpers.js | 3 --- src/backend/lib/migrate_template.js | 2 -- src/backend/lib/utils.js | 2 -- src/backend/lib/validator/api.js | 2 -- src/backend/lib/validator/index.js | 2 -- src/backend/migrate.js | 2 -- src/backend/migrations/20180618015850_initial.js | 2 -- .../migrations/20180929054513_websockets.js | 2 -- .../migrations/20181019052346_forward_host.js | 2 -- .../migrations/20181113041458_http2_support.js | 2 -- .../migrations/20181213013211_forward_scheme.js | 2 -- src/backend/migrations/20190104035154_disabled.js | 2 -- .../migrations/20190215115310_customlocations.js | 2 -- src/backend/migrations/20190218060101_hsts.js | 2 -- src/backend/models/access_list.js | 2 -- src/backend/models/access_list_auth.js | 2 -- src/backend/models/audit-log.js | 2 -- src/backend/models/auth.js | 2 -- src/backend/models/certificate.js | 2 -- src/backend/models/dead_host.js | 2 -- src/backend/models/proxy_host.js | 2 -- src/backend/models/redirection_host.js | 2 -- src/backend/models/stream.js | 2 -- src/backend/models/token.js | 2 -- src/backend/models/user.js | 2 -- src/backend/models/user_permission.js | 2 -- src/backend/routes/api/audit-log.js | 2 -- src/backend/routes/api/main.js | 2 -- src/backend/routes/api/nginx/access_lists.js | 2 -- src/backend/routes/api/nginx/dead_hosts.js | 2 -- src/backend/routes/api/nginx/proxy_hosts.js | 2 -- src/backend/routes/api/nginx/redirection_hosts.js | 2 -- src/backend/routes/api/nginx/streams.js | 2 -- src/backend/routes/api/reports.js | 2 -- src/backend/routes/api/tokens.js | 2 -- src/backend/routes/api/users.js | 2 -- src/backend/routes/main.js | 2 -- src/backend/setup.js | 4 +--- src/frontend/js/app/audit-log/list/item.js | 2 -- src/frontend/js/app/audit-log/list/main.js | 2 -- src/frontend/js/app/audit-log/main.js | 2 -- src/frontend/js/app/audit-log/meta.js | 2 -- src/frontend/js/app/cache.js | 2 -- src/frontend/js/app/controller.js | 15 +++++++++++++-- src/frontend/js/app/dashboard/main.js | 2 -- src/frontend/js/app/empty/main.js | 2 -- src/frontend/js/app/error/main.js | 2 -- src/frontend/js/app/help/main.js | 2 -- src/frontend/js/app/i18n.js | 2 -- src/frontend/js/app/main.js | 2 -- src/frontend/js/app/nginx/access/delete.js | 2 -- src/frontend/js/app/nginx/access/form.js | 2 -- src/frontend/js/app/nginx/access/form/item.js | 2 -- src/frontend/js/app/nginx/access/list/item.js | 2 -- src/frontend/js/app/nginx/access/list/main.js | 2 -- src/frontend/js/app/nginx/access/main.js | 2 -- src/frontend/js/app/nginx/certificates/delete.js | 3 --- src/frontend/js/app/nginx/certificates/form.js | 2 -- src/frontend/js/app/nginx/certificates/main.js | 2 -- src/frontend/js/app/nginx/dead/delete.js | 2 -- src/frontend/js/app/nginx/dead/form.js | 2 -- src/frontend/js/app/nginx/dead/list/item.js | 2 -- src/frontend/js/app/nginx/dead/list/main.js | 2 -- src/frontend/js/app/nginx/dead/main.js | 2 -- src/frontend/js/app/nginx/proxy/delete.js | 2 -- src/frontend/js/app/nginx/proxy/form.js | 2 -- src/frontend/js/app/nginx/proxy/list/item.js | 2 -- src/frontend/js/app/nginx/proxy/list/main.js | 2 -- src/frontend/js/app/nginx/proxy/location-item.ejs | 2 +- src/frontend/js/app/nginx/proxy/main.js | 2 -- src/frontend/js/app/nginx/redirection/delete.js | 2 -- src/frontend/js/app/nginx/redirection/form.js | 2 -- .../js/app/nginx/redirection/list/item.js | 2 -- .../js/app/nginx/redirection/list/main.js | 2 -- src/frontend/js/app/nginx/redirection/main.js | 2 -- src/frontend/js/app/nginx/stream/delete.js | 2 -- src/frontend/js/app/nginx/stream/form.js | 3 --- src/frontend/js/app/nginx/stream/list/item.js | 2 -- src/frontend/js/app/nginx/stream/list/main.js | 2 -- src/frontend/js/app/nginx/stream/main.js | 2 -- src/frontend/js/app/router.js | 2 -- src/frontend/js/app/settings/default-site/main.js | 2 -- src/frontend/js/app/settings/list/item.js | 2 -- src/frontend/js/app/settings/list/main.js | 2 -- src/frontend/js/app/settings/main.js | 2 -- src/frontend/js/app/tokens.js | 8 +++----- src/frontend/js/app/ui/footer/main.js | 2 -- src/frontend/js/app/ui/header/main.js | 2 -- src/frontend/js/app/ui/main.js | 2 -- src/frontend/js/app/ui/menu/main.js | 2 -- src/frontend/js/app/user/delete.js | 2 -- src/frontend/js/app/user/form.js | 2 -- src/frontend/js/app/user/password.js | 2 -- src/frontend/js/app/user/permissions.js | 2 -- src/frontend/js/app/users/list/item.js | 2 -- src/frontend/js/app/users/list/main.js | 2 -- src/frontend/js/app/users/main.js | 2 -- src/frontend/js/lib/helpers.js | 2 -- src/frontend/js/lib/marionette.js | 2 -- src/frontend/js/login/main.js | 2 -- src/frontend/js/login/ui/login.js | 2 -- src/frontend/js/models/access-list.js | 2 -- src/frontend/js/models/audit-log.js | 2 -- src/frontend/js/models/certificate.js | 2 -- src/frontend/js/models/dead-host.js | 2 -- src/frontend/js/models/proxy-host-location.js | 2 -- src/frontend/js/models/proxy-host.js | 2 -- src/frontend/js/models/redirection-host.js | 2 -- src/frontend/js/models/setting.js | 3 --- src/frontend/js/models/stream.js | 2 -- src/frontend/js/models/user.js | 2 -- 131 files changed, 23 insertions(+), 273 deletions(-) diff --git a/src/backend/app.js b/src/backend/app.js index 3b852cd4..03a7b8c7 100644 --- a/src/backend/app.js +++ b/src/backend/app.js @@ -1,5 +1,3 @@ -'use strict'; - const path = require('path'); const express = require('express'); const bodyParser = require('body-parser'); diff --git a/src/backend/db.js b/src/backend/db.js index 6fcf831e..6ad3f34c 100644 --- a/src/backend/db.js +++ b/src/backend/db.js @@ -1,5 +1,3 @@ -'use strict'; - const config = require('config'); if (!config.has('database')) { diff --git a/src/backend/importer.js b/src/backend/importer.js index 8e47ea4e..79b756c0 100644 --- a/src/backend/importer.js +++ b/src/backend/importer.js @@ -1,10 +1,8 @@ -'use strict'; - const fs = require('fs'); const logger = require('./logger').import; const utils = require('./lib/utils'); const batchflow = require('batchflow'); -const debug_mode = process.env.NODE_ENV !== 'production'; +const debug_mode = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG; const internalProxyHost = require('./internal/proxy-host'); const internalRedirectionHost = require('./internal/redirection-host'); diff --git a/src/backend/internal/access-list.js b/src/backend/internal/access-list.js index 83dd2e58..0b9f927f 100644 --- a/src/backend/internal/access-list.js +++ b/src/backend/internal/access-list.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('lodash'); const fs = require('fs'); const batchflow = require('batchflow'); diff --git a/src/backend/internal/audit-log.js b/src/backend/internal/audit-log.js index 543b1662..5f7f1da0 100644 --- a/src/backend/internal/audit-log.js +++ b/src/backend/internal/audit-log.js @@ -1,5 +1,3 @@ -'use strict'; - const error = require('../lib/error'); const auditLogModel = require('../models/audit-log'); diff --git a/src/backend/internal/dead-host.js b/src/backend/internal/dead-host.js index d4c36a75..9042db1d 100644 --- a/src/backend/internal/dead-host.js +++ b/src/backend/internal/dead-host.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('lodash'); const error = require('../lib/error'); const deadHostModel = require('../models/dead_host'); diff --git a/src/backend/internal/ip_ranges.js b/src/backend/internal/ip_ranges.js index c6ed6200..8e7322a5 100644 --- a/src/backend/internal/ip_ranges.js +++ b/src/backend/internal/ip_ranges.js @@ -1,8 +1,5 @@ -'use strict'; - const https = require('https'); const fs = require('fs'); -const _ = require('lodash'); const logger = require('../logger').ip_ranges; const error = require('../lib/error'); const internalNginx = require('./nginx'); diff --git a/src/backend/internal/nginx.js b/src/backend/internal/nginx.js index faaf77fb..556e9fdf 100644 --- a/src/backend/internal/nginx.js +++ b/src/backend/internal/nginx.js @@ -4,7 +4,7 @@ const Liquid = require('liquidjs'); const logger = require('../logger').nginx; const utils = require('../lib/utils'); const error = require('../lib/error'); -const debug_mode = process.env.NODE_ENV !== 'production'; +const debug_mode = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG; const internalNginx = { @@ -132,7 +132,7 @@ const internalNginx = { /** * Generates custom locations - * @param {Object} host + * @param {Object} host * @returns {Promise} */ renderLocations: (host) => { @@ -146,7 +146,7 @@ const internalNginx = { return; } - let renderer = new Liquid(); + let renderer = new Liquid(); let renderedLocations = ''; const locationRendering = async () => { @@ -207,7 +207,7 @@ const internalNginx = { } if (host.locations) { - origLocations = [].concat(host.locations); + origLocations = [].concat(host.locations); locationsPromise = internalNginx.renderLocations(host).then((renderedLocations) => { host.locations = renderedLocations; }); diff --git a/src/backend/internal/redirection-host.js b/src/backend/internal/redirection-host.js index 7f2dea56..7817ef29 100644 --- a/src/backend/internal/redirection-host.js +++ b/src/backend/internal/redirection-host.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('lodash'); const error = require('../lib/error'); const redirectionHostModel = require('../models/redirection_host'); diff --git a/src/backend/internal/report.js b/src/backend/internal/report.js index bd4facae..6594f940 100644 --- a/src/backend/internal/report.js +++ b/src/backend/internal/report.js @@ -1,5 +1,3 @@ -'use strict'; - const internalProxyHost = require('./proxy-host'); const internalRedirectionHost = require('./redirection-host'); const internalDeadHost = require('./dead-host'); diff --git a/src/backend/internal/stream.js b/src/backend/internal/stream.js index bb90bd87..3abed218 100644 --- a/src/backend/internal/stream.js +++ b/src/backend/internal/stream.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('lodash'); const error = require('../lib/error'); const streamModel = require('../models/stream'); diff --git a/src/backend/internal/token.js b/src/backend/internal/token.js index 5b074d32..c216ce15 100644 --- a/src/backend/internal/token.js +++ b/src/backend/internal/token.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('lodash'); const error = require('../lib/error'); const userModel = require('../models/user'); diff --git a/src/backend/internal/user.js b/src/backend/internal/user.js index ff9853f7..2253c956 100644 --- a/src/backend/internal/user.js +++ b/src/backend/internal/user.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('lodash'); const error = require('../lib/error'); const userModel = require('../models/user'); diff --git a/src/backend/lib/access.js b/src/backend/lib/access.js index 6b9ab8b6..6f2da739 100644 --- a/src/backend/lib/access.js +++ b/src/backend/lib/access.js @@ -1,5 +1,3 @@ -'use strict'; - /** * Some Notes: This is a friggin complicated piece of code. * diff --git a/src/backend/lib/error.js b/src/backend/lib/error.js index 070952f1..7c0f8cca 100644 --- a/src/backend/lib/error.js +++ b/src/backend/lib/error.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('lodash'); const util = require('util'); diff --git a/src/backend/lib/express/cors.js b/src/backend/lib/express/cors.js index 1a5778e3..8e241acb 100644 --- a/src/backend/lib/express/cors.js +++ b/src/backend/lib/express/cors.js @@ -1,5 +1,3 @@ -'use strict'; - const validator = require('../validator'); module.exports = function (req, res, next) { diff --git a/src/backend/lib/express/jwt-decode.js b/src/backend/lib/express/jwt-decode.js index ce386e4b..d6c2b934 100644 --- a/src/backend/lib/express/jwt-decode.js +++ b/src/backend/lib/express/jwt-decode.js @@ -1,5 +1,3 @@ -'use strict'; - const Access = require('../access'); module.exports = () => { diff --git a/src/backend/lib/express/jwt.js b/src/backend/lib/express/jwt.js index b4e7dfe3..66dba859 100644 --- a/src/backend/lib/express/jwt.js +++ b/src/backend/lib/express/jwt.js @@ -1,5 +1,3 @@ -'use strict'; - module.exports = function () { return function (req, res, next) { if (req.headers.authorization) { diff --git a/src/backend/lib/express/pagination.js b/src/backend/lib/express/pagination.js index c948edf2..70404f64 100644 --- a/src/backend/lib/express/pagination.js +++ b/src/backend/lib/express/pagination.js @@ -1,5 +1,3 @@ -'use strict'; - let _ = require('lodash'); module.exports = function (default_sort, default_offset, default_limit, max_limit) { diff --git a/src/backend/lib/express/user-id-from-me.js b/src/backend/lib/express/user-id-from-me.js index 259b186f..ca18952e 100644 --- a/src/backend/lib/express/user-id-from-me.js +++ b/src/backend/lib/express/user-id-from-me.js @@ -1,5 +1,3 @@ -'use strict'; - module.exports = (req, res, next) => { if (req.params.user_id === 'me' && res.locals.access) { req.params.user_id = res.locals.access.token.get('attrs').id; diff --git a/src/backend/lib/helpers.js b/src/backend/lib/helpers.js index 389cfc5c..7f1aaac3 100644 --- a/src/backend/lib/helpers.js +++ b/src/backend/lib/helpers.js @@ -1,7 +1,4 @@ -'use strict'; - const moment = require('moment'); -const _ = require('lodash'); module.exports = { diff --git a/src/backend/lib/migrate_template.js b/src/backend/lib/migrate_template.js index 68ba6d69..03c3d132 100644 --- a/src/backend/lib/migrate_template.js +++ b/src/backend/lib/migrate_template.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'identifier_for_migrate'; const logger = require('../logger').migrate; diff --git a/src/backend/lib/utils.js b/src/backend/lib/utils.js index 28919b18..910779ea 100644 --- a/src/backend/lib/utils.js +++ b/src/backend/lib/utils.js @@ -1,5 +1,3 @@ -'use strict'; - const exec = require('child_process').exec; module.exports = { diff --git a/src/backend/lib/validator/api.js b/src/backend/lib/validator/api.js index 4f259efe..fbf8c97d 100644 --- a/src/backend/lib/validator/api.js +++ b/src/backend/lib/validator/api.js @@ -1,5 +1,3 @@ -'use strict'; - const error = require('../error'); const path = require('path'); const parser = require('json-schema-ref-parser'); diff --git a/src/backend/lib/validator/index.js b/src/backend/lib/validator/index.js index 46d32f20..44cac50c 100644 --- a/src/backend/lib/validator/index.js +++ b/src/backend/lib/validator/index.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('lodash'); const error = require('../error'); const definitions = require('../../schema/definitions.json'); diff --git a/src/backend/migrate.js b/src/backend/migrate.js index 68267e36..2240cf49 100644 --- a/src/backend/migrate.js +++ b/src/backend/migrate.js @@ -1,5 +1,3 @@ -'use strict'; - const db = require('./db'); const logger = require('./logger').migrate; diff --git a/src/backend/migrations/20180618015850_initial.js b/src/backend/migrations/20180618015850_initial.js index cf288e37..999a29e1 100644 --- a/src/backend/migrations/20180618015850_initial.js +++ b/src/backend/migrations/20180618015850_initial.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'initial-schema'; const logger = require('../logger').migrate; diff --git a/src/backend/migrations/20180929054513_websockets.js b/src/backend/migrations/20180929054513_websockets.js index 63698fa1..22bafce1 100644 --- a/src/backend/migrations/20180929054513_websockets.js +++ b/src/backend/migrations/20180929054513_websockets.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'websockets'; const logger = require('../logger').migrate; diff --git a/src/backend/migrations/20181019052346_forward_host.js b/src/backend/migrations/20181019052346_forward_host.js index 1ca4d0fc..0a8a4311 100644 --- a/src/backend/migrations/20181019052346_forward_host.js +++ b/src/backend/migrations/20181019052346_forward_host.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'forward_host'; const logger = require('../logger').migrate; diff --git a/src/backend/migrations/20181113041458_http2_support.js b/src/backend/migrations/20181113041458_http2_support.js index f416e0a8..16d91625 100644 --- a/src/backend/migrations/20181113041458_http2_support.js +++ b/src/backend/migrations/20181113041458_http2_support.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'http2_support'; const logger = require('../logger').migrate; diff --git a/src/backend/migrations/20181213013211_forward_scheme.js b/src/backend/migrations/20181213013211_forward_scheme.js index e68cecd1..4c02273d 100644 --- a/src/backend/migrations/20181213013211_forward_scheme.js +++ b/src/backend/migrations/20181213013211_forward_scheme.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'forward_scheme'; const logger = require('../logger').migrate; diff --git a/src/backend/migrations/20190104035154_disabled.js b/src/backend/migrations/20190104035154_disabled.js index 308e219d..767112b2 100644 --- a/src/backend/migrations/20190104035154_disabled.js +++ b/src/backend/migrations/20190104035154_disabled.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'disabled'; const logger = require('../logger').migrate; diff --git a/src/backend/migrations/20190215115310_customlocations.js b/src/backend/migrations/20190215115310_customlocations.js index 5b55dd5e..b1766ac1 100644 --- a/src/backend/migrations/20190215115310_customlocations.js +++ b/src/backend/migrations/20190215115310_customlocations.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'custom_locations'; const logger = require('../logger').migrate; diff --git a/src/backend/migrations/20190218060101_hsts.js b/src/backend/migrations/20190218060101_hsts.js index 752d3320..50812a30 100644 --- a/src/backend/migrations/20190218060101_hsts.js +++ b/src/backend/migrations/20190218060101_hsts.js @@ -1,5 +1,3 @@ -'use strict'; - const migrate_name = 'hsts'; const logger = require('../logger').migrate; diff --git a/src/backend/models/access_list.js b/src/backend/models/access_list.js index 9d620afb..1c7cb51e 100644 --- a/src/backend/models/access_list.js +++ b/src/backend/models/access_list.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; const User = require('./user'); diff --git a/src/backend/models/access_list_auth.js b/src/backend/models/access_list_auth.js index 7c251b65..e4ebd204 100644 --- a/src/backend/models/access_list_auth.js +++ b/src/backend/models/access_list_auth.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; diff --git a/src/backend/models/audit-log.js b/src/backend/models/audit-log.js index 6220ade3..31da1748 100644 --- a/src/backend/models/audit-log.js +++ b/src/backend/models/audit-log.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; const User = require('./user'); diff --git a/src/backend/models/auth.js b/src/backend/models/auth.js index 38d2dd54..b793a6fd 100644 --- a/src/backend/models/auth.js +++ b/src/backend/models/auth.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const bcrypt = require('bcrypt'); const db = require('../db'); const Model = require('objection').Model; diff --git a/src/backend/models/certificate.js b/src/backend/models/certificate.js index b211ee7c..8d016755 100644 --- a/src/backend/models/certificate.js +++ b/src/backend/models/certificate.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; const User = require('./user'); diff --git a/src/backend/models/dead_host.js b/src/backend/models/dead_host.js index c900ebc8..d8357157 100644 --- a/src/backend/models/dead_host.js +++ b/src/backend/models/dead_host.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; const User = require('./user'); diff --git a/src/backend/models/proxy_host.js b/src/backend/models/proxy_host.js index faa5d068..801796a1 100644 --- a/src/backend/models/proxy_host.js +++ b/src/backend/models/proxy_host.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; const User = require('./user'); diff --git a/src/backend/models/redirection_host.js b/src/backend/models/redirection_host.js index 49f12710..c7157f65 100644 --- a/src/backend/models/redirection_host.js +++ b/src/backend/models/redirection_host.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; const User = require('./user'); diff --git a/src/backend/models/stream.js b/src/backend/models/stream.js index a22bf323..5394f725 100644 --- a/src/backend/models/stream.js +++ b/src/backend/models/stream.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; const User = require('./user'); diff --git a/src/backend/models/token.js b/src/backend/models/token.js index e3853108..8db5d72a 100644 --- a/src/backend/models/token.js +++ b/src/backend/models/token.js @@ -3,8 +3,6 @@ and then has abilities after that. */ -'use strict'; - const _ = require('lodash'); const config = require('config'); const jwt = require('jsonwebtoken'); diff --git a/src/backend/models/user.js b/src/backend/models/user.js index 0873b65a..09df952b 100644 --- a/src/backend/models/user.js +++ b/src/backend/models/user.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; const UserPermission = require('./user_permission'); diff --git a/src/backend/models/user_permission.js b/src/backend/models/user_permission.js index 5848a9ea..5ffcfa04 100644 --- a/src/backend/models/user_permission.js +++ b/src/backend/models/user_permission.js @@ -1,8 +1,6 @@ // Objection Docs: // http://vincit.github.io/objection.js/ -'use strict'; - const db = require('../db'); const Model = require('objection').Model; diff --git a/src/backend/routes/api/audit-log.js b/src/backend/routes/api/audit-log.js index 36a0357f..ac60537d 100644 --- a/src/backend/routes/api/audit-log.js +++ b/src/backend/routes/api/audit-log.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const validator = require('../../lib/validator'); const jwtdecode = require('../../lib/express/jwt-decode'); diff --git a/src/backend/routes/api/main.js b/src/backend/routes/api/main.js index a9c885c4..bdbe08fa 100644 --- a/src/backend/routes/api/main.js +++ b/src/backend/routes/api/main.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const pjson = require('../../../../package.json'); const error = require('../../lib/error'); diff --git a/src/backend/routes/api/nginx/access_lists.js b/src/backend/routes/api/nginx/access_lists.js index 46883887..8c9cd16a 100644 --- a/src/backend/routes/api/nginx/access_lists.js +++ b/src/backend/routes/api/nginx/access_lists.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const validator = require('../../../lib/validator'); const jwtdecode = require('../../../lib/express/jwt-decode'); diff --git a/src/backend/routes/api/nginx/dead_hosts.js b/src/backend/routes/api/nginx/dead_hosts.js index 5e7a367e..b0270a68 100644 --- a/src/backend/routes/api/nginx/dead_hosts.js +++ b/src/backend/routes/api/nginx/dead_hosts.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const validator = require('../../../lib/validator'); const jwtdecode = require('../../../lib/express/jwt-decode'); diff --git a/src/backend/routes/api/nginx/proxy_hosts.js b/src/backend/routes/api/nginx/proxy_hosts.js index 718f135e..97d04eda 100644 --- a/src/backend/routes/api/nginx/proxy_hosts.js +++ b/src/backend/routes/api/nginx/proxy_hosts.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const validator = require('../../../lib/validator'); const jwtdecode = require('../../../lib/express/jwt-decode'); diff --git a/src/backend/routes/api/nginx/redirection_hosts.js b/src/backend/routes/api/nginx/redirection_hosts.js index 501d5601..48eef30e 100644 --- a/src/backend/routes/api/nginx/redirection_hosts.js +++ b/src/backend/routes/api/nginx/redirection_hosts.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const validator = require('../../../lib/validator'); const jwtdecode = require('../../../lib/express/jwt-decode'); diff --git a/src/backend/routes/api/nginx/streams.js b/src/backend/routes/api/nginx/streams.js index 857f325c..fd062ee0 100644 --- a/src/backend/routes/api/nginx/streams.js +++ b/src/backend/routes/api/nginx/streams.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const validator = require('../../../lib/validator'); const jwtdecode = require('../../../lib/express/jwt-decode'); diff --git a/src/backend/routes/api/reports.js b/src/backend/routes/api/reports.js index d14d8bd3..a02e6da0 100644 --- a/src/backend/routes/api/reports.js +++ b/src/backend/routes/api/reports.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const jwtdecode = require('../../lib/express/jwt-decode'); const internalReport = require('../../internal/report'); diff --git a/src/backend/routes/api/tokens.js b/src/backend/routes/api/tokens.js index 54207907..1fdf2512 100644 --- a/src/backend/routes/api/tokens.js +++ b/src/backend/routes/api/tokens.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const jwtdecode = require('../../lib/express/jwt-decode'); const internalToken = require('../../internal/token'); diff --git a/src/backend/routes/api/users.js b/src/backend/routes/api/users.js index f4495512..1d559370 100644 --- a/src/backend/routes/api/users.js +++ b/src/backend/routes/api/users.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const validator = require('../../lib/validator'); const jwtdecode = require('../../lib/express/jwt-decode'); diff --git a/src/backend/routes/main.js b/src/backend/routes/main.js index 8b4f9a53..27731ab3 100644 --- a/src/backend/routes/main.js +++ b/src/backend/routes/main.js @@ -1,5 +1,3 @@ -'use strict'; - const express = require('express'); const fs = require('fs'); const PACKAGE = require('../../../package.json'); diff --git a/src/backend/setup.js b/src/backend/setup.js index 3a660806..ef870cbe 100644 --- a/src/backend/setup.js +++ b/src/backend/setup.js @@ -1,5 +1,3 @@ -'use strict'; - const fs = require('fs'); const NodeRSA = require('node-rsa'); const config = require('config'); @@ -7,7 +5,7 @@ const logger = require('./logger').setup; const userModel = require('./models/user'); const userPermissionModel = require('./models/user_permission'); const authModel = require('./models/auth'); -const debug_mode = process.env.NODE_ENV !== 'production'; +const debug_mode = process.env.NODE_ENV !== 'production' || !!process.env.DEBUG; module.exports = function () { return new Promise((resolve, reject) => { diff --git a/src/frontend/js/app/audit-log/list/item.js b/src/frontend/js/app/audit-log/list/item.js index f154931f..862ffc22 100644 --- a/src/frontend/js/app/audit-log/list/item.js +++ b/src/frontend/js/app/audit-log/list/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const Controller = require('../../controller'); const template = require('./item.ejs'); diff --git a/src/frontend/js/app/audit-log/list/main.js b/src/frontend/js/app/audit-log/list/main.js index bbe75beb..88e639e8 100644 --- a/src/frontend/js/app/audit-log/list/main.js +++ b/src/frontend/js/app/audit-log/list/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const ItemView = require('./item'); const template = require('./main.ejs'); diff --git a/src/frontend/js/app/audit-log/main.js b/src/frontend/js/app/audit-log/main.js index b9c2f15d..ec9b5368 100644 --- a/src/frontend/js/app/audit-log/main.js +++ b/src/frontend/js/app/audit-log/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../main'); const AuditLogModel = require('../../models/audit-log'); diff --git a/src/frontend/js/app/audit-log/meta.js b/src/frontend/js/app/audit-log/meta.js index 9ec962bd..815cdfac 100644 --- a/src/frontend/js/app/audit-log/meta.js +++ b/src/frontend/js/app/audit-log/meta.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const template = require('./meta.ejs'); diff --git a/src/frontend/js/app/cache.js b/src/frontend/js/app/cache.js index 9e6534f1..6d1fbc4f 100644 --- a/src/frontend/js/app/cache.js +++ b/src/frontend/js/app/cache.js @@ -1,5 +1,3 @@ -'use strict'; - const UserModel = require('../models/user'); let cache = { diff --git a/src/frontend/js/app/controller.js b/src/frontend/js/app/controller.js index 7e516434..902659be 100644 --- a/src/frontend/js/app/controller.js +++ b/src/frontend/js/app/controller.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const Cache = require('./cache'); const Tokens = require('./tokens'); @@ -342,6 +340,19 @@ module.exports = { } }, + /** + * Certificate Renew + * + * @param model + */ + showNginxCertificateRenew: function (model) { + if (Cache.User.isAdmin() || Cache.User.canManage('certificates')) { + require(['./main', './nginx/certificates/renew'], function (App, View) { + App.UI.showModalDialog(new View({model: model})); + }); + } + }, + /** * Certificate Delete Confirm * diff --git a/src/frontend/js/app/dashboard/main.js b/src/frontend/js/app/dashboard/main.js index 9d768183..c2e82f85 100644 --- a/src/frontend/js/app/dashboard/main.js +++ b/src/frontend/js/app/dashboard/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const Cache = require('../cache'); const Controller = require('../controller'); diff --git a/src/frontend/js/app/empty/main.js b/src/frontend/js/app/empty/main.js index e6f54e45..74998d65 100644 --- a/src/frontend/js/app/empty/main.js +++ b/src/frontend/js/app/empty/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const template = require('./main.ejs'); diff --git a/src/frontend/js/app/error/main.js b/src/frontend/js/app/error/main.js index 431fb17f..6fa85fc8 100644 --- a/src/frontend/js/app/error/main.js +++ b/src/frontend/js/app/error/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const template = require('./main.ejs'); diff --git a/src/frontend/js/app/help/main.js b/src/frontend/js/app/help/main.js index c5787775..b0f54374 100644 --- a/src/frontend/js/app/help/main.js +++ b/src/frontend/js/app/help/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const template = require('./main.ejs'); diff --git a/src/frontend/js/app/i18n.js b/src/frontend/js/app/i18n.js index 451f1968..c63cdc07 100644 --- a/src/frontend/js/app/i18n.js +++ b/src/frontend/js/app/i18n.js @@ -1,5 +1,3 @@ -'use strict'; - const Cache = ('./cache'); const messages = require('../i18n/messages.json'); diff --git a/src/frontend/js/app/main.js b/src/frontend/js/app/main.js index 09236420..e85b4f62 100644 --- a/src/frontend/js/app/main.js +++ b/src/frontend/js/app/main.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('underscore'); const Backbone = require('backbone'); const Mn = require('../lib/marionette'); diff --git a/src/frontend/js/app/nginx/access/delete.js b/src/frontend/js/app/nginx/access/delete.js index e4660cb1..4af91ab1 100644 --- a/src/frontend/js/app/nginx/access/delete.js +++ b/src/frontend/js/app/nginx/access/delete.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const template = require('./delete.ejs'); diff --git a/src/frontend/js/app/nginx/access/form.js b/src/frontend/js/app/nginx/access/form.js index 89c1020b..d4e77c90 100644 --- a/src/frontend/js/app/nginx/access/form.js +++ b/src/frontend/js/app/nginx/access/form.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const AccessListModel = require('../../../models/access-list'); diff --git a/src/frontend/js/app/nginx/access/form/item.js b/src/frontend/js/app/nginx/access/form/item.js index 07c86b96..f15238dc 100644 --- a/src/frontend/js/app/nginx/access/form/item.js +++ b/src/frontend/js/app/nginx/access/form/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const template = require('./item.ejs'); diff --git a/src/frontend/js/app/nginx/access/list/item.js b/src/frontend/js/app/nginx/access/list/item.js index d6498d52..4f68aead 100644 --- a/src/frontend/js/app/nginx/access/list/item.js +++ b/src/frontend/js/app/nginx/access/list/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const template = require('./item.ejs'); diff --git a/src/frontend/js/app/nginx/access/list/main.js b/src/frontend/js/app/nginx/access/list/main.js index d5b7aa75..a1fb6521 100644 --- a/src/frontend/js/app/nginx/access/list/main.js +++ b/src/frontend/js/app/nginx/access/list/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const ItemView = require('./item'); diff --git a/src/frontend/js/app/nginx/access/main.js b/src/frontend/js/app/nginx/access/main.js index 21e54f0f..6b86f55c 100644 --- a/src/frontend/js/app/nginx/access/main.js +++ b/src/frontend/js/app/nginx/access/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const AccessListModel = require('../../../models/access-list'); diff --git a/src/frontend/js/app/nginx/certificates/delete.js b/src/frontend/js/app/nginx/certificates/delete.js index 2499bad1..426e2506 100644 --- a/src/frontend/js/app/nginx/certificates/delete.js +++ b/src/frontend/js/app/nginx/certificates/delete.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const template = require('./delete.ejs'); @@ -16,7 +14,6 @@ module.exports = Mn.View.extend({ }, events: { - 'click @ui.save': function (e) { e.preventDefault(); diff --git a/src/frontend/js/app/nginx/certificates/form.js b/src/frontend/js/app/nginx/certificates/form.js index bde6599e..4c315c15 100644 --- a/src/frontend/js/app/nginx/certificates/form.js +++ b/src/frontend/js/app/nginx/certificates/form.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('underscore'); const Mn = require('backbone.marionette'); const App = require('../../main'); diff --git a/src/frontend/js/app/nginx/certificates/main.js b/src/frontend/js/app/nginx/certificates/main.js index 03f795ad..e1148468 100644 --- a/src/frontend/js/app/nginx/certificates/main.js +++ b/src/frontend/js/app/nginx/certificates/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const CertificateModel = require('../../../models/certificate'); diff --git a/src/frontend/js/app/nginx/dead/delete.js b/src/frontend/js/app/nginx/dead/delete.js index 81356f32..d497d068 100644 --- a/src/frontend/js/app/nginx/dead/delete.js +++ b/src/frontend/js/app/nginx/dead/delete.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const template = require('./delete.ejs'); diff --git a/src/frontend/js/app/nginx/dead/form.js b/src/frontend/js/app/nginx/dead/form.js index 905fab71..4d7ef6b7 100644 --- a/src/frontend/js/app/nginx/dead/form.js +++ b/src/frontend/js/app/nginx/dead/form.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const DeadHostModel = require('../../../models/dead-host'); diff --git a/src/frontend/js/app/nginx/dead/list/item.js b/src/frontend/js/app/nginx/dead/list/item.js index ce5e6db6..a477dbfa 100644 --- a/src/frontend/js/app/nginx/dead/list/item.js +++ b/src/frontend/js/app/nginx/dead/list/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const template = require('./item.ejs'); diff --git a/src/frontend/js/app/nginx/dead/list/main.js b/src/frontend/js/app/nginx/dead/list/main.js index c1833739..2c457bf5 100644 --- a/src/frontend/js/app/nginx/dead/list/main.js +++ b/src/frontend/js/app/nginx/dead/list/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const ItemView = require('./item'); diff --git a/src/frontend/js/app/nginx/dead/main.js b/src/frontend/js/app/nginx/dead/main.js index 4741a61c..ac3cb7f1 100644 --- a/src/frontend/js/app/nginx/dead/main.js +++ b/src/frontend/js/app/nginx/dead/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const DeadHostModel = require('../../../models/dead-host'); diff --git a/src/frontend/js/app/nginx/proxy/delete.js b/src/frontend/js/app/nginx/proxy/delete.js index 3f739f8f..63a8e020 100644 --- a/src/frontend/js/app/nginx/proxy/delete.js +++ b/src/frontend/js/app/nginx/proxy/delete.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const template = require('./delete.ejs'); diff --git a/src/frontend/js/app/nginx/proxy/form.js b/src/frontend/js/app/nginx/proxy/form.js index 1e26bcf5..7abb09be 100644 --- a/src/frontend/js/app/nginx/proxy/form.js +++ b/src/frontend/js/app/nginx/proxy/form.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const ProxyHostModel = require('../../../models/proxy-host'); diff --git a/src/frontend/js/app/nginx/proxy/list/item.js b/src/frontend/js/app/nginx/proxy/list/item.js index 9df2fd81..37d199b4 100644 --- a/src/frontend/js/app/nginx/proxy/list/item.js +++ b/src/frontend/js/app/nginx/proxy/list/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const template = require('./item.ejs'); diff --git a/src/frontend/js/app/nginx/proxy/list/main.js b/src/frontend/js/app/nginx/proxy/list/main.js index 64896c1f..054e856e 100644 --- a/src/frontend/js/app/nginx/proxy/list/main.js +++ b/src/frontend/js/app/nginx/proxy/list/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const ItemView = require('./item'); diff --git a/src/frontend/js/app/nginx/proxy/location-item.ejs b/src/frontend/js/app/nginx/proxy/location-item.ejs index d6f362a0..8b5eb767 100644 --- a/src/frontend/js/app/nginx/proxy/location-item.ejs +++ b/src/frontend/js/app/nginx/proxy/location-item.ejs @@ -39,7 +39,7 @@
- <%- i18n('proxy-hosts', 'cutom-forward-host-help') %> + <%- i18n('proxy-hosts', 'custom-forward-host-help') %>
diff --git a/src/frontend/js/app/nginx/proxy/main.js b/src/frontend/js/app/nginx/proxy/main.js index 10139ac0..83cedfba 100644 --- a/src/frontend/js/app/nginx/proxy/main.js +++ b/src/frontend/js/app/nginx/proxy/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const ProxyHostModel = require('../../../models/proxy-host'); diff --git a/src/frontend/js/app/nginx/redirection/delete.js b/src/frontend/js/app/nginx/redirection/delete.js index 430f9c48..6d2862f6 100644 --- a/src/frontend/js/app/nginx/redirection/delete.js +++ b/src/frontend/js/app/nginx/redirection/delete.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const template = require('./delete.ejs'); diff --git a/src/frontend/js/app/nginx/redirection/form.js b/src/frontend/js/app/nginx/redirection/form.js index 61e8401f..0cef1a3d 100644 --- a/src/frontend/js/app/nginx/redirection/form.js +++ b/src/frontend/js/app/nginx/redirection/form.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const RedirectionHostModel = require('../../../models/redirection-host'); diff --git a/src/frontend/js/app/nginx/redirection/list/item.js b/src/frontend/js/app/nginx/redirection/list/item.js index 05a5d5a3..05adc251 100644 --- a/src/frontend/js/app/nginx/redirection/list/item.js +++ b/src/frontend/js/app/nginx/redirection/list/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const template = require('./item.ejs'); diff --git a/src/frontend/js/app/nginx/redirection/list/main.js b/src/frontend/js/app/nginx/redirection/list/main.js index e51e03e6..5aa501e6 100644 --- a/src/frontend/js/app/nginx/redirection/list/main.js +++ b/src/frontend/js/app/nginx/redirection/list/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const ItemView = require('./item'); diff --git a/src/frontend/js/app/nginx/redirection/main.js b/src/frontend/js/app/nginx/redirection/main.js index 1269fc54..f45f9a07 100644 --- a/src/frontend/js/app/nginx/redirection/main.js +++ b/src/frontend/js/app/nginx/redirection/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const RedirectionHostModel = require('../../../models/redirection-host'); diff --git a/src/frontend/js/app/nginx/stream/delete.js b/src/frontend/js/app/nginx/stream/delete.js index 8e0c57b8..71eff18c 100644 --- a/src/frontend/js/app/nginx/stream/delete.js +++ b/src/frontend/js/app/nginx/stream/delete.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const template = require('./delete.ejs'); diff --git a/src/frontend/js/app/nginx/stream/form.js b/src/frontend/js/app/nginx/stream/form.js index 260a8ce1..2133c3da 100644 --- a/src/frontend/js/app/nginx/stream/form.js +++ b/src/frontend/js/app/nginx/stream/form.js @@ -1,6 +1,3 @@ -'use strict'; - -const _ = require('underscore'); const Mn = require('backbone.marionette'); const App = require('../../main'); const StreamModel = require('../../../models/stream'); diff --git a/src/frontend/js/app/nginx/stream/list/item.js b/src/frontend/js/app/nginx/stream/list/item.js index 34595732..a6892ee2 100644 --- a/src/frontend/js/app/nginx/stream/list/item.js +++ b/src/frontend/js/app/nginx/stream/list/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const template = require('./item.ejs'); diff --git a/src/frontend/js/app/nginx/stream/list/main.js b/src/frontend/js/app/nginx/stream/list/main.js index 905eaa9d..4b1e27e2 100644 --- a/src/frontend/js/app/nginx/stream/list/main.js +++ b/src/frontend/js/app/nginx/stream/list/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../../main'); const ItemView = require('./item'); diff --git a/src/frontend/js/app/nginx/stream/main.js b/src/frontend/js/app/nginx/stream/main.js index 0dc99c02..a8eda92c 100644 --- a/src/frontend/js/app/nginx/stream/main.js +++ b/src/frontend/js/app/nginx/stream/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const StreamModel = require('../../../models/stream'); diff --git a/src/frontend/js/app/router.js b/src/frontend/js/app/router.js index 790ef817..a036bfc5 100644 --- a/src/frontend/js/app/router.js +++ b/src/frontend/js/app/router.js @@ -1,5 +1,3 @@ -'use strict'; - const AppRouter = require('marionette.approuter'); const Controller = require('./controller'); diff --git a/src/frontend/js/app/settings/default-site/main.js b/src/frontend/js/app/settings/default-site/main.js index 4bd14e5c..06a45b8b 100644 --- a/src/frontend/js/app/settings/default-site/main.js +++ b/src/frontend/js/app/settings/default-site/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const template = require('./main.ejs'); diff --git a/src/frontend/js/app/settings/list/item.js b/src/frontend/js/app/settings/list/item.js index c79b73b2..03f9ac05 100644 --- a/src/frontend/js/app/settings/list/item.js +++ b/src/frontend/js/app/settings/list/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const template = require('./item.ejs'); diff --git a/src/frontend/js/app/settings/list/main.js b/src/frontend/js/app/settings/list/main.js index bbe75beb..88e639e8 100644 --- a/src/frontend/js/app/settings/list/main.js +++ b/src/frontend/js/app/settings/list/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const ItemView = require('./item'); const template = require('./main.ejs'); diff --git a/src/frontend/js/app/settings/main.js b/src/frontend/js/app/settings/main.js index 348f467f..96b2941f 100644 --- a/src/frontend/js/app/settings/main.js +++ b/src/frontend/js/app/settings/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../main'); const SettingModel = require('../../models/setting'); diff --git a/src/frontend/js/app/tokens.js b/src/frontend/js/app/tokens.js index fb85e9f6..4a56bcab 100644 --- a/src/frontend/js/app/tokens.js +++ b/src/frontend/js/app/tokens.js @@ -1,5 +1,3 @@ -'use strict'; - const STORAGE_NAME = 'nginx-proxy-manager-tokens'; /** @@ -28,7 +26,7 @@ const setStorageTokens = function (tokens) { const Tokens = { /** - * @returns {Integer} + * @returns {Number} */ getTokenCount: () => { return getStorageTokens().length; @@ -62,7 +60,7 @@ const Tokens = { * * @param {String} token * @param {String} [name] - * @returns {Integer} + * @returns {Number} */ addToken: (token, name) => { // Get top token and if it's the same, ignore this call @@ -107,7 +105,7 @@ const Tokens = { }, /** - * @returns {Integer} + * @returns {Number} */ dropTopToken: () => { let tokens = getStorageTokens(); diff --git a/src/frontend/js/app/ui/footer/main.js b/src/frontend/js/app/ui/footer/main.js index 5d00cad1..73f515e6 100644 --- a/src/frontend/js/app/ui/footer/main.js +++ b/src/frontend/js/app/ui/footer/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const template = require('./main.ejs'); const Cache = require('../../cache'); diff --git a/src/frontend/js/app/ui/header/main.js b/src/frontend/js/app/ui/header/main.js index a914ae66..9779b45c 100644 --- a/src/frontend/js/app/ui/header/main.js +++ b/src/frontend/js/app/ui/header/main.js @@ -1,5 +1,3 @@ -'use strict'; - const $ = require('jquery'); const Mn = require('backbone.marionette'); const i18n = require('../../i18n'); diff --git a/src/frontend/js/app/ui/main.js b/src/frontend/js/app/ui/main.js index 4783358d..c90c61d5 100644 --- a/src/frontend/js/app/ui/main.js +++ b/src/frontend/js/app/ui/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const template = require('./main.ejs'); const HeaderView = require('./header/main'); diff --git a/src/frontend/js/app/ui/menu/main.js b/src/frontend/js/app/ui/menu/main.js index 43186541..dabe26d3 100644 --- a/src/frontend/js/app/ui/menu/main.js +++ b/src/frontend/js/app/ui/menu/main.js @@ -1,5 +1,3 @@ -'use strict'; - const $ = require('jquery'); const Mn = require('backbone.marionette'); const Controller = require('../../controller'); diff --git a/src/frontend/js/app/user/delete.js b/src/frontend/js/app/user/delete.js index 87aa7d5e..e8ed5c32 100644 --- a/src/frontend/js/app/user/delete.js +++ b/src/frontend/js/app/user/delete.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const template = require('./delete.ejs'); const App = require('../main'); diff --git a/src/frontend/js/app/user/form.js b/src/frontend/js/app/user/form.js index 6fe88f09..ef92ec3e 100644 --- a/src/frontend/js/app/user/form.js +++ b/src/frontend/js/app/user/form.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../main'); const UserModel = require('../../models/user'); diff --git a/src/frontend/js/app/user/password.js b/src/frontend/js/app/user/password.js index 7530ddbf..06c57261 100644 --- a/src/frontend/js/app/user/password.js +++ b/src/frontend/js/app/user/password.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../main'); const template = require('./password.ejs'); diff --git a/src/frontend/js/app/user/permissions.js b/src/frontend/js/app/user/permissions.js index 3621273a..af8049ce 100644 --- a/src/frontend/js/app/user/permissions.js +++ b/src/frontend/js/app/user/permissions.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../main'); const UserModel = require('../../models/user'); diff --git a/src/frontend/js/app/users/list/item.js b/src/frontend/js/app/users/list/item.js index 4b5b2c82..4645a5c4 100644 --- a/src/frontend/js/app/users/list/item.js +++ b/src/frontend/js/app/users/list/item.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../../main'); const Tokens = require('../../tokens'); diff --git a/src/frontend/js/app/users/list/main.js b/src/frontend/js/app/users/list/main.js index bbe75beb..88e639e8 100644 --- a/src/frontend/js/app/users/list/main.js +++ b/src/frontend/js/app/users/list/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const ItemView = require('./item'); const template = require('./main.ejs'); diff --git a/src/frontend/js/app/users/main.js b/src/frontend/js/app/users/main.js index db4a389f..95d42c61 100644 --- a/src/frontend/js/app/users/main.js +++ b/src/frontend/js/app/users/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const App = require('../main'); const UserModel = require('../../models/user'); diff --git a/src/frontend/js/lib/helpers.js b/src/frontend/js/lib/helpers.js index 578fe3ce..21ce7424 100644 --- a/src/frontend/js/lib/helpers.js +++ b/src/frontend/js/lib/helpers.js @@ -1,5 +1,3 @@ -'use strict'; - const numeral = require('numeral'); const moment = require('moment'); diff --git a/src/frontend/js/lib/marionette.js b/src/frontend/js/lib/marionette.js index c2989fde..c88368f8 100644 --- a/src/frontend/js/lib/marionette.js +++ b/src/frontend/js/lib/marionette.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('underscore'); const Mn = require('backbone.marionette'); const i18n = require('../app/i18n'); diff --git a/src/frontend/js/login/main.js b/src/frontend/js/login/main.js index 80d28660..934a073a 100644 --- a/src/frontend/js/login/main.js +++ b/src/frontend/js/login/main.js @@ -1,5 +1,3 @@ -'use strict'; - const Mn = require('backbone.marionette'); const LoginView = require('./ui/login'); diff --git a/src/frontend/js/login/ui/login.js b/src/frontend/js/login/ui/login.js index da1bc858..757eb4e3 100644 --- a/src/frontend/js/login/ui/login.js +++ b/src/frontend/js/login/ui/login.js @@ -1,5 +1,3 @@ -'use strict'; - const $ = require('jquery'); const Mn = require('backbone.marionette'); const template = require('./login.ejs'); diff --git a/src/frontend/js/models/access-list.js b/src/frontend/js/models/access-list.js index 60cd57dd..8cd9306f 100644 --- a/src/frontend/js/models/access-list.js +++ b/src/frontend/js/models/access-list.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/audit-log.js b/src/frontend/js/models/audit-log.js index 2918ff40..c929a0bd 100644 --- a/src/frontend/js/models/audit-log.js +++ b/src/frontend/js/models/audit-log.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/certificate.js b/src/frontend/js/models/certificate.js index 60df86c7..c7d0b2d9 100644 --- a/src/frontend/js/models/certificate.js +++ b/src/frontend/js/models/certificate.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/dead-host.js b/src/frontend/js/models/dead-host.js index eaacf1b3..98ceef29 100644 --- a/src/frontend/js/models/dead-host.js +++ b/src/frontend/js/models/dead-host.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/proxy-host-location.js b/src/frontend/js/models/proxy-host-location.js index 08459138..2a35059f 100644 --- a/src/frontend/js/models/proxy-host-location.js +++ b/src/frontend/js/models/proxy-host-location.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/proxy-host.js b/src/frontend/js/models/proxy-host.js index e169fa02..b82d09fe 100644 --- a/src/frontend/js/models/proxy-host.js +++ b/src/frontend/js/models/proxy-host.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/redirection-host.js b/src/frontend/js/models/redirection-host.js index cb31e6fb..a4f11e21 100644 --- a/src/frontend/js/models/redirection-host.js +++ b/src/frontend/js/models/redirection-host.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/setting.js b/src/frontend/js/models/setting.js index 4ee198df..c70a4e9c 100644 --- a/src/frontend/js/models/setting.js +++ b/src/frontend/js/models/setting.js @@ -1,6 +1,3 @@ -'use strict'; - -const _ = require('underscore'); const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/stream.js b/src/frontend/js/models/stream.js index 69f23111..e4693549 100644 --- a/src/frontend/js/models/stream.js +++ b/src/frontend/js/models/stream.js @@ -1,5 +1,3 @@ -'use strict'; - const Backbone = require('backbone'); const model = Backbone.Model.extend({ diff --git a/src/frontend/js/models/user.js b/src/frontend/js/models/user.js index 2fe809ef..a8e4ed9e 100644 --- a/src/frontend/js/models/user.js +++ b/src/frontend/js/models/user.js @@ -1,5 +1,3 @@ -'use strict'; - const _ = require('underscore'); const Backbone = require('backbone');