Browse Source

refactor: adjust layout in layout and adapted skeleton loader

pull/4394/head
tobikugel 6 months ago
parent
commit
310bf57b7c
  1. 2
      apps/client/src/app/components/rule/rule.component.scss
  2. 49
      apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html
  3. 3
      apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.scss
  4. 2
      apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts

2
apps/client/src/app/components/rule/rule.component.scss

@ -2,7 +2,7 @@
display: block; display: block;
.icon-container { .icon-container {
background-color: rgba(var(--dark-primary-text), 0.05); background-color: rgba(var(--palette-foreground-base), 0.02);
border-radius: 0.25rem; border-radius: 0.25rem;
height: 2rem; height: 2rem;

49
apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.html

@ -7,18 +7,28 @@
risks in your portfolio. Adjust the rules below and set custom risks in your portfolio. Adjust the rules below and set custom
thresholds to align with your personal investment strategy. thresholds to align with your personal investment strategy.
</p> </p>
<p class="mb-4"> <div class="d-flex py-3">
@if (isLoading) { @if (isLoading) {
<ngx-skeleton-loader <div class="d-flex">
animation="pulse" <ngx-skeleton-loader
class="w-100" animation="pulse"
[theme]="{ class="mr-2"
height: '1rem', [theme]="{
width: '100%' height: '2rem',
}" width: '2rem'
/> }"
/>
<ngx-skeleton-loader
animation="pulse"
class="mt-2 mb-1"
[theme]="{
height: '1rem',
width: '10rem'
}"
/>
</div>
} @else { } @else {
<span <div
class="icon-container mr-2 px-2" class="icon-container mr-2 px-2"
[ngClass]="{ [ngClass]="{
okay: okay:
@ -32,23 +42,26 @@
statistics?.rulesActiveCount === 0 || statistics?.rulesActiveCount === 0 ||
statistics?.rulesFulfilledCount === 0 statistics?.rulesFulfilledCount === 0
) { ) {
<ion-icon class="text-muted" name="remove-circle-outline" /> <ion-icon
class="align-middle text-muted"
name="remove-circle-outline"
/>
} @else if ( } @else if (
statistics?.rulesFulfilledCount === statistics?.rulesActiveCount statistics?.rulesFulfilledCount === statistics?.rulesActiveCount
) { ) {
<ion-icon name="checkmark-circle-outline" /> <ion-icon class="align-middle" name="checkmark-circle-outline" />
} @else { } @else {
<ion-icon name="warning-outline" /> <ion-icon class="align-middle" name="warning-outline" />
} }
</span> </div>
<span> <div>
{{ statistics?.rulesFulfilledCount }} <ng-container>{{ statistics?.rulesFulfilledCount }} </ng-container>
<ng-container i18n>out of</ng-container> <ng-container i18n>out of</ng-container>
{{ statistics?.rulesActiveCount }} {{ statistics?.rulesActiveCount }}
<ng-container i18n>rules align with your portfolio.</ng-container> <ng-container i18n>rules align with your portfolio.</ng-container>
</span> </div>
} }
</p> </div>
<div <div
class="mb-4" class="mb-4"
[ngClass]="{ [ngClass]="{

3
apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.scss

@ -2,10 +2,9 @@
display: block; display: block;
.icon-container { .icon-container {
background-color: rgba(var(--dark-primary-text), 0.05); background-color: rgba(var(--palette-foreground-base), 0.02);
border-radius: 0.25rem; border-radius: 0.25rem;
height: 2rem; height: 2rem;
vertical-align: middle;
&.okay { &.okay {
color: var(--success); color: var(--success);

2
apps/client/src/app/pages/portfolio/x-ray/x-ray-page.component.ts

@ -134,7 +134,7 @@ export class XRayPageComponent {
rules['regionalMarketClusterRisk']?.filter(({ isActive }) => { rules['regionalMarketClusterRisk']?.filter(({ isActive }) => {
return isActive; return isActive;
}) ?? null; }) ?? null;
debugger;
this.isLoading = false; this.isLoading = false;
this.changeDetectorRef.markForCheck(); this.changeDetectorRef.markForCheck();

Loading…
Cancel
Save