Merge remote-tracking branch 'origin/demo' into starter

This commit is contained in:
sercan 2021-09-10 12:27:59 +03:00
commit 3d6714008a
34 changed files with 401 additions and 29 deletions

View File

@ -14,17 +14,17 @@
"lint": "ng lint" "lint": "ng lint"
}, },
"dependencies": { "dependencies": {
"@angular/animations": "12.2.3", "@angular/animations": "12.2.4",
"@angular/cdk": "12.2.3", "@angular/cdk": "12.2.4",
"@angular/common": "12.2.3", "@angular/common": "12.2.4",
"@angular/compiler": "12.2.3", "@angular/compiler": "12.2.4",
"@angular/core": "12.2.3", "@angular/core": "12.2.4",
"@angular/forms": "12.2.3", "@angular/forms": "12.2.4",
"@angular/material": "12.2.3", "@angular/material": "12.2.4",
"@angular/material-moment-adapter": "12.2.3", "@angular/material-moment-adapter": "12.2.4",
"@angular/platform-browser": "12.2.3", "@angular/platform-browser": "12.2.4",
"@angular/platform-browser-dynamic": "12.2.3", "@angular/platform-browser-dynamic": "12.2.4",
"@angular/router": "12.2.3", "@angular/router": "12.2.4",
"@fullcalendar/angular": "4.4.5-beta", "@fullcalendar/angular": "4.4.5-beta",
"@fullcalendar/core": "4.4.2", "@fullcalendar/core": "4.4.2",
"@fullcalendar/daygrid": "4.4.2", "@fullcalendar/daygrid": "4.4.2",
@ -51,14 +51,14 @@
"zone.js": "0.11.4" "zone.js": "0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-devkit/build-angular": "12.2.3", "@angular-devkit/build-angular": "12.2.4",
"@angular-eslint/builder": "12.3.1", "@angular-eslint/builder": "12.3.1",
"@angular-eslint/eslint-plugin": "12.3.1", "@angular-eslint/eslint-plugin": "12.3.1",
"@angular-eslint/eslint-plugin-template": "12.3.1", "@angular-eslint/eslint-plugin-template": "12.3.1",
"@angular-eslint/schematics": "12.3.1", "@angular-eslint/schematics": "12.3.1",
"@angular-eslint/template-parser": "12.3.1", "@angular-eslint/template-parser": "12.3.1",
"@angular/cli": "12.2.3", "@angular/cli": "12.2.4",
"@angular/compiler-cli": "12.2.3", "@angular/compiler-cli": "12.2.4",
"@tailwindcss/aspect-ratio": "0.2.1", "@tailwindcss/aspect-ratio": "0.2.1",
"@tailwindcss/line-clamp": "0.2.1", "@tailwindcss/line-clamp": "0.2.1",
"@tailwindcss/typography": "0.4.1", "@tailwindcss/typography": "0.4.1",
@ -69,9 +69,9 @@
"@types/lodash": "4.14.172", "@types/lodash": "4.14.172",
"@types/lodash-es": "4.17.4", "@types/lodash-es": "4.17.4",
"@types/node": "12.20.21", "@types/node": "12.20.21",
"@typescript-eslint/eslint-plugin": "4.30.0", "@typescript-eslint/eslint-plugin": "4.31.0",
"@typescript-eslint/parser": "4.30.0", "@typescript-eslint/parser": "4.31.0",
"autoprefixer": "10.3.3", "autoprefixer": "10.3.4",
"chroma-js": "2.1.2", "chroma-js": "2.1.2",
"eslint": "7.32.0", "eslint": "7.32.0",
"eslint-plugin-import": "2.24.2", "eslint-plugin-import": "2.24.2",

View File

@ -0,0 +1 @@
export * from '@fuse/components/loading-bar/public-api';

View File

@ -0,0 +1,5 @@
<ng-container *ngIf="show">
<mat-progress-bar
[mode]="mode"
[value]="progress"></mat-progress-bar>
</ng-container>

View File

@ -0,0 +1,7 @@
fuse-loading-bar {
position: fixed;
top: 0;
z-index: 999;
width: 100%;
height: 6px;
}

View File

@ -0,0 +1,83 @@
import { Component, Input, OnChanges, OnDestroy, OnInit, SimpleChanges, ViewEncapsulation } from '@angular/core';
import { coerceBooleanProperty } from '@angular/cdk/coercion';
import { FuseLoadingBarService } from '@fuse/components/loading-bar/loading-bar.service';
import { takeUntil } from 'rxjs/operators';
import { Subject } from 'rxjs';
@Component({
selector : 'fuse-loading-bar',
templateUrl : './loading-bar.component.html',
styleUrls : ['./loading-bar.component.scss'],
encapsulation: ViewEncapsulation.None,
exportAs : 'fuseLoadingBar'
})
export class FuseLoadingBarComponent implements OnChanges, OnInit, OnDestroy
{
@Input() autoMode: boolean = true;
mode: 'determinate' | 'indeterminate';
progress: number = 0;
show: boolean = false;
private _unsubscribeAll: Subject<any> = new Subject<any>();
/**
* Constructor
*/
constructor(private _fuseLoadingBarService: FuseLoadingBarService)
{
}
// -----------------------------------------------------------------------------------------------------
// @ Lifecycle hooks
// -----------------------------------------------------------------------------------------------------
/**
* On changes
*
* @param changes
*/
ngOnChanges(changes: SimpleChanges): void
{
// Auto mode
if ( 'autoMode' in changes )
{
// Set the auto mode in the service
this._fuseLoadingBarService.setAutoMode(coerceBooleanProperty(changes.autoMode.currentValue));
}
}
/**
* On init
*/
ngOnInit(): void
{
// Subscribe to the service
this._fuseLoadingBarService.mode$
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((value) => {
this.mode = value;
});
this._fuseLoadingBarService.progress$
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((value) => {
this.progress = value;
});
this._fuseLoadingBarService.show$
.pipe(takeUntil(this._unsubscribeAll))
.subscribe((value) => {
this.show = value;
});
}
/**
* On destroy
*/
ngOnDestroy(): void
{
// Unsubscribe from all subscriptions
this._unsubscribeAll.next();
this._unsubscribeAll.complete();
}
}

View File

@ -0,0 +1,49 @@
import { Injectable } from '@angular/core';
import { HttpEvent, HttpHandler, HttpInterceptor, HttpRequest } from '@angular/common/http';
import { Observable } from 'rxjs';
import { finalize } from 'rxjs/operators';
import { FuseLoadingBarService } from '@fuse/components/loading-bar/loading-bar.service';
@Injectable()
export class FuseLoadingBarInterceptor implements HttpInterceptor
{
handleRequestsAutomatically: boolean;
/**
* Constructor
*/
constructor(
private _fuseLoadingBarService: FuseLoadingBarService
)
{
// Subscribe to the auto
this._fuseLoadingBarService.auto$
.subscribe((value) => {
this.handleRequestsAutomatically = value;
});
}
/**
* Intercept
*
* @param req
* @param next
*/
intercept(req: HttpRequest<any>, next: HttpHandler): Observable<HttpEvent<any>>
{
// If the Auto mode is turned off, do nothing
if ( !this.handleRequestsAutomatically )
{
return next.handle(req);
}
// Set the loading status to true
this._fuseLoadingBarService._setLoadingStatus(true, req.url);
return next.handle(req).pipe(
finalize(() => {
// Set the status to false if there are any errors or the request is completed
this._fuseLoadingBarService._setLoadingStatus(false, req.url);
}));
}
}

View File

@ -0,0 +1,29 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { HTTP_INTERCEPTORS } from '@angular/common/http';
import { MatProgressBarModule } from '@angular/material/progress-bar';
import { FuseLoadingBarComponent } from '@fuse/components/loading-bar/loading-bar.component';
import { FuseLoadingBarInterceptor } from '@fuse/components/loading-bar/loading-bar.interceptor';
@NgModule({
declarations: [
FuseLoadingBarComponent
],
imports : [
CommonModule,
MatProgressBarModule
],
exports : [
FuseLoadingBarComponent
],
providers : [
{
provide : HTTP_INTERCEPTORS,
useClass: FuseLoadingBarInterceptor,
multi : true
}
]
})
export class FuseLoadingBarModule
{
}

View File

@ -0,0 +1,146 @@
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { BehaviorSubject, Observable } from 'rxjs';
@Injectable({
providedIn: 'root'
})
export class FuseLoadingBarService
{
private _auto$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(true);
private _mode$: BehaviorSubject<'determinate' | 'indeterminate'> = new BehaviorSubject<'determinate' | 'indeterminate'>('indeterminate');
private _progress$: BehaviorSubject<number | null> = new BehaviorSubject<number | null>(0);
private _show$: BehaviorSubject<boolean> = new BehaviorSubject<boolean>(false);
private _urlMap: Map<string, boolean> = new Map<string, boolean>();
/**
* Constructor
*/
constructor(private _httpClient: HttpClient)
{
}
// -----------------------------------------------------------------------------------------------------
// @ Accessors
// -----------------------------------------------------------------------------------------------------
/**
* Getter for auto mode
*/
get auto$(): Observable<boolean>
{
return this._auto$.asObservable();
}
/**
* Getter for mode
*/
get mode$(): Observable<'determinate' | 'indeterminate'>
{
return this._mode$.asObservable();
}
/**
* Getter for progress
*/
get progress$(): Observable<number>
{
return this._progress$.asObservable();
}
/**
* Getter for show
*/
get show$(): Observable<boolean>
{
return this._show$.asObservable();
}
// -----------------------------------------------------------------------------------------------------
// @ Public methods
// -----------------------------------------------------------------------------------------------------
/**
* Show the loading bar
*/
show(): void
{
this._show$.next(true);
}
/**
* Hide the loading bar
*/
hide(): void
{
this._show$.next(false);
}
/**
* Set the auto mode
*
* @param value
*/
setAutoMode(value: boolean): void
{
this._auto$.next(value);
}
/**
* Set the mode
*
* @param value
*/
setMode(value: 'determinate' | 'indeterminate'): void
{
this._mode$.next(value);
}
/**
* Set the progress of the bar manually
*
* @param value
*/
setProgress(value: number): void
{
if ( value < 0 || value > 100 )
{
console.error('Progress value must be between 0 and 100!');
return;
}
this._progress$.next(value);
}
/**
* Sets the loading status on the given url
*
* @param status
* @param url
*/
_setLoadingStatus(status: boolean, url: string): void
{
// Return if the url was not provided
if ( !url )
{
console.error('The request URL must be provided!');
return;
}
if ( status === true )
{
this._urlMap.set(url, status);
this._show$.next(true);
}
else if ( status === false && this._urlMap.has(url) )
{
this._urlMap.delete(url);
}
// Only set the status to 'false' if all outgoing requests are completed
if ( this._urlMap.size === 0 )
{
this._show$.next(false);
}
}
}

View File

@ -0,0 +1,3 @@
export * from '@fuse/components/loading-bar/loading-bar.component';
export * from '@fuse/components/loading-bar/loading-bar.service';
export * from '@fuse/components/loading-bar/loading-bar.module';

View File

@ -434,7 +434,7 @@
/* Border color */ /* Border color */
.mat-form-field-flex { .mat-form-field-flex {
@apply border-warn #{'!important'}; @apply border-warn dark:border-warn #{'!important'};
} }
} }
} }
@ -446,7 +446,7 @@
/* Background color */ /* Background color */
.mat-form-field-flex { .mat-form-field-flex {
@apply bg-card #{'!important'}; @apply bg-card dark:bg-card #{'!important'};
} }
} }
} }
@ -458,7 +458,7 @@
/* Border color */ /* Border color */
.mat-form-field-flex { .mat-form-field-flex {
@apply border-primary #{'!important'}; @apply border-primary dark:border-primary #{'!important'};
} }
} }
} }

View File

@ -1,7 +1,4 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';
import { FuseDrawerModule } from '@fuse/components/drawer';
import { LayoutComponent } from 'app/layout/layout.component'; import { LayoutComponent } from 'app/layout/layout.component';
import { EmptyLayoutModule } from 'app/layout/layouts/empty/empty.module'; import { EmptyLayoutModule } from 'app/layout/layouts/empty/empty.module';
import { CenteredLayoutModule } from 'app/layout/layouts/horizontal/centered/centered.module'; import { CenteredLayoutModule } from 'app/layout/layouts/horizontal/centered/centered.module';
@ -40,13 +37,10 @@ const layoutModules = [
declarations: [ declarations: [
LayoutComponent LayoutComponent
], ],
imports: [ imports : [
MatIconModule,
MatTooltipModule,
FuseDrawerModule,
SharedModule, SharedModule,
SettingsModule, SettingsModule,
...layoutModules, ...layoutModules
], ],
exports : [ exports : [
LayoutComponent, LayoutComponent,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Wrapper --> <!-- Wrapper -->
<div class="flex flex-col flex-auto w-full"> <div class="flex flex-col flex-auto w-full">

View File

@ -1,5 +1,6 @@
import { NgModule } from '@angular/core'; import { NgModule } from '@angular/core';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { SharedModule } from 'app/shared/shared.module'; import { SharedModule } from 'app/shared/shared.module';
import { EmptyLayoutComponent } from 'app/layout/layouts/empty/empty.component'; import { EmptyLayoutComponent } from 'app/layout/layouts/empty/empty.component';
@ -9,6 +10,7 @@ import { EmptyLayoutComponent } from 'app/layout/layouts/empty/empty.component';
], ],
imports : [ imports : [
RouterModule, RouterModule,
FuseLoadingBarModule,
SharedModule SharedModule
], ],
exports : [ exports : [

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<div class="flex flex-auto justify-center w-full sm:p-4 md:p-8 bg-gray-200 dark:bg-card"> <div class="flex flex-auto justify-center w-full sm:p-4 md:p-8 bg-gray-200 dark:bg-card">
<!-- Navigation --> <!-- Navigation -->

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -28,6 +29,7 @@ import { CenteredLayoutComponent } from 'app/layout/layouts/horizontal/centered/
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<ng-container *ngIf="isScreenSmall"> <ng-container *ngIf="isScreenSmall">
<fuse-vertical-navigation <fuse-vertical-navigation

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -29,6 +30,7 @@ import { EnterpriseLayoutComponent } from 'app/layout/layouts/horizontal/enterpr
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<ng-container *ngIf="isScreenSmall"> <ng-container *ngIf="isScreenSmall">
<fuse-vertical-navigation <fuse-vertical-navigation

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -28,6 +29,7 @@ import { MaterialLayoutComponent } from 'app/layout/layouts/horizontal/material/
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<ng-container *ngIf="isScreenSmall"> <ng-container *ngIf="isScreenSmall">
<fuse-vertical-navigation <fuse-vertical-navigation

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -29,6 +30,7 @@ import { ModernLayoutComponent } from 'app/layout/layouts/horizontal/modern/mode
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<fuse-vertical-navigation <fuse-vertical-navigation
class="dark bg-gray-900 print:hidden" class="dark bg-gray-900 print:hidden"

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -29,6 +30,7 @@ import { ClassicLayoutComponent } from 'app/layout/layouts/vertical/classic/clas
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<fuse-vertical-navigation <fuse-vertical-navigation
class="dark bg-gray-900 print:hidden" class="dark bg-gray-900 print:hidden"

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseFullscreenModule } from '@fuse/components/fullscreen/fullscreen.module'; import { FuseFullscreenModule } from '@fuse/components/fullscreen/fullscreen.module';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -29,6 +30,7 @@ import { ClassyLayoutComponent } from 'app/layout/layouts/vertical/classy/classy
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<fuse-vertical-navigation <fuse-vertical-navigation
class="dark bg-gray-900 print:hidden" class="dark bg-gray-900 print:hidden"

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -29,6 +30,7 @@ import { CompactLayoutComponent } from 'app/layout/layouts/vertical/compact/comp
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<fuse-vertical-navigation <fuse-vertical-navigation
class="dark bg-gray-900 print:hidden" class="dark bg-gray-900 print:hidden"

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -29,6 +30,7 @@ import { DenseLayoutComponent } from 'app/layout/layouts/vertical/dense/dense.co
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<fuse-vertical-navigation <fuse-vertical-navigation
class="dark bg-indigo-800 text-white print:hidden" class="dark bg-indigo-800 text-white print:hidden"

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -29,6 +30,7 @@ import { FuturisticLayoutComponent } from 'app/layout/layouts/vertical/futuristi
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -1,3 +1,6 @@
<!-- Loading bar -->
<fuse-loading-bar></fuse-loading-bar>
<!-- Navigation --> <!-- Navigation -->
<fuse-vertical-navigation <fuse-vertical-navigation
class="bg-card dark:bg-gray-900 print:hidden" class="bg-card dark:bg-gray-900 print:hidden"

View File

@ -6,6 +6,7 @@ import { MatDividerModule } from '@angular/material/divider';
import { MatIconModule } from '@angular/material/icon'; import { MatIconModule } from '@angular/material/icon';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { FuseFullscreenModule } from '@fuse/components/fullscreen'; import { FuseFullscreenModule } from '@fuse/components/fullscreen';
import { FuseLoadingBarModule } from '@fuse/components/loading-bar';
import { FuseNavigationModule } from '@fuse/components/navigation'; import { FuseNavigationModule } from '@fuse/components/navigation';
import { LanguagesModule } from 'app/layout/common/languages/languages.module'; import { LanguagesModule } from 'app/layout/common/languages/languages.module';
import { MessagesModule } from 'app/layout/common/messages/messages.module'; import { MessagesModule } from 'app/layout/common/messages/messages.module';
@ -29,6 +30,7 @@ import { ThinLayoutComponent } from 'app/layout/layouts/vertical/thin/thin.compo
MatIconModule, MatIconModule,
MatMenuModule, MatMenuModule,
FuseFullscreenModule, FuseFullscreenModule,
FuseLoadingBarModule,
FuseNavigationModule, FuseNavigationModule,
LanguagesModule, LanguagesModule,
MessagesModule, MessagesModule,

View File

@ -12,7 +12,7 @@
<div>Already have an account?</div> <div>Already have an account?</div>
<a <a
class="ml-1 text-primary-500 hover:underline" class="ml-1 text-primary-500 hover:underline"
[routerLink]="['/pages/authentication/sign-in']">Sign in [routerLink]="['/sign-in']">Sign in
</a> </a>
</div> </div>