From bebdd504dda0699d78af83858d04059bf92fb481 Mon Sep 17 00:00:00 2001 From: garrettmills Date: Mon, 15 Feb 2021 19:06:51 -0600 Subject: [PATCH] Noded/frontend#84 - make welcome page redirect to SPA by default --- app/controllers/Home.controller.js | 12 +----------- app/controllers/api/v1/Page.controller.js | 5 +++++ app/routing/routers/api/v1/page.routes.js | 7 +++++++ 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/app/controllers/Home.controller.js b/app/controllers/Home.controller.js index 601f41f..5d5d1ba 100644 --- a/app/controllers/Home.controller.js +++ b/app/controllers/Home.controller.js @@ -15,17 +15,7 @@ class Home extends Controller { * Serve the main welcome page. */ welcome(req, res) { - if (req.user) { - // If we have a user, redirect them to the main app - return res.redirect('/i') - } - - /* - * Return the welcome view. - * The page() method is added by Flitter and passes some - * helpful contextual data to the view as well. - */ - return res.page('welcome', { user: req.user }); + return res.redirect('/i') } async get_login(req, res) { diff --git a/app/controllers/api/v1/Page.controller.js b/app/controllers/api/v1/Page.controller.js index bb6a1cb..7ed4dcc 100644 --- a/app/controllers/api/v1/Page.controller.js +++ b/app/controllers/api/v1/Page.controller.js @@ -167,6 +167,11 @@ class Page extends Controller { return res.api(return_nodes) } + async get_node(req, res) { + let { page, node } = req.form + return res.api(node) + } + async save_node_to_page(req, res) { const { page } = req.form diff --git a/app/routing/routers/api/v1/page.routes.js b/app/routing/routers/api/v1/page.routes.js index cdca034..4c27921 100644 --- a/app/routing/routers/api/v1/page.routes.js +++ b/app/routing/routers/api/v1/page.routes.js @@ -24,6 +24,13 @@ module.exports = exports = { ['middleware::api:DataInjection', { access_level: 'view' }], 'controller::api:v1:Page.get_nodes', ], + + // Get a particular node present on the specified page + '/:PageId/nodes/:NodeId': [ + 'middleware::auth:ApiRoute', + ['middleware::api:DataInjection', { access_level: 'view' }], + 'controller::api:v1:Page.get_node', + ], }, post: {