diff --git a/src/officesense_pi/src/api/livedata/livadata.routes.ts b/src/officesense_pi/src/api/livedata/livadata.routes.ts index 1ada5c2..c185ef5 100644 --- a/src/officesense_pi/src/api/livedata/livadata.routes.ts +++ b/src/officesense_pi/src/api/livedata/livadata.routes.ts @@ -3,8 +3,7 @@ import { getEntities, getEntitiesOfType, getEntity } from "./livedata.controller const router = express.Router(); -router.get("/entities", getEntities); -router.get("/entities", getEntitiesOfType); +router.get("/entities", getEntities, getEntitiesOfType); router.get("/entities/:urn", getEntity); export default router; diff --git a/src/officesense_pi/src/index.ts b/src/officesense_pi/src/index.ts index 4f9f1a0..990b523 100644 --- a/src/officesense_pi/src/index.ts +++ b/src/officesense_pi/src/index.ts @@ -1,14 +1,22 @@ import express from "express"; -import lookupRoutes from "./api/lookup/lookup.routes.js"; -import livedataRoutes from "./api/livedata/livadata.routes.js" +import lookupRouter from "./api/lookup/lookup.routes.js"; +import livedataRouter from "./api/livedata/livadata.routes.js" +import mapperRouter from "./api/mapper/mapper.routes.js" +import { createAdmin, sessionMiddleware } from './api/management/adminjs.routes.js' import config from "./config/config.js"; import { bootstrap } from "./core/bootstrap.js"; (async () => { const app = express(); - app.use("/lookup", lookupRoutes); - app.use("/livedata", livedataRoutes); + const { admin, router: adminRouter } = await createAdmin(); + + app.use(sessionMiddleware); + + app.use("/lookup", lookupRouter); + app.use("/livedata", livedataRouter); + app.use("/admin", mapperRouter); + app.use("/admin", adminRouter); app.listen(config.api.port, config.api.address, () => { console.log(`Server listening on ${config.api.address}:${config.api.port}`); diff --git a/src/officesense_pi/src/lib/prisma.ts b/src/officesense_pi/src/lib/prisma.ts index 4513b1d..7ededa5 100644 --- a/src/officesense_pi/src/lib/prisma.ts +++ b/src/officesense_pi/src/lib/prisma.ts @@ -1,10 +1,5 @@ -import "dotenv/config"; -import { PrismaBetterSqlite3 } from "@prisma/adapter-better-sqlite3"; -import { PrismaClient } from "../generated/prisma/client.js"; +import { PrismaClient } from '@prisma/client' -const connectionString = `${process.env.DATABASE_URL}`; - -const adapter = new PrismaBetterSqlite3({ url: connectionString }); -const prisma = new PrismaClient({ adapter }); +const prisma = new PrismaClient() export { prisma }; \ No newline at end of file