Merge branch 'master' of https://github.com/Angular-RU/angular-universal-starter

Author: Gorniv

package.json

@@ -43,6 +43,7 @@
     "core-js": "2.5.3",
     "ngx-cookie-service": "1.0.10",
     "rxjs": "5.5.6",
+    "node-fetch": "^2.0.0",
     "zone.js": "0.8.20"
   },
   "devDependencies": {

server.ts

@@ -4,10 +4,12 @@ const path = require('path');
 const template = fs.readFileSync(path.join(__dirname, '.', 'dist', 'index.html')).toString();
 const win = domino.createWindow(template);
 const files = fs.readdirSync(`${process.cwd()}/dist-server`);
+import fetch from 'node-fetch';
 // const styleFiles = files.filter(file => file.startsWith('styles'));
 // const hashStyle = styleFiles[0].split('.')[1];
 // const style = fs.readFileSync(path.join(__dirname, '.', 'dist-server', `styles.${hashStyle}.bundle.css`)).toString();
 
+win.fetch = fetch;
 global['window'] = win;
 Object.defineProperty(win.document.body.style, 'transform', {
   value: () => {
@@ -97,24 +99,31 @@ app.get('*', (req, res) => {
 
   // tslint:disable-next-line:no-console
   console.time(`GET: ${req.originalUrl}`);
-  res.render('../dist/index', {
-    req: req,
-    res: res,
-    providers: [
-      {
-        provide: REQUEST, useValue: (req)
-      },
-      {
-        provide: RESPONSE, useValue: (res)
-      },
-      {
-        provide: 'ORIGIN_URL',
-        useValue: (`${http}://${req.headers.host}`)
-      }
-    ]
-  });
-  // tslint:disable-next-line:no-console
-  console.timeEnd(`GET: ${req.originalUrl}`);
+  res.render(
+    '../dist/index',
+    {
+      req: req,
+      res: res,
+      providers: [
+        {
+          provide: REQUEST, useValue: (req)
+        },
+        {
+          provide: RESPONSE, useValue: (res)
+        },
+        {
+          provide: 'ORIGIN_URL',
+          useValue: (`${http}://${req.headers.host}`)
+        }
+      ]
+    },
+    (err, html) => {
+      if (!!err) throw err;
+
+      // tslint:disable-next-line:no-console
+      console.timeEnd(`GET: ${req.originalUrl}`);
+      res.send(html);
+    });
 });
 
 app.listen(PORT, () => {

src/app/app.routing.ts

@@ -3,7 +3,7 @@ import { MetaGuard } from '@ngx-meta/core';
 
 const routes: Routes = [
   {
-    path: '', loadChildren: './home/home.module#HomeModule', pathMatch: 'full',
+    path: '', loadChildren: './home/home.module#HomeModule',
     data: {
       // for override default meta
       meta: {
@@ -19,6 +19,9 @@ const routes: Routes = [
   { path: 'mock', loadChildren: './mock-server-browser/mock-server-browser.module#MockServerBrowserModule' },
   // with meta
   { path: 'back', loadChildren: './transfer-back/transfer-back.module#TransferBackModule', canActivateChild: [MetaGuard]},
+  // 404
+  { path: '404', loadChildren: './not-found/not-found.module#NotFoundModule' },
+  { path: '**', redirectTo: '404', pathMatch: 'full' }
 ];
 // must use {initialNavigation: 'enabled'}) - for one load page, without reload
 export const AppRoutes = RouterModule.forRoot(routes, { initialNavigation: 'enabled' });

src/app/not-found/not-found.component.html

@@ -0,0 +1,3 @@
+<p>
+  not-found works!
+</p>

src/app/not-found/not-found.component.scss

@@ -0,0 +1,25 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { NotFoundComponent } from './not-found.component';
+
+describe('NotFoundComponent', () => {
+  let component: NotFoundComponent;
+  let fixture: ComponentFixture<NotFoundComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ NotFoundComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NotFoundComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

src/app/not-found/not-found.component.spec.ts

@@ -0,0 +1,16 @@
+import { Component, OnInit } from '@angular/core';
+import { NotFoundService } from './not-found.service';
+
+@Component({
+    selector: 'app-not-found',
+    templateUrl: './not-found.component.html',
+    styleUrls: ['./not-found.component.scss']
+})
+export class NotFoundComponent implements OnInit {
+    public status: { code: number, message: string };
+    constructor(private _notFoundService: NotFoundService) {}
+
+    ngOnInit() {
+        this._notFoundService.setStatus(404, 'Not Found');
+    }
+}

src/app/not-found/not-found.component.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { NotFoundComponent } from './not-found.component';
+import { NotFoundRoutes } from './not-found.routing';
+import { NotFoundService } from './not-found.service';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    NotFoundRoutes
+  ],
+  providers: [NotFoundService],
+  declarations: [NotFoundComponent]
+})
+export class NotFoundModule { }

src/app/not-found/not-found.module.ts

@@ -0,0 +1,8 @@
+import { NotFoundComponent } from './not-found.component';
+import { Routes, RouterModule } from '@angular/router';
+
+const routes: Routes = [
+  { path: '' , component: NotFoundComponent},
+];
+
+export const NotFoundRoutes = RouterModule.forChild(routes);

src/app/not-found/not-found.routing.ts

@@ -0,0 +1,15 @@
+import { TestBed, inject } from '@angular/core/testing';
+
+import { NotFoundService } from './not-found.service';
+
+describe('NotFoundService', () => {
+  beforeEach(() => {
+    TestBed.configureTestingModule({
+      providers: [NotFoundService]
+    });
+  });
+
+  it('should be created', inject([NotFoundService], (service: NotFoundService) => {
+    expect(service).toBeTruthy();
+  }));
+});