diff --git a/credits.txt b/credits.txt new file mode 100644 index 00000000..682051e7 --- /dev/null +++ b/credits.txt @@ -0,0 +1,16 @@ +// ----------------------------------------------------------------------------------------------------- +// @ Image/Vector/Icon Credits +// ----------------------------------------------------------------------------------------------------- +Avatars - https://uifaces.co/ +Flag icons - http://www.famfamfam.com/lab/icons/flags/ +Frame vector created by Freepik - https://www.freepik.com/free-photos-vectors/frame +A Walk Amongst Friends - Photo by Kristin Ellis on Unsplash - https://unsplash.com/photos/CbZOGbazDWQ +Sunrise at Moraine Lake - Photo by Marlon Martinez on Unsplash - https://unsplash.com/photos/woNYcfrnp9M +Braies Lake - Photo by Luca Nicoletti on Unsplash - https://unsplash.com/photos/dH-L5zPcv3E +Lago di Sorapis - Photo by eberhard grossgasteiger on Unsplash - https://unsplash.com/photos/6uDg_zb20EM +Lago di Braies - Photo by Salmen Bejaoui on Unsplash - https://unsplash.com/photos/uXTozY3CcQg +Reaching - Photo by Justin Novello on Unsplash - https://unsplash.com/photos/Y14TNvIDllM +Yosemite - Photo by Tim Mossholder on Unsplash - https://unsplash.com/photos/ZCrtRSSUpGI +Never Stop Changing - Photo by John Westrock on Unsplash - https://unsplash.com/photos/_GY56uSG70U +Fall glow - Photo by Casey Horner on Unsplash - https://unsplash.com/photos/gz19zOdgN7w +First snow - Photo by eberhard grossgasteiger on Unsplash - https://unsplash.com/photos/LRrGf6dBjA4 \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index d8cac4d3..d0aa7b11 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@agm/core": { - "version": "1.0.0-beta.3", - "resolved": "https://registry.npmjs.org/@agm/core/-/core-1.0.0-beta.3.tgz", - "integrity": "sha512-nsyergarmMB4JCw7KGujj86ulgRYhEk8zXKRiJZdnju/irLvazQ/9Anlfsf1Rc5yph8sZrmQDwqLGZ6AqHhnzA==" + "version": "1.0.0-beta.5", + "resolved": "https://registry.npmjs.org/@agm/core/-/core-1.0.0-beta.5.tgz", + "integrity": "sha512-LVENJqtBZEWpX+uJkGI0zgg+Xkm2KkktQm4ojZozArbeNvQkVL6pqVc04Mme6vvOzwJpD1cET5w4byC8Xaq1QQ==" }, "@angular-devkit/architect": { "version": "0.8.3", @@ -17,6 +17,17 @@ "requires": { "@angular-devkit/core": "0.8.3", "rxjs": "~6.2.0" + }, + "dependencies": { + "rxjs": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", + "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular-devkit/build-angular": { @@ -81,6 +92,15 @@ "resolved": "https://registry.npmjs.org/parse5/-/parse5-4.0.0.tgz", "integrity": "sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==", "dev": true + }, + "rxjs": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", + "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } } } }, @@ -113,6 +133,17 @@ "@angular-devkit/architect": "0.8.3", "@angular-devkit/core": "0.8.3", "rxjs": "~6.2.0" + }, + "dependencies": { + "rxjs": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", + "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular-devkit/core": { @@ -125,6 +156,17 @@ "chokidar": "^2.0.3", "rxjs": "~6.2.0", "source-map": "^0.5.6" + }, + "dependencies": { + "rxjs": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", + "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular-devkit/schematics": { @@ -135,21 +177,33 @@ "requires": { "@angular-devkit/core": "0.8.3", "rxjs": "~6.2.0" + }, + "dependencies": { + "rxjs": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", + "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@angular/animations": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.8.tgz", - "integrity": "sha512-OUetZPkEfUz0o58bVmx42Jdd/ep+KcgV5xaFvRTwXI/mVbTYgODJUos7aaoyBz6J2EPB/pTA4NMyZU3XFKjDiw==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/animations/-/animations-6.1.9.tgz", + "integrity": "sha512-bPl5fNn4ja1S2Bn4xRT93wYqx0KjvZrX1FjpQltkf9dMmAdVpYj7spy+eYgClAMfZMWv7pa70F+FtSDkWbgRsA==", "requires": { "tslib": "^1.9.0" } }, "@angular/cdk": { - "version": "7.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.0.0-beta.1.tgz", - "integrity": "sha512-8Xtp5XE8x2xPj9rmUWEuFZ2aptNRaEnzcZmP7RZ97nIf0mv6t+K/rD80HEbAnXjhNYzA839vIUjZNUezfuhLAQ==", + "version": "7.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@angular/cdk/-/cdk-7.0.0-beta.2.tgz", + "integrity": "sha512-txzcJtWYbnd+Gs5ah5KojmZaRR/k3WOKJNz0NKR2FK7rnX8rfYK65FMNniakqjDPd08mpgqWVkyhJRuAeSDfGQ==", "requires": { + "parse5": "^5.0.0", "tslib": "^1.7.1" } }, @@ -184,6 +238,15 @@ "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "dev": true }, + "rxjs": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", + "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + }, "yargs-parser": { "version": "10.1.0", "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz", @@ -196,25 +259,25 @@ } }, "@angular/common": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.8.tgz", - "integrity": "sha512-v8U49a7w2hXKX229WCLNF40RYY3v26+QKlN/jxdzKpP4wu5dguX6s6d3+AJdtywvsE8WS1NwOTHWCCWuMiVxrg==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/common/-/common-6.1.9.tgz", + "integrity": "sha512-i35FiFxHC/vBfyYEdprgbedxWuimCbqGSdSQpBUE4jNka80EifG2IAHIk/vAG98z7LSUyo6n7nf6iFDY3GrYZA==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.8.tgz", - "integrity": "sha512-a+OblYNKzjBVsYy3FlZd8QkZvWpsDlqb8xGCfUBPazPFlbeDGp4Bvz5KdX0uCTv46OQyh6jeAmKWPt0PVxLrhg==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-6.1.9.tgz", + "integrity": "sha512-TY6axB1c7VvYXf+ebFDq3Ej+edgii3CDxew8HnyTFAWeDF2Gh8io1vTYwtdyDka6U53ASaheM1HpiUjzvYH0jQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/compiler-cli": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.8.tgz", - "integrity": "sha512-oL7ghO1Yjfp+J349hWrOqsrwJZ6ZAC0mRsXY0SkadnPI3oLzcmysmZV91UUjjZ43KR6lmXXkxo52Gt8bIRYEWQ==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/compiler-cli/-/compiler-cli-6.1.9.tgz", + "integrity": "sha512-/+Gh/I40KhwcLKiLpzYzZwPm78O2p6zxJxBmJA3gySCtl6iaxXq7wHvc63wa/6ESSvGWW0/WkZAr3m3GECx5Tg==", "dev": true, "requires": { "chokidar": "^1.4.2", @@ -357,80 +420,80 @@ } }, "@angular/core": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.8.tgz", - "integrity": "sha512-6bMVQmPqpKJZspjNRIEMaGOxCmDWrAZENlofXNgPhQ0mUNh17iTH7XpqjKbW7UWtnTqGcdnDC9dI++P08ggD3g==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/core/-/core-6.1.9.tgz", + "integrity": "sha512-V4XuBvQtS98guRV0Fq661hG9Ij0+4oWyHvIrnqZckuQ9D1G8NSJyZ/Lfh0kBB1cl+mnGe/J9XN1avW7liswDNQ==", "requires": { "tslib": "^1.9.0" } }, "@angular/flex-layout": { - "version": "6.0.0-beta.16", - "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-6.0.0-beta.16.tgz", - "integrity": "sha512-0AYtIBGrEJshdFMc6TXGloCkD19YTCRKVJl6xZHX4H5dLnUn+daqXcbh4UsWhayevnLp85HEf2ViHLmTa6jv3g==", + "version": "6.0.0-beta.18", + "resolved": "https://registry.npmjs.org/@angular/flex-layout/-/flex-layout-6.0.0-beta.18.tgz", + "integrity": "sha512-1Alv3YSIZYp0CTUIESIaSQLoSVyLzuNKPa5bGM/RzOmeSrndm5plVgI9wopGfJUDiwM18R97rq/4XjDvNT/+ig==", "requires": { "tslib": "^1.7.1" } }, "@angular/forms": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.8.tgz", - "integrity": "sha512-S+spi72wxXTTIdB+02xgYdl8UlCYMJ13ast0dfCGStwx/fRUsgo0sWppDpMJz9sseC7xKEJ4U5tsfjTiCQ9dqw==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/forms/-/forms-6.1.9.tgz", + "integrity": "sha512-gNwTCA0nzUR4LlXWPdfYBA+chq4X9mvOBo46+M44TevNwEsip6iSZKp7no9O5dquALOZ2HpFRuRkPoH4lXuVYA==", "requires": { "tslib": "^1.9.0" } }, "@angular/http": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.8.tgz", - "integrity": "sha512-WqOm3mAjU9SdPazi7DTJzPosRzb4+3Dk3gdzMpKwDNP40Zg940UBt62udVmK2ERReIQlQbHgq/+JLiPe3q5O5A==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/http/-/http-6.1.9.tgz", + "integrity": "sha512-Tm6SA7QIKGT4Bb+xlyPG+ZXrwniNwF+/ejsKcBar8xaligW4+R9oo5Ql6t4HpjafkWIPLBEXyxaiVq1nWPyz7g==", "requires": { "tslib": "^1.9.0" } }, "@angular/language-service": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.1.8.tgz", - "integrity": "sha512-AQpjHDlhGuuRvBuWEpq/u49lcaEL/PO2tLMMU5gRqBFYido9wP/6Flz0Oxgu1g5Xjj19Kj00j9uNGgSGc4UCyQ==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/language-service/-/language-service-6.1.9.tgz", + "integrity": "sha512-xm3lbJYelyq02iLdS4gpymuHc8WadoPRCYMHW5Ond7kD+05JGt8smYEGOAcjSt0NJrpmkPWnTzlFlXxWYLQNdw==", "dev": true }, "@angular/material": { - "version": "7.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.0.0-beta.1.tgz", - "integrity": "sha512-l1zyAivLf09yIPKWaRq/TiGq+h7vKuUlSG3ruqBdtjK/BTiiWgylNojKNI9X/zPd0DOamN255KzrgbJEb5eBIg==", + "version": "7.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@angular/material/-/material-7.0.0-beta.2.tgz", + "integrity": "sha512-OgKGzcylyFDGSGY6GnZ6HmreKG6eTgjQtkSqC/Ngv0B7ilPlpvbiyk3yAcjXSOLiHjU0tfXI1stZJjxmlSCqjg==", "requires": { "parse5": "^5.0.0", "tslib": "^1.7.1" } }, "@angular/material-moment-adapter": { - "version": "7.0.0-beta.1", - "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.0.0-beta.1.tgz", - "integrity": "sha512-N16ulgszdMHnTOgTcd06cviwYlIGED4kQDUaUFLAQziyu8DCWRE2eumQRC2EyBjLvaTJuIC5rP5JPFcVMbp75w==", + "version": "7.0.0-beta.2", + "resolved": "https://registry.npmjs.org/@angular/material-moment-adapter/-/material-moment-adapter-7.0.0-beta.2.tgz", + "integrity": "sha512-54ZqAv5/ROq1WCrbf97HPvJJQ/gM3NLWablmLcmxRgd2BMZm80XcItSGGY/j+S5Ra2A0zBhVxsvXjWpNvmn2tw==", "requires": { "tslib": "^1.7.1" } }, "@angular/platform-browser": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.8.tgz", - "integrity": "sha512-ZjnlnKj6K+Z+LvA9dbzckOfB0CwaamTkQGxyODXdYpwEJ/7YOoz+v+LYf6BpKdyqiDHEyVQnkU0YiniNNy+CWA==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/platform-browser/-/platform-browser-6.1.9.tgz", + "integrity": "sha512-/OpLZxpAQW912DnY4/RX0VLYJJ+TaCWMVP/tg7CBYaPpeJve7GHXfZLSJ1p95RhnSyohTYtdtbHG0NDuG8dgqw==", "requires": { "tslib": "^1.9.0" } }, "@angular/platform-browser-dynamic": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.8.tgz", - "integrity": "sha512-rXsyY6xpeuBTGyEmgx3KFMv1PTgaa1efA1bo8I3KIuUn595GnQamszpXISSySGeMYxEhKFeQWafb/ZDnSg0vWQ==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.9.tgz", + "integrity": "sha512-PGng7UCrWc5gCNxKo94VSWq0SRdN4jUeTCnX7tEI//Qu+dQPolJkUHPgD9A5UH1pSOEYl/2z+S2bayu+z+9o2w==", "requires": { "tslib": "^1.9.0" } }, "@angular/router": { - "version": "6.1.8", - "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.8.tgz", - "integrity": "sha512-0J7xkN8l4vdmtFETgJFYqHYxUPZz9grTnjeKmEkBSogxpOfJE5doDkAcBraRzB/Nb95MSb+zc4rIjx9Otx2IjA==", + "version": "6.1.9", + "resolved": "https://registry.npmjs.org/@angular/router/-/router-6.1.9.tgz", + "integrity": "sha512-FQksj8DiiWiY9o/1Ppq335Lr3d5wW3Odzg3yWC3JgFN37GMdCQxX71TX5ls8JeVspTiOeP9Lty99vDgfIcl+9A==", "requires": { "tslib": "^1.9.0" } @@ -471,6 +534,17 @@ "rxjs": "~6.2.0", "tree-kill": "^1.0.0", "webpack-sources": "^1.1.0" + }, + "dependencies": { + "rxjs": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", + "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@ngx-translate/core": { @@ -504,6 +578,17 @@ "rxjs": "~6.2.0", "semver": "^5.3.0", "semver-intersect": "^1.1.2" + }, + "dependencies": { + "rxjs": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", + "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "dev": true, + "requires": { + "tslib": "^1.9.0" + } + } } }, "@swimlane/dragula": { @@ -8735,17 +8820,17 @@ "integrity": "sha1-P4Yt+pGrdmsUiF700BEkv9oHT7Q=" }, "rxjs": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.2.2.tgz", - "integrity": "sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==", + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.3.3.tgz", + "integrity": "sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==", "requires": { "tslib": "^1.9.0" } }, "rxjs-compat": { - "version": "6.2.2", - "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.2.2.tgz", - "integrity": "sha512-h113JzEXnqBd6JQ8TYg33oDuM3baZ9WKS49rtbMX0gBW2Kz0z4wDZ0/pCA0T9sRJM1HkZT6mt45gpYOJ2MqWYQ==" + "version": "6.3.3", + "resolved": "https://registry.npmjs.org/rxjs-compat/-/rxjs-compat-6.3.3.tgz", + "integrity": "sha512-caGN7ixiabHpOofginKEquuHk7GgaCrC7UpUQ9ZqGp80tMc68msadOeP/2AKy2R4YJsT1+TX5GZCtxO82qWkyA==" }, "safe-buffer": { "version": "5.1.2", @@ -10077,9 +10162,9 @@ "dev": true }, "typescript": { - "version": "2.7.2", - "resolved": "http://registry.npmjs.org/typescript/-/typescript-2.7.2.tgz", - "integrity": "sha512-p5TCYZDAO0m4G344hD+wx/LATebLWZNkkh2asWUFqSsD2OrDNhbAHuSjobrmsUmdzjJjEeZVU9g1h3O6vpstnw==", + "version": "2.9.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz", + "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index b04de155..2211d39b 100644 --- a/package.json +++ b/package.json @@ -18,20 +18,20 @@ }, "private": true, "dependencies": { - "@agm/core": "1.0.0-beta.3", - "@angular/animations": "6.1.8", - "@angular/cdk": "7.0.0-beta.1", - "@angular/common": "6.1.8", - "@angular/compiler": "6.1.8", - "@angular/core": "6.1.8", - "@angular/flex-layout": "6.0.0-beta.16", - "@angular/forms": "6.1.8", - "@angular/http": "6.1.8", - "@angular/material": "7.0.0-beta.1", - "@angular/material-moment-adapter": "7.0.0-beta.1", - "@angular/platform-browser": "6.1.8", - "@angular/platform-browser-dynamic": "6.1.8", - "@angular/router": "6.1.8", + "@agm/core": "1.0.0-beta.5", + "@angular/animations": "6.1.9", + "@angular/cdk": "7.0.0-beta.2", + "@angular/common": "6.1.9", + "@angular/compiler": "6.1.9", + "@angular/core": "6.1.9", + "@angular/flex-layout": "6.0.0-beta.18", + "@angular/forms": "6.1.9", + "@angular/http": "6.1.9", + "@angular/material": "7.0.0-beta.2", + "@angular/material-moment-adapter": "7.0.0-beta.2", + "@angular/platform-browser": "6.1.9", + "@angular/platform-browser-dynamic": "6.1.9", + "@angular/router": "6.1.9", "@ngrx/effects": "6.1.0", "@ngrx/router-store": "6.1.0", "@ngrx/store": "6.1.0", @@ -58,15 +58,15 @@ "ngx-cookie-service": "1.0.10", "perfect-scrollbar": "1.4.0", "prismjs": "1.15.0", - "rxjs": "6.2.2", - "rxjs-compat": "6.2.2", + "rxjs": "6.3.3", + "rxjs-compat": "6.3.3", "web-animations-js": "2.3.1", "zone.js": "0.8.26" }, "devDependencies": { "@angular/cli": "6.2.3", - "@angular/compiler-cli": "6.1.8", - "@angular/language-service": "6.1.8", + "@angular/compiler-cli": "6.1.9", + "@angular/language-service": "6.1.9", "@angular-devkit/build-angular": "0.8.3", "@angularclass/hmr": "2.1.3", "@types/jasmine": "2.8.8", @@ -84,7 +84,7 @@ "protractor": "5.4.0", "ts-node": "5.0.1", "tslint": "5.9.1", - "typescript": "2.7.2", + "typescript": "2.9.2", "webpack-bundle-analyzer": "3.0.2" } } diff --git a/src/@fuse/components/search-bar/search-bar.component.scss b/src/@fuse/components/search-bar/search-bar.component.scss index b4917fff..f844c772 100644 --- a/src/@fuse/components/search-bar/search-bar.component.scss +++ b/src/@fuse/components/search-bar/search-bar.component.scss @@ -9,7 +9,7 @@ height: 64px; font-size: 13px; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { height: 56px; } @@ -28,7 +28,7 @@ height: 64px !important; line-height: 64px !important; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { height: 56px !important; line-height: 56px !important; } @@ -39,7 +39,7 @@ height: 64px !important; line-height: 64px !important; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { height: 56px !important; line-height: 56px !important; } diff --git a/src/@fuse/components/shortcuts/shortcuts.component.html b/src/@fuse/components/shortcuts/shortcuts.component.html index 7e24bb75..bf011b24 100644 --- a/src/@fuse/components/shortcuts/shortcuts.component.html +++ b/src/@fuse/components/shortcuts/shortcuts.component.html @@ -7,7 +7,7 @@ -
+
diff --git a/src/@fuse/components/shortcuts/shortcuts.component.scss b/src/@fuse/components/shortcuts/shortcuts.component.scss index 2fd8d648..63428a1c 100644 --- a/src/@fuse/components/shortcuts/shortcuts.component.scss +++ b/src/@fuse/components/shortcuts/shortcuts.component.scss @@ -2,7 +2,7 @@ :host { - @include media-breakpoint-down('sm') { + @include media-breakpoint('lt-md') { #fuse-shortcuts { diff --git a/src/@fuse/components/shortcuts/shortcuts.component.ts b/src/@fuse/components/shortcuts/shortcuts.component.ts index 05f49f47..9984310c 100644 --- a/src/@fuse/components/shortcuts/shortcuts.component.ts +++ b/src/@fuse/components/shortcuts/shortcuts.component.ts @@ -70,9 +70,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy // Get the navigation items and flatten them this.filteredNavigationItems = this.navigationItems = this._fuseNavigationService.getFlatNavigation(this.navigation); - const cookieExists = this._cookieService.check('FUSE2.shortcuts'); - - if ( cookieExists ) + if ( this._cookieService.check('FUSE2.shortcuts') ) { this.shortcutItems = JSON.parse(this._cookieService.get('FUSE2.shortcuts')); } @@ -107,6 +105,7 @@ export class FuseShortcutsComponent implements OnInit, OnDestroy ]; } + // Subscribe to media changes this._fuseMatchMediaService.onMediaChange .pipe(takeUntil(this._unsubscribeAll)) .subscribe(() => { diff --git a/src/@fuse/components/sidebar/sidebar.component.scss b/src/@fuse/components/sidebar/sidebar.component.scss index 955c5669..b67ac4ef 100644 --- a/src/@fuse/components/sidebar/sidebar.component.scss +++ b/src/@fuse/components/sidebar/sidebar.component.scss @@ -16,7 +16,7 @@ fuse-sidebar { z-index: 1000; box-shadow: 0 2px 8px 0 rgba(0, 0, 0, 0.35); - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { min-width: 0 !important; max-width: 80vw !important; width: 80vw !important; diff --git a/src/@fuse/components/widget/widget.component.scss b/src/@fuse/components/widget/widget.component.scss index 7efe1b83..d50b5def 100644 --- a/src/@fuse/components/widget/widget.component.scss +++ b/src/@fuse/components/widget/widget.component.scss @@ -20,11 +20,13 @@ fuse-widget { width: 100%; opacity: 1; z-index: 10; - border-radius: 2px; + border-radius: 8px; transition: transform 0.5s ease-out 0s, visibility 0s ease-in 0.2s, opacity 0s ease-in 0.2s; transform: rotateY(0deg); backface-visibility: hidden; + border: 1px solid; } + > .fuse-widget-back { display: block; position: absolute; @@ -36,9 +38,11 @@ fuse-widget { visibility: hidden; opacity: 0; z-index: 10; + border-radius: 8px; transition: transform 0.5s ease-out 0s, visibility 0s ease-in 0.2s, opacity 0s ease-in 0.2s; transform: rotateY(180deg); backface-visibility: hidden; + border: 1px solid; [fuseWidgetToggle] { position: absolute; diff --git a/src/@fuse/components/widget/widget.theme.scss b/src/@fuse/components/widget/widget.theme.scss index 667412c3..c9bf1a40 100644 --- a/src/@fuse/components/widget/widget.theme.scss +++ b/src/@fuse/components/widget/widget.theme.scss @@ -8,6 +8,7 @@ > .fuse-widget-front, > .fuse-widget-back { background: map-get($background, card); + border-color: map-get($foreground, divider); } } } \ No newline at end of file diff --git a/src/@fuse/scss/fuse.scss b/src/@fuse/scss/fuse.scss index 20e8b847..61dce32e 100644 --- a/src/@fuse/scss/fuse.scss +++ b/src/@fuse/scss/fuse.scss @@ -2,4 +2,4 @@ @import '~@angular/material/theming'; // Breakpoint mixins -@import "mixins/breakpoints"; \ No newline at end of file +@import "partials/breakpoints"; \ No newline at end of file diff --git a/src/@fuse/scss/mixins/_breakpoints.scss b/src/@fuse/scss/mixins/_breakpoints.scss deleted file mode 100644 index 3533c6a4..00000000 --- a/src/@fuse/scss/mixins/_breakpoints.scss +++ /dev/null @@ -1,126 +0,0 @@ -// Media step breakpoint mixin based on Angular Material lib -$breakpoints: ( - xs: 'screen and (max-width: 599px)', - sm: 'screen and (min-width: 600px) and (max-width: 959px)', - md: 'screen and (min-width: 960px) and (max-width: 1279px)', - lg: 'screen and (min-width: 1280px) and (max-width: 1919px)', - xl: 'screen and (min-width: 1920px) and (max-width: 5000px)', - lt-sm: 'screen and (max-width: 599px)', - lt-md: 'screen and (max-width: 959px)', - lt-lg: 'screen and (max-width: 1279px)', - lt-xl: 'screen and (max-width: 1919px)', - gt-xs: 'screen and (min-width: 600px)', - gt-sm: 'screen and (min-width: 960px)', - gt-md: 'screen and (min-width: 1280px)', - gt-lg: 'screen and (min-width: 1920px)' -) !default; - -$grid-breakpoints: ( - xs: 0, - sm: 600px, - md: 960px, - lg: 1280px, - xl: 1920px -) !default; - -@mixin media-breakpoint($breakpointName) { - - $mediaQuery: map-get($breakpoints, $breakpointName); - - @if ($mediaQuery != null) { - - @media #{$mediaQuery} { - @content - } - } -} - -// >> breakpoint-next(sm) -// md -// >> breakpoint-next(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) -// md -// >> breakpoint-next(sm, $breakpoint-names: (xs sm md lg xl)) -// md -@function breakpoint-next($name, $breakpoints: $grid-breakpoints, $breakpoint-names: map-keys($breakpoints)) { - $n: index($breakpoint-names, $name); - @return if($n < length($breakpoint-names), nth($breakpoint-names, $n + 1), null); -} - -// Minimum breakpoint width. Null for the smallest (first) breakpoint. -// -// >> breakpoint-min(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) -// 576px -@function breakpoint-min($name, $breakpoints: $grid-breakpoints) { - $min: map-get($breakpoints, $name); - @return if($min != 0, $min, null); -} - -// Maximum breakpoint width. Null for the largest (last) breakpoint. -// The maximum value is calculated as the minimum of the next one less 0.1. -// -// >> breakpoint-max(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) -// 767px -@function breakpoint-max($name, $breakpoints: $grid-breakpoints) { - $next: breakpoint-next($name, $breakpoints); - @return if($next, breakpoint-min($next, $breakpoints) - 1px, null); -} - -// Returns a blank string if smallest breakpoint, otherwise returns the name with a dash infront. -// Useful for making responsive utilities. -// -// >> breakpoint-infix(xs, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) -// "" (Returns a blank string) -// >> breakpoint-infix(sm, (xs: 0, sm: 576px, md: 768px, lg: 992px, xl: 1200px)) -// "-sm" -@function breakpoint-infix($name, $breakpoints: $grid-breakpoints) { - @return if(breakpoint-min($name, $breakpoints) == null, "", "-#{$name}"); -} - -// Media of at least the minimum breakpoint width. No query for the smallest breakpoint. -// Makes the @content apply to the given breakpoint and wider. -@mixin media-breakpoint-up($name, $breakpoints: $grid-breakpoints) { - $min: breakpoint-min($name, $breakpoints); - @if $min { - @media (min-width: $min) { - @content; - } - } @else { - @content; - } -} - -// Media of at most the maximum breakpoint width. No query for the largest breakpoint. -// Makes the @content apply to the given breakpoint and narrower. -@mixin media-breakpoint-down($name, $breakpoints: $grid-breakpoints) { - $max: breakpoint-max($name, $breakpoints); - @if $max { - @media (max-width: $max) { - @content; - } - } @else { - @content; - } -} - -// Media that spans multiple breakpoint widths. -// Makes the @content apply between the min and max breakpoints -@mixin media-breakpoint-between($lower, $upper, $breakpoints: $grid-breakpoints) { - $min: breakpoint-max($lower, $breakpoints); - $max: breakpoint-max($upper, $breakpoints); - - @media (min-width: $min) and (max-width: $max) { - @content; - } -} - -// Media between the breakpoint's minimum and maximum widths. -// No minimum for the smallest breakpoint, and no maximum for the largest one. -// Makes the @content apply only to the given breakpoint, not viewports any wider or narrower. -@mixin media-breakpoint-only($name, $breakpoints: $grid-breakpoints) { - $min: breakpoint-min($name, $breakpoints); - $max: breakpoint-max($name, $breakpoints); - - @media (min-width: $min) and (max-width: $max) { - @content; - } -} diff --git a/src/@fuse/scss/partials/_angular-material-fix.scss b/src/@fuse/scss/partials/_angular-material-fix.scss index 43debd21..07c9ae06 100644 --- a/src/@fuse/scss/partials/_angular-material-fix.scss +++ b/src/@fuse/scss/partials/_angular-material-fix.scss @@ -1,3 +1,31 @@ +// Fix: "Remove the cdk-global-scrollblock effects from the HTML" +// Fuse already blocks the body scroll so it doesn't need this feature. We are disabling it +// because on Windows, it causes a scrollbar to show up. +html { + + &.cdk-global-scrollblock { + position: relative !important; + overflow: hidden !important; + } +} + +// Fix: "Inconsistent button heights due to inconsistent line heights" +button { + + .mat-button-wrapper { + line-height: normal; + } +} + +.mat-icon { + + // Fix: "Font-weight config affecting the icons" + font-weight: 400 !important; + + // Fix: "Inconsistent positioning on custom font icons" + line-height: 1; +} + // Fix: "Icon button ripple radius is not correct on Edge & Safari" .mat-icon-button { @@ -30,9 +58,9 @@ background-color: rgba(0, 0, 0, 0.12); } -// Fix: "Table-cell and inline-table in mat-select" .mat-form-field { + // Fix: "Table-cell and inline-table in mat-select" &.mat-form-field-type-mat-select { .mat-form-field-infix { @@ -58,6 +86,17 @@ } } +// Fix: "Inconsistent input heights" +.mat-form-field-appearance-outline { + + input[type="time"] { + + &.mat-input-element { + height: 18px; + } + } +} + // Fix: Stepper icons are broken due to Fuse's icon helpers mat-horizontal-stepper, mat-vertical-stepper { diff --git a/src/@fuse/scss/partials/_breakpoints.scss b/src/@fuse/scss/partials/_breakpoints.scss new file mode 100644 index 00000000..3ba38f93 --- /dev/null +++ b/src/@fuse/scss/partials/_breakpoints.scss @@ -0,0 +1,38 @@ +// Media step breakpoint mixin based on Angular Material lib +$breakpoints: ( + xs: 'screen and (max-width: 599px)', + sm: 'screen and (min-width: 600px) and (max-width: 959px)', + md: 'screen and (min-width: 960px) and (max-width: 1279px)', + lg: 'screen and (min-width: 1280px) and (max-width: 1919px)', + xl: 'screen and (min-width: 1920px) and (max-width: 5000px)', + lt-sm: 'screen and (max-width: 599px)', + lt-md: 'screen and (max-width: 959px)', + lt-lg: 'screen and (max-width: 1279px)', + lt-xl: 'screen and (max-width: 1919px)', + gt-xs: 'screen and (min-width: 600px)', + gt-sm: 'screen and (min-width: 960px)', + gt-md: 'screen and (min-width: 1280px)', + gt-lg: 'screen and (min-width: 1920px)' +) !default; + +// Re-map the breakpoints for the helper classes +$helper-breakpoints: ( + xs: null, + sm: 'gt-xs', + md: 'gt-sm', + lg: 'gt-md', + xl: 'gt-lg' +); + +@mixin media-breakpoint($breakpointName) { + + $mediaQuery: map-get($breakpoints, $breakpointName); + + @if ($mediaQuery == null) { + @content + } @else { + @media #{$mediaQuery} { + @content + } + } +} diff --git a/src/@fuse/scss/partials/_cards.scss b/src/@fuse/scss/partials/_cards.scss index 9d3788b4..3ddd6647 100644 --- a/src/@fuse/scss/partials/_cards.scss +++ b/src/@fuse/scss/partials/_cards.scss @@ -8,6 +8,7 @@ .fuse-card { background: map-get($background, card); + border-color: map-get($foreground, divider); .card-divider { border-top: 1px solid map-get($foreground, divider); @@ -21,8 +22,8 @@ .fuse-card { max-width: 320px; min-width: 320px; - border-radius: 2px; - @include mat-elevation(2); + border-radius: 8px; + border: 1px solid; &.variable-width { min-width: 0; diff --git a/src/@fuse/scss/partials/_general.scss b/src/@fuse/scss/partials/_general.scss index a3598600..d3f0d402 100644 --- a/src/@fuse/scss/partials/_general.scss +++ b/src/@fuse/scss/partials/_general.scss @@ -59,4 +59,12 @@ img { height: auto; vertical-align: top; border: none; +} + +// ----------------------------------------------------------------------------------------------------- +// @ Input +// ----------------------------------------------------------------------------------------------------- +input { + border: none; + padding: 0 16px; } \ No newline at end of file diff --git a/src/@fuse/scss/partials/_helpers.scss b/src/@fuse/scss/partials/_helpers.scss index b8e0a4cc..e2950acd 100644 --- a/src/@fuse/scss/partials/_helpers.scss +++ b/src/@fuse/scss/partials/_helpers.scss @@ -1,11 +1,11 @@ // ----------------------------------------------------------------------------------------------------- // @ Position helpers // ----------------------------------------------------------------------------------------------------- -@each $breakpoint in map-keys($grid-breakpoints) { +@each $breakpoint, $materialBreakpoint in $helper-breakpoints { - @include media-breakpoint-up($breakpoint) { + @include media-breakpoint($materialBreakpoint) { - $infix: breakpoint-infix($breakpoint, $grid-breakpoints); + $infix: if($materialBreakpoint == null, "", "-#{$breakpoint}"); .position#{$infix}-relative { position: relative; @@ -24,11 +24,11 @@ // ----------------------------------------------------------------------------------------------------- // @ Absolute position alignment helpers // ----------------------------------------------------------------------------------------------------- -@each $breakpoint in map-keys($grid-breakpoints) { +@each $breakpoint, $materialBreakpoint in $helper-breakpoints { - @include media-breakpoint-up($breakpoint) { + @include media-breakpoint($materialBreakpoint) { - $infix: breakpoint-infix($breakpoint, $grid-breakpoints); + $infix: if($materialBreakpoint == null, "", "-#{$breakpoint}"); .align#{$infix}-top { top: 0; @@ -78,11 +78,11 @@ // ----------------------------------------------------------------------------------------------------- // @ Spacing helpers // ----------------------------------------------------------------------------------------------------- -@each $breakpoint in map-keys($grid-breakpoints) { +@each $breakpoint, $materialBreakpoint in $helper-breakpoints { - @include media-breakpoint-up($breakpoint) { + @include media-breakpoint($materialBreakpoint) { - $infix: breakpoint-infix($breakpoint, $grid-breakpoints); + $infix: if($materialBreakpoint == null, "", "-#{$breakpoint}"); @each $prop, $abbrev in (margin: m, padding: p) { diff --git a/src/@fuse/scss/partials/_icons.scss b/src/@fuse/scss/partials/_icons.scss index 91774833..e5f61394 100644 --- a/src/@fuse/scss/partials/_icons.scss +++ b/src/@fuse/scss/partials/_icons.scss @@ -14,11 +14,11 @@ mat-icon { min-height: 24px; line-height: 24px; - @each $breakpoint in map-keys($grid-breakpoints) { + @each $breakpoint, $materialBreakpoint in $helper-breakpoints { - @include media-breakpoint-up($breakpoint) { + @include media-breakpoint($materialBreakpoint) { - $infix: breakpoint-infix($breakpoint, $grid-breakpoints); + $infix: if($materialBreakpoint == null, "", "-#{$breakpoint}"); @for $size from 2 through 128 { diff --git a/src/@fuse/scss/partials/_material.scss b/src/@fuse/scss/partials/_material.scss index 1247ea81..67e6780a 100644 --- a/src/@fuse/scss/partials/_material.scss +++ b/src/@fuse/scss/partials/_material.scss @@ -230,13 +230,12 @@ mat-icon.status { color: #F44336; &:before { - content: "do_not_disturb_on"; + content: "remove_circle_outline"; } } &.away { - background-color: #FFC107; - color: #FFFFFF; + color: #FFC107; &:before { content: "access_time"; @@ -245,7 +244,6 @@ mat-icon.status { &.offline { color: #646464; - background-color: #FFFFFF; &:before { content: "not_interested"; diff --git a/src/@fuse/scss/partials/_navigation.scss b/src/@fuse/scss/partials/_navigation.scss index c02a10ce..492d9a43 100644 --- a/src/@fuse/scss/partials/_navigation.scss +++ b/src/@fuse/scss/partials/_navigation.scss @@ -219,24 +219,27 @@ } } - // Material style - &.material { + // Material 2 style + &.material2, + .material2 & { .nav-subheader { - border-top: 1px solid rgba(0, 0, 0, 0.12); - - &:first-child { - border-top: none; - } + height: 40px; } + .nav-group { + + > .group-title { + height: 40px; + } + } .nav-item { .nav-link { height: 40px; - padding: 0 16px; - margin: 4px 8px; - border-radius: 4px; + padding: 0 12px 0 24px; + border-radius: 0 20px 20px 0; + margin-right: 16px; } } } diff --git a/src/@fuse/scss/partials/_page-layouts.scss b/src/@fuse/scss/partials/_page-layouts.scss index f28cc535..3d1a45e1 100644 --- a/src/@fuse/scss/partials/_page-layouts.scss +++ b/src/@fuse/scss/partials/_page-layouts.scss @@ -18,6 +18,7 @@ > .content-card { background: map-get($background, card); + border-radius: 8px 8px 0 0; > .toolbar { border-bottom-color: map-get($foreground, divider); @@ -34,6 +35,7 @@ > .content-card { background: map-get($background, card); + border-radius: 8px 8px 0 0; > .toolbar { border-bottom-color: map-get($foreground, divider); @@ -79,15 +81,11 @@ // @ Page Layouts // ----------------------------------------------------------------------------------------------------- $carded-header-height: 200px !default; -$carded-header-height-sm: 160px !default; $carded-toolbar-height: 64px !default; - $header-height: 120px !default; -$header-height-sm: 100px !default; -// Calculate toolbarless header height +// Calculate toolbar-less carded header height $carded-header-height-without-toolbar: $carded-header-height - $carded-toolbar-height; -$carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-toolbar-height; .page-layout { position: relative; @@ -109,10 +107,6 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too right: 0; left: 0; height: $carded-header-height; - - @include media-breakpoint-down('sm') { - height: $carded-header-height-sm; - } } // Fullwidth @@ -136,12 +130,6 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too height: $carded-header-height-without-toolbar !important; min-height: $carded-header-height-without-toolbar !important; max-height: $carded-header-height-without-toolbar !important; - - @include media-breakpoint-down('sm') { - height: $carded-header-height-without-toolbar-sm !important; - min-height: $carded-header-height-without-toolbar-sm !important; - max-height: $carded-header-height-without-toolbar-sm !important; - } } > .content-card { @@ -149,7 +137,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too flex-direction: column; flex: 1 0 auto; overflow: hidden; - @include mat-elevation(7); + @include mat-elevation(1); > .toolbar { display: flex; @@ -303,12 +291,6 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too height: $carded-header-height; min-height: $carded-header-height; max-height: $carded-header-height; - - @include media-breakpoint-down('sm') { - height: $carded-header-height-sm; - min-height: $carded-header-height-sm; - max-height: $carded-header-height-sm; - } } .content { @@ -334,12 +316,6 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too height: $carded-header-height-without-toolbar; min-height: $carded-header-height-without-toolbar; max-height: $carded-header-height-without-toolbar; - - @include media-breakpoint-down('sm') { - height: $carded-header-height-without-toolbar-sm; - min-height: $carded-header-height-without-toolbar-sm; - max-height: $carded-header-height-without-toolbar-sm; - } } > .content-card { @@ -347,7 +323,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too flex-direction: column; flex: 1 1 auto; overflow: hidden; - @include mat-elevation(7); + @include mat-elevation(1); > .toolbar { display: flex; @@ -379,7 +355,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too width: calc(100% - 32px); min-width: 0; - @include media-breakpoint-down('md') { + @include media-breakpoint('lt-lg') { width: calc(100% - 64px); } @@ -566,7 +542,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too z-index: 3; min-width: 0; width: 100%; - @include mat-elevation(7); + @include mat-elevation(1); > .header { height: $header-height; @@ -625,6 +601,11 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too flex: 1 1 auto; overflow: auto; -webkit-overflow-scrolling: touch; + + > .content { + border-radius: 8px; + @include mat-elevation(1); + } } } } @@ -685,7 +666,7 @@ $carded-header-height-without-toolbar-sm: $carded-header-height-sm - $carded-too min-height: 100%; } - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { // Smaller margins &.carded { diff --git a/src/@fuse/scss/partials/_typography.scss b/src/@fuse/scss/partials/_typography.scss index dd8521fa..fa98cc2e 100644 --- a/src/@fuse/scss/partials/_typography.scss +++ b/src/@fuse/scss/partials/_typography.scss @@ -41,7 +41,7 @@ // ----------------------------------------------------------------------------------------------------- html { font-size: 62.5%; - font-family: 'Muli', 'Helvetica Neue', 'Arial', sans-serif; + font-family: 'Nunito', 'Helvetica Neue', 'Arial', sans-serif; line-height: 1.4 !important; letter-spacing: -0.1px !important; } diff --git a/src/app/app.component.scss b/src/app/app.component.scss index e1b40cd1..41964781 100644 --- a/src/app/app.component.scss +++ b/src/app/app.component.scss @@ -25,7 +25,7 @@ &.right-side-panel { - @include media-breakpoint-up('lg') { + @include media-breakpoint('gt-md') { right: 70px; } } diff --git a/src/app/app.theme.scss b/src/app/app.theme.scss index cc807163..923884d3 100644 --- a/src/app/app.theme.scss +++ b/src/app/app.theme.scss @@ -63,8 +63,11 @@ $custom_palettes: ( // Force the input field font sizes to 16px $typography: mat-typography-config( - $font-family: 'Muli, Helvetica Neue, Arial, sans-serif', - $input: mat-typography-level(16px, 1.125, 400) + $font-family: 'Nunito, Helvetica Neue, Arial, sans-serif', + $title: mat-typography-level(20px, 32px, 600), + $body-2: mat-typography-level(14px, 24px, 600), + $button: mat-typography-level(14px, 14px, 600), + $input: mat-typography-level(16px, 1.125, 400) // line-height must be unitless !!! ); // Setup the typography diff --git a/src/app/fake-db/calendar.ts b/src/app/fake-db/calendar.ts index 9eef3f3b..1a92c79c 100644 --- a/src/app/fake-db/calendar.ts +++ b/src/app/fake-db/calendar.ts @@ -22,8 +22,8 @@ export class CalendarFakeDb title : 'A 3 day event', allDay : true, color : { - primary : '#ad2121', - secondary: '#FAE3E3' + primary : '#F44336', + secondary: '#FFCDD2' }, resizable: { beforeStart: true, @@ -40,8 +40,8 @@ export class CalendarFakeDb title : 'An event with no end date', allDay : false, color : { - primary : '#e3bc08', - secondary: '#FDF1BA' + primary : '#FF9800', + secondary: '#FFE0B2' }, resizable: { beforeStart: true, @@ -59,7 +59,7 @@ export class CalendarFakeDb title : 'A long event that spans 2 months', allDay : false, color : { - primary : '#1e90ff', + primary : '#1E90FF', secondary: '#D1E8FF' }, resizable: { @@ -78,8 +78,8 @@ export class CalendarFakeDb title : 'A draggable and resizable event', allDay : false, color : { - primary : '#e3bc08', - secondary: '#FDF1BA' + primary : '#673AB7', + secondary: '#D1C4E9' }, resizable: { beforeStart: true, diff --git a/src/app/fake-db/contacts.ts b/src/app/fake-db/contacts.ts index 67d36ea9..bcbf7acc 100644 --- a/src/app/fake-db/contacts.ts +++ b/src/app/fake-db/contacts.ts @@ -12,7 +12,7 @@ export class ContactsFakeDb 'email' : 'abbott@withinpixels.com', 'phone' : '+1-202-555-0175', 'address' : '933 8th Street Stamford, CT 06902', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -26,7 +26,7 @@ export class ContactsFakeDb 'email' : 'arnold@withinpixels.com', 'phone' : '+1-202-555-0141', 'address' : '906 Valley Road Michigan City, IN 46360', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -40,7 +40,7 @@ export class ContactsFakeDb 'email' : 'barrera@withinpixels.com', 'phone' : '+1-202-555-0196', 'address' : '183 River Street Passaic, NJ 07055', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -54,7 +54,7 @@ export class ContactsFakeDb 'email' : 'blair@withinpixels.com', 'phone' : '+1-202-555-0118', 'address' : '143 Jones Street Eau Claire, WI 54701', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -68,7 +68,7 @@ export class ContactsFakeDb 'email' : 'boyle@withinpixels.com', 'phone' : '+1-202-555-0177', 'address' : '218 Pearl Street Brandon, FL 33510', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -82,7 +82,7 @@ export class ContactsFakeDb 'email' : 'christy@withinpixels.com', 'phone' : '+1-202-555-0136', 'address' : '329 Bridge Street Desoto, TX 75115', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -96,7 +96,7 @@ export class ContactsFakeDb 'email' : 'copeland@withinpixels.com', 'phone' : '+1-202-555-0107', 'address' : '956 6th Avenue North Bergen, NJ 0704', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -110,7 +110,7 @@ export class ContactsFakeDb 'email' : 'estes@withinpixels.com', 'phone' : '+1-202-555-0113', 'address' : '664 York Street Cambridge, MA 02138', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -124,7 +124,7 @@ export class ContactsFakeDb 'email' : 'harper@withinpixels.com', 'phone' : '+1-202-555-0173', 'address' : '738 Route 11 Cornelius, NC 28031', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -138,7 +138,7 @@ export class ContactsFakeDb 'email' : 'helen@withinpixels.com', 'phone' : '+1-202-555-0163', 'address' : '194 Washington Avenue Saint Petersburg, FL 33702', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -152,7 +152,7 @@ export class ContactsFakeDb 'email' : 'henderson@withinpixels.com', 'phone' : '+1-202-555-0151', 'address' : '686 Roosevelt Avenue Oviedo, FL 32765', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -166,7 +166,7 @@ export class ContactsFakeDb 'email' : 'josefina@withinpixels.com', 'phone' : '+1-202-555-0160', 'address' : '202 Hartford Road Lynchburg, VA 24502', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -180,7 +180,7 @@ export class ContactsFakeDb 'email' : 'katina@withinpixels.com', 'phone' : '+1-202-555-0186', 'address' : '219 Woodland Road Valrico, FL 33594', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -194,7 +194,7 @@ export class ContactsFakeDb 'email' : 'lily@withinpixels.com', 'phone' : '+1-202-555-0115', 'address' : '305 Willow Drive Superior, WI 54880', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -208,7 +208,7 @@ export class ContactsFakeDb 'email' : 'mai@withinpixels.com', 'phone' : '+1-202-555-0199', 'address' : '148 Heather Lane Mcminnville, TN 37110', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -222,7 +222,7 @@ export class ContactsFakeDb 'email' : 'nancy@withinpixels.com', 'phone' : '+1-202-555-0120', 'address' : '345 Laurel Lane Union City, NJ 07087', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -236,7 +236,7 @@ export class ContactsFakeDb 'email' : 'nora@withinpixels.com', 'phone' : '+1-202-555-0172', 'address' : '572 Rose Street Summerfield, FL 34491', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -250,7 +250,7 @@ export class ContactsFakeDb 'email' : 'odessa@withinpixels.com', 'phone' : '+1-202-555-0190', 'address' : '527 Jefferson Court Conyers, GA 30012', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -264,7 +264,7 @@ export class ContactsFakeDb 'email' : 'reyna@withinpixels.com', 'phone' : '+1-202-555-0116', 'address' : '297 Strawberry Lane Faribault, MN 55021', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -278,7 +278,7 @@ export class ContactsFakeDb 'email' : 'shauna@withinpixels.com', 'phone' : '+1-202-555-0159', 'address' : '928 Canterbury Court Pittsburgh, PA 15206', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -292,7 +292,7 @@ export class ContactsFakeDb 'email' : 'shepard@withinpixels.com', 'phone' : '+1-202-555-0173', 'address' : '904 Ridge Road Pickerington, OH 43147', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -306,7 +306,7 @@ export class ContactsFakeDb 'email' : 'tillman@withinpixels.com', 'phone' : '+1-202-555-0183', 'address' : '447 Charles Street Dorchester, MA 02125', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -320,7 +320,7 @@ export class ContactsFakeDb 'email' : 'trevino@withinpixels.com', 'phone' : '+1-202-555-0138', 'address' : '84 Valley View Road Norman, OK 73072', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -334,7 +334,7 @@ export class ContactsFakeDb 'email' : 'tyson@withinpixels.com', 'phone' : '+1-202-555-0146', 'address' : '204 Clark Street Monsey, NY 10952', - 'birthday': null, + 'birthday': '', 'notes' : '' }, { @@ -348,7 +348,7 @@ export class ContactsFakeDb 'email' : 'velezquez@withinpixels.com', 'phone' : '+1-202-555-0146', 'address' : '261 Cleveland Street Riverside, NJ 08075', - 'birthday': null, + 'birthday': '', 'notes' : '' } ]; diff --git a/src/app/fake-db/e-commerce.ts b/src/app/fake-db/e-commerce.ts index cee5a72c..eb1fee6a 100644 --- a/src/app/fake-db/e-commerce.ts +++ b/src/app/fake-db/e-commerce.ts @@ -3,66 +3,67 @@ export class ECommerceFakeDb public static products = [ { 'id' : '1', - 'name' : 'Printed Dress', - 'handle' : 'printed-dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', + 'handle' : 'a-walk-amongst-friends-canvas-print', 'description' : 'Officia amet eiusmod eu sunt tempor voluptate laboris velit nisi amet enim proident et. Consequat laborum non eiusmod cillum eu exercitation. Qui adipisicing est fugiat eiusmod esse. Sint aliqua cupidatat pariatur mollit ad est proident reprehenderit. Eiusmod adipisicing laborum incididunt sit aliqua ullamco.', 'categories' : [ - 'Dresses', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 1, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -81,66 +82,67 @@ export class ECommerceFakeDb }, { 'id' : '2', - 'name' : 'Green Skirt', - 'handle' : 'green-skirt', + 'name' : 'Braies Lake - Canvas Print', + 'handle' : 'braies-lake-canvas-print', 'description' : 'Duis anim est non exercitation consequat. Ullamco ut ipsum dolore est elit est ea elit ad fugiat exercitation. Adipisicing eu ad sit culpa sint. Minim irure Lorem eiusmod minim nisi sit est consectetur.', 'categories' : [ - 'Skirts', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 2, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -159,66 +161,67 @@ export class ECommerceFakeDb }, { 'id' : '3', - 'name' : 'Printed Dress', - 'handle' : 'printed-dress', + 'name' : 'Fall Glow - Canvas Print', + 'handle' : 'fall-glow-canvas-print', 'description' : 'Sit ipsum esse eu consequat veniam sit consectetur consectetur anim. Ut Lorem dolor ullamco do. Laboris excepteur consectetur tempor nisi commodo amet deserunt duis.', 'categories' : [ - 'Dresses', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 3, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -237,66 +240,67 @@ export class ECommerceFakeDb }, { 'id' : '4', - 'name' : 'White T-Shirt', - 'handle' : 'white-t-shirt', + 'name' : 'First Snow - Canvas Print', + 'handle' : 'first-snow-canvas-print', 'description' : 'Incididunt nostrud culpa labore nostrud veniam nostrud dolore velit sunt laborum ad reprehenderit. Excepteur enim irure ut labore elit ut deserunt qui qui consequat quis do nostrud ad. Aliqua dolor labore ut occaecat laborum irure. Aute in deserunt do aute laborum sit et reprehenderit minim voluptate proident do est.', 'categories' : [ - 'T-Shirts', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 4, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -315,66 +319,67 @@ export class ECommerceFakeDb }, { 'id' : '5', - 'name' : 'Red Hoodie', - 'handle' : 'red-hoodie', + 'name' : 'Lago di Braies - Canvas Print', + 'handle' : 'lago-di-braies-canvas-print', 'description' : 'Laboris laborum minim qui reprehenderit duis fugiat ea anim labore incididunt duis. Officia adipisicing anim amet in sit aliqua fugiat quis do sint non velit eu. Labore occaecat labore elit voluptate Lorem adipisicing et ipsum id et reprehenderit ullamco. Elit in nulla laborum nulla quis dolor deserunt magna dolor ad anim magna. Esse aute reprehenderit anim sit est et quis est. Ex reprehenderit culpa deserunt qui sint eiusmod reprehenderit ipsum consequat ut.', 'categories' : [ - 'Hoodies', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 5, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -393,66 +398,67 @@ export class ECommerceFakeDb }, { 'id' : '6', - 'name' : 'Red Hoodie', - 'handle' : 'red-hoodie', + 'name' : 'Lago di Sorapis - Canvas Print', + 'handle' : 'lago-di-sorapis-canvas-print', 'description' : 'Tempor sunt tempor veniam non culpa excepteur. Ea irure elit non cupidatat cillum dolore. Sit incididunt qui dolore ipsum commodo aliqua amet cupidatat incididunt nisi qui consectetur. Cillum eu aute qui irure aute adipisicing cupidatat magna.', 'categories' : [ - 'Hoodies', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 6, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -471,66 +477,67 @@ export class ECommerceFakeDb }, { 'id' : '7', - 'name' : 'Summer Dress', - 'handle' : 'summer-dress', + 'name' : 'Never Stop Changing - Canvas Print', + 'handle' : 'never-stop-changing-canvas-print', 'description' : 'Excepteur commodo ipsum in ex esse elit ea id voluptate id occaecat. Sunt Lorem ipsum ut proident eu aliquip velit non minim. Sunt velit deserunt veniam eu non veniam. Eiusmod sit ex et id incididunt labore aliqua eu aute dolor cillum ex mollit mollit. Incididunt voluptate adipisicing eiusmod non ipsum cupidatat excepteur enim in pariatur eu. Labore dolor qui exercitation amet labore laboris Lorem do adipisicing. Minim non consectetur adipisicing esse ut occaecat incididunt eiusmod commodo et cillum pariatur.', 'categories' : [ - 'Dresses', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 7, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -549,66 +556,67 @@ export class ECommerceFakeDb }, { 'id' : '8', - 'name' : 'Black Shoes', - 'handle' : 'black-shoes', + 'name' : 'Reaching - Canvas Print', + 'handle' : 'reaching-canvas-print', 'description' : 'Velit cillum cupidatat eiusmod ea quis sit. Consequat dolore elit sunt sunt voluptate irure incididunt consectetur non. Dolore veniam ipsum anim commodo ex. Proident ipsum nostrud ullamco sit. Ad dolore nulla qui mollit laborum ex ipsum.', 'categories' : [ - 'Shoes', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 8, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -627,66 +635,67 @@ export class ECommerceFakeDb }, { 'id' : '9', - 'name' : 'Yellow Bag', - 'handle' : 'yellow-bag', + 'name' : 'Morain Lake - Canvas Print', + 'handle' : 'morain-lake-canvas-print', 'description' : 'Consequat minim velit commodo Lorem ipsum velit elit amet ut. In deserunt id duis nisi labore. Proident cillum et reprehenderit excepteur ex nulla enim.', 'categories' : [ - 'Bags', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 9, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -705,66 +714,67 @@ export class ECommerceFakeDb }, { 'id' : '10', - 'name' : 'Brown Shoes', - 'handle' : 'brown-shoes', + 'name' : 'Yosemite - Canvas Print', + 'handle' : 'yosemite-canvas-print', 'description' : 'Proident do sunt dolor tempor aliquip adipisicing dolor reprehenderit officia proident. Culpa non reprehenderit velit anim consequat velit elit eu culpa quis incididunt id. Eu incididunt exercitation nostrud est mollit officia. Laboris deserunt dolore sit occaecat exercitation quis sunt sunt nisi commodo.', 'categories' : [ - 'Shoes', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 9, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -783,74 +793,75 @@ export class ECommerceFakeDb }, { 'id' : '11', - 'name' : 'Brown Shoes', - 'handle' : 'brown-shoes', - 'description' : 'Aute do cupidatat amet excepteur. Adipisicing est exercitation ullamco velit pariatur ex id laborum ex consectetur velit et eiusmod. Do laborum commodo veniam adipisicing aute cillum. Adipisicing est minim voluptate aliqua nostrud.', + 'name' : 'A Walk Amongst Friends - Canvas Print', + 'handle' : 'a-walk-amongst-friends-canvas-print', + 'description' : 'Officia amet eiusmod eu sunt tempor voluptate laboris velit nisi amet enim proident et. Consequat laborum non eiusmod cillum eu exercitation. Qui adipisicing est fugiat eiusmod esse. Sint aliqua cupidatat pariatur mollit ad est proident reprehenderit. Eiusmod adipisicing laborum incididunt sit aliqua ullamco.', 'categories' : [ - 'Shoes', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 1, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], - 'priceTaxExcl' : 48.727, - 'priceTaxIncl' : 53.60, + 'priceTaxExcl' : 9.309, + 'priceTaxIncl' : 10.24, 'taxRate' : 10, - 'comparedPrice' : 69.90, - 'quantity' : 27, + 'comparedPrice' : 19.90, + 'quantity' : 3, 'sku' : 'A445BV', 'width' : '22cm', 'height' : '24cm', @@ -861,74 +872,75 @@ export class ECommerceFakeDb }, { 'id' : '12', - 'name' : 'Night Dress', - 'handle' : 'night-dress', - 'description' : 'Ex culpa et enim aute labore deserunt. Culpa occaecat nostrud culpa elit Lorem deserunt qui nulla ea elit veniam ea. Qui ullamco ullamco minim esse excepteur magna aliquip Lorem tempor ut aliqua sunt ad. Lorem minim tempor aliqua in in. In nisi esse ea eiusmod consequat sint.', + 'name' : 'Never Stop Changing - Canvas Print', + 'handle' : 'never-stop-changing-canvas-print', + 'description' : 'Excepteur commodo ipsum in ex esse elit ea id voluptate id occaecat. Sunt Lorem ipsum ut proident eu aliquip velit non minim. Sunt velit deserunt veniam eu non veniam. Eiusmod sit ex et id incididunt labore aliqua eu aute dolor cillum ex mollit mollit. Incididunt voluptate adipisicing eiusmod non ipsum cupidatat excepteur enim in pariatur eu. Labore dolor qui exercitation amet labore laboris Lorem do adipisicing. Minim non consectetur adipisicing esse ut occaecat incididunt eiusmod commodo et cillum pariatur.', 'categories' : [ - 'Dresses', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 7, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], - 'priceTaxExcl' : 9.309, - 'priceTaxIncl' : 10.24, + 'priceTaxExcl' : 58.372, + 'priceTaxIncl' : 64.21, 'taxRate' : 10, - 'comparedPrice' : 19.90, - 'quantity' : 188, + 'comparedPrice' : 69.90, + 'quantity' : 34, 'sku' : 'A445BV', 'width' : '22cm', 'height' : '24cm', @@ -939,66 +951,146 @@ export class ECommerceFakeDb }, { 'id' : '13', - 'name' : 'Red Hoodie', - 'handle' : 'red-hoodie', - 'description' : 'Aliquip cillum qui in consectetur ullamco ipsum ea esse eu non nostrud cillum velit minim. Deserunt est do non mollit incididunt enim non consectetur dolore ullamco do ad enim aliqua. Velit ipsum duis sunt sint dolore reprehenderit aute sint sunt esse laborum.', + 'name' : 'Morain Lake - Canvas Print', + 'handle' : 'morain-lake-canvas-print', + 'description' : 'Consequat minim velit commodo Lorem ipsum velit elit amet ut. In deserunt id duis nisi labore. Proident cillum et reprehenderit excepteur ex nulla enim.', 'categories' : [ - 'Hoodies', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 9, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', + 'type': 'image' + } + ], + 'priceTaxExcl' : 52.154, + 'priceTaxIncl' : 57.37, + 'taxRate' : 10, + 'comparedPrice' : 59.90, + 'quantity' : 58, + 'sku' : 'A445BV', + 'width' : '22cm', + 'height' : '24cm', + 'depth' : '15cm', + 'weight' : '3kg', + 'extraShippingFee': 3.00, + 'active' : true + }, + { + 'id' : '14', + 'name' : 'Braies Lake - Canvas Print', + 'handle' : 'braies-lake-canvas-print', + 'description' : 'Duis anim est non exercitation consequat. Ullamco ut ipsum dolore est elit est ea elit ad fugiat exercitation. Adipisicing eu ad sit culpa sint. Minim irure Lorem eiusmod minim nisi sit est consectetur.', + 'categories' : [ + 'Canvas Print', + 'Nature' + ], + 'tags' : [ + 'canvas-print', + 'nature' + ], + 'featuredImageId' : 2, + 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', 'type': 'image' }, { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'id' : 1, + 'url' : 'assets/images/ecommerce/braies-lake.jpg', + 'type': 'image' + }, + { + 'id' : 2, + 'url' : 'assets/images/ecommerce/fall-glow.jpg', + 'type': 'image' + }, + { + 'id' : 3, + 'url' : 'assets/images/ecommerce/first-snow.jpg', + 'type': 'image' + }, + { + 'id' : 4, + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', + 'type': 'image' + }, + { + 'id' : 5, + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', + 'type': 'image' + }, + { + 'id' : 6, + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', + 'type': 'image' + }, + { + 'id' : 7, + 'url' : 'assets/images/ecommerce/reaching.jpg', + 'type': 'image' + }, + { + 'id' : 8, + 'url' : 'assets/images/ecommerce/morain-lake.jpg', + 'type': 'image' + }, + { + 'id' : 9, + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], @@ -1006,163 +1098,86 @@ export class ECommerceFakeDb 'priceTaxIncl' : 24.62, 'taxRate' : 10, 'comparedPrice' : 29.90, - 'quantity' : 147, + 'quantity' : 92, 'sku' : 'A445BV', 'width' : '22cm', 'height' : '24cm', 'depth' : '15cm', 'weight' : '3kg', 'extraShippingFee': 3.00, - 'active' : false - }, - { - 'id' : '14', - 'name' : 'Red Hoodie', - 'handle' : 'red-hoodie', - 'description' : 'Proident excepteur consectetur elit eiusmod ipsum in pariatur voluptate laborum ex ullamco. Nisi cupidatat officia veniam eiusmod enim do aute labore dolor in nostrud sunt pariatur ex. Dolore elit non excepteur sint proident aliqua in aliquip irure elit.', - 'categories' : [ - 'Hoodies', - 'Women' - ], - 'tags' : [ - 'dress', - 'printed' - ], - 'images' : [ - { - 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', - 'type': 'image' - }, - { - 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', - 'type': 'image' - }, - { - 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', - 'type': 'image' - }, - { - 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', - 'type': 'image' - }, - { - 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', - 'type': 'image' - }, - { - 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', - 'type': 'image' - }, - { - 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', - 'type': 'image' - }, - { - 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', - 'type': 'image' - }, - { - 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', - 'type': 'image' - } - ], - 'priceTaxExcl' : 44.809, - 'priceTaxIncl' : 49.29, - 'taxRate' : 10, - 'comparedPrice' : 59.90, - 'quantity' : 21, - 'sku' : 'A445BV', - 'width' : '22cm', - 'height' : '24cm', - 'depth' : '15cm', - 'weight' : '3kg', - 'extraShippingFee': 3.00, - 'active' : false + 'active' : true }, { 'id' : '15', - 'name' : 'Summer Dress', - 'handle' : 'summer-dress', - 'description' : 'Exercitation consectetur eiusmod nisi aliqua adipisicing nisi sit eiusmod. Quis ex est in cillum sit consequat ut mollit excepteur ipsum. Culpa Lorem magna cillum qui tempor nisi eiusmod occaecat veniam eiusmod officia culpa. Incididunt est nulla incididunt quis dolore duis id laborum magna veniam velit amet nostrud. Ad deserunt velit dolor irure exercitation reprehenderit nisi occaecat officia anim. Minim eiusmod aliquip eu do ipsum excepteur in reprehenderit voluptate laborum ullamco anim.', + 'name' : 'Lago di Braies - Canvas Print', + 'handle' : 'lago-di-braies-canvas-print', + 'description' : 'Laboris laborum minim qui reprehenderit duis fugiat ea anim labore incididunt duis. Officia adipisicing anim amet in sit aliqua fugiat quis do sint non velit eu. Labore occaecat labore elit voluptate Lorem adipisicing et ipsum id et reprehenderit ullamco. Elit in nulla laborum nulla quis dolor deserunt magna dolor ad anim magna. Esse aute reprehenderit anim sit est et quis est. Ex reprehenderit culpa deserunt qui sint eiusmod reprehenderit ipsum consequat ut.', 'categories' : [ - 'Dresses', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 5, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], - 'priceTaxExcl' : 62.827, - 'priceTaxIncl' : 69.11, + 'priceTaxExcl' : 9.309, + 'priceTaxIncl' : 10.24, 'taxRate' : 10, - 'comparedPrice' : 79.90, - 'quantity' : 10, + 'comparedPrice' : 19.90, + 'quantity' : 19, 'sku' : 'A445BV', 'width' : '22cm', 'height' : '24cm', @@ -1173,229 +1188,74 @@ export class ECommerceFakeDb }, { 'id' : '16', - 'name' : 'Red Hoodie', - 'handle' : 'red-hoodie', - 'description' : 'Deserunt exercitation Lorem est tempor. Elit magna irure dolore pariatur culpa elit labore laborum anim ad excepteur esse. Irure qui proident irure elit exercitation qui cupidatat mollit in excepteur nulla. Laboris exercitation culpa irure non ea in incididunt est. Dolor ipsum proident esse ea ipsum culpa nulla officia ad ipsum excepteur. Commodo veniam cillum non eu anim exercitation.', + 'name' : 'Fall Glow - Canvas Print', + 'handle' : 'fall-glow-canvas-print', + 'description' : 'Sit ipsum esse eu consequat veniam sit consectetur consectetur anim. Ut Lorem dolor ullamco do. Laboris excepteur consectetur tempor nisi commodo amet deserunt duis.', 'categories' : [ - 'Hoodies', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 3, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], - 'priceTaxExcl' : 9.309, - 'priceTaxIncl' : 10.24, + 'priceTaxExcl' : 44.809, + 'priceTaxIncl' : 49.29, 'taxRate' : 10, - 'comparedPrice' : 19.90, - 'quantity' : 68, - 'sku' : 'A445BV', - 'width' : '22cm', - 'height' : '24cm', - 'depth' : '15cm', - 'weight' : '3kg', - 'extraShippingFee': 3.00, - 'active' : true - }, - { - 'id' : '17', - 'name' : 'Printed Dress', - 'handle' : 'printed-dress', - 'description' : 'Labore adipisicing exercitation velit minim nostrud excepteur eu esse. Dolor ullamco exercitation consequat cupidatat amet qui occaecat anim pariatur aute anim enim aute fugiat. Enim sint eiusmod amet nulla consequat aute culpa elit. Laborum laboris duis do quis do dolor incididunt id culpa laborum non est. Commodo ullamco labore duis occaecat est pariatur voluptate occaecat et voluptate occaecat sit.', - 'categories' : [ - 'Dresses', - 'Women' - ], - 'tags' : [ - 'dress', - 'printed' - ], - 'images' : [ - { - 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', - 'type': 'image' - }, - { - 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', - 'type': 'image' - }, - { - 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', - 'type': 'image' - }, - { - 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', - 'type': 'image' - }, - { - 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', - 'type': 'image' - }, - { - 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', - 'type': 'image' - }, - { - 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', - 'type': 'image' - }, - { - 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', - 'type': 'image' - }, - { - 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', - 'type': 'image' - } - ], - 'priceTaxExcl' : 53.963, - 'priceTaxIncl' : 59.36, - 'taxRate' : 10, - 'comparedPrice' : 69.90, - 'quantity' : 66, - 'sku' : 'A445BV', - 'width' : '22cm', - 'height' : '24cm', - 'depth' : '15cm', - 'weight' : '3kg', - 'extraShippingFee': 3.00, - 'active' : false - }, - { - 'id' : '18', - 'name' : 'Blouse', - 'handle' : 'blouse', - 'description' : 'Id dolor sunt deserunt adipisicing nostrud sit enim magna. Eu ut ea qui ullamco aute. Elit do non anim labore culpa aliquip eu ullamco magna aliqua culpa velit. Culpa nisi laboris cupidatat ea in officia est ex.', - 'categories' : [ - 'Dresses', - 'Women' - ], - 'tags' : [ - 'dress', - 'printed' - ], - 'images' : [ - { - 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', - 'type': 'image' - }, - { - 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', - 'type': 'image' - }, - { - 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', - 'type': 'image' - }, - { - 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', - 'type': 'image' - }, - { - 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', - 'type': 'image' - }, - { - 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', - 'type': 'image' - }, - { - 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', - 'type': 'image' - }, - { - 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', - 'type': 'image' - }, - { - 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', - 'type': 'image' - } - ], - 'priceTaxExcl' : 58.372, - 'priceTaxIncl' : 64.21, - 'taxRate' : 10, - 'comparedPrice' : 69.90, + 'comparedPrice' : 59.90, 'quantity' : 60, 'sku' : 'A445BV', 'width' : '22cm', @@ -1406,75 +1266,76 @@ export class ECommerceFakeDb 'active' : true }, { - 'id' : '19', - 'name' : 'Leather Belt', - 'handle' : 'leather-belt', - 'description' : 'Enim adipisicing commodo laboris voluptate minim officia irure aliqua exercitation ad. Laboris in elit culpa aute aliquip ex fugiat enim labore. Ut commodo magna dolore dolore officia exercitation non enim id. Est proident enim incididunt consectetur consequat magna consequat esse veniam ea cillum laboris fugiat incididunt.', + 'id' : '17', + 'name' : 'Lago di Sorapis - Canvas Print', + 'handle' : 'lago-di-sorapis-canvas-print', + 'description' : 'Tempor sunt tempor veniam non culpa excepteur. Ea irure elit non cupidatat cillum dolore. Sit incididunt qui dolore ipsum commodo aliqua amet cupidatat incididunt nisi qui consectetur. Cillum eu aute qui irure aute adipisicing cupidatat magna.', 'categories' : [ - 'Belts', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 6, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], - 'priceTaxExcl' : 63.390, - 'priceTaxIncl' : 69.73, + 'priceTaxExcl' : 53.963, + 'priceTaxIncl' : 59.36, 'taxRate' : 10, - 'comparedPrice' : 79.90, - 'quantity' : 78, + 'comparedPrice' : 69.90, + 'quantity' : 101, 'sku' : 'A445BV', 'width' : '22cm', 'height' : '24cm', @@ -1484,75 +1345,234 @@ export class ECommerceFakeDb 'active' : true }, { - 'id' : '20', - 'name' : 'Leather Belt', - 'handle' : 'leather-belt', - 'description' : 'Id et id ad consequat non exercitation laboris enim. Cillum nulla nulla elit ipsum in aliquip culpa fugiat est nulla id adipisicing et. Occaecat aliqua esse dolor aliquip veniam ad amet nisi ipsum. Et aliquip culpa adipisicing Lorem ipsum aute non dolor eu deserunt ex consequat.', + 'id' : '18', + 'name' : 'Reaching - Canvas Print', + 'handle' : 'reaching-canvas-print', + 'description' : 'Velit cillum cupidatat eiusmod ea quis sit. Consequat dolore elit sunt sunt voluptate irure incididunt consectetur non. Dolore veniam ipsum anim commodo ex. Proident ipsum nostrud ullamco sit. Ad dolore nulla qui mollit laborum ex ipsum.', 'categories' : [ - 'Belts', - 'Women' + 'Canvas Print', + 'Nature' ], 'tags' : [ - 'dress', - 'printed' + 'canvas-print', + 'nature' ], + 'featuredImageId' : 8, 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, { 'id' : 1, - 'url' : 'assets/images/ecommerce/product-image-placeholder.png', + 'url' : 'assets/images/ecommerce/braies-lake.jpg', 'type': 'image' }, { 'id' : 2, - 'url' : 'assets/images/etc/air-balloons.jpg', + 'url' : 'assets/images/ecommerce/fall-glow.jpg', 'type': 'image' }, { 'id' : 3, - 'url' : 'assets/images/etc/avenue.jpg', + 'url' : 'assets/images/ecommerce/first-snow.jpg', 'type': 'image' }, { 'id' : 4, - 'url' : 'assets/images/etc/cactus.jpg', + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', 'type': 'image' }, { 'id' : 5, - 'url' : 'assets/images/etc/early-sunrise.jpg', + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', 'type': 'image' }, { 'id' : 6, - 'url' : 'assets/images/etc/mountain-lake.jpg', + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', 'type': 'image' }, { 'id' : 7, - 'url' : 'assets/images/etc/road-trip.jpg', + 'url' : 'assets/images/ecommerce/reaching.jpg', 'type': 'image' }, { 'id' : 8, - 'url' : 'assets/images/etc/snow.jpg', + 'url' : 'assets/images/ecommerce/morain-lake.jpg', 'type': 'image' }, { 'id' : 9, - 'url' : 'assets/images/etc/tropical-beach.jpg', - 'type': 'image' - }, - { - 'id' : 10, - 'url' : 'assets/images/etc/mountain-sunset.jpg', + 'url' : 'assets/images/ecommerce/yosemite.jpg', 'type': 'image' } ], - 'priceTaxExcl' : 52.154, - 'priceTaxIncl' : 57.37, + 'priceTaxExcl' : 63.390, + 'priceTaxIncl' : 69.73, 'taxRate' : 10, - 'comparedPrice' : 59.90, - 'quantity' : 2, + 'comparedPrice' : 79.90, + 'quantity' : 4, + 'sku' : 'A445BV', + 'width' : '22cm', + 'height' : '24cm', + 'depth' : '15cm', + 'weight' : '3kg', + 'extraShippingFee': 3.00, + 'active' : false + }, + { + 'id' : '19', + 'name' : 'First Snow - Canvas Print', + 'handle' : 'first-snow-canvas-print', + 'description' : 'Incididunt nostrud culpa labore nostrud veniam nostrud dolore velit sunt laborum ad reprehenderit. Excepteur enim irure ut labore elit ut deserunt qui qui consequat quis do nostrud ad. Aliqua dolor labore ut occaecat laborum irure. Aute in deserunt do aute laborum sit et reprehenderit minim voluptate proident do est.', + 'categories' : [ + 'Canvas Print', + 'Nature' + ], + 'tags' : [ + 'canvas-print', + 'nature' + ], + 'featuredImageId' : 4, + 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, + { + 'id' : 1, + 'url' : 'assets/images/ecommerce/braies-lake.jpg', + 'type': 'image' + }, + { + 'id' : 2, + 'url' : 'assets/images/ecommerce/fall-glow.jpg', + 'type': 'image' + }, + { + 'id' : 3, + 'url' : 'assets/images/ecommerce/first-snow.jpg', + 'type': 'image' + }, + { + 'id' : 4, + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', + 'type': 'image' + }, + { + 'id' : 5, + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', + 'type': 'image' + }, + { + 'id' : 6, + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', + 'type': 'image' + }, + { + 'id' : 7, + 'url' : 'assets/images/ecommerce/reaching.jpg', + 'type': 'image' + }, + { + 'id' : 8, + 'url' : 'assets/images/ecommerce/morain-lake.jpg', + 'type': 'image' + }, + { + 'id' : 9, + 'url' : 'assets/images/ecommerce/yosemite.jpg', + 'type': 'image' + } + ], + 'priceTaxExcl' : 62.827, + 'priceTaxIncl' : 69.11, + 'taxRate' : 10, + 'comparedPrice' : 79.90, + 'quantity' : 101, + 'sku' : 'A445BV', + 'width' : '22cm', + 'height' : '24cm', + 'depth' : '15cm', + 'weight' : '3kg', + 'extraShippingFee': 3.00, + 'active' : false + }, + { + 'id' : '20', + 'name' : 'Yosemite - Canvas Print', + 'handle' : 'yosemite-canvas-print', + 'description' : 'Proident do sunt dolor tempor aliquip adipisicing dolor reprehenderit officia proident. Culpa non reprehenderit velit anim consequat velit elit eu culpa quis incididunt id. Eu incididunt exercitation nostrud est mollit officia. Laboris deserunt dolore sit occaecat exercitation quis sunt sunt nisi commodo.', + 'categories' : [ + 'Canvas Print', + 'Nature' + ], + 'tags' : [ + 'canvas-print', + 'nature' + ], + 'featuredImageId' : 9, + 'images' : [ + { + 'id' : 0, + 'url' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg', + 'type': 'image' + }, + { + 'id' : 1, + 'url' : 'assets/images/ecommerce/braies-lake.jpg', + 'type': 'image' + }, + { + 'id' : 2, + 'url' : 'assets/images/ecommerce/fall-glow.jpg', + 'type': 'image' + }, + { + 'id' : 3, + 'url' : 'assets/images/ecommerce/first-snow.jpg', + 'type': 'image' + }, + { + 'id' : 4, + 'url' : 'assets/images/ecommerce/lago-di-braies.jpg', + 'type': 'image' + }, + { + 'id' : 5, + 'url' : 'assets/images/ecommerce/lago-di-sorapis.jpg', + 'type': 'image' + }, + { + 'id' : 6, + 'url' : 'assets/images/ecommerce/never-stop-changing.jpg', + 'type': 'image' + }, + { + 'id' : 7, + 'url' : 'assets/images/ecommerce/reaching.jpg', + 'type': 'image' + }, + { + 'id' : 8, + 'url' : 'assets/images/ecommerce/morain-lake.jpg', + 'type': 'image' + }, + { + 'id' : 9, + 'url' : 'assets/images/ecommerce/yosemite.jpg', + 'type': 'image' + } + ], + 'priceTaxExcl' : 62.18, + 'priceTaxIncl' : 68.40, + 'taxRate' : 10, + 'comparedPrice' : 69.90, + 'quantity' : 125, 'sku' : 'A445BV', 'width' : '22cm', 'height' : '24cm', @@ -1595,27 +1615,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -1679,27 +1699,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -1763,27 +1783,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -1847,27 +1867,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -1931,27 +1951,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2015,27 +2035,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2099,27 +2119,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2183,27 +2203,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2267,27 +2287,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2351,27 +2371,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2435,27 +2455,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2519,27 +2539,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2603,27 +2623,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2687,27 +2707,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2771,27 +2791,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2855,27 +2875,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -2939,27 +2959,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -3023,27 +3043,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -3107,27 +3127,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ @@ -3191,27 +3211,27 @@ export class ECommerceFakeDb 'products' : [ { 'id' : 1, - 'name' : 'Printed Dress', + 'name' : 'A Walk Amongst Friends - Canvas Print', 'price' : '10.24', 'quantity': 1, 'total' : '10.24', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/a-walk-amongst-friends.jpg' }, { 'id' : 2, - 'name' : 'Green Skirt', + 'name' : 'Lago di Braies - Canvas Print', 'price' : '24.62', 'quantity': 1, 'total' : '24.62', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/lago-di-braies.jpg' }, { 'id' : 3, - 'name' : 'Printed Dress', + 'name' : 'Never Stop Changing - Canvas Print', 'price' : '49.29', 'quantity': 1, 'total' : '49.29', - 'image' : 'assets/images/ecommerce/product-image-placeholder.png' + 'image' : 'assets/images/ecommerce/never-stop-changing.jpg' } ], 'status' : [ diff --git a/src/app/fake-db/mail.ts b/src/app/fake-db/mail.ts index e0b5c0ab..21f0d9f2 100644 --- a/src/app/fake-db/mail.ts +++ b/src/app/fake-db/mail.ts @@ -25,23 +25,22 @@ export class MailFakeDb { 'type' : 'image', 'fileName': 'flowers', - 'preview' : 'assets/images/etc/flowers-thumb.jpg', + 'preview' : 'assets/images/mail/attachment-1.jpg', 'url' : '', 'size' : '1.1Mb' }, { 'type' : 'image', 'fileName': 'snow', - 'preview' : 'assets/images/etc/snow-thumb.jpg', + 'preview' : 'assets/images/mail/attachment-2.jpg', 'url' : '', 'size' : '380kb' }, { 'type' : 'image', 'fileName': 'sunrise', - 'preview' : 'assets/images/etc/sunrise-thumb.jpg', - 'url' : 'assets/images/etc/early-sunrise.jpg', - 'size' : '17Mb' + 'preview' : 'assets/images/mail/attachment-3.jpg', + 'size': '17Mb' } ], 'labels' : [ diff --git a/src/app/fake-db/scrumboard.ts b/src/app/fake-db/scrumboard.ts index e055fabd..ddb06cbd 100644 --- a/src/app/fake-db/scrumboard.ts +++ b/src/app/fake-db/scrumboard.ts @@ -94,14 +94,14 @@ export class ScrumboardFakeDb 'id' : '67027cahbe3b52ecf2dc631c', 'name': 'mail.jpg', 'src' : 'assets/images/scrumboard/mail.jpg', - 'time': 'Added Nov 3 at 15:22AM', + 'time': 'Nov 3 at 15:22AM', 'type': 'image' }, { 'id' : '56027cfcbe1b72ecf1fc452a', 'name': 'calendar.jpg', 'src' : 'assets/images/scrumboard/calendar.jpg', - 'time': 'Added Nov 1 at 12:34PM', + 'time': 'Nov 1 at 12:34PM', 'type': 'image' } ], @@ -383,14 +383,14 @@ export class ScrumboardFakeDb 'id' : '12027cafbe3b52ecf2ef632c', 'name': 'header-.jpg', 'src' : 'assets/images/scrumboard/header-1.jpg', - 'time': 'Added Nov 3 at 15:22AM', + 'time': 'Nov 3 at 15:22AM', 'type': 'image' }, { 'id' : '55027ced1e1a12ecf1fced2a', 'name': 'header-2.jpg', 'src' : 'assets/images/scrumboard/header-2.jpg', - 'time': 'Added Nov 1 at 12:34PM', + 'time': 'Nov 1 at 12:34PM', 'type': 'image' } ], @@ -628,13 +628,13 @@ export class ScrumboardFakeDb 'id' : '56027cfcbe1b72ecf1fc452a', 'name': 'calendar-app-design.jpg', 'src' : 'assets/images/scrumboard/calendar.jpg', - 'time': 'Added Nov 1 at 12:34PM', + 'time': 'Nov 1 at 12:34PM', 'type': 'image' }, { 'id' : '67027cahbe3b52ecf2dc631c', 'url' : 'assets/images/scrumboard/calendar.jpg', - 'time': 'Added Nov 3 at 15:22AM', + 'time': 'Nov 3 at 15:22AM', 'type': 'link' } ], @@ -730,7 +730,7 @@ export class ScrumboardFakeDb 'id' : '5603a2ae2bbd55bb2db57478', 'name': 'mail-app-design.jpg', 'src' : 'assets/images/scrumboard/mail.jpg', - 'time': 'Added Nov 1 at 12:34PM', + 'time': 'Nov 1 at 12:34PM', 'type': 'image' } ], diff --git a/src/app/layout/components/chat-panel/chat-panel.component.scss b/src/app/layout/components/chat-panel/chat-panel.component.scss index 4e8eff6c..7ea4f187 100644 --- a/src/app/layout/components/chat-panel/chat-panel.component.scss +++ b/src/app/layout/components/chat-panel/chat-panel.component.scss @@ -10,7 +10,7 @@ chat-panel { z-index: 99; overflow: hidden; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { max-width: none !important; width: 100% !important; } @@ -381,7 +381,7 @@ fuse-sidebar { min-width: 360px; max-width: 360px; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { min-width: 0 !important; max-width: 100vw !important; width: 100vw !important; diff --git a/src/app/layout/components/content/content.module.ts b/src/app/layout/components/content/content.module.ts index 410b821c..7d8c9888 100644 --- a/src/app/layout/components/content/content.module.ts +++ b/src/app/layout/components/content/content.module.ts @@ -11,9 +11,9 @@ import { ContentComponent } from 'app/layout/components/content/content.componen ], imports : [ RouterModule, - FuseSharedModule, + FuseSharedModule ], - exports: [ + exports : [ ContentComponent ] }) diff --git a/src/app/layout/components/footer/footer.component.html b/src/app/layout/components/footer/footer.component.html index 93cffc40..b03c42d4 100644 --- a/src/app/layout/components/footer/footer.component.html +++ b/src/app/layout/components/footer/footer.component.html @@ -15,7 +15,6 @@ Changelog
-
diff --git a/src/app/layout/components/navbar/vertical/style-1/style-1.component.html b/src/app/layout/components/navbar/vertical/style-1/style-1.component.html index c6effb77..d56f7350 100644 --- a/src/app/layout/components/navbar/vertical/style-1/style-1.component.html +++ b/src/app/layout/components/navbar/vertical/style-1/style-1.component.html @@ -36,7 +36,7 @@
diff --git a/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss b/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss index d1aef361..5e9b1ba2 100644 --- a/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss +++ b/src/app/layout/components/navbar/vertical/style-1/style-1.component.scss @@ -61,6 +61,19 @@ fuse-sidebar { .navbar-content { padding-top: 0; + + // Material 2 specific style + .material2 { + + .nav-item { + + .nav-link { + border-radius: 20px; + margin: 0 12px; + padding: 0 12px; + } + } + } } } } diff --git a/src/app/layout/components/navbar/vertical/style-2/style-2.component.scss b/src/app/layout/components/navbar/vertical/style-2/style-2.component.scss index b4c466a2..658b7193 100644 --- a/src/app/layout/components/navbar/vertical/style-2/style-2.component.scss +++ b/src/app/layout/components/navbar/vertical/style-2/style-2.component.scss @@ -22,6 +22,22 @@ fuse-sidebar { } } } + + .navbar-content { + + // Material 2 specific style + .material2 { + + .nav-item { + + .nav-link { + border-radius: 20px; + margin: 0 12px; + padding: 0 12px; + } + } + } + } } } } diff --git a/src/app/layout/components/toolbar/toolbar.component.scss b/src/app/layout/components/toolbar/toolbar.component.scss index 218aa9ba..5b7b3150 100644 --- a/src/app/layout/components/toolbar/toolbar.component.scss +++ b/src/app/layout/components/toolbar/toolbar.component.scss @@ -33,7 +33,7 @@ toolbar { min-width: 64px; height: 64px; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { height: 56px; } } @@ -47,7 +47,7 @@ toolbar { height: 64px; width: 1px; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { height: 56px; } } diff --git a/src/app/main/apps/academy/course/course.component.scss b/src/app/main/apps/academy/course/course.component.scss index 07387f82..b8a3e472 100644 --- a/src/app/main/apps/academy/course/course.component.scss +++ b/src/app/main/apps/academy/course/course.component.scss @@ -144,7 +144,8 @@ max-width: 720px; margin: 0 auto; width: 100%; - @include mat-elevation(4); + border-radius: 8px; + @include mat-elevation(1); } } } diff --git a/src/app/main/apps/academy/courses/courses.component.html b/src/app/main/apps/academy/courses/courses.component.html index 1dbac2e1..760a8d4c 100644 --- a/src/app/main/apps/academy/courses/courses.component.html +++ b/src/app/main/apps/academy/courses/courses.component.html @@ -25,16 +25,15 @@
- - - + Search for a course + - - - - + Category + All @@ -43,7 +42,6 @@ {{ category.label }} -
diff --git a/src/app/main/apps/academy/courses/courses.component.scss b/src/app/main/apps/academy/courses/courses.component.scss index 05a95def..d7fa05e5 100644 --- a/src/app/main/apps/academy/courses/courses.component.scss +++ b/src/app/main/apps/academy/courses/courses.component.scss @@ -35,7 +35,7 @@ margin-top: 0; margin-bottom: 16px; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { font-size: 24px; } } @@ -47,7 +47,7 @@ letter-spacing: 0.03em; margin: 0; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { font-size: 14px; } } @@ -57,7 +57,7 @@ .content { .category-selector { - min-width: 200px; + min-width: 320px; } .filters { @@ -66,18 +66,14 @@ margin: 24px auto; padding: 0 20px; - @include media-breakpoint-down('xs') { + @include media-breakpoint('xs') { margin: 0 auto; } .course-search { - width: 200px; + width: 320px; - @include media-breakpoint-down('xs') { - margin-bottom: 16px; - } - - @include media-breakpoint-up('sm') { + @include media-breakpoint('gt-xs') { margin-right: 16px; } } @@ -100,15 +96,17 @@ &:hover { .course-content { - @include mat-elevation(8); + border: none; + @include mat-elevation(12); } } .course-content { min-height: 240px; - transition: box-shadow 150ms ease-in-out; - - @include mat-elevation(3); + border-radius: 4px; + overflow: hidden; + transition: box-shadow 200ms ease-in-out; + @include mat-elevation(1); .header { padding: 16px 24px; diff --git a/src/app/main/apps/calendar/calendar.component.scss b/src/app/main/apps/calendar/calendar.component.scss index f1ba6f0f..57a5da3d 100644 --- a/src/app/main/apps/calendar/calendar.component.scss +++ b/src/app/main/apps/calendar/calendar.component.scss @@ -20,13 +20,14 @@ min-height: 200px; } - &.cal-open { - @include mat-elevation(3); + &.cal-selected { + border: none; + @include mat-elevation(9); } } .cal-open-day-events { - box-shadow: inset 0 0 12px 0 rgba(0, 0, 0, 0.54); + box-shadow: inset 0 0 2px 0 rgba(0, 0, 0, 0.54); padding: 0; display: flex; flex-direction: column; diff --git a/src/app/main/apps/calendar/calendar.component.ts b/src/app/main/apps/calendar/calendar.component.ts index 94074ddd..ddd01d2e 100644 --- a/src/app/main/apps/calendar/calendar.component.ts +++ b/src/app/main/apps/calendar/calendar.component.ts @@ -111,7 +111,6 @@ export class CalendarComponent implements OnInit */ beforeMonthViewRender({header, body}): void { - // console.info('beforeMonthViewRender'); /** * Get the selected day */ @@ -122,10 +121,10 @@ export class CalendarComponent implements OnInit if ( _selectedDay ) { /** - * Set selectedday style + * Set selected day style * @type {string} */ - _selectedDay.cssClass = 'mat-elevation-z3'; + _selectedDay.cssClass = 'cal-selected'; } } 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 33b0e7d1..5909bb91 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 @@ -8,36 +8,26 @@ -
+
- + + Title -
- - All Day - -
+
-
- - + + Primary color - + + Secondary color +
+ + + All Day + + +
+
- - + + Start date + - - + + Start time +
- - + + End date + - - + + End time +
- + + Location + formControlName="location"> - - + + Notes @@ -113,32 +110,34 @@
-
- - +
- - + + + + +
diff --git a/src/app/main/apps/calendar/event-form/event-form.component.scss b/src/app/main/apps/calendar/event-form/event-form.component.scss index 8449592f..57bfbe2a 100644 --- a/src/app/main/apps/calendar/event-form/event-form.component.scss +++ b/src/app/main/apps/calendar/event-form/event-form.component.scss @@ -6,7 +6,7 @@ width: 100%; } - @include media-breakpoint-up('xs') { + @include media-breakpoint('gt-xs') { width: 480px; } diff --git a/src/app/main/apps/chat/chat-start/chat-start.component.html b/src/app/main/apps/chat/chat-start/chat-start.component.html index 627f8a38..a606bcbc 100644 --- a/src/app/main/apps/chat/chat-start/chat-start.component.html +++ b/src/app/main/apps/chat/chat-start/chat-start.component.html @@ -1,13 +1,13 @@
- - Chat App + + Chat App + Select a contact to start a chat! diff --git a/src/app/main/apps/chat/chat-start/chat-start.component.scss b/src/app/main/apps/chat/chat-start/chat-start.component.scss index e8fb05ef..9e16ba39 100644 --- a/src/app/main/apps/chat/chat-start/chat-start.component.scss +++ b/src/app/main/apps/chat/chat-start/chat-start.component.scss @@ -10,8 +10,9 @@ chat-start { height: 240px; line-height: 240px; text-align: center; + border: 1px solid; - @include media-breakpoint-down('sm') { + @include media-breakpoint('lt-md') { width: 160px; height: 160px; line-height: 160px; diff --git a/src/app/main/apps/chat/chat-view/chat-view.component.scss b/src/app/main/apps/chat/chat-view/chat-view.component.scss index a61ac0ca..f4ac17d2 100644 --- a/src/app/main/apps/chat/chat-view/chat-view.component.scss +++ b/src/app/main/apps/chat/chat-view/chat-view.component.scss @@ -190,7 +190,7 @@ chat-view { padding: 0; border: none; border-radius: 20px; - @include mat-elevation(2); + border: 1px solid; textarea { overflow: hidden; diff --git a/src/app/main/apps/chat/chat.component.scss b/src/app/main/apps/chat/chat.component.scss index 7cc5db7d..be0f46b3 100644 --- a/src/app/main/apps/chat/chat.component.scss +++ b/src/app/main/apps/chat/chat.component.scss @@ -7,14 +7,15 @@ max-width: 1400px; margin: 0 auto; - @include media-breakpoint-down(md) { + @include media-breakpoint('lt-lg') { padding: 0 !important; } .content-card { + position: relative; display: flex; flex: 1; - position: relative; + border-radius: 8px; .mat-sidenav-container { display: flex; @@ -38,7 +39,6 @@ flex-direction: column; width: 400px; max-width: 90%; - box-shadow: 0 0 1px rgba(0, 0, 0, 0.37); overflow: hidden; } } diff --git a/src/app/main/apps/chat/chat.theme.scss b/src/app/main/apps/chat/chat.theme.scss index 7d5fceb9..dd17cf65 100644 --- a/src/app/main/apps/chat/chat.theme.scss +++ b/src/app/main/apps/chat/chat.theme.scss @@ -11,6 +11,7 @@ .big-circle { background: map-get($background, card); + border-color: map-get($foreground, divider); } } @@ -60,6 +61,8 @@ .mat-form-field-flex { .mat-form-field-infix { + border-color: map-get($foreground, divider); + @if ($is-dark == true) { background-color: map-get($background, hover); } @else { @@ -84,6 +87,7 @@ .search { background: map-get($background, background); + border-color: map-get($foreground, divider); input { background: map-get($background, background); diff --git a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html index 3ee0770a..9faeb2eb 100644 --- a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html +++ b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.html @@ -81,12 +81,10 @@
+
@@ -120,27 +118,29 @@
- {{contacts | getById:chat.contactId:'name'}}
-
+
{{contacts | getById:chat.contactId:'name'}}
{{chat.lastMessage}}
-
+
{{chat.lastMessageTime | date}}
-
{{chat.unread}}
+
{{chat.unread}}
+
+
+
@@ -159,17 +159,21 @@ [@animate]="{value:'*',params:{y:'100%'}}">
+
{{contact.name}}
-
+
{{contact.name}}

{{contact.mood}}

+
+ +
diff --git a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss index f432f300..9473f60a 100644 --- a/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss +++ b/src/app/main/apps/chat/sidenavs/left/chats/chats.component.scss @@ -23,14 +23,16 @@ chat-chats-sidenav { line-height: 36px; padding: 8px; font-size: 13px; - @include mat-elevation(1); + border-radius: 18px; + border: 1px solid; + overflow: hidden; - .icon { + .mat-icon { margin: 0; } input { - padding-left: 12px; + padding: 0 12px 0 8px; height: 36px; border: none; } @@ -61,6 +63,7 @@ chat-chats-sidenav { border-bottom: 1px solid; padding: 16px; font-weight: 400; + border-radius: 0; .avatar-wrapper { @@ -80,17 +83,23 @@ chat-chats-sidenav { margin-top: 0; } + .contact-last-message-time { + font-size: 12px; + margin-top: 4px; + } + .contact-mood { line-height: normal; - margin-top: 0; + margin: 0; } .unread-message-count { + font-size: 12px; border-radius: 50%; text-align: center; - width: 24px; - height: 24px; - line-height: 24px; + width: 20px; + height: 20px; + line-height: 20px; } } } diff --git a/src/app/main/apps/chat/sidenavs/left/user/user.component.html b/src/app/main/apps/chat/sidenavs/left/user/user.component.html index 448b1cfc..c09cb743 100644 --- a/src/app/main/apps/chat/sidenavs/left/user/user.component.html +++ b/src/app/main/apps/chat/sidenavs/left/user/user.component.html @@ -33,9 +33,9 @@ - - + + Mood + diff --git a/src/app/main/apps/contacts/contact-form/contact-form.component.html b/src/app/main/apps/contacts/contact-form/contact-form.component.html index c42f48ba..89a19a69 100644 --- a/src/app/main/apps/contacts/contact-form/contact-form.component.html +++ b/src/app/main/apps/contacts/contact-form/contact-form.component.html @@ -14,79 +14,88 @@ -
+
-
- +
+ + Name account_circle - +
-
- +
+ + Lastname account_circle - +
-
- +
+ + Nickname star - +
-
- +
+ + Phone number phone - +
-
- +
+ + Email email - +
-
- +
+ + Company domain - +
-
- +
+ + Job title work - +
-
- +
+ + Birthday cake - +
-
- +
+ + Address home - +
- - + + Notes +
@@ -94,32 +103,33 @@
-
+
- - - - - + + + +
diff --git a/src/app/main/apps/contacts/contact-form/contact-form.component.scss b/src/app/main/apps/contacts/contact-form/contact-form.component.scss index d3bebe31..103c1e78 100644 --- a/src/app/main/apps/contacts/contact-form/contact-form.component.scss +++ b/src/app/main/apps/contacts/contact-form/contact-form.component.scss @@ -6,7 +6,7 @@ width: 100%; } - @include media-breakpoint-up('xs') { + @include media-breakpoint('gt-xs') { width: 400px; } diff --git a/src/app/main/apps/contacts/contact-list/contact-list.component.html b/src/app/main/apps/contacts/contact-list/contact-list.component.html index 9427cc7b..61949fa7 100644 --- a/src/app/main/apps/contacts/contact-list/contact-list.component.html +++ b/src/app/main/apps/contacts/contact-list/contact-list.component.html @@ -74,7 +74,7 @@
@@ -25,13 +25,17 @@ -
- - - - +
+ +
+ + + +
+
@@ -61,7 +65,7 @@
-
+
diff --git a/src/app/main/apps/contacts/contacts.component.scss b/src/app/main/apps/contacts/contacts.component.scss index cb752a8d..20964802 100644 --- a/src/app/main/apps/contacts/contacts.component.scss +++ b/src/app/main/apps/contacts/contacts.component.scss @@ -1,5 +1,34 @@ +@import "src/@fuse/scss/fuse"; + #contacts { + .header { + + .search-wrapper { + width: 100%; + max-width: 480px; + border-radius: 28px; + overflow: hidden; + @include mat-elevation(1); + + .search { + width: 100%; + height: 48px; + line-height: 48px; + padding: 0 18px; + + input { + height: 48px; + min-height: 48px; + max-height: 48px; + padding: 0 16px; + border: none; + outline: none; + } + } + } + } + .content { overflow: hidden; diff --git a/src/app/main/apps/contacts/contacts.theme.scss b/src/app/main/apps/contacts/contacts.theme.scss index 59a7abbc..160cd1df 100644 --- a/src/app/main/apps/contacts/contacts.theme.scss +++ b/src/app/main/apps/contacts/contacts.theme.scss @@ -1,10 +1,30 @@ @mixin contacts-theme($theme) { $background: map-get($theme, background); + $foreground: map-get($theme, foreground); $is-dark: map-get($theme, is-dark); #contacts { + .header { + + .search-wrapper { + background: map-get($background, card); + + .search { + + .mat-icon { + color: map-get($foreground, icon); + } + + input { + background: map-get($background, card); + color: map-get($foreground, text); + } + } + } + } + .content { .sidebar { diff --git a/src/app/main/apps/contacts/sidebars/main/main.component.html b/src/app/main/apps/contacts/sidebars/main/main.component.html index 7dec5d80..25706056 100644 --- a/src/app/main/apps/contacts/sidebars/main/main.component.html +++ b/src/app/main/apps/contacts/sidebars/main/main.component.html @@ -16,7 +16,7 @@
- diff --git a/src/app/main/apps/dashboards/project/project.component.scss b/src/app/main/apps/dashboards/project/project.component.scss index f886160c..baba5dc0 100644 --- a/src/app/main/apps/dashboards/project/project.component.scss +++ b/src/app/main/apps/dashboards/project/project.component.scss @@ -20,12 +20,13 @@ height: 40px; line-height: 24px; font-size: 16px; + border-radius: 8px 0 0 0; } .project-selector { margin-left: 1px; - border-radius: 0; background: rgba(0, 0, 0, 0.12); + border-radius: 0 8px 0 0; mat-icon { color: #FFFFFF; diff --git a/src/app/main/apps/dashboards/project/project.theme.scss b/src/app/main/apps/dashboards/project/project.theme.scss index 2051486f..022c8083 100644 --- a/src/app/main/apps/dashboards/project/project.theme.scss +++ b/src/app/main/apps/dashboards/project/project.theme.scss @@ -5,21 +5,6 @@ #dashboard-project { - > .sidebar { - - fuse-widget { - - > .fuse-widget-front, - > .fuse-widget-back { - @if ($is-dark) { - background: map-get($background, background); - } @else { - background: map-get($background, app-bar); - } - } - } - } - > .center { > .content { diff --git a/src/app/main/apps/e-commerce/e-commerce.module.ts b/src/app/main/apps/e-commerce/e-commerce.module.ts index 8bb0f524..1cd1bec1 100644 --- a/src/app/main/apps/e-commerce/e-commerce.module.ts +++ b/src/app/main/apps/e-commerce/e-commerce.module.ts @@ -1,7 +1,8 @@ import { NgModule } from '@angular/core'; import { RouterModule, Routes } from '@angular/router'; import { - MatButtonModule, MatChipsModule, MatFormFieldModule, MatIconModule, MatInputModule, MatPaginatorModule, MatRippleModule, MatSelectModule, MatSnackBarModule, MatSortModule, + MatButtonModule, MatChipsModule, MatExpansionModule, MatFormFieldModule, MatIconModule, MatInputModule, MatPaginatorModule, MatRippleModule, MatSelectModule, MatSnackBarModule, + MatSortModule, MatTableModule, MatTabsModule } from '@angular/material'; import { NgxChartsModule } from '@swimlane/ngx-charts'; @@ -69,6 +70,7 @@ const routes: Routes = [ MatButtonModule, MatChipsModule, + MatExpansionModule, MatFormFieldModule, MatIconModule, MatInputModule, diff --git a/src/app/main/apps/e-commerce/order/order.component.html b/src/app/main/apps/e-commerce/order/order.component.html index 2d9c5cc8..26acee79 100644 --- a/src/app/main/apps/e-commerce/order/order.component.html +++ b/src/app/main/apps/e-commerce/order/order.component.html @@ -53,7 +53,7 @@
Customer
-
+
@@ -88,9 +88,14 @@
- + + + + + + Shipping Address + -
{{order.customer.shippingAddress.address}}
@@ -102,9 +107,15 @@
-
- +
+ + + + + Invoice Address + +
{{order.customer.invoiceAddress.address}}
@@ -116,8 +127,11 @@
- -
+ + + + +
@@ -156,9 +170,10 @@ [formGroup]="statusForm" fxLayout="row" fxLayoutAlign="start center"> - + + Status + required> {{status.name}} @@ -265,21 +280,21 @@ - - + + - - + + - -
IDImageIDImage NamePriceQuantityPriceQuantity
+ {{product.id}} + diff --git a/src/app/main/apps/e-commerce/orders/orders.component.html b/src/app/main/apps/e-commerce/orders/orders.component.html index 4decbf96..cb26fb66 100644 --- a/src/app/main/apps/e-commerce/orders/orders.component.html +++ b/src/app/main/apps/e-commerce/orders/orders.component.html @@ -13,9 +13,9 @@ fxLayout.gt-xs="row" fxLayoutAlign.gt-xs="space-between center"> -