Skip to content

Commit

Permalink
updated to single quote and updating to sample project to es6 cont
Browse files Browse the repository at this point in the history
  • Loading branch information
seanpmaxwell committed May 14, 2019
1 parent 1cb76d9 commit 806fd7c
Show file tree
Hide file tree
Showing 27 changed files with 173 additions and 165 deletions.
10 changes: 5 additions & 5 deletions sample-project/src/CustomRouterServer.ts
Expand Up @@ -4,15 +4,15 @@
* created by Sean Maxwell Aug 26, 2018
*/

import { Server } from "@overnightjs/core";
import { Logger } from "@overnightjs/logger";
import customRouter from "express-promise-router";
import PostController from "./controllers/PostController";
import { Server } from '@overnightjs/core';
import { Logger } from '@overnightjs/logger';
import customRouter from 'express-promise-router';
import PostController from './controllers/PostController';


class CustomRouterServer extends Server {

private readonly START_MSG = "OvernightJs with custom router started on port:";
private readonly START_MSG = 'OvernightJs with custom router started on port:';
private readonly logger: Logger;


Expand Down
18 changes: 9 additions & 9 deletions sample-project/src/NormalRouterServer.ts
Expand Up @@ -4,16 +4,16 @@
* created by Sean Maxwell Aug 26, 2018
*/

import * as bodyParser from "body-parser";
import * as controllers from "./controllers";
import { Server } from "@overnightjs/core";
import { Logger } from "@overnightjs/logger";
import * as bodyParser from 'body-parser';
import * as controllers from './controllers';
import { Server } from '@overnightjs/core';
import { Logger } from '@overnightjs/logger';


class NormalRouterServer extends Server {

private readonly FRONT_END_MSG = "OvernightJS with standard express router started.";
private readonly START_MSG = "OvernightJS with standard express router started on port: ";
private readonly FRONT_END_MSG = 'OvernightJS with standard express router started.';
private readonly START_MSG = 'OvernightJS with standard express router started on port: ';
private readonly logger: Logger;


Expand All @@ -35,7 +35,7 @@ class NormalRouterServer extends Server {
for (const name of Object.keys(controllers)) {

const controller = (controllers as any)[name];
if (typeof controller === "function") {
if (typeof controller === 'function') {
controllerInstances.push(new controller());
}
}
Expand All @@ -47,13 +47,13 @@ class NormalRouterServer extends Server {
public start(port?: number): void {
port = port || 3000;

this.app.get("*", (req, res) => {
this.app.get('*', (req, res) => {
res.send(this.FRONT_END_MSG);
});

this.app.listen(port, () => {
this.logger.rmTimestamp = true;
this.logger.info("\n");
this.logger.info('\n');
this.logger.rmTimestamp = false;
this.logger.imp(this.START_MSG + port);
});
Expand Down
6 changes: 3 additions & 3 deletions sample-project/src/controllers/CustomLoggerTool.ts
@@ -1,13 +1,13 @@
/**
* Custom Logging tool to test Overnight/logger custom logging option. Replace the
* "thirdPartyLoggingApplication" function with a logging tool of your choice i.e. ElasticSearch
* 'thirdPartyLoggingApplication' function with a logging tool of your choice i.e. ElasticSearch
* MongoDB or whatever.
*
* created by Sean Maxwell April 10, 2019
*/

import * as colors from "colors";
import { ICustomLogger } from "@overnightjs/logger";
import * as colors from 'colors';
import { ICustomLogger } from '@overnightjs/logger';


class CustomLoggerTool implements ICustomLogger {
Expand Down
18 changes: 9 additions & 9 deletions sample-project/src/controllers/JwtPracticeController.ts
Expand Up @@ -4,18 +4,18 @@
* created by Sean Maxwell Aug 26, 2018
*/

import { JwtManager, ISecureRequest } from "@overnightjs/jwt";
import { Controller, Middleware, Get, Post, Put } from "@overnightjs/core";
import { Request, Response } from "express";
import { JwtManager, ISecureRequest } from '@overnightjs/jwt';
import { Controller, Middleware, Get, Post, Put } from '@overnightjs/core';
import { Request, Response } from 'express';

const jwtMgr = new JwtManager("secret", "10h");
const jwtMgr = new JwtManager('secret', '10h');


@Controller("api/jwt")
@Controller('api/jwt')
export class JwtPracticeController {


@Get(":email")
@Get(':email')
private getJwt(req: Request, res: Response): void {
const jwtStr = JwtManager.jwt({
email: req.params.email,
Expand All @@ -25,14 +25,14 @@ export class JwtPracticeController {
}


@Post("callProtectedRoute")
@Post('callProtectedRoute')
@Middleware(JwtManager.middleware)
private callProtectedRoute(req: ISecureRequest, res: Response): void {
res.status(200).json({email: req.payload.email});
}


@Put("getJwtAlt/:fullname")
@Put('getJwtAlt/:fullname')
private getJwtFromHandler(req: Request, res: Response): void {
const jwtStr = jwtMgr.jwt({
fullName: req.params.fullname,
Expand All @@ -42,7 +42,7 @@ export class JwtPracticeController {
}


@Post("callProtectedRouteAlt")
@Post('callProtectedRouteAlt')
@Middleware(jwtMgr.middleware)
private callProtectedRouteFromHandler(req: ISecureRequest, res: Response): void {
res.status(200).json({fullname: req.payload.fullName});
Expand Down
56 changes: 28 additions & 28 deletions sample-project/src/controllers/LoggerPracticeController.ts
@@ -1,17 +1,17 @@
/**
* Controller to test OvernightJS"s Logger package.
* Controller to test OvernightJS's Logger package.
*
* created by Sean Maxwell April 6, 2019
*/

import * as path from "path";
import { Request, Response } from "express";
import { Controller, Get } from "@overnightjs/core";
import { Logger, LoggerModes } from "@overnightjs/logger";
import CustomLoggerTool from "./CustomLoggerTool";
import * as path from 'path';
import { Request, Response } from 'express';
import { Controller, Get } from '@overnightjs/core';
import { Logger, LoggerModes } from '@overnightjs/logger';
import CustomLoggerTool from './CustomLoggerTool';


@Controller("api/logger")
@Controller('api/logger')
export class LoggerPracticeController {

private readonly customLoggerTool: CustomLoggerTool;
Expand All @@ -22,7 +22,7 @@ export class LoggerPracticeController {
}


@Get("console/:msg")
@Get('console/:msg')
private printLogsConsole(req: Request, res: Response): void {
process.env.OVERNIGHT_LOGGER_MODE = LoggerModes.CONSOLE;
const logger = new Logger();
Expand All @@ -32,16 +32,16 @@ export class LoggerPracticeController {
logger.warn(req.params.msg);
logger.err(req.params.msg);

logger.err(new Error("printing out an error"));
logger.err(new Error("printing out an error full"), true);
logger.err(new Error('printing out an error'));
logger.err(new Error('printing out an error full'), true);

res.status(200).json({msg: "console_mode"});
res.status(200).json({msg: 'console_mode'});
}


@Get("file/:msg")
@Get('file/:msg')
private printLogsFile(req: Request, res: Response): void {
const logFilePath = path.join(__dirname, "../../sampleProject.log");
const logFilePath = path.join(__dirname, '../../sampleProject.log');
process.env.OVERNIGHT_LOGGER_FILEPATH = logFilePath;

const logger = new Logger(LoggerModes.FILE);
Expand All @@ -51,14 +51,14 @@ export class LoggerPracticeController {
logger.warn(req.params.msg);
logger.err(req.params.msg);

logger.err(new Error("printing out an error"));
logger.err(new Error("printing out an error full"), true);
logger.err(new Error('printing out an error'));
logger.err(new Error('printing out an error full'), true);

res.status(200).json({msg: "file_mode"});
res.status(200).json({msg: 'file_mode'});
}


@Get("off/:msg")
@Get('off/:msg')
private printLogsOff(req: Request, res: Response): void {
const logger = new Logger(LoggerModes.OFF);

Expand All @@ -67,14 +67,14 @@ export class LoggerPracticeController {
logger.warn(req.params.msg);
logger.err(req.params.msg);

res.status(200).json({msg: "off_mode"});
res.status(200).json({msg: 'off_mode'});
}


@Get("defaults/:msg")
@Get('defaults/:msg')
private testDefaults(req: Request, res: Response): void {
process.env.OVERNIGHT_LOGGER_FILEPATH = "";
process.env.OVERNIGHT_LOGGER_MODE = "";
process.env.OVERNIGHT_LOGGER_FILEPATH = '';
process.env.OVERNIGHT_LOGGER_MODE = '';

const logger = new Logger();

Expand All @@ -83,13 +83,13 @@ export class LoggerPracticeController {
logger.warn(req.params.msg);
logger.err(req.params.msg);

res.status(200).json({msg: "test_defaults"});
res.status(200).json({msg: 'test_defaults'});
}


@Get("defaultFilePath/:msg")
@Get('defaultFilePath/:msg')
private defaultFilePath(req: Request, res: Response): void {
process.env.OVERNIGHT_LOGGER_FILEPATH = "";
process.env.OVERNIGHT_LOGGER_FILEPATH = '';
process.env.OVERNIGHT_LOGGER_MODE = LoggerModes.FILE;

const logger = new Logger();
Expand All @@ -99,20 +99,20 @@ export class LoggerPracticeController {
logger.warn(req.params.msg);
logger.err(req.params.msg);

res.status(200).json({msg: "default_file_path"});
res.status(200).json({msg: 'default_file_path'});
}


@Get("useCustomLogger/:msg")
@Get('useCustomLogger/:msg')
private useCustomLogger(req: Request, res: Response): void {
const logger = new Logger(LoggerModes.CUSTOM, "", true, this.customLoggerTool);
const logger = new Logger(LoggerModes.CUSTOM, '', true, this.customLoggerTool);
logger.rmTimestamp = true;

logger.info(req.params.msg);
logger.imp(req.params.msg);
logger.warn(req.params.msg);
logger.err(req.params.msg);

res.status(200).json({msg: "default_file_path"});
res.status(200).json({msg: 'default_file_path'});
}
}
20 changes: 10 additions & 10 deletions sample-project/src/controllers/PostController.ts
Expand Up @@ -6,15 +6,15 @@
* created by Sean Maxwell Aug 28, 2018
*/

import { Request, Response } from "express";
import { Controller, Get, Put } from "@overnightjs/core";
import { Request, Response } from 'express';
import { Controller, Get, Put } from '@overnightjs/core';


@Controller("api/posts")
@Controller('api/posts')
class PostController {


@Get(":id")
@Get(':id')
private get(req: Request, res: Response): Promise<Response> {
return this.someAsyncFunction(req.params.id)
.then((ret) => res.status(200).json({msg: ret}));
Expand All @@ -25,23 +25,23 @@ class PostController {
return new Promise((resolve, reject) => {

if (isNaN(id)) {
reject("You entered an invalid post id: " + id);
reject('You entered an invalid post id: ' + id);
} else {
resolve("You entered the post id: " + id);
resolve('You entered the post id: ' + id);
}
});
}


@Put(":id")
@Put(':id')
private add(req: Request, res: Response): Promise<string> {
return Promise.resolve("next");
return Promise.resolve('next');
}


@Put("foo")
@Put('foo')
private add2(req: Request, res: Response): void {
res.status(200).json({msg: "Route used: " + req.url});
res.status(200).json({msg: 'Route used: ' + req.url});
}
}

Expand Down
20 changes: 9 additions & 11 deletions sample-project/src/controllers/SignupController.ts
Expand Up @@ -4,13 +4,13 @@
* created by Sean Maxwell Aug 28, 2018
*/

import { Request, Response } from "express";
import { Controller, Post } from "@overnightjs/core";
import { Logger, LoggerModes } from "@overnightjs/logger";
import MailPromise from "mail-promise";
import { Request, Response } from 'express';
import { Controller, Post } from '@overnightjs/core';
import { Logger, LoggerModes } from '@overnightjs/logger';
import MailPromise from 'mail-promise';


@Controller("api/signup")
@Controller('api/signup')
export class SignupController {

private readonly mailer: MailPromise;
Expand All @@ -25,18 +25,16 @@ export class SignupController {

@Post()
private async signup(req: Request, res: Response): Promise<void> {
let msg = "problem_sending_email";
let msg = 'problem_sending_email';
let code = 400;
const email = req.body.email;

try {
const info = await this.mailer.send(email, "Overnight Developers",
"Thanks for signing up", "", "<h1>You are awesome</h1>");

const info = await this.mailer.send(email, 'Overnight Developers',
'Thanks for signing up', '', '<h1>You are awesome</h1>');
this.logger.info(info.response);
msg = "email_sent_to_" + email;
msg = 'email_sent_to_' + email;
code = 200;

} catch (err) {
this.logger.err(err, true);
} finally {
Expand Down

0 comments on commit 806fd7c

Please sign in to comment.