diff --git a/api/src/index.ts b/api/src/index.ts index 7230a30..80d29db 100644 --- a/api/src/index.ts +++ b/api/src/index.ts @@ -7,7 +7,7 @@ import morgan = require('morgan'); const app = express() app.use(morgan('dev', { skip: (req) => { - return req.path === '/members/me'; + return req.originalUrl === '/members/me'; } })) @@ -64,6 +64,7 @@ import { authRouter } from './routes/auth'; import { roles, memberRoles } from './routes/roles'; import { courseRouter, eventRouter } from './routes/course'; import { calendarRouter } from './routes/calendar'; +import { docsRouter } from './routes/docs'; app.use('/application', applicationRouter); app.use('/ranks', ranks); @@ -77,6 +78,7 @@ app.use('/memberRoles', memberRoles) app.use('/course', courseRouter) app.use('/courseEvent', eventRouter) app.use('/calendar', calendarRouter) +app.use('/docs', docsRouter) app.use('/', authRouter) app.get('/ping', (req, res) => { diff --git a/api/src/routes/docs.ts b/api/src/routes/docs.ts new file mode 100644 index 0000000..13ada87 --- /dev/null +++ b/api/src/routes/docs.ts @@ -0,0 +1,24 @@ +const express = require('express'); +const router = express.Router(); + +import { Request, Response } from 'express'; +import { requireLogin } from '../middleware/auth'; + +router.get('/welcome', [requireLogin], async (req: Request, res: Response) => { + const output = await fetch(`${process.env.DOC_HOST}/api/pages/717`, { + headers: { + Authorization: `Token ${process.env.DOC_TOKEN_ID}:${process.env.DOC_TOKEN_SECRET}`, + } + }) + + if (output.ok) { + const out = await output.json(); + res.status(200).json(out.html); + } else { + console.error("Failed to fetch LOA policy from bookstack"); + res.sendStatus(500); + } +}) + + +export const docsRouter = router; \ No newline at end of file diff --git a/ui/public/bg.jpg b/ui/public/bg.jpg new file mode 100644 index 0000000..25c6ace Binary files /dev/null and b/ui/public/bg.jpg differ diff --git a/ui/src/App.vue b/ui/src/App.vue index 28a0fbc..d27efcd 100644 --- a/ui/src/App.vue +++ b/ui/src/App.vue @@ -22,7 +22,10 @@ const environment = import.meta.env.VITE_ENVIRONMENT;