Fixed routing and publicInfoPage.

src/routes/frontend/:id.ts

@@ -2,15 +2,28 @@ import { Request, Response } from 'express';
 import { prisma, __path } from '../../index.js';
 import * as Eta from 'eta';
 
-export default (req: Request, res: Response) => {
-	// retrieve data from database using id from url
+function get(req: Request, res: Response) {
+	// Get data from database using sku from url.
 	prisma.item
 		.findFirst({
 			where: {
 				SKU: req.params.id
+			},
+			select: {
+				SKU: true,
+				name: true,
+				comment: true,
+				amount: true,
+				// Get category name from relation.
+				category: {
+					select: {
+						name: true
+					}
+				}
 			}
 		})
 		.then((item) => {
+			console.log(JSON.stringify(item));
 			if (item) {
 				Eta.renderFile(__path + '/src/frontend/publicInfoPage.eta.html', item).then((html) => {
 					res.send(html);
@@ -19,4 +32,6 @@ export default (req: Request, res: Response) => {
 				res.send('Item not found');
 			}
 		});
-};
+}
+
+export default { get };

src/routes/frontend/dashboard.ts

@@ -1,29 +1,25 @@
 import express, { Request, Response } from 'express';
 import { prisma, __path } from '../../index.js';
 
-export default (req: Request, res: Response) => {
-	// TODO: Fix it? Express behaves like fucking shit with routers and /. Do not ask about it or touch it. EVER! (But if you can fix it a PR is welcome!)
-	if (req.originalUrl !== '/') {
-		// TODO: Respond based on content-type (with req.is('application/json'))
-		res.status(404).render(__path + '/src/frontend/errors/404.eta.html', { url: req.originalUrl });
-	} else {
-		prisma.item
-			.findMany({
-				orderBy: {
-					updatedAt: 'desc'
-				},
-				// Limit to 10 items
-				take: 10
-			})
-			.then((items) => {
-				// Count amount of total items
-				prisma.item.count().then((count) => {
-					res.render(__path + '/src/frontend/dashboard.eta.html', { recents: items, stats: { total: count } });
-				});
-			})
-			.catch((err) => {
-				console.error(err);
-				res.status(500).render(__path + '/src/frontend/errors/dbError.eta.html', { error: err });
+function get(req: Request, res: Response) {
+	prisma.item
+		.findMany({
+			orderBy: {
+				updatedAt: 'desc'
+			},
+			// Limit to 10 items
+			take: 10
+		})
+		.then((items) => {
+			// Count amount of total items
+			prisma.item.count().then((count) => {
+				res.render(__path + '/src/frontend/dashboard.eta.html', { recents: items, stats: { total: count } });
 			});
-	}
-};
+		})
+		.catch((err) => {
+			console.error(err);
+			res.status(500).render(__path + '/src/frontend/errors/dbError.eta.html', { error: err });
+		});
+}
+
+export default { get };

src/routes/frontend/index.ts

@@ -5,15 +5,18 @@ import skuRoute from './:id.js';
 import testRoute from './test.js';
 import dashboardRoute from './dashboard.js';
 import itemsRoute from './items.js';
-import manage_routes from "./manage/index.js";
+import manage_routes from './manage/index.js';
 
 // Router base is '/'
 const Router = express.Router({ strict: false });
 
-Router.use('/test', testRoute);
-Router.use('/items', itemsRoute)
-Router.use('/:id(\\w{8})', skuRoute);
+Router.route('/test').get(testRoute.get);
+Router.route('/items').get(itemsRoute.get);
+
+Router.route('/:id(\\w{8})').get(skuRoute.get);
+
 Router.use('/manage', manage_routes);
-Router.use('/', dashboardRoute);
+
+Router.route('/').get(dashboardRoute.get);
 
 export default Router;

src/routes/frontend/items.ts

@@ -1,7 +1,7 @@
-import express, { Request, Response } from 'express';
+import { Request, Response } from 'express';
 import { prisma, __path } from '../../index.js';
 
-export default (req: Request, res: Response) => {
+function get(req: Request, res: Response) {
 	prisma.item
 		.findMany({})
 		.then((items) => {
@@ -12,4 +12,6 @@ export default (req: Request, res: Response) => {
 			console.error(err);
 			res.status(500).render(__path + '/src/frontend/errors/dbError.eta.html', { error: err });
 		});
-};
+}
+
+export default { get };

src/routes/frontend/manage/categoryManager.ts

@@ -33,7 +33,7 @@ export default (req: Request, res: Response) => {
 			},
 		})
 		.then(() => {
-			res.redirect('/allCategories');
+			res.redirect('categories');
 		})
 		.catch((err) => {
 			// TODO Catch if is a duplicate error and show a message to the user
@@ -52,7 +52,7 @@ export default (req: Request, res: Response) => {
 			},
 		})
 		.then(() => {
-			res.redirect('/allCategories');
+			res.redirect('categories');
 		})
 		.catch((err) => {
 			// TODO Catch if is a duplicate error and show a message to the user

src/routes/frontend/manage/import/csvImport.ts

@@ -1,39 +1,39 @@
 import express, { Request, Response } from 'express';
 import { prisma, __path, log } from '../../../../index.js';
 import { UploadedFile } from 'express-fileupload';
-import { parse, transform } from 'csv';
+import { parse } from 'csv';
 import { itemStatus, itemCategory, PrismaPromise } from '@prisma/client';
 
-export default (req: Request, res: Response) => {
-	// Decide wether its post or get
-	if (req.method === 'POST') {
-		// Handle file upload and import
-		console.log(req.files)
-		if (!req.files || Object.keys(req.files).length === 0) {
-			return res.status(400).send('No files were uploaded.');
-		}
+function post(req: Request, res: Response) {
+	// Handle file upload and import
+	console.log(req.files);
+	if (!req.files || Object.keys(req.files).length === 0) {
+		return res.status(400).send('No files were uploaded.');
+	}
 
-		const file: UploadedFile = req.files.formFile as UploadedFile;
-		const csv = file.data.toString();
-		parse(csv, { columns: true }, function (err, records) {
-			if (err) {
-				res.send(err);
-				return;
-			}
-			// Find all categories and save them into a set
-			const categories = new Set<string>();
-			records.forEach((record: any) => {
-				categories.add(record.category);
-			});
-			log.db.debug(categories);
-			// Remove categories that already exists in the database
-			prisma.itemCategory.findMany({
+	const file: UploadedFile = req.files.formFile as UploadedFile;
+	const csv = file.data.toString();
+	parse(csv, { columns: true }, function (err, records) {
+		if (err) {
+			res.send(err);
+			return;
+		}
+		// Find all categories and save them into a set
+		const categories = new Set<string>();
+		records.forEach((record: any) => {
+			categories.add(record.category);
+		});
+		log.db.debug(categories);
+		// Remove categories that already exists in the database
+		prisma.itemCategory
+			.findMany({
 				where: {
 					name: {
 						in: Array.from(categories)
 					}
 				}
-			}).then((values) => {
+			})
+			.then((values) => {
 				values.forEach((value) => {
 					categories.delete(value.name);
 				});
@@ -44,60 +44,61 @@ export default (req: Request, res: Response) => {
 						data: {
 							name: category
 						}
-					})
+					});
 					categoryPromises.push(promise);
 				});
-				Promise.all(categoryPromises).then((values) => {
-					// Create items
-					const listOfPromises = [];
+				Promise.all(categoryPromises)
+					.then((values) => {
+						// Create items
+						const listOfPromises = [];
 
-					for (let i = 0; i < records.length; i++) {
-						const record = records[i];
-						const promise = prisma.item.create({
-							data: {
-								name: record.name,
-								amount: parseInt(record.amount),
-								comment: record.comment,
-								category: {
-									connect: {
-										name: record.category
-									}
-								},
-								SKU: record.sku,
-								manufacturer: record.manufacturer,
-								status: itemStatus.normal,
-								importedBy: "CSV_IMPORT"
-							}
-						});
-						listOfPromises.push(promise);
-					}
-					Promise.all(listOfPromises).then((values) => {
-						console.log(values);
-						res.send('ok');
-					}).catch((err) => {
-						res.send('failed to create items');
+						for (let i = 0; i < records.length; i++) {
+							const record = records[i];
+							const promise = prisma.item.create({
+								data: {
+									name: record.name,
+									amount: parseInt(record.amount),
+									comment: record.comment,
+									category: {
+										connect: {
+											name: record.category
+										}
+									},
+									SKU: record.sku,
+									manufacturer: record.manufacturer,
+									status: itemStatus.normal,
+									importedBy: 'CSV_IMPORT'
+								}
+							});
+							listOfPromises.push(promise);
+						}
+						Promise.all(listOfPromises)
+							.then((values) => {
+								console.log(values);
+								res.send('ok');
+							})
+							.catch((err) => {
+								res.send('failed to create items');
+								log.db.error(err);
+								return;
+							});
+					})
+					.catch((err) => {
+						// res.send('failed to create categories');
 						log.db.error(err);
-						return;
 					});
-				}).catch((err) => {
-					// res.send('failed to create categories');
-					log.db.error(err);
-
-				});
-
-
-			}).catch((err) => {
+			})
+			.catch((err) => {
 				res.send('failed to find categories');
 				log.db.error(err);
 				return;
 			});
+	});
+}
 
-		});
+function get(req: Request, res: Response) {
+	// Render page
+	res.render(__path + '/src/frontend/manage/imports/csvImport.eta.html');
+}
 
-
-	} else {
-		// Render page
-		res.render(__path + '/src/frontend/manage/imports/csvImport.eta.html');
-	}
-
-};
+export default { get, post };

src/routes/frontend/manage/index.ts

@@ -10,11 +10,11 @@ import startpageRoute from './startpage.js';
 // Router base is '/manage'
 const Router = express.Router({ strict: false });
 
+Router.route('/test').get(testRoute.get);
 
-Router.use('/test', testRoute);
-Router.use('/categories', categoryManager)
-Router.use('/storages', storageManager)
-Router.use('/import/csv', csvImportRoute);
-Router.use('/', startpageRoute);
+Router.use('/categories', categoryManager); // TODO: Needs refactoring to new route format.
+Router.route('/storages').get(storageManager.get);
+Router.route('/import/csv').get(csvImportRoute.get).post(csvImportRoute.post);
+Router.route('/').get(startpageRoute.get);
 
 export default Router;

src/routes/frontend/manage/startpage.ts

@@ -1,7 +1,8 @@
 import express, { Request, Response } from 'express';
 import { prisma, __path } from '../../../index.js';
 
-export default (req: Request, res: Response) => {
+function get(req: Request, res: Response) {
 	res.render(__path + '/src/frontend/manage/startpage.eta.html'); //, { items: items });
+}
 
-};
+export default { get };

src/routes/frontend/manage/storageManager.ts

@@ -1,15 +1,8 @@
 import express, { Request, Response } from 'express';
 import { prisma, __path } from '../../../index.js';
 
-export default (req: Request, res: Response) => {
-	//	prisma.item
-	//		.findMany({})
-	//		.then((items) => {
-	// Count amount of total items
+function get(req: Request, res: Response) {
 	res.render(__path + '/src/frontend/manage/storageManager.eta.html'); //, { items: items });
-	//		})
-	//		.catch((err) => {
-	//			console.error(err);
-	//			res.status(500).render(__path + '/src/frontend/errors/dbError.eta.html', { error: err });
-	//		});
-};
+}
+
+export default { get };

src/routes/frontend/manage/test.ts

@@ -1,4 +1,7 @@
-import express, { Request, Response } from 'express';
-export default (req: Request, res: Response) => {
+import { Request, Response } from 'express';
+
+function get(req: Request, res: Response) {
 	res.status(200).send('Manage Test Successful!');
-};
+}
+
+export default { get };

src/routes/frontend/test.ts

@@ -1,4 +1,7 @@
-import express, { Request, Response } from 'express';
-export default (req: Request, res: Response) => {
-	res.status(200).send("Frontend Test Successful!");
-};
+import { Request, Response } from 'express';
+
+function get(req: Request, res: Response) {
+	res.status(200).send('Frontend Test Successful!');
+}
+
+export default { get };