diff --git a/src/app/layout/components/toolbar/toolbar.component.scss b/src/app/layout/components/toolbar/toolbar.component.scss
index 8f6f583c..0174a02e 100644
--- a/src/app/layout/components/toolbar/toolbar.component.scss
+++ b/src/app/layout/components/toolbar/toolbar.component.scss
@@ -11,17 +11,9 @@
}
.mat-toolbar {
+ position: relative;
background: inherit;
color: inherit;
- position: relative;
-
- .loading-bar {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- width: 100%;
- }
}
.logo {
diff --git a/src/app/layout/components/toolbar/toolbar.component.ts b/src/app/layout/components/toolbar/toolbar.component.ts
index 1c06dfcb..81fdd0d7 100644
--- a/src/app/layout/components/toolbar/toolbar.component.ts
+++ b/src/app/layout/components/toolbar/toolbar.component.ts
@@ -8,7 +8,6 @@ import { FuseConfigService } from '@fuse/services/config.service';
import { FuseSidebarService } from '@fuse/components/sidebar/sidebar.service';
import { navigation } from 'app/navigation/navigation';
-import { FuseLoadingBarService } from '@fuse/services/loading-bar.service';
@Component({
selector : 'toolbar',
@@ -24,7 +23,6 @@ export class ToolbarComponent implements OnInit, OnDestroy
languages: any;
navigation: any;
selectedLanguage: any;
- showLoadingBar: boolean;
userStatusOptions: any[];
// Private
@@ -34,13 +32,11 @@ export class ToolbarComponent implements OnInit, OnDestroy
* Constructor
*
* @param {FuseConfigService} _fuseConfigService
- * @param {FuseLoadingBarService} _fuseLoadingBarService
* @param {FuseSidebarService} _fuseSidebarService
* @param {TranslateService} _translateService
*/
constructor(
private _fuseConfigService: FuseConfigService,
- private _fuseLoadingBarService: FuseLoadingBarService,
private _fuseSidebarService: FuseSidebarService,
private _translateService: TranslateService
)
@@ -102,13 +98,6 @@ export class ToolbarComponent implements OnInit, OnDestroy
*/
ngOnInit(): void
{
- // Subscribe to the Fuse loading bar service
- this._fuseLoadingBarService.visible
- .pipe(takeUntil(this._unsubscribeAll))
- .subscribe((visible) => {
- this.showLoadingBar = visible;
- });
-
// Subscribe to the config changes
this._fuseConfigService.config
.pipe(takeUntil(this._unsubscribeAll))
diff --git a/src/app/layout/components/toolbar/toolbar.module.ts b/src/app/layout/components/toolbar/toolbar.module.ts
index 17e36e0c..b7b63cfb 100644
--- a/src/app/layout/components/toolbar/toolbar.module.ts
+++ b/src/app/layout/components/toolbar/toolbar.module.ts
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router';
-import { MatButtonModule, MatIconModule, MatMenuModule, MatProgressBarModule, MatToolbarModule } from '@angular/material';
+import { MatButtonModule, MatIconModule, MatMenuModule, MatToolbarModule } from '@angular/material';
import { FuseSearchBarModule, FuseShortcutsModule } from '@fuse/components';
import { FuseSharedModule } from '@fuse/shared.module';
@@ -16,7 +16,6 @@ import { ToolbarComponent } from 'app/layout/components/toolbar/toolbar.componen
MatButtonModule,
MatIconModule,
MatMenuModule,
- MatProgressBarModule,
MatToolbarModule,
FuseSharedModule,
diff --git a/src/app/main/documentation/components/components.module.ts b/src/app/main/documentation/components/components.module.ts
index d1d695ab..2c6c03e8 100644
--- a/src/app/main/documentation/components/components.module.ts
+++ b/src/app/main/documentation/components/components.module.ts
@@ -11,6 +11,7 @@ import { DocsComponentsCountdownComponent } from 'app/main/documentation/compone
import { DocsComponentsHighlightComponent } from 'app/main/documentation/components/highlight/highlight.component';
import { DocsComponentsMaterialColorPickerComponent } from 'app/main/documentation/components/material-color-picker/material-color-picker.component';
import { DocsComponentsNavigationComponent } from 'app/main/documentation/components/navigation/navigation.component';
+import { DocsComponentsProgressBarComponent } from 'app/main/documentation/components/progress-bar/progress-bar.component';
import { DocsComponentsSearchBarComponent } from 'app/main/documentation/components/search-bar/search-bar.component';
import { DocsComponentsSidebarComponent } from 'app/main/documentation/components/sidebar/sidebar.component';
import { DocsComponentsShortcutsComponent } from 'app/main/documentation/components/shortcuts/shortcuts.component';
@@ -37,6 +38,10 @@ const routes = [
path : 'navigation',
component: DocsComponentsNavigationComponent
},
+ {
+ path : 'progress-bar',
+ component: DocsComponentsProgressBarComponent
+ },
{
path : 'search-bar',
component: DocsComponentsSearchBarComponent
@@ -62,6 +67,7 @@ const routes = [
DocsComponentsHighlightComponent,
DocsComponentsMaterialColorPickerComponent,
DocsComponentsNavigationComponent,
+ DocsComponentsProgressBarComponent,
DocsComponentsSearchBarComponent,
DocsComponentsSidebarComponent,
DocsComponentsShortcutsComponent,
diff --git a/src/app/main/documentation/components/progress-bar/progress-bar.component.html b/src/app/main/documentation/components/progress-bar/progress-bar.component.html
new file mode 100644
index 00000000..2ec56932
--- /dev/null
+++ b/src/app/main/documentation/components/progress-bar/progress-bar.component.html
@@ -0,0 +1,83 @@
+
+
+
+
+
+
+
+
+
+
+ fuse-progress-bar
is a custom built Fuse component allows you to have a service controlled
+ progress bar. It internally uses mat-progress-bar
and provides a global service to control it.
+
+
+
+ Due to the nature of global progress bars, fuse-progress-bar
can only be used once in the
+ entire app and it's currently located at app.component.html
file.
+
+
+
Usage
+
+
+
+
+
+
+
Service Usage
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/app/main/documentation/components/progress-bar/progress-bar.component.scss b/src/app/main/documentation/components/progress-bar/progress-bar.component.scss
new file mode 100644
index 00000000..38d84b8f
--- /dev/null
+++ b/src/app/main/documentation/components/progress-bar/progress-bar.component.scss
@@ -0,0 +1,7 @@
+:host {
+
+ .content{
+ max-width: 1100px;
+ }
+
+}
diff --git a/src/app/main/documentation/components/progress-bar/progress-bar.component.ts b/src/app/main/documentation/components/progress-bar/progress-bar.component.ts
new file mode 100644
index 00000000..0c42f2e0
--- /dev/null
+++ b/src/app/main/documentation/components/progress-bar/progress-bar.component.ts
@@ -0,0 +1,17 @@
+import { Component } from '@angular/core';
+
+@Component({
+ selector : 'docs-components-progress-bar',
+ templateUrl: './progress-bar.component.html',
+ styleUrls : ['./progress-bar.component.scss']
+})
+export class DocsComponentsProgressBarComponent
+{
+ /**
+ * Constructor
+ */
+ constructor()
+ {
+
+ }
+}
diff --git a/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.html b/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.html
deleted file mode 100644
index ee110003..00000000
--- a/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.html
+++ /dev/null
@@ -1,66 +0,0 @@
-
-
-
-
-
-
-
-
-
-
- Loading bar
is a custom Fuse service that allows to have a control on the loading bar that is
- placed in the Toolbar by default.
-
-
-
Usage
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.scss b/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.scss
deleted file mode 100644
index 8fdbe2d4..00000000
--- a/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-:host {
-
-}
\ No newline at end of file
diff --git a/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.ts b/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.ts
deleted file mode 100644
index aaa838b5..00000000
--- a/src/app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { Component } from '@angular/core';
-
-@Component({
- selector : 'fuse-loading-bar-service-docs',
- templateUrl: './fuse-loading-bar.component.html',
- styleUrls : ['./fuse-loading-bar.component.scss']
-})
-export class FuseLoadingBarServiceDocsComponent
-{
- /**
- * Constructor
- */
- constructor()
- {
-
- }
-}
diff --git a/src/app/main/documentation/services/services.module.ts b/src/app/main/documentation/services/services.module.ts
index b3798a56..465fef74 100644
--- a/src/app/main/documentation/services/services.module.ts
+++ b/src/app/main/documentation/services/services.module.ts
@@ -6,7 +6,6 @@ import { FuseSharedModule } from '@fuse/shared.module';
import { FuseHighlightModule } from '@fuse/components/index';
import { FuseConfigServiceDocsComponent } from 'app/main/documentation/services/fuse-config/fuse-config.component';
-import { FuseLoadingBarServiceDocsComponent } from 'app/main/documentation/services/fuse-loading-bar/fuse-loading-bar.component';
import { FuseSplashScreenServiceDocsComponent } from 'app/main/documentation/services/fuse-splash-screen/fuse-splash-screen.component';
const routes = [
@@ -14,10 +13,6 @@ const routes = [
path : 'fuse-config',
component: FuseConfigServiceDocsComponent
},
- {
- path : 'fuse-loading-bar',
- component: FuseLoadingBarServiceDocsComponent
- },
{
path : 'fuse-splash-screen',
component: FuseSplashScreenServiceDocsComponent
@@ -27,7 +22,6 @@ const routes = [
@NgModule({
declarations: [
FuseConfigServiceDocsComponent,
- FuseLoadingBarServiceDocsComponent,
FuseSplashScreenServiceDocsComponent
],
imports : [
diff --git a/src/app/navigation/navigation.ts b/src/app/navigation/navigation.ts
index b67a7dec..1e314cce 100644
--- a/src/app/navigation/navigation.ts
+++ b/src/app/navigation/navigation.ts
@@ -960,6 +960,12 @@ export const navigation: FuseNavigation[] = [
type : 'item',
url : '/documentation/components/navigation'
},
+ {
+ id : 'progress-bar',
+ title: 'Progress Bar',
+ type : 'item',
+ url : '/documentation/components/progress-bar'
+ },
{
id : 'search-bar',
title: 'Search Bar',
@@ -1057,12 +1063,6 @@ export const navigation: FuseNavigation[] = [
type : 'item',
url : '/documentation/services/fuse-config'
},
- {
- id : 'fuse-loading-bar',
- title: 'Fuse Loading Bar',
- type : 'item',
- url : '/documentation/services/fuse-loading-bar'
- },
{
id : 'fuse-splash-screen',
title: 'Fuse Splash Screen',