Skip to content

Commit

Permalink
Merge pull request #34 from supermurat/develop
Browse files Browse the repository at this point in the history 
Develop
  • Loading branch information
@supermurat
supermurat committed Mar 1, 2019
2 parents 8002f7a + 2e19e72 commit f60badd
Show file tree
Hide file tree
Showing 14 changed files with 100 additions and 85 deletions.
65 changes: 34 additions & 31 deletions functions/package.json
View file
@@ -1,5 +1,8 @@
{
"name": "functions",
"engines": {
"node": "8"
},
"scripts": {
"lint": "tslint --project tsconfig.json",
"build": "tsc",
Expand All @@ -11,42 +14,42 @@
},
"main": "lib/index.js",
"dependencies": {
"firebase-admin": "~7.0.0",
"firebase-functions": "^2.2.0",
"express": "~4.16.4",
"@angular/animations": "7.2.3",
"@angular/common": "7.2.3",
"@angular/compiler": "7.2.3",
"@angular/core": "7.2.3",
"firebase-admin": "7.0.0",
"firebase-functions": "2.2.0",
"express": "4.16.4",
"@angular/animations": "7.2.6",
"@angular/common": "7.2.6",
"@angular/compiler": "7.2.6",
"@angular/core": "7.2.6",
"@angular/fire": "5.1.1",
"@angular/forms": "7.2.3",
"@angular/http": "7.2.3",
"@angular/platform-browser": "7.2.3",
"@angular/platform-browser-dynamic": "7.2.3",
"@angular/platform-server": "7.2.3",
"@angular/pwa": "~0.13.0",
"@angular/router": "7.2.3",
"@angular/service-worker": "7.2.3",
"@fortawesome/fontawesome-free": "~5.7.1",
"@ng-bootstrap/ng-bootstrap": "4.0.2",
"angulartics2": "~7.4.1",
"bootstrap": "~4.2.1",
"classlist.js": "~1.1.20150312",
"core-js": "~2.6.3",
"dotenv": "~6.2.0",
"firebase": "5.8.2",
"grpc": "~1.18.0",
"html2plaintext": "~2.1.2",
"protractor": "~5.4.2",
"rxjs": "~6.4.0",
"tslib": "~1.9.3",
"zone.js": "~0.8.29",
"sitemap": "~2.1.0"
"@angular/forms": "7.2.6",
"@angular/http": "7.2.6",
"@angular/platform-browser": "7.2.6",
"@angular/platform-browser-dynamic": "7.2.6",
"@angular/platform-server": "7.2.6",
"@angular/pwa": "0.13.3",
"@angular/router": "7.2.6",
"@angular/service-worker": "7.2.6",
"@fortawesome/fontawesome-free": "5.7.2",
"@ng-bootstrap/ng-bootstrap": "4.0.4",
"angulartics2": "7.4.1",
"bootstrap": "4.3.1",
"classlist.js": "1.1.20150312",
"core-js": "2.6.5",
"dotenv": "6.2.0",
"firebase": "5.8.4",
"grpc": "1.18.0",
"html2plaintext": "2.1.2",
"protractor": "5.4.2",
"rxjs": "6.4.0",
"tslib": "1.9.3",
"zone.js": "0.8.29",
"sitemap": "2.1.0"
},
"devDependencies": {
"jquery": "~3.3.1",
"popper.js": "~1.14.7",
"tslint": "~5.12.1",
"tslint": "~5.13.0",
"typescript": "3.2.4"
},
"private": true
Expand Down
1 change: 1 addition & 0 deletions functions/src/jobs.ts
View file
Expand Up @@ -3,6 +3,7 @@ import * as functions from 'firebase-functions';
import { DocumentSnapshot } from 'firebase-functions/lib/providers/firestore';
import * as h2p from 'html2plaintext';
import * as sitemap from 'sitemap';

import { FUNCTIONS_CONFIG } from './config';
import { JobModel } from './job-model';
import { SiteMapUrlModel } from './site-map-url-model';
Expand Down
4 changes: 3 additions & 1 deletion functions/src/ssr.ts
View file
@@ -1,13 +1,15 @@
// tslint:disable-next-line:no-import-side-effect
// tslint:disable-next-line:no-import-side-effect ordered-imports
import 'zone.js/dist/zone-node';

// tslint:disable-next-line:ordered-imports
import { enableProdMode } from '@angular/core';
import { renderModuleFactory } from '@angular/platform-server';
import * as express from 'express';
import * as admin from 'firebase-admin';
import * as functions from 'firebase-functions';
import { existsSync, readFileSync } from 'fs';
import * as path from 'path';

import { FUNCTIONS_CONFIG } from './config';
import { FirstResponseModel } from './first-response-model';

Expand Down
20 changes: 10 additions & 10 deletions migrate-to-firebase/package.json
View file
Expand Up @@ -11,17 +11,17 @@
"imagemin": "npm run build && node ./lib/imagemin.js"
},
"dependencies": {
"colors": "^1.3.3",
"firebase-admin": "^7.0.0",
"fs": "^0.0.1-security",
"html2plaintext": "^2.1.2",
"imagemin": "^6.1.0",
"imagemin-webp": "^5.0.0",
"mysql": "^2.16.0",
"colors": "1.3.3",
"firebase-admin": "7.0.0",
"fs": "0.0.1-security",
"html2plaintext": "2.1.2",
"imagemin": "6.1.0",
"imagemin-webp": "5.0.0",
"mysql": "2.16.0",
"latinize": "0.4.0",
"mime-types": "^2.1.21",
"@google-cloud/storage": "^2.4.1",
"tslint": "~5.12.1",
"mime-types": "2.1.22",
"@google-cloud/storage": "2.4.2",
"tslint": "5.13.0",
"typescript": "3.2.4"
},
"private": true
Expand Down
1 change: 1 addition & 0 deletions migrate-to-firebase/src/download-data-from-firestore.ts
View file
@@ -1,5 +1,6 @@
import * as admin from 'firebase-admin';
import * as path from 'path';

import { checkDirectory, writeResultToFile } from './helper';

// tslint:disable-next-line:no-var-requires no-require-imports
Expand Down
1 change: 1 addition & 0 deletions migrate-to-firebase/src/download-files-from-fire-storage.ts
View file
Expand Up @@ -2,6 +2,7 @@ import * as colors from 'colors';
import * as admin from 'firebase-admin';
import * as fs from 'fs';
import * as path from 'path';

import { checkDirectory } from './helper';

// tslint:disable-next-line:no-var-requires no-require-imports
Expand Down
1 change: 1 addition & 0 deletions migrate-to-firebase/src/export-from-drupal-7.ts
View file
Expand Up @@ -4,6 +4,7 @@ import * as http from 'http';
import * as latinize from 'latinize';
import * as mysql from 'mysql';
import * as path from 'path';

import { checkDirectory, writeResultToFile } from './helper';

// tslint:disable-next-line:no-var-requires no-require-imports
Expand Down
1 change: 1 addition & 0 deletions migrate-to-firebase/src/export-from-mysql.ts
View file
@@ -1,6 +1,7 @@
import * as fs from 'fs';
import * as mysql from 'mysql';
import * as path from 'path';

import { writeResultToFile } from './helper';

// tslint:disable-next-line:no-var-requires no-require-imports
Expand Down
1 change: 1 addition & 0 deletions migrate-to-firebase/src/imagemin.ts
View file
Expand Up @@ -2,6 +2,7 @@ import * as colors from 'colors';
import * as imagemin from 'imagemin';
import * as imageminWebp from 'imagemin-webp';
import * as path from 'path';

import { checkDirectory, getDirectoriesRecursive } from './helper';

const pathOfData = `${path.dirname(__dirname) + path.sep}data`;
Expand Down
85 changes: 43 additions & 42 deletions package.json
View file
Expand Up @@ -52,58 +52,58 @@
},
"private": true,
"dependencies": {
"@angular/animations": "7.2.3",
"@angular/common": "7.2.3",
"@angular/compiler": "7.2.3",
"@angular/core": "7.2.3",
"@angular/animations": "7.2.6",
"@angular/common": "7.2.6",
"@angular/compiler": "7.2.6",
"@angular/core": "7.2.6",
"@angular/fire": "5.1.1",
"@angular/forms": "7.2.3",
"@angular/http": "7.2.3",
"@angular/platform-browser": "7.2.3",
"@angular/platform-browser-dynamic": "7.2.3",
"@angular/platform-server": "7.2.3",
"@angular/pwa": "~0.13.0",
"@angular/router": "7.2.3",
"@angular/service-worker": "7.2.3",
"@fortawesome/fontawesome-free": "~5.7.1",
"@ng-bootstrap/ng-bootstrap": "4.0.2",
"angulartics2": "~7.4.1",
"bootstrap": "~4.2.1",
"classlist.js": "~1.1.20150312",
"core-js": "~2.6.3",
"firebase": "5.8.2",
"grpc": "~1.18.0",
"protractor": "~5.4.2",
"rxjs": "~6.4.0",
"tslib": "~1.9.3",
"zone.js": "~0.8.29"
"@angular/forms": "7.2.6",
"@angular/http": "7.2.6",
"@angular/platform-browser": "7.2.6",
"@angular/platform-browser-dynamic": "7.2.6",
"@angular/platform-server": "7.2.6",
"@angular/pwa": "0.13.3",
"@angular/router": "7.2.6",
"@angular/service-worker": "7.2.6",
"@fortawesome/fontawesome-free": "5.7.2",
"@ng-bootstrap/ng-bootstrap": "4.0.4",
"angulartics2": "7.4.1",
"bootstrap": "4.3.1",
"classlist.js": "1.1.20150312",
"core-js": "2.6.5",
"firebase": "5.8.4",
"grpc": "1.18.0",
"protractor": "5.4.2",
"rxjs": "6.4.0",
"tslib": "1.9.3",
"zone.js": "0.8.29"
},
"devDependencies": {
"@angular-devkit/build-angular": "0.13.0",
"@angular/cli": "7.3.0",
"@angular/compiler-cli": "7.2.3",
"@angular/language-service": "7.2.3",
"@commitlint/cli": "~7.5.0",
"@angular-devkit/build-angular": "0.13.3",
"@angular/cli": "7.3.3",
"@angular/compiler-cli": "7.2.6",
"@angular/language-service": "7.2.6",
"@commitlint/cli": "~7.5.2",
"@commitlint/config-conventional": "~7.5.0",
"@types/jasmine": "~3.3.8",
"@types/jasmine": "~3.3.9",
"@types/jasminewd2": "~2.0.6",
"@types/node": "~10.12.21",
"acorn": "^6.0.6",
"@types/node": "~11.9.5",
"acorn": "^6.1.0",
"angular-tslint-rules": "~1.12.1",
"browserslist": "~4.4.1",
"browserslist": "~4.4.2",
"browserstack-local": "~1.3.7",
"codacy-coverage": "~3.4.0",
"codelyzer": "~4.5.0",
"coveralls": "~3.0.2",
"coveralls": "~3.0.3",
"husky": "~1.3.1",
"htmlhint": "~0.10.1",
"htmlhint": "~0.11.0",
"jasmine-core": "~3.3.0",
"jasmine-spec-reporter": "~4.2.1",
"jquery": "~3.3.1",
"karma": "~4.0.0",
"karma-chrome-launcher": "~2.2.0",
"karma-cli": "~2.0.0",
"karma-coverage-istanbul-reporter": "~2.0.4",
"karma-coverage-istanbul-reporter": "~2.0.5",
"karma-jasmine": "~2.0.1",
"karma-jasmine-html-reporter": "~1.4.0",
"karma-mocha-reporter": "~2.2.5",
Expand All @@ -117,17 +117,18 @@
"stylelint": "~9.10.1",
"stylelint-config-recommended-scss": "~3.2.0",
"stylelint-config-standard": "~18.2.0",
"stylelint-scss": "~3.5.2",
"terser": "3.14.1",
"stylelint-scss": "~3.5.4",
"terser": "3.16.1",
"ts-node": "~8.0.2",
"tslint": "5.12.1",
"tslint": "5.13.0",
"typescript": "3.2.4",
"webpack": "~4.29.0",
"webpack-bundle-analyzer": "~3.0.3"
"webpack": "~4.29.5",
"webpack-bundle-analyzer": "~3.0.4"
},
"remarkConfig": {
"plugins": [
"remark-preset-lint-markdown-style-guide"
"remark-preset-lint-markdown-style-guide",
["remark-lint-list-item-indent", true]
]
},
"husky": {
Expand Down
1 change: 1 addition & 0 deletions src/app/app-routing.module.ts
View file
Expand Up @@ -198,5 +198,6 @@ const routes: Routes = [
})],
exports: [RouterModule]
})
// istanbul ignore next
export class AppRoutingModule {
}
1 change: 1 addition & 0 deletions src/app/app.module.ts
View file
Expand Up @@ -112,5 +112,6 @@ import { SearchBarComponent } from './widgets/search-bar/search-bar.component';
],
bootstrap: [AppComponent]
})
// istanbul ignore next
export class AppModule {
}
1 change: 1 addition & 0 deletions src/app/components/loading-spinner/loading-spinner.component.ts
View file
Expand Up @@ -8,5 +8,6 @@ import { Component } from '@angular/core';
templateUrl: './loading-spinner.component.html',
styleUrls: ['./loading-spinner.component.scss']
})
// istanbul ignore next
export class LoadingSpinnerComponent {
}
2 changes: 1 addition & 1 deletion src/app/services/seo.service.ts
View file
Expand Up @@ -165,7 +165,7 @@ export class SeoService {
Object.keys(tempPage.seo.properties)
.forEach((prop: string) => {
this.meta.updateTag({property: prop, content: tempPage.seo.properties[prop]}, `property='${prop}'`);
this.customSEOMetaTags.push({type: 'name', value: prop});
this.customSEOMetaTags.push({type: 'property', value: prop});
});
}
}
Expand Down

0 comments on commit f60badd

Please sign in to comment.