MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

ui fixes

This commit is contained in:
CITE\spapacharalampous 2024-09-04 15:38:01 +03:00
parent 42390e6b64
commit 0609065ab8
15 changed files with 45 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/annotation-service/ui/admin/status/listing/status-listing.component.html
View File

@ -80,9 +80,9 @@
<mat-icon>more_horiz</mat-icon> <mat-icon>more_horiz</mat-icon>
</button> </button>
<mat-menu #actionsMenu="matMenu"> <mat-menu #actionsMenu="matMenu">
<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/notification-templates/', row.id])"> <a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/annotation-statuses/', row.id])">
<mat-icon>edit</mat-icon>{{'ANNOTATION-SERVICE.STATUS-LISTING.ACTIONS.EDIT' | translate}} <mat-icon>edit</mat-icon>{{'ANNOTATION-SERVICE.STATUS-LISTING.ACTIONS.EDIT' | translate}}
</button> </a>
<button *ngIf="canDelete(row)" mat-menu-item (click)="deleteType(row.id)"> <button *ngIf="canDelete(row)" mat-menu-item (click)="deleteType(row.id)">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
{{'ANNOTATION-SERVICE.STATUS-LISTING.ACTIONS.DELETE' | translate}} {{'ANNOTATION-SERVICE.STATUS-LISTING.ACTIONS.DELETE' | translate}}

1
frontend/src/annotation-service/ui/admin/status/listing/status-listing.component.ts
View File

@ -24,7 +24,6 @@ import { StatusService } from '@annotation-service/services/http/status.service'
import { AnnotationServiceEnumUtils } from '@annotation-service/core/formatting/enum-utils.service'; import { AnnotationServiceEnumUtils } from '@annotation-service/core/formatting/enum-utils.service';
import { InternalStatusTypePipe } from '@annotation-service/core/formatting/pipes/internal-status-type.pipe'; import { InternalStatusTypePipe } from '@annotation-service/core/formatting/pipes/internal-status-type.pipe';
import { IsActiveTypePipe } from '@annotation-service/core/formatting/pipes/is-active-type.pipe'; import { IsActiveTypePipe } from '@annotation-service/core/formatting/pipes/is-active-type.pipe';
import { AppPermission } from '@app/core/common/enum/permission.enum';
@Component({ @Component({
templateUrl: './status-listing.component.html', templateUrl: './status-listing.component.html',

4
frontend/src/app/library/guided-tour/guided-tour.component.html
View File

@ -26,12 +26,12 @@
{{ currentTourStep.title }} {{ currentTourStep.title }}
</h2> </h2>
<div class="tour-buttons"> <div class="tour-buttons">
<button *ngIf="!guidedTourService.onResizeMessage" class="next-button" <button *ngIf="!guidedTourService.onResizeMessage" mat-button type="button" class="rounded-btn primary"
(click)="guidedTourService.nextStep()"> (click)="guidedTourService.nextStep()">
{{ nextText }} {{ nextText }}
</button> </button>
<button *ngIf="!guidedTourService.onResizeMessage && !currentTourStep.isStepUnique" <button *ngIf="!guidedTourService.onResizeMessage && !currentTourStep.isStepUnique"
(click)="guidedTourService.skipTour()" class="skip-button link-button"> (click)="guidedTourService.skipTour()" class="rounded-btn primary-inverted">
{{ skipText }} {{ skipText }}
</button> </button>
</div> </div>

54
frontend/src/app/library/guided-tour/guided-tour.component.scss
View File

@ -136,60 +136,6 @@ ngx-guided-tour {
padding: 10px 70px 18px 65px; /*custom add*/ padding: 10px 70px 18px 65px; /*custom add*/
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
button.link-button {
padding-left: 0;
font-size: 15px;
font-weight: bold;
max-width: none !important;
cursor: pointer;
text-align: center;
white-space: nowrap;
vertical-align: middle;
border: 1px solid transparent;
line-height: 1.5;
background-color: transparent;
position: relative;
outline: none;
padding: 0 15px;
-webkit-appearance: button;
}
button.skip-button.link-button {
border-left: 0;
/*custom add*/
padding-right: 1em;
padding-left: 1em;
min-width: 133px;
height: 40px;
border: 1px solid var(--primary-color);
background: #ffffff 0% 0% no-repeat padding-box;
color: var(--primary-color);
}
.next-button {
cursor: pointer;
border: none;
outline: none;
/*custom add*/
padding-left: 1em;
padding-right: 1em;
min-width: 101px;
background: var(--primary-color) 0% 0% no-repeat padding-box;
}
/*custom add*/
button.skip-button.link-button,
.next-button {
font-size: 14px;
font-weight: bold;
letter-spacing: 0.35px;
height: 40px;
box-shadow: 0px 3px 6px #1e202029;
border-radius: 30px;
}
} }
} }
} }

36
frontend/src/app/library/notification/popup/popup-notification.component.html
View File

@ -1,21 +1,19 @@
<div class="dialog-wrapper"> <div mat-dialog-title class="row d-flex mt-2 mb-4">
<div mat-dialog-title class="row d-flex mb-4"> <div class="col">
<div class="col p-0"> <span>
<span> {{notification.title}}
{{notification.title}} </span>
</span> </div>
</div> </div>
</div> <div mat-dialog-content class="row d-flex">
<div class="row mt-2 mb-4"> <div class="col-12">
<div class="col-12"> <span>
<span> {{notification.message}}
{{notification.message}} </span>
</span> </div>
</div> </div>
</div> <div mat-dialog-actions class="row d-flex">
<div class="row justify-content-end"> <div class="ml-auto col-auto">
<div class="col-auto"> <button mat-button tabindex="-1" class="rounded-btn primary-inverted" (click)="close()">{{'GENERAL.NOTIFICATION-DIALOG.POPUP.CLOSE' | translate}}</button>
<button class="ml-auto" mat-button mat-dialog-close>{{'GENERAL.NOTIFICATION-DIALOG.POPUP.CLOSE' | translate}}</button>
</div>
</div> </div>
</div> </div>

3
frontend/src/app/library/notification/popup/popup-notification.component.scss
View File

@ -1,3 +0,0 @@
.dialog-wrapper {
padding: 2.0rem;
}

4
frontend/src/app/library/notification/popup/popup-notification.component.ts
View File

@ -14,4 +14,8 @@ export class PopupNotificationDialogComponent {
@Inject(MAT_DIALOG_DATA) public notification: PopupNotification @Inject(MAT_DIALOG_DATA) public notification: PopupNotification
) { ) {
} }
close() {
this.dialogRef.close();
}
} }

4
frontend/src/app/ui/admin/description-status/listing/description-status-listing/description-status-listing.component.html
View File

@ -54,9 +54,9 @@
<mat-icon>more_horiz</mat-icon> <mat-icon>more_horiz</mat-icon>
</button> </button>
<mat-menu #actionsMenu="matMenu"> <mat-menu #actionsMenu="matMenu">
<button *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-statuses/', row.id])"> <a *ngIf="canEdit(row)" mat-menu-item [routerLink]="routerUtils.generateUrl(['/description-statuses/', row.id])">
<mat-icon>edit</mat-icon>{{'COMMONS.ACTIONS.EDIT' | translate}} <mat-icon>edit</mat-icon>{{'COMMONS.ACTIONS.EDIT' | translate}}
</button> </a>
<button *ngIf="canDelete(row)" mat-menu-item (click)="delete(row.id)"> <button *ngIf="canDelete(row)" mat-menu-item (click)="delete(row.id)">
<mat-icon>delete</mat-icon> <mat-icon>delete</mat-icon>
{{'COMMONS.ACTIONS.DELETE' | translate}} {{'COMMONS.ACTIONS.DELETE' | translate}}

6
frontend/src/app/ui/admin/description-template/description-template-preview/description-template-preview-dialog.component.html
View File

@ -11,9 +11,9 @@
<div mat-dialog-content class="definition-content"> <div mat-dialog-content class="definition-content">
<app-description-form *ngIf="formGroup && formGroup.get('properties')" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionId]="descriptionId" [descriptionTemplate]="descriptionTemplate" [canAnnotate]="false" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form> <app-description-form *ngIf="formGroup && formGroup.get('properties')" [propertiesFormGroup]="previewPropertiesFormGroup" [descriptionId]="descriptionId" [descriptionTemplate]="descriptionTemplate" [canAnnotate]="false" [visibilityRulesService]="visibilityRulesService" [isNew]="true"></app-description-form>
</div> </div>
<div mat-mat-dialog-actions *ngIf="formGroup"> <div mat-dialog-actions *ngIf="formGroup" class="row d-flex pb-2 pt-3">
<div class="col-auto d-flex pb-4 pt-2"> <div class="col-auto ml-auto">
<button mat-button type="button" class="rounded-btn primary ml-auto" (click)="select()">{{'TYPES.EXTERNAL-DATASET-TYPE.SELECT' | translate}}</button> <button mat-button type="button" class="rounded-btn primary" (click)="select()">{{'TYPES.EXTERNAL-DATASET-TYPE.SELECT' | translate}}</button>
</div> </div>
</div> </div>
</div> </div>

2
frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.html
View File

@ -281,7 +281,7 @@
<ng-template #actions> <ng-template #actions>
<div> <div>
<button mat-button class="rounded-btn primary-inverted mr-3" (click)="cancel()">{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.CLOSE' | translate}}</button> <button mat-button class="rounded-btn primary-inverted mr-3" (click)="cancel()">{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.CLOSE' | translate}}</button>
<button *ngIf="!viewOnly" mat-button class="rounded-btn secondary save-btn" type="button"> <button *ngIf="!viewOnly" mat-button class="rounded-btn secondary" type="button">
<span class="d-flex flex-row row"> <span class="d-flex flex-row row">
<span (click)="save(); formSubmit()" class="col">{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.SAVE' | translate}}</span> <span (click)="save(); formSubmit()" class="col">{{'DESCRIPTION-TEMPLATE-EDITOR.ACTIONS.SAVE' | translate}}</span>
<mat-divider [vertical]="true"></mat-divider> <mat-divider [vertical]="true"></mat-divider>

21
frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.html
View File

@ -8,7 +8,7 @@
</div> </div>
</div> </div>
<div mat-dialog-content class="row"> <div mat-dialog-content class="row">
<div *ngFor="let user of formGroup.get('users').controls; let userIndex=index;" class="row mb-3"> <div *ngFor="let user of formGroup.get('users').controls; let userIndex=index;" class="row align-items-center mb-2">
<div class="col-12 col-xl mt-3"> <div class="col-12 col-xl mt-3">
<mat-form-field class="w-100"> <mat-form-field class="w-100">
<mat-label>{{'USER-INVITE-TO-TENANT-DIALOG.FIELDS.EMAIL' | translate}}</mat-label> <mat-label>{{'USER-INVITE-TO-TENANT-DIALOG.FIELDS.EMAIL' | translate}}</mat-label>
@ -37,21 +37,22 @@
</button> </button>
</div> </div>
</div> </div>
</div>
<mat-error *ngIf="formGroup.get('users').dirty && formGroup.get('users').hasError('required')">{{'USER-INVITE-TO-TENANT-DIALOG.USERS-REQUIRED' | translate}}</mat-error> <mat-error *ngIf="formGroup.get('users').dirty && formGroup.get('users').hasError('required')">{{'USER-INVITE-TO-TENANT-DIALOG.USERS-REQUIRED' | translate}}</mat-error>
<mat-error *ngIf="formGroup.get('users').hasError('backendError')">{{formGroup.get('users').getError('backendError').message}}</mat-error> <mat-error *ngIf="formGroup.get('users').hasError('backendError')">{{formGroup.get('users').getError('backendError').message}}</mat-error>
<div class="p-2">
<div class="row"> <div class="row">
<div class="col"> <div class="col-12">
<button mat-icon-button (click)="addUser()"> <button mat-icon-button (click)="addUser()">
<mat-icon>add</mat-icon> <mat-icon>add</mat-icon>
</button> </button>
</div> </div>
</div> </div>
</div> </div>
<div class="col mt-2"> <div mat-dialog-actions class="row d-flex">
<button mat-button [disabled]="inProgressSendButton" (click)="send()" type="button" class="rounded-btn primary-inverted invite-btn">{{'USER-INVITE-TO-TENANT-DIALOG.ACTIONS.INVITE' | translate}}</button> <div class="col-auto ml-auto">
<mat-error *ngIf="formGroup.get('users').hasError('backendError')">{{formGroup.get('users').getError('backendError').message}}</mat-error> <button mat-button [disabled]="inProgressSendButton || !formGroup.valid" (click)="send()" type="button" class="rounded-btn primary-inverted primary-inverted-hover">{{'USER-INVITE-TO-TENANT-DIALOG.ACTIONS.INVITE' | translate}}</button>
<mat-error *ngIf="formGroup.get('users').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error> <mat-error *ngIf="formGroup.get('users').hasError('backendError')">{{formGroup.get('users').getError('backendError').message}}</mat-error>
<mat-error *ngIf="formGroup.get('users').hasError('required')">{{'GENERAL.VALIDATION.REQUIRED' | translate}}</mat-error>
</div>
</div> </div>
</div> </div>

18
frontend/src/app/ui/admin/user/listing/user-invite-to-tenant-dialog/user-invite-to-tenant-dialog.component.scss
View File

@ -7,18 +7,6 @@
padding: 0.28em 0.34em 0em 1.125em; padding: 0.28em 0.34em 0em 1.125em;
} }
.close-icon {
cursor: pointer;
padding: .4rem;
width: auto !important;
height: auto !important;
}
.close-icon:hover {
background-color: #ECECED !important;
border-radius: 50%;
}
.title { .title {
font-size: 2.375em; font-size: 2.375em;
font-weight: lighter; font-weight: lighter;
@ -81,12 +69,6 @@
padding-bottom: 0 !important; padding-bottom: 0 !important;
} }
.invite-btn:hover {
background: var(--primary-color);
color: #ffffff;
}
@keyframes blink { @keyframes blink {
0% { 0% {
border: 1px solid rgba(255, 0, 0, 0.2); border: 1px solid rgba(255, 0, 0, 0.2);

4
frontend/src/app/ui/dashboard/dashboard.component.html
View File

@ -15,8 +15,8 @@
<div class="row d-flex align-items-center mt-4" *ngIf="this.configurationService.newReleaseNotificationLink"> <div class="row d-flex align-items-center mt-4" *ngIf="this.configurationService.newReleaseNotificationLink">
<div class="col-auto d-flex"> <div class="col-auto d-flex">
<a class="notification-link" href="{{this.configurationService.newReleaseNotificationLink}}" target="_blank"> <a mat-button class="rounded-btn primary new-releases-btn" href="{{this.configurationService.newReleaseNotificationLink}}" target="_blank">
<button mat-raised-button type="button" class="col-auto align-self-center new-releases-btn">{{'NEW-RELEASE-NOTIFICATION.ACTIONS.LEARN-MORE' | translate}}</button> {{'NEW-RELEASE-NOTIFICATION.ACTIONS.LEARN-MORE' | translate}}
</a> </a>
</div> </div>
<span class="new-releases-logo"> <span class="new-releases-logo">

8
frontend/src/app/ui/dashboard/dashboard.component.scss
View File

@ -359,15 +359,7 @@ mat-tab-group.my-mat-tab .mat-mdc-tab-header .mat-mdc-tab-label-container .mat-m
} }
.new-releases-btn { .new-releases-btn {
height: 40px;
margin-left: 40px; margin-left: 40px;
background: var(--primary-color) 0% 0% no-repeat padding-box;
border-radius: 30px;
opacity: 1;
color: #FFFFFF;
padding-right: 2em;
padding-left: 2em;
} }
.new-releases-chip { .new-releases-chip {

2
frontend/src/app/ui/description/description-copy-dialog/description-copy-dialog.component.html
View File

@ -27,7 +27,7 @@
</div> </div>
</div> </div>
<div mat-dialog-actions class="row"> <div mat-dialog-actions class="row">
<div class="col-auto ml-auto"><button mat-button class="cancel-btn" type="button" (click)="cancel()">{{ data.cancelButton }}</button></div> <div class="col-auto ml-auto"><button mat-button class="rounded-btn neutral" type="button" (click)="cancel()">{{ data.cancelButton }}</button></div>
<div class="col-auto"><button mat-button class="confirm-btn" type="button" [disabled]="!data.formGroup.valid" (click)="confirm()">{{ data.confirmButton }}</button></div> <div class="col-auto"><button mat-button class="confirm-btn" type="button" [disabled]="!data.formGroup.valid" (click)="confirm()">{{ data.confirmButton }}</button></div>
</div> </div>
</div> </div>