Project-Name-Here/assetflow
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed routing and publicInfoPage.

Browse Source
This commit is contained in:
Leon Meier 2023-05-15 01:37:51 +02:00
parent 1f2eb78333
commit ee61e94853
18 changed files with 170 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/publicInfoPage.eta.html
View File

@ -2,11 +2,11 @@
<div class="text-center">
<h2><%= it.name %></h2>
<p><strong>Category:</strong> <%= it.category%></p>
<p><strong>Amount:</strong> <%= it.Amount %></p>
<p><strong>SKU:</strong> <%= it.SKU %></p>
<p><strong>Comment:</strong> <%= it.comment %></p>
<p><strong>Category:</strong> <%= it.category.name %></p>
<p><strong>Amount:</strong> <%= it.amount %></p>
<p><strong>SKU:</strong> <%= it.SKU %></p>
</div>
<%~ E.includeFile("partials/foot.eta.html") %>
<%~ E.includeFile("partials/foot.eta.html") %>

6
src/index.ts
View File

@ -44,7 +44,7 @@ export const prisma = new PrismaClient({
export const app = express();
app.set('x-powered-by', false);
app.set('strict routing', true);
//app.set('strict routing', true);
app.engine('html', eta.renderFile);
// app.use(cors());
@ -58,10 +58,6 @@ app.use(fileUpload());
// app.use('/static', express.static('public'));
app.use(express.static(__path + '/static'));
/* app.use((req, res, next) => {
res.status(404).send("Sorry can't find that!");
}); */
//routes(app);
app.use(routes);
app.listen(config.global.http_port, config.global.http_listen_address, () => {

3
src/routes/api/v1/index.ts
View File

@ -6,6 +6,7 @@ import testRoute from './test.js';
// Router base is '/api/v1'
const Router = express.Router({ strict: false });
Router.use('/test', testRoute);
Router.route('/test').get(testRoute.get);
export default Router;

4
src/routes/api/v1/test.ts
View File

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

11
src/routes/dev/index.ts
View File

@ -1,11 +0,0 @@
import express from 'express';
// Route imports
// import setDemoData from './setDemoData.js';
// Router base is '/dev'
const Router = express.Router();
// Router.use("/setDemoData", setDemoData)
export default Router;

21
src/routes/frontend/:id.ts
View File

@ -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 };

46
src/routes/frontend/dashboard.ts
View File

@ -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 };

13
src/routes/frontend/index.ts
View File

@ -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;

8
src/routes/frontend/items.ts
View File

@ -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 };

4
src/routes/frontend/manage/categoryManager.ts
View File

@ -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

143
src/routes/frontend/manage/import/csvImport.ts
View File

@ -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 };

10
src/routes/frontend/manage/index.ts
View File

@ -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;

5
src/routes/frontend/manage/startpage.ts
View File

@ -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 };

15
src/routes/frontend/manage/storageManager.ts
View File

@ -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 };

9
src/routes/frontend/manage/test.ts
View File

@ -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 };

11
src/routes/frontend/test.ts
View File

@ -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 };

11
src/routes/index.ts
View File

@ -1,16 +1,21 @@
import express, { Express } from 'express';
import { __path } from '../index.js';
// Route imports
import frontend_routes from './frontend/index.js';
import static_routes from './static/index.js';
import api_routes from './api/index.js';
import dev_routes from './dev/index.js';
const Router = express.Router({ strict: false });
Router.use('/static', static_routes);
Router.use('/api', api_routes);
Router.use('/dev', dev_routes); // This is just for development. TODO: Add check if we are in devmode.
Router.use('/', frontend_routes);
export default Router;
// Default route.
Router.get('*', function (req, res) {
// 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 });
});
export default Router;

2
src/routes/static/index.ts
View File

@ -11,7 +11,7 @@ const allowedURLs: Array<string> = JSON.parse(fs.readFileSync('allowedStaticPath
const recordedURLs: Array<string> = [];
const debugMode: boolean = JSON.parse(fs.readFileSync('allowedStaticPaths.json', 'utf8')).debugMode;
Router.use('*', (req: Request, res: Response) => {
Router.get('*', (req: Request, res: Response) => {
if (debugMode) {
res.sendFile(Path.join(__path, 'node_modules', req.params[0]));
recordedURLs.push(req.params[0]);