diff --git a/lib/webadmin/index.js b/lib/webadmin/index.js index 6536f54..fe7445a 100644 --- a/lib/webadmin/index.js +++ b/lib/webadmin/index.js @@ -10,10 +10,6 @@ const logger = require('komodo-sdk/logger'); const routerConfig = require('./router/config'); const app = express(); -app.use((req, res, next) => { - res.locals.main_config = config; - next(); -}); nunjucks.configure('./webadmin-views', { autoescape: true, @@ -37,6 +33,11 @@ const accessLogStream = rfs.createStream( app.use(morgan('combined', { stream: accessLogStream })); +app.use((req, res, next) => { + res.locals.config = config; + next(); +}); + app.get('/', (req, res) => { res.redirect('/config/modem'); }); diff --git a/lib/webadmin/router/config.js b/lib/webadmin/router/config.js index 9d7688b..dd2327c 100644 --- a/lib/webadmin/router/config.js +++ b/lib/webadmin/router/config.js @@ -16,7 +16,6 @@ async function writeConfigFile() { function pageMain(req, res) { res.render('config.index.html', { - config: JSON.stringify(config, null, 4), modems: orderBy(config.modems, [(v) => v.name], ['asc']), baseUrl: req.baseUrl, }); diff --git a/webadmin-views/template.starter.html b/webadmin-views/template.starter.html index 7868a14..439bea4 100644 --- a/webadmin-views/template.starter.html +++ b/webadmin-views/template.starter.html @@ -7,7 +7,7 @@ <meta name="description" content=""> <meta name="author" content="Mark Otto, Jacob Thornton, and Bootstrap contributors"> <meta name="generator" content="Jekyll v3.8.6"> - <title>{{ main_config.name }}</title> + <title>{{ config.name }}</title> <!-- Bootstrap core CSS --> <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.4.1/css/bootstrap.min.css" integrity="sha384-Vkoo8x4CGsO3+Hhxv8T/Q5PaXtkKtu6ug5TOeNV6gBiFeWPGFN9MuhOf23Q9Ifjh" crossorigin="anonymous"> @@ -44,7 +44,7 @@ </head> <body> <nav class="navbar navbar-expand-md navbar-dark bg-dark fixed-top"> - <a class="navbar-brand" href="#">{{ main_config.name }}</a> + <a class="navbar-brand" href="#">{{ config.name }}</a> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarsExampleDefault" aria-controls="navbarsExampleDefault" aria-expanded="false" aria-label="Toggle navigation"> <span class="navbar-toggler-icon"></span> </button>