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 194e958..09cd57b 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,8 +1,14 @@
- - - Показать удаленные +
+ Показать скрытые - +
+
+
+ + Сайт компании +
+ +
diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.ts b/src/app/_modules/layout/jumbotron/jumbotron.component.ts index 2ad5e97..102977c 100644 --- a/src/app/_modules/layout/jumbotron/jumbotron.component.ts +++ b/src/app/_modules/layout/jumbotron/jumbotron.component.ts @@ -13,6 +13,7 @@ export class JumbotronComponent { ){} get currentPage(){ + return this.pagesService.currentPage } diff --git a/src/app/_modules/pages/tree/item/pages-tree-item.component.html b/src/app/_modules/pages/tree/item/pages-tree-item.component.html index 98f4a45..00cc173 100644 --- a/src/app/_modules/pages/tree/item/pages-tree-item.component.html +++ b/src/app/_modules/pages/tree/item/pages-tree-item.component.html @@ -1,32 +1,41 @@ -
+
-
+
-
- - - - - - - - - - - - - - - +
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
diff --git a/src/app/_modules/pages/tree/item/pages-tree-item.component.ts b/src/app/_modules/pages/tree/item/pages-tree-item.component.ts index adab3d8..52c50ae 100644 --- a/src/app/_modules/pages/tree/item/pages-tree-item.component.ts +++ b/src/app/_modules/pages/tree/item/pages-tree-item.component.ts @@ -68,7 +68,7 @@ export class PagesTreeItemComponent { fetch() { - let include = ['children']; + let include = ['children','locale']; this.pagesService.show(this.page.id, {include: include.join(','), withTrashed: true}).subscribe(res => { this.page = res.data; }); diff --git a/src/app/_modules/widget/modal/modal.component.html b/src/app/_modules/widget/modal/modal.component.html deleted file mode 100644 index decdfe6..0000000 --- a/src/app/_modules/widget/modal/modal.component.html +++ /dev/null @@ -1 +0,0 @@ -

modal works!

diff --git a/src/app/_modules/widget/modal/modal.component.scss b/src/app/_modules/widget/modal/modal.component.scss deleted file mode 100644 index e69de29..0000000 diff --git a/src/app/_modules/widget/modal/modal.component.spec.ts b/src/app/_modules/widget/modal/modal.component.spec.ts deleted file mode 100644 index 1b71c6b..0000000 --- a/src/app/_modules/widget/modal/modal.component.spec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { ComponentFixture, TestBed } from '@angular/core/testing'; - -import { ModalComponent } from './modal.component'; - -describe('ModalComponent', () => { - let component: ModalComponent; - let fixture: ComponentFixture; - - beforeEach(async () => { - await TestBed.configureTestingModule({ - declarations: [ ModalComponent ] - }) - .compileComponents(); - - fixture = TestBed.createComponent(ModalComponent); - component = fixture.componentInstance; - fixture.detectChanges(); - }); - - it('should create', () => { - expect(component).toBeTruthy(); - }); -}); diff --git a/src/app/_modules/widget/modal/modal.component.ts b/src/app/_modules/widget/modal/modal.component.ts deleted file mode 100644 index cf6338f..0000000 --- a/src/app/_modules/widget/modal/modal.component.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { Component } from '@angular/core'; - -@Component({ - selector: 'app-modal', - templateUrl: './modal.component.html', - styleUrls: ['./modal.component.scss'] -}) -export class ModalComponent { - -} diff --git a/src/app/_modules/widjet/switch/switch.component.scss b/src/app/_modules/widjet/switch/switch.component.scss index c8982e8..d24ac7d 100644 --- a/src/app/_modules/widjet/switch/switch.component.scss +++ b/src/app/_modules/widjet/switch/switch.component.scss @@ -1,7 +1,7 @@ - $bull: 18px; $offset: 2px; $track: 20px; + div{ border: 1px solid var(--second); display: inline-flex; diff --git a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts index 0d50981..d3dc3ec 100644 --- a/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts +++ b/src/vniigaz-v2/component/layout/jumbotron/jumbotron.component.ts @@ -59,7 +59,7 @@ export class JumbotronComponent { } get bgStyle(){ - let height = 150; + let height = 70; let pictURL:string; if (this.contentPage){ height = 150; diff --git a/src/vniigaz-v2/css/_admin.scss b/src/vniigaz-v2/css/_admin.scss index 9aa4031..88fbbdd 100644 --- a/src/vniigaz-v2/css/_admin.scss +++ b/src/vniigaz-v2/css/_admin.scss @@ -1,5 +1,9 @@ .administration-page{ - font-size: 20px; + font-family: PT Sans; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: 24px; h2{ color: var(--second-act); margin-bottom: 48px; @@ -9,14 +13,40 @@ .site-admin-control{ - display: flex; - justify-content: space-between; - cursor: pointer; + .site-admin-control-toggle{ display: flex; align-items: center; gap: 16px; + cursor: pointer; + margin-bottom: 32px; } + .site-admin-page-block{ + display: flex; + justify-content: space-between; + align-items: center; + height: 64px; + border-top: 1px solid var(--second-dis); + border-bottom: 1px solid var(--second-dis); + div{ + display: flex; + align-items: center; + } + .site-admin-company{ + font-weight: 700; + } + } + ico.page-lable{ + background-color: var(--prime); + border-radius: 20px; + width: 40px; + height: 40px; + display: flex; + align-items: center; + justify-content: center; + margin-right: 12px; + } + } administrate-site-pages>pages-tree{ @@ -24,7 +54,15 @@ administrate-site-pages>pages-tree{ margin-bottom: 128px; } - +ico.page-control{ + cursor: pointer; + svg{ + color:var(--second); + &:hover{ + color: var(--second-act); + } + } +} pages-tree{ .item:not(.home){ @@ -56,18 +94,20 @@ pages-tree{ .item { flex-direction: column; align-items: stretch; + font-family: PT Sans; + font-size: 16px; + font-style: normal; + font-weight: 400; + line-height: 24px; .bar { display: flex; flex-direction: row; align-items: center; - padding: 16px 0; - border-bottom: #E0E0E0 solid 1px; + border-bottom: solid var(--second-dis) 1px; + height: 64px; .left { - flex-shrink: 0; - width: 40px; - height: 24px; cursor: pointer; - + width: 24px; } .mid { flex-grow: 1; @@ -97,16 +137,15 @@ pages-tree{ } } .name { - p { - margin: 0; + display: flex; + flex-direction: column; + height: 100%; a { - color: var(--grey-7); + color: var(--dadk); + &:nth-child(2){ + color: var(--second); + } } - &.sub { - font-size: 0.875rem; - color: #7f7f7f; - } - } } } } diff --git a/src/vniigaz-v2/images/ico/cloud_24.svg b/src/vniigaz-v2/images/ico/cloud_24.svg new file mode 100644 index 0000000..cbea7f5 --- /dev/null +++ b/src/vniigaz-v2/images/ico/cloud_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/vniigaz-v2/images/ico/copy_24.svg b/src/vniigaz-v2/images/ico/copy_24.svg new file mode 100644 index 0000000..0c6f5d5 --- /dev/null +++ b/src/vniigaz-v2/images/ico/copy_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/vniigaz-v2/images/ico/home_24.svg b/src/vniigaz-v2/images/ico/home_24.svg new file mode 100644 index 0000000..b92a1ec --- /dev/null +++ b/src/vniigaz-v2/images/ico/home_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/vniigaz-v2/images/ico/home_plus_24.svg b/src/vniigaz-v2/images/ico/home_plus_24.svg new file mode 100644 index 0000000..29a3276 --- /dev/null +++ b/src/vniigaz-v2/images/ico/home_plus_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/vniigaz-v2/images/ico/webpage_plus_24.svg b/src/vniigaz-v2/images/ico/webpage_plus_24.svg new file mode 100644 index 0000000..f4d2f84 --- /dev/null +++ b/src/vniigaz-v2/images/ico/webpage_plus_24.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file