Commit e1ed489c authored by Qianwen's avatar Qianwen
Browse files

fix and update

parent b8dd6232
Pipeline #565392 passed with stages
in 3 minutes and 32 seconds
......@@ -25,7 +25,6 @@
"main": "src/main.ts",
"polyfills": "src/polyfills.ts",
"tsConfig": "tsconfig.app.json",
"aot": true,
"assets": [
"src/favicon.ico",
"src/assets"
......@@ -35,7 +34,13 @@
"node_modules/bootstrap/dist/css/bootstrap.min.css",
"src/styles.scss"
],
"scripts": []
"scripts": [],
"vendorChunk": true,
"extractLicenses": false,
"buildOptimizer": false,
"sourceMap": true,
"optimization": false,
"namedChunks": true
},
"configurations": {
"production": {
......@@ -65,7 +70,8 @@
}
]
}
}
},
"defaultConfiguration": ""
},
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
......
This diff is collapsed.
......@@ -11,17 +11,17 @@
},
"private": true,
"dependencies": {
"@angular/animations": "~11.0.4",
"@angular/cdk": "^11.2.8",
"@angular/common": "~11.0.4",
"@angular/compiler": "~11.0.4",
"@angular/core": "~11.0.4",
"@angular/forms": "~11.0.4",
"@angular/localize": "~11.0.4",
"@angular/material": "^11.2.8",
"@angular/platform-browser": "~11.0.4",
"@angular/platform-browser-dynamic": "~11.0.4",
"@angular/router": "~11.0.4",
"@angular/animations": "~12.2.10",
"@angular/cdk": "^12.2.9",
"@angular/common": "~12.2.10",
"@angular/compiler": "~12.2.10",
"@angular/core": "~12.2.10",
"@angular/forms": "~12.2.10",
"@angular/localize": "~12.2.10",
"@angular/material": "^12.2.9",
"@angular/platform-browser": "~12.2.10",
"@angular/platform-browser-dynamic": "~12.2.10",
"@angular/router": "~12.2.10",
"@ng-bootstrap/ng-bootstrap": "^9.0.2",
"@swimlane/ngx-charts": "^17.0.1",
"@types/cytoscape": "^3.14.13",
......@@ -31,22 +31,22 @@
"cytoscape-popper": "^2.0.0",
"install": "^0.13.0",
"luxon": "^1.26.0",
"ngx-mat-timepicker": "^11.0.5",
"ngx-mat-timepicker": "^12.0.0",
"ngx-pagination": "^5.1.0",
"rxjs": "~6.6.0",
"tslib": "^2.2.0",
"zone.js": "~0.10.2"
"zone.js": "~0.11.4"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.1100.4",
"@angular/cli": "^11.0.4",
"@angular/compiler-cli": "^11.0.4",
"@angular-devkit/build-angular": "~12.2.10",
"@angular/cli": "^12.2.10",
"@angular/compiler-cli": "^12.2.10",
"@types/jasmine": "~3.6.0",
"@types/node": "^12.20.10",
"codelyzer": "^6.0.0",
"jasmine-core": "~3.6.0",
"jasmine-spec-reporter": "~5.0.0",
"karma": "~5.1.0",
"karma": "~6.3.4",
"karma-chrome-launcher": "~3.1.0",
"karma-coverage": "~2.0.3",
"karma-jasmine": "~4.0.0",
......@@ -55,6 +55,6 @@
"schematics-scss-migrate": "^1.3.13",
"ts-node": "~8.3.0",
"tslint": "~6.1.0",
"typescript": "~4.0.2"
"typescript": "~4.3.5"
}
}
......@@ -48,12 +48,12 @@
</div>
</div>
<div *ngIf="MASID.length === 0" class="d-flex flex-column justify-content-center align-items-center">
<div *ngIf="MASID.length === 0" class="overview-empty d-flex flex-column justify-content-center align-items-center">
<div *ngIf="status==='Connecting......'" class="spinner-border process-spinner mb-5" role="status">
<span class="sr-only">Loading...</span>
</div>
<h1 class="status mb-5">{{status}}</h1>
<button *ngIf="status==='Currently no MASs, create one......'" type='button' class="btn btn-secondary" (click)="openLg(content)">+ New MAS</button>
<button *ngIf="status==='Currently no MASs, create one......'" type='button' class="btn btn-lg btn-secondary" (click)="openLg(content)">+ New MAS</button>
</div>
......
// Custom Theming for Angular Material
@use '~@angular/material' as mat;
// For more information: https://material.angular.io/guide/theming
@import '~@angular/material/theming';
// Plus imports for other components in your app.
// Include the common styles for Angular Material. We include this here so that you only
// have to load a single css file for Angular Material in your app.
// Be sure that you only ever include this mixin once!
@include mat-core();
@include mat.core();
// Define the palettes for your theme using the Material Design palettes available in palette.scss
// (imported above). For each palette, you can optionally specify a default, lighter, and darker
// hue. Available color palettes: https://material.io/design/color/
$clonemap-frontend-primary: mat-palette($mat-indigo);
$clonemap-frontend-accent: mat-palette($mat-pink, A200, A100, A400);
/* For use in src/lib/core/theming/_palette.scss */
$mat-clonemap: (
50 : #ededff,
100 : #d1d1ff,
200 : #b3b3ff,
300 : #9494ff,
400 : #7d7dff,
500 : #6666ff,
600 : #5e5eff,
700 : #5353ff,
800 : #4949ff,
900 : #3838ff,
A100 : #ffffff,
A200 : #ffffff,
A400 : #e1e1ff,
A700 : #c8c8ff,
contrast: (
50 : #000000,
100 : #000000,
200 : #000000,
300 : #000000,
400 : #000000,
500 : #ffffff,
600 : #ffffff,
700 : #ffffff,
800 : #ffffff,
900 : #ffffff,
A100 : #000000,
A200 : #000000,
A400 : #000000,
A700 : #000000,
)
);
$clonemap-frontend-primary: mat.define-palette($mat-clonemap);
$clonemap-frontend-accent: mat.define-palette(mat.$pink-palette, A200, A100, A400);
// The warn palette is optional (defaults to red).
$clonemap-frontend-warn: mat-palette($mat-red);
$clonemap-frontend-warn: mat.define-palette(mat.$red-palette);
// Create the theme object. A theme consists of configurations for individual
// theming systems such as "color" or "typography".
$clonemap-frontend-theme: mat-light-theme((
$clonemap-frontend-theme: mat.define-light-theme((
color: (
primary: $clonemap-frontend-primary,
accent: $clonemap-frontend-accent,
......@@ -31,5 +70,5 @@ $clonemap-frontend-theme: mat-light-theme((
// Include theme styles for core and each component used in your app.
// Alternatively, you can import and @include the theme mixins for each component
// that you are using.
@include angular-material-theme($clonemap-frontend-theme);
@include mat.all-component-themes($clonemap-frontend-theme);
......@@ -14,4 +14,4 @@ export const environment = {
* This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown.
*/
// import 'zone.js/dist/zone-error'; // Included with Angular CLI.
// import 'zone.js/plugins/zone-error'; // Included with Angular CLI.
......@@ -59,7 +59,7 @@ import '@angular/localize/init';
/***************************************************************************************************
* Zone JS is required by default for Angular itself.
*/
import 'zone.js/dist/zone'; // Included with Angular CLI.
import 'zone.js'; // Included with Angular CLI.
/***************************************************************************************************
......
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/dist/zone-testing';
import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment