reorganize routing

routes/index.js

@@ -1,3 +1,18 @@
+import aboutRouter from './about.js';
+import adminRouter from './admin/index.js';
+import apiRouter from './api/index.js';
+import apiDocsRouter from './api-docs.js';
+import authRouter from './auth/index.js';
+import backupsRouter from './backups.js';
+import bonusesRouter from './bonuses.js';
+import databaseRouter from './database.js';
+import geowordRouter from './geoword/index.js';
+import multiplayerRouter from './multiplayer.js';
+import settingsRouter from './settings.js';
+import tossupsRouter from './tossups.js';
+import userRouter from './user.js';
+import webhookRouter from './api/webhook.js';
+
 import { Router } from 'express';
 const router = Router();
 
@@ -64,4 +79,27 @@ router.get('/users', (req, res) => {
     res.redirect(`/user${req.url}`);
 });
 
+/**
+ * Routes:
+ */
+
+router.use('/about', aboutRouter);
+router.use('/admin', adminRouter);
+router.use('/api', apiRouter);
+router.use('/api-docs', apiDocsRouter);
+router.use('/auth', authRouter);
+router.use('/backups', backupsRouter);
+router.use('/bonuses', bonusesRouter);
+router.use('/db', databaseRouter);
+router.use('/geoword', geowordRouter);
+router.use('/multiplayer', multiplayerRouter);
+router.use('/settings', settingsRouter);
+router.use('/tossups', tossupsRouter);
+router.use('/user', userRouter);
+router.use('/webhook', webhookRouter);
+
+router.use((req, res) => {
+    res.sendFile(req.url, { root: './client' });
+});
+
 export default router;

server/server.js

@@ -4,21 +4,7 @@ import { ipFilterMiddleware, ipFilterError } from './ip-filter.js';
 import { createAndReturnRoom } from './TossupRoom.js';
 
 import { WEBSOCKET_MAX_PAYLOAD, COOKIE_MAX_AGE } from '../constants.js';
-
-import aboutRouter from '../routes/about.js';
-import adminRouter from '../routes/admin/index.js';
-import apiRouter from '../routes/api/index.js';
-import apiDocsRouter from '../routes/api-docs.js';
-import authRouter from '../routes/auth/index.js';
-import backupsRouter from '../routes/backups.js';
-import bonusesRouter from '../routes/bonuses.js';
-import databaseRouter from '../routes/database.js';
-import geowordRouter from '../routes/geoword/index.js';
 import indexRouter from '../routes/index.js';
-import multiplayerRouter from '../routes/multiplayer.js';
-import settingsRouter from '../routes/settings.js';
-import tossupsRouter from '../routes/tossups.js';
-import userRouter from '../routes/user.js';
 import webhookRouter from '../routes/api/webhook.js';
 
 import cookieSession from 'cookie-session';
@@ -74,26 +60,7 @@ wss.on('connection', (ws, req) => {
     });
 });
 
-app.use('/', indexRouter);
-app.use('/about', aboutRouter);
-app.use('/admin', adminRouter);
-app.use('/api', apiRouter);
-app.use('/api-docs', apiDocsRouter);
-app.use('/auth', authRouter);
-app.use('/backups', backupsRouter);
-app.use('/bonuses', bonusesRouter);
-app.use('/db', databaseRouter);
-app.use('/geoword', geowordRouter);
-app.use('/multiplayer', multiplayerRouter);
-app.use('/settings', settingsRouter);
-app.use('/tossups', tossupsRouter);
-app.use('/user', userRouter);
-app.use('/webhook', webhookRouter);
-
-
-app.use((req, res) => {
-    res.sendFile(req.url, { root: './client' });
-});
+app.use(indexRouter);
 
 // listen on ipv4 instead of ipv6
 server.listen({ port, host: '0.0.0.0' }, () => {