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

Author: Gorniv

.angular-cli.json

@@ -19,17 +19,9 @@
             "testTsconfig": "tsconfig.spec.json",
             "prefix": "app",
             "styles": [
-                "styles.scss",
-                "../node_modules/font-awesome/css/font-awesome.min.css"
+                "styles.scss"
             ],
             "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"
             ],
             "environmentSource": "environments/environment.ts",
             "environments": {
@@ -53,17 +45,9 @@
             "testTsconfig": "tsconfig.spec.json",
             "prefix": "app",
             "styles": [
-                "styles.scss",
-                "../node_modules/font-awesome/css/font-awesome.min.css"
+                "styles.scss"
             ],
             "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"
             ],
             "environmentSource": "environments/environment.ts",
             "environments": {

.gitignore

@@ -6,3 +6,4 @@ package-lock.json
 yarn.lock
 prerender.js
 prerender.js
+.DS_Store

package.json

@@ -25,7 +25,6 @@
         "@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.1",
         "@angular/platform-browser-dynamic": "5.0.1",
         "@angular/router": "5.0.1",
@@ -34,24 +33,12 @@
         "@nguniversal/express-engine": "5.0.0-beta.5",
         "@nguniversal/module-map-ngfactory-loader": "5.0.0-beta.5",
         "@types/node": "8.0.51",
-        "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",
-        "ionic-angular": "3.9.2",
-        "ionicons": "3.0.0",
-        "jquery": "3.2.1",
-        "moment": "2.19.2",
         "ngx-cookie-service": "1.0.9",
         "preboot": "5.1.7",
-        "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": {

server.ts

@@ -3,8 +3,22 @@ const fs = require('fs');
 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`);
+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();
+
 global['window'] = win;
+Object.defineProperty(win.document.body.style, 'transform', {
+  value: () => {
+    return {
+      enumerable: true,
+      configurable: true
+    };
+  },
+});
 global['document'] = win.document;
+global['CSS'] = style;
 // global['XMLHttpRequest'] = require('xmlhttprequest').XMLHttpRequest;
 global['Prism'] = null;
 
@@ -17,7 +31,7 @@ import * as compression from 'compression';
 import * as cookieparser from 'cookie-parser';
 const { provideModuleMap } = require('@nguniversal/module-map-ngfactory-loader');
 
-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`);

src/app/app.component.html

@@ -1,10 +1,8 @@
 <nav>
     <ul>
         <li><a [routerLink]="['']" [routerLinkActive]="['router-link-active']">home</a></li>
-        <li><a [routerLink]="['/material']" [routerLinkActive]="['router-link-active']">material</a></li>
-        <li><a [routerLink]="['/primeng/report']" [routerLinkActive]="['router-link-active']">primeng</a></li>
         <li><a [routerLink]="['/mock']" [routerLinkActive]="['router-link-active']">mock</a></li>
-        <li><a [routerLink]="['/ionic']" [routerLinkActive]="['router-link-active']">ionic</a></li>
+        <li><a [routerLink]="['/back']" [routerLinkActive]="['router-link-active']">back http</a></li>
     </ul>
 </nav>
 <router-outlet></router-outlet>

src/app/app.routing.ts

@@ -2,10 +2,8 @@ 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: 'primeng', loadChildren: './primengPage/primengPage.module#PrimengPageModule' },
   { path: 'mock', loadChildren: './mock-server-browser/mock-server-browser.module#MockServerBrowserModule' },
-  { path: 'ionic', loadChildren: './ionic-page/ionic-page.module#IonicPageModule' },
+  { path: 'back', loadChildren: './transfer-back/transfer-back.module#TransferBackModule' },
 ];
 
 export const AppRoutes = RouterModule.forRoot(routes);

src/app/home/home.component.html

@@ -1,8 +1,5 @@
 <p>
   home works!
 </p>
-result
-<br/>
-{{result | json}}
-<br/>
+
 

src/app/home/home.component.ts

@@ -8,16 +8,13 @@ import { Component, OnInit, Inject } from '@angular/core';
   styleUrls: ['./home.component.scss']
 })
 export class HomeComponent implements OnInit {
-  result: any;
 
   constructor(
     private http: TransferHttp, @Inject(AppStorage) private appStorage: Storage
   ) { }
 
   ngOnInit(): void {
-    this.http.get('https://reqres.in/api/users?delay=3').subscribe(result => {
-      this.result = result;
-    });
+
     this.appStorage.setItem('test', 'test2');
     const resultCookie = this.appStorage.getItem('test');
     const t = window;