* angular2 uplift to version 5

* meta tag stuff added
* ssr changes for universal

.angular-cli.json

@@ -6,7 +6,7 @@
   "apps": [
     {
       "root": "src",
-      "outDir": "dist",
+      "outDir": "dist/browser",
       "assets": [
         "assets",
         "favicon.ico"
@@ -32,12 +32,14 @@
     },
     {
       "name": "ssr",
+      "platform": "server",
       "root": "src",
-      "outDir": "dist-ssr",
+      "outDir": "dist/server",
       "assets": [
         "assets",
         "favicon.ico"
       ],
+      "index": "index.html",
       "main": "main-ssr.ts",
       "tsconfig": "tsconfig.app-ssr.json",
       "prefix": "app",
@@ -51,8 +53,7 @@
       "environments": {
         "dev": "environments/environment.ts",
         "prod": "environments/environment.prod.ts"
-      },
-      "platform": "server"
+      }
     }
   ],
   "e2e": {

deploy.php

@@ -20,17 +20,18 @@ host('alfheim.ragnarok.yvan.hu')
     ->stage('production')
     ->user('yvan')
     ->forwardAgent()
-    ->set('ng_target', 'production')
-    ->set('ng_environment', 'prod')
+//    ->set('ng_target', 'production')
+//    ->set('ng_environment', 'prod')
     ->set('env_vars', 'NODE_ENV=production')
     ->set('deploy_path', '/var/www/photos/frontend');
 
 // Tasks
 desc('Prepare release');
 task('deploy:ng-prepare', function() {
-    runLocally("ng build --target={{ng_target}} --environment={{ng_environment}}");
-    runLocally("ng build --target={{ng_target}} --environment={{ng_environment}} --app ssr --output-hashing=none");
-    runLocally("tar -cJf dist.tar.xz dist dist-ssr render.js package.json pm2.json");
+    runLocally("npm run build:ssr");
+//    runLocally("ng build --target={{ng_target}} --environment={{ng_environment}}");
+//    runLocally("ng build --target={{ng_target}} --environment={{ng_environment}} --app ssr --output-hashing=none");
+    runLocally("tar -cJf dist.tar.xz dist server.js package.json pm2.json");
 });
 
 desc('Upload release');

package.json

@@ -5,49 +5,53 @@
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
-    "build": "ng build",
+    "build": "ng build --prod",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "sbuild": "ng build --aot && ng build --aot --app ssr"
+    "build:ssr": "npm run build:client-and-server-bundles",
+    "serve:ssr": "node dist/server.js",
+    "build:client-and-server-bundles": "ng build --prod && ng build --prod --app ssr --output-hashing=false"
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^4.2.4",
-    "@angular/common": "^4.2.4",
-    "@angular/compiler": "^4.2.4",
-    "@angular/core": "^4.2.4",
-    "@angular/forms": "^4.2.4",
-    "@angular/http": "^4.2.4",
-    "@angular/platform-browser": "^4.2.4",
-    "@angular/platform-browser-dynamic": "^4.2.4",
-    "@angular/platform-server": "^4.3.3",
-    "@angular/router": "^4.2.4",
+    "@angular/animations": "^5.2.0",
+    "@angular/common": "^5.2.0",
+    "@angular/compiler": "^5.2.0",
+    "@angular/core": "^5.2.0",
+    "@angular/forms": "^5.2.0",
+    "@angular/http": "^5.2.0",
+    "@angular/platform-browser": "^5.2.0",
+    "@angular/platform-browser-dynamic": "^5.2.0",
+    "@angular/platform-server": "^5.2.0",
+    "@angular/router": "^5.2.0",
+    "@nguniversal/express-engine": "^5.0.0-beta.5",
+    "@nguniversal/module-map-ngfactory-loader": "^5.0.0-beta.5",
     "core-js": "^2.4.1",
     "normalize.css": "^7.0.0",
     "pm2": "^2.6.1",
-    "rxjs": "^5.4.2",
-    "zone.js": "^0.8.14"
+    "rxjs": "^5.5.6",
+    "zone.js": "^0.8.19"
   },
   "devDependencies": {
-    "@angular/cli": "1.3.0-rc.5",
-    "@angular/compiler-cli": "^4.2.4",
-    "@angular/language-service": "^4.2.4",
-    "@types/jasmine": "~2.5.53",
+    "@angular/cli": "^1.7.1",
+    "@angular/compiler-cli": "^5.2.0",
+    "@angular/language-service": "^5.2.0",
+    "@types/jasmine": "~2.8.3",
     "@types/jasminewd2": "~2.0.2",
     "@types/node": "~6.0.60",
-    "codelyzer": "~3.1.1",
-    "jasmine-core": "~2.6.2",
-    "jasmine-spec-reporter": "~4.1.0",
-    "karma": "~1.7.0",
-    "karma-chrome-launcher": "~2.1.1",
+    "codelyzer": "~4.0.1",
+    "jasmine-core": "~2.8.0",
+    "jasmine-spec-reporter": "~4.2.1",
+    "karma": "~2.0.0",
+    "karma-chrome-launcher": "~2.2.0",
     "karma-cli": "~1.0.1",
     "karma-coverage-istanbul-reporter": "^1.2.1",
     "karma-jasmine": "~1.1.0",
     "karma-jasmine-html-reporter": "^0.2.2",
     "protractor": "~5.1.2",
-    "ts-node": "~3.2.0",
-    "tslint": "~5.3.2",
-    "typescript": "~2.3.3"
+    "ts-node": "~4.1.0",
+    "tslint": "~5.9.1",
+    "typescript": "~2.5.3"
   }
 }

pm2.json

@@ -1,7 +1,7 @@
 {
   "apps" : [{
     "name"        : "gallery-frontend",
-    "script"      : "./render.js",
+    "script"      : "./server.js",
     "watch"       : true,
     "env": {
       "NODE_ENV": "development"

render.js

@@ -1,35 +0,0 @@
-const PORT = 4000;
-
-//require('reflect-metadata');
-require('zone.js/dist/zone-node');
-const { renderModuleFactory } = require('@angular/platform-server');
-const { enableProdMode } = require('@angular/core');
-const { join } = require('path');
-const express = require('express');
-const fs = require('fs');
-
-const { AppServerModuleNgFactory } = require('./dist-ssr/main.bundle');
-
-
-enableProdMode();
-const app = express();
-let template = fs.readFileSync('dist/index.html', 'utf8');
-
-app.engine('html', (_, options, callback) => {
-    renderModuleFactory(AppServerModuleNgFactory, {
-        document: template,
-        url: options.req.url
-    }).then(html => callback(null, html));
-});
-
-app.set('view engine', 'html');
-app.set('views', 'dist')
-
-app.get('*.*', express.static(join(__dirname, 'dist')));
-app.get('*', (req, res) => {
-  res.render('index', { req });
-});
-
-app.listen(PORT, () => {
-    console.log(`listening on http://localhost:${PORT}!`);
-});

server.js

@@ -0,0 +1,43 @@
+"use strict";
+require("zone.js/dist/zone-node");
+require("reflect-metadata");
+
+const { enableProdMode } = require('@angular/core');
+
+const express = require('express');
+const { join } = require('path');
+
+enableProdMode();
+
+// Express server
+const app = express();
+
+const PORT = process.env.PORT || 4000;
+const DIST_FOLDER = join(process.cwd(), 'dist');
+
+// * NOTE :: leave this as require() since this file is built Dynamically from webpack
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require('./dist/server/main.bundle');
+
+// Express Engine
+const { ngExpressEngine } = require("@nguniversal/express-engine");
+// Import module map for lazy loading
+const { provideModuleMap } = require("@nguniversal/module-map-ngfactory-loader");
+
+app.engine('html', ngExpressEngine({
+    bootstrap: AppServerModuleNgFactory,
+    providers: [
+        provideModuleMap(LAZY_MODULE_MAP)
+    ]
+}));
+app.set('view engine', 'html');
+app.set('views', join(DIST_FOLDER, 'browser'));
+// Server static files from /browser
+app.get('*.*', express.static(join(DIST_FOLDER, 'browser')));
+// All regular routes use the Universal engine
+app.get('*', function (req, res) {
+    res.render(join(DIST_FOLDER, 'browser', 'index.html'), { req: req });
+});
+// Start up the Node server
+app.listen(PORT, function () {
+    console.log("Node server listening on http://localhost:" + PORT);
+});

src/app/app.component.ts

@@ -1,10 +1,10 @@
 import { Component } from '@angular/core';
 
 @Component({
-  selector: 'app-root',
-  templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+    selector: 'app-root',
+    templateUrl: './app.component.html',
+    styleUrls: ['./app.component.css']
 })
 export class AppComponent {
-  title = 'app';
+    title = 'app';
 }

src/app/app.module.ts

@@ -1,25 +1,33 @@
 import { BrowserModule } from '@angular/platform-browser';
 import { BrowserAnimationsModule } from "@angular/platform-browser/animations"
 import { NgModule } from '@angular/core';
+import { PLATFORM_ID, APP_ID, Inject } from '@angular/core';
+import { isPlatformBrowser } from '@angular/common';
 
 import { AppRoutingModule } from './app-routing.module';
 import { AppComponent } from './app.component';
 import { GalleryModule } from "./gallery/gallery.module";
 
 @NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule.withServerTransition({
-      appId: 'angullary'
-    }),
-    BrowserAnimationsModule,
-    AppRoutingModule,
-    GalleryModule,
-  ],
-  providers: [],
-  bootstrap: [AppComponent]
+    declarations: [
+        AppComponent
+    ],
+    imports: [
+        BrowserModule.withServerTransition({
+            appId: 'angullary'
+        }),
+        BrowserAnimationsModule,
+        AppRoutingModule,
+        GalleryModule,
+    ],
+    providers: [],
+    bootstrap: [AppComponent]
 })
 export class AppModule {
+    constructor(@Inject(PLATFORM_ID) private platformId: Object,
+                @Inject(APP_ID) private appId: string) {
+        const platform = isPlatformBrowser(platformId) ?
+            'in the browser' : 'on the server';
+        console.log(`Running ${platform} with appId=${appId}`);
+    }
 }

src/app/app.server.module.ts

@@ -1,14 +1,18 @@
 import { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
-import { AppComponent } from './app.component';
+import { ModuleMapLoaderModule } from '@nguniversal/module-map-ngfactory-loader';
+
 import { AppModule } from './app.module';
+import { AppComponent } from './app.component';
+
 @NgModule({
-  imports: [
-          AppModule,
-          ServerModule
-  ],
-  bootstrap: [
-          AppComponent
-  ]
+    imports: [
+        AppModule,
+        ServerModule,
+        ModuleMapLoaderModule,
+    ],
+    bootstrap: [
+        AppComponent,
+    ]
 })
 export class AppServerModule {}

src/app/gallery/album/album.component.ts

@@ -1,11 +1,10 @@
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from "@angular/router";
-import { Title } from "@angular/platform-browser";
+import { Meta, Title } from "@angular/platform-browser";
 
-import { Album } from "../shared/album.model";
-import { DisplayImageService } from "../display-image/display-image.service";
 import { environment } from "../../../environments/environment";
-import { Image } from "../shared/image.model";
+import { Album, Image } from "../shared";
+import { DisplayImageService } from "../display-image/display-image.service";
 import { Thumbnail } from "../shared/thumbnail.model";
 
 const IDX_LEFT = 0;
@@ -32,7 +31,8 @@ export class AlbumComponent implements OnInit {
 
     constructor(private titleService: Title,
                 private route: ActivatedRoute,
-                private displayImageService: DisplayImageService) {
+                private displayImageService: DisplayImageService,
+                private metaService: Meta) {
     }
 
     ngOnInit() {
@@ -40,6 +40,10 @@ export class AlbumComponent implements OnInit {
             this.album = data.albums.find(album => album.slug == this.route.snapshot.params.slug);
             this.titleService.setTitle(`${this.album.name} - photos.yvan.hu`);
             this.initThumbnails();
+            this.metaService.updateTag({
+                property: 'og:image',
+                content: this.imageUrl(this.album.coverImage)
+            });
             this.route.params.subscribe((params: {
                 slug: string,
                 image: string

src/app/gallery/gallery/gallery.component.ts

@@ -1,10 +1,10 @@
-import {Component, OnInit} from '@angular/core';
-import {Title} from "@angular/platform-browser";
+import { Component, OnInit } from '@angular/core';
+import { Title, Meta } from "@angular/platform-browser";
 
-import {Album} from "../shared";
-import {ActivatedRoute} from "@angular/router";
-import {environment} from "../../../environments/environment";
-import {Thumbnail} from "../shared/thumbnail.model";
+import { environment } from "../../../environments/environment";
+import { Album } from "../shared";
+import { ActivatedRoute } from "@angular/router";
+import { Thumbnail } from "../shared/thumbnail.model";
 
 const IDX_LEFT = 0;
 const IDX_MIDDLE = 1;
@@ -12,66 +12,71 @@ const IDX_RIGHT = 2;
 const THUMB_MARGIN = 10;
 
 @Component({
-  selector: 'app-gallery',
-  templateUrl: './gallery.component.html',
-  styleUrls: ['./gallery.component.css'],
+    selector: 'app-gallery',
+    templateUrl: './gallery.component.html',
+    styleUrls: ['./gallery.component.css'],
 })
 export class GalleryComponent implements OnInit {
 
-  public albums: Array<Album> = [];
+    public albums: Array<Album> = [];
 
-  private leftHeight: number = 0;
-  private middleHeight: number = 0;
-  private rightHeight: number = 0;
+    private leftHeight: number = 0;
+    private middleHeight: number = 0;
+    private rightHeight: number = 0;
 
-  public thumbnailsLeft: Array<Thumbnail> = [];
-  public thumbnailsMiddle: Array<Thumbnail> = [];
-  public thumbnailsRight: Array<Thumbnail> = [];
+    public thumbnailsLeft: Array<Thumbnail> = [];
+    public thumbnailsMiddle: Array<Thumbnail> = [];
+    public thumbnailsRight: Array<Thumbnail> = [];
 
-  constructor(private titleService: Title,
-              private route: ActivatedRoute) {
-  }
+    constructor(private titleService: Title,
+                private route: ActivatedRoute,
+                private metaService: Meta) {
+    }
 
-  ngOnInit() {
-    this.titleService.setTitle('Albums - photos.yvan.hu');
-    this.route.data.subscribe((data: { albums: Array<Album> }) => {
-      this.albums = data.albums.filter(album => album.isPublic).reverse();
-      this.initThumbnails();
-    });
-  }
+    ngOnInit() {
+        this.titleService.setTitle('Albums - photos.yvan.hu');
+        this.route.data.subscribe((data: { albums: Array<Album> }) => {
+            this.albums = data.albums.filter(album => album.isPublic).reverse();
+            this.initThumbnails();
+            this.metaService.updateTag({
+                property: 'og:image',
+                content: this.imageUrl(this.albums[0])
+            });
+        });
+    }
 
-  private initThumbnails() {
-    this.albums.map(album => <Thumbnail>{
-      slug: album.slug,
-      image: this.imageUrl(album),
-      label: {
-        title: album.name,
-        extraRight: album.images.length + ' images',
-        extraLeft: album.date,
-      },
-      height: album.coverImage.thumbHeight,
-    }).map(thumbnail => {
-      let heights = [this.leftHeight, this.middleHeight, this.rightHeight];
-      let idx = heights.reduce((low, nxt, idx) => nxt < heights[low] ? idx : low, 0);
-      switch(idx) {
-        case IDX_LEFT:
-          this.thumbnailsLeft.push(thumbnail);
-          this.leftHeight += thumbnail.height + THUMB_MARGIN;
-          break;
-        case IDX_MIDDLE:
-          this.thumbnailsMiddle.push(thumbnail);
-          this.middleHeight += thumbnail.height + THUMB_MARGIN;
-          break;
-        case IDX_RIGHT:
-          this.thumbnailsRight.push(thumbnail);
-          this.rightHeight += thumbnail.height + THUMB_MARGIN;
-          break;
-      }
-    });
-  }
+    private initThumbnails() {
+        this.albums.map(album => <Thumbnail>{
+            slug: album.slug,
+            image: this.imageUrl(album),
+            label: {
+                title: album.name,
+                extraRight: album.images.length + ' images',
+                extraLeft: album.date,
+            },
+            height: album.coverImage.thumbHeight,
+        }).map(thumbnail => {
+            let heights = [this.leftHeight, this.middleHeight, this.rightHeight];
+            let idx = heights.reduce((low, nxt, idx) => nxt < heights[low] ? idx : low, 0);
+            switch (idx) {
+                case IDX_LEFT:
+                    this.thumbnailsLeft.push(thumbnail);
+                    this.leftHeight += thumbnail.height + THUMB_MARGIN;
+                    break;
+                case IDX_MIDDLE:
+                    this.thumbnailsMiddle.push(thumbnail);
+                    this.middleHeight += thumbnail.height + THUMB_MARGIN;
+                    break;
+                case IDX_RIGHT:
+                    this.thumbnailsRight.push(thumbnail);
+                    this.rightHeight += thumbnail.height + THUMB_MARGIN;
+                    break;
+            }
+        });
+    }
 
-  private imageUrl(album: Album): string {
-    return environment.apiUrl + `/image/${album.slug}/${album.coverImage.path}/thumb`;
-  }
+    private imageUrl(album: Album): string {
+        return environment.apiUrl + `/image/${album.slug}/${album.coverImage.path}/thumb`;
+    }
 
 }

src/app/gallery/shared/gallery.service.ts

@@ -8,7 +8,7 @@ import { environment } from "../../../environments/environment";
 import { Album, Image } from ".";
 
 @Injectable()
-export class GalleryService implements Resolve<Array<Album>> {
+export class GalleryService implements Resolve<Array<Album>|false> {
 
   public albums: Array<Album> = [];
 
@@ -20,17 +20,12 @@ export class GalleryService implements Resolve<Array<Album>> {
     return this.httpService.get(environment.apiUrl + '/api/galleries').map(res => res.json());
   }
 
-  // public listGalleryImages(gallerySlug: string): Observable<Image> {
-  //   return this.httpService.get(environment.apiUrl + '/api/gallery/' + gallerySlug).map(res => res.json());
-  // }
-
   /**
-   *
    * @param {ActivatedRouteSnapshot} route
    * @returns {Promise<Array<Album>>}
    * @todo add some cache ttl to albums?
    */
-  public resolve(route: ActivatedRouteSnapshot): Promise<Array<Album>> {
+  public resolve(route: ActivatedRouteSnapshot): Promise<Array<Album>|false> {
     if(this.albums.length) {
       return Promise.resolve(this.albums);
     }

src/index.html

@@ -1,23 +1,26 @@
 <!doctype html>
 <html lang="en">
 <head>
-  <meta charset="utf-8">
-  <title>Gallery</title>
-  <base href="/">
+    <meta charset="utf-8">
+    <title>Gallery</title>
+    <base href="/">
 
-  <meta name="viewport" content="width=device-width, initial-scale=1">
-  <link rel="icon" type="image/x-icon" href="favicon.ico">
+    <meta name="og:title" content="Angullery"/>
+    <meta name="og:description" content="A really simple photo album"/>
+
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <link rel="icon" type="image/x-icon" href="favicon.ico">
 </head>
 <body>
-  <app-root>
+<app-root>
     <div class="ui main container">
-      <div class="ui visible massive floating icon message">
-        <i class="notched circle loading icon"></i>
-        <div class="content">
-          <div class="header">Loading ...</div>
+        <div class="ui visible massive floating icon message">
+            <i class="notched circle loading icon"></i>
+            <div class="content">
+                <div class="header">Loading ...</div>
+            </div>
         </div>
-      </div>
     </div>
-  </app-root>
+</app-root>
 </body>
 </html>

src/main.ts

@@ -5,7 +5,7 @@ import { AppModule } from './app/app.module';
 import { environment } from './environments/environment';
 
 if (environment.production) {
-  enableProdMode();
+    enableProdMode();
 }
 
 platformBrowserDynamic().bootstrapModule(AppModule);