You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2020/08/15 21:54:08 UTC
[incubator-streampipes] 01/11: [STREAMPIPES-193] Remove AngularJS
dependencies from package.json
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch STREAMPIPES-193
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 83d25c5b39b051868f4e59c7205b9c3874239329
Author: Dominik Riemer <ri...@fzi.de>
AuthorDate: Wed Aug 12 08:58:49 2020 +0200
[STREAMPIPES-193] Remove AngularJS dependencies from package.json
---
ui/package.json | 30 ++++------------------
.../components/toolbar/toolbar.component.html | 2 +-
.../standalone/standalone-dashboard.component.ts | 1 -
.../app/data-explorer/data-explorer.component.css | 2 +-
ui/src/app/pipelines/pipelines.module.ts | 3 ---
ui/src/scss/main.scss | 1 -
6 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/ui/package.json b/ui/package.json
index e7d1bbc..140a8ad 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -11,9 +11,10 @@
"start": "node ./deployment/prebuild.js && ng serve",
"watchtest": "node ./deployment/prebuild.js && karma start ./karma.conf.js --no-auto-watch --single-run",
"test": "node ./deployment/prebuild.js && karma start ./karma.conf.js",
- "build": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --prod",
+ "build": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --prod --stats-json",
"build-rc": "node ./deployment/prebuild.js rel && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --prod",
- "lint": "tslint -c tslint.json 'src/**/*.ts*"
+ "lint": "tslint -c tslint.json 'src/**/*.ts*",
+ "analyze": "webpack-bundle-analyzer dist/stats.json"
},
"dependencies": {
"@angular/animations": "9.0.5",
@@ -35,36 +36,15 @@
"@ngui/datetime-picker": "0.16.2",
"@stomp/ng2-stompjs": "7.2.0",
"@swimlane/ngx-charts": "13.0.2",
- "@uirouter/angular": "6.0.1",
- "@uirouter/angular-hybrid": "10.0.1",
- "@uirouter/angularjs": "1.0.25",
- "@uirouter/core": "6.0.4",
- "@uirouter/rx": "0.6.5",
- "angular": "1.7.7",
- "angular-animate": "1.7.7",
- "angular-aria": "1.7.7",
- "angular-clipboard": "1.4.2",
- "angular-cookies": "1.7.7",
- "angular-datatables": "0.6.2",
"angular-gridster2": "8.3.0",
"angular-loading-bar": "0.8.0",
- "angular-material": "1.1.18",
"angular-material-icons": "0.4.0",
- "angular-messages": "1.7.7",
"angular-notification-icons": "0.4.4",
"angular-plotly.js": "1.5.0",
- "angular-resource": "1.7.7",
- "angular-route": "1.7.7",
- "angular-rt-popup": "1.0.6",
- "angular-sanitize": "1.7.7",
"angular-slick-carousel": "3.1.7",
- "angular-touch": "1.7.7",
"angular-tree-component": "8.5.6",
- "angular-ui-bootstrap": "0.14.3",
- "angular-ui-sortable": "0.13.4",
"angular-ui-tree": "2.9.0",
"angular2-uuid": "1.1.1",
- "angularjs-datetime-picker": "0.1.16",
"bootstrap": "3.3.4",
"calendar-heatmap-graph": "0.0.14",
"codemirror": "5.55.0",
@@ -152,9 +132,9 @@
"typescript": "3.7.5",
"uglifyjs-webpack-plugin": "^2.1.2",
"webpack": "^4.41.6",
- "webpack-bundle-analyzer": "^3.4.1",
"webpack-cli": "^3.3.11",
"webpack-dev-server": "^3.10.3",
- "webpack-merge": "^4.2.1"
+ "webpack-merge": "^4.2.1",
+ "webpack-bundle-analyzer": "^3.8.0"
}
}
diff --git a/ui/src/app/core-v2/components/toolbar/toolbar.component.html b/ui/src/app/core-v2/components/toolbar/toolbar.component.html
index bacae80..b49d6c4 100644
--- a/ui/src/app/core-v2/components/toolbar/toolbar.component.html
+++ b/ui/src/app/core-v2/components/toolbar/toolbar.component.html
@@ -17,7 +17,7 @@
-->
<mat-toolbar class="md-primary md-hue-2 top-nav" color="accent">
- <div class="md-toolbar-tools" style="height:50px;max-height:50px;">
+ <div class="md-toolbar-tools" style="height:50px;max-height:50px;width:100%;">
<div fxFlex="60" fxLayout fxLayoutAlign="start center">
<h1 class="md-toolbar-tools" style="height:50px;max-height:50px;">
<div class="sp-darkblue"
diff --git a/ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts b/ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts
index 40c760b..0300e8f 100644
--- a/ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts
+++ b/ui/src/app/dashboard/components/standalone/standalone-dashboard.component.ts
@@ -17,7 +17,6 @@
import {Component, OnInit} from "@angular/core";
import {Dashboard} from "../../models/dashboard.model";
-import {UIRouter} from "@uirouter/core";
import {DashboardService} from "../../services/dashboard.service";
import {ActivatedRoute} from "@angular/router";
diff --git a/ui/src/app/data-explorer/data-explorer.component.css b/ui/src/app/data-explorer/data-explorer.component.css
index e7ecf3a..0b8993f 100644
--- a/ui/src/app/data-explorer/data-explorer.component.css
+++ b/ui/src/app/data-explorer/data-explorer.component.css
@@ -31,7 +31,7 @@
.ribbon {
position: absolute;
- right: 5px; top: 5px;
+ right: 5px; top: 55px;
z-index: 1;
overflow: hidden;
width: 75px; height: 75px;
diff --git a/ui/src/app/pipelines/pipelines.module.ts b/ui/src/app/pipelines/pipelines.module.ts
index 636fa7b..3dd1a0b 100644
--- a/ui/src/app/pipelines/pipelines.module.ts
+++ b/ui/src/app/pipelines/pipelines.module.ts
@@ -16,9 +16,6 @@
*
*/
-import 'npm/angular-datatables';
-import 'npm/angular-sanitize';
-
import {CategoryAlreadyInPipelinePipe} from './category-already-in-pipeline.filter';
import {PipelineOperationsService} from "./services/pipeline-operations.service";
import {PipelinesComponent} from "./pipelines.component";
diff --git a/ui/src/scss/main.scss b/ui/src/scss/main.scss
index 1468335..f3ae3e1 100644
--- a/ui/src/scss/main.scss
+++ b/ui/src/scss/main.scss
@@ -19,7 +19,6 @@
@import './_variables';
@import '~angular-tree-component/dist/angular-tree-component.css';
-@import '~angular-material/angular-material.scss';
//@import '~@angular/material/prebuilt-themes/indigo-pink.css';
@import '~bootstrap/dist/css/bootstrap.css';
@import '~slick-carousel/slick/slick-theme.css';