diff --git a/src/app/_modules/administration/page/administration-page.component.html b/src/app/_modules/administration/page/administration-page.component.html index 5b7fe4b..15d3c31 100644 --- a/src/app/_modules/administration/page/administration-page.component.html +++ b/src/app/_modules/administration/page/administration-page.component.html @@ -1,15 +1,16 @@ -
-
-

Панель управления

+
+
+

Панель управления

-
+

Страница не найдена

+ \ 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/pages/tree/item/pages-tree-item.component.html b/src/app/_modules/pages/tree/item/pages-tree-item.component.html index 8f9ebbd..98f4a45 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,26 +1,35 @@ -
+
- +
- +
- + + + + + + + + + + + + + + +
-
- +
+
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 0044012..eb7fd39 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 @@ -15,7 +15,10 @@ export class PagesTreeItemComponent { public touched = false; public subscription: Subscription; - constructor(public pagesService: PagesService, private formsService: FormsService, private listsService: ListsService) { + constructor( + public pagesService: PagesService, + private formsService: FormsService, + private listsService: ListsService) { } ngOnInit() { diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss index ec08638..e69de29 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.scss +++ b/src/app/_modules/pages/tree/pages-tree.component.scss @@ -1,181 +0,0 @@ - -.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 { - flex-direction: column; - align-items: stretch; - .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; - cursor: move; - span{ - display: none; - - } - &::before { - content: ""; - display: block; - background: transparent url("~src/assets/images/icons/web_page_24dp.svg")no-repeat; - width: 24px; - height: 24px; - } - &.orphan::before{ - background-image: url('~src/assets/images/icons/home_page_24dp.svg'); - } - 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; - } - &.clone { - width: 24px; - background-color: #dedede; - } - &.restore { - width: 24px; - background-color: #dedede; - } - } - .orphan{ - margin-right: 48px; - } - } - .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; - } - } - } -} diff --git a/src/app/_services/pages.service.ts b/src/app/_services/pages.service.ts index c2565d8..83fa4ca 100644 --- a/src/app/_services/pages.service.ts +++ b/src/app/_services/pages.service.ts @@ -16,7 +16,10 @@ export class PagesService { constructor(private http: HttpClient) { //this.find('/').subscribe(res => {this.rootPages = res.data}); } - rootPage:any + rootPage={ + link:'', + slug:environment.defaultLocale + } get currentPage() { return this.currentPageSubject.value; diff --git a/src/assets/css/_admin.scss b/src/assets/css/_admin.scss new file mode 100644 index 0000000..9aa4031 --- /dev/null +++ b/src/assets/css/_admin.scss @@ -0,0 +1,148 @@ +.administration-page{ + font-size: 20px; + h2{ + color: var(--second-act); + margin-bottom: 48px; + } + +} + + +.site-admin-control{ + display: flex; + justify-content: space-between; + cursor: pointer; + .site-admin-control-toggle{ + display: flex; + align-items: center; + gap: 16px; + } + +} +administrate-site-pages>pages-tree{ + display: block; + margin-bottom: 128px; +} + + +pages-tree{ + +.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 .item .item .item .item .bar{ + padding-left: 300px; + } + } + + + +.item { + flex-direction: column; + align-items: stretch; + .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; + + } + .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; + cursor: move; + &:hover{ + background-color: var(--prime-act); + } + span{ + display: none; + } + } + .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; + gap: 8px; + } + } +} + + +@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/assets/css/_grid.scss b/src/assets/css/_grid.scss index f603cc5..4d66ab3 100644 --- a/src/assets/css/_grid.scss +++ b/src/assets/css/_grid.scss @@ -169,24 +169,25 @@ footer{ pages-menu-item{ display: flex; flex-direction: column; - -} - -.item{ - display: flex; - align-items: flex-start; - drop-down{ - margin-left: -24px; - } - min-height: 24px; - >a{ - margin-top: 4px; - &.active { - color: #000000; + .item{ + display: flex; + align-items: flex-start; + drop-down{ + margin-left: -24px; + } + min-height: 24px; + >a{ + margin-top: 4px; + &.active { + color: #000000; + } } } + } + + .pages{ width: 100%; } \ No newline at end of file diff --git a/src/assets/images/ico/add_web_page_24.svg b/src/assets/images/ico/add_web_page_24.svg new file mode 100644 index 0000000..24ab34f --- /dev/null +++ b/src/assets/images/ico/add_web_page_24.svg @@ -0,0 +1,3 @@ + + + diff --git a/src/assets/images/ico/arrow_drop_down_24-1.svg b/src/assets/images/ico/drop_down_24.svg similarity index 100% rename from src/assets/images/ico/arrow_drop_down_24-1.svg rename to src/assets/images/ico/drop_down_24.svg diff --git a/src/styles.scss b/src/styles.scss index 57dc748..686d428 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -12,4 +12,5 @@ @import 'slider'; @import 'tables'; @import 'tabs.scss'; -@import 'pages-section'; \ No newline at end of file +@import 'pages-section'; +@import 'admin'; \ No newline at end of file