Skip to content

Commit

Permalink
Fixes build issues. Removes warnings.
Browse files Browse the repository at this point in the history
  • Loading branch information
gloriousCode committed Aug 15, 2018
1 parent a7ed69c commit f7bc243
Show file tree
Hide file tree
Showing 11 changed files with 4,288 additions and 750 deletions.
4,803 changes: 4,165 additions & 638 deletions web/package-lock.json

Large diffs are not rendered by default.

202 changes: 100 additions & 102 deletions web/package.json
Original file line number Diff line number Diff line change
@@ -1,105 +1,103 @@
{
"name": "gocryptotrader-web",
"version": "0.4.0",
"description": "Front-end interface for GoCryptoTrader",
"homepage": "https://github.com/thrasher-/gocryptotrader",
"author": {
"name": "Scott",
"email": "[email protected]",
"github": "https://github.com/gloriousCode/",
"website": "https://www.gloriousedge.com"
},
"contributors": [
{
"name": "Maxime GRIS",
"email": "[email protected]",
"github": "https://github.com/maximegris/"
}
],
"keywords": [
"angular",
"electron",
"typescript",
"sass",
"bitcoin",
"exchange"
],
"main": "main.js",
"private": true,
"scripts": {
"postinstall": "npx electron-builder install-app-deps",
"ng": "ng",
"start": "node hooks/environments/set_profile.js && npm-run-all -p ng:serve electron:serve",
"build": "node hooks/environments/set_profile.js && ng build && npm run electron:tsc",
"build:prod": "node hooks/environments/set_profile.js && ng build --prod && npm run electron:tsc",
"lint": "tslint -c tslint.json src/**/*{.ts,.tsx} main.ts",
"lint:fix": "tslint --fix -c tslint.json src/**/*{.ts,.tsx} main.ts",
"ng:serve": "ng serve -o",
"electron:tsc": "tsc main.ts",
"electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:tsc && electron . --serve",
"electron:local": "npm run build:prod && electron .",
"electron:linux": "npm run build:prod && npx electron-builder build --linux",
"electron:windows": "npm run build:prod && npx electron-builder build --windows",
"electron:mac": "npm run build:prod && npx electron-builder build --mac",
"test": "karma start ./karma.conf.js",
"pree2e:build": "webdriver-manager update --gecko false && npm run ng serve",
"pree2e:protractor": "wait-on http-get://localhost:4200/ && protractor ./protractor.conf.js",
"e2e": "npm-run-all -p -r pree2e:build pree2e:protractor",
"start:web": "ng serve --o"
},
"dependencies": {
"node-sass": "^4.9.2",
"rxjs-compat": "^6.2.1",
"rxjs-tslint": "^0.1.5"
},
"devDependencies": {
"@amcharts/amcharts3-angular": "^2.1.1",
"@angular-devkit/build-angular": "~0.6.8",
"@angular/animations": "^6.0.9",
"@angular/cdk": "^6.4.0",
"@angular/cli": "^6.0.8",
"@angular/common": "^6.0.9",
"@angular/compiler": "^6.0.9",
"@angular/compiler-cli": "^6.0.9",
"@angular/core": "^6.0.9",
"@angular/forms": "^6.0.9",
"@angular/http": "^6.0.9",
"@angular/language-service": "^6.0.9",
"@angular/material": "^6.4.0",
"@angular/platform-browser": "^6.0.9",
"@angular/platform-browser-dynamic": "^6.0.9",
"@angular/router": "^6.0.9",
"@ngx-translate/core": "^9.1.1",
"@ngx-translate/http-loader": "^2.0.1",
"@types/core-js": "^0.9.46",
"@types/jasmine": "^2.8.8",
"@types/jasminewd2": "^2.0.3",
"@types/node": "^7.0.67",
"codelyzer": "^4.4.2",
"core-js": "^2.5.7",
"cross-env": "^5.2.0",
"dotenv": "^6.0.0",
"electron": "^1.8.7",
"electron-builder": "^20.15.3",
"electron-reload": "^1.2.5",
"fs-extra": "^5.0.0",
"jasmine-core": "^2.99.1",
"jasmine-spec-reporter": "^4.2.1",
"karma": "^2.0.4",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^1.4.3",
"karma-jasmine": "^1.1.2",
"karma-jasmine-html-reporter": "^1.2.0",
"npm-run-all": "^4.1.3",
"npx": "^10.2.0",
"protractor": "^5.3.2",
"replace": "^0.3.0",
"rxjs": "^6.2.1",
"ts-node": "^4.1.0",
"tslint": "^5.11.0",
"typescript": "^2.7.2",
"wait-on": "^2.1.0",
"webdriver-manager": "^12.0.6",
"zone.js": "^0.8.26"
"name": "gocryptotrader-web",
"version": "0.4.0",
"description": "Front-end interface for GoCryptoTrader",
"homepage": "https://github.com/thrasher-/gocryptotrader",
"author": {
"name": "Scott",
"email": "[email protected]",
"github": "https://github.com/gloriousCode/",
"website": "https://www.gloriousedge.com"
},
"contributors": [
{
"name": "Maxime GRIS",
"email": "[email protected]",
"github": "https://github.com/maximegris/"
}
],
"keywords": [
"angular",
"electron",
"typescript",
"sass",
"bitcoin",
"exchange"
],
"main": "main.js",
"private": true,
"scripts": {
"postinstall": "node patch-zone-js.js",
"ng": "ng",
"start": "node hooks/environments/set_profile.js && npm-run-all -p ng:serve electron:serve",
"build": "node hooks/environments/set_profile.js && ng build && npm run electron:tsc",
"build:prod": "node hooks/environments/set_profile.js && ng build --prod && npm run electron:tsc",
"lint": "tslint -c tslint.json src/**/*{.ts,.tsx} main.ts",
"lint:fix": "tslint --fix -c tslint.json src/**/*{.ts,.tsx} main.ts",
"ng:serve": "ng serve -o",
"electron:tsc": "tsc main.ts",
"electron:serve": "wait-on http-get://localhost:4200/ && npm run electron:tsc && electron . --serve",
"electron:local": "npm run build:prod && electron .",
"electron:linux": "npm run build:prod && electron-builder build --linux",
"electron:windows": "npm run build:prod && electron-builder build --windows",
"electron:mac": "npm run build:prod && electron-builder build --mac",
"test": "ng test --karma-config ./karma.conf.js",
"pree2e:build": "webdriver-manager update --gecko false && npm run ng serve",
"pree2e:protractor": "wait-on http-get://localhost:4200/ && protractor ./protractor.conf.js",
"e2e": "npm-run-all -p -r pree2e:build pree2e:protractor",
"start:web": "ng serve --o"
},
"dependencies": {
"node-sass": "^4.9.2",
"rxjs-compat": "^6.2.1",
"rxjs-tslint": "^0.1.5"
},
"devDependencies": {
"@amcharts/amcharts3-angular": "^2.1.1",
"@angular-devkit/build-angular": "~0.6.8",
"@angular/animations": "^6.1.2",
"@angular/cdk": "^6.4.0",
"@angular/cli": "^6.0.8",
"@angular/common": "^6.1.2",
"@angular/compiler": "^6.1.2",
"@angular/compiler-cli": "^6.1.2",
"@angular/core": "^6.1.2",
"@angular/forms": "^6.1.2",
"@angular/http": "^6.1.2",
"@angular/language-service": "^6.1.2",
"@angular/material": "^6.4.0",
"@angular/platform-browser": "^6.1.2",
"@angular/platform-browser-dynamic": "^6.1.2",
"@angular/router": "^6.1.2",
"@ngx-translate/core": "^9.1.1",
"@ngx-translate/http-loader": "^2.0.1",
"@types/jasmine": "^2.8.8",
"@types/jasminewd2": "^2.0.3",
"@types/node": "^7.0.67",
"codelyzer": "^4.4.2",
"cross-env": "^5.2.0",
"dotenv": "^6.0.0",
"electron": "^2.0.7",
"electron-builder": "^20.27.1",
"electron-reload": "^1.2.5",
"fs-extra": "^5.0.0",
"jasmine-core": "^2.99.1",
"jasmine-spec-reporter": "^4.2.1",
"karma": "^2.0.4",
"karma-chrome-launcher": "^2.2.0",
"karma-coverage-istanbul-reporter": "^1.4.3",
"karma-jasmine": "^1.1.2",
"karma-jasmine-html-reporter": "^1.2.0",
"npm-run-all": "^4.1.3",
"npx": "^10.2.0",
"protractor": "^5.3.2",
"replace": "^0.3.0",
"rxjs": "^6.2.2",
"ts-node": "^4.1.0",
"tslint": "^5.11.0",
"typescript": "^2.9.2",
"wait-on": "^2.1.0",
"webdriver-manager": "^12.0.6",
"zone.js": "^0.8.26"
}
}
13 changes: 13 additions & 0 deletions web/patch-zone-js.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
const fs = require('fs');
const f = 'node_modules/@angular-devkit/build-angular/src/angular-cli-files/models/webpack-configs/browser.js';

fs.readFile(f, 'utf8', function (err,data) {
if (err) {
return console.log(err);
}
var result = data.replace(/node: false/g, 'node: {crypto: true, stream: true, fs: \'empty\'}');

fs.writeFile(f, result, 'utf8', function (err) {
if (err) return console.log(err);
});
});
2 changes: 1 addition & 1 deletion web/src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ import { SettingsComponent, EnabledCurrenciesDialogueComponent } from './pages/s
// Shared
import { NavbarComponent } from './shared/navbar/navbar.component';
import { AllEnabledCurrencyTickersComponent } from './shared/all-updates-ticker/all-updates-ticker.component';
import { ThemePickerComponent } from './shared/theme-picker/theme-picker';
import { ThemePickerComponent } from './shared/theme-picker/theme-picker.component';
import {IterateMapPipe, EnabledCurrenciesPipe} from './shared/classes/pipes';
// services
import { WebsocketService } from './services/websocket/websocket.service';
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
import {inject, TestBed} from '@angular/core/testing';
import {HttpModule} from '@angular/http';
import {StyleManagerComponent} from './style-manager.component';
import {StyleManagerService} from './style-manager.service';


describe('StyleManager', () => {
let styleManager: StyleManagerComponent;
let styleManager: StyleManagerService;

beforeEach(() => TestBed.configureTestingModule({
imports: [HttpModule],
providers: [StyleManagerComponent]
providers: [StyleManagerService]
}));

beforeEach(inject([StyleManagerComponent], (sm: StyleManagerComponent) => {
beforeEach(inject([StyleManagerService], (sm: StyleManagerService) => {
styleManager = sm;
}));

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { AllEnabledCurrencyTickersComponent } from './all-enabled-currency-tickers.component';
import { AllEnabledCurrencyTickersComponent } from './all-updates-ticker.component';

describe('AllEnabledCurrencyTickersComponent', () => {
let component: AllEnabledCurrencyTickersComponent;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import {CommonModule} from '@angular/common';

@Component({
selector: 'app-theme-picker',
templateUrl: 'theme-picker.html',
styleUrls: ['theme-picker.scss'],
templateUrl: 'theme-picker.component.html',
styleUrls: ['theme-picker.component.scss'],
changeDetection: ChangeDetectionStrategy.OnPush,
encapsulation: ViewEncapsulation.None,
host: {'aria-hidden': 'true'},
Expand Down
4 changes: 2 additions & 2 deletions web/src/polyfills.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@


/** Evergreen browsers require these. **/
import 'core-js/es6/reflect';
import 'core-js/es7/reflect';
//import 'core-js/es6/reflect';
//import 'core-js/es7/reflect';


/** ALL Firefox browsers require the following to support `@angular/animation`. **/
Expand Down

0 comments on commit f7bc243

Please sign in to comment.