Skip to content

Commit

Permalink
working on #180, #110
Browse files Browse the repository at this point in the history
  • Loading branch information
axtho committed Dec 20, 2017
1 parent c076309 commit aa39afe
Show file tree
Hide file tree
Showing 11 changed files with 188 additions and 154 deletions.
30 changes: 15 additions & 15 deletions api/composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 0 additions & 4 deletions api/yarn.lock

This file was deleted.

2 changes: 1 addition & 1 deletion core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"docs:build": "compodoc -p tsconfig.json -n mh-core -d docs --hideGenerator",
"docs:serve": "yarn docs:build -- -s",
"docs:watch": "yarn docs:build -- -s -w",
"lint": "tslint --type-check --project tsconfig.json src/**/*.ts",
"lint": "tslint --project tsconfig.json src/**/*.ts",
"test": "tsc && karma start",
"install:dep": "cd dist && yarn link"
},
Expand Down
82 changes: 39 additions & 43 deletions core/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -94,20 +94,20 @@
viz.js "^1.8.0"

"@ngrx/effects@github:ngrx/effects-builds":
version "4.1.1"
resolved "https://codeload.github.com/ngrx/effects-builds/tar.gz/ea551d5d59c55f23ae9e850f0f8437ce12cf07e1"
version "5.0.0-alpha.0"
resolved "https://codeload.github.com/ngrx/effects-builds/tar.gz/3b6b0d0336ae208a03960f4cc239d53f41c3575d"

"@ngrx/entity@github:ngrx/entity-builds":
version "4.1.1"
resolved "https://codeload.github.com/ngrx/entity-builds/tar.gz/17d19996e9f440629c136af681e6511f7ed65f13"
version "5.0.0-alpha.0"
resolved "https://codeload.github.com/ngrx/entity-builds/tar.gz/eabb6c0c0a4eea97760f2c3833e9183dec7acf91"

"@ngrx/router-store@github:ngrx/router-store-builds":
version "4.1.1"
resolved "https://codeload.github.com/ngrx/router-store-builds/tar.gz/941610930658ab229a2431b88e3eec81f1ac6d4f"
version "5.0.0-alpha.0"
resolved "https://codeload.github.com/ngrx/router-store-builds/tar.gz/92c66f36a3cfc0ed2ed925046333772d56065292"

"@ngrx/store@github:ngrx/store-builds":
version "4.1.1"
resolved "https://codeload.github.com/ngrx/store-builds/tar.gz/11e0d00c3fa4769840c6176fd3eca0cac59b95b2"
version "5.0.0-alpha.0"
resolved "https://codeload.github.com/ngrx/store-builds/tar.gz/00d2b9e60a9ffde4f3a74520b65d072ec9a50b88"

"@types/[email protected]":
version "2.6.2"
Expand Down Expand Up @@ -192,8 +192,8 @@ ajv@^4.9.1:
json-stable-stringify "^1.0.1"

ajv@^5.1.0:
version "5.5.1"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.1.tgz#b38bb8876d9e86bee994956a04e721e88b248eb2"
version "5.5.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
co "^4.6.0"
fast-deep-equal "^1.0.0"
Expand Down Expand Up @@ -1571,9 +1571,9 @@ first-chunk-stream@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"

flagged-respawn@^0.3.2:
version "0.3.2"
resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-0.3.2.tgz#ff191eddcd7088a675b2610fffc976be9b8074b5"
flagged-respawn@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/flagged-respawn/-/flagged-respawn-1.0.0.tgz#4e79ae9b2eb38bf86b3bb56bf3e0a56aa5fcabd7"

for-in@^1.0.1, for-in@^1.0.2:
version "1.0.2"
Expand Down Expand Up @@ -2238,12 +2238,12 @@ invert-kv@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/invert-kv/-/invert-kv-1.0.0.tgz#104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"

is-absolute@^0.2.3:
version "0.2.6"
resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.2.6.tgz#20de69f3db942ef2d87b9c2da36f172235b1b5eb"
is-absolute@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-1.0.0.tgz#395e1ae84b11f26ad1795e73c17378e48a301576"
dependencies:
is-relative "^0.2.1"
is-windows "^0.2.0"
is-relative "^1.0.0"
is-windows "^1.0.1"

is-accessor-descriptor@^0.1.6:
version "0.1.6"
Expand Down Expand Up @@ -2396,8 +2396,8 @@ is-index-x@^1.0.0:
to-string-symbols-supported-x "^1.0.0"

is-my-json-valid@^2.12.4:
version "2.16.1"
resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.16.1.tgz#5a846777e2c2620d1e69104e5d3a03b1f6088f11"
version "2.17.1"
resolved "https://registry.yarnpkg.com/is-my-json-valid/-/is-my-json-valid-2.17.1.tgz#3da98914a70a22f0a8563ef1511a246c6fc55471"
dependencies:
generate-function "^2.0.0"
generate-object-property "^1.1.0"
Expand Down Expand Up @@ -2478,11 +2478,11 @@ is-property@^1.0.0:
version "1.0.2"
resolved "https://registry.yarnpkg.com/is-property/-/is-property-1.0.2.tgz#57fe1c4e48474edd65b09911f26b1cd4095dda84"

is-relative@^0.2.1:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.2.1.tgz#d27f4c7d516d175fb610db84bbeef23c3bc97aa5"
is-relative@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-1.0.0.tgz#a1bb6935ce8c5dba1e8b9754b9b2dcc020e2260d"
dependencies:
is-unc-path "^0.1.1"
is-unc-path "^1.0.0"

is-string@^1.0.4:
version "1.0.4"
Expand All @@ -2496,20 +2496,16 @@ is-typedarray@~1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"

is-unc-path@^0.1.1:
version "0.1.2"
resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-0.1.2.tgz#6ab053a72573c10250ff416a3814c35178af39b9"
is-unc-path@^1.0.0:
version "1.0.0"
resolved "https://registry.yarnpkg.com/is-unc-path/-/is-unc-path-1.0.0.tgz#d731e8898ed090a12c352ad2eaed5095ad322c9d"
dependencies:
unc-path-regex "^0.1.0"
unc-path-regex "^0.1.2"

is-utf8@^0.2.0:
version "0.2.1"
resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"

is-windows@^0.2.0:
version "0.2.0"
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-0.2.0.tgz#de1aa6d63ea29dd248737b69f1ff8b8002d2108c"

is-windows@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.1.tgz#310db70f742d259a16a369202b51af84233310d9"
Expand Down Expand Up @@ -2845,13 +2841,13 @@ lie@~3.1.0:
immediate "~3.0.5"

liftoff@^2.1.0:
version "2.4.0"
resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.4.0.tgz#1fb33e6eb28b027c7bd53ad22ebfc91a51e6ef9f"
version "2.5.0"
resolved "https://registry.yarnpkg.com/liftoff/-/liftoff-2.5.0.tgz#2009291bb31cea861bbf10a7c15a28caf75c31ec"
dependencies:
extend "^3.0.0"
findup-sync "^2.0.0"
fined "^1.0.1"
flagged-respawn "^0.3.2"
flagged-respawn "^1.0.0"
is-plain-object "^2.0.4"
object.map "^1.0.0"
rechoir "^0.6.2"
Expand Down Expand Up @@ -3212,8 +3208,8 @@ mixin-deep@^1.2.0:
minimist "0.0.8"

moment@^2.19.2:
version "2.19.4"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.19.4.tgz#17e5e2c6ead8819c8ecfad83a0acccb312e94682"
version "2.20.1"
resolved "https://registry.yarnpkg.com/moment/-/moment-2.20.1.tgz#d6eb1a46cbcc14a2b2f9434112c1ff8907f313fd"

morgan@^1.6.1:
version "1.9.0"
Expand Down Expand Up @@ -3580,10 +3576,10 @@ pako@~1.0.2:
resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"

parse-filepath@^1.0.1:
version "1.0.1"
resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.1.tgz#159d6155d43904d16c10ef698911da1e91969b73"
version "1.0.2"
resolved "https://registry.yarnpkg.com/parse-filepath/-/parse-filepath-1.0.2.tgz#a632127f53aaf3d15876f5872f3ffac763d6c891"
dependencies:
is-absolute "^0.2.3"
is-absolute "^1.0.0"
map-cache "^0.2.0"
path-root "^0.1.1"

Expand Down Expand Up @@ -4874,8 +4870,8 @@ tsconfig@^6.0.0:
strip-json-comments "^2.0.0"

tsickle@^0.25.5:
version "0.25.5"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.5.tgz#2891d29f97c4aab1306e06378d8496d1765a4bfe"
version "0.25.6"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.6.tgz#b595db16b236721824eeeda8bb262365b47ef334"
dependencies:
minimist "^1.2.0"
mkdirp "^0.5.1"
Expand Down Expand Up @@ -4968,7 +4964,7 @@ [email protected]:
version "1.0.2"
resolved "https://registry.yarnpkg.com/ultron/-/ultron-1.0.2.tgz#ace116ab557cd197386a4e88f4685378c8b2e4fa"

unc-path-regex@^0.1.0:
unc-path-regex@^0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/unc-path-regex/-/unc-path-regex-0.1.2.tgz#e73dd3d7b0d7c5ed86fbac6b0ae7d8c6a69d50fa"

Expand Down
5 changes: 5 additions & 0 deletions jwtkeys.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ssh-keygen -t rsa -b 4096 -f ./.ssh/jwtRS256.key
# Don't add passphrase
openssl rsa -in ./.ssh/jwtRS256.key -pubout -outform PEM -out ./.ssh/jwtRS256.key.pub
cat ./.ssh/jwtRS256.key
cat ./.ssh/jwtRS256.key.pub
36 changes: 18 additions & 18 deletions mobile/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@
resolved "https://registry.yarnpkg.com/@ionic-native/status-bar/-/status-bar-4.5.2.tgz#8c32d48f3c46ea7477e99e8605d4dd885ab03805"

"@ionic/app-scripts@^3.0.0":
version "3.1.5"
resolved "https://registry.yarnpkg.com/@ionic/app-scripts/-/app-scripts-3.1.5.tgz#ff368605fb24dcbb15e074aeaaa6adb28e88a51b"
version "3.1.6"
resolved "https://registry.yarnpkg.com/@ionic/app-scripts/-/app-scripts-3.1.6.tgz#8ad84a933b6b54f4379bd5e6bac5c66e03238a43"
dependencies:
"@angular-devkit/build-optimizer" "0.0.35"
autoprefixer "^7.1.6"
Expand All @@ -116,7 +116,7 @@
tslint-eslint-rules "^4.1.1"
uglify-es "^3.2.0"
webpack "3.8.1"
ws "^3.2.0"
ws "3.3.2"
xml2js "^0.4.19"

"@ionic/cli-build-ionic-angular@^0.0.4":
Expand Down Expand Up @@ -177,16 +177,16 @@
localforage-cordovasqlitedriver "~1.5.0"

"@ngrx/effects@github:ngrx/effects-builds":
version "4.1.1"
resolved "https://codeload.github.com/ngrx/effects-builds/tar.gz/ea551d5d59c55f23ae9e850f0f8437ce12cf07e1"
version "5.0.0-alpha.0"
resolved "https://codeload.github.com/ngrx/effects-builds/tar.gz/3b6b0d0336ae208a03960f4cc239d53f41c3575d"

"@ngrx/router-store@github:ngrx/router-store-builds":
version "4.1.1"
resolved "https://codeload.github.com/ngrx/router-store-builds/tar.gz/941610930658ab229a2431b88e3eec81f1ac6d4f"
version "5.0.0-alpha.0"
resolved "https://codeload.github.com/ngrx/router-store-builds/tar.gz/92c66f36a3cfc0ed2ed925046333772d56065292"

"@ngrx/store@github:ngrx/store-builds":
version "4.1.1"
resolved "https://codeload.github.com/ngrx/store-builds/tar.gz/11e0d00c3fa4769840c6176fd3eca0cac59b95b2"
version "5.0.0-alpha.0"
resolved "https://codeload.github.com/ngrx/store-builds/tar.gz/00d2b9e60a9ffde4f3a74520b65d072ec9a50b88"

"@types/[email protected]":
version "0.0.30"
Expand Down Expand Up @@ -233,8 +233,8 @@ ajv@^4.9.1:
json-stable-stringify "^1.0.1"

ajv@^5.1.0, ajv@^5.1.5:
version "5.5.1"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.1.tgz#b38bb8876d9e86bee994956a04e721e88b248eb2"
version "5.5.2"
resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
dependencies:
co "^4.6.0"
fast-deep-equal "^1.0.0"
Expand Down Expand Up @@ -668,8 +668,8 @@ camelcase@^4.1.0:
resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"

caniuse-lite@^1.0.30000780, caniuse-lite@^1.0.30000783:
version "1.0.30000783"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000783.tgz#9b5499fb1b503d2345d12aa6b8612852f4276ffd"
version "1.0.30000784"
resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000784.tgz#129ced74e9a1280a441880b6cd2bce30ef59e6c0"

caseless@~0.12.0:
version "0.12.0"
Expand Down Expand Up @@ -1066,8 +1066,8 @@ [email protected]:
resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"

electron-to-chromium@^1.3.28:
version "1.3.28"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.28.tgz#8dd4e6458086644e9f9f0a1cf32e2a1f9dffd9ee"
version "1.3.29"
resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.29.tgz#7a58236b95468c3e7660091348522d65d7736b36"

elementtree@^0.1.7:
version "0.1.7"
Expand Down Expand Up @@ -3573,8 +3573,8 @@ trim-newlines@^1.0.0:
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"

tsickle@^0.25.5:
version "0.25.5"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.5.tgz#2891d29f97c4aab1306e06378d8496d1765a4bfe"
version "0.25.6"
resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.25.6.tgz#b595db16b236721824eeeda8bb262365b47ef334"
dependencies:
minimist "^1.2.0"
mkdirp "^0.5.1"
Expand Down Expand Up @@ -3863,7 +3863,7 @@ wrappy@1:
version "1.0.2"
resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"

ws@^3.2.0:
ws@3.3.2:
version "3.3.2"
resolved "https://registry.yarnpkg.com/ws/-/ws-3.3.2.tgz#96c1d08b3fefda1d5c1e33700d3bfaa9be2d5608"
dependencies:
Expand Down
Loading

0 comments on commit aa39afe

Please sign in to comment.