This is an automated email from the ASF dual-hosted git repository. riemer pushed a commit to branch STREAMPIPES-319 in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git
commit 0495203f1f140ff81dca1044210828d5885e55c1 Author: Dominik Riemer <[email protected]> AuthorDate: Tue Jul 13 20:08:19 2021 +0200 [STREAMPIPES-395] Replace logo and modify prebuild script --- ui/.gitignore | 2 ++ ui/deployment/prebuild.js | 28 ++++++++++----------- .../components/startup/startup.component.html | 2 +- .../login/components/startup/startup.component.ts | 2 +- ui/src/assets/img/sp/sp-logo-center-white.png | Bin 29781 -> 0 bytes ui/src/assets/img/sp/sp-logo-right-white.png | Bin 21453 -> 0 bytes 6 files changed, 18 insertions(+), 16 deletions(-) diff --git a/ui/.gitignore b/ui/.gitignore index b469556..351d928 100644 --- a/ui/.gitignore +++ b/ui/.gitignore @@ -25,6 +25,8 @@ src/app/appng5.module.ts src/app/home/home.service.ts src/app/services/version/version.service.ts ui/src/app/core/components/base-navigation.component.ts +ui/src/assets/img/login/logo.png +ui/src/assets/img/sp/logo-navigation.png # compiled output /dist diff --git a/ui/deployment/prebuild.js b/ui/deployment/prebuild.js index be35a65..d184d56 100644 --- a/ui/deployment/prebuild.js +++ b/ui/deployment/prebuild.js @@ -91,19 +91,19 @@ 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'); -// if (process.env.THEME_LOC !== 'undefined') { -// console.log('Using custom-provided theme ' + process.env.THEME_LOC); -// fs.writeFileSync('src/scss/sp/sp-theme.scss', fs.readFileSync(process.env.THEME_LOC, 'utf8')); -// } -// -// if (process.env.LOGO_HEADER_LOC !== 'undefined') { -// console.log('Using custom-provided header logo ' + process.env.LOGO_HEADER_LOC); -// fs.writeFileSync('src/assets/img/login/logo.png', fs.readFileSync(process.env.LOGO_HEADER_LOC)); -// } -// -// if (process.env.LOGO_NAV_LOC !== 'undefined') { -// console.log('Using custom-provided navbar logo' + process.env.LOGO_NAV_LOC); -// fs.writeFileSync('src/assets/img/sp/sp-logo-right-white.png', fs.readFileSync(process.env.LOGO_NAV_LOC)); -// } +if (process.env.THEME_LOC !== undefined) { + console.log('Using custom-provided theme ' + process.env.THEME_LOC); + fs.writeFileSync('src/scss/sp/sp-theme.scss', fs.readFileSync(process.env.THEME_LOC, 'utf8')); +} + +if (process.env.LOGO_HEADER_LOC !== undefined) { + console.log('Using custom-provided header logo ' + process.env.LOGO_HEADER_LOC); + fs.writeFileSync('src/assets/img/login/logo.png', fs.readFileSync(process.env.LOGO_HEADER_LOC)); +} + +if (process.env.LOGO_NAV_LOC !== undefined) { + console.log('Using custom-provided navbar logo' + process.env.LOGO_NAV_LOC); + fs.writeFileSync('src/assets/img/sp/sp-logo-right-white.png', fs.readFileSync(process.env.LOGO_NAV_LOC)); +} console.log('Pre-Build finished.'); diff --git a/ui/src/app/login/components/startup/startup.component.html b/ui/src/app/login/components/startup/startup.component.html index c42fdb8..5a58bcc 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/sp/sp-logo-center-color.png" style="max-width:500px;"/> + <img src="../../../../assets/img/login/logo.png" style="max-width:500px;"/> <div fxFlex="100"> <h2>Welcome!</h2> diff --git a/ui/src/app/login/components/startup/startup.component.ts b/ui/src/app/login/components/startup/startup.component.ts index b6f0931..8f90a53 100644 --- a/ui/src/app/login/components/startup/startup.component.ts +++ b/ui/src/app/login/components/startup/startup.component.ts @@ -54,4 +54,4 @@ export class StartupComponent implements OnInit { }, this.loadingIntervalInSeconds*1000); }); } -} \ No newline at end of file +} diff --git a/ui/src/assets/img/sp/sp-logo-center-white.png b/ui/src/assets/img/sp/sp-logo-center-white.png deleted file mode 100644 index e5f6ae0..0000000 Binary files a/ui/src/assets/img/sp/sp-logo-center-white.png and /dev/null differ diff --git a/ui/src/assets/img/sp/sp-logo-right-white.png b/ui/src/assets/img/sp/sp-logo-right-white.png deleted file mode 100644 index ff2eb7c..0000000 Binary files a/ui/src/assets/img/sp/sp-logo-right-white.png and /dev/null differ
