Skip to content

Commit

Permalink
Merge pull request #1 from greenroach/dev
Browse files Browse the repository at this point in the history
Dev
  • Loading branch information
greenroach authored Oct 21, 2018
2 parents b805811 + 8a12d8d commit d591896
Show file tree
Hide file tree
Showing 8 changed files with 2,458 additions and 3,359 deletions.
3,261 changes: 0 additions & 3,261 deletions package-lock.json

This file was deleted.

7 changes: 4 additions & 3 deletions public/css/style.css
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
body {
padding: 50px;
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
padding: 50px;
font: 14px "Lucida Grande", Helvetica, Arial, sans-serif;
}

a {
color: #00B7FF;
color: #00B7FF;
}

6 changes: 3 additions & 3 deletions src/server.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { app } from "./app";

const server = app.listen(app.get("port"), () => {
console.log(("Server running at http://localhost:%d in %s mode"),
app.get("port"), app.get("env"));
console.log("Press CTRL-C to stop\n");
console.log(("Server running at http://localhost:%d in %s mode"),
app.get("port"), app.get("env"));
console.log("Press CTRL-C to stop\n");
});

export default server;
38 changes: 19 additions & 19 deletions tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"noImplicitAny": true,
"moduleResolution": "node",
"sourceMap": true,
"outDir": "dist",
"baseUrl": ".",
"paths": {
"*": [
"node_modules/*",
"src/types/*"
]
}
},
"include": [
"src/**/*"
]
}
"compilerOptions": {
"module": "commonjs",
"target": "es6",
"noImplicitAny": true,
"moduleResolution": "node",
"sourceMap": true,
"outDir": "dist",
"baseUrl": ".",
"paths": {
"*": [
"node_modules/*",
"src/types/*"
]
}
},
"include": [
"src/**/*"
]
}
82 changes: 16 additions & 66 deletions tslint.json
Original file line number Diff line number Diff line change
@@ -1,67 +1,17 @@
{
"extends": "tslint:recommended",
"rules": {
"max-line-length": {
"options": [120]
},
"indent": [true, "tabs"],
"variable-name": [
true,
"ban-keywords",
"check-format",
"allow-leading-underscore"
],
"no-namespace": false,
"new-parens": true,
"no-arg": true,
"no-bitwise": true,
"ordered-imports": false,
"no-conditional-assignment": true,
"no-consecutive-blank-lines": [true, 1],
"object-literal-sort-keys": false,
"no-console": [false, "log", "error"],
"space-before-function-paren": true,
"member-ordering": [
true, {
"order": [
"public-static-field",
"protected-static-field",
"private-static-field",

"public-instance-field",
"protected-instance-field",
"private-instance-field",

"public-constructor",
"protected-constructor",
"private-constructor",

"public-instance-method",
"protected-instance-method",
"private-instance-method",

"public-static-method",
"protected-static-method",
"private-static-method"
]
}
],
"typedef-whitespace": [
true,
{
"call-signature": "nospace",
"index-signature": "nospace",
"parameter": "nospace",
"property-declaration": "nospace",
"variable-declaration": "nospace"
},
{
"call-signature": "onespace",
"index-signature": "onespace",
"parameter": "onespace",
"property-declaration": "onespace",
"variable-declaration": "onespace"
}
]
}
}
"extends": "tslint:recommended",
"rules": {
"no-console": false,
"variable-name": [
true,
"ban-keywords",
"check-format",
"allow-leading-underscore"
]
},
"linterOptions": {
"exclude": [

]
}
}
4 changes: 2 additions & 2 deletions views/index.pug
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
extends layout

block content
h1= title
p Welcome to #{title}
h1= title
p Welcome to #{title}
10 changes: 5 additions & 5 deletions views/layout.pug
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
doctype html
html
head
title= title
link(rel='stylesheet', href='/css/style.css')
body
block content
head
title= title
link(rel='stylesheet', href='/css/style.css')
body
block content
Loading

0 comments on commit d591896

Please sign in to comment.