diff --git a/package.json b/package.json
index b90aee3..0c98bd2 100644
--- a/package.json
+++ b/package.json
@@ -11,13 +11,14 @@
"@extollo/di": "file:../di",
"@extollo/lib": "file:../lib",
"@extollo/orm": "file:../orm",
+ "copyfiles": "^2.4.1",
"typescript": "^4.1.3"
},
- "devDependencies": {},
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
- "build": "mkdir -p lib && cp .env lib/.env && tsc",
- "app": "mkdir -p lib && cp .env lib/.env && tsc && node lib/index.js"
+ "build": "rm -rf lib && mkdir -p lib && cp .env lib/.env && tsc",
+ "postbuild": "copyfiles -u 1 src/app/resources/**/* lib",
+ "app": "pnpm run build && node lib/index.js"
},
"files": [
"lib/**/*"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
new file mode 100644
index 0000000..6ed142c
--- /dev/null
+++ b/pnpm-lock.yaml
@@ -0,0 +1,301 @@
+dependencies:
+ '@extollo/di': link:../di
+ '@extollo/lib': link:../lib
+ '@extollo/orm': link:../orm
+ copyfiles: 2.4.1
+ typescript: 4.2.3
+lockfileVersion: 5.2
+packages:
+ /ansi-regex/5.0.0:
+ dev: false
+ engines:
+ node: '>=8'
+ resolution:
+ integrity: sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+ /ansi-styles/4.3.0:
+ dependencies:
+ color-convert: 2.0.1
+ dev: false
+ engines:
+ node: '>=8'
+ resolution:
+ integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+ /balanced-match/1.0.0:
+ dev: false
+ resolution:
+ integrity: sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+ /brace-expansion/1.1.11:
+ dependencies:
+ balanced-match: 1.0.0
+ concat-map: 0.0.1
+ dev: false
+ resolution:
+ integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+ /cliui/7.0.4:
+ dependencies:
+ string-width: 4.2.2
+ strip-ansi: 6.0.0
+ wrap-ansi: 7.0.0
+ dev: false
+ resolution:
+ integrity: sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+ /color-convert/2.0.1:
+ dependencies:
+ color-name: 1.1.4
+ dev: false
+ engines:
+ node: '>=7.0.0'
+ resolution:
+ integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+ /color-name/1.1.4:
+ dev: false
+ resolution:
+ integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+ /concat-map/0.0.1:
+ dev: false
+ resolution:
+ integrity: sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
+ /copyfiles/2.4.1:
+ dependencies:
+ glob: 7.1.6
+ minimatch: 3.0.4
+ mkdirp: 1.0.4
+ noms: 0.0.0
+ through2: 2.0.5
+ untildify: 4.0.0
+ yargs: 16.2.0
+ dev: false
+ hasBin: true
+ resolution:
+ integrity: sha512-fereAvAvxDrQDOXybk3Qu3dPbOoKoysFMWtkY3mv5BsL8//OSZVL5DCLYqgRfY5cWirgRzlC+WSrxp6Bo3eNZg==
+ /core-util-is/1.0.2:
+ dev: false
+ resolution:
+ integrity: sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
+ /emoji-regex/8.0.0:
+ dev: false
+ resolution:
+ integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+ /escalade/3.1.1:
+ dev: false
+ engines:
+ node: '>=6'
+ resolution:
+ integrity: sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+ /fs.realpath/1.0.0:
+ dev: false
+ resolution:
+ integrity: sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
+ /get-caller-file/2.0.5:
+ dev: false
+ engines:
+ node: 6.* || 8.* || >= 10.*
+ resolution:
+ integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+ /glob/7.1.6:
+ dependencies:
+ fs.realpath: 1.0.0
+ inflight: 1.0.6
+ inherits: 2.0.4
+ minimatch: 3.0.4
+ once: 1.4.0
+ path-is-absolute: 1.0.1
+ dev: false
+ resolution:
+ integrity: sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
+ /inflight/1.0.6:
+ dependencies:
+ once: 1.4.0
+ wrappy: 1.0.2
+ dev: false
+ resolution:
+ integrity: sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=
+ /inherits/2.0.4:
+ dev: false
+ resolution:
+ integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+ /is-fullwidth-code-point/3.0.0:
+ dev: false
+ engines:
+ node: '>=8'
+ resolution:
+ integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+ /isarray/0.0.1:
+ dev: false
+ resolution:
+ integrity: sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
+ /isarray/1.0.0:
+ dev: false
+ resolution:
+ integrity: sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
+ /minimatch/3.0.4:
+ dependencies:
+ brace-expansion: 1.1.11
+ dev: false
+ resolution:
+ integrity: sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+ /mkdirp/1.0.4:
+ dev: false
+ engines:
+ node: '>=10'
+ hasBin: true
+ resolution:
+ integrity: sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
+ /noms/0.0.0:
+ dependencies:
+ inherits: 2.0.4
+ readable-stream: 1.0.34
+ dev: false
+ resolution:
+ integrity: sha1-2o69nzr51nYJGbJ9nNyAkqczKFk=
+ /once/1.4.0:
+ dependencies:
+ wrappy: 1.0.2
+ dev: false
+ resolution:
+ integrity: sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
+ /path-is-absolute/1.0.1:
+ dev: false
+ engines:
+ node: '>=0.10.0'
+ resolution:
+ integrity: sha1-F0uSaHNVNP+8es5r9TpanhtcX18=
+ /process-nextick-args/2.0.1:
+ dev: false
+ resolution:
+ integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
+ /readable-stream/1.0.34:
+ dependencies:
+ core-util-is: 1.0.2
+ inherits: 2.0.4
+ isarray: 0.0.1
+ string_decoder: 0.10.31
+ dev: false
+ resolution:
+ integrity: sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
+ /readable-stream/2.3.7:
+ dependencies:
+ core-util-is: 1.0.2
+ inherits: 2.0.4
+ isarray: 1.0.0
+ process-nextick-args: 2.0.1
+ safe-buffer: 5.1.2
+ string_decoder: 1.1.1
+ util-deprecate: 1.0.2
+ dev: false
+ resolution:
+ integrity: sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
+ /require-directory/2.1.1:
+ dev: false
+ engines:
+ node: '>=0.10.0'
+ resolution:
+ integrity: sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
+ /safe-buffer/5.1.2:
+ dev: false
+ resolution:
+ integrity: sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
+ /string-width/4.2.2:
+ dependencies:
+ emoji-regex: 8.0.0
+ is-fullwidth-code-point: 3.0.0
+ strip-ansi: 6.0.0
+ dev: false
+ engines:
+ node: '>=8'
+ resolution:
+ integrity: sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
+ /string_decoder/0.10.31:
+ dev: false
+ resolution:
+ integrity: sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
+ /string_decoder/1.1.1:
+ dependencies:
+ safe-buffer: 5.1.2
+ dev: false
+ resolution:
+ integrity: sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==
+ /strip-ansi/6.0.0:
+ dependencies:
+ ansi-regex: 5.0.0
+ dev: false
+ engines:
+ node: '>=8'
+ resolution:
+ integrity: sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+ /through2/2.0.5:
+ dependencies:
+ readable-stream: 2.3.7
+ xtend: 4.0.2
+ dev: false
+ resolution:
+ integrity: sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
+ /typescript/4.2.3:
+ dev: false
+ engines:
+ node: '>=4.2.0'
+ hasBin: true
+ resolution:
+ integrity: sha512-qOcYwxaByStAWrBf4x0fibwZvMRG+r4cQoTjbPtUlrWjBHbmCAww1i448U0GJ+3cNNEtebDteo/cHOR3xJ4wEw==
+ /untildify/4.0.0:
+ dev: false
+ engines:
+ node: '>=8'
+ resolution:
+ integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==
+ /util-deprecate/1.0.2:
+ dev: false
+ resolution:
+ integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+ /wrap-ansi/7.0.0:
+ dependencies:
+ ansi-styles: 4.3.0
+ string-width: 4.2.2
+ strip-ansi: 6.0.0
+ dev: false
+ engines:
+ node: '>=10'
+ resolution:
+ integrity: sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+ /wrappy/1.0.2:
+ dev: false
+ resolution:
+ integrity: sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
+ /xtend/4.0.2:
+ dev: false
+ engines:
+ node: '>=0.4'
+ resolution:
+ integrity: sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
+ /y18n/5.0.5:
+ dev: false
+ engines:
+ node: '>=10'
+ resolution:
+ integrity: sha512-hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg==
+ /yargs-parser/20.2.6:
+ dev: false
+ engines:
+ node: '>=10'
+ resolution:
+ integrity: sha512-AP1+fQIWSM/sMiET8fyayjx/J+JmTPt2Mr0FkrgqB4todtfa53sOsrSAcIrJRD5XS20bKUwaDIuMkWKCEiQLKA==
+ /yargs/16.2.0:
+ dependencies:
+ cliui: 7.0.4
+ escalade: 3.1.1
+ get-caller-file: 2.0.5
+ require-directory: 2.1.1
+ string-width: 4.2.2
+ y18n: 5.0.5
+ yargs-parser: 20.2.6
+ dev: false
+ engines:
+ node: '>=10'
+ resolution:
+ integrity: sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+specifiers:
+ '@extollo/di': file:../di
+ '@extollo/lib': file:../lib
+ '@extollo/orm': file:../orm
+ copyfiles: ^2.4.1
+ typescript: ^4.1.3
diff --git a/src/app/http/controllers/main/Home.controller.ts b/src/app/http/controllers/main/Home.controller.ts
index d2ceb27..b16deb4 100644
--- a/src/app/http/controllers/main/Home.controller.ts
+++ b/src/app/http/controllers/main/Home.controller.ts
@@ -1,4 +1,4 @@
-import {Controller, html, Session} from '@extollo/lib';
+import {Controller, view, Session} from '@extollo/lib';
import {Inject, Injectable} from "@extollo/di";
@Injectable()
@@ -9,9 +9,8 @@ export class Home extends Controller {
public welcome() {
this.session.set('app_visits', this.session.get('app_visits', 0) + 1)
- return html(`
- Welcome to Extollo!
- You have visited this page ${this.session.get('app_visits')} times.
- `)
+ return view('welcome', {
+ app_visits: this.session.get('app_visits')
+ })
}
}
diff --git a/src/app/resources/views/welcome.pug b/src/app/resources/views/welcome.pug
new file mode 100644
index 0000000..3f428e4
--- /dev/null
+++ b/src/app/resources/views/welcome.pug
@@ -0,0 +1,6 @@
+html
+ head
+ title Welcome | Extollo
+ body
+ h1 Welcome to Extollo
+ h2 You have viewed this page !{app_visits} times.