From 1462b71784c53d5765c2be98fea85d9e786eebce Mon Sep 17 00:00:00 2001
From: Florent Poittevin <florent.poittevin@unige.ch>
Date: Mon, 8 Jul 2019 13:49:11 +0200
Subject: [PATCH] Rename main-toolbar-component
---
src/app/app.component.html | 14 +++++++-------
src/app/app.component.scss | 2 +-
src/app/app.module.ts | 8 ++++----
.../abstract-main-toolbar.component.ts | 0
.../main-toolbar-desktop.component.html} | 0
.../main-toolbar-desktop.component.scss} | 0
.../main-toolbar-desktop.component.spec.ts} | 10 +++++-----
.../main-toolbar-desktop.component.ts} | 10 +++++-----
.../main-toolbar-mobile.component.html | 0
.../main-toolbar-mobile.component.scss | 0
.../main-toolbar-mobile.component.spec.ts | 0
.../main-toolbar-mobile.component.ts | 2 +-
12 files changed, 23 insertions(+), 23 deletions(-)
rename src/app/components/{main-tool => main-toolbar}/abstract-main-toolbar/abstract-main-toolbar.component.ts (100%)
rename src/app/components/{main-tool/main-toolbar/main-toolbar.component.html => main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.html} (100%)
rename src/app/components/{main-tool/main-toolbar/main-toolbar.component.scss => main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.scss} (100%)
rename src/app/components/{main-tool/main-toolbar/main-toolbar.component.spec.ts => main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.spec.ts} (56%)
rename src/app/components/{main-tool/main-toolbar/main-toolbar.component.ts => main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.ts} (52%)
rename src/app/components/{main-tool => main-toolbar}/main-toolbar-mobile/main-toolbar-mobile.component.html (100%)
rename src/app/components/{main-tool => main-toolbar}/main-toolbar-mobile/main-toolbar-mobile.component.scss (100%)
rename src/app/components/{main-tool => main-toolbar}/main-toolbar-mobile/main-toolbar-mobile.component.spec.ts (100%)
rename src/app/components/{main-tool => main-toolbar}/main-toolbar-mobile/main-toolbar-mobile.component.ts (89%)
diff --git a/src/app/app.component.html b/src/app/app.component.html
index 53e583e21..a42c14662 100644
--- a/src/app/app.component.html
+++ b/src/app/app.component.html
@@ -1,11 +1,11 @@
<div [class]="theme">
- <dlcm-main-toolbar [logged]="isLogged$ | async"
- [currentPath]="currentModule"
- [currentLanguage]="appLanguage$ | async"
- (languageEvent)="useLanguage($event)"
- (navigateEvent)="navigate($event)"
- (logoutEvent)="logout()">
- </dlcm-main-toolbar>
+ <dlcm-main-toolbar-desktop [logged]="isLogged$ | async"
+ [currentPath]="currentModule"
+ [currentLanguage]="appLanguage$ | async"
+ (languageEvent)="useLanguage($event)"
+ (navigateEvent)="navigate($event)"
+ (logoutEvent)="logout()">
+ </dlcm-main-toolbar-desktop>
<dlcm-main-toolbar-mobile [logged]="isLogged$ | async"
[currentPath]="currentModule"
diff --git a/src/app/app.component.scss b/src/app/app.component.scss
index ece56ee12..55c6b5896 100644
--- a/src/app/app.component.scss
+++ b/src/app/app.component.scss
@@ -11,7 +11,7 @@
}
}
-dlcm-main-toolbar {
+dlcm-main-toolbar-desktop {
display: none;
@include respond-to('md') {
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index be523cae5..957352b22 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -4,7 +4,7 @@ import {BrowserModule} from "@angular/platform-browser";
import {BrowserAnimationsModule} from "@angular/platform-browser/animations";
import {AppRoutingModule} from "@app/app-routing.module";
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 {GlobalErrorsHandlerService} from "@app/core/services/global-errors-handler.service";
@@ -24,9 +24,9 @@ import {FooterComponent} from "./components/footer/footer.component";
import {HomeComponent} from "./components/home/home.component";
import {LanguageSelectorComponent} from "./components/language-selector/language-selector.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 {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 {OAuth2Interceptor} from "@app/core/http/oauth2-interceptor.service";
import {MatPaginatorIntl} from "@angular/material";
@@ -40,7 +40,7 @@ const components = [
HomeComponent,
LanguageSelectorComponent,
LoginComponent,
- MainToolbarComponent,
+ MainToolbarDesktopComponent,
MainToolbarMobileComponent,
PageNotFoundComponent,
];
diff --git a/src/app/components/main-tool/abstract-main-toolbar/abstract-main-toolbar.component.ts b/src/app/components/main-toolbar/abstract-main-toolbar/abstract-main-toolbar.component.ts
similarity index 100%
rename from src/app/components/main-tool/abstract-main-toolbar/abstract-main-toolbar.component.ts
rename to src/app/components/main-toolbar/abstract-main-toolbar/abstract-main-toolbar.component.ts
diff --git a/src/app/components/main-tool/main-toolbar/main-toolbar.component.html b/src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.html
similarity index 100%
rename from src/app/components/main-tool/main-toolbar/main-toolbar.component.html
rename to src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.html
diff --git a/src/app/components/main-tool/main-toolbar/main-toolbar.component.scss b/src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.scss
similarity index 100%
rename from src/app/components/main-tool/main-toolbar/main-toolbar.component.scss
rename to src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.scss
diff --git a/src/app/components/main-tool/main-toolbar/main-toolbar.component.spec.ts b/src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.spec.ts
similarity index 56%
rename from src/app/components/main-tool/main-toolbar/main-toolbar.component.spec.ts
rename to src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.spec.ts
index c3b733d80..75a001791 100644
--- a/src/app/components/main-tool/main-toolbar/main-toolbar.component.spec.ts
+++ b/src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.spec.ts
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from "@angular/core/testing";
-import { MainToolbarComponent } from "./main-toolbar.component";
+import { MainToolbarDesktopComponent } from "./main-toolbar-desktop.component";
describe("MainToolbarComponent", () => {
- let component: MainToolbarComponent;
- let fixture: ComponentFixture<MainToolbarComponent>;
+ let component: MainToolbarDesktopComponent;
+ let fixture: ComponentFixture<MainToolbarDesktopComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ MainToolbarComponent ]
+ declarations: [ MainToolbarDesktopComponent ]
})
.compileComponents();
}));
beforeEach(() => {
- fixture = TestBed.createComponent(MainToolbarComponent);
+ fixture = TestBed.createComponent(MainToolbarDesktopComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
diff --git a/src/app/components/main-tool/main-toolbar/main-toolbar.component.ts b/src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.ts
similarity index 52%
rename from src/app/components/main-tool/main-toolbar/main-toolbar.component.ts
rename to src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.ts
index 13b9a7fde..56ed67246 100644
--- a/src/app/components/main-tool/main-toolbar/main-toolbar.component.ts
+++ b/src/app/components/main-toolbar/main-toolbar-desktop/main-toolbar-desktop.component.ts
@@ -1,14 +1,14 @@
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";
@Component({
- selector: "dlcm-main-toolbar",
- templateUrl: "./main-toolbar.component.html",
- styleUrls: ["./main-toolbar.component.scss"],
+ selector: "dlcm-main-toolbar-desktop",
+ templateUrl: "./main-toolbar-desktop.component.html",
+ styleUrls: ["./main-toolbar-desktop.component.scss"],
changeDetection: ChangeDetectionStrategy.OnPush,
})
-export class MainToolbarComponent extends AbstractMainToolbarComponent {
+export class MainToolbarDesktopComponent extends AbstractMainToolbarComponent {
constructor(private oauth: OAuth2Service) {
super(oauth);
diff --git a/src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.html b/src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.html
similarity index 100%
rename from src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.html
rename to src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.html
diff --git a/src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.scss b/src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.scss
similarity index 100%
rename from src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.scss
rename to src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.scss
diff --git a/src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.spec.ts b/src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.spec.ts
similarity index 100%
rename from src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.spec.ts
rename to src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.spec.ts
diff --git a/src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.ts b/src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.ts
similarity index 89%
rename from src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.ts
rename to src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.ts
index ef1dfe2d4..106bb7a37 100644
--- a/src/app/components/main-tool/main-toolbar-mobile/main-toolbar-mobile.component.ts
+++ b/src/app/components/main-toolbar/main-toolbar-mobile/main-toolbar-mobile.component.ts
@@ -1,5 +1,5 @@
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";
@Component({
--
GitLab