Andrey
/
object-type-constructor-front
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bag-fix

master
Boris Voropaev 2023-10-24 17:15:59 +03:00
parent 0a640bce3d
commit cce1b8fc1b
5 changed files with 11 additions and 160 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/_modules/layout/header/user-bar/header-user-bar.component.ts
View File

@ -2,6 +2,8 @@ import {Component, Input} from '@angular/core';
import {AuthenticationService} from "@app/_services";
import {Router} from "@angular/router";
import {Subscription} from "rxjs";
import { PagesService } from '@app/_services/pages.service';
@Component({
selector: 'header-user-bar',
@ -16,7 +18,8 @@ export class HeaderUserBarComponent {
constructor(
public authService: AuthenticationService,
private router: Router) {
private router: Router,
private pagesService: PagesService) {
this.subscriptionUser = this.authService.user.subscribe(user => {
this.user = user;
});
@ -47,6 +50,7 @@ export class HeaderUserBarComponent {
logout() {
if (confirm('Вы деествительно хотите выйти из системы?')) {
this.pagesService.editMode.next(false)
this.authService.logout();
this.ddHidden = true;
this.router.navigate(['']).then();

7
src/app/_modules/pages/page/page.component.html
View File

@ -2,7 +2,6 @@
<!-- <div class="limiter">
<page-breadcrumbs [page]="page"></page-breadcrumbs>
</div> -->
<div class="limiter double-column">
<div class="pages" [ngSwitch]="page?.type?.name || page?.type">
<content-page *ngSwitchCase="'content'" [page]="page" [editMode]="editMode"></content-page>
<publications-page *ngSwitchCase="'publications'" [page]="page" [editMode]="editMode"></publications-page>
@ -11,12 +10,6 @@
<tk-structure-page *ngSwitchCase="'tk-structure'" [page]="page" [editMode]="editMode"></tk-structure-page>
<p *ngSwitchDefault>Page type {{page?.type?.name}} is undefined</p>
</div>
<div class="sub-menu">
<!-- <pre>{{page.children.data.length|json}}</pre> -->
<pages-menu [items]="subMenu" (onSelected)="itemSelect($event)" *ngIf="subMenu?.length"></pages-menu>
<!-- <pre>{{menuItems|json}}</pre> -->
</div>
</div>
</div>
<div class="content" *ngIf="!loading && !page">
<page-not-found></page-not-found>

153
src/app/_modules/pages/page/page.component.scss
View File

@ -1,158 +1,9 @@
.content {
background-color: var(--light);
padding-bottom: 120px;
.limiter{
max-width: 1280px;
}
.row {
display: block;
width: 100%;
border-bottom: 1px solid var(--second-dis);
background-color: #FFF;
.page-header {
display: flex;
flex-direction: column;
justify-content: center;
align-items: start;
width: 100%;
height: 400px;
background-color: #86898E;
background-size: cover;
background-position: center;
overflow: hidden;
.block{
position: absolute;
top:136px;
left: calc((100% - 1280px) / 2);
}
.limiter{
display: block;
.line{
display: inline-block;
border-bottom: 12px solid var(--blue-0);
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:100%;
letter-spacing: 0.76px;
color: white;
}
}
}
}
.left {
flex-grow: 1;
}
.right {
margin-left: 32px;
display: flex;
flex-direction: row;
align-items: center;
flex-shrink: 0;
cursor: pointer;
.label {
margin-right: 8px;
font-size: 20px;
color: var(--second-act);
}
}
}
.nav-info{
display: flex;
justify-content: end;
padding: 16px 0;
}
@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;
}
}
.holder {
margin-bottom: 32px;
}
@media screen and (min-width: 1330px){
}
.dual-cols {
display: flex;
flex-direction: row;
width: 100%;
.col {
&.left {
flex-grow: 1;
}
&.right {
flex-shrink: 0;
width: 400px;
margin-left: 40px;
}
}
}
@media screen and (max-width: 480px) {
.content {
h1 {
font-size: 1.5rem;
line-height: 2rem;
}
.row {
flex-direction: column-reverse;
//padding-top: 24px;
.right {
visibility: hidden;
}
}
.row .page-header .limiter .line h1 {
font-size: 50px;
line-height: 60px;
letter-spacing: 0.5px;
}
}
.dual-cols {
flex-direction: column;
.col {
&.right {
width: 100%;
margin-left: 0 !important;
}
}
}
}

2
src/app/_modules/pages/sections/item/page-section.component.html
View File

@ -1,7 +1,7 @@
<div class="section">
<add-section *ngIf="editMode" [page]="page" [ord]="ord" [modelType]="modelType"></add-section>
<page-menu [editMode]="editMode" [index]="index" [page]="page" [section]="section" [modelId]="modelId" [modelType]="modelType"></page-menu>
<div class="content" [ngSwitch]="type?.name">
<div [ngSwitch]="type?.name">
<header-section [section]="section" *ngSwitchCase="'page-section-header'"></header-section>
<text-section [section]="section" *ngSwitchCase="'page-section-text'"></text-section>
<html-section [section]="section" *ngSwitchCase="'page-section-html'"></html-section>

3
src/assets/css/basics.scss
View File

@ -156,6 +156,9 @@ body {
}
.main-content{
flex-basis: 840px;
.pages{
width: 100%;
}
}
right-content{
flex-basis: 400px;