From 7600bd789db87decc05f7c9aba2e1770b4ea2756 Mon Sep 17 00:00:00 2001
From: ManifoldFR <wilson.jallet@gmail.com>
Date: Tue, 27 Feb 2018 13:28:53 +0100
Subject: [PATCH] Enhanced backend
Added pug for view templating
---
.gitignore | 4 +-
README.md | 11 +-
package-lock.json | 313 ++++++++++++++++++++++++++++++++++++++++++++-
package.json | 1 +
src/css/style.css | 7 +
src/index.js | 44 ++++---
src/server.js | 5 +
src/views/head.pug | 2 +
src/views/home.pug | 8 ++
9 files changed, 366 insertions(+), 29 deletions(-)
create mode 100644 src/css/style.css
create mode 100644 src/views/head.pug
create mode 100644 src/views/home.pug
diff --git a/.gitignore b/.gitignore
index 9b5dfd3..8eef92a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,5 +62,7 @@ typings/
# VS Code config files
.vscode/
+build/
-build/
\ No newline at end of file
+# Misc
+.DS_Store
\ No newline at end of file
diff --git a/README.md b/README.md
index 2813610..a246411 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ Certaines d'entre elles comme KnexJS ou Webpack devraient être installées glob
```bash
npm install -g knex
npm install -g webpack
+npm install -g eslint
```
## Structure
@@ -75,11 +76,15 @@ Donc, lancer `npm run watch` dans un terminal et `npm test` dans un autre permet
On utilisera ESLint pour standardiser le code : un ensemble de règles de style pour le code sont appliquées, et quelques-unes d'entre elles sont dans le fichier `.eslintrc.json`. Pour l'instant, la config ESLint impose d'utiliser quatre espaces pour les indentations et d'utiliser des points-virgule en fin de ligne.
-Pour faire valider un fichier `file.js` par ESLint, utilisez
+Il est préférable de l'installer **globalement** avec
- npm run lint file.js
+ npm install -g eslint
-et avec l'option `--fix` pour corriger le fichier.
+Pour faire valider les fichiers source par ESLint, utilisez
+
+ npm run lint
+
+qui fait appel au script `eslint src/` défini dans le [`package.json`](./package.json). L'option `--fix` permet de corriger les fichiers.
Sinon, si vous utilisez Atom ou Visual Studio Code pour éditer votre code, il existe des plugins qui font tourner ESLint en _live_ sur le code et vérifient que tout est en ordre.
diff --git a/package-lock.json b/package-lock.json
index 7948d7a..5cd1c84 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,6 +4,19 @@
"lockfileVersion": 1,
"requires": true,
"dependencies": {
+ "@types/babel-types": {
+ "version": "7.0.1",
+ "resolved": "https://registry.npmjs.org/@types/babel-types/-/babel-types-7.0.1.tgz",
+ "integrity": "sha512-EkcOk09rjhivbovP8WreGRbXW20YRfe/qdgXOGq3it3u3aAOWDRNsQhL/XPAWFF7zhZZ+uR+nT+3b+TCkIap1w=="
+ },
+ "@types/babylon": {
+ "version": "6.16.2",
+ "resolved": "https://registry.npmjs.org/@types/babylon/-/babylon-6.16.2.tgz",
+ "integrity": "sha512-+Jty46mPaWe1VAyZbfvgJM4BAdklLWxrT5tc/RjvCgLrtk6gzRY6AOnoWFv4p6hVxhJshDdr2hGVn56alBp97Q==",
+ "requires": {
+ "@types/babel-types": "7.0.1"
+ }
+ },
"@types/body-parser": {
"version": "1.16.8",
"resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.16.8.tgz",
@@ -129,6 +142,21 @@
}
}
},
+ "acorn-globals": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-3.1.0.tgz",
+ "integrity": "sha1-/YJw9x+7SZawBPqIDuXUZXOnMb8=",
+ "requires": {
+ "acorn": "4.0.13"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "4.0.13",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+ "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+ }
+ }
+ },
"acorn-jsx": {
"version": "3.0.1",
"resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz",
@@ -184,6 +212,11 @@
}
}
},
+ "amdefine": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+ "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU="
+ },
"ansi-align": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-2.0.0.tgz",
@@ -342,6 +375,11 @@
"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=",
"dev": true
},
+ "asap": {
+ "version": "2.0.6",
+ "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+ "integrity": "sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY="
+ },
"asn1.js": {
"version": "4.10.1",
"resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-4.10.1.tgz",
@@ -445,6 +483,17 @@
"regenerator-runtime": "0.11.1"
}
},
+ "babel-types": {
+ "version": "6.26.0",
+ "resolved": "https://registry.npmjs.org/babel-types/-/babel-types-6.26.0.tgz",
+ "integrity": "sha1-o7Bz+Uq0nrb6Vc1lInozQ4BjJJc=",
+ "requires": {
+ "babel-runtime": "6.26.0",
+ "esutils": "2.0.2",
+ "lodash": "4.17.5",
+ "to-fast-properties": "1.0.3"
+ }
+ },
"babylon": {
"version": "7.0.0-beta.19",
"resolved": "https://registry.npmjs.org/babylon/-/babylon-7.0.0-beta.19.tgz",
@@ -773,6 +822,14 @@
"supports-color": "5.2.0"
}
},
+ "character-parser": {
+ "version": "2.2.0",
+ "resolved": "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz",
+ "integrity": "sha1-x84o821LzZdE5f/CxfzeHHMmH8A=",
+ "requires": {
+ "is-regex": "1.0.4"
+ }
+ },
"chardet": {
"version": "0.4.2",
"resolved": "https://registry.npmjs.org/chardet/-/chardet-0.4.2.tgz",
@@ -886,6 +943,33 @@
}
}
},
+ "clean-css": {
+ "version": "3.4.28",
+ "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-3.4.28.tgz",
+ "integrity": "sha1-vxlF6C/ICPVWlebd6uwBQA79A/8=",
+ "requires": {
+ "commander": "2.8.1",
+ "source-map": "0.4.4"
+ },
+ "dependencies": {
+ "commander": {
+ "version": "2.8.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz",
+ "integrity": "sha1-Br42f+v9oMMwqh4qBy09yXYkJdQ=",
+ "requires": {
+ "graceful-readlink": "1.0.1"
+ }
+ },
+ "source-map": {
+ "version": "0.4.4",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz",
+ "integrity": "sha1-66T12pwNyZneaAMti092FzZSA2s=",
+ "requires": {
+ "amdefine": "1.0.1"
+ }
+ }
+ }
+ },
"cli-boxes": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz",
@@ -1010,6 +1094,24 @@
"date-now": "0.1.4"
}
},
+ "constantinople": {
+ "version": "3.1.2",
+ "resolved": "https://registry.npmjs.org/constantinople/-/constantinople-3.1.2.tgz",
+ "integrity": "sha512-yePcBqEFhLOqSBtwYOGGS1exHo/s1xjekXiinh4itpNQGCu4KA1euPh1fg07N2wMITZXQkBz75Ntdt1ctGZouw==",
+ "requires": {
+ "@types/babel-types": "7.0.1",
+ "@types/babylon": "6.16.2",
+ "babel-types": "6.26.0",
+ "babylon": "6.18.0"
+ },
+ "dependencies": {
+ "babylon": {
+ "version": "6.18.0",
+ "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
+ "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ=="
+ }
+ }
+ },
"constants-browserify": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
@@ -1255,6 +1357,11 @@
"esutils": "2.0.2"
}
},
+ "doctypes": {
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz",
+ "integrity": "sha1-6oCxBqh1OHdOijpKWv4pPeSJ4Kk="
+ },
"domain-browser": {
"version": "1.2.0",
"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
@@ -1616,8 +1723,7 @@
"esutils": {
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
- "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
- "dev": true
+ "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs="
},
"etag": {
"version": "1.8.1",
@@ -2928,8 +3034,7 @@
"function-bind": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
- "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
- "dev": true
+ "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
},
"functional-red-black-tree": {
"version": "1.0.1",
@@ -3102,6 +3207,11 @@
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
"integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg="
},
+ "graceful-readlink": {
+ "version": "1.0.1",
+ "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz",
+ "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU="
+ },
"graphql": {
"version": "0.13.1",
"resolved": "https://registry.npmjs.org/graphql/-/graphql-0.13.1.tgz",
@@ -3143,7 +3253,6 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
"integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
- "dev": true,
"requires": {
"function-bind": "1.1.1"
}
@@ -3433,6 +3542,22 @@
"is-primitive": "2.0.0"
}
},
+ "is-expression": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/is-expression/-/is-expression-3.0.0.tgz",
+ "integrity": "sha1-Oayqa+f9HzRx3ELHQW5hwkMXrJ8=",
+ "requires": {
+ "acorn": "4.0.13",
+ "object-assign": "4.1.1"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "4.0.13",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-4.0.13.tgz",
+ "integrity": "sha1-EFSVrlNh1pe9GVyCUZLhrX8lN4c="
+ }
+ }
+ },
"is-extendable": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
@@ -3557,8 +3682,7 @@
"is-promise": {
"version": "2.1.0",
"resolved": "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz",
- "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
- "dev": true
+ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o="
},
"is-redirect": {
"version": "1.0.0",
@@ -3566,6 +3690,14 @@
"integrity": "sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=",
"dev": true
},
+ "is-regex": {
+ "version": "1.0.4",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+ "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+ "requires": {
+ "has": "1.0.1"
+ }
+ },
"is-relative": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-relative/-/is-relative-1.0.0.tgz",
@@ -3629,6 +3761,11 @@
"resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz",
"integrity": "sha1-4mJbrbwNZ8dTPp7cEGjFh65BN+8="
},
+ "js-stringify": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz",
+ "integrity": "sha1-Fzb939lyTyijaCrcYjCufk6Weds="
+ },
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -3695,6 +3832,15 @@
"resolved": "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz",
"integrity": "sha1-Hq3nrMASA0rYTiOWdn6tn6VJWCE="
},
+ "jstransformer": {
+ "version": "1.0.0",
+ "resolved": "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz",
+ "integrity": "sha1-7Yvwkh4vPx7U1cGkT2hwntJHIsM=",
+ "requires": {
+ "is-promise": "2.1.0",
+ "promise": "7.3.1"
+ }
+ },
"kind-of": {
"version": "6.0.2",
"resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
@@ -4884,6 +5030,14 @@
"integrity": "sha1-ihvjZr+Pwj2yvSPxDG/pILQ4nR8=",
"dev": true
},
+ "promise": {
+ "version": "7.3.1",
+ "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
+ "integrity": "sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==",
+ "requires": {
+ "asap": "2.0.6"
+ }
+ },
"proxy-addr": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.3.tgz",
@@ -4933,6 +5087,120 @@
"randombytes": "2.0.6"
}
},
+ "pug": {
+ "version": "2.0.0-rc.4",
+ "resolved": "https://registry.npmjs.org/pug/-/pug-2.0.0-rc.4.tgz",
+ "integrity": "sha512-SL7xovj6E2Loq9N0UgV6ynjMLW4urTFY/L/Fprhvz13Xc5vjzkjZjI1QHKq31200+6PSD8PyU6MqrtCTJj6/XA==",
+ "requires": {
+ "pug-code-gen": "2.0.0",
+ "pug-filters": "2.1.5",
+ "pug-lexer": "3.1.0",
+ "pug-linker": "3.0.3",
+ "pug-load": "2.0.9",
+ "pug-parser": "4.0.0",
+ "pug-runtime": "2.0.3",
+ "pug-strip-comments": "1.0.2"
+ }
+ },
+ "pug-attrs": {
+ "version": "2.0.2",
+ "resolved": "https://registry.npmjs.org/pug-attrs/-/pug-attrs-2.0.2.tgz",
+ "integrity": "sha1-i+KyIlVo/6ddG4Zpgr/59BEa/8s=",
+ "requires": {
+ "constantinople": "3.1.2",
+ "js-stringify": "1.0.2",
+ "pug-runtime": "2.0.3"
+ }
+ },
+ "pug-code-gen": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-2.0.0.tgz",
+ "integrity": "sha512-E4oiJT+Jn5tyEIloj8dIJQognbiNNp0i0cAJmYtQTFS0soJ917nlIuFtqVss3IXMEyQKUew3F4gIkBpn18KbVg==",
+ "requires": {
+ "constantinople": "3.1.2",
+ "doctypes": "1.1.0",
+ "js-stringify": "1.0.2",
+ "pug-attrs": "2.0.2",
+ "pug-error": "1.3.2",
+ "pug-runtime": "2.0.3",
+ "void-elements": "2.0.1",
+ "with": "5.1.1"
+ }
+ },
+ "pug-error": {
+ "version": "1.3.2",
+ "resolved": "https://registry.npmjs.org/pug-error/-/pug-error-1.3.2.tgz",
+ "integrity": "sha1-U659nSm7A89WRJOgJhCfVMR/XyY="
+ },
+ "pug-filters": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/pug-filters/-/pug-filters-2.1.5.tgz",
+ "integrity": "sha512-xkw71KtrC4sxleKiq+cUlQzsiLn8pM5+vCgkChW2E6oNOzaqTSIBKIQ5cl4oheuDzvJYCTSYzRaVinMUrV4YLQ==",
+ "requires": {
+ "clean-css": "3.4.28",
+ "constantinople": "3.1.2",
+ "jstransformer": "1.0.0",
+ "pug-error": "1.3.2",
+ "pug-walk": "1.1.5",
+ "resolve": "1.5.0",
+ "uglify-js": "2.8.29"
+ }
+ },
+ "pug-lexer": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/pug-lexer/-/pug-lexer-3.1.0.tgz",
+ "integrity": "sha1-/QhzdtSmdbT1n4/vQiiDQ06VgaI=",
+ "requires": {
+ "character-parser": "2.2.0",
+ "is-expression": "3.0.0",
+ "pug-error": "1.3.2"
+ }
+ },
+ "pug-linker": {
+ "version": "3.0.3",
+ "resolved": "https://registry.npmjs.org/pug-linker/-/pug-linker-3.0.3.tgz",
+ "integrity": "sha512-DCKczglCXOzJ1lr4xUj/lVHYvS+lGmR2+KTCjZjtIpdwaN7lNOoX2SW6KFX5X4ElvW+6ThwB+acSUg08UJFN5A==",
+ "requires": {
+ "pug-error": "1.3.2",
+ "pug-walk": "1.1.5"
+ }
+ },
+ "pug-load": {
+ "version": "2.0.9",
+ "resolved": "https://registry.npmjs.org/pug-load/-/pug-load-2.0.9.tgz",
+ "integrity": "sha512-BDdZOCru4mg+1MiZwRQZh25+NTRo/R6/qArrdWIf308rHtWA5N9kpoUskRe4H6FslaQujC+DigH9LqlBA4gf6Q==",
+ "requires": {
+ "object-assign": "4.1.1",
+ "pug-walk": "1.1.5"
+ }
+ },
+ "pug-parser": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/pug-parser/-/pug-parser-4.0.0.tgz",
+ "integrity": "sha512-ocEUFPdLG9awwFj0sqi1uiZLNvfoodCMULZzkRqILryIWc/UUlDlxqrKhKjAIIGPX/1SNsvxy63+ayEGocGhQg==",
+ "requires": {
+ "pug-error": "1.3.2",
+ "token-stream": "0.0.1"
+ }
+ },
+ "pug-runtime": {
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/pug-runtime/-/pug-runtime-2.0.3.tgz",
+ "integrity": "sha1-mBYmB7D86eJU1CfzOYelrucWi9o="
+ },
+ "pug-strip-comments": {
+ "version": "1.0.2",
+ "resolved": "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-1.0.2.tgz",
+ "integrity": "sha1-0xOvoBvMN0mA4TmeI+vy65vchRM=",
+ "requires": {
+ "pug-error": "1.3.2"
+ }
+ },
+ "pug-walk": {
+ "version": "1.1.5",
+ "resolved": "https://registry.npmjs.org/pug-walk/-/pug-walk-1.1.5.tgz",
+ "integrity": "sha512-rJlH1lXerCIAtImXBze3dtKq/ykZMA4rpO9FnPcIgsWcxZLOvd8zltaoeOVFyBSSqCkhhJWbEbTMga8UxWUUSA=="
+ },
"punycode": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
@@ -5873,6 +6141,11 @@
"resolved": "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz",
"integrity": "sha1-fSKbH8xjfkZsoIEYCDanqr/4P0M="
},
+ "to-fast-properties": {
+ "version": "1.0.3",
+ "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-1.0.3.tgz",
+ "integrity": "sha1-uDVx+k2MJbguIxsG46MFXeTKGkc="
+ },
"to-object-path": {
"version": "0.3.0",
"resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
@@ -5979,6 +6252,11 @@
"repeat-string": "1.6.1"
}
},
+ "token-stream": {
+ "version": "0.0.1",
+ "resolved": "https://registry.npmjs.org/token-stream/-/token-stream-0.0.1.tgz",
+ "integrity": "sha1-zu78cXp2xDFvEm0LnbqlXX598Bo="
+ },
"touch": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/touch/-/touch-3.1.0.tgz",
@@ -6376,6 +6654,11 @@
"indexof": "0.0.1"
}
},
+ "void-elements": {
+ "version": "2.0.1",
+ "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+ "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w="
+ },
"watchpack": {
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.4.0.tgz",
@@ -6608,6 +6891,22 @@
"resolved": "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz",
"integrity": "sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0="
},
+ "with": {
+ "version": "5.1.1",
+ "resolved": "https://registry.npmjs.org/with/-/with-5.1.1.tgz",
+ "integrity": "sha1-+k2qktrzLE6pTtRTyB8EaGtXXf4=",
+ "requires": {
+ "acorn": "3.3.0",
+ "acorn-globals": "3.1.0"
+ },
+ "dependencies": {
+ "acorn": {
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz",
+ "integrity": "sha1-ReN/s56No/JbruP/U2niu18iAXo="
+ }
+ }
+ },
"wordwrap": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
diff --git a/package.json b/package.json
index d15ed76..9bdc64a 100644
--- a/package.json
+++ b/package.json
@@ -16,6 +16,7 @@
"knex": "^0.14.4",
"morgan": "^1.9.0",
"pg": "^7.4.1",
+ "pug": "^2.0.0-rc.4",
"serve-favicon": "^2.4.5",
"webpack": "^3.11.0",
"webpack-node-externals": "^1.6.0"
diff --git a/src/css/style.css b/src/css/style.css
new file mode 100644
index 0000000..6592b98
--- /dev/null
+++ b/src/css/style.css
@@ -0,0 +1,7 @@
+body {
+ padding: 2em
+}
+
+* {
+ font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif
+}
\ No newline at end of file
diff --git a/src/index.js b/src/index.js
index 12c1a75..9bf29f3 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,24 +1,24 @@
import server from './server';
import colors from 'colors';
+import { graphqlExpress, graphiqlExpress } from 'graphql-server-express';
+import makeExecutableSchema from 'graphql-tools';
import knex from '../db/knex_router';
/**
- * Returns home page of API
- * @name Home
+ * @function Home
+ * @summary Renvoie l'accueil du backend
*/
server.get('/', function(req, res) {
- console.log('Connectting to '+req.url);
- res.send(`<h1>Hello, world</h1>
-
- Hello, world ! This is server talking to you live on port `+port+' !');
+ console.log('Connecting to '+req.url);
+ res.render('home');
});
/**
- * Get table data
- * @name Database: Table get
- * @argument id - Table user wants
+ * @function Knex API: Get table
+ * @summary Effectue une requête pour une table dans la BDD
+ * @argument {string} table_name - La table voulue par l'utilisateur.
*/
-server.get('/db/:id?', function(req, res) {
+server.get('/db/:table_name?', function(req, res) {
// get columns from query
let columns;
@@ -29,16 +29,21 @@ server.get('/db/:id?', function(req, res) {
}
console.log(columns);
- knex.select(columns).from(req.params.id).then(function(table) {
+ knex.select(columns).from(req.params.table_name).then(function(table) {
res.setHeader("Content-Type", "application/json");
res.write(JSON.stringify(table,null,2));
res.end();
- });
+ },function() {
+ res.status(404);
+ res.write(`Error: Relation ${req.params.table_name} does not exist`);
+ res.end();
+ }
+ );
});
/**
- * @name Error 404 catcher
- * @function
+ * @function Error 404 catcher
+ * @summary Catche les requêtes en dehors des URL acceptées
*/
server.use((req, res, next) => {
let err = new Error('Not found');
@@ -47,15 +52,18 @@ server.use((req, res, next) => {
});
/**
- * @name Error 404 handler
- * @function
+ * @function Error 404 handler
+ * @summary Gère les erreurs 404
*/
+
server.use((err, req, res, next) => {
res.locals.message = err.message;
- res.locals.error = req.server.get('env') === 'development' ? err : {};
res.status(err.status || 500);
- res.render('Error');
+ res.write(`Error 404
+
+ Not found.`);
+ res.end();
});
// define port server is to listen on
diff --git a/src/server.js b/src/server.js
index 1c97471..500e233 100644
--- a/src/server.js
+++ b/src/server.js
@@ -11,6 +11,11 @@ server.use(bodyParser.urlencoded({
extended: false
}));
+// setting up view engine
+let viewpath = path.resolve('./','src','views');
+console.log(viewpath);
+server.set('views', viewpath);
+server.set('view engine', 'pug');
// sigma by Sumana Chamrunworakiat from the Noun Project
server.use(favicon(path.resolve('./','assets','favicon.ico')));
diff --git a/src/views/head.pug b/src/views/head.pug
new file mode 100644
index 0000000..f995826
--- /dev/null
+++ b/src/views/head.pug
@@ -0,0 +1,2 @@
+style
+ include ../css/style.css
\ No newline at end of file
diff --git a/src/views/home.pug b/src/views/home.pug
new file mode 100644
index 0000000..de607d8
--- /dev/null
+++ b/src/views/home.pug
@@ -0,0 +1,8 @@
+html
+ head
+ include head.pug
+ title Accueil
+ body
+ h1 Welcome to API server
+ p Hello, world ! This is server talking to you live on port 3000 !
+ a(href="db/groups") Groups
\ No newline at end of file
--
GitLab