Merge branch 'primeng'

Author: Gorniv

.angular-cli.json

@@ -19,9 +19,18 @@
             "testTsconfig": "tsconfig.spec.json",
             "prefix": "app",
             "styles": [
-                "styles.scss"
+                "styles.scss",
+                "../node_modules/font-awesome/css/font-awesome.min.css"
+            ],
+            "scripts": [
+                "../node_modules/jquery/dist/jquery.js",
+                "../node_modules/moment/moment.js",
+                "../node_modules/chart.js/dist/Chart.js",
+                "../node_modules/fullcalendar/dist/fullcalendar.js",
+                "../node_modules/quill/dist/quill.js",
+                "../node_modules/prismjs/prism.js",
+                "../node_modules/prismjs/components/prism-typescript.js"
             ],
-            "scripts": [],
             "environmentSource": "environments/environment.ts",
             "environments": {
                 "dev": "environments/environment.ts",
@@ -44,9 +53,18 @@
             "testTsconfig": "tsconfig.spec.json",
             "prefix": "app",
             "styles": [
-                "styles.scss"
+                "styles.scss",
+                "../node_modules/font-awesome/css/font-awesome.min.css"
+            ],
+            "scripts": [
+                "../node_modules/jquery/dist/jquery.js",
+                "../node_modules/moment/moment.js",
+                "../node_modules/chart.js/dist/Chart.js",
+                "../node_modules/fullcalendar/dist/fullcalendar.js",
+                "../node_modules/quill/dist/quill.js",
+                "../node_modules/prismjs/prism.js",
+                "../node_modules/prismjs/components/prism-typescript.js"
             ],
-            "scripts": [],
             "environmentSource": "environments/environment.ts",
             "environments": {
                 "dev": "environments/environment.ts",

.gitignore

@@ -4,3 +4,5 @@ dist
 server.js
 package-lock.json
 yarn.lock
+prerender.js
+prerender.js

package.json

@@ -13,39 +13,51 @@
         "test": "ng test",
         "lint": "ng lint",
         "e2e": "ng e2e",
-        "universal": "ng build --prod && ng build --prod --app 1 && ts-node server"
+        "universal": "ng build --prod && ng build --prod --app 1 && ts-node server",
+        "client:watch": "ng build --watch --prod --aot",
+        "server:watch": "ng build --app 1 --watch --prod --aot",
+        "webpack:watch": "webpack --watch"
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "5.0.0",
+        "@angular/animations": "5.0.1",
         "@angular/cdk": "5.0.0-rc0",
-        "@angular/common": "5.0.0",
-        "@angular/compiler": "5.0.0",
-        "@angular/core": "5.0.0",
-        "@angular/forms": "5.0.0",
-        "@angular/http": "5.0.0",
+        "@angular/common": "5.0.1",
+        "@angular/compiler": "5.0.1",
+        "@angular/core": "5.0.1",
+        "@angular/forms": "5.0.1",
+        "@angular/http": "5.0.1",
         "@angular/material": "5.0.0-rc0",
-        "@angular/platform-browser": "5.0.0",
-        "@angular/platform-browser-dynamic": "5.0.0",
-        "@angular/router": "5.0.0",
+        "@angular/platform-browser": "5.0.1",
+        "@angular/platform-browser-dynamic": "5.0.1",
+        "@angular/router": "5.0.1",
         "@ngtools/webpack": "1.9.0-beta.0",
         "@nguniversal/common": "5.0.0-beta.5",
         "@nguniversal/express-engine": "5.0.0-beta.5",
         "@nguniversal/module-map-ngfactory-loader": "5.0.0-beta.5",
+        "chart.js": "2.7.1",
         "cookie-parser": "1.4.3",
         "core-js": "2.5.1",
+        "font-awesome": "4.7.0",
+        "fullcalendar": "3.7.0",
         "hammerjs": "2.0.8",
+        "jquery": "3.2.1",
+        "moment": "2.19.2",
         "ngx-cookie-service": "1.0.9",
+        "primeng": "5.0.0-rc.0",
+        "prismjs": "1.8.4",
+        "quill": "1.3.4",
         "rxjs": "5.5.2",
         "uglify-es": "3.1.9",
+        "xmlhttprequest": "^1.8.0",
         "zone.js": "0.8.18"
     },
     "devDependencies": {
         "@angular/cli": "1.6.0-beta.0",
-        "@angular/compiler-cli": "5.0.0",
-        "@angular/language-service": "5.0.0",
-        "@angular/platform-server": "5.0.0",
-        "@types/jasmine": "2.6.2",
+        "@angular/compiler-cli": "5.0.1",
+        "@angular/language-service": "5.0.1",
+        "@angular/platform-server": "5.0.1",
+        "@types/jasmine": "2.8.0",
         "@types/jasminewd2": "2.0.3",
         "@types/node": "8.0.51",
         "codelyzer": "4.0.1",

prerender.ts

@@ -0,0 +1,49 @@
+// Load zone.js for the server.
+import 'zone.js/dist/zone-node';
+import 'reflect-metadata';
+import { readFileSync, writeFileSync, existsSync, mkdirSync } from 'fs';
+import { join } from 'path';
+const fs = require('fs');
+
+import { enableProdMode } from '@angular/core';
+// Faster server renders w/ Prod mode (dev mode never needed)
+enableProdMode();
+
+// Express Engine
+import { ngExpressEngine } from '@nguniversal/express-engine';
+// Import module map for lazy loading
+import { provideModuleMap } from '@nguniversal/module-map-ngfactory-loader';
+import { renderModuleFactory } from '@angular/platform-server';
+import { ROUTES } from './static.paths';
+
+// * NOTE :: leave this as require() since this file is built Dynamically from webpack
+const files = fs.readdirSync(`${process.cwd()}/dist-server`);
+const mainFiles = files.filter(file => file.startsWith('main'));
+const hash = mainFiles[0].split('.')[1];
+const { AppServerModuleNgFactory, LAZY_MODULE_MAP } = require(`./dist-server/main.${hash}.bundle`);
+
+const BROWSER_FOLDER = join(process.cwd(), 'browser');
+
+// Load the index.html file containing referances to your application bundle.
+const index = readFileSync(join('browser', 'index.html'), 'utf8');
+
+let previousRender = Promise.resolve();
+
+// Iterate each route path
+ROUTES.forEach(route => {
+    const fullPath = join(BROWSER_FOLDER, route);
+
+    // Make sure the directory structure is there
+    if (!existsSync(fullPath)) {
+        mkdirSync(fullPath);
+    }
+
+    // Writes rendered HTML to index.html, replacing the file if it already exists.
+    previousRender = previousRender.then(_ => renderModuleFactory(AppServerModuleNgFactory, {
+        document: index,
+        url: route,
+        extraProviders: [
+            provideModuleMap(LAZY_MODULE_MAP)
+        ]
+    })).then(html => writeFileSync(join(fullPath, 'index.html'), html));
+});

server.ts

@@ -1,6 +1,6 @@
+import { HttpClient } from '@angular/common/http';
 import 'reflect-metadata';
 import 'zone.js/dist/zone-node';
-import { platformServer, renderModuleFactory } from '@angular/platform-server';
 import { enableProdMode } from '@angular/core';
 import * as express from 'express';
 import * as compression from 'compression';
@@ -43,7 +43,7 @@ app.get('*', (req, res) => {
   global['document'] = template;
   global['navigator'] = req['headers']['user-agent'];
   global['CSS'] = null;
-
+  // global['XMLHttpRequest'] = require('xmlhttprequest').XMLHttpRequest;
   res.render('../dist/index', {
     req: req,
     res: res,

src/app/app.routing.ts

@@ -2,7 +2,7 @@ import { Routes, RouterModule } from '@angular/router';
 
 const routes: Routes = [
   { path: '', loadChildren: './home/home.module#HomeModule', pathMatch: 'full' },
-  { path: 'material', loadChildren: './materialPage/materialPage.module#MaterialPageModule' },
+  // { path: 'material', loadChildren: './materialPage/materialPage.module#MaterialPageModule' },
   { path: 'primeng', loadChildren: './primengPage/primengPage.module#PrimengPageModule' },
 ];
 

src/app/home/home.component.ts

@@ -10,7 +10,9 @@ import { Component, OnInit, Inject } from '@angular/core';
 export class HomeComponent implements OnInit {
   result: any;
 
-  constructor(private http: TransferHttp, @Inject(AppStorage) private appStorage: Storage) { }
+  constructor(
+    private http: TransferHttp, @Inject(AppStorage) private appStorage: Storage
+  ) { }
 
   ngOnInit(): void {
     this.http.get('https://reqres.in/api/users?delay=3').subscribe(result => {

src/app/primengPage/components/accordion/accordiondemo-routing.module.ts

@@ -0,0 +1,15 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { AccordionDemo } from './accordiondemo';
+
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      { path: '', component: AccordionDemo }
+    ])
+  ],
+  exports: [
+    RouterModule
+  ]
+})
+export class AccordionDemoRoutingModule { }