Conversion to typescript
* Init
This commit is contained in:
Martin Donnelly
parent
e98342cca0
commit
5fc1b43358
96
server.js
96
server.js
@ -1,3 +1,4 @@
|
||||
"use strict";
|
||||
require('dotenv').config();
|
||||
const express = require('express');
|
||||
const bodyParser = require('body-parser');
|
||||
@ -5,94 +6,67 @@ const session = require('express-session');
|
||||
const path = require('path');
|
||||
const helmet = require('helmet');
|
||||
const cors = require('cors');
|
||||
|
||||
const cron = require('node-cron');
|
||||
|
||||
const db = require('./server/lib/loginmanager');
|
||||
|
||||
const doJob = require('./server/lib/job');
|
||||
const checkAuth = require('./server/middle/checkAuth');
|
||||
|
||||
// create express app
|
||||
const app = express();
|
||||
require('dotenv').config();
|
||||
|
||||
const serverPort = process.env.PORT || 3000;
|
||||
|
||||
const sitePath = 'dist';
|
||||
|
||||
app.use(cors());
|
||||
app.use(helmet());
|
||||
|
||||
app.use(session({
|
||||
'secret': 'rBLH5#Q89Z4',
|
||||
'resave': true,
|
||||
'saveUninitialized': true
|
||||
'secret': 'rBLH5#Q89Z4',
|
||||
'resave': true,
|
||||
'saveUninitialized': true
|
||||
}));
|
||||
|
||||
app.get('/', (request, response) => {
|
||||
if (request.session.auth)
|
||||
response.redirect('/menu');
|
||||
else
|
||||
response.sendFile(path.join(`${__dirname}/server/static/login.html`));
|
||||
if (request.session.auth)
|
||||
response.redirect('/menu');
|
||||
else
|
||||
response.sendFile(path.join(`${__dirname}/server/static/login.html`));
|
||||
});
|
||||
|
||||
app.get('/menu', checkAuth, (req, res) => {
|
||||
res.sendFile(path.join(`${__dirname }/dist/index.html`));
|
||||
res.sendFile(path.join(`${__dirname}/dist/index.html`));
|
||||
});
|
||||
|
||||
app.use(express.static(path.join(__dirname, sitePath)));
|
||||
|
||||
// parse requests of content-type - application/x-www-form-urlencoded
|
||||
app.use(bodyParser.urlencoded({ 'extended': true }));
|
||||
|
||||
// parse requests of content-type - application/json
|
||||
app.use(bodyParser.json());
|
||||
|
||||
app.post('/auth', (request, response) => {
|
||||
const username = request.body.u;
|
||||
const password = request.body.p;
|
||||
|
||||
if (username && password)
|
||||
|
||||
db.getOne(username, password)
|
||||
.then((data) => {
|
||||
if (!data)
|
||||
// response.send('Incorrect Username and/or Password!');
|
||||
response.redirect('/');
|
||||
else {
|
||||
request.session.username = username;
|
||||
request.session.auth = 'jhgkjgkjhgkjhgjkhgjkhgfhghfjgfjhgf';
|
||||
response.redirect('/menu');
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
response.status(500).send({
|
||||
'message': err.message || 'Some error occurred while querying the database.'
|
||||
const username = request.body.u;
|
||||
const password = request.body.p;
|
||||
if (username && password)
|
||||
db.getOne(username, password)
|
||||
.then((data) => {
|
||||
if (!data)
|
||||
response.redirect('/');
|
||||
else {
|
||||
request.session.username = username;
|
||||
request.session.auth = 'jhgkjgkjhgkjhgjkhgjkhgfhghfjgfjhgf';
|
||||
response.redirect('/menu');
|
||||
}
|
||||
})
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
response.status(500).send({
|
||||
'message': err.message || 'Some error occurred while querying the database.'
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
else {
|
||||
response.send('Please enter Username and Password!');
|
||||
response.end();
|
||||
}
|
||||
else {
|
||||
response.send('Please enter Username and Password!');
|
||||
response.end();
|
||||
}
|
||||
});
|
||||
|
||||
require('./server/routes/recipe.routes')(app);
|
||||
require('./server/routes/view.routes')(app);
|
||||
|
||||
// listen for requests
|
||||
app.listen(serverPort, () => {
|
||||
console.log(`Server is listening on port ${serverPort}`);
|
||||
console.log(`Server is listening on port ${serverPort}`);
|
||||
});
|
||||
|
||||
((() => {
|
||||
console.log('Menuserver 2.0 started');
|
||||
console.log('Menuserver 2.0 started');
|
||||
})());
|
||||
|
||||
cron.schedule('0 8 * * 6', function () {
|
||||
doJob();
|
||||
|
||||
return -1;
|
||||
doJob();
|
||||
return -1;
|
||||
});
|
||||
|
||||
98
server.ts
Normal file
98
server.ts
Normal file
@ -0,0 +1,98 @@
|
||||
require('dotenv').config();
|
||||
const express = require('express');
|
||||
const bodyParser = require('body-parser');
|
||||
const session = require('express-session');
|
||||
const path = require('path');
|
||||
const helmet = require('helmet');
|
||||
const cors = require('cors');
|
||||
|
||||
const cron = require('node-cron');
|
||||
|
||||
const db = require('./server/lib/loginmanager');
|
||||
|
||||
const doJob = require('./server/lib/job');
|
||||
const checkAuth = require('./server/middle/checkAuth');
|
||||
|
||||
// create express app
|
||||
const app = express();
|
||||
require('dotenv').config();
|
||||
|
||||
const serverPort = process.env.PORT || 3000;
|
||||
|
||||
const sitePath = 'dist';
|
||||
|
||||
app.use(cors());
|
||||
app.use(helmet());
|
||||
|
||||
app.use(session({
|
||||
'secret': 'rBLH5#Q89Z4',
|
||||
'resave': true,
|
||||
'saveUninitialized': true
|
||||
}));
|
||||
|
||||
app.get('/', (request: { session: { auth: any; }; }, response: { redirect: (arg0: string) => void; sendFile: (arg0: any) => void; }) => {
|
||||
if (request.session.auth)
|
||||
response.redirect('/menu');
|
||||
else
|
||||
response.sendFile(path.join(`${__dirname}/server/static/login.html`));
|
||||
});
|
||||
|
||||
app.get('/menu', checkAuth, (req: any, res: { sendFile: (arg0: any) => void; }) => {
|
||||
res.sendFile(path.join(`${__dirname }/dist/index.html`));
|
||||
});
|
||||
|
||||
app.use(express.static(path.join(__dirname, sitePath)));
|
||||
|
||||
// parse requests of content-type - application/x-www-form-urlencoded
|
||||
app.use(bodyParser.urlencoded({ 'extended': true }));
|
||||
|
||||
// parse requests of content-type - application/json
|
||||
app.use(bodyParser.json());
|
||||
|
||||
app.post('/auth', (request: { body: { u: any; p: any; }; session: { username: any; auth: string; }; }, response: { redirect: (arg0: string) => void; status: (arg0: number) => { (): any; new(): any; send: { (arg0: { message: any; }): void; new(): any; }; }; send: (arg0: string) => void; end: () => void; }) => {
|
||||
const username = request.body.u;
|
||||
const password = request.body.p;
|
||||
|
||||
if (username && password)
|
||||
|
||||
db.getOne(username, password)
|
||||
.then((data: any) => {
|
||||
if (!data)
|
||||
// response.send('Incorrect Username and/or Password!');
|
||||
response.redirect('/');
|
||||
else {
|
||||
request.session.username = username;
|
||||
request.session.auth = 'jhgkjgkjhgkjhgjkhgjkhgfhghfjgfjhgf';
|
||||
response.redirect('/menu');
|
||||
}
|
||||
})
|
||||
.catch((err: { message: any; }) => {
|
||||
console.log(err);
|
||||
response.status(500).send({
|
||||
'message': err.message || 'Some error occurred while querying the database.'
|
||||
});
|
||||
});
|
||||
|
||||
else {
|
||||
response.send('Please enter Username and Password!');
|
||||
response.end();
|
||||
}
|
||||
});
|
||||
|
||||
require('./server/routes/recipe.routes')(app);
|
||||
require('./server/routes/view.routes')(app);
|
||||
|
||||
// listen for requests
|
||||
app.listen(serverPort, () => {
|
||||
console.log(`Server is listening on port ${serverPort}`);
|
||||
});
|
||||
|
||||
((() => {
|
||||
console.log('Menuserver 2.0 started');
|
||||
})());
|
||||
|
||||
cron.schedule('0 8 * * 6', function () {
|
||||
doJob();
|
||||
|
||||
return -1;
|
||||
});
|
||||
69
tsconfig.json
Normal file
69
tsconfig.json
Normal file
@ -0,0 +1,69 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
/* Visit https://aka.ms/tsconfig.json to read more about this file */
|
||||
|
||||
/* Basic Options */
|
||||
// "incremental": true, /* Enable incremental compilation */
|
||||
"target": "es6", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'. */
|
||||
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'. */
|
||||
// "lib": [], /* Specify library files to be included in the compilation. */
|
||||
// "allowJs": true, /* Allow javascript files to be compiled. */
|
||||
// "checkJs": true, /* Report errors in .js files. */
|
||||
// "jsx": "preserve", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
|
||||
// "declaration": true, /* Generates corresponding '.d.ts' file. */
|
||||
// "declarationMap": true, /* Generates a sourcemap for each corresponding '.d.ts' file. */
|
||||
// "sourceMap": true, /* Generates corresponding '.map' file. */
|
||||
// "outFile": "./", /* Concatenate and emit output to single file. */
|
||||
// "outDir": "./", /* Redirect output structure to the directory. */
|
||||
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
|
||||
// "composite": true, /* Enable project compilation */
|
||||
// "tsBuildInfoFile": "./", /* Specify file to store incremental compilation information */
|
||||
"removeComments": true, /* Do not emit comments to output. */
|
||||
// "noEmit": true, /* Do not emit outputs. */
|
||||
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
|
||||
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
|
||||
// "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
|
||||
|
||||
/* Strict Type-Checking Options */
|
||||
"strict": true, /* Enable all strict type-checking options. */
|
||||
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
|
||||
// "strictNullChecks": true, /* Enable strict null checks. */
|
||||
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
|
||||
// "strictBindCallApply": true, /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
|
||||
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
|
||||
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
|
||||
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
|
||||
|
||||
/* Additional Checks */
|
||||
// "noUnusedLocals": true, /* Report errors on unused locals. */
|
||||
// "noUnusedParameters": true, /* Report errors on unused parameters. */
|
||||
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
|
||||
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
|
||||
|
||||
/* Module Resolution Options */
|
||||
// "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
|
||||
// "baseUrl": "./", /* Base directory to resolve non-absolute module names. */
|
||||
// "paths": {}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
|
||||
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
|
||||
// "typeRoots": [], /* List of folders to include type definitions from. */
|
||||
// "types": [], /* Type declaration files to be included in compilation. */
|
||||
// "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
|
||||
"esModuleInterop": true, /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
|
||||
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
|
||||
// "allowUmdGlobalAccess": true, /* Allow accessing UMD globals from modules. */
|
||||
|
||||
/* Source Map Options */
|
||||
// "sourceRoot": "", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
|
||||
// "mapRoot": "", /* Specify the location where debugger should locate map files instead of generated locations. */
|
||||
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
|
||||
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
|
||||
|
||||
/* Experimental Options */
|
||||
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
|
||||
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
|
||||
|
||||
/* Advanced Options */
|
||||
"skipLibCheck": true, /* Skip type checking of declaration files. */
|
||||
"forceConsistentCasingInFileNames": true /* Disallow inconsistently-cased references to the same file. */
|
||||
}
|
||||
}
|
||||
Loading…
Reference in New Issue
Block a user