Skip to content
Snippets Groups Projects
Commit 1462b717 authored by Florent Poittevin's avatar Florent Poittevin
Browse files

Rename main-toolbar-component

parent e6102d46
No related branches found
No related tags found
No related merge requests found
Showing
with 23 additions and 23 deletions
<div [class]="theme"> <div [class]="theme">
<dlcm-main-toolbar [logged]="isLogged$ | async" <dlcm-main-toolbar-desktop [logged]="isLogged$ | async"
[currentPath]="currentModule" [currentPath]="currentModule"
[currentLanguage]="appLanguage$ | async" [currentLanguage]="appLanguage$ | async"
(languageEvent)="useLanguage($event)" (languageEvent)="useLanguage($event)"
(navigateEvent)="navigate($event)" (navigateEvent)="navigate($event)"
(logoutEvent)="logout()"> (logoutEvent)="logout()">
</dlcm-main-toolbar> </dlcm-main-toolbar-desktop>
<dlcm-main-toolbar-mobile [logged]="isLogged$ | async" <dlcm-main-toolbar-mobile [logged]="isLogged$ | async"
[currentPath]="currentModule" [currentPath]="currentModule"
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
} }
} }
dlcm-main-toolbar { dlcm-main-toolbar-desktop {
display: none; display: none;
@include respond-to('md') { @include respond-to('md') {
......
...@@ -4,7 +4,7 @@ import {BrowserModule} from "@angular/platform-browser"; ...@@ -4,7 +4,7 @@ import {BrowserModule} from "@angular/platform-browser";
import {BrowserAnimationsModule} from "@angular/platform-browser/animations"; import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
import {AppRoutingModule} from "@app/app-routing.module"; import {AppRoutingModule} from "@app/app-routing.module";
import {AppState} from "@app/app.state"; import {AppState} from "@app/app.state";
import {MainToolbarMobileComponent} from "@app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component"; import {MainToolbarMobileComponent} from "@app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component";
import {ApiModule} from "@app/generated-api/api.module"; import {ApiModule} from "@app/generated-api/api.module";
import {GlobalErrorsHandlerService} from "@app/core/services/global-errors-handler.service"; import {GlobalErrorsHandlerService} from "@app/core/services/global-errors-handler.service";
...@@ -24,9 +24,9 @@ import {FooterComponent} from "./components/footer/footer.component"; ...@@ -24,9 +24,9 @@ import {FooterComponent} from "./components/footer/footer.component";
import {HomeComponent} from "./components/home/home.component"; import {HomeComponent} from "./components/home/home.component";
import {LanguageSelectorComponent} from "./components/language-selector/language-selector.component"; import {LanguageSelectorComponent} from "./components/language-selector/language-selector.component";
import {LoginComponent} from "./components/login/login.component"; import {LoginComponent} from "./components/login/login.component";
import {MainToolbarComponent} from "./components/main-tool/main-toolbar/main-toolbar.component"; import {MainToolbarDesktopComponent} from "./components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component";
import {PageNotFoundComponent} from "./components/page-not-found/page-not-found.component"; import {PageNotFoundComponent} from "./components/page-not-found/page-not-found.component";
import {AbstractMainToolbarComponent} from "./components/main-tool/abstract-main-toolbar/abstract-main-toolbar.component"; import {AbstractMainToolbarComponent} from "./components/main-toolbar/abstract-main-toolbar/abstract-main-toolbar.component";
import {AppConfigService} from "@app/core/config/app-config.service"; import {AppConfigService} from "@app/core/config/app-config.service";
import {OAuth2Interceptor} from "@app/core/http/oauth2-interceptor.service"; import {OAuth2Interceptor} from "@app/core/http/oauth2-interceptor.service";
import {MatPaginatorIntl} from "@angular/material"; import {MatPaginatorIntl} from "@angular/material";
...@@ -40,7 +40,7 @@ const components = [ ...@@ -40,7 +40,7 @@ const components = [
HomeComponent, HomeComponent,
LanguageSelectorComponent, LanguageSelectorComponent,
LoginComponent, LoginComponent,
MainToolbarComponent, MainToolbarDesktopComponent,
MainToolbarMobileComponent, MainToolbarMobileComponent,
PageNotFoundComponent, PageNotFoundComponent,
]; ];
......
import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { async, ComponentFixture, TestBed } from "@angular/core/testing";
import { MainToolbarComponent } from "./main-toolbar.component"; import { MainToolbarDesktopComponent } from "./main-toolbar-desktop.component";
describe("MainToolbarComponent", () => { describe("MainToolbarComponent", () => {
let component: MainToolbarComponent; let component: MainToolbarDesktopComponent;
let fixture: ComponentFixture<MainToolbarComponent>; let fixture: ComponentFixture<MainToolbarDesktopComponent>;
beforeEach(async(() => { beforeEach(async(() => {
TestBed.configureTestingModule({ TestBed.configureTestingModule({
declarations: [ MainToolbarComponent ] declarations: [ MainToolbarDesktopComponent ]
}) })
.compileComponents(); .compileComponents();
})); }));
beforeEach(() => { beforeEach(() => {
fixture = TestBed.createComponent(MainToolbarComponent); fixture = TestBed.createComponent(MainToolbarDesktopComponent);
component = fixture.componentInstance; component = fixture.componentInstance;
fixture.detectChanges(); fixture.detectChanges();
}); });
......
import {ChangeDetectionStrategy, Component} from "@angular/core"; import {ChangeDetectionStrategy, Component} from "@angular/core";
import {AbstractMainToolbarComponent} from "@app/components/main-tool/abstract-main-toolbar/abstract-main-toolbar.component"; import {AbstractMainToolbarComponent} from "@app/components/main-toolbar/abstract-main-toolbar/abstract-main-toolbar.component";
import {OAuth2Service} from "@app/core/auth/oauth2.service"; import {OAuth2Service} from "@app/core/auth/oauth2.service";
@Component({ @Component({
selector: "dlcm-main-toolbar", selector: "dlcm-main-toolbar-desktop",
templateUrl: "./main-toolbar.component.html", templateUrl: "./main-toolbar-desktop.component.html",
styleUrls: ["./main-toolbar.component.scss"], styleUrls: ["./main-toolbar-desktop.component.scss"],
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
}) })
export class MainToolbarComponent extends AbstractMainToolbarComponent { export class MainToolbarDesktopComponent extends AbstractMainToolbarComponent {
constructor(private oauth: OAuth2Service) { constructor(private oauth: OAuth2Service) {
super(oauth); super(oauth);
......
import {ChangeDetectionStrategy, Component} from "@angular/core"; import {ChangeDetectionStrategy, Component} from "@angular/core";
import {AbstractMainToolbarComponent} from "@app/components/main-tool/abstract-main-toolbar/abstract-main-toolbar.component"; import {AbstractMainToolbarComponent} from "@app/components/main-toolbar/abstract-main-toolbar/abstract-main-toolbar.component";
import {OAuth2Service} from "@app/core/auth/oauth2.service"; import {OAuth2Service} from "@app/core/auth/oauth2.service";
@Component({ @Component({
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment