fix: merge

Signed-off-by: Dafnik <[email protected]>
DatepollSystems · Sep 16, 2024 · 9447dc3 · 9447dc3
1 parent 3018489
commit 9447dc3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/src/app/home/start/start.component.html b/src/app/home/start/start.component.html
@@ -1,5 +1,5 @@
-<div class="d-flex flex-column flex-lg-row justify-content-start gap-2">
-  <div class="col-12 col-lg-7 d-flex flex-column gap-2">
+<div class="d-flex flex-column flex-md-row justify-content-between gap-2">
+  <div class="col-12 col-md-6 col-xl-5 col-xxl-4 d-flex flex-column gap-2">
     <div class="card p-2">
       <div class="card-body">
         <h5 class="card-title">{{ 'HOME_START_SETUP' | transloco }}</h5>
@@ -29,15 +29,15 @@ <h5 class="card-title">{{ 'HOME_START_SETUP' | transloco }}</h5>
       </div>
     </div>
 
-    <div class="card p-2 col-12 col-sm-7 col-md-8">
+    <div class="card p-2">
       <div class="card-body">
         <h5 class="card-title">{{ 'ABOUT_APP_DISCOVER' | transloco }}</h5>
         <app-download-btn-list />
       </div>
     </div>
 
     @if (unusedPrinters(); as unusedPrinters) {
-    <div class="card p-2 col-12 col-sm-7 col-md-8">
+    <div class="card p-2">
       <div class="card-body">
         <h5 class="card-title d-flex justify-content-between align-items-center">
           {{ 'Ungekoppelte Drucker' | transloco }}
@@ -58,7 +58,7 @@ <h5 class="card-title d-flex justify-content-between align-items-center">
       </div>
     </div>
     } @if (myUser()?.isAdmin) {
-    <div class="card p-2 col-12 col-sm-7 col-md-8">
+    <div class="card p-2">
       <div
         class="card-body d-inline-flex align-items-center gap-2 clickable"
         (mousedown)="showSystemInfoService.set(!showSystemInfoService.show())"
@@ -77,7 +77,7 @@ <h5 class="card-title d-flex justify-content-between align-items-center">
   </div>
 
   @if (event()) {
-  <div class="col-12 col-lg-5 d-flex flex-column gap-2">
+  <div class="col-12 col-md-6 col-xl-5 col-xxl-4 d-flex flex-column gap-2">
     <div class="card p-2">
       <div class="card-body">
         <h5 class="card-title">{{ 'Neue Bestellungen' | transloco }}</h5>

diff --git a/src/app/home/start/start.component.ts b/src/app/home/start/start.component.ts
@@ -16,9 +16,7 @@ import {BiComponent} from 'dfx-bootstrap-icons';
 import {StopPropagationDirective} from 'dfx-helper';
 import {deriveLoading} from 'ngxtension/derive-loading';
 
-import {catchError, filter, map, of, startWith, switchMap, timer} from 'rxjs';
 import {catchError, combineLatest, filter, map, of, startWith, switchMap, timer} from 'rxjs';
-import {MyUserService} from '../_shared/services/user/my-user.service';
 import {SelectedEventService} from '../_admin/events/_services/selected-event.service';
 import {MyUserService} from '../_shared/services/user/my-user.service';
 import {AppOrderStateBadgeComponent} from '../orders/_components/app-order-state-badge.component';
@@ -79,7 +77,7 @@ export class StartComponent {
     map((it) => it.data),
   );
 
-  orders = toSignal(this.#orders$);
+  orders = toSignal(this.#orders$, {initialValue: []});
 
   showOrdersLoading = toSignal(this.#orders$.pipe(deriveLoading({threshold: 0, loadingTime: 0})), {requireSync: true});