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/02/23 13:17:02 UTC

[incubator-streampipes] 01/03: [hotfix] Fix progress bar on startup page

This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git

commit 732c2686f155212b3178c27d839237875cd899ce
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Wed Feb 23 14:15:10 2022 +0100

    [hotfix] Fix progress bar on startup page
---
 .../components/startup/startup.component.html      |  2 +-
 .../components/startup/startup.component.scss      | 27 ++++++++++++++++++++++
 .../login/components/startup/startup.component.ts  |  5 ++--
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/ui/src/app/login/components/startup/startup.component.html b/ui/src/app/login/components/startup/startup.component.html
index a95712c..2a52c0a 100644
--- a/ui/src/app/login/components/startup/startup.component.html
+++ b/ui/src/app/login/components/startup/startup.component.html
@@ -30,7 +30,7 @@
         </div>
 
         <div fxFlex="100" fxLayoutAlign="center center">
-            <mat-progress-bar style="margin-top:10px;width:800px;" [mode]="'determinate'" value="{{progress}}"></mat-progress-bar>
+            <mat-progress-bar class="sp-progress" mode="determinate" [value]="progress" color="accent"></mat-progress-bar>
         </div>
     </div>
 
diff --git a/ui/src/app/login/components/startup/startup.component.scss b/ui/src/app/login/components/startup/startup.component.scss
new file mode 100644
index 0000000..0b7bb3a
--- /dev/null
+++ b/ui/src/app/login/components/startup/startup.component.scss
@@ -0,0 +1,27 @@
+/*
+ * 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 '../../../../scss/_variables.scss';
+
+::ng-deep .mat-progress-bar-fill::after {
+  background: $sp-color-accent;
+}
+
+.sp-progress {
+  margin-top:10px;width:800px;
+}
diff --git a/ui/src/app/login/components/startup/startup.component.ts b/ui/src/app/login/components/startup/startup.component.ts
index 7f8e34a..d8e8f5c 100644
--- a/ui/src/app/login/components/startup/startup.component.ts
+++ b/ui/src/app/login/components/startup/startup.component.ts
@@ -23,13 +23,14 @@ import { AppConstants } from '../../../services/app.constants';
 
 @Component({
     selector: 'startup',
-    templateUrl: './startup.component.html'
+    templateUrl: './startup.component.html',
+    styleUrls: ['./startup.component.scss']
 })
 export class StartupComponent implements OnInit {
 
     progress = 0;
     currentStep = 0;
-    maxLoadingTimeInSeconds = 300;
+    maxLoadingTimeInSeconds = 100;
     loadingIntervalInSeconds = 1;
 
     constructor(private authService: AuthService,