administration-page

2023-09-04 11:45:28 +03:00 · 2023-09-04 11:45:28 +03:00 · a9873383c0
parent 305c12b2eb
commit a9873383c0
9 changed files with 50 additions and 21 deletions
--- a/src/app/_modules/administration/page/administration-page.component.html
+++ b/src/app/_modules/administration/page/administration-page.component.html
@ -3,9 +3,9 @@
    <h1>Панель управления</h1>
  </div>

-  <div class="tabs default">
+  <!-- <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> -->
  <div class="limiter" [ngSwitch]="tab.name">
    <administrate-company *ngSwitchCase="'company'" [companyId]="'main'"></administrate-company>
    <administrate-committee *ngSwitchCase="'committee'"></administrate-committee>
--- a/src/app/_modules/advisories/tree/advisories-tree.component.scss
+++ b/src/app/_modules/advisories/tree/advisories-tree.component.scss
@ -32,11 +32,17 @@
      flex-shrink: 0;
      cursor: pointer;
      &:before {
-        display: block;
-        width: 40px;
+        display: inline-block;
+        width: 24px;
        height: 24px;
-        background: transparent url("~src/assets/images/icons/circle_plus_24.svg") 50% 50% no-repeat;
-        content: "";
+        background: var(--white) url("~src/assets/images/icons/arrow_drop_down_24dp.svg") no-repeat center;
+        content: '';
+        z-index: 0;
+        bottom: -2px;
+        position: absolute;
+        right: -28px;
+        transform: rotate(0deg);
+        transition: transform .3s;
      }
    }
    .mid {
@ -116,7 +122,7 @@
  }
  .items {
    display: none;
-    padding-left: 56px;
+    padding-left: 50px;
  }
  &.active {
    >.bar {
--- a/src/app/_modules/layout/header/user-bar/header-user-bar.component.html
+++ b/src/app/_modules/layout/header/user-bar/header-user-bar.component.html
@ -7,7 +7,7 @@
    <ul>
      <li (click)="link('profile')">Личный кабинет</li>
      <!-- <li *ngIf="isJournalVisible" (click)="link('applications')">Журнал заявок</li> -->
-      <li *ngIf="authService.isAdmin" (click)="link('administrate')">Панель управления</li>
+      <li *ngIf="authService.isAdmin" (click)="link('administrate')">Структура сайта</li>
      <li (click)="logout()">Выход из системы</li>
    </ul>
  </div>
--- a/src/app/_modules/pages/tree/item/pages-tree-item.component.html
+++ b/src/app/_modules/pages/tree/item/pages-tree-item.component.html
@ -9,16 +9,16 @@
        </div>
        <div class="name">
          <p><a [routerLink]="page.link" target="_blank">{{page.name}}</a></p>
-          <p class="sub">{{page.type?.title}}</p>
+          <!-- <p class="sub">{{page.type?.title}}</p> -->
        </div>
      </div>
    </div>
    <div class="right">
      <div class="menu">
-        <button type="button" class="btn icon move" title="Переместить"></button>
-        <button type="button" class="btn icon add" title="Добавить страницу" (click)="add()"></button>
-        <button type="button" class="btn icon edit" title="Редактировать" (click)="edit()"></button>
-        <button type="button" class="btn icon delete" title="Удалить" (click)="delete()"></button>
+        <button type="button" class="clear move" title="Переместить"></button>
+        <button type="button" class="clear add-child" title="Добавить страницу" (click)="add()"></button>
+        <button type="button" class="clear edit" title="Редактировать" (click)="edit()"></button>
+        <button type="button" class="clear close-blue" title="Удалить" (click)="delete()"></button>
      </div>
    </div>
  </div>
--- a/src/app/_modules/pages/tree/pages-tree.component.scss
+++ b/src/app/_modules/pages/tree/pages-tree.component.scss
@ -11,9 +11,12 @@
      height: 24px;
      cursor: pointer;
      .toggle {
+        border:none;
        width: 100%;
        height: 100%;
-        background: transparent url("~src/assets/images/icons/circle_plus_24.svg") 50% 50% no-repeat;
+        background: transparent url("~src/assets/images/icons/expand_less_20.svg") 50% 50% no-repeat;
+        transform: rotate(90deg);
+        transition: transform .3s;
      }
    }
    .mid {
@ -33,7 +36,19 @@
          height: 40px;
          margin-right: 16px;
          border-radius: 100px;
-          background-color: #F9B417;
+          background-color: #0070BA;
+          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%;
@ -46,7 +61,6 @@
          p {
            margin: 0;
            a {
-              font-weight: bold;
              color: var(--grey-7);
            }
            &.sub {
@ -82,13 +96,13 @@
  }
  .items {
    display: none;
-    padding-left: 56px;
+    padding-left: 50px;
  }
  &.active {
    >.bar {
      .left {
        .toggle {
-          background-image: url('~src/assets/images/icons/circle_minus_24.svg');
+          transform: rotate(180deg);
        }
      }
    }
--- a/src/assets/css/buttons.scss
+++ b/src/assets/css/buttons.scss
@ -68,7 +68,7 @@ button, .btn, a.btn {
    letter-spacing: 100%;
  }

-  &.trash,&.add-child,&.edit,&.delete,&.close-blue{
+  &.trash,&.add-child,&.edit,&.delete,&.close-blue,&.move{
    
      width: 24px;
      height: 24px;
@ -91,6 +91,12 @@ button, .btn, a.btn {
  &.close-blue {
    background-image: url('~src/assets/images/icons/close_blue_24dp.svg');
  };
+  &.move {
+    background-image: url('~src/assets/images/icons/drag-n-drop_24.svg');
+  };
+
+  
+  
  

 }
--- a/src/assets/images/icons/drag-n-drop_24.svg
+++ b/src/assets/images/icons/drag-n-drop_24.svg
@ -1,3 +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="M11 5.85V9H4V11H11H13H20V9H13V5.85L14.825 7.675L16.25 6.25L12 2L7.75 6.25L9.175 7.675L11 5.85ZM13 18.15V15H20V13H13H11H4V15H11V18.15L9.175 16.325L7.75 17.75L12 22L16.25 17.75L14.825 16.325L13 18.15Z" fill="#86898E"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M11 5.85V9H4V11H11H13H20V9H13V5.85L14.825 7.675L16.25 6.25L12 2L7.75 6.25L9.175 7.675L11 5.85ZM13 18.15V15H20V13H13H11H4V15H11V18.15L9.175 16.325L7.75 17.75L12 22L16.25 17.75L14.825 16.325L13 18.15Z" fill="#0070BA"/>
 </svg>
--- a/src/assets/images/icons/web_page_24dp.svg
+++ b/src/assets/images/icons/web_page_24dp.svg
@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+  <path 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 19H19V7H5V19ZM7 12V10H17V12H7ZM7 16V14H13V16H7Z" fill="white"/>
+</svg>
--- a/src/environments/environment.ts
+++ b/src/environments/environment.ts
@ -6,7 +6,7 @@ export const environment = {
  production: false,
  apiUrl: 'http://api.vniigazv2.lc',
  clientId: 2,
-  clientSecret: 'LzHjVVQU5Y3c1xVkIl6BJRhYdCkxE6bNgZL2nqfv',
+  clientSecret: 'ibcsrXeGLmzmilvgKw53otrIB8RdrhXsheW3aaWd',
 };

 /*