diff --git a/src/app/_modules/layout/footer/footer.component.html b/src/app/_modules/layout/footer/footer.component.html index af71b53..191018b 100644 --- a/src/app/_modules/layout/footer/footer.component.html +++ b/src/app/_modules/layout/footer/footer.component.html @@ -46,7 +46,7 @@
Новости
-
+
Вход для зарегистрированных пользователей
diff --git a/src/app/_modules/layout/header/header.component.html b/src/app/_modules/layout/header/header.component.html index 25d5b9e..4bd7a3c 100644 --- a/src/app/_modules/layout/header/header.component.html +++ b/src/app/_modules/layout/header/header.component.html @@ -17,6 +17,7 @@ --> +
@@ -29,3 +30,4 @@
+ diff --git a/src/app/_modules/layout/header/header.component.scss b/src/app/_modules/layout/header/header.component.scss index 399993a..d56a20a 100644 --- a/src/app/_modules/layout/header/header.component.scss +++ b/src/app/_modules/layout/header/header.component.scss @@ -118,6 +118,10 @@ } } } + header-user-bar{ + position: absolute; + right: 0; + } } diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html index 3009aef..412a4de 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html @@ -1,4 +1,4 @@ -
+
{{user.initials}} diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss index 00d1657..27dadb8 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.scss @@ -1,4 +1,6 @@ .user { + width: 100px; + height: 100px; position: relative; .avatar { width: 40px; diff --git a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts index a465f7f..afd7266 100644 --- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts +++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.ts @@ -1,5 +1,5 @@ import {Component, Input} from '@angular/core'; -import {AuthenticationService, ListsService} from "@app/_services"; +import {AuthenticationService} from "@app/_services"; import {Router} from "@angular/router"; @Component({ @@ -23,7 +23,7 @@ export class HeaderUserBarComponent { } ngOnInit() { - + console.log(this.user) } diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts index 0abbcf1..e793d1f 100644 --- a/src/app/_modules/pages/page/page.component.ts +++ b/src/app/_modules/pages/page/page.component.ts @@ -15,6 +15,7 @@ export class PageComponent { private url: string; private inited = false; routeSubscription?: Subscription; + subscription: Subscription; constructor(private router: Router, private pagesService: PagesService, private listsService: ListsService) { this.routeSubscription = this.router.events.subscribe(event => { @@ -23,6 +24,7 @@ export class PageComponent { } + get permissions() { return this.page?.permissions; } diff --git a/src/app/_modules/pages/sections/add/add-section.component.html b/src/app/_modules/pages/sections/add/add-section.component.html index d15eb2c..4013871 100644 --- a/src/app/_modules/pages/sections/add/add-section.component.html +++ b/src/app/_modules/pages/sections/add/add-section.component.html @@ -1,6 +1,6 @@
Добавить элемент
-