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 36ca89f..b1af125 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,4 +1,5 @@ + .item.home .bar .mid .info .logo::before{ background-image: url('~src/assets/images/icons/home_page_24dp.svg'); } diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.html b/src/app/_modules/layout/jumbotron/jumbotron.component.html index 2840be7..81564b8 100644 --- a/src/app/_modules/layout/jumbotron/jumbotron.component.html +++ b/src/app/_modules/layout/jumbotron/jumbotron.component.html @@ -2,6 +2,7 @@

{{name}}

+ {{currentPage|json}}
diff --git a/src/app/_modules/layout/jumbotron/jumbotron.component.ts b/src/app/_modules/layout/jumbotron/jumbotron.component.ts index 195837e..8c3b083 100644 --- a/src/app/_modules/layout/jumbotron/jumbotron.component.ts +++ b/src/app/_modules/layout/jumbotron/jumbotron.component.ts @@ -17,7 +17,7 @@ export class JumbotronComponent { } get name(){ - return this.currentPage?.h1 + return this.currentPage?.h1 || this.currentPage?.name } get back(){ diff --git a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts index e0d93bd..792eff5 100644 --- a/src/app/_modules/pages/menu/item/pages-menu-item.component.ts +++ b/src/app/_modules/pages/menu/item/pages-menu-item.component.ts @@ -40,7 +40,6 @@ export class PagesMenuItemComponent { } get nav(){ - console.log(this.item) return this.item.type.name == "nav-page" } diff --git a/src/app/_modules/pages/tree/pages-tree.component.scss b/src/app/_modules/pages/tree/pages-tree.component.scss index 22ccffe..98705c7 100644 --- a/src/app/_modules/pages/tree/pages-tree.component.scss +++ b/src/app/_modules/pages/tree/pages-tree.component.scss @@ -22,6 +22,8 @@ .item { + flex-direction: column; + align-items: stretch; .bar { display: flex; flex-direction: row; diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 204af52..812e2fd 100644 --- a/src/environments/environment.ts +++ b/src/environments/environment.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiUrl: 'http://api.nircms.lc', clientId: 2, - clientSecret: 'kzZNPvuxFIhDmJkzdC6ug4b6TplrzGrnCqi0Zgr9', + clientSecret: '2aUob26JoFP8ulT7QWbnBP1kwiooJEauzBhJnlI1', project: null, defaultLocale: 'ru' };