Skip to content

Commit 79c305d

Browse files
committed
Sorted components
1 parent c330167 commit 79c305d

10 files changed

Lines changed: 5 additions & 3 deletions

src/app/authentication/guard/authenticated.guard.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ import { AuthenticationService } from '../service/authentication.service';
77
})
88
export class AuthenticatedGuard implements CanActivate {
99

10+
private loginUrl = '/login';
11+
1012
constructor(
1113
private router: Router,
1214
private authenticationService: AuthenticationService
@@ -22,7 +24,7 @@ export class AuthenticatedGuard implements CanActivate {
2224
} else {
2325
// Not logged in
2426
// Redirect to login
25-
this.router.navigate(['/login'], { queryParams: { returnUrl: state.url } });
27+
this.router.navigate([this.loginUrl], { queryParams: { returnUrl: state.url } });
2628
active = false;
2729
}
2830

src/app/login/component/login-form/login-form.component.html renamed to src/app/login/components/login-form/login-form.component.html

File renamed without changes.

src/app/login/component/login-form/login-form.component.sass renamed to src/app/login/components/login-form/login-form.component.sass

File renamed without changes.

src/app/login/component/login-form/login-form.component.spec.ts renamed to src/app/login/components/login-form/login-form.component.spec.ts

File renamed without changes.

src/app/login/component/login-form/login-form.component.ts renamed to src/app/login/components/login-form/login-form.component.ts

File renamed without changes.

src/app/login/logout-button/logout-button.component.html renamed to src/app/login/containers/logout-button/logout-button.component.html

File renamed without changes.

src/app/login/logout-button/logout-button.component.sass renamed to src/app/login/containers/logout-button/logout-button.component.sass

File renamed without changes.

src/app/login/logout-button/logout-button.component.spec.ts renamed to src/app/login/containers/logout-button/logout-button.component.spec.ts

File renamed without changes.

src/app/login/logout-button/logout-button.component.ts renamed to src/app/login/containers/logout-button/logout-button.component.ts

File renamed without changes.

src/app/login/login.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ import { CommonModule } from '@angular/common';
22
import { NgModule } from '@angular/core';
33
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
44
import { AuthenticationModule } from '@app/authentication/authentication.module';
5-
import { LoginFormComponent } from './component/login-form/login-form.component';
5+
import { LoginFormComponent } from './components/login-form/login-form.component';
6+
import { LogoutButtonComponent } from './containers/logout-button/logout-button.component';
67
import { LoginRoutingModule } from './login-routing.module';
7-
import { LogoutButtonComponent } from './logout-button/logout-button.component';
88
import { LoginViewComponent } from './view/login-view/login-view.component';
99

1010

0 commit comments

Comments
 (0)