diff --git a/src/app/_modules/administration/licence/administrate-licence.component.html b/src/app/_modules/administration/licence/administrate-licence.component.html index 297c1ad..96dfe11 100644 --- a/src/app/_modules/administration/licence/administrate-licence.component.html +++ b/src/app/_modules/administration/licence/administrate-licence.component.html @@ -1,7 +1,7 @@ - + @@ -21,10 +21,12 @@ - +
Состояние лицензии{{licence?.state?.title || 'Не найдено'}}{{licence?.state?.title || 'Не найдено'}}
Номер лицензии
Дата окончания действия{{licence?.activeTill | date: 'dd.MM.yyyy'}}{{licence?.activeTill?(licence?.activeTill | date: 'dd.MM.yyyy'):'Бессрочная'}}
-

Доступные опции

- +

Включённые опции

+
+

{{option.title}}

+

отсутствуют

diff --git a/src/app/_modules/administration/licence/administrate-licence.component.ts b/src/app/_modules/administration/licence/administrate-licence.component.ts index b007234..783fc84 100644 --- a/src/app/_modules/administration/licence/administrate-licence.component.ts +++ b/src/app/_modules/administration/licence/administrate-licence.component.ts @@ -23,4 +23,11 @@ export class AdministrateLicenceComponent { return this.licence?.options?.data; } + get classState(){ + return { + ok: this.licence.state.name == 'active', + warn: this.licence.state.name == 'expired' + } + } + } diff --git a/src/environments/environment.ts b/src/environments/environment.ts index 4d81dc1..b1a8934 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: 'SSLFpp0u4fAgqSTNamgQdqUsb2mNzj921Ak3DVRI', + clientSecret: 'Nya7dqdsfiEO3EVzKgZqe7lF6oLjRw04Bc6Udm6Y', project: null, licence: 'POUFLO4YW7SU', defaultLocale: 'ru' diff --git a/src/environments/vniigaz-v2.env.dev.ts b/src/environments/vniigaz-v2.env.dev.ts index 24a6133..82707e7 100644 --- a/src/environments/vniigaz-v2.env.dev.ts +++ b/src/environments/vniigaz-v2.env.dev.ts @@ -6,7 +6,7 @@ export const environment = { production: false, apiUrl: 'http://api.nircms.lc', clientId: 2, - clientSecret: 'E4BoAclC9X3gre4Wr4XXmU3Y7sXTEtFSk3iCSkIm', + clientSecret: 'Nya7dqdsfiEO3EVzKgZqe7lF6oLjRw04Bc6Udm6Y', project: 'vniigaz-v2', licence: 'POUFLO4YW7SU', defaultLocale: 'ru' diff --git a/src/vniigaz-v2/css/_admin.scss b/src/vniigaz-v2/css/_admin.scss index 318cf24..ac3eca9 100644 --- a/src/vniigaz-v2/css/_admin.scss +++ b/src/vniigaz-v2/css/_admin.scss @@ -65,137 +65,161 @@ ico.page-control{ } pages-tree{ -.item:not(.home){ - .bar{ - padding-left: 50px; + .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; - 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; - border-bottom: solid var(--second-dis) 1px; - height: 64px; - .left { - cursor: pointer; - width: 24px; - } - .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 { - display: flex; - flex-direction: column; - height: 100%; - a { - color: var(--dadk); - &:nth-child(2){ - color: var(--second); - } - } - } } - } - .right { + .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; + 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; - flex-shrink: 1; - gap: 24px; + border-bottom: solid var(--second-dis) 1px; + height: 64px; + .left { + cursor: pointer; + width: 24px; + } + .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 { + display: flex; + flex-direction: column; + height: 100%; + a { + color: var(--dadk); + &:nth-child(2){ + color: var(--second); + } + } + } + } + } + .right { + display: flex; + flex-direction: row; + align-items: center; + flex-shrink: 1; + gap: 24px; + } } } + + + + + @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; + } + } + } + } + } + + administrate-licence{ font-family: PT Sans; font-size: 16px; font-style: normal; font-weight: 400; line-height: 24px; + color: var(--dark); .default{ - color: var(--second); - } - .caption{ - - } -} - - -@media screen and (max-width: 1330px) { - .item { - .bar { - .mid { - padding: 0 12px; - .info .logo { - display: none; - } - } - .right { - display: none; - } + + .caption{ + color: var(--second); } - .items { - padding-left: 16px; - } - &.company { - .items { - padding-left: 40px; + .value{ + &.ok{ + color: #14A92D + } + &.warn{ + color: #E51F30 } } } -} - + h3{ + font-family: PT Sans; + font-size: 20px; + font-style: normal; + font-weight: 400; + line-height: 28px; + margin: 24px 0 16px; + } + p{ + font-size: 16px; + } } \ No newline at end of file diff --git a/src/vniigaz-v2/css/_basics.scss b/src/vniigaz-v2/css/_basics.scss index d3dc93a..aa0975e 100644 --- a/src/vniigaz-v2/css/_basics.scss +++ b/src/vniigaz-v2/css/_basics.scss @@ -127,7 +127,7 @@ $pxxs:4px; --second-act: #2D2D2D; --second-dis: #C0C0C0; - + --dark: #1F1F1F; --blue-0: #2EB2E8;