Merge branch 'master' into develop
# Conflicts: # backend/pom.xml # distribution/pom.xml # frontend/pom.xml # pom.xml # resources/pom.xml
This commit is contained in:
commit
f96d81f660
9 changed files with 36 additions and 99 deletions
|
|
@ -9,7 +9,7 @@
|
|||
|
||||
<div class="header">
|
||||
<div class="header-logo"></div>
|
||||
<div class="header-title">Официальный сайт Минобороны России <a href="https://mil.ru/">mil.ru</a></div>
|
||||
<div class="header-title">Реестр повесток физических лиц</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
<div class="user short-text">Если учётной записи нет, зарегистрируйтесь</div>
|
||||
</div>
|
||||
<div class="btn-group">
|
||||
<a href="/" class="btn">Войти в Личный кабинет</a>
|
||||
<a href="." class="btn">Войти в Личный кабинет</a>
|
||||
<!--<a href="#" class="btn btn-secondary">Зарегистрироваться</a>-->
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -495,7 +495,7 @@ a.btn:is(:hover, :focus, :active) {
|
|||
right: 0;
|
||||
bottom: 0;
|
||||
opacity: 0.12;
|
||||
background: url(img/svg/bg-star.svg) no-repeat calc(100% + 200px) -180px transparent;
|
||||
background: url(img/bg-star.png) no-repeat calc(100% + 200px) 0px transparent;
|
||||
z-index: 0;
|
||||
}
|
||||
:is(.ul, .fl) .container-inside .list-group.lk-what > div {
|
||||
|
|
|
|||
BIN
frontend/src/resources/landing/img/bg-star.png
Normal file
BIN
frontend/src/resources/landing/img/bg-star.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 238 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 2.8 MiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 3.6 MiB After Width: | Height: | Size: 3.3 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 3.6 MiB After Width: | Height: | Size: 4.6 KiB |
|
|
@ -1,7 +1,7 @@
|
|||
<nav class="header" id="webbpm-header">
|
||||
<div class="header-logo">
|
||||
<div class="logo"><a routerLink="/"></a></div>
|
||||
<div class="main-page">Официальный сайт Минобороны России <a href="https://mil.ru/">mil.ru</a></div>
|
||||
<div class="main-page">Реестр повесток физических лиц</div>
|
||||
</div>
|
||||
<div class="header-menu">
|
||||
<div ngbDropdown class="logout" log-out></div>
|
||||
|
|
|
|||
|
|
@ -65,10 +65,15 @@ export abstract class AuthGuard implements CanActivate {
|
|||
return false;
|
||||
}
|
||||
else {
|
||||
this.httpClient.get<string>("esia/url")
|
||||
return this.httpClient.get<string>("esia/url")
|
||||
.toPromise()
|
||||
.then(url => window.open(url, "_self"));
|
||||
return true;
|
||||
.then(url => {
|
||||
window.open(url, "_self");
|
||||
return true;
|
||||
}).catch((reason)=> {
|
||||
console.error(reason);
|
||||
return false;
|
||||
});
|
||||
}
|
||||
}).catch((reason) => {
|
||||
console.error(reason);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue