Merge branch 'master' of https://gitea.testnir.ru/NirGroup/multi-option

src/environments/gbu.env.dev.ts

@@ -4,9 +4,9 @@
 
 export const environment = {
   production: false,
-  apiUrl: 'http://api.nircms.lc',
-  clientId: 4,
-  clientSecret: 'KmGnhqVbEi3wlzkEyXi1JeNg9FtswdOdKQHpOcAu',
+  apiUrl: 'http://api.gbu.lc',
+  clientId: 2,
+  clientSecret: 'tU3LXUexXXXL5MjueJYZEWlZzZnLKD8TnIsnn4rh',
   project: null,
   licence: 'POUFLO4YW7SU',
   defaultLocale: 'ru'

src/gbu/component/layout/grid/grid.component.html

@@ -21,7 +21,7 @@
         </div>
         <router-outlet></router-outlet>
       </div>
-      <right-content></right-content>
+      <right-content *ngIf="currentPage"></right-content>
     </div>
   </div>
   <!-- <footer class="space"></footer> -->

src/gbu/component/layout/grid/grid.component.ts

@@ -24,6 +24,9 @@ export class GridComponent {
     private listsService: ListsService, private pagesService: PagesService, private publicationsService: PublicationsService
   ) {
   }
+  get currentPage(){
+    return this.pagesService.currentPage
+  }
 
   ngOnInit() {
     this.pagesService.currentPageSubject.subscribe(

src/gbu/css/_admin.scss

@@ -4,6 +4,7 @@
   font-style: normal;
   font-weight: 400;
   line-height: 24px;
+  padding: 32px;
     h2{
         color: var(--second-act);
         margin-bottom: 48px;

src/gbu/css/_grid.scss

@@ -20,6 +20,7 @@
 
 jumbotron{
   margin-block: 40px 32px;
+  min-height: 40px;
   .jumbotron-content{
     flex-direction: column;
     header-user-bar{