diff --git a/package-lock.json b/package-lock.json index 4fa50c1c..0cd9b2b7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@angular/animations": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.1.tgz", - "integrity": "sha1-H34LuAPvwhxggkbmdlocZH89Gl8=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-4.3.2.tgz", + "integrity": "sha1-tNsX10PIzWlSplfnZRHaCEMvsj8=", "requires": { "tslib": "1.7.1" } @@ -86,21 +86,21 @@ "webpack-dev-middleware": "1.11.0", "webpack-dev-server": "2.4.5", "webpack-merge": "2.6.1", - "zone.js": "0.8.14" + "zone.js": "0.8.16" } }, "@angular/common": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.1.tgz", - "integrity": "sha1-Jg9IenzcoybENr0+qVFceX3i/3I=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-4.3.2.tgz", + "integrity": "sha1-L72Xs56EU5nDRX4dVavGsfYOCbg=", "requires": { "tslib": "1.7.1" } }, "@angular/compiler": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.1.tgz", - "integrity": "sha1-OiTUns8BrCtuB/Y+N4uP+OJX/gk=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-4.3.2.tgz", + "integrity": "sha1-t5ItCyCHqC57UWocERpZkwVPaLM=", "requires": { "tslib": "1.7.1" } @@ -125,9 +125,9 @@ } }, "@angular/core": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.1.tgz", - "integrity": "sha1-qdCn1kS5YmBnQmm2iaBP7qYyqNM=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-4.3.2.tgz", + "integrity": "sha1-6ng0HDUBrY9DtR/7GD4gDcGYRMM=", "requires": { "tslib": "1.7.1" } @@ -138,17 +138,17 @@ "integrity": "sha1-uc9XhlqTyhWP5W2FCVJCPySNEDs=" }, "@angular/forms": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.1.tgz", - "integrity": "sha1-M5FNossUZDD/kBRx5oLHZlRiLf4=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-4.3.2.tgz", + "integrity": "sha1-bnw2PtmUkn3O/RoZGJnNt74CzsY=", "requires": { "tslib": "1.7.1" } }, "@angular/http": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.1.tgz", - "integrity": "sha1-5PZh90ZxHojsvqdqPJBbq/l9MVo=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-4.3.2.tgz", + "integrity": "sha1-hRpWtwDmz95ml3aIPTKwSB4NUwc=", "requires": { "tslib": "1.7.1" } @@ -168,25 +168,25 @@ } }, "@angular/platform-browser": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.1.tgz", - "integrity": "sha1-23J7Bu7WS9pd7+xxgV2yak2i9pA=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-4.3.2.tgz", + "integrity": "sha1-f/D2pcKfE4+u63q4COt6sgKghZQ=", "requires": { "tslib": "1.7.1" } }, "@angular/platform-browser-dynamic": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.1.tgz", - "integrity": "sha1-hANNpgqC7zbn7/2ns63m5kWzMLM=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-4.3.2.tgz", + "integrity": "sha1-9DTxoucPU4A/Gfj9T0ZlFvw07tU=", "requires": { "tslib": "1.7.1" } }, "@angular/router": { - "version": "4.3.1", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.1.tgz", - "integrity": "sha1-UhnURSYVbYFgZYQRJ2EBZaAVtFA=", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-4.3.2.tgz", + "integrity": "sha1-ce3I/n/kY4pm0VVNV4VFHcrSQoQ=", "requires": { "tslib": "1.7.1" } @@ -1201,7 +1201,6 @@ "requires": { "anymatch": "1.3.0", "async-each": "1.0.1", - "fsevents": "1.1.2", "glob-parent": "2.0.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -2700,9 +2699,9 @@ } }, "firebase": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.1.5.tgz", - "integrity": "sha1-9+kmnqYmKXNriMNyfbMmXO6hrao=", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/firebase/-/firebase-4.2.0.tgz", + "integrity": "sha1-kYGgoixq/CsnvYEHib6sSKQ4IH0=", "requires": { "dom-storage": "2.0.2", "faye-websocket": "0.9.3", @@ -2931,905 +2930,6 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "fsevents": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.1.2.tgz", - "integrity": "sha512-Sn44E5wQW4bTHXvQmvSHwqbuiXtduD6Rrjm2ZtUEGbyrig+nUH3t/QD4M4/ZXViY556TBpRgZkHLDx3JxPwxiw==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.6.2", - "node-pre-gyp": "0.6.36" - }, - "dependencies": { - "abbrev": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ajv": { - "version": "4.11.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "co": "4.6.0", - "json-stable-stringify": "1.0.1" - } - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.2.9" - } - }, - "asn1": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "assert-plus": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "asynckit": { - "version": "0.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws-sign2": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "aws4": { - "version": "1.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "balanced-match": { - "version": "0.4.2", - "bundled": true, - "dev": true - }, - "bcrypt-pbkdf": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "tweetnacl": "0.14.5" - } - }, - "block-stream": { - "version": "0.0.9", - "bundled": true, - "dev": true, - "requires": { - "inherits": "2.0.3" - } - }, - "boom": { - "version": "2.10.1", - "bundled": true, - "dev": true, - "requires": { - "hoek": "2.16.3" - } - }, - "brace-expansion": { - "version": "1.1.7", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "0.4.2", - "concat-map": "0.0.1" - } - }, - "buffer-shims": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "caseless": { - "version": "0.12.0", - "bundled": true, - "dev": true, - "optional": true - }, - "co": { - "version": "4.6.0", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "combined-stream": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "requires": { - "delayed-stream": "1.0.0" - } - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "cryptiles": { - "version": "2.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "boom": "2.10.1" - } - }, - "dashdash": { - "version": "1.14.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "debug": { - "version": "2.6.8", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.4.2", - "bundled": true, - "dev": true, - "optional": true - }, - "delayed-stream": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "ecc-jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "extend": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "extsprintf": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "forever-agent": { - "version": "0.6.1", - "bundled": true, - "dev": true, - "optional": true - }, - "form-data": { - "version": "2.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asynckit": "0.4.0", - "combined-stream": "1.0.5", - "mime-types": "2.1.15" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "fstream": { - "version": "1.0.11", - "bundled": true, - "dev": true, - "requires": { - "graceful-fs": "4.1.11", - "inherits": "2.0.3", - "mkdirp": "0.5.1", - "rimraf": "2.6.1" - } - }, - "fstream-ignore": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fstream": "1.0.11", - "inherits": "2.0.3", - "minimatch": "3.0.4" - } - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.1.1", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "getpass": { - "version": "0.1.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "graceful-fs": { - "version": "4.1.11", - "bundled": true, - "dev": true - }, - "har-schema": { - "version": "1.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "har-validator": { - "version": "4.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ajv": "4.11.8", - "har-schema": "1.0.5" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "hawk": { - "version": "3.1.3", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "boom": "2.10.1", - "cryptiles": "2.0.5", - "hoek": "2.16.3", - "sntp": "1.0.9" - } - }, - "hoek": { - "version": "2.16.3", - "bundled": true, - "dev": true - }, - "http-signature": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "0.2.0", - "jsprim": "1.4.0", - "sshpk": "1.13.0" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.4", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "is-typedarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "isstream": { - "version": "0.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "jodid25519": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsbn": "0.1.1" - } - }, - "jsbn": { - "version": "0.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "json-schema": { - "version": "0.2.3", - "bundled": true, - "dev": true, - "optional": true - }, - "json-stable-stringify": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "jsonify": "0.0.0" - } - }, - "json-stringify-safe": { - "version": "5.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "jsonify": { - "version": "0.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "jsprim": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.0.2", - "json-schema": "0.2.3", - "verror": "1.3.6" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "mime-db": { - "version": "1.27.0", - "bundled": true, - "dev": true - }, - "mime-types": { - "version": "2.1.15", - "bundled": true, - "dev": true, - "requires": { - "mime-db": "1.27.0" - } - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.7" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "node-pre-gyp": { - "version": "0.6.36", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "mkdirp": "0.5.1", - "nopt": "4.0.1", - "npmlog": "4.1.0", - "rc": "1.2.1", - "request": "2.81.0", - "rimraf": "2.6.1", - "semver": "5.3.0", - "tar": "2.2.1", - "tar-pack": "3.4.0" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.0", - "osenv": "0.1.4" - } - }, - "npmlog": { - "version": "4.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "oauth-sign": { - "version": "0.8.2", - "bundled": true, - "dev": true, - "optional": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "performance-now": { - "version": "0.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "1.0.7", - "bundled": true, - "dev": true - }, - "punycode": { - "version": "1.4.1", - "bundled": true, - "dev": true, - "optional": true - }, - "qs": { - "version": "6.4.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.4.2", - "ini": "1.3.4", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.2.9", - "bundled": true, - "dev": true, - "requires": { - "buffer-shims": "1.0.0", - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "1.0.7", - "string_decoder": "1.0.1", - "util-deprecate": "1.0.2" - } - }, - "request": { - "version": "2.81.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aws-sign2": "0.6.0", - "aws4": "1.6.0", - "caseless": "0.12.0", - "combined-stream": "1.0.5", - "extend": "3.0.1", - "forever-agent": "0.6.1", - "form-data": "2.1.4", - "har-validator": "4.2.1", - "hawk": "3.1.3", - "http-signature": "1.1.1", - "is-typedarray": "1.0.0", - "isstream": "0.1.2", - "json-stringify-safe": "5.0.1", - "mime-types": "2.1.15", - "oauth-sign": "0.8.2", - "performance-now": "0.2.0", - "qs": "6.4.0", - "safe-buffer": "5.0.1", - "stringstream": "0.0.5", - "tough-cookie": "2.3.2", - "tunnel-agent": "0.6.0", - "uuid": "3.0.1" - } - }, - "rimraf": { - "version": "2.6.1", - "bundled": true, - "dev": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.0.1", - "bundled": true, - "dev": true - }, - "semver": { - "version": "5.3.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sntp": { - "version": "1.0.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "hoek": "2.16.3" - } - }, - "sshpk": { - "version": "1.13.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "asn1": "0.2.3", - "assert-plus": "1.0.0", - "bcrypt-pbkdf": "1.0.1", - "dashdash": "1.14.1", - "ecc-jsbn": "0.1.1", - "getpass": "0.1.7", - "jodid25519": "1.0.2", - "jsbn": "0.1.1", - "tweetnacl": "0.14.5" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "stringstream": { - "version": "0.0.5", - "bundled": true, - "dev": true, - "optional": true - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "2.2.1", - "bundled": true, - "dev": true, - "requires": { - "block-stream": "0.0.9", - "fstream": "1.0.11", - "inherits": "2.0.3" - } - }, - "tar-pack": { - "version": "3.4.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.8", - "fstream": "1.0.11", - "fstream-ignore": "1.0.5", - "once": "1.4.0", - "readable-stream": "2.2.9", - "rimraf": "2.6.1", - "tar": "2.2.1", - "uid-number": "0.0.6" - } - }, - "tough-cookie": { - "version": "2.3.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "punycode": "1.4.1" - } - }, - "tunnel-agent": { - "version": "0.6.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "bundled": true, - "dev": true, - "optional": true - }, - "uid-number": { - "version": "0.0.6", - "bundled": true, - "dev": true, - "optional": true - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "uuid": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "verror": { - "version": "1.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "extsprintf": "1.0.2" - } - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - } - } - }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", @@ -9545,9 +8645,9 @@ "dev": true }, "zone.js": { - "version": "0.8.14", - "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.14.tgz", - "integrity": "sha1-DE2ySxeCMidMy0P3jJnbfzZCts8=" + "version": "0.8.16", + "resolved": "https://registry.npmjs.org/zone.js/-/zone.js-0.8.16.tgz", + "integrity": "sha1-rDG2xBj4jA+Ritas2KQCrKkxOrs=" } } } diff --git a/package.json b/package.json index cd07fd96..2b1ca5cb 100644 --- a/package.json +++ b/package.json @@ -12,30 +12,30 @@ }, "private": true, "dependencies": { - "@angular/animations": "^4.3.1", + "@angular/animations": "^4.3.2", "@angular/cdk": "^2.0.0-beta.8", - "@angular/common": "^4.3.1", - "@angular/compiler": "^4.3.1", - "@angular/core": "^4.3.1", + "@angular/common": "^4.3.2", + "@angular/compiler": "^4.3.2", + "@angular/core": "^4.3.2", "@angular/flex-layout": "2.0.0-beta.8", - "@angular/forms": "^4.3.1", - "@angular/http": "^4.3.1", + "@angular/forms": "^4.3.2", + "@angular/http": "^4.3.2", "@angular/material": "^2.0.0-beta.8", - "@angular/platform-browser": "^4.3.1", - "@angular/platform-browser-dynamic": "^4.3.1", - "@angular/router": "^4.3.1", + "@angular/platform-browser": "^4.3.2", + "@angular/platform-browser-dynamic": "^4.3.2", + "@angular/router": "^4.3.2", "@swimlane/ngx-datatable": "^9.3.1", "@swimlane/ngx-dnd": "^2.2.0", "angular-calendar": "^0.19.0", "angular-in-memory-web-api": "^0.3.2", "core-js": "^2.4.1", - "firebase": "^4.1.3", + "firebase": "^4.2.0", "hammerjs": "^2.0.8", "moment": "^2.18.1", "ngx-color-picker": "^4.2.0", "ngx-perfect-scrollbar": "^4.5.2", "rxjs": "^5.4.2", - "zone.js": "^0.8.13" + "zone.js": "^0.8.16" }, "devDependencies": { "@angular/cli": "^1.2.5", diff --git a/src/app/core/components/layout/layout.component.scss b/src/app/core/components/layout/layout.component.scss index 35734c7e..754a1727 100644 --- a/src/app/core/components/layout/layout.component.scss +++ b/src/app/core/components/layout/layout.component.scss @@ -12,6 +12,7 @@ fuse-layout { display: flex; flex-direction: column; flex: 1; + overflow: hidden; fuse-content { display: flex; diff --git a/src/app/core/components/navigation/navigation.model.ts b/src/app/core/components/navigation/navigation.model.ts index d3be6f63..f34ccfe9 100644 --- a/src/app/core/components/navigation/navigation.model.ts +++ b/src/app/core/components/navigation/navigation.model.ts @@ -183,77 +183,77 @@ export class FuseNavigation { 'title': 'Alerts', 'type' : 'nav-item', - 'url' : '/user-interface/elements/alerts' + 'url' : '/ui/elements/alerts' }, { 'title': 'Badges', 'type' : 'nav-item', - 'url' : '/user-interface/elements/badges' + 'url' : '/ui/elements/badges' }, { 'title': 'Breadcrumb', 'type' : 'nav-item', - 'url' : '/user-interface/elements/breadcrumb' + 'url' : '/ui/elements/breadcrumb' }, { 'title': 'Buttons', 'type' : 'nav-item', - 'url' : '/user-interface/elements/buttons' + 'url' : '/ui/elements/buttons' }, { 'title': 'Button Group', 'type' : 'nav-item', - 'url' : '/user-interface/elements/button-group' + 'url' : '/ui/elements/button-group' }, { 'title': 'Cards', 'type' : 'nav-item', - 'url' : '/user-interface/elements/cards' + 'url' : '/ui/elements/cards' }, { 'title': 'Dropdowns', 'type' : 'nav-item', - 'url' : '/user-interface/elements/dropdowns' + 'url' : '/ui/elements/dropdowns' }, { 'title': 'Forms', 'type' : 'nav-item', - 'url' : '/user-interface/elements/forms' + 'url' : '/ui/elements/forms' }, { 'title': 'Input Group', 'type' : 'nav-item', - 'url' : '/user-interface/elements/input-group' + 'url' : '/ui/elements/input-group' }, { 'title': 'Jumbotron', 'type' : 'nav-item', - 'url' : '/user-interface/elements/jumbotron' + 'url' : '/ui/elements/jumbotron' }, { 'title': 'List Group', 'type' : 'nav-item', - 'url' : '/user-interface/elements/list-group' + 'url' : '/ui/elements/list-group' }, { 'title': 'Navs', 'type' : 'nav-item', - 'url' : '/user-interface/elements/navs' + 'url' : '/ui/elements/navs' }, { 'title': 'Navbar', 'type' : 'nav-item', - 'url' : '/user-interface/elements/navbar' + 'url' : '/ui/elements/navbar' }, { 'title': 'Pagination', 'type' : 'nav-item', - 'url' : '/user-interface/elements/pagination' + 'url' : '/ui/elements/pagination' }, { 'title': 'Progress', 'type' : 'nav-item', - 'url' : '/user-interface/elements/progress' + 'url' : '/ui/elements/progress' } ] }, @@ -265,12 +265,12 @@ export class FuseNavigation { 'title': 'Simple Table', 'type' : 'nav-item', - 'url' : '/user-interface/tables/simple-table' + 'url' : '/ui/tables/simple-table' }, { 'title': 'Data Table', 'type' : 'nav-item', - 'url' : '/user-interface/tables/data-table' + 'url' : '/ui/tables/data-table' } ] }, @@ -362,7 +362,7 @@ export class FuseNavigation 'title': 'Colors', 'type' : 'nav-item', 'icon' : 'color_lens', - 'url' : '/user-interface/colors' + 'url' : '/ui/colors' }, { 'title': 'COMPONENTS', diff --git a/src/app/core/fuseUtils.ts b/src/app/core/fuseUtils.ts index 66f706ed..fcacfa09 100644 --- a/src/app/core/fuseUtils.ts +++ b/src/app/core/fuseUtils.ts @@ -84,4 +84,14 @@ export class FuseUtils } return false; } + + public static genearateGUID() + { + function S4() + { + return (((1 + Math.random()) * 0x10000) || 0).toString(16).substring(1); + } + + return (S4() + S4()); + } } diff --git a/src/app/core/matColors.ts b/src/app/core/matColors.ts new file mode 100644 index 00000000..a37eb9eb --- /dev/null +++ b/src/app/core/matColors.ts @@ -0,0 +1,656 @@ +const black87 = 'rgba(black, 0.87)'; +const white87 = 'rgba(white, 0.87)'; +const black12 = 'rgba(black, 0.12)'; +const white12 = 'rgba(white, 0.12)'; +const black6 = 'rgba(black, 0.06)'; +const white6 = 'rgba(white, 0.06)'; +const matColors = { + 'red': { + 50 : '#ffebee', + 100 : '#ffcdd2', + 200 : '#ef9a9a', + 300 : '#e57373', + 400 : '#ef5350', + 500 : '#f44336', + 600 : '#e53935', + 700 : '#d32f2f', + 800 : '#c62828', + 900 : '#b71c1c', + A100 : '#ff8a80', + A200 : '#ff5252', + A400 : '#ff1744', + A700 : '#d50000', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : 'white', + 600 : 'white', + 700 : 'white', + 800 : white87, + 900 : white87, + A100: black87, + A200: 'white', + A400: 'white', + A700: 'white', + } + }, + + 'pink': { + 50 : '#fce4ec', + 100 : '#f8bbd0', + 200 : '#f48fb1', + 300 : '#f06292', + 400 : '#ec407a', + 500 : '#e91e63', + 600 : '#d81b60', + 700 : '#c2185b', + 800 : '#ad1457', + 900 : '#880e4f', + A100 : '#ff80ab', + A200 : '#ff4081', + A400 : '#f50057', + A700 : '#c51162', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : 'white', + 600 : 'white', + 700 : white87, + 800 : white87, + 900 : white87, + A100: black87, + A200: 'white', + A400: 'white', + A700: 'white', + } + }, + + 'purple': { + 50 : '#f3e5f5', + 100 : '#e1bee7', + 200 : '#ce93d8', + 300 : '#ba68c8', + 400 : '#ab47bc', + 500 : '#9c27b0', + 600 : '#8e24aa', + 700 : '#7b1fa2', + 800 : '#6a1b9a', + 900 : '#4a148c', + A100 : '#ea80fc', + A200 : '#e040fb', + A400 : '#d500f9', + A700 : '#aa00ff', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : 'white', + 400 : 'white', + 500 : white87, + 600 : white87, + 700 : white87, + 800 : white87, + 900 : white87, + A100: black87, + A200: 'white', + A400: 'white', + A700: 'white', + } + }, + + 'deep-purple': { + 50 : '#ede7f6', + 100 : '#d1c4e9', + 200 : '#b39ddb', + 300 : '#9575cd', + 400 : '#7e57c2', + 500 : '#673ab7', + 600 : '#5e35b1', + 700 : '#512da8', + 800 : '#4527a0', + 900 : '#311b92', + A100 : '#b388ff', + A200 : '#7c4dff', + A400 : '#651fff', + A700 : '#6200ea', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : 'white', + 400 : 'white', + 500 : white87, + 600 : white87, + 700 : white87, + 800 : white87, + 900 : white87, + A100: black87, + A200: 'white', + A400: white87, + A700: white87, + } + }, + + 'indigo': { + 50 : '#e8eaf6', + 100 : '#c5cae9', + 200 : '#9fa8da', + 300 : '#7986cb', + 400 : '#5c6bc0', + 500 : '#3f51b5', + 600 : '#3949ab', + 700 : '#303f9f', + 800 : '#283593', + 900 : '#1a237e', + A100 : '#8c9eff', + A200 : '#536dfe', + A400 : '#3d5afe', + A700 : '#304ffe', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : 'white', + 400 : 'white', + 500 : white87, + 600 : white87, + 700 : white87, + 800 : white87, + 900 : white87, + A100: black87, + A200: 'white', + A400: 'white', + A700: white87, + } + }, + + 'blue': { + 50 : '#e3f2fd', + 100 : '#bbdefb', + 200 : '#90caf9', + 300 : '#64b5f6', + 400 : '#42a5f5', + 500 : '#2196f3', + 600 : '#1e88e5', + 700 : '#1976d2', + 800 : '#1565c0', + 900 : '#0d47a1', + A100 : '#82b1ff', + A200 : '#448aff', + A400 : '#2979ff', + A700 : '#2962ff', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : 'white', + 600 : 'white', + 700 : 'white', + 800 : white87, + 900 : white87, + A100: black87, + A200: 'white', + A400: 'white', + A700: 'white', + } + }, + + 'light-blue': { + 50 : '#e1f5fe', + 100 : '#b3e5fc', + 200 : '#81d4fa', + 300 : '#4fc3f7', + 400 : '#29b6f6', + 500 : '#03a9f4', + 600 : '#039be5', + 700 : '#0288d1', + 800 : '#0277bd', + 900 : '#01579b', + A100 : '#80d8ff', + A200 : '#40c4ff', + A400 : '#00b0ff', + A700 : '#0091ea', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : 'white', + 600 : 'white', + 700 : 'white', + 800 : 'white', + 900 : white87, + A100: black87, + A200: black87, + A400: black87, + A700: 'white', + } + }, + + 'cyan': { + 50 : '#e0f7fa', + 100 : '#b2ebf2', + 200 : '#80deea', + 300 : '#4dd0e1', + 400 : '#26c6da', + 500 : '#00bcd4', + 600 : '#00acc1', + 700 : '#0097a7', + 800 : '#00838f', + 900 : '#006064', + A100 : '#84ffff', + A200 : '#18ffff', + A400 : '#00e5ff', + A700 : '#00b8d4', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : 'white', + 600 : 'white', + 700 : 'white', + 800 : 'white', + 900 : white87, + A100: black87, + A200: black87, + A400: black87, + A700: black87, + } + }, + + 'teal': { + 50 : '#e0f2f1', + 100 : '#b2dfdb', + 200 : '#80cbc4', + 300 : '#4db6ac', + 400 : '#26a69a', + 500 : '#009688', + 600 : '#00897b', + 700 : '#00796b', + 800 : '#00695c', + 900 : '#004d40', + A100 : '#a7ffeb', + A200 : '#64ffda', + A400 : '#1de9b6', + A700 : '#00bfa5', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : 'white', + 600 : 'white', + 700 : 'white', + 800 : white87, + 900 : white87, + A100: black87, + A200: black87, + A400: black87, + A700: black87, + } + }, + + 'green': { + 50 : '#e8f5e9', + 100 : '#c8e6c9', + 200 : '#a5d6a7', + 300 : '#81c784', + 400 : '#66bb6a', + 500 : '#4caf50', + 600 : '#43a047', + 700 : '#388e3c', + 800 : '#2e7d32', + 900 : '#1b5e20', + A100 : '#b9f6ca', + A200 : '#69f0ae', + A400 : '#00e676', + A700 : '#00c853', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : 'white', + 600 : 'white', + 700 : 'white', + 800 : white87, + 900 : white87, + A100: black87, + A200: black87, + A400: black87, + A700: black87, + } + }, + + 'light-green': { + 50 : '#f1f8e9', + 100 : '#dcedc8', + 200 : '#c5e1a5', + 300 : '#aed581', + 400 : '#9ccc65', + 500 : '#8bc34a', + 600 : '#7cb342', + 700 : '#689f38', + 800 : '#558b2f', + 900 : '#33691e', + A100 : '#ccff90', + A200 : '#b2ff59', + A400 : '#76ff03', + A700 : '#64dd17', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : black87, + 600 : black87, + 700 : black87, + 800 : 'white', + 900 : 'white', + A100: black87, + A200: black87, + A400: black87, + A700: black87, + } + }, + + 'lime': { + 50 : '#f9fbe7', + 100 : '#f0f4c3', + 200 : '#e6ee9c', + 300 : '#dce775', + 400 : '#d4e157', + 500 : '#cddc39', + 600 : '#c0ca33', + 700 : '#afb42b', + 800 : '#9e9d24', + 900 : '#827717', + A100 : '#f4ff81', + A200 : '#eeff41', + A400 : '#c6ff00', + A700 : '#aeea00', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : black87, + 600 : black87, + 700 : black87, + 800 : black87, + 900 : 'white', + A100: black87, + A200: black87, + A400: black87, + A700: black87, + } + }, + + 'yellow': { + 50 : '#fffde7', + 100 : '#fff9c4', + 200 : '#fff59d', + 300 : '#fff176', + 400 : '#ffee58', + 500 : '#ffeb3b', + 600 : '#fdd835', + 700 : '#fbc02d', + 800 : '#f9a825', + 900 : '#f57f17', + A100 : '#ffff8d', + A200 : '#ffff00', + A400 : '#ffea00', + A700 : '#ffd600', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : black87, + 600 : black87, + 700 : black87, + 800 : black87, + 900 : black87, + A100: black87, + A200: black87, + A400: black87, + A700: black87, + } + }, + + 'amber': { + 50 : '#fff8e1', + 100 : '#ffecb3', + 200 : '#ffe082', + 300 : '#ffd54f', + 400 : '#ffca28', + 500 : '#ffc107', + 600 : '#ffb300', + 700 : '#ffa000', + 800 : '#ff8f00', + 900 : '#ff6f00', + A100 : '#ffe57f', + A200 : '#ffd740', + A400 : '#ffc400', + A700 : '#ffab00', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : black87, + 600 : black87, + 700 : black87, + 800 : black87, + 900 : black87, + A100: black87, + A200: black87, + A400: black87, + A700: black87, + } + }, + + 'orange': { + 50 : '#fff3e0', + 100 : '#ffe0b2', + 200 : '#ffcc80', + 300 : '#ffb74d', + 400 : '#ffa726', + 500 : '#ff9800', + 600 : '#fb8c00', + 700 : '#f57c00', + 800 : '#ef6c00', + 900 : '#e65100', + A100 : '#ffd180', + A200 : '#ffab40', + A400 : '#ff9100', + A700 : '#ff6d00', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : black87, + 600 : black87, + 700 : black87, + 800 : 'white', + 900 : 'white', + A100: black87, + A200: black87, + A400: black87, + A700: 'black', + } + }, + + 'deep-orange': { + 50 : '#fbe9e7', + 100 : '#ffccbc', + 200 : '#ffab91', + 300 : '#ff8a65', + 400 : '#ff7043', + 500 : '#ff5722', + 600 : '#f4511e', + 700 : '#e64a19', + 800 : '#d84315', + 900 : '#bf360c', + A100 : '#ff9e80', + A200 : '#ff6e40', + A400 : '#ff3d00', + A700 : '#dd2c00', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : 'white', + 600 : 'white', + 700 : 'white', + 800 : 'white', + 900 : 'white', + A100: black87, + A200: black87, + A400: 'white', + A700: 'white', + } + }, + + 'brown': { + 50 : '#efebe9', + 100 : '#d7ccc8', + 200 : '#bcaaa4', + 300 : '#a1887f', + 400 : '#8d6e63', + 500 : '#795548', + 600 : '#6d4c41', + 700 : '#5d4037', + 800 : '#4e342e', + 900 : '#3e2723', + A100 : '#d7ccc8', + A200 : '#bcaaa4', + A400 : '#8d6e63', + A700 : '#5d4037', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : 'white', + 400 : 'white', + 500 : white87, + 600 : white87, + 700 : white87, + 800 : white87, + 900 : white87, + A100: black87, + A200: black87, + A400: 'white', + A700: white87, + } + }, + + 'grey': { + 0 : '#ffffff', + 50 : '#fafafa', + 100 : '#f5f5f5', + 200 : '#eeeeee', + 300 : '#e0e0e0', + 400 : '#bdbdbd', + 500 : '#9e9e9e', + 600 : '#757575', + 700 : '#616161', + 800 : '#424242', + 900 : '#212121', + 1000 : '#000000', + A100 : '#ffffff', + A200 : '#eeeeee', + A400 : '#bdbdbd', + A700 : '#616161', + contrast: { + 0 : black87, + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : black87, + 500 : black87, + 600 : white87, + 700 : white87, + 800 : white87, + 900 : white87, + 1000: white87, + A100: black87, + A200: black87, + A400: black87, + A700: white87, + } + }, + + 'blue-grey': { + 50 : '#eceff1', + 100 : '#cfd8dc', + 200 : '#b0bec5', + 300 : '#90a4ae', + 400 : '#78909c', + 500 : '#607d8b', + 600 : '#546e7a', + 700 : '#455a64', + 800 : '#37474f', + 900 : '#263238', + A100 : '#cfd8dc', + A200 : '#b0bec5', + A400 : '#78909c', + A700 : '#455a64', + contrast: { + 50 : black87, + 100 : black87, + 200 : black87, + 300 : black87, + 400 : 'white', + 500 : 'white', + 600 : white87, + 700 : white87, + 800 : white87, + 900 : white87, + A100: black87, + A200: black87, + A400: 'white', + A700: white87, + } + }, +}; + +/** + // Color palettes from the Material Design spec. + // See https://www.google.com/design/spec/style/color.html + */ +export class MatColors +{ + public static all = matColors; + + public static getColor(colorName) + { + if ( matColors[colorName] ) + { + return matColors[colorName]; + } + return false; + } +} diff --git a/src/app/core/pipes/camelCaseToDash.pipe.ts b/src/app/core/pipes/camelCaseToDash.pipe.ts new file mode 100644 index 00000000..edac85b0 --- /dev/null +++ b/src/app/core/pipes/camelCaseToDash.pipe.ts @@ -0,0 +1,10 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({name: 'camelCaseToDash'}) +export class CamelCaseToDashPipe implements PipeTransform +{ + transform(value: string, args: any[] = []) + { + return value ? String(value).replace(/([A-Z])/g, (g) => `-${g[0].toLowerCase()}`) : ''; + } +} diff --git a/src/app/core/pipes/pipes.module.ts b/src/app/core/pipes/pipes.module.ts index ebcb5090..c4a21aeb 100644 --- a/src/app/core/pipes/pipes.module.ts +++ b/src/app/core/pipes/pipes.module.ts @@ -4,13 +4,15 @@ import { KeysPipe } from './keys.pipe'; import { GetByIdPipe } from './getById.pipe'; import { HtmlToPlaintextPipe } from './htmlToPlaintext.pipe'; import { FilterPipe } from './filter.pipe'; +import { CamelCaseToDashPipe } from './camelCaseToDash.pipe'; @NgModule({ declarations: [ KeysPipe, GetByIdPipe, HtmlToPlaintextPipe, - FilterPipe + FilterPipe, + CamelCaseToDashPipe ], imports : [], @@ -18,7 +20,8 @@ import { FilterPipe } from './filter.pipe'; KeysPipe, GetByIdPipe, HtmlToPlaintextPipe, - FilterPipe + FilterPipe, + CamelCaseToDashPipe ] }) diff --git a/src/app/core/scss/partials/_colors.scss b/src/app/core/scss/partials/_colors.scss index e69de29b..c58e8ca0 100644 --- a/src/app/core/scss/partials/_colors.scss +++ b/src/app/core/scss/partials/_colors.scss @@ -0,0 +1,101 @@ +$matColorsMap: ( + red: $mat-red, + pink:$mat-pink, + purple:$mat-purple, + deep-purple:$mat-deep-purple, + indigo:$mat-indigo, + blue:$mat-blue, + light-blue:$mat-light-blue, + cyan:$mat-cyan, + teal:$mat-teal, + green:$mat-green, + light-green:$mat-light-green, + lime:$mat-lime, + yellow:$mat-yellow, + amber:$mat-amber, + orange:$mat-orange, + deep-orange:$mat-deep-orange, + brown:$mat-brown, + grey:$mat-grey, + blue-grey:$mat-blue-grey +); + +$matColorHues: 50, 100, 200, 300, 400, 500, 600, 700, 800, 900, A100, A200, A400, A700; + +@each $colorName, $colorMap in $matColorsMap { + + @each $hue in $matColorHues { + + $bgColor: map-get($colorMap, $hue); + $fgColor: map-get(map-get($colorMap, 'contrast'), $hue); + + .#{$colorName}-#{$hue}-bg { + background-color: $bgColor !important; + } + + .md-#{$colorName}-#{$hue}-bg { + background-color: $bgColor !important; + color: $fgColor; + } + + .#{$colorName}-#{$hue}-fg { + color: $bgColor !important; + } + + .#{$colorName}-#{$hue}-border { + border-color: $bgColor !important; + } + + .#{$colorName}-#{$hue}-border-top { + border-top-color: $bgColor !important; + } + + .#{$colorName}-#{$hue}-border-right { + border-right-color: $bgColor !important; + } + + .#{$colorName}-#{$hue}-border-bottom { + border-bottom-color: $bgColor !important; + } + + .#{$colorName}-#{$hue}-border-left { + border-left-color: $bgColor !important; + } + + @if ($hue == 500) { + + .md-#{$colorName}-bg { + background-color: $bgColor !important; + color: $fgColor; + } + + .#{$colorName}-bg { + background-color: $bgColor !important; + } + + .#{$colorName}-fg { + color: $bgColor !important; + } + + .#{$colorName}-border { + border-color: $bgColor !important; + } + + .#{$colorName}-border-top { + border-top-color: $bgColor !important; + } + + .#{$colorName}-border-right { + border-right-color: $bgColor !important; + } + + .#{$colorName}-border-bottom { + border-bottom-color: $bgColor !important; + } + + .#{$colorName}-border-left { + border-left-color: $bgColor !important; + } + } + } +} diff --git a/src/app/main/apps/calendar/event-form/event-form.component.html b/src/app/main/apps/calendar/event-form/event-form.component.html index b3396e26..170ef2af 100644 --- a/src/app/main/apps/calendar/event-form/event-form.component.html +++ b/src/app/main/apps/calendar/event-form/event-form.component.html @@ -115,7 +115,7 @@ md-raised-button (click)="dialogRef.close(eventForm)" class="save-button mat-accent" - [disabled]="eventForm.pristine" + [disabled]="eventForm.invalid" aria-label="SAVE"> SAVE @@ -124,7 +124,7 @@ md-raised-button (click)="dialogRef.close(['save',eventForm])" class="save-button mat-accent" - [disabled]="eventForm.pristine" + [disabled]="eventForm.invalid" aria-label="SAVE"> SAVE diff --git a/src/app/main/apps/chat/chat.service.ts b/src/app/main/apps/chat/chat.service.ts index 59998e4b..7996a17a 100644 --- a/src/app/main/apps/chat/chat.service.ts +++ b/src/app/main/apps/chat/chat.service.ts @@ -4,6 +4,7 @@ import { Observable } from 'rxjs/Observable'; import { Http } from '@angular/http'; import { Subject } from 'rxjs/Subject'; import { BehaviorSubject } from 'rxjs/BehaviorSubject'; +import { FuseUtils } from '../../../core/fuseUtils'; @Injectable() export class ChatService implements Resolve @@ -80,7 +81,7 @@ export class ChatService implements Resolve return item.id === contactId; }); - const chatId = this.guidGenerator(); + const chatId = FuseUtils.genearateGUID(); const chat = { id : chatId, @@ -243,18 +244,4 @@ export class ChatService implements Resolve }, reject); }); } - - /** - * Random ID Generator - * @returns {string} - */ - guidGenerator() - { - function S4() - { - return (((1 + Math.random()) * 0x10000) || 0).toString(16).substring(1); - } - - return (S4() + S4()); - } } diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html index e0476296..b2969663 100644 --- a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html +++ b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.html @@ -22,6 +22,15 @@
+
+ +
+
diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss index 4e646178..b3a7e55f 100644 --- a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss +++ b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.scss @@ -26,5 +26,9 @@ .content { padding: 0 !important; + + .add-todo-button { + width: 100%; + } } } diff --git a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts index f9aaaf47..0736b8ac 100644 --- a/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts +++ b/src/app/main/apps/todo/sidenavs/main/main-sidenav.component.ts @@ -1,6 +1,7 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { TodoService } from '../../todo.service'; import { Subscription } from 'rxjs/Subscription'; +import { Router } from '@angular/router'; @Component({ selector : 'fuse-todo-main-sidenav', @@ -18,7 +19,7 @@ export class MainSidenavComponent implements OnInit, OnDestroy onFiltersChanged: Subscription; onTagsChanged: Subscription; - constructor(private todoService: TodoService) + constructor(private todoService: TodoService, private router: Router) { // Data this.accounts = { @@ -49,4 +50,13 @@ export class MainSidenavComponent implements OnInit, OnDestroy this.onFiltersChanged.unsubscribe(); this.onTagsChanged.unsubscribe(); } + + newTodo() + { + this.router.navigate(['/apps/todo/all']).then(() => { + setTimeout(() => { + this.todoService.onNewTodoClicked.next(''); + }); + }); + } } diff --git a/src/app/main/apps/todo/todo-details/todo-details.component.html b/src/app/main/apps/todo/todo-details/todo-details.component.html index fc4ad78f..2e1a1576 100644 --- a/src/app/main/apps/todo/todo-details/todo-details.component.html +++ b/src/app/main/apps/todo/todo-details/todo-details.component.html @@ -46,14 +46,16 @@
-
+ @@ -96,6 +98,11 @@ mdAutosizeMinRows="6"> + +
diff --git a/src/app/main/apps/todo/todo-details/todo-details.component.ts b/src/app/main/apps/todo/todo-details/todo-details.component.ts index c57e2852..8101cb9a 100644 --- a/src/app/main/apps/todo/todo-details/todo-details.component.ts +++ b/src/app/main/apps/todo/todo-details/todo-details.component.ts @@ -1,8 +1,9 @@ -import { Component, OnDestroy, OnInit } from '@angular/core'; +import { AfterViewInit, Component, OnDestroy, OnInit, ViewChildren } from '@angular/core'; import { TodoService } from '../todo.service'; import { Todo } from '../todo.model'; import { Subscription } from 'rxjs/Subscription'; import { FormBuilder, FormControl, FormGroup } from '@angular/forms'; +import { FuseUtils } from '../../../../core/fuseUtils'; @Component({ selector : 'fuse-todo-details', @@ -13,17 +14,19 @@ export class TodoDetailsComponent implements OnInit, OnDestroy { todo: Todo; tags: any[]; + formType: string; todoForm: FormGroup; + @ViewChildren('titleInput') titleInputField; onFormChange: any; onCurrentTodoChanged: Subscription; onTagsChanged: Subscription; + onNewTodoClicked: Subscription; constructor(private todoService: TodoService, private formBuilder: FormBuilder) { - } ngOnInit() @@ -31,12 +34,16 @@ export class TodoDetailsComponent implements OnInit, OnDestroy // Subscribe to update the current todo this.onCurrentTodoChanged = this.todoService.onCurrentTodoChanged - .subscribe(currentTodo => { - this.todo = currentTodo; + .subscribe(todo => { + + this.formType = 'edit'; + + this.todo = todo; if ( this.todo ) { this.todoForm = this.createTodoForm(); + this.onFormChange = this.todoForm.valueChanges .debounceTime(500) .distinctUntilChanged() @@ -52,6 +59,23 @@ export class TodoDetailsComponent implements OnInit, OnDestroy .subscribe(labels => { this.tags = labels; }); + + // Subscribe to update on tag change + this.onNewTodoClicked = this.todoService.onNewTodoClicked + .subscribe(() => { + this.todo = new Todo({}); + this.todo.id = FuseUtils.genearateGUID(); + this.formType = 'new'; + this.todoForm = this.createTodoForm(); + this.focusTitleField(); + }); + } + + focusTitleField() + { + setTimeout(() => { + this.titleInputField.first.nativeElement.focus(); + }); } createTodoForm() @@ -120,12 +144,20 @@ export class TodoDetailsComponent implements OnInit, OnDestroy this.todoService.toggleTagOnTodo(tagId, this.todo); } + addTodo() + { + this.todoService.updateTodo(this.todoForm.getRawValue()); + } + ngOnDestroy() { if ( this.onFormChange ) { this.onFormChange.unsubscribe(); } + this.onCurrentTodoChanged.unsubscribe(); + + this.onNewTodoClicked.unsubscribe(); } } diff --git a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss index 730811e2..37dfb2db 100644 --- a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss +++ b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.scss @@ -24,6 +24,12 @@ user-select: none; } + &.move-disabled { + .handle { + display: none; + } + } + .tags { font-size: 12px; diff --git a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts index 4a3003f5..a14c445f 100644 --- a/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts +++ b/src/app/main/apps/todo/todo-list/todo-list-item/todo-list-item.component.ts @@ -2,6 +2,7 @@ import { Component, HostBinding, Input, OnDestroy, OnInit, ViewEncapsulation } f import { Todo } from '../../todo.model'; import { TodoService } from '../../todo.service'; import { Subscription } from 'rxjs/Subscription'; +import { ActivatedRoute, ActivatedRouteSnapshot, Route, Router } from '@angular/router'; @Component({ selector : 'fuse-todo-list-item', @@ -15,12 +16,19 @@ export class TodoListItemComponent implements OnInit, OnDestroy tags: any[]; @HostBinding('class.selected') selected: boolean; @HostBinding('class.completed') completed: boolean; + @HostBinding('class.move-disabled') moveDisabled: boolean; onSelectedTodosChanged: Subscription; onTagsChanged: Subscription; - constructor(private todoService: TodoService) + constructor(private todoService: TodoService, + private route: ActivatedRoute) { + // Disable move if path is not /all + if ( route.snapshot.url[0].path !== 'all' ) + { + this.moveDisabled = true; + } } ngOnInit() diff --git a/src/app/main/apps/todo/todo-list/todo-list.component.html b/src/app/main/apps/todo/todo-list/todo-list.component.html index 1c630129..460c949f 100644 --- a/src/app/main/apps/todo/todo-list/todo-list.component.html +++ b/src/app/main/apps/todo/todo-list/todo-list.component.html @@ -1,7 +1,7 @@
There are no todos!
-
+
@@ -26,8 +27,10 @@ export class TodoService implements Resolve onFiltersChanged: BehaviorSubject = new BehaviorSubject([]); onTagsChanged: BehaviorSubject = new BehaviorSubject([]); onSearchTextChanged: BehaviorSubject = new BehaviorSubject(''); + onNewTodoClicked: Subject = new Subject(); - constructor(private http: Http) + constructor(private http: Http, + private location: Location) { this.selectedTodos = []; } @@ -317,6 +320,23 @@ export class TodoService implements Resolve }); this.onCurrentTodoChanged.next(this.currentTodo); + + const tagHandle = this.routeParams.tagHandle, + filterHandle = this.routeParams.filterHandle; + + if ( tagHandle ) + { + this.location.go('apps/todo/tag/' + tagHandle + '/' + id); + } + else if ( filterHandle ) + { + this.location.go('apps/todo/filter/' + filterHandle + '/' + id); + } + else + { + this.location.go('apps/todo/all/' + id); + } + } /** @@ -360,10 +380,7 @@ export class TodoService implements Resolve this.getTodos().then(todos => { - if ( todos && this.currentTodo ) - { - this.setCurrentTodo(this.currentTodo.id); - } + this.setCurrentTodo(todo.id); resolve(todos); @@ -371,4 +388,27 @@ export class TodoService implements Resolve }); }); } + + /** + * Update the todo + * @param todo + * @returns {Promise} + */ + updateTodos(todos) + { + + /* return new Promise((resolve, reject) => { + + this.http.post('api/todo-todos/', {...todos}) + + .subscribe(response => { + + this.getTodos().then(_todos => { + console.log(response); + resolve(_todos); + }, reject); + }); + });*/ + + } } diff --git a/src/app/main/ui/colors/colors.component.html b/src/app/main/ui/colors/colors.component.html new file mode 100644 index 00000000..62ab632a --- /dev/null +++ b/src/app/main/ui/colors/colors.component.html @@ -0,0 +1,76 @@ +
+ + +
+

Material Colors

+ + + link + Reference + +
+ + + +
+ + + + + + {{color.key}} + + + + + +
+ +
Fuse has classes for every single color from + Material + Design Color Palette for your convenient. You can use them with pretty much every + element. +
+ +
+
+

{{selectedColor}}

+
+
+
500
+
+ {{selectedColorDefaultValue}} +
+
+
+ +
+ +
+ +
{{hue}}
+ +
+ .{{'md-'+selectedColor+'-'+hue+'-bg'}} +
+ +
.{{selectedColor+'-'+hue+'-bg'}}
+ +
+ .{{selectedColor+'-'+hue+'-fg'}} +
+
+
+
+
+ +
diff --git a/src/app/main/ui/colors/colors.component.scss b/src/app/main/ui/colors/colors.component.scss new file mode 100644 index 00000000..4887b6dd --- /dev/null +++ b/src/app/main/ui/colors/colors.component.scss @@ -0,0 +1,29 @@ +:host { + + .content { + + .color-tabs { + + .mat-tab-body { + + } + + } + + .color-tabs-content { + + .color { + + .fg-box { + background-color: white; + min-width: 128px; + } + } + + .colored-bg { + transition: background-color 400ms ease; + } + } + } +} + diff --git a/src/app/main/ui/colors/colors.component.ts b/src/app/main/ui/colors/colors.component.ts new file mode 100644 index 00000000..c77d8a6b --- /dev/null +++ b/src/app/main/ui/colors/colors.component.ts @@ -0,0 +1,37 @@ +import { Component, OnInit } from '@angular/core'; +import { MatColors } from '../../../core/matColors'; +import { MdTab } from '@angular/material'; + +@Component({ + selector : 'fuse-colors', + templateUrl: './colors.component.html', + styleUrls : ['./colors.component.scss'] +}) +export class ColorsComponent implements OnInit +{ + colors: {}; + selectedColor: string; + selectedColorDefaultValue: string; + + constructor() + { + this.colors = MatColors.all; + this.updateSelectedColor('red'); + } + + ngOnInit() + { + + } + + selectColor(selected) + { + this.updateSelectedColor(selected.tab.textLabel); + } + + private updateSelectedColor(colorName) + { + this.selectedColor = colorName; + this.selectedColorDefaultValue = MatColors.getColor(this.selectedColor)[500]; + } +} diff --git a/src/app/main/ui/colors/colors.module.ts b/src/app/main/ui/colors/colors.module.ts new file mode 100644 index 00000000..d4690cf4 --- /dev/null +++ b/src/app/main/ui/colors/colors.module.ts @@ -0,0 +1,26 @@ +import { NgModule } from '@angular/core'; +import { RouterModule, Routes } from '@angular/router'; +import { SharedModule } from '../../../core/modules/shared.module'; +import { FuseDemoModule } from '../../../core/components/demo/demo.module'; +import { ColorsComponent } from './colors.component'; + +const routes: Routes = [ + { + path : 'ui/colors', + component: ColorsComponent + } +]; + +@NgModule({ + imports : [ + SharedModule, + RouterModule.forChild(routes), + FuseDemoModule + ], + declarations: [ + ColorsComponent + ] +}) +export class UIColorsModule +{ +} diff --git a/src/app/main/ui/ui.module.ts b/src/app/main/ui/ui.module.ts index 036b1d48..4643b51c 100644 --- a/src/app/main/ui/ui.module.ts +++ b/src/app/main/ui/ui.module.ts @@ -1,9 +1,11 @@ import { NgModule } from '@angular/core'; import { UIPageLayoutsModule } from './page-layouts/page-layouts.module'; +import { UIColorsModule } from './colors/colors.module'; @NgModule({ - imports : [ + imports: [ + UIColorsModule, UIPageLayoutsModule ] })