diff --git a/package-lock.json b/package-lock.json index 80643c94..946b61a1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1281,7 +1281,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", @@ -3306,905 +3305,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-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" - } - }, - "string_decoder": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.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", @@ -8728,6 +7828,15 @@ "integrity": "sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=", "dev": true }, + "string_decoder": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", + "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", + "dev": true, + "requires": { + "safe-buffer": "5.1.1" + } + }, "string-width": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz", @@ -8755,15 +7864,6 @@ } } }, - "string_decoder": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz", - "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==", - "dev": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, "stringstream": { "version": "0.0.5", "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz", diff --git a/src/app/core/animations.ts b/src/app/core/animations.ts index 611dd1f1..193b9e10 100644 --- a/src/app/core/animations.ts +++ b/src/app/core/animations.ts @@ -1,8 +1,56 @@ -import { sequence, trigger, animate, style, group, query, transition, animateChild, state } from '@angular/animations'; +import { sequence, trigger, animate, style, group, query, transition, animateChild, state, animation, useAnimation, stagger } from '@angular/animations'; -export class Animations -{ - public static fadeInOut = trigger('fadeInOut', [ +const customAnimation = animation([ + style({ + opacity : '{{opacity}}', + transform: 'scale({{scale}}) translate3d({{x}}, {{y}}, {{z}})' + }), + animate('{{duration}} {{delay}} cubic-bezier(0.0, 0.0, 0.2, 1)', style('*')) +], { + params: { + duration: '200ms', + delay : '0ms', + opacity : '0', + scale : '1', + x : '0', + y : '0', + z : '0' + } +}); + +export const fuseAnimations = [ + + trigger('animate', [transition('void => *', [useAnimation(customAnimation)])]), + + trigger('animateStagger', [ + state('50', style('*')), + state('100', style('*')), + state('200', style('*')), + + transition('void => 50', + query('@*', + [ + stagger('50ms', [ + animateChild() + ]) + ])), + transition('void => 100', + query('@*', + [ + stagger('100ms', [ + animateChild() + ]) + ])), + transition('void => 200', + query('@*', + [ + stagger('200ms', [ + animateChild() + ]) + ])) + ]), + + trigger('fadeInOut', [ state('0', style({ display: 'none', opacity: 0 @@ -13,9 +61,9 @@ export class Animations })), transition('1 => 0', animate('300ms ease-out')), transition('0 => 1', animate('300ms ease-in')) - ]); + ]), - public static slideInOut = trigger('slideInOut', [ + trigger('slideInOut', [ state('0', style({ height : '0px', display: 'none' @@ -26,9 +74,9 @@ export class Animations })), transition('1 => 0', animate('300ms ease-out')), transition('0 => 1', animate('300ms ease-in')) - ]); + ]), - public static slideInLeft = trigger('slideInLeft', [ + trigger('slideInLeft', [ state('void', style({ transform: 'translateX(-100%)', display : 'none' @@ -39,9 +87,9 @@ export class Animations })), transition('void => *', animate('300ms')), transition('* => void', animate('300ms')) - ]); + ]), - public static slideInRight = trigger('slideInRight', [ + trigger('slideInRight', [ state('void', style({ transform: 'translateX(100%)', display : 'none' @@ -52,9 +100,9 @@ export class Animations })), transition('void => *', animate('300ms')), transition('* => void', animate('300ms')) - ]); + ]), - public static slideInTop = trigger('slideInTop', [ + trigger('slideInTop', [ state('void', style({ transform: 'translateY(-100%)', display : 'none' @@ -65,9 +113,9 @@ export class Animations })), transition('void => *', animate('300ms')), transition('* => void', animate('300ms')) - ]); + ]), - public static slideInBottom = trigger('slideInBottom', [ + trigger('slideInBottom', [ state('void', style({ transform: 'translateY(100%)', @@ -79,9 +127,9 @@ export class Animations })), transition('void => *', animate('300ms')), transition('* => void', animate('300ms')) - ]); + ]), - public static routerTransitionLeft = trigger('routerTransitionLeft', [ + trigger('routerTransitionLeft', [ transition('* => *', [ query('fuse-content > :enter, fuse-content > :leave', [ @@ -106,7 +154,7 @@ export class Animations transform: 'translateX(0)', opacity : 1 }), - animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', + animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ transform: 'translateX(-100%)', opacity : 0 @@ -114,7 +162,7 @@ export class Animations ], {optional: true}), query('fuse-content > :enter', [ style({transform: 'translateX(100%)'}), - animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', + animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ transform: 'translateX(0%)', opacity : 1 @@ -125,9 +173,9 @@ export class Animations query('fuse-content > :enter', animateChild(), {optional: true}) ]) ]) - ]); + ]), - public static routerTransitionRight = trigger('routerTransitionRight', [ + trigger('routerTransitionRight', [ transition('* => *', [ query('fuse-content > :enter, fuse-content > :leave', [ @@ -152,7 +200,7 @@ export class Animations transform: 'translateX(0)', opacity : 1 }), - animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', + animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ transform: 'translateX(100%)', opacity : 0 @@ -160,7 +208,7 @@ export class Animations ], {optional: true}), query('fuse-content > :enter', [ style({transform: 'translateX(-100%)'}), - animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', + animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ transform: 'translateX(0%)', opacity : 1 @@ -171,9 +219,9 @@ export class Animations query('fuse-content > :enter', animateChild(), {optional: true}) ]) ]) - ]); + ]), - public static routerTransitionUp = trigger('routerTransitionUp', [ + trigger('routerTransitionUp', [ transition('* => *', [ query('fuse-content > :enter, fuse-content > :leave', [ @@ -191,35 +239,33 @@ export class Animations opacity : 0 }) ], {optional: true}), - sequence([ - group([ - query('fuse-content > :leave', [ + group([ + query('fuse-content > :leave', [ + style({ + transform: 'translateY(0)', + opacity : 1 + }), + animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ - transform: 'translateY(0)', + transform: 'translateY(-100%)', + opacity : 0 + })) + ], {optional: true}), + query('fuse-content > :enter', [ + style({transform: 'translateY(100%)'}), + animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)', + style({ + transform: 'translateY(0%)', opacity : 1 - }), - animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', - style({ - transform: 'translateY(-100%)', - opacity : 0 - })) - ], {optional: true}), - query('fuse-content > :enter', [ - style({transform: 'translateY(100%)'}), - animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', - style({ - transform: 'translateY(0%)', - opacity : 1 - })) - ], {optional: true}) - ]), - query('fuse-content > :leave', animateChild(), {optional: true}), - query('fuse-content > :enter', animateChild(), {optional: true}) - ]) + })) + ], {optional: true}) + ]), + query('fuse-content > :leave', animateChild(), {optional: true}), + query('fuse-content > :enter', animateChild(), {optional: true}) ]) - ]); + ]), - public static routerTransitionDown = trigger('routerTransitionDown', [ + trigger('routerTransitionDown', [ transition('* => *', [ query('fuse-content > :enter, fuse-content > :leave', [ @@ -244,7 +290,7 @@ export class Animations transform: 'translateY(0)', opacity : 1 }), - animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', + animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ transform: 'translateY(100%)', opacity : 0 @@ -252,7 +298,7 @@ export class Animations ], {optional: true}), query('fuse-content > :enter', [ style({transform: 'translateY(-100%)'}), - animate('400ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', + animate('600ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ transform: 'translateY(0%)', opacity : 1 @@ -263,9 +309,9 @@ export class Animations query('fuse-content > :enter', animateChild(), {optional: true}) ]) ]) - ]); + ]), - public static routerTransitionFade = trigger('routerTransitionFade', [ + trigger('routerTransitionFade', [ transition('* => *', group([ @@ -278,6 +324,7 @@ export class Animations right : 0 }) ], {optional: true}), + query('fuse-content > :enter', [ style({ opacity: 0 @@ -287,7 +334,7 @@ export class Animations style({ opacity: 1 }), - animate('300ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', + animate('300ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ opacity: 0 })) @@ -296,7 +343,7 @@ export class Animations style({ opacity: 0 }), - animate('300ms cubic-bezier(0.250, 0.460, 0.450, 0.940)', + animate('300ms cubic-bezier(0.0, 0.0, 0.2, 1)', style({ opacity: 1 })) @@ -304,5 +351,5 @@ export class Animations query('fuse-content > :enter', animateChild(), {optional: true}), query('fuse-content > :leave', animateChild(), {optional: true}) ])) - ]); -} + ]) +]; diff --git a/src/app/core/components/material-color-picker/material-color-picker.component.ts b/src/app/core/components/material-color-picker/material-color-picker.component.ts index 3010b448..786ce470 100644 --- a/src/app/core/components/material-color-picker/material-color-picker.component.ts +++ b/src/app/core/components/material-color-picker/material-color-picker.component.ts @@ -1,12 +1,12 @@ import { Component, EventEmitter, Input, OnChanges, OnInit, Output, ViewEncapsulation } from '@angular/core'; import { MatColors } from '../../matColors'; -import { Animations } from '../../animations'; +import { fuseAnimations } from '../../animations'; @Component({ selector : 'fuse-material-color-picker', templateUrl : './material-color-picker.component.html', styleUrls : ['./material-color-picker.component.scss'], - animations : [Animations.slideInLeft, Animations.slideInRight], + animations : fuseAnimations, encapsulation: ViewEncapsulation.None }) export class FuseMaterialColorPickerComponent implements OnInit, OnChanges diff --git a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts index 84954253..4fb2853a 100644 --- a/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts +++ b/src/app/core/components/navigation/horizontal/nav-collapse/nav-horizontal-collapse.component.ts @@ -1,5 +1,5 @@ import { Component, HostBinding, HostListener, Input, OnDestroy } from '@angular/core'; -import { Animations } from '../../../../animations'; +import { fuseAnimations } from '../../../../animations'; import { FuseConfigService } from '../../../../services/config.service'; import { Subscription } from 'rxjs/Subscription'; @@ -7,7 +7,7 @@ import { Subscription } from 'rxjs/Subscription'; selector : 'fuse-nav-horizontal-collapse', templateUrl: './nav-horizontal-collapse.component.html', styleUrls : ['./nav-horizontal-collapse.component.scss'], - animations : [Animations.slideInOut] + animations : fuseAnimations }) export class FuseNavHorizontalCollapseComponent implements OnDestroy { diff --git a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts index a32e0c9a..5585f1e5 100644 --- a/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts +++ b/src/app/core/components/navigation/vertical/nav-collapse/nav-vertical-collapse.component.ts @@ -1,13 +1,13 @@ import { Component, HostBinding, Input, OnInit } from '@angular/core'; import { FuseNavigationService } from '../../navigation.service'; import { NavigationEnd, Router } from '@angular/router'; -import { Animations } from '../../../../animations'; +import { fuseAnimations } from '../../../../animations'; @Component({ selector : 'fuse-nav-vertical-collapse', templateUrl: './nav-vertical-collapse.component.html', styleUrls : ['./nav-vertical-collapse.component.scss'], - animations : [Animations.slideInOut] + animations : fuseAnimations }) export class FuseNavVerticalCollapseComponent implements OnInit { diff --git a/src/app/core/components/theme-options/theme-options.component.scss b/src/app/core/components/theme-options/theme-options.component.scss index e3cae6f3..f2670861 100644 --- a/src/app/core/components/theme-options/theme-options.component.scss +++ b/src/app/core/components/theme-options/theme-options.component.scss @@ -15,6 +15,10 @@ right: 0; top: 160px; + &.bar-closed .theme-options-panel { + display: none; + } + .theme-options-panel { position: absolute; right: 0; @@ -82,4 +86,5 @@ opacity: 1; } } + } diff --git a/src/app/core/components/theme-options/theme-options.component.ts b/src/app/core/components/theme-options/theme-options.component.ts index c69966b7..15c6fbc7 100644 --- a/src/app/core/components/theme-options/theme-options.component.ts +++ b/src/app/core/components/theme-options/theme-options.component.ts @@ -1,14 +1,14 @@ -import { Component, ElementRef, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; +import { Component, ElementRef, HostBinding, OnDestroy, OnInit, Renderer2, ViewChild } from '@angular/core'; import { style, animate, AnimationBuilder, AnimationPlayer } from '@angular/animations'; import { Subscription } from 'rxjs/Subscription'; import { FuseConfigService } from '../../services/config.service'; -import { Animations } from '../../animations'; +import { fuseAnimations } from '../../animations'; @Component({ selector : 'fuse-theme-options', templateUrl: './theme-options.component.html', styleUrls : ['./theme-options.component.scss'], - animations : [Animations.fadeInOut] + animations : fuseAnimations }) export class FuseThemeOptionsComponent implements OnInit, OnDestroy { @@ -18,10 +18,11 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy public player: AnimationPlayer; fuseSettings: any; - barClosed: boolean; onSettingsChanged: Subscription; + @HostBinding('class.bar-closed') barClosed: boolean; + constructor( private animationBuilder: AnimationBuilder, private fuseConfig: FuseConfigService, @@ -53,8 +54,6 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy closeBar() { - this.barClosed = true; - this.player = this.animationBuilder .build([ @@ -63,6 +62,10 @@ export class FuseThemeOptionsComponent implements OnInit, OnDestroy ]).create(this.panel.nativeElement); this.player.play(); + + this.player.onDone(() => { + this.barClosed = true; + }); } openBar() diff --git a/src/app/main/content/apps/calendar/calendar.component.html b/src/app/main/content/apps/calendar/calendar.component.html index 47b1545b..6f7969e7 100644 --- a/src/app/main/content/apps/calendar/calendar.component.html +++ b/src/app/main/content/apps/calendar/calendar.component.html @@ -1,5 +1,4 @@
-
@@ -9,9 +8,9 @@ @@ -50,7 +49,8 @@ -
+
@@ -86,7 +87,7 @@ -
+
-
+ - Chat App + Chat App - Select contact to start the chat!.. + Select contact to start the chat!.. diff --git a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts index f8624b9a..cc0e8287 100644 --- a/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts +++ b/src/app/main/content/apps/contacts/contact-list/contact-list.component.ts @@ -6,11 +6,13 @@ import { MdDialog, MdDialogRef } from '@angular/material'; import { FuseConfirmDialogComponent } from '../../../../../core/components/confirm-dialog/confirm-dialog.component'; import { FormGroup } from '@angular/forms'; import { DataSource } from '@angular/cdk/collections'; +import { fuseAnimations } from '../../../../../core/animations'; @Component({ selector : 'fuse-contacts-contact-list', templateUrl: './contact-list.component.html', - styleUrls : ['./contact-list.component.scss'] + styleUrls : ['./contact-list.component.scss'], + animations : fuseAnimations }) export class FuseContactsContactListComponent implements OnInit { diff --git a/src/app/main/content/apps/contacts/contacts.component.html b/src/app/main/content/apps/contacts/contacts.component.html index 24d898c4..4df1bda9 100644 --- a/src/app/main/content/apps/contacts/contacts.component.html +++ b/src/app/main/content/apps/contacts/contacts.component.html @@ -14,8 +14,8 @@
@@ -45,7 +45,7 @@ - + diff --git a/src/app/main/content/apps/contacts/contacts.component.ts b/src/app/main/content/apps/contacts/contacts.component.ts index dcc4f8f6..68c708a1 100644 --- a/src/app/main/content/apps/contacts/contacts.component.ts +++ b/src/app/main/content/apps/contacts/contacts.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { ContactsService } from './contacts.service'; -import { Animations } from '../../../../core/animations'; +import { fuseAnimations } from '../../../../core/animations'; import { FormControl } from '@angular/forms'; @Component({ @@ -8,7 +8,7 @@ import { FormControl } from '@angular/forms'; templateUrl : './contacts.component.html', styleUrls : ['./contacts.component.scss'], encapsulation: ViewEncapsulation.None, - animations : [Animations.slideInTop] + animations : fuseAnimations }) export class FuseContactsComponent implements OnInit { diff --git a/src/app/main/content/apps/dashboards/project/project.component.html b/src/app/main/content/apps/dashboards/project/project.component.html index 00fc77a3..7d785fe9 100644 --- a/src/app/main/content/apps/dashboards/project/project.component.html +++ b/src/app/main/content/apps/dashboards/project/project.component.html @@ -10,7 +10,7 @@
- Welcome back, John! + Welcome back, John!
diff --git a/src/app/main/content/apps/file-manager/file-manager.component.ts b/src/app/main/content/apps/file-manager/file-manager.component.ts index 0fd30a5f..3374fc48 100644 --- a/src/app/main/content/apps/file-manager/file-manager.component.ts +++ b/src/app/main/content/apps/file-manager/file-manager.component.ts @@ -1,11 +1,13 @@ import { Component, OnInit, ViewEncapsulation } from '@angular/core'; import { FileManagerService } from './file-manager.service'; +import { fuseAnimations } from '../../../../core/animations'; @Component({ selector : 'fuse-file-manager', templateUrl : './file-manager.component.html', styleUrls : ['./file-manager.component.scss'], - encapsulation: ViewEncapsulation.None + encapsulation: ViewEncapsulation.None, + animations : fuseAnimations }) export class FuseFileManagerComponent implements OnInit { @@ -15,7 +17,6 @@ export class FuseFileManagerComponent implements OnInit constructor(private fileManagerService: FileManagerService) { - } ngOnInit() diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html index 51b60b43..9c4b4cf7 100644 --- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html +++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.html @@ -29,7 +29,8 @@
-
+
diff --git a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts index cb08fb7b..ced23ac0 100644 --- a/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts +++ b/src/app/main/content/apps/file-manager/sidenavs/details/details.component.ts @@ -1,10 +1,12 @@ import { Component, OnInit } from '@angular/core'; import { FileManagerService } from '../../file-manager.service'; +import { fuseAnimations } from '../../../../../../core/animations'; @Component({ selector : 'fuse-file-manager-details-sidenav', templateUrl: './details.component.html', - styleUrls : ['./details.component.scss'] + styleUrls : ['./details.component.scss'], + animations : fuseAnimations }) export class FuseFileManagerDetailsSidenavComponent implements OnInit { diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.html b/src/app/main/content/apps/mail/mail-details/mail-details.component.html index 0927817a..42df8292 100644 --- a/src/app/main/content/apps/mail/mail-details/mail-details.component.html +++ b/src/app/main/content/apps/mail/mail-details/mail-details.component.html @@ -1,6 +1,6 @@
- email - Select a message to read + email + Select a message to read
diff --git a/src/app/main/content/apps/mail/mail-details/mail-details.component.ts b/src/app/main/content/apps/mail/mail-details/mail-details.component.ts index ca3d9165..ac475616 100644 --- a/src/app/main/content/apps/mail/mail-details/mail-details.component.ts +++ b/src/app/main/content/apps/mail/mail-details/mail-details.component.ts @@ -2,11 +2,13 @@ import { Component, OnDestroy, OnInit } from '@angular/core'; import { MailService } from '../mail.service'; import { Mail } from '../mail.model'; import { Subscription } from 'rxjs/Subscription'; +import { fuseAnimations } from '../../../../../core/animations'; @Component({ selector : 'fuse-mail-details', templateUrl: './mail-details.component.html', - styleUrls : ['./mail-details.component.scss'] + styleUrls : ['./mail-details.component.scss'], + animations : fuseAnimations }) export class FuseMailDetailsComponent implements OnInit, OnDestroy { diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.html b/src/app/main/content/apps/mail/mail-list/mail-list.component.html index 713a359c..467fac48 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list.component.html +++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.html @@ -2,6 +2,9 @@ There are no messages!
- - +
+ + +
diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.scss b/src/app/main/content/apps/mail/mail-list/mail-list.component.scss index 6451a90e..440b75aa 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list.component.scss +++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.scss @@ -11,4 +11,11 @@ font-size: 24px; font-weight: 300; } + + .mail-list { + position: relative; + display: flex; + flex-direction: column; + flex: 1; + } } diff --git a/src/app/main/content/apps/mail/mail-list/mail-list.component.ts b/src/app/main/content/apps/mail/mail-list/mail-list.component.ts index 1059f2be..54eb8985 100644 --- a/src/app/main/content/apps/mail/mail-list/mail-list.component.ts +++ b/src/app/main/content/apps/mail/mail-list/mail-list.component.ts @@ -4,11 +4,13 @@ import { ActivatedRoute } from '@angular/router'; import { MailService } from '../mail.service'; import { Location } from '@angular/common'; import { Subscription } from 'rxjs/Subscription'; +import { fuseAnimations } from '../../../../../core/animations'; @Component({ selector : 'fuse-mail-list', templateUrl: './mail-list.component.html', - styleUrls : ['./mail-list.component.scss'] + styleUrls : ['./mail-list.component.scss'], + animations : fuseAnimations }) export class FuseMailListComponent implements OnInit, OnDestroy { diff --git a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html index 249a4458..a00fbb05 100644 --- a/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html +++ b/src/app/main/content/apps/mail/sidenavs/main/main-sidenav.component.html @@ -2,11 +2,11 @@
-