mirror of
https://github.com/d0zingcat/gocryptotrader.git
synced 2026-05-20 07:26:46 +00:00
Updates everything to latest stable,rc and beta versions of Angular, cli, material, webpack yeahhhh
This commit is contained in:
2660
web/package-lock.json
generated
2660
web/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -46,19 +46,18 @@
|
||||
"e2e": "protractor ./protractor.conf.js"
|
||||
},
|
||||
"dependencies": {
|
||||
"@amcharts/amcharts3-angular": "^1.5.0",
|
||||
"@angular/animations": "^5.0.0",
|
||||
"@angular/cdk": "^2.0.0-beta.12",
|
||||
"@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/material": "^2.0.0-beta.12",
|
||||
"@angular/platform-browser": "5.0.0",
|
||||
"@angular/platform-browser-dynamic": "5.0.0",
|
||||
"@angular/router": "5.0.0",
|
||||
"@ngtools/webpack": "^1.7.4",
|
||||
"@angular/animations": "5.0.2",
|
||||
"@angular/cdk": "5.0.0-rc0",
|
||||
"@angular/common": "5.0.2",
|
||||
"@angular/compiler": "5.0.2",
|
||||
"@angular/core": "5.0.2",
|
||||
"@angular/forms": "5.0.2",
|
||||
"@angular/http": "5.0.2",
|
||||
"@angular/material": "^5.0.0-rc0",
|
||||
"@angular/platform-browser": "5.0.2",
|
||||
"@angular/platform-browser-dynamic": "5.0.2",
|
||||
"@angular/router": "5.0.2",
|
||||
"@ngtools/webpack": "1.8.2",
|
||||
"core-js": "2.4.1",
|
||||
"enhanced-resolve": "3.3.0",
|
||||
"extract-text-webpack-plugin": "^3.0.1",
|
||||
@@ -67,8 +66,8 @@
|
||||
"zone.js": "0.8.12"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@angular/cli": "^1.5.0",
|
||||
"@angular/compiler-cli": "5.0.0",
|
||||
"@angular/cli": "^1.5.2",
|
||||
"@angular/compiler-cli": "5.0.2",
|
||||
"@types/bluebird": "3.5.8",
|
||||
"@types/core-js": "0.9.36",
|
||||
"@types/jasmine": "2.5.53",
|
||||
@@ -114,8 +113,8 @@
|
||||
"typescript": "2.4.2",
|
||||
"url-loader": "0.5.9",
|
||||
"webdriver-manager": "12.0.6",
|
||||
"webpack": "3.3.0",
|
||||
"webpack-dev-server": "2.5.0"
|
||||
"webpack": "3.8.1",
|
||||
"webpack-dev-server": "2.9.4"
|
||||
},
|
||||
"license": "SEE LICENSE IN LICENSE.md"
|
||||
}
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
.container {
|
||||
height: 96vmax;
|
||||
height: 100vmax;
|
||||
}
|
||||
|
||||
.main {
|
||||
@@ -14,6 +14,12 @@
|
||||
|
||||
.sidebar {
|
||||
width: 14%;
|
||||
position: fixed;
|
||||
margin-top: 64px;
|
||||
}
|
||||
|
||||
.navbar {
|
||||
position: fixed;
|
||||
}
|
||||
|
||||
.dashboard-highlight {
|
||||
|
||||
@@ -1,17 +1,63 @@
|
||||
<mat-grid-list cols="3" rowHeight="300px">
|
||||
<mat-grid-tile [colspan]="1" [rowspan]="2">
|
||||
<app-trade-history></app-trade-history>
|
||||
</mat-grid-tile>
|
||||
<mat-grid-tile [colspan]="2" [rowspan]="1">
|
||||
<app-price-history></app-price-history>
|
||||
</mat-grid-tile>
|
||||
<mat-grid-tile [colspan]="1" [rowspan]="1">
|
||||
<app-my-orders></app-my-orders>
|
||||
</mat-grid-tile>
|
||||
<mat-grid-tile [colspan]="1" [rowspan]="1">
|
||||
<app-orders></app-orders>
|
||||
</mat-grid-tile>
|
||||
<mat-grid-tile [colspan]="1" [rowspan]="2">
|
||||
<mat-card class="full-card">
|
||||
<mat-card-header>
|
||||
<mat-card-title>Shiba Inu</mat-card-title>
|
||||
<mat-card-subtitle>Dog Breed</mat-card-subtitle>
|
||||
</mat-card-header>
|
||||
<mat-card-content style="height:80%">
|
||||
HI
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
<button mat-button>EXPAND</button>
|
||||
</mat-card-actions>
|
||||
</mat-card>
|
||||
</mat-grid-tile>
|
||||
<mat-grid-tile [colspan]="2" [rowspan]="1">
|
||||
<mat-card class="full-card">
|
||||
<mat-card-header>
|
||||
<mat-card-title>Shiba Inu</mat-card-title>
|
||||
<mat-card-subtitle>Dog Breed</mat-card-subtitle>
|
||||
</mat-card-header>
|
||||
<mat-card-content>
|
||||
HI
|
||||
</mat-card-content>
|
||||
|
||||
<mat-card-actions>
|
||||
<button mat-button>EXPAND</button>
|
||||
</mat-card-actions>
|
||||
<mat-card-footer>lkasdjf; la</mat-card-footer>
|
||||
</mat-card>
|
||||
</mat-grid-tile>
|
||||
<mat-grid-tile [colspan]="1" [rowspan]="1">
|
||||
<mat-card class="full-card">
|
||||
<mat-card-header>
|
||||
<mat-card-title>Shiba Inu</mat-card-title>
|
||||
<mat-card-subtitle>Dog Breed</mat-card-subtitle>
|
||||
</mat-card-header>
|
||||
<mat-card-content style="height:80%">
|
||||
HI
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
<button mat-button>EXPAND</button>
|
||||
</mat-card-actions>
|
||||
</mat-card>
|
||||
</mat-grid-tile>
|
||||
<mat-grid-tile [colspan]="1" [rowspan]="1">
|
||||
<mat-card class="full-card">
|
||||
<mat-card-header>
|
||||
<mat-card-title>Shiba Inu</mat-card-title>
|
||||
<mat-card-subtitle>Dog Breed</mat-card-subtitle>
|
||||
</mat-card-header>
|
||||
<mat-card-content style="height:80%">
|
||||
HI
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
<button mat-button>EXPAND</button>
|
||||
</mat-card-actions>
|
||||
</mat-card>
|
||||
</mat-grid-tile>
|
||||
</mat-grid-list>
|
||||
|
||||
|
||||
<app-all-enabled-currency-tickers></app-all-enabled-currency-tickers>
|
||||
<app-all-enabled-currency-tickers></app-all-enabled-currency-tickers>
|
||||
@@ -1,10 +1,9 @@
|
||||
app-trade-history, app-orders, app-price-history, app-my-orders {
|
||||
height:100%;
|
||||
width:100%;
|
||||
margin: 15px;
|
||||
.full-card {
|
||||
margin: 10px;
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.my-orders-card, .orders-card,.trade-history-card,.price-history-card {
|
||||
height: 90%;
|
||||
width:90%;
|
||||
::ng-deep mat-grid-tile.mat-grid-tile .mat-figure {
|
||||
align-items: initial;
|
||||
/*vertical alignment*/
|
||||
}
|
||||
@@ -1 +1,16 @@
|
||||
<h1>Howdy!</h1>
|
||||
<mat-card class="example-card">
|
||||
<mat-card-header>
|
||||
<div class="example-header-image"></div>
|
||||
<mat-card-title>Shiba Inu</mat-card-title>
|
||||
<mat-card-subtitle>Dog Breed</mat-card-subtitle>
|
||||
</mat-card-header>
|
||||
<mat-card-content>
|
||||
<p>
|
||||
The Shiba Inu is the smallest of the six original and distinct spitz breeds of dog from Japan. A small, agile dog that copes very well with mountainous terrain, the Shiba Inu was originally bred for hunting.
|
||||
</p>
|
||||
</mat-card-content>
|
||||
<mat-card-actions>
|
||||
<button mat-button>LIKE</button>
|
||||
<button mat-button>SHARE</button>
|
||||
</mat-card-actions>
|
||||
</mat-card>
|
||||
@@ -0,0 +1,3 @@
|
||||
.example-card {
|
||||
width: 400px;
|
||||
}
|
||||
@@ -20,7 +20,9 @@ export class SidebarService {
|
||||
* @returns Promise<MatSidnavToggleResult>
|
||||
*/
|
||||
public open(): Promise<MatDrawerToggleResult> {
|
||||
return this.sidenav.open();
|
||||
this.sidenav.open();
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -29,7 +31,8 @@ export class SidebarService {
|
||||
* @returns Promise<MatSidnavToggleResult>
|
||||
*/
|
||||
public close(): Promise<MatDrawerToggleResult> {
|
||||
return this.sidenav.close();
|
||||
this.sidenav.close();
|
||||
return;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -40,6 +43,7 @@ export class SidebarService {
|
||||
* @returns {Promise<MatSidnavToggleResult>}
|
||||
*/
|
||||
public toggle(isOpen?: boolean): Promise<MatDrawerToggleResult> {
|
||||
return this.sidenav.toggle(isOpen);
|
||||
this.sidenav.toggle(isOpen);
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -27,23 +27,21 @@ body {
|
||||
margin: 0px auto !important;
|
||||
}
|
||||
|
||||
.mat-expansion-panel-header-title,
|
||||
.mat-expansion-panel-header-description {
|
||||
flex-basis: 0;
|
||||
.mat-expansion-panel-header-title,
|
||||
.mat-expansion-panel-header-description {
|
||||
flex-basis: 0;
|
||||
}
|
||||
|
||||
.mat-expansion-panel-header-description {
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
}
|
||||
|
||||
.mat-expansion-panel-spacing {
|
||||
margin: 16px auto !important;
|
||||
width: 85%;
|
||||
|
||||
}
|
||||
|
||||
|
||||
.mat-drawer {
|
||||
background: none !important;
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
{
|
||||
"compileOnSave": false,
|
||||
"compilerOptions": {
|
||||
"module":"system",
|
||||
"outDir": "./dist/out-tsc",
|
||||
"baseUrl": "src",
|
||||
"sourceMap": true,
|
||||
@@ -8,7 +9,7 @@
|
||||
"moduleResolution": "node",
|
||||
"emitDecoratorMetadata": true,
|
||||
"experimentalDecorators": true,
|
||||
"allowJs": true,
|
||||
"allowJs": false,
|
||||
"target": "es5",
|
||||
"paths": {
|
||||
"environments": [
|
||||
|
||||
@@ -9,7 +9,7 @@ const postcssUrl = require('postcss-url');
|
||||
const { NoEmitOnErrorsPlugin, LoaderOptionsPlugin, DefinePlugin, HashedModuleIdsPlugin } = require('webpack');
|
||||
const { GlobCopyWebpackPlugin, BaseHrefWebpackPlugin } = require('@angular/cli/plugins/webpack');
|
||||
const { CommonsChunkPlugin, UglifyJsPlugin } = require('webpack').optimize;
|
||||
const { AotPlugin } = require('@ngtools/webpack');
|
||||
const { AngularCompilerPlugin } = require('@ngtools/webpack');
|
||||
|
||||
const nodeModules = path.join(process.cwd(), 'node_modules');
|
||||
const entryPoints = ["inline", "polyfills", "sw-register", "styles", "vendor", "main"];
|
||||
@@ -139,7 +139,7 @@ function getPlugins() {
|
||||
"hashDigestLength": 4
|
||||
}));
|
||||
|
||||
plugins.push(new AotPlugin({
|
||||
plugins.push(new AngularCompilerPlugin({
|
||||
"mainPath": "main.ts",
|
||||
"hostReplacementPaths": {
|
||||
"environments/index.ts": "environments/index.prod.ts"
|
||||
@@ -160,7 +160,7 @@ function getPlugins() {
|
||||
}));
|
||||
|
||||
} else {
|
||||
plugins.push(new AotPlugin({
|
||||
plugins.push(new AngularCompilerPlugin({
|
||||
"mainPath": "main.ts",
|
||||
"hostReplacementPaths": {
|
||||
"environments/index.ts": "environments/index.ts"
|
||||
@@ -364,7 +364,7 @@ module.exports = {
|
||||
})
|
||||
},
|
||||
{
|
||||
"test": /\.ts$/,
|
||||
"test": /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/,
|
||||
"loader": "@ngtools/webpack"
|
||||
}
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user