Skip to content

Commit a0af2d7

Browse files
simeonoffsimeonoff
committed
Merge branch 'vNext' into simeonoff/igniteui-theming
2 parents dc70385 + 0a92b9c commit a0af2d7

8 files changed

Lines changed: 495 additions & 222 deletions

File tree

‎gulpfile.js‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,65 @@ gulp.task("overwrite-package-json", (done) => {
5050
done();
5151
});
5252

53+
const createPrependerdLobStructure = (cb) => {
54+
const folders = [
55+
'./dist/app-lob/angular-demos-lob',
56+
'./dist/app-lob/angular-demos-lob/grid',
57+
'./dist/app-lob/angular-demos-lob/tree-grid',
58+
'./dist/app-lob/angular-demos-lob/grid-finjs-dock-manager',
59+
'./dist/app-lob/angular-demos-lob/hierarchical-grid'
60+
];
61+
folders.forEach(dir => {
62+
if (!fs.existsSync(dir)) {
63+
fs.mkdirSync(dir);
64+
}
65+
});
66+
cb();
67+
}
68+
69+
const addPrerenderedLobPages = (cb) => {
70+
const { metadata } = require('./projects/app-lob/src/app/metadata');
71+
const indexFilePath = path.resolve(__dirname, './', 'dist/app-lob', 'index.html');
72+
73+
// read in the index.html file
74+
fs.readFile(indexFilePath, 'utf8', function (err, data) {
75+
if (err) {
76+
return console.error(err);
77+
}
78+
79+
metadata.forEach(({ url, title, description, og_url, folder }) => {
80+
let result = data;
81+
result = result.replace(/\$OG_TITLE/g, title);
82+
result = result.replace(/\$OG_DESCRIPTION/g, description);
83+
result = result.replace(/\$OG_URL/g, og_url);
84+
85+
let filename = url.substring(1).replace(/\//g, '-');
86+
if (filename.length) {
87+
filename = filename + '.html';
88+
} else {
89+
filename = 'index.html';
90+
}
91+
92+
if (folder) {
93+
fs.writeFile(path.resolve(__dirname, './', './dist/app-lob/angular-demos-lob/' + folder, filename), result, (err) => {
94+
if (err) {
95+
console.log(err);
96+
}
97+
});
98+
} else {
99+
fs.writeFile(path.resolve(__dirname, './', 'dist/app-lob/angular-demos-lob', filename), result, (err) => {
100+
if (err) {
101+
console.log(err);
102+
}
103+
});
104+
}
105+
})
106+
})
107+
cb();
108+
}
109+
110+
exports.prerenderPages = gulp.series(createPrependerdLobStructure, addPrerenderedLobPages);
111+
53112
gulp.task("watch-live-editing", gulp.series("generate-live-editing", () => {
54113
gulp.watch(["./src/**/*.*", "!./src/assets/**", "./live-editing/**/*.*", "package.json"], function () {
55114
Object.keys(require.cache).forEach(function (key) {

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
"watch-live-editing": "gulp watch-live-editing",
1616
"sass-js-compile-check": "gulp sass-js-compile-check",
1717
"build": "gulp generate-live-editing && gulp overwrite-package-json && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng build --configuration production",
18-
"build:app-lob": "gulp generate-live-editing --appDv=true && gulp overwrite-package-json && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng build app-lob --configuration production",
18+
"build:app-lob": "gulp generate-live-editing --appDv=true && gulp overwrite-package-json && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng build app-lob --configuration production && gulp prerenderPages",
1919
"build:app-crm": "ng build app-crm --configuration production",
2020
"test": "ng test",
2121
"lint": "node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng lint",
@@ -26,7 +26,7 @@
2626
"start:app-lob:live-editing": "gulp generate-live-editing --appDv=true && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng serve app-lob -o",
2727
"lint:app-crm": "ng lint app-crm",
2828
"build-ci": "gulp overwrite-package-json && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng build --configuration production",
29-
"build-ci:app-lob": "gulp overwrite-package-json && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng build app-lob --configuration production",
29+
"build-ci:app-lob": "gulp overwrite-package-json && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng build app-lob --configuration production && gulp prerenderPages",
3030
"build-ci:app-crm": "gulp overwrite-package-json && node --max_old_space_size=12192 node_modules/@angular/cli/bin/ng build app-crm --configuration production",
3131
"repositoryfyAngularDemos": "gulp repositoryfyAngularDemos",
3232
"repositoryfyAngularDemos:prod": "gulp repositoryfyAngularDemos --configuration production",

‎projects/app-crm/src/app/app.module.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import { NgModule } from '@angular/core';
22
import { FormsModule } from '@angular/forms';
33
import { BrowserModule, HammerModule } from '@angular/platform-browser';
44
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
5+
import { RouterModule } from '@angular/router';
56
import {
67
IgxAutocompleteModule, IgxButtonModule, IgxIconModule, IgxInputGroupModule, IgxLayoutModule,
78
IgxRippleModule, IgxGridModule, IgxAvatarModule
@@ -25,6 +26,7 @@ import { GridCRMComponent } from './grid-crm/grid-crm.component';
2526
IgxAvatarModule,
2627
IgxInputGroupModule,
2728
BrowserModule,
29+
RouterModule.forRoot([]),
2830
BrowserAnimationsModule,
2931
IgxButtonModule,
3032
FormsModule,

‎projects/app-crm/src/app/grid-crm/grid-crm.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="grid__wrapper">
1+
<div [ngClass]="{'grid__wrapper': true, 'dark_grid': dark === true }">
22
<igx-grid #grid1 [igxPreventDocumentScroll]="true" id="grid1" [data]="localData" [height]="'430px'" [moving]="true" [width]="'100%'" [rowSelection]="selectionMode" displayDensity="cosy" rowHeight="50" [allowFiltering]="true">
33
<igx-grid-toolbar>
44
<igx-grid-toolbar-actions>
@@ -35,7 +35,7 @@
3535
</span>
3636
</div>
3737
<div class="caseSensitiveButton">
38-
<button igxButton="icon" igxRipple [igxRippleCentered]="true" (click)="updateSearch()" [igxButtonBackground]="caseSensitive? 'rgb(73, 180, 254)' : 'transparent'">
38+
<button igxButton="icon" igxRipple [igxRippleCentered]="true" (click)="updateSearch()" [class]="caseSensitive? 'case-sensitive--active' : ''">
3939
<igx-icon class="caseSensitiveIcon" family="material">text_fields</igx-icon>
4040
</button>
4141
</div>

0 commit comments

Comments
 (0)