Merge branch 'master' of https://github.com/mohiit1502/PictureStory

.editorconfig

@@ -1,4 +1,4 @@
-# Editor configuration, see http://editorconfig.org
+# Editor configuration, see https://editorconfig.org
 root = true
 
 [*]

.gitignore

@@ -60,3 +60,36 @@ typings/
 # next.js build output
 .next
 
+# See http://help.github.com/ignore-files/ for more about ignoring files.
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# IDEs and editors
+/.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+/.sass-cache
+/connect.lock
+/coverage
+/libpeerconnection.log
+testem.log
+
+# System Files
+.DS_Store
+Thumbs.db

README.md

@@ -1,6 +1,6 @@
 # PictureStory
 
-This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 6.0.8.
+This project was generated with [Angular CLI](https://github.com/angular/angular-cli) version 7.0.7.
 
 ## Development server
 

angular.json

@@ -58,7 +58,14 @@
               "aot": true,
               "extractLicenses": true,
               "vendorChunk": false,
-              "buildOptimizer": true
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                }
+              ]
             }
           }
         },
@@ -113,6 +120,7 @@
     "PictureStory-e2e": {
       "root": "e2e/",
       "projectType": "application",
+      "prefix": "",
       "architect": {
         "e2e": {
           "builder": "@angular-devkit/build-angular:protractor",

e2e/src/app.e2e-spec.ts

@@ -9,6 +9,6 @@ describe('workspace-project App', () => {
 
   it('should display welcome message', () => {
     page.navigateTo();
-    expect(page.getParagraphText()).toEqual('Welcome to PictureStory!');
+    expect(page.getTitleText()).toEqual('Welcome to PictureStory!');
   });
 });

e2e/src/app.po.ts

@@ -5,7 +5,7 @@ export class AppPage {
     return browser.get('/');
   }
 
-  getParagraphText() {
+  getTitleText() {
     return element(by.css('app-root h1')).getText();
   }
 }

package.json

@@ -11,45 +11,45 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^6.1.10",
+    "@angular/animations": "~7.0.0",
-    "@angular/cdk": "^7.0.1",
+    "@angular/cdk": "^7.0.4",
-    "@angular/common": "^6.0.3",
+    "@angular/common": "~7.0.0",
-    "@angular/compiler": "^6.0.3",
+    "@angular/compiler": "~7.0.0",
-    "@angular/core": "^6.0.3",
+    "@angular/core": "~7.0.0",
-    "@angular/forms": "^6.0.3",
+    "@angular/forms": "~7.0.0",
-    "@angular/http": "^6.0.3",
+    "@angular/http": "~7.0.0",
-    "@angular/material": "^7.0.1",
+    "@angular/material": "^7.0.4",
-    "@angular/platform-browser": "^6.0.3",
+    "@angular/platform-browser": "~7.0.0",
-    "@angular/platform-browser-dynamic": "^6.0.3",
+    "@angular/platform-browser-dynamic": "~7.0.0",
-    "@angular/router": "^6.0.3",
+    "@angular/router": "~7.0.0",
-    "@material/card": "^0.41.0",
+    "@material/card": "^3.2.0",
-    "bootstrap": "^4.1.3",
+    "bootstrap": "^4.3.1",
     "core-js": "^2.5.4",
     "font-awesome": "^4.7.0",
     "imagemagick": "^0.1.3",
-    "jquery": "^3.3.1",
+    "jquery": "^3.4.1",
-    "rxjs": "^6.0.0",
+    "rxjs": "~6.3.3",
-    "zone.js": "^0.8.26"
+    "zone.js": "~0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.6.8",
+    "@angular-devkit/build-angular": "~0.10.0",
-    "@angular/cli": "~6.0.8",
+    "@angular/cli": "~7.0.7",
-    "@angular/compiler-cli": "^6.0.3",
+    "@angular/compiler-cli": "~7.0.0",
-    "@angular/language-service": "^6.0.3",
+    "@angular/language-service": "~7.0.0",
-    "@types/jasmine": "~2.8.6",
+    "@types/jasmine": "~2.8.8",
     "@types/jasminewd2": "~2.0.3",
     "@types/node": "~8.9.4",
-    "codelyzer": "~4.2.1",
+    "codelyzer": "~4.5.0",
     "jasmine-core": "~2.99.1",
     "jasmine-spec-reporter": "~4.2.1",
-    "karma": "~1.7.1",
+    "karma": "~3.0.0",
     "karma-chrome-launcher": "~2.2.0",
-    "karma-coverage-istanbul-reporter": "~2.0.0",
+    "karma-coverage-istanbul-reporter": "~2.0.1",
-    "karma-jasmine": "~1.1.1",
+    "karma-jasmine": "~1.1.2",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "protractor": "^5.4.1",
+    "protractor": "~5.4.0",
-    "ts-node": "~5.0.1",
+    "ts-node": "~7.0.0",
-    "tslint": "~5.9.1",
+    "tslint": "~5.11.0",
-    "typescript": "~2.7.2"
+    "typescript": "~3.1.6"
   }
 }

src/app/content/image-container/image/image.component.html

@@ -17,7 +17,7 @@
 
 <mat-card class="card">
   <mat-card-header>
-    <div mat-card-avatar class="header-image"></div>
+    <div mat-card-avatar [ngStyle]="{background: 'url(' + image.imageUrl + ')'}" class="header-image"></div>
     <mat-card-title>{{image.imageTitle}}</mat-card-title>
     <mat-card-subtitle>Nature</mat-card-subtitle>
   </mat-card-header>

src/app/content/image-container/image/image.component.scss

@@ -15,19 +15,19 @@
     overflow: auto
 }
 
-.image-card {
+// .image-card {
-    max-width: 400px;
+//     max-width: 400px;
-}
+// }
 
-.image {
+// .image {
-    background-image: url('https://material.angular.io/assets/img/examples/shiba1.jpg');
+//     background-image: url('https://material.angular.io/assets/img/examples/shiba1.jpg');
-    background-size: cover;
+//     background-size: cover;
-    max-width: 400px;
+//     max-width: 400px;
-}
+// }
   
 .header-image {
-    background-image: url('https://material.angular.io/assets/img/examples/shiba1.jpg');
+    // background-image: url('https://material.angular.io/assets/img/examples/shiba1.jpg');
-    background-size: cover;
+    background-size: contain;
 }
 
 mat-divider {

tsconfig.json

@@ -5,6 +5,7 @@
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
     "declaration": false,
+    "module": "es2015",
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
@@ -13,7 +14,7 @@
       "node_modules/@types"
     ],
     "lib": [
-      "es2017",
+      "es2018",
       "dom"
     ]
   }

tslint.json

@@ -65,6 +65,7 @@
     ],
     "no-misused-new": true,
     "no-non-null-assertion": true,
+    "no-redundant-jsdoc": true,
     "no-shadowed-variable": true,
     "no-string-literal": false,
     "no-string-throw": true,