diff --git a/src/app/_modules/pages/page/page.component.scss b/src/app/_modules/pages/page/page.component.scss
index 72c757a..d919642 100644
--- a/src/app/_modules/pages/page/page.component.scss
+++ b/src/app/_modules/pages/page/page.component.scss
@@ -1,6 +1,9 @@
.content {
background-color: #F6F6F6;
padding-bottom: 120px;
+ .limiter{
+ max-width: 1280px;
+ }
.row {
display: block;
width: 100%;
@@ -20,11 +23,12 @@
.block{
position: absolute;
top:136px;
- left: calc((100% - 900px) / 2);
+ left: calc((100% - 1280px) / 2);
}
.limiter{
display: block;
+
.line{
display: inline-block;
border-bottom: 12px solid var(--blue-0);
@@ -70,7 +74,27 @@
}
- @media screen and (max-width: 1264px) {
+ @media screen and (min-width: 1330px){
+ .double-column{
+ display: flex;
+ align-items: flex-start;
+ gap: 40px;
+ .pages{
+ flex-grow: 1;
+ flex-shrink: 1;
+ }
+ .sub-menu{
+ flex-grow: 0;
+ flex-shrink: 0;
+ flex-basis: 360px;
+ width: 360px;
+
+ margin-top: 40px;
+ }
+ }
+ }
+
+ @media screen and (max-width: 1330px) {
.nav-info{
display: none;
}
diff --git a/src/app/_modules/pages/page/page.component.ts b/src/app/_modules/pages/page/page.component.ts
index 4147cef..fc9d20c 100644
--- a/src/app/_modules/pages/page/page.component.ts
+++ b/src/app/_modules/pages/page/page.component.ts
@@ -12,6 +12,7 @@ export class PageComponent {
public page: any;
public editMode: boolean;
public loading = false;
+ public menuItems:any[]
private url: string;
private inited = false;
routeSubscription?: Subscription;
@@ -38,13 +39,26 @@ export class PageComponent {
}
get pageTopName(){
- return this.page?.parents?.data[1]?.name;
+ let item:any;
+ let name:string
+ if(this.menuItems){
+ item = this.menuItems.find(item=>this.page.link.startsWith(item.link))
+ name= item?.name;
+ if (item?.depth>=2){
+ item = item.children.data.find(item=>this.page.link.startsWith(item.link))
+ name= item?.name;
+ }
+ }
+ return name||this.page.name;
}
ngOnInit() {
+
this.listsService.controls().subscribe(res => {
this.inited ? this.fetch() : this.inited = true;
+ this.fetchMenu();
});
+
}
ngOnDestroy() {
@@ -70,16 +84,25 @@ export class PageComponent {
'sections.objectables.groups.fields.value',
'sidebars.groups.fields.value',
'sidebars.type',
- 'permissions'
+ 'permissions',
+ 'children.children'
];
this.pagesService.find(this.url, {include: include.join(',')}).subscribe(res => {
- this.page = res?.data;
+ this.page = res?.data;
this.loading = false;
}, error => {
this.loading = false;
});
}
+ fetchMenu() {
+ let include = ['children.children'];
+ this.pagesService.root({include: include.join(',')}).subscribe(res => {
+ this.menuItems = res.data;
+ });
+ }
+
+
toggleEditMode() {
this.editMode = !this.editMode;
}
@@ -88,6 +111,10 @@ export class PageComponent {
this.formsService.createModel('page-background', {extraProps: {attach: {pageId: this.page.id}}});
}
+ itemSelect(event){
+ console.log('EVENT',event)
+ }
+
removeBackground() {
if (confirm('Вы деествительно хотите удалить этот фон?')) {
this.pagesService.deleteBackground(this.page.id).subscribe(res => {
diff --git a/src/app/_modules/pages/page/types/tk-structure/tk-structure-page.component.scss b/src/app/_modules/pages/page/types/tk-structure/tk-structure-page.component.scss
index d19fcf0..0a40eda 100644
--- a/src/app/_modules/pages/page/types/tk-structure/tk-structure-page.component.scss
+++ b/src/app/_modules/pages/page/types/tk-structure/tk-structure-page.component.scss
@@ -117,7 +117,7 @@
}
}
}
-@media screen and (max-width: 1264px) {
+@media screen and (max-width: 1330px) {
.title {
span {
font-size: 1rem !important;
diff --git a/src/app/_modules/pages/pages-routing.module.ts b/src/app/_modules/pages/pages-routing.module.ts
index 3981825..451cd60 100644
--- a/src/app/_modules/pages/pages-routing.module.ts
+++ b/src/app/_modules/pages/pages-routing.module.ts
@@ -14,6 +14,7 @@ import {RegistriesModule} from "@app/_modules/registries/registries.module";
import {PublicationsModule} from "@app/_modules/publications/publications.module";
import {TkStructurePageComponent} from "@app/_modules/pages/page/types/tk-structure/tk-structure-page.component";
import {HomepageModule} from "@app/_modules/pages/home/homepage.module";
+import { PagesMenuModule } from './menu/pages-menu.module';
const routes: Routes = [
{path: '', component: HomepageComponent},
@@ -28,7 +29,8 @@ const routes: Routes = [
PageSectionsModule,
PageSidebarsModule,
RegistriesModule,
- PublicationsModule
+ PublicationsModule,
+ PagesMenuModule
],
declarations: [
PageComponent,
diff --git a/src/app/_modules/pages/pages.module.ts b/src/app/_modules/pages/pages.module.ts
index 11e36dd..33a9fe2 100644
--- a/src/app/_modules/pages/pages.module.ts
+++ b/src/app/_modules/pages/pages.module.ts
@@ -6,8 +6,6 @@ import {RegistriesModule} from "@app/_modules/registries/registries.module";
import {PublicationsModule} from "@app/_modules/publications/publications.module";
import {PagesListComponent} from "@app/_modules/pages/list/pages-list.component";
import {PagesListItemComponent} from "@app/_modules/pages/list/item/pages-list-item.component";
-import {PagesMenuComponent} from "@app/_modules/pages/menu/pages-menu.component";
-import {PagesMenuItemComponent} from "@app/_modules/pages/menu/item/pages-menu-item.component";
import {RouterModule} from "@angular/router";
import {PaginationModule} from "@app/_modules/pagination/pagination.module";
import {SearchSectionsComponent} from "@app/_modules/pages/sections/search/search-sections.component";
@@ -30,8 +28,6 @@ import {SortablejsModule} from "ngx-sortablejs";
SortablejsModule,
],
declarations: [
- PagesMenuComponent,
- PagesMenuItemComponent,
PagesListComponent,
PagesListItemComponent,
PagesTreeComponent,
@@ -40,7 +36,6 @@ import {SortablejsModule} from "ngx-sortablejs";
SearchSectionsItemComponent,
],
exports: [
- PagesMenuComponent,
PagesListComponent,
SearchSectionsComponent,
PagesTreeComponent,
diff --git a/src/app/_modules/pages/sections/add/add-section.component.ts b/src/app/_modules/pages/sections/add/add-section.component.ts
index 2c66b76..b339545 100644
--- a/src/app/_modules/pages/sections/add/add-section.component.ts
+++ b/src/app/_modules/pages/sections/add/add-section.component.ts
@@ -37,7 +37,6 @@ export class AddSectionComponent {
return item;
});
let attach = {modelType: this.modelType, modelId: this.page.id, group: 'sections', ord: this.ord};
- console.log(type);
this.formsService.createObject(type, {extraProps: {attach: attach}});
this.hideDD();
}
diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss
index 9fc93ed..0b369cb 100644
--- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss
+++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.scss
@@ -37,9 +37,9 @@
}
.image {
img{
- width: 273px;
+ width: 265px;
object-fit: cover;
- height: 204px;
+ height: 190px;
border-radius: 12px;
border: 1px solid rgba(45, 45, 45, 0.27);
}
diff --git a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts
index 6b1d96e..d49784b 100644
--- a/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts
+++ b/src/app/_modules/pages/sections/types/basic/image-group/image-group-section.component.ts
@@ -15,7 +15,7 @@ export class ImageGroupSectionComponent {
}
ngOnInit() {
- console.log(this.section);
+ // console.log(this.section);
}
diff --git a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html
index 58e3ddc..e93e56c 100644
--- a/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html
+++ b/src/app/_modules/pages/sections/types/basic/member/item/member-section-item.component.html
@@ -1,12 +1,35 @@
-
![]()
+
+
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
+
+
+