minor Ui fixes
This commit is contained in:
parent
9dab1da115
commit
4f4ea14536
@ -18,6 +18,7 @@ export class IconsModule {
|
|||||||
'arrow-right',
|
'arrow-right',
|
||||||
'assign',
|
'assign',
|
||||||
'assign-me',
|
'assign-me',
|
||||||
|
'back-arrow',
|
||||||
'calendar',
|
'calendar',
|
||||||
'check',
|
'check',
|
||||||
'close',
|
'close',
|
||||||
|
|||||||
@ -73,10 +73,6 @@
|
|||||||
mat-icon {
|
mat-icon {
|
||||||
max-width: 14px;
|
max-width: 14px;
|
||||||
margin-left: 8px;
|
margin-left: 8px;
|
||||||
|
|
||||||
&.transform-180 {
|
|
||||||
transform: rotate(180deg);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -25,8 +25,19 @@
|
|||||||
routerLink="/ui/projects"
|
routerLink="/ui/projects"
|
||||||
translate="top-bar.navigation-items.projects"
|
translate="top-bar.navigation-items.projects"
|
||||||
routerLinkActive="active"
|
routerLinkActive="active"
|
||||||
|
*ngIf="projectsView"
|
||||||
[routerLinkActiveOptions]="{ exact: true }"
|
[routerLinkActiveOptions]="{ exact: true }"
|
||||||
></a>
|
></a>
|
||||||
|
<a
|
||||||
|
class="breadcrumb back-to-projects"
|
||||||
|
routerLink="/ui/projects"
|
||||||
|
routerLinkActive="active"
|
||||||
|
*ngIf="settingsView"
|
||||||
|
[routerLinkActiveOptions]="{ exact: true }"
|
||||||
|
>
|
||||||
|
<mat-icon svgIcon="red:collapse" class="transform-180"></mat-icon>
|
||||||
|
{{ 'top-bar.navigation-items.back-to-projects' | translate }}
|
||||||
|
</a>
|
||||||
<mat-icon *ngIf="appStateService.activeProject" svgIcon="red:arrow-right"></mat-icon>
|
<mat-icon *ngIf="appStateService.activeProject" svgIcon="red:arrow-right"></mat-icon>
|
||||||
<a
|
<a
|
||||||
*ngIf="appStateService.activeProject"
|
*ngIf="appStateService.activeProject"
|
||||||
|
|||||||
@ -4,6 +4,7 @@ import { AppStateService } from '../../state/app-state.service';
|
|||||||
import { LanguageService } from '../../i18n/language.service';
|
import { LanguageService } from '../../i18n/language.service';
|
||||||
import { PermissionsService } from '../../common/service/permissions.service';
|
import { PermissionsService } from '../../common/service/permissions.service';
|
||||||
import { UserPreferenceService } from '../../common/service/user-preference.service';
|
import { UserPreferenceService } from '../../common/service/user-preference.service';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'redaction-base-screen',
|
selector: 'redaction-base-screen',
|
||||||
@ -11,18 +12,33 @@ import { UserPreferenceService } from '../../common/service/user-preference.serv
|
|||||||
styleUrls: ['./base-screen.component.scss']
|
styleUrls: ['./base-screen.component.scss']
|
||||||
})
|
})
|
||||||
export class BaseScreenComponent {
|
export class BaseScreenComponent {
|
||||||
|
private _projectsView: boolean;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
public readonly appStateService: AppStateService,
|
public readonly appStateService: AppStateService,
|
||||||
public readonly permissionsService: PermissionsService,
|
public readonly permissionsService: PermissionsService,
|
||||||
public readonly userPreferenceService: UserPreferenceService,
|
public readonly userPreferenceService: UserPreferenceService,
|
||||||
|
private readonly _router: Router,
|
||||||
private readonly _languageService: LanguageService,
|
private readonly _languageService: LanguageService,
|
||||||
private readonly _userService: UserService
|
private readonly _userService: UserService
|
||||||
) {}
|
) {
|
||||||
|
_router.events.subscribe(() => {
|
||||||
|
this._projectsView = this._router.url.indexOf('/ui/projects') === 0;
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
get user() {
|
get user() {
|
||||||
return this._userService.user;
|
return this._userService.user;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
get projectsView() {
|
||||||
|
return this._projectsView;
|
||||||
|
}
|
||||||
|
|
||||||
|
get settingsView() {
|
||||||
|
return !this._projectsView;
|
||||||
|
}
|
||||||
|
|
||||||
logout() {
|
logout() {
|
||||||
this._userService.logout();
|
this._userService.logout();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -35,8 +35,10 @@ export class FileDropOverlayService {
|
|||||||
e.preventDefault();
|
e.preventDefault();
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
if (e.toElement == null && e.relatedTarget == null) {
|
if (e.toElement == null && e.relatedTarget == null) {
|
||||||
this._mouseIn = false;
|
setTimeout(() => {
|
||||||
this.closeFileDropOverlay();
|
this._mouseIn = false;
|
||||||
|
this.closeFileDropOverlay();
|
||||||
|
}, 250);
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
|
|||||||
@ -34,10 +34,6 @@ section {
|
|||||||
padding-left: 8px;
|
padding-left: 8px;
|
||||||
padding-right: 8px;
|
padding-right: 8px;
|
||||||
|
|
||||||
&.transform-180 {
|
|
||||||
transform: rotate(180deg);
|
|
||||||
}
|
|
||||||
|
|
||||||
mat-icon {
|
mat-icon {
|
||||||
width: 10px;
|
width: 10px;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
{
|
{
|
||||||
"OAUTH_URL": "https://redkc-staging.iqser.cloud/auth/realms/redaction",
|
"OAUTH_URL": "https://redkc-staging.iqser.cloud/auth/realms/redaction",
|
||||||
"OAUTH_CLIENT_ID": "redaction",
|
"OAUTH_CLIENT_ID": "redaction",
|
||||||
"API_URL": "https://redapi-staging.iqser.cloud"
|
"API_URL": "https://timo-redaction-dev.iqser.cloud"
|
||||||
}
|
}
|
||||||
|
|||||||
@ -39,9 +39,10 @@
|
|||||||
"top-bar": {
|
"top-bar": {
|
||||||
"navigation-items": {
|
"navigation-items": {
|
||||||
"projects": "Projects",
|
"projects": "Projects",
|
||||||
|
"back-to-projects": "Back to Projects",
|
||||||
"my-account": {
|
"my-account": {
|
||||||
"children": {
|
"children": {
|
||||||
"admin": "Management",
|
"admin": "Settings",
|
||||||
"language": {
|
"language": {
|
||||||
"label": "Language",
|
"label": "Language",
|
||||||
"english": "English",
|
"english": "English",
|
||||||
|
|||||||
9
apps/red-ui/src/assets/icons/general/back-arrow.svg
Normal file
9
apps/red-ui/src/assets/icons/general/back-arrow.svg
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
<svg id="Capa_1" xmlns="http://www.w3.org/2000/svg" x="0px" y="0px"
|
||||||
|
viewBox="0 0 477.862 477.862" xml:space="preserve">
|
||||||
|
<g fill="currentColor">
|
||||||
|
<path d="M187.722,102.856V17.062C187.719,7.636,180.076-0.003,170.65,0c-4.834,0.001-9.44,2.053-12.676,5.644L4.375,176.311
|
||||||
|
c-5.617,6.256-5.842,15.67-0.529,22.187l153.6,187.733c5.968,7.295,16.72,8.371,24.016,2.403c3.952-3.233,6.249-8.066,6.26-13.172
|
||||||
|
v-85.043c134.827,4.386,218.965,62.02,256.888,175.787c2.326,6.96,8.841,11.653,16.179,11.656c0.92,0.003,1.84-0.072,2.748-0.222
|
||||||
|
c8.256-1.347,14.319-8.479,14.319-16.845C477.855,259.818,356.87,112.174,187.722,102.856z"/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 641 B |
@ -13,6 +13,17 @@
|
|||||||
width: fit-content;
|
width: fit-content;
|
||||||
white-space: nowrap;
|
white-space: nowrap;
|
||||||
|
|
||||||
|
&.back-to-projects {
|
||||||
|
display: flex !important;
|
||||||
|
justify-content: center;
|
||||||
|
align-items: center;
|
||||||
|
|
||||||
|
mat-icon {
|
||||||
|
margin-right: 4px;
|
||||||
|
color: $primary;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
&:last-child {
|
&:last-child {
|
||||||
@include line-clamp(1);
|
@include line-clamp(1);
|
||||||
}
|
}
|
||||||
|
|||||||
@ -36,3 +36,7 @@
|
|||||||
width: 10px;
|
width: 10px;
|
||||||
height: 10px;
|
height: 10px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.transform-180 {
|
||||||
|
transform: rotate(180deg);
|
||||||
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user