+
+
Панель управления
-
+
\ No newline at end of file
diff --git a/src/app/_modules/administration/page/administration-page.component.scss b/src/app/_modules/administration/page/administration-page.component.scss
index 7195ade..8b13789 100644
--- a/src/app/_modules/administration/page/administration-page.component.scss
+++ b/src/app/_modules/administration/page/administration-page.component.scss
@@ -1,22 +1 @@
-.line{
- display: inline-block;
- border-bottom: 12px solid var(--blue-0);
- margin-top: 24px;
- margin-bottom: 40px;
- h1{
- display: inline;
- padding-right: 40px;
- vertical-align: 2px;
- font-family: PT Sans Narrow;
- font-size: 76px;
- font-style: normal;
- font-weight: 700;
- line-height: 60px; /* 100% */
- letter-spacing: 0.76px;
- color: var(--second-act);
- }
-}
-:host{
- font-size: 20px;
-}
diff --git a/src/app/_modules/administration/site-pages/administrate-site-pages.component.html b/src/app/_modules/administration/site-pages/administrate-site-pages.component.html
index ac13a87..194e958 100644
--- a/src/app/_modules/administration/site-pages/administrate-site-pages.component.html
+++ b/src/app/_modules/administration/site-pages/administrate-site-pages.component.html
@@ -1,3 +1,8 @@
-
-
Показать удаленные
+
+
+
+ Показать удаленные
+
+
+
diff --git a/src/app/_modules/administration/site-pages/administrate-site-pages.component.scss b/src/app/_modules/administration/site-pages/administrate-site-pages.component.scss
index b1af125..e69de29 100644
--- a/src/app/_modules/administration/site-pages/administrate-site-pages.component.scss
+++ b/src/app/_modules/administration/site-pages/administrate-site-pages.component.scss
@@ -1,171 +0,0 @@
-
-
-.item.home .bar .mid .info .logo::before{
- background-image: url('~src/assets/images/icons/home_page_24dp.svg');
- }
-
- .item:not(.home){
- .bar{
- padding-left: 50px;
-
- }
- .item .bar{
- padding-left: 100px;
- }
- .item .item .bar{
- padding-left: 150px;
- }
- .item .item .item .bar{
- padding-left: 200px;
- }
-
- .item .item .item .item .bar{
- padding-left: 250px;
- }
- }
-
-
-
- .item {
- .bar {
- display: flex;
- flex-direction: row;
- align-items: center;
- padding: 16px 0;
- border-bottom: #E0E0E0 solid 1px;
- .left {
- flex-shrink: 0;
- width: 40px;
- height: 24px;
- cursor: pointer;
- .toggle {
- border:none;
- width: 100%;
- height: 100%;
- background: transparent url("~src/assets/images/icons/expand_less_20.svg") 50% 50% no-repeat;
- transform: rotate(90deg);
- transition: transform .3s;
- }
- }
- .mid {
- flex-grow: 1;
- padding: 0 16px;
- .info {
- display: flex;
- flex-direction: row;
- align-items: center;
- .logo {
- display: flex;
- align-items: center;
- justify-content: center;
- position: relative;
- flex-shrink: 0;
- width: 40px;
- height: 40px;
- margin-right: 16px;
- border-radius: 100px;
- background-color: var(--prime);
- color: #ffffff;
- span{
- display: none;
-
- }
- &::before {
- content: "";
- display: block;
- background: transparent url("~src/assets/images/icons/web_page_24dp.svg")no-repeat;
- width: 24px;
- height: 24px;
- }
-
- img {
- width: 100%;
- height: 100%;
- border-radius: 100px;
- object-fit: cover;
- background-color: #ffffff;
- }
- }
- .name {
- p {
- margin: 0;
- a {
- color: var(--grey-7);
- }
- &.sub {
- font-size: 0.875rem;
- color: #7f7f7f;
- }
- }
- }
- }
- }
- .right {
- display: flex;
- flex-direction: row;
- align-items: center;
- flex-shrink: 1;
- button {
- margin-left: 24px;
- &.edit {
- background-image: url('~src/assets/images/icons/edit_24dp.svg');
- }
- &.add {
- background-image: url('~src/assets/images/icons/add_library_dark_24.svg');
- }
- &.delete {
- background-image: url('~src/assets/images/icons/close_24dp.svg');
- }
- &.move {
- background-image: url('~src/assets/images/icons/drag-n-drop_24.svg');
- cursor: move;
- }
- }
- }
- .right-home {
- width: 144px;
- }
- }
- .items {
- display: none;
-
- }
- &.active {
- >.bar {
- .left {
- .toggle {
- transform: rotate(180deg);
- }
- }
- }
- >.items {
- display: block;
- }
- }
- }
-
-
- @media screen and (max-width: 1330px) {
- .item {
- .bar {
- .mid {
- padding: 0 12px;
- .info .logo {
- display: none;
- }
- }
- .right {
- display: none;
- }
- }
- .items {
- padding-left: 16px;
- }
- &.company {
- .items {
- padding-left: 40px;
- }
- }
- }
- }
-
\ No newline at end of file
diff --git a/src/app/_modules/layout/header/header.component.ts b/src/app/_modules/layout/header/header.component.ts
index 2b713e1..700de46 100644
--- a/src/app/_modules/layout/header/header.component.ts
+++ b/src/app/_modules/layout/header/header.component.ts
@@ -14,6 +14,11 @@ export class HeaderComponent {
public pagesService: PagesService
) {
}
+ // ngOnInit(){
+ // this.pagesService.root().subscribe(
+ // resp=> this.pagesService.rootPages = resp
+ // )
+ // }
get rootPage() {
return this.pagesService.rootPage;
@@ -22,5 +27,4 @@ export class HeaderComponent {
openMobileMenu(){
this.router.navigate([{outlets: {slider: 'pages-menu'}}], {skipLocationChange: true}).then();
}
-
-}
+}
\ No newline at end of file
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 f933e4a..e31ee79 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
@@ -58,6 +58,7 @@ export class HeaderUserBarComponent {
}
link(link: string) {
+ this.pagesService.currentPageSubject.next(null);
this.close()
this.router.navigate([link]).then();
}
diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.html b/src/app/_modules/layout/jumbotron/jumbotron.component.html
index 9972ebf..3b5bf6e 100644
--- a/src/app/_modules/layout/jumbotron/jumbotron.component.html
+++ b/src/app/_modules/layout/jumbotron/jumbotron.component.html
@@ -1,7 +1,7 @@
-
+
diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.ts b/src/app/_modules/layout/jumbotron/jumbotron.component.ts
index 8c3b083..2ad5e97 100644
--- a/src/app/_modules/layout/jumbotron/jumbotron.component.ts
+++ b/src/app/_modules/layout/jumbotron/jumbotron.component.ts
@@ -20,9 +20,22 @@ export class JumbotronComponent {
return this.currentPage?.h1 || this.currentPage?.name
}
- get back(){
- let pictURL = this.currentPage?.picture?.data.links.open;
- return {'background-image' : `url(${pictURL})`||'none'}
+ get bgStyle(){
+ let height = 50;
+ let pictURL:string;
+ if (this.currentPage){
+ height = 150;
+ pictURL = this.currentPage?.picture?.data.links.open;
+ }
+
+ return {
+ 'background-image' : `url(${pictURL})`||'none',
+ 'height': (pictURL?400:height) + 'px'
+ }
+ }
+
+ get h1Style(){
+ return { color: this.currentPage?.picture?'var(--white)':'var(--second-act)'}
}
get editable(){
diff --git a/src/app/_modules/layout/left-content/left-content.component.html b/src/app/_modules/layout/left-content/left-content.component.html
index 30b99f9..54e286d 100644
--- a/src/app/_modules/layout/left-content/left-content.component.html
+++ b/src/app/_modules/layout/left-content/left-content.component.html
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/src/app/_modules/layout/left-content/left-content.component.ts b/src/app/_modules/layout/left-content/left-content.component.ts
index 54b7b27..d338c95 100644
--- a/src/app/_modules/layout/left-content/left-content.component.ts
+++ b/src/app/_modules/layout/left-content/left-content.component.ts
@@ -1,6 +1,4 @@
import {Component} from '@angular/core';
-import {Router} from "@angular/router";
-import {PagesService} from "@app/_services/pages.service";
@Component({
selector: 'left-content',
@@ -9,20 +7,6 @@ import {PagesService} from "@app/_services/pages.service";
})
export class LeftContentComponent {
- constructor(
- private router: Router,
- public pagesService: PagesService
- ) {
- }
-
- get rootPage() {
- return this.pagesService.rootPage;
- }
-
- openMobileMenu(){
- this.router.navigate([{outlets: {slider: 'pages-menu'}}], {skipLocationChange: true}).then();
- }
-
}
diff --git a/src/app/_modules/layout/right-content/right-content.component.html b/src/app/_modules/layout/right-content/right-content.component.html
index 2ea0efe..2e81f78 100644
--- a/src/app/_modules/layout/right-content/right-content.component.html
+++ b/src/app/_modules/layout/right-content/right-content.component.html
@@ -1 +1 @@
-
+
diff --git a/src/app/_modules/layout/right-content/right-content.component.ts b/src/app/_modules/layout/right-content/right-content.component.ts
index 2cfc12b..e594d33 100644
--- a/src/app/_modules/layout/right-content/right-content.component.ts
+++ b/src/app/_modules/layout/right-content/right-content.component.ts
@@ -1,4 +1,5 @@
import { Component } from '@angular/core';
+import { PagesService } from '@app/_services/pages.service';
@Component({
selector: 'right-content',
@@ -6,5 +7,11 @@ import { Component } from '@angular/core';
styleUrls: ['./right-content.component.scss']
})
export class RightContentComponent {
-
+ constructor(
+ private pagesService:PagesService
+ ){}
+ get show(){
+ return !!this.pagesService.currentPage
+ }
+
}
diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
index f980d17..aa9c02f 100644
--- a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
+++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts
@@ -28,7 +28,7 @@ export class PagesMenuItemComponent {
}
get current(){
- return this.item.link == this.pagesService.currentPage.link
+ return this.item.link == this.pagesService.currentPage?.link
}
get selected(){
@@ -36,7 +36,7 @@ export class PagesMenuItemComponent {
}
get parent(){
- return !this.current && this.pagesService.currentPage.link.startsWith(this.item.link)
+ return !this.current && this.pagesService.currentPage?.link.startsWith(this.item.link)
}
get nav(){
diff --git a/src/app/_modules/pages/menu/pages-menu.component.ts b/src/app/_modules/pages/menu/pages-menu.component.ts
index f96d1cd..d8df33b 100644
--- a/src/app/_modules/pages/menu/pages-menu.component.ts
+++ b/src/app/_modules/pages/menu/pages-menu.component.ts
@@ -24,10 +24,10 @@ export class PagesMenuComponent implements OnInit {
this.subscription = combineLatest([
this.pagesService.currentPageSubject,
- this.pagesService.rootPageSubject
+ this.pagesService.rootPagesSubject
]).subscribe(
resp=>{
- let [currentPage, rootPage] = resp
+ let [currentPage, rootPages] = resp
if(currentPage){
let menuTree = currentPage.parents.data.reduceRight(
(menuTree,item)=>{
@@ -39,7 +39,7 @@ export class PagesMenuComponent implements OnInit {
}, currentPage);
this.items = menuTree.children.data;
}else{
- this.items = rootPage?.data[0].children.data
+ this.items = rootPages?.data[0].children.data
}
}
)
diff --git a/src/app/_modules/pages/menu/slider-menu/slider-menu.component.html b/src/app/_modules/pages/menu/slider-menu/slider-menu.component.html
index 66082c8..ba5f5c3 100644
--- a/src/app/_modules/pages/menu/slider-menu/slider-menu.component.html
+++ b/src/app/_modules/pages/menu/slider-menu/slider-menu.component.html
@@ -1,7 +1,7 @@
-
+