diff --git a/packages/server/app.js b/packages/server/app.js index f56d4c8541..3b95d2364f 100644 --- a/packages/server/app.js +++ b/packages/server/app.js @@ -1,5 +1,5 @@ const Koa = require("koa") -const router = require("./middleware/routers") +const router = require("./middleware/routes/builderRouter") const koaBody = require("koa-body") const initialiseRuntimePackages = require("./initialise/initialiseRuntimePackages") diff --git a/packages/server/middleware/routes/apps.js b/packages/server/middleware/routes/apps.js index dd20d79ab5..45ddceb96d 100644 --- a/packages/server/middleware/routes/apps.js +++ b/packages/server/middleware/routes/apps.js @@ -2,7 +2,8 @@ const Router = require("@koa/router"); const { getPackageForBuilder, getApps, -} = require("../utilities/builder") +} = require("../../utilities/builder") + const router = Router(); diff --git a/packages/server/middleware/routes/authenticated.js b/packages/server/middleware/routes/authenticated.js index 5931469d89..d6c791aedc 100644 --- a/packages/server/middleware/routes/authenticated.js +++ b/packages/server/middleware/routes/authenticated.js @@ -1,4 +1,4 @@ -const Router = require("koa-router"); +const Router = require("@koa/router"); const routeHandlers = require("../routeHandlers") const router = Router(); diff --git a/packages/server/middleware/routes/builderRouter.js b/packages/server/middleware/routes/builderRouter.js index a9960a0b26..e47e45ed09 100644 --- a/packages/server/middleware/routes/builderRouter.js +++ b/packages/server/middleware/routes/builderRouter.js @@ -1,9 +1,9 @@ const Router = require("@koa/router") -const session = require("./session") -const StatusCodes = require("../utilities/statusCodes") +const session = require("../session") +const StatusCodes = require("../../utilities/statusCodes") const { resolve } = require("path") const send = require("koa-send") -const routeHandlers = require("./routeHandlers") +const routeHandlers = require("../routeHandlers") const { componentRoutes, appsRoutes, diff --git a/packages/server/middleware/routes/components.js b/packages/server/middleware/routes/components.js index bc52863966..e89fec6b3b 100644 --- a/packages/server/middleware/routes/components.js +++ b/packages/server/middleware/routes/components.js @@ -1,4 +1,4 @@ -const Router = require("koa-router"); +const Router = require("@koa/router"); const send = require("koa-send") const { getComponentDefinitions, diff --git a/packages/server/middleware/routes/index.js b/packages/server/middleware/routes/index.js index 1efaadbaeb..5cac9f21ff 100644 --- a/packages/server/middleware/routes/index.js +++ b/packages/server/middleware/routes/index.js @@ -1,4 +1,3 @@ -const screenRoutes = require("./screens"); const pageRoutes = require("./pages"); const componentRoutes = require("./components"); const userRoutes = require("./user"); @@ -6,9 +5,9 @@ const appsRoutes = require("./apps"); const authenticatedRoutes = require("./authenticated"); module.exports = { - screenRoutes, pageRoutes, componentRoutes, - authRoutes, - appsRoutes + appsRoutes, + userRoutes, + authenticatedRoutes }; \ No newline at end of file