From 366f3297dafeffd21fa20f47baa35cb0257fdf96 Mon Sep 17 00:00:00 2001 From: Spacelord Date: Sun, 20 Apr 2025 21:20:57 +0200 Subject: [PATCH] Streamline some variable names --- src/routes/api/index.ts | 4 ++-- src/routes/api/v1/index.ts | 8 ++++---- src/routes/frontend/admin/index.ts | 19 ++++++++----------- src/routes/frontend/index.ts | 16 ++++++++-------- src/routes/index.ts | 8 ++++---- 5 files changed, 26 insertions(+), 29 deletions(-) diff --git a/src/routes/api/index.ts b/src/routes/api/index.ts index 6528ca2..c8610a4 100644 --- a/src/routes/api/index.ts +++ b/src/routes/api/index.ts @@ -1,11 +1,11 @@ import express from 'express'; // Route imports -import v1_routes from './v1/index.js'; +import v1_router from './v1/index.js'; // Router base is '/api' const Router = express.Router({ strict: false }); -Router.use('/v1', v1_routes); +Router.use('/v1', v1_router); export default Router; diff --git a/src/routes/api/v1/index.ts b/src/routes/api/v1/index.ts index 37a6f55..b5981d7 100644 --- a/src/routes/api/v1/index.ts +++ b/src/routes/api/v1/index.ts @@ -1,8 +1,8 @@ import express from 'express'; // Route imports -import testRoute from './test.js'; -import versionRoute from './version.js'; +import test_route from './test.js'; +import version_route from './version.js'; import user_route from './user/user.js'; import user_schema from './user/user_schema.js'; @@ -58,7 +58,7 @@ Router.route('/image/describe').get(image_schema); Router.route('/transaction').get(transaction_route.get).post(transaction_route.post).patch(transaction_route.patch).delete(transaction_route.del); Router.route('/transaction/describe').get(transaction_schema); -Router.route('/version').get(versionRoute.get); -Router.route('/test').get(testRoute.get); +Router.route('/version').get(version_route.get); +Router.route('/test').get(test_route.get); export default Router; diff --git a/src/routes/frontend/admin/index.ts b/src/routes/frontend/admin/index.ts index 179a916..dc33ffd 100644 --- a/src/routes/frontend/admin/index.ts +++ b/src/routes/frontend/admin/index.ts @@ -1,20 +1,17 @@ import express from 'express'; // Route imports -import dashboard_Route from './dashboard.js'; -import users from './users.js'; -import products from './products.js'; -import report from './report.js'; +import dashboard_route from './dashboard.js'; +import users_route from './users.js'; +import products_route from './products.js'; +import report_route from './report.js'; // Router base is '/admin' const Router = express.Router({ strict: false }); -Router.route('/').get(dashboard_Route.get); -Router.route('/users').get(users.get); -Router.route('/products').get(products.get); -Router.route('/report').get(report.get); -// Router.route('/user_select').get(user_select_Route.get); -// Router.route('/product_select').get(product_select_Route.get); -// Router.route('/pay_up').get(pay_up_Route.get); +Router.route('/').get(dashboard_route.get); +Router.route('/users').get(users_route.get); +Router.route('/products').get(products_route.get); +Router.route('/report').get(report_route.get); export default Router; diff --git a/src/routes/frontend/index.ts b/src/routes/frontend/index.ts index a85231c..7e4502a 100644 --- a/src/routes/frontend/index.ts +++ b/src/routes/frontend/index.ts @@ -2,10 +2,10 @@ import express from 'express'; import config from '../../handlers/config.js'; // Route imports -import screensaver_Route from './screensaver.js'; -import user_select_Route from './user_select.js'; -import product_select_Route from './product_select.js'; -import pay_up_Route from './pay_up.js'; +import screensaver_route from './screensaver.js'; +import user_select_route from './user_select.js'; +import product_select_route from './product_select.js'; +import pay_up_route from './pay_up.js'; import test_Route from './test.js'; import adminRouter from './admin/index.js'; @@ -13,10 +13,10 @@ import adminRouter from './admin/index.js'; // Router base is '/' const Router = express.Router({ strict: false }); -Router.route('/').get(screensaver_Route.get); -Router.route('/user_select').get(user_select_Route.get); -Router.route('/product_select').get(product_select_Route.get); -Router.route('/pay_up').get(pay_up_Route.get); +Router.route('/').get(screensaver_route.get); +Router.route('/user_select').get(user_select_route.get); +Router.route('/product_select').get(product_select_route.get); +Router.route('/pay_up').get(pay_up_route.get); Router.use('/admin', adminRouter); diff --git a/src/routes/index.ts b/src/routes/index.ts index 243d0c0..00c2cc6 100644 --- a/src/routes/index.ts +++ b/src/routes/index.ts @@ -4,8 +4,8 @@ import __path from '../handlers/path.js'; import log from '../handlers/log.js'; // Route imports -import frontend_routes from './frontend/index.js'; -import api_routes from './api/index.js'; +import frontend_router from './frontend/index.js'; +import api_router from './api/index.js'; const Router = express.Router({ strict: false }); @@ -16,8 +16,8 @@ Router.use('/libs/jquery', express.static(path.join(__path, 'node_modules', 'jqu Router.use('/libs/bootstrap-icons', express.static(path.join(__path, 'node_modules', 'bootstrap-icons'))); // Other routers -Router.use('/api', api_routes); -Router.use('/', frontend_routes); +Router.use('/api', api_router); +Router.use('/', frontend_router); // Default route. Router.all('*', function (req, res) {