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 2022/01/26 21:08:07 UTC
[incubator-streampipes] branch experimental-module-federation updated (33c12b5 -> 4c4d6b3)
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a change to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git.
from 33c12b5 Cleanup prebuild script, add theme to prebuild
new 3071aa9 Add npm scripts for plain config
new 75f5445 [hotfix] Add theme to prebuild script
new df04911 [hotfix] Update gitignore file to exclude files from prebuild script
new b2eda9c [hotfix] Update gitignore file to exclude files from prebuild script
new 6382f4a [hotfix] Modify path of logo
new 4c4d6b3 [hotfix] Add constants file to gitignore
The 6 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.gitignore | 7 -
ui/.gitignore | 6 +-
ui/deployment/dev/config.yml | 1 +
.../dev/img/favicon.png} | Bin
ui/deployment/prebuild.js | 8 +-
ui/deployment/sp-theme.scss | 7 +
ui/{ => deployment}/webpack.partial.dev.js | 7 +
ui/package.json | 3 +
ui/src/app/app-routing.module.ts | 94 --------
.../core/components/base-navigation.component.ts | 164 --------------
ui/src/app/info/about/about.component.html | 2 +-
.../components/auth-box/auth-box.component.html | 2 +-
.../login/components/setup/setup.component.html | 2 +-
.../components/startup/startup.component.html | 2 +-
ui/src/assets/img/login/logo.png | Bin 24942 -> 0 bytes
ui/src/assets/img/sp/logo-navigation.png | Bin 19196 -> 0 bytes
ui/src/scss/sp/sp-theme.scss | 242 ---------------------
17 files changed, 34 insertions(+), 513 deletions(-)
rename ui/{src/assets/img/favicon/favicon-96x96.png => deployment/dev/img/favicon.png} (100%)
rename ui/{ => deployment}/webpack.partial.dev.js (92%)
delete mode 100644 ui/src/app/app-routing.module.ts
delete mode 100644 ui/src/app/core/components/base-navigation.component.ts
delete mode 100644 ui/src/assets/img/login/logo.png
delete mode 100644 ui/src/assets/img/sp/logo-navigation.png
delete mode 100644 ui/src/scss/sp/sp-theme.scss
[incubator-streampipes] 01/06: Add npm scripts for plain config
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 3071aa96fcf3cda955704b1981164928d4852730
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Tue Jan 25 22:47:22 2022 +0100
Add npm scripts for plain config
---
ui/package.json | 3 +++
1 file changed, 3 insertions(+)
diff --git a/ui/package.json b/ui/package.json
index 3c56594..b0696ee 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -10,6 +10,9 @@
"scripts": {
"start": "node ./deployment/prebuild.js && ng serve",
"test": "node ./deployment/prebuild.js && ng test",
+ "start-plain": "ng serve",
+ "build-plain": "set NODE_OPTIONS=--max-old-space-size=10192 && ng build --configuration production",
+ "run-prebuild-script": "node ./deployment/prebuild.js",
"build": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --configuration production",
"build-dev": "node ./deployment/prebuild.js && set NODE_OPTIONS=--max-old-space-size=10192 && ng build",
"build-rc": "node ./deployment/prebuild.js rel && set NODE_OPTIONS=--max-old-space-size=10192 && ng build --configuration production",
[incubator-streampipes] 04/06: [hotfix] Update gitignore file to exclude files from prebuild script
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit b2eda9c3bad5ad8f4f4cf02d0c8d3f776678b377
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jan 26 21:52:18 2022 +0100
[hotfix] Update gitignore file to exclude files from prebuild script
---
.gitignore | 7 -------
ui/.gitignore | 3 +++
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/.gitignore b/.gitignore
index 03e2cbc..4b3258f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -85,13 +85,6 @@ npm-debug.log
ui/src/assets/lib/apps/*
-# prebuild
-ui/src/app/appng5.module.ts
-ui/src/app/core/components/base-navigation.component.ts
-ui/src/app/app-routing.module.ts
-ui/src/app/home/home.service.ts
-ui/src/scss/sp/sp-theme.scss
-
# compiled output
ui/dist
ui/dist/**
diff --git a/ui/.gitignore b/ui/.gitignore
index 6d68a4a..a686a3a 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -27,6 +27,9 @@ src/app/services/version/version.service.ts
src/app/core/components/base-navigation.component.ts
src/assets/img/login/logo.png
src/assets/img/sp/logo-navigation.png
+src/assets/img/favicon/favicon-96x96.png
+src/scss/sp/sp-theme.scss
+webpack.partial.dev.js
# compiled output
/dist
[incubator-streampipes] 03/06: [hotfix] Update gitignore file to exclude files from prebuild script
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit df04911f428f0653e677c3d1883b60e06ab2e3ed
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jan 26 21:51:30 2022 +0100
[hotfix] Update gitignore file to exclude files from prebuild script
---
ui/src/app/app-routing.module.ts | 94 --------
.../core/components/base-navigation.component.ts | 164 --------------
ui/src/assets/img/favicon/favicon-96x96.png | Bin 5353 -> 0 bytes
ui/src/assets/img/login/logo.png | Bin 24942 -> 0 bytes
ui/src/assets/img/sp/logo-navigation.png | Bin 19196 -> 0 bytes
ui/src/scss/sp/sp-theme.scss | 242 ---------------------
ui/webpack.partial.dev.js | 58 -----
7 files changed, 558 deletions(-)
diff --git a/ui/src/app/app-routing.module.ts b/ui/src/app/app-routing.module.ts
deleted file mode 100644
index f29e84f..0000000
--- a/ui/src/app/app-routing.module.ts
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-import {NgModule} from '@angular/core';
-import {RouterModule, Routes} from '@angular/router';
-import {HomeComponent} from "./home/home.component";
-import {LoginComponent} from "./login/components/login/login.component";
-import {SetupComponent} from "./login/components/setup/setup.component";
-import {StreampipesComponent} from "./core/components/streampipes/streampipes.component";
-import {PipelineDetailsComponent} from "./pipeline-details/pipeline-details.component";
-import {StandaloneDashboardComponent} from "./dashboard/components/standalone/standalone-dashboard.component";
-import {AuthCanActivateChildrenGuard} from "./_guards/auth.can-activate-children.guard";
-import {ConfiguredCanActivateGuard} from "./_guards/configured.can-activate.guard";
-import {StartupComponent} from "./login/components/startup/startup.component";
-import {AlreadyConfiguredCanActivateGuard} from "./_guards/already-configured.can-activate.guard";
-import {InfoComponent} from "./info/info.component";
-import {NotificationsComponent} from "./notifications/notifications.component";
-import {ProfileComponent} from "./profile/profile.component";
-import {ApidocsComponent} from "./apidocs/apidocs.component";
-import { PageName } from './_enums/page-name.enum';
-import { PageAuthGuard } from './_guards/page-auth.can-active.guard';
-import { RegisterComponent } from './login/components/register/register.component';
-import { RestorePasswordComponent } from './login/components/restore-password/restore-password.component';
-import { RegistrationAllowedCanActivateGuard } from './_guards/registration-allowed.can-activate.guard';
-import { RestorePasswordAllowedCanActivateGuard } from './_guards/restore-password-allowed.can-activate.guard';
-import { SetNewPasswordComponent } from './login/components/set-new-password/set-new-password.component';
-import { ActivateAccountComponent } from './login/components/activate-account/activate-account.component';
-
-import { EditorComponent } from './editor/editor.component';
-import { PipelinesComponent } from './pipelines/pipelines.component';
-import { ConnectComponent } from './connect/connect.component';
-import { DashboardComponent } from './dashboard/dashboard.component';
-import { DataExplorerComponent } from './data-explorer/data-explorer.component';
-import { AppOverviewComponent } from './app-overview/app-overview.component';
-import { AddComponent } from './add/add.component';
-import { FilesComponent } from './files/files.component';
-import { ConfigurationComponent } from './configuration/configuration.component';
-
-const routes: Routes = [
- { path: 'apidocs', component: ApidocsComponent, canActivate: [ConfiguredCanActivateGuard]},
- { path: 'login', component: LoginComponent, canActivate: [ConfiguredCanActivateGuard],
- data: {animation: 'LoginPage'}},
- { path: 'register', component: RegisterComponent, canActivate: [RegistrationAllowedCanActivateGuard] },
- { path: 'activate-account', component: ActivateAccountComponent, canActivate: [RegistrationAllowedCanActivateGuard] },
- { path: 'restore-password', component: RestorePasswordComponent, canActivate: [RestorePasswordAllowedCanActivateGuard] },
- { path: 'set-new-password', component: SetNewPasswordComponent, canActivate: [RestorePasswordAllowedCanActivateGuard] },
- { path: 'startup', component: StartupComponent },
- { path: 'standalone/:dashboardId', component: StandaloneDashboardComponent },
- { path: '', component: StreampipesComponent, children: [
- { path: '', component: HomeComponent, canActivate: [ConfiguredCanActivateGuard] },
- { path: 'editor', component: EditorComponent, data: { authPageNames: [PageName.PIPELINE_EDITOR]}},
- { path: 'pipelines', component: PipelinesComponent, data: { authPageNames: [PageName.PIPELINE_OVERVIEW]}},
- { path: 'connect', component: ConnectComponent, data: { authPageNames: [PageName.CONNECT]}},
- { path: 'dashboard', component: DashboardComponent, data: { authPageNames: [PageName.DASHBOARD]}},
- { path: 'dataexplorer', component: DataExplorerComponent, data: { authPageNames: [PageName.DATA_EXPLORER]}},
- { path: 'app-overview', component: AppOverviewComponent, data: { authPageNames: [PageName.APPS]}},
- { path: 'add', component: AddComponent, data: { authPageNames: [PageName.INSTALL_PIPELINE_ELEMENTS]}},
- { path: 'files', component: FilesComponent, data: { authPageNames: [PageName.FILE_UPLOAD]}},
- { path: 'configuration', component: ConfigurationComponent, data: { authPageNames: [PageName.SETTINGS]}},
- { path: 'notifications', component: NotificationsComponent },
- { path: 'info', component: InfoComponent },
- { path: 'pipeline-details', component: PipelineDetailsComponent },
- { path: 'profile', component: ProfileComponent},
- ], canActivateChild: [AuthCanActivateChildrenGuard, PageAuthGuard] }
-];
-
-@NgModule({
- imports: [RouterModule.forRoot(routes, {useHash: true})],
- exports: [RouterModule],
- providers: [
- AuthCanActivateChildrenGuard,
- AlreadyConfiguredCanActivateGuard,
- ConfiguredCanActivateGuard,
- PageAuthGuard,
- RegistrationAllowedCanActivateGuard,
- RestorePasswordAllowedCanActivateGuard,
- ]
-})
-export class AppRoutingModule { }
diff --git a/ui/src/app/core/components/base-navigation.component.ts b/ui/src/app/core/components/base-navigation.component.ts
deleted file mode 100644
index 98f431c..0000000
--- a/ui/src/app/core/components/base-navigation.component.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-
-import {NavigationEnd, Router} from "@angular/router";
-import { PageName } from '../../_enums/page-name.enum';
-import { AuthService } from '../../services/auth.service';
-
-export abstract class BaseNavigationComponent {
-
- activePageName: string;
- activePage: any;
-
- authenticated: boolean = true;
-
- public menu = [
- {
- link: '',
- title: 'Home',
- icon: 'home',
- pagesNames: [PageName.HOME],
- visible: false
- },
- {
- link: 'editor',
- title: 'Pipeline Editor',
- icon: 'dashboard',
- pageNames: [PageName.PIPELINE_EDITOR],
- visible: false
- },
- {
- link: 'pipelines',
- title: 'Pipelines',
- icon: 'play_arrow',
- pageNames: [PageName.PIPELINE_OVERVIEW],
- visible: false
- },
- {
- link: 'connect',
- title: 'Connect',
- icon: 'power',
- pageNames: [PageName.CONNECT],
- visible: false
- },
- {
- link: 'dashboard',
- title: 'Dashboard',
- icon: 'insert_chart',
- pageNames: [PageName.DASHBOARD],
- visible: false
- },
- {
- link: 'dataexplorer',
- title: 'Data Explorer',
- icon: 'search',
- pageNames: [PageName.DATA_EXPLORER],
- visible: false
- },
- {
- link: 'app-overview',
- title: 'Apps',
- icon: 'apps',
- pageNames: [PageName.APPS],
- visible: false
- },
- ];
-
- admin = [
- {
- link: 'add',
- title: 'Install Pipeline Elements',
- icon: 'cloud_download',
- pageNames: [PageName.INSTALL_PIPELINE_ELEMENTS],
- visible: false
- },
- {
- link: 'files',
- title: 'File Management',
- icon: 'folder',
- pageNames: [PageName.FILE_UPLOAD],
- visible: false
- },
- {
- link: 'configuration',
- title: 'Configuration',
- icon: 'settings',
- pageNames: [PageName.SETTINGS],
- visible: false
- },
- ];
-
- notificationsVisible = false;
-
-
- constructor(protected authService: AuthService,
- protected router: Router) {
-
- }
-
- onInit() {
- this.authService.user$.subscribe(user => {
- this.menu.forEach(m => m.visible = this.isNavItemVisible(m.pageNames));
- this.admin.forEach(m => m.visible = this.isNavItemVisible(m.pageNames));
- this.notificationsVisible = this.isNavItemVisible([PageName.NOTIFICATIONS]);
- });
- this.activePage = this.router.url.replace('/', '');
- this.activePageName = this.getPageTitle(this.activePage);
- this.router.events.subscribe(event => {
- if (event instanceof NavigationEnd) {
- this.activePage = event.url.replace('/', '');
- this.activePageName = this.getPageTitle(this.activePage);
- }
- });
- }
-
- getActivePage() {
- return this.activePage;
- }
-
- getPageTitle(path) {
- const allMenuItems = this.menu.concat(this.admin);
- let currentTitle = 'StreamPipes';
- allMenuItems.forEach(m => {
- if (m.link === path) {
- currentTitle = m.title;
- }
- });
- if (path === 'pipeline-details') {
- currentTitle = 'Pipeline Details';
- }
- return currentTitle;
- }
-
- go(path, payload?) {
- if (payload === undefined) {
- this.router.navigateByUrl(path);
- this.activePage = path;
- } else {
- this.router.navigateByUrl(path, payload);
- this.activePage = path;
- }
- this.activePageName = this.getPageTitle(this.activePage);
- }
-
- public isNavItemVisible(pageNames?: PageName[]): boolean {
- return this.authService.isAnyAccessGranted(pageNames);
- }
-
-}
diff --git a/ui/src/assets/img/favicon/favicon-96x96.png b/ui/src/assets/img/favicon/favicon-96x96.png
deleted file mode 100644
index 92f2f5a..0000000
Binary files a/ui/src/assets/img/favicon/favicon-96x96.png and /dev/null differ
diff --git a/ui/src/assets/img/login/logo.png b/ui/src/assets/img/login/logo.png
deleted file mode 100644
index 1bef5cd..0000000
Binary files a/ui/src/assets/img/login/logo.png and /dev/null differ
diff --git a/ui/src/assets/img/sp/logo-navigation.png b/ui/src/assets/img/sp/logo-navigation.png
deleted file mode 100644
index 35ee8aa..0000000
Binary files a/ui/src/assets/img/sp/logo-navigation.png and /dev/null differ
diff --git a/ui/src/scss/sp/sp-theme.scss b/ui/src/scss/sp/sp-theme.scss
deleted file mode 100644
index 894fc16..0000000
--- a/ui/src/scss/sp/sp-theme.scss
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-@import '~@angular/material/theming';
-@import '../variables';
-
-@include mat-core();
-
-$mat-streampipes-primary: (
- 50: #ffebee,
- 100: #ffcdd2,
- 200: #72e879,
- 300: #49e750,
- 400: #49e750,
- 500: $sp-color-primary,
- 600: #06c12a,
- 700: #01a51d,
- 800: #00841b,
- 900: #005818,
- A100: #ff8a80,
- A200: #ff5252,
- A400: #ff1744,
- A700: #d50000,
- contrast: (
- 50: $black-87-opacity,
- 100: $black-87-opacity,
- 200: $black-87-opacity,
- 300: $black-87-opacity,
- 400: $black-87-opacity,
- 500: white,
- 600: white,
- 700: white,
- 800: $white-87-opacity,
- 900: $white-87-opacity,
- A100: $black-87-opacity,
- A200: white,
- A400: white,
- A700: white,
- )
-);
-
-$mat-streampipes-accent: (
- 50: #ffebee,
- 100: #ffcdd2,
- 200: #4e3c93,
- 300: #2a0c9a,
- 400: #395481,
- 500: $sp-color-accent,
- 600: #0303a3,
- 700: #01016a,
- 800: #000039,
- 900: #00002b,
- A100: #ff8a80,
- A200: #ff5252,
- A400: #ff1744,
- A700: #d50000,
- contrast: (
- 50: $black-87-opacity,
- 100: $black-87-opacity,
- 200: $black-87-opacity,
- 300: $black-87-opacity,
- 400: $black-87-opacity,
- 500: white,
- 600: white,
- 700: white,
- 800: $white-87-opacity,
- 900: $white-87-opacity,
- A100: $black-87-opacity,
- A200: white,
- A400: white,
- A700: white,
- )
-);
-
-$mat-streampipes-accent-dark: (
- 50: #ffebee,
- 100: #ffcdd2,
- 200: #4e3c93,
- 300: #2a0c9a,
- 400: #395481,
- 500: #83a3de,
- 600: #0303a3,
- 700: #01016a,
- 800: #000039,
- 900: #00002b,
- A100: #ff8a80,
- A200: #ff5252,
- A400: #ff1744,
- A700: #d50000,
- contrast: (
- 50: $black-87-opacity,
- 100: $black-87-opacity,
- 200: $black-87-opacity,
- 300: $black-87-opacity,
- 400: $black-87-opacity,
- 500: white,
- 600: white,
- 700: white,
- 800: $white-87-opacity,
- 900: $white-87-opacity,
- A100: $black-87-opacity,
- A200: white,
- A400: white,
- A700: white,
- )
-);
-
-$custom-theme-primary: mat-palette($mat-streampipes-primary);
-$custom-theme-accent-dark: mat-palette($mat-streampipes-accent-dark);
-$custom-theme-accent: mat-palette($mat-streampipes-accent);
-$custom-theme-warn: mat-palette($mat-red);
-
-$custom-theme-light: mat-light-theme($custom-theme-primary, $custom-theme-accent, $custom-theme-warn);
-$custom-theme-dark: mat-dark-theme($custom-theme-primary, $custom-theme-accent-dark, $custom-theme-warn);
-
-$custom-typography: mat-typography-config($font-family: 'Roboto, Arial');
-
-
-@include angular-material-typography($custom-typography);
-
-$primary: map-get($custom-theme-light, primary);
-$accent-dark: map-get($custom-theme-dark, accent);
-$accent: map-get($custom-theme-light, accent);
-
-
-.small .mat-tab-label {
- height: 24px;
- padding: 0 12px;
- cursor: pointer;
- box-sizing: border-box;
- opacity: .6;
- min-width: 80px;
- text-align: center;
- display: inline-flex;
- justify-content: center;
- align-items: center;
- white-space: nowrap;
- position: relative;
-}
-
-.small .mat-tab-label-content {
- text-transform: none;
- font-size: 11pt;
-
-}
-
-.dark-mode {
- @include angular-material-theme($custom-theme-dark);
-
- .base-style {
- color: rgba(255, 255, 255, 0.87);
- background: #121212;
- }
-
- .mat-toolbar.mat-primary {
- color: #121212;
- }
-
- .mat-tooltip.tooltip {
- background-color: rgba(255, 255, 255, 0.87);
- font-size: 12px;
- }
-
- --color-primary: #{mat-color($primary)};
- --color-accent: #{mat-color($accent-dark)};
- --color-bg-0: #121212;
- --color-bg-1: #282828;
- --color-bg-2: #404040;
- --color-bg-3: #424242;
- --color-bg-4: #5f5f5f;
- --color-bg-dialog: rgb(66, 66, 66);
- --color-shadow: #c4c4c4;
- --color-pe: #404040;
- --color-default-text: rgba(255, 255, 255, 0.87);
- --color-warn: #b36161;
-
- --color-tab-border : #cccccc;
-
- --color-navigation-bg: #{mat-color($primary)};
- --color-navigation-link-text: #121212;
- --color-navigation-text: #121212;
- --color-navigation-selected: #{mat-color($primary)};
- --color-navigation-hover: #{mat-color($primary, 600)};
- --color-navigation-bg-selected: #121212;
- --color-navigation-divider: #{mat-color($primary)};
-
- --content-box-color: #404040;
- --canvas-color: linear-gradient(90deg, rgba(50, 50, 50, 0.5) 10%, transparent 0%), linear-gradient(rgba(50, 50, 50, 0.5) 10%, transparent 0%);
-
-}
-
-.light-mode {
- @include angular-material-theme($custom-theme-light);
-
- .base-style {
- color: #121212;
- background: #FFFFFF;
- }
-
-
- --color-primary: #{mat-color($primary)};
- --color-accent: #{mat-color($accent)};
- --color-bg-0: #FFFFFF;
- --color-bg-1: #FAFAFA;
- --color-bg-2: #f1f1f1;
- --color-bg-3: rgb(224, 224, 224);
- --color-bg-4: rgb(212, 212, 212);
- --color-bg-dialog: #FFFFFF;
- --color-shadow: #555;
- --color-pe: #FFFFFF;
- --color-default-text: #121212;
- --color-warn: #B71C1C;
-
- --color-tab-border : #cccccc;
-
- --color-navigation-bg: #{mat-color($primary)};
- --color-navigation-link-text: #FFFFFF;
- --color-navigation-text: #FFFFFF;
- --color-navigation-selected: #{mat-color($primary)};
- --color-navigation-hover: #{mat-color($primary, 600)};
- --color-navigation-bg-selected: #FFFFFF;
- --color-navigation-divider: #{mat-color($primary)};
-
- --content-box-color: rgb(156, 156, 156);
- --canvas-color: linear-gradient(90deg, rgba(208, 208, 208, 0.5) 10%, transparent 0%), linear-gradient(rgba(208, 208, 208, 0.5) 10%, transparent 0%);
-
-}
diff --git a/ui/webpack.partial.dev.js b/ui/webpack.partial.dev.js
deleted file mode 100644
index 1013515..0000000
--- a/ui/webpack.partial.dev.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const { merge } = require('webpack-merge');
-const baseConfig = require('./webpack.partial.base.js');
-
-module.exports = merge(baseConfig, {
- devServer: {
- compress: true,
- port: 8082,
- proxy: {
- '/streampipes-connect': {
- target: 'http://localhost:8030',
- // pathRewrite: { '^/streampipes-connect': '' },
- secure: false,
- },
- '/streampipes-backend': {
- target: 'http://localhost:8030',
- secure: false,
- },
- '/visualizablepipeline': {
- target: 'http://localhost:5984',
- secure: false,
- },
- '/dashboard': {
- target: 'http://localhost:5984',
- secure: false,
- },
- '/widget': {
- target: 'http://localhost:5984',
- secure: false,
- },
- '/pipeline': {
- target: 'http://localhost:5984',
- secure: false,
- },
- '/streampipes/ws': {
- target: 'ws://localhost:61614',
- ws: true,
- secure: false,
- },
- },
- },
-});
[incubator-streampipes] 06/06: [hotfix] Add constants file to gitignore
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 4c4d6b3fa80fab28d0152d18768db9f9bdc5807d
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jan 26 22:07:51 2022 +0100
[hotfix] Add constants file to gitignore
---
ui/.gitignore | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ui/.gitignore b/ui/.gitignore
index a686a3a..fab5934 100644
--- a/ui/.gitignore
+++ b/ui/.gitignore
@@ -24,8 +24,9 @@ src/app/app-routing.module.ts
src/app/appng5.module.ts
src/app/home/home.service.ts
src/app/services/version/version.service.ts
+src/app/services/app.constants.ts
src/app/core/components/base-navigation.component.ts
-src/assets/img/login/logo.png
+src/assets/img/sp/logo.png
src/assets/img/sp/logo-navigation.png
src/assets/img/favicon/favicon-96x96.png
src/scss/sp/sp-theme.scss
[incubator-streampipes] 02/06: [hotfix] Add theme to prebuild script
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 75f5445ff48101bcd59e89fe305320c738d954fc
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jan 26 21:20:57 2022 +0100
[hotfix] Add theme to prebuild script
---
ui/deployment/dev/config.yml | 1 +
ui/deployment/dev/img/favicon.png | Bin 0 -> 5353 bytes
ui/deployment/prebuild.js | 6 ++++
ui/deployment/sp-theme.scss | 7 ++++
ui/deployment/webpack.partial.dev.js | 65 +++++++++++++++++++++++++++++++++++
5 files changed, 79 insertions(+)
diff --git a/ui/deployment/dev/config.yml b/ui/deployment/dev/config.yml
index 492d5f6..d134f44 100644
--- a/ui/deployment/dev/config.yml
+++ b/ui/deployment/dev/config.yml
@@ -17,6 +17,7 @@ login:
backgroundImage: 'deployment/dev/img/background.png'
logo: 'deployment/dev/img/logo.png'
logo-navigation: 'deployment/dev/img/logo-navigation.png'
+ favicon: 'deployment/dev/img/favicon.png'
modules:
- spEditor
- spPipelines
diff --git a/ui/deployment/dev/img/favicon.png b/ui/deployment/dev/img/favicon.png
new file mode 100644
index 0000000..92f2f5a
Binary files /dev/null and b/ui/deployment/dev/img/favicon.png differ
diff --git a/ui/deployment/prebuild.js b/ui/deployment/prebuild.js
index 47914fb..3750cff 100644
--- a/ui/deployment/prebuild.js
+++ b/ui/deployment/prebuild.js
@@ -92,6 +92,12 @@ fs.writeFileSync('src/assets/img/login/logo.png', fs.readFileSync(config['login'
console.log('Moved: logo.png');
fs.writeFileSync('src/assets/img/sp/logo-navigation.png', fs.readFileSync(config['login']['logo-navigation']));
console.log('Moved: sp-logo-navigation.png');
+fs.writeFileSync('src/assets/img/favicon/favicon-96x96.png', fs.readFileSync(config['login']['favicon']));
+console.log('Moved: favicon');
+fs.writeFileSync('src/scss/sp/sp-theme.scss', fs.readFileSync('deployment/sp-theme.scss', 'utf8'));
+console.log("Moved: theme file");
+fs.writeFileSync('webpack.partial.dev.js', fs.readFileSync('deployment/webpack.partial.dev.js', 'utf8'));
+console.log("Moved: webpack dev config");
if (process.env.THEME_LOC !== undefined) {
console.log('Using custom-provided theme ' + process.env.THEME_LOC);
diff --git a/ui/deployment/sp-theme.scss b/ui/deployment/sp-theme.scss
index 894fc16..5a23ac5 100644
--- a/ui/deployment/sp-theme.scss
+++ b/ui/deployment/sp-theme.scss
@@ -16,6 +16,13 @@
*
*/
+/**
+ *
+ * Note: to change this file, change sp-theme.scss in deployment folder
+ * changes in the root folder will be overridden by prebuild script
+ *
+ */
+
@import '~@angular/material/theming';
@import '../variables';
diff --git a/ui/deployment/webpack.partial.dev.js b/ui/deployment/webpack.partial.dev.js
new file mode 100644
index 0000000..d26b0fe
--- /dev/null
+++ b/ui/deployment/webpack.partial.dev.js
@@ -0,0 +1,65 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ *
+ * Note: to change this file, change webpack.partial.dev.js in deployment folder
+ * changes in the root folder will be overridden by prebuild script
+ *
+ */
+
+const { merge } = require('webpack-merge');
+const baseConfig = require('./webpack.partial.base.js');
+
+module.exports = merge(baseConfig, {
+ devServer: {
+ compress: true,
+ port: 8082,
+ proxy: {
+ '/streampipes-connect': {
+ target: 'http://localhost:8030',
+ // pathRewrite: { '^/streampipes-connect': '' },
+ secure: false,
+ },
+ '/streampipes-backend': {
+ target: 'http://localhost:8030',
+ secure: false,
+ },
+ '/visualizablepipeline': {
+ target: 'http://localhost:5984',
+ secure: false,
+ },
+ '/dashboard': {
+ target: 'http://localhost:5984',
+ secure: false,
+ },
+ '/widget': {
+ target: 'http://localhost:5984',
+ secure: false,
+ },
+ '/pipeline': {
+ target: 'http://localhost:5984',
+ secure: false,
+ },
+ '/streampipes/ws': {
+ target: 'ws://localhost:61614',
+ ws: true,
+ secure: false,
+ },
+ },
+ },
+});
[incubator-streampipes] 05/06: [hotfix] Modify path of logo
Posted by ri...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch experimental-module-federation
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 6382f4a5e307a77a596a01937226c9a318ac5d6f
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Jan 26 21:57:17 2022 +0100
[hotfix] Modify path of logo
---
ui/deployment/prebuild.js | 2 +-
ui/src/app/info/about/about.component.html | 2 +-
ui/src/app/login/components/auth-box/auth-box.component.html | 2 +-
ui/src/app/login/components/setup/setup.component.html | 2 +-
ui/src/app/login/components/startup/startup.component.html | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ui/deployment/prebuild.js b/ui/deployment/prebuild.js
index 3750cff..c3bde27 100644
--- a/ui/deployment/prebuild.js
+++ b/ui/deployment/prebuild.js
@@ -88,7 +88,7 @@ fs.writeFileSync('src/app/core/components/base-navigation.component.ts', mustach
fs.writeFileSync('src/scss/sp/sp-theme.scss', fs.readFileSync('deployment/sp-theme.scss'));
// Move Images
-fs.writeFileSync('src/assets/img/login/logo.png', fs.readFileSync(config['login']['logo']));
+fs.writeFileSync('src/assets/img/sp/logo.png', fs.readFileSync(config['login']['logo']));
console.log('Moved: logo.png');
fs.writeFileSync('src/assets/img/sp/logo-navigation.png', fs.readFileSync(config['login']['logo-navigation']));
console.log('Moved: sp-logo-navigation.png');
diff --git a/ui/src/app/info/about/about.component.html b/ui/src/app/info/about/about.component.html
index 065ba45..cb48e35 100644
--- a/ui/src/app/info/about/about.component.html
+++ b/ui/src/app/info/about/about.component.html
@@ -20,7 +20,7 @@
class="about-container">
<div fxFlex="50" fxLayoutAlign="center center" fxLayout="column"
style="color:white;"><img
- alt="icon" src="assets/img/login/logo.png" class="about-logo">
+ alt="icon" src="assets/img/sp/logo.png" class="about-logo">
</div>
<div fxFlex="100" fxLayout="row wrap" fxLayoutAlign="start stretch" style="margin-top:20px;">
diff --git a/ui/src/app/login/components/auth-box/auth-box.component.html b/ui/src/app/login/components/auth-box/auth-box.component.html
index 0c00cc5..3bd00ee 100644
--- a/ui/src/app/login/components/auth-box/auth-box.component.html
+++ b/ui/src/app/login/components/auth-box/auth-box.component.html
@@ -25,7 +25,7 @@
style="margin-left:auto;margin-right:auto;">
<div fxFlex="60" fxLayoutAlign="center center" fxLayout="row"
style="color:white;width:100%;"><img
- alt="icon" src="../../../../assets/img/login/logo.png" style="width:100%;">
+ alt="icon" src="../../../../assets/img/sp/logo.png" style="width:100%;">
</div>
</div>
<ng-content></ng-content>
diff --git a/ui/src/app/login/components/setup/setup.component.html b/ui/src/app/login/components/setup/setup.component.html
index 495d019..c72adf1 100644
--- a/ui/src/app/login/components/setup/setup.component.html
+++ b/ui/src/app/login/components/setup/setup.component.html
@@ -21,7 +21,7 @@
<div fxFlex="100" fxLayout="column" class="box-shadow-login setup-card">
<form #setupForm="ngForm" fxFlex="100" fxLayout="column">
<div class="setup-header p-20">
- <img class="sp-logo" alt="icon" src="../../../../assets/img/login/logo.png">
+ <img class="sp-logo" alt="icon" src="../../../../assets/img/sp/logo.png">
<h2 class="text-center">Welcome to {{appConstants.APP_NAME}}!</h2>
<span class="text-center">Create a user and you are ready to go (the initial setup might take some time)</span>
</div>
diff --git a/ui/src/app/login/components/startup/startup.component.html b/ui/src/app/login/components/startup/startup.component.html
index 2c118ce..01f78ec 100644
--- a/ui/src/app/login/components/startup/startup.component.html
+++ b/ui/src/app/login/components/startup/startup.component.html
@@ -19,7 +19,7 @@
<div class="md-padding sp-fade" fxLayout="row" fxLayoutAlign="center center"
style="min-height:100vh !important; background:white;">
<div fxFlex="80" fxLayout="column" fxLayoutAlign="center center" style="display:flex;">
- <img src="../../../../assets/img/login/logo.png" style="max-width:500px;"/>
+ <img src="../../../../assets/img/logo.png" style="max-width:500px;"/>
<div fxFlex="100">
<h2>Welcome!</h2>