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

conflicts

master
sergeybodin 2023-09-04 09:57:59 +03:00
parent 2a3b493949 f50b5d08d4
commit 2ad5bc7eb2
22 changed files with 201 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/app/_modules/administration/page/administration-page.component.html
View File

@ -1,9 +1,12 @@
<div class="container">
<h1>Панель управления</h1>
<div class="limiter">
<div class="line">
<h1>Панель управления</h1>
</div>
<div class="tabs default">
<button type="button" *ngFor="let tab of tabs" [class.active]="tab.active" routerLink="/administrate/{{tab.name}}">{{tab.title}}</button>
</div>
<div class="container" [ngSwitch]="tab?.name">
<div class="limiter" [ngSwitch]="tab.name">
<administrate-company *ngSwitchCase="'company'" [companyId]="'main'"></administrate-company>
<administrate-committee *ngSwitchCase="'committee'"></administrate-committee>
<administrate-site-pages *ngSwitchCase="'site-pages'"></administrate-site-pages>

22
src/app/_modules/administration/page/administration-page.component.scss
View File

@ -1,5 +1,21 @@
.container {
h1 {
margin-top: 40px;
.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: #2D2D2D;
}
}
:host{
font-size: 20px;
}

1
src/app/_modules/advisories/tree/advisories-tree.component.html
View File

@ -1,3 +1,4 @@
<div class="tree default" *ngIf="advisories?.length">
<div class="items">
<advisories-tree-advisory [advisory]="advisory" [active]="true" *ngFor="let advisory of advisories"></advisories-tree-advisory>

36
src/app/_modules/advisories/tree/advisories-tree.component.scss
View File

@ -93,24 +93,24 @@
flex-shrink: 0;
button {
margin-left: 24px;
&.edit {
background-image: url('~src/assets/images/icons/edit_24dp.svg');
}
&.add-company {
background-image: url('~src/assets/images/icons/note_add_20.svg');
}
&.add-person {
background-image: url('~src/assets/images/icons/note_add_20.svg');
}
&.add-group {
background-image: url('~src/assets/images/icons/add_folder_24.svg');
}
&.add-child {
background-image: url('~src/assets/images/icons/add_library_dark_24.svg');
}
&.delete {
background-image: url('~src/assets/images/icons/close_24dp.svg');
}
// &.edit {
// background-image: url('~src/assets/images/icons/edit_24dp.svg');
// }
// &.add-company {
// background-image: url('~src/assets/images/icons/note_add_20.svg');
// }
// &.add-person {
// background-image: url('~src/assets/images/icons/note_add_20.svg');
// }
// &.add-group {
// background-image: url('~src/assets/images/icons/add_folder_24.svg');
// }
// &.add-child {
// background-image: url('~src/assets/images/icons/add_library_dark_24.svg');
// }
// &.delete {
// background-image: url('~src/assets/images/icons/close_24dp.svg');
// }
}
}
}

4
src/app/_modules/layout/header/header.component.scss
View File

@ -86,6 +86,7 @@
margin: 12px 24px 12px 40px;
background-image: url('~src/assets/images/logo_vniigaz_1163x816.svg');
background-size: contain;
flex-shrink: 0;
;
}
.grid-menu{
@ -114,6 +115,9 @@
flex-grow: 1;
flex-shrink: 1;
margin-right: 40px;
button{
white-space: nowrap;
}
}
}
}

2
src/app/_modules/layout/header/user-bar/header-user-bar.component.html
View File

@ -6,7 +6,7 @@
<div class="dropdown" [class.hidden]="ddHidden" (mouseleave)="close()">
<ul>
<li (click)="link('profile')">Личный кабинет</li>
<!--li *ngIf="isJournalVisible" (click)="link('applications')">Журнал заявок</li-->
<!-- <li *ngIf="isJournalVisible" (click)="link('applications')">Журнал заявок</li> -->
<li *ngIf="authService.isAdmin" (click)="link('administrate')">Панель управления</li>
<li (click)="logout()">Выход из системы</li>
</ul>

4
src/app/_modules/layout/header/user-bar/header-user-bar.component.scss
View File

@ -32,7 +32,9 @@
.name{
margin: 8px 4px 0 12px;
color: #2D2D2D
color: #2D2D2D;
white-space: nowrap;
}
.toggle{
height: 24px;

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

@ -23,7 +23,7 @@ export class HeaderUserBarComponent {
}
ngOnInit() {
console.log(this.user)
}

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

@ -1,15 +1,15 @@
<div class="content" *ngIf="page">
<div class="row">
<div class="page-header" style="background-image: url('{{page?.image?.data?.links?.full}}')">
<div class="row">
<div class="page-header" style="background-image: url('{{page?.image}}')">
<div class="block" *ngIf="editMode">
<button (click)="editBackground()" class="edit"></button>
<button (click)="removeBackground()" class="delete"></button>
</div>
<div class="limiter">
</div>
<div class="limiter">
<div class="line">
<h1>{{page?.name}}</h1>
<h1>{{pageTopName||page?.name}}</h1>
</div>
</div>
</div>
</div>
<div class="limiter nav-info" *ngIf="isEditable">
<div class="col right" (click)="toggleEditMode()">
@ -32,4 +32,4 @@
<div class="content" *ngIf="!loading && !page">
<page-not-found></page-not-found>
</div>
<!--div class="loader" *ngIf="loading"></div-->
<!--div class="loader" *ngIf="loading"></div-->

3
src/app/_modules/pages/page/page.component.ts
View File

@ -35,6 +35,9 @@ export class PageComponent {
get isEditable() {
return this.permissions?.edit || this.permissions?.anything;
}
get pageTopName(){
return this.page?.parents?.data[1]?.name;
}

4
src/app/_modules/pages/sections/types/basic/document/document-section.component.html
View File

@ -1,6 +1,6 @@
<!-- <span style="white-space: pre-wrap;">
{{section.groups.data[0].fields.data[0].value.data[0].links.download|json}}
{{section.groups.data[0].fields.data|json}}
</span> -->
<a [textContent]="title" class="title" [href]="download"></a>
<a [textContent]="name" class="title" [href]="download"></a>
<div [textContent]="description" class="description"></div>

6
src/app/_modules/pages/sections/types/basic/document/document-section.component.ts
View File

@ -20,10 +20,14 @@ export class DocumentSectionComponent {
return this.section.groups.data[0].fields.data[1].title;
}
get description(){
get name(){
return this.section.groups.data[0].fields.data[1].value.data[0];
}
get description(){
return this.section.groups.data[0].fields.data[2].value.data[0];
}
get download(){
return this.section.groups.data[0].fields.data[0].value.data[0].links.download;
}

9
src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.html
View File

@ -1,12 +1,15 @@
<div class="feedback-form">
<form [formGroup]="formGroup" (submit)="onSubmit()">
<div class="title">
Внимание! Отправленное данной формой сообщение не подпадает под действие
<span>Федерального закона №59-ФЗ от 02.05.2016 г «О порядке рассмотрения обращений граждан Российской Федерации».</span>
Оно не регистрируется, а ответы не являются официальным ответом ФАУ «ФЦС».
Для получения достоверных данных об эмиссии парниковых газов, подтверждения, признания и обеспечения доверия к углеродной отчетности как в Российской Федерации, так и за рубежом
необходимо проведение процедур по валидации и верификации заявлений по парниковым газам
(ФЗ 296 — Федеральный закон от 02.07.2021 N 296-ФЗ «Об ограничении выбросов парниковых газов»).
</div>
<div class="form" *ngIf="!sent">
<object-form [formGroup]="formGroup" [type]="objectType?.name" target="object"></object-form>
<!-- <span style="white-space: pre-wrap;">
{{formGroup|json}}
</span> -->
<div class="row">
<button [disabled]="loading" class="btn">Отправить</button>
</div>

16
src/app/_modules/pages/sections/types/basic/feedback/feedback-section.component.scss
View File

@ -15,13 +15,13 @@
}
}
.row {
button {
padding: 11px 24px;
background-color: var(--orange-2);
border-radius: var(--radius-2);
color: var(--white);
}
}
// .row {
// button {
// padding: 11px 24px;
// background-color: var(--orange-2);
// border-radius: var(--radius-2);
// color: var(--white);
// }
// }
}
}

11
src/app/_modules/pages/sections/types/basic/images/images-section.component.html
View File

@ -1,8 +1,11 @@
<div *ngIf="imageType!=='carousel'" class="items">
<div class="item {{imageType}}" *ngFor="let item of items">
<div class="first" [ngClass]="imageClass">
<img class="" [src]="items[0].links.full" (click)="show(items[0].id)"/>
</div>
<div *ngIf="imageType!=='carousel'" class="items" [ngClass]="imageClass">
<div class="item" *ngFor="let item of items">
<img [src]="item.links?.full" (click)="show(item.id)"/>
</div>
</div>
</div>
<div *ngIf="imageType==='carousel'" class="carousel" id="section-{{section.id}}">
<div class="prev">
@ -35,5 +38,3 @@
<img *ngIf="nextId!==''" src="/assets/images/icons/chevron_right_white_48dp.svg"/>
</div>
</div>

66
src/app/_modules/pages/sections/types/basic/images/images-section.component.scss
View File

@ -1,18 +1,74 @@
.first{
display: none;
&.large-preview{
display: block;
width: 663px;
height: 468px;
margin-bottom: 8px;
border-radius: 12px;
border: 1px solid rgba(45, 45, 45, 0.27);
overflow: hidden;
img{
object-fit: cover;
width: 100%;
height: 100%;
}
}
}
.items {
display: flex;
flex-direction: row;
flex-wrap: wrap;
width: 100%;
gap: 20px;
margin-bottom: 20px;
gap: 8px;
&.small{
display: flex;
flex-direction: column;
.item{
margin-bottom: 16px;
img{
max-height: 273px;
max-width: 273px;
}
}
}
&.large{
display: flex;
flex-direction: column;
.item{
margin-bottom: 32px;
img{
max-height: 468px;
max-width: 900px;
}
}
}
&.large-preview{
display: flex;
flex-direction: row;
.item{
width: 72px;
height: 52px;
border: 1px solid var(--blue-1);
img{
object-fit: cover;
width: 100%;
height: 100%;
}
}
}
.item {
position: relative;
img {
width: 128px;
height: 128px;
object-fit: cover;
cursor: pointer;
}

10
src/app/_modules/pages/sections/types/basic/images/images-section.component.ts
View File

@ -38,7 +38,6 @@ export class ImagesSectionComponent {
}, 300)
}
get items() {
return this.objectsService.getValue(this.section, 'images-required');
}
@ -46,6 +45,13 @@ export class ImagesSectionComponent {
let type = this.objectsService.getValue(this.section, 'image-type');
return type.name;
}
get imageClass(){
return {
small : this.imageType=='small',
large : this.imageType=='large',
'large-preview': this.imageType=='large-preview'
}
}
set photo(activePhoto: string) {
this.activePhoto = activePhoto
}
@ -54,6 +60,8 @@ export class ImagesSectionComponent {
}
parsed(): void {
this.tmpNumber = 0
this.parsedPhotos = this.items || []

28
src/assets/css/buttons.scss
View File

@ -50,7 +50,7 @@ button, .btn, a.btn {
}
}
&.clear{
&.clear,&.icon{
padding: 0;
justify-content: center;
align-items: center;
@ -68,13 +68,27 @@ button, .btn, a.btn {
letter-spacing: 100%;
}
&.trash::after {
content: "";
width: 24px;
height: 24px;
background: url('~src/assets/images/icons/trash_grey_24dp.svg') center no-repeat;
&.trash,&.add-child,&.edit,&.delete{
width: 24px;
height: 24px;
background: center no-repeat;
}
&.trash {
background-image: url('~src/assets/images/icons/trash_grey_24dp.svg');
}
&.add-child {
background-image: url('~src/assets/images/icons/add_web_page_24dp.svg');
}
&.edit {
background-image: url('~src/assets/images/icons/edit_24dp.svg');
}
&.close {
background-image: url('~src/assets/images/icons/close_24dp.svg');
}
}
// .inline-menu.default {

16
src/assets/css/main-menu.scss
View File

@ -89,10 +89,18 @@
@media screen and (min-width: 961px){
pages-menu {
animation: slide-from-top-and-fade-in 0.2s;
pages-menu-item {
a {
transition: all 0.3s;
&:not(:hover).active{
>span{
display: inline-block;
box-sizing: border-box;
}
}
}
&:hover {
&>pages-menu {
@ -106,9 +114,14 @@
}
}
}
.grid-menu>pages-menu>pages-menu-item>a.active:not(:hover)>span {
padding-top: 2px;
border-bottom: 2px solid var(--blue-1) ;
}
// level 1
pages-menu {
width: 100%;
display: flex;
align-items: stretch;
@ -116,6 +129,7 @@
margin: 0 4px;
&>pages-menu-item {
animation: slide-from-top-and-fade-in 0.2s;
display: flex;
flex-direction: row;
flex-wrap: nowrap;

3
src/assets/images/icons/add_web_page_24dp.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M5 21C4.45 21 3.97917 20.8042 3.5875 20.4125C3.19583 20.0208 3 19.55 3 19V5C3 4.45 3.19583 3.97917 3.5875 3.5875C3.97917 3.19583 4.45 3 5 3H19C19.55 3 20.0208 3.19583 20.4125 3.5875C20.8042 3.97917 21 4.45 21 5V19C21 19.55 20.8042 20.0208 20.4125 20.4125C20.0208 20.8042 19.55 21 19 21H5ZM5 19H19V7H5V19ZM8 12V14H11V17H13V14H16V12H13V9H11V12H8Z" fill="#0070BA"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 515 B

4
src/assets/images/icons/edit_24dp.svg
View File

@ -1,5 +1,3 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M5 19H6.4L15.025 10.375L13.625 8.975L5 17.6V19ZM19.3 8.925L15.05 4.725L16.45 3.325C16.8333 2.94167 17.3042 2.75 17.8625 2.75C18.4208 2.75 18.8917 2.94167 19.275 3.325L20.675 4.725C21.0583 5.10833 21.2583 5.57083 21.275 6.1125C21.2917 6.65417 21.1083 7.11667 20.725 7.5L19.3 8.925ZM17.85 10.4L7.25 21H3V16.75L13.6 6.15L17.85 10.4ZM14.325 9.675L13.625 8.975L15.025 10.375L14.325 9.675Z"
fill="#0070BA"/>
<path d="M5 19H6.4L15.025 10.375L13.625 8.975L5 17.6V19ZM19.3 8.925L15.05 4.725L16.45 3.325C16.8333 2.94167 17.3042 2.75 17.8625 2.75C18.4208 2.75 18.8917 2.94167 19.275 3.325L20.675 4.725C21.0583 5.10833 21.2583 5.57083 21.275 6.1125C21.2917 6.65417 21.1083 7.11667 20.725 7.5L19.3 8.925ZM17.85 10.4L7.25 21H3V16.75L13.6 6.15L17.85 10.4ZM14.325 9.675L13.625 8.975L15.025 10.375L14.325 9.675Z" fill="#0070BA"/>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 524 B

After

Width:  |  Height:  |  Size: 514 B

2
src/environments/environment.ts
View File

@ -6,7 +6,7 @@ export const environment = {
production: false,
apiUrl: 'http://api.vniigazv2.lc',
clientId: 2,
clientSecret: '0T64vQU8sHXFprE6A8UmGIuHjRA9j9xbjt3vBenR',
clientSecret: 'Mq5VXetkQ0XifT5Tao019rupEq5dQFbAhaw29Ei4',
};
/*