Bug Fixing overall

2024-05-06 20:13:09 +02:00
parent bb5a408cdc
commit 6b61c19bd7
52 changed files with 1926 additions and 1048 deletions
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
@@ -12,7 +12,7 @@
        <div class="col-12 md:col-6">
          <ul class="list-none p-0 m-0 border-top-1 border-300">
            <li class="flex align-items-center py-3 px-2 flex-wrap">
-              <div class="text-500 w-full md:w-2 font-medium">Description</div>
+              <div class="text-500 w-full md:w-2 font-medium flex align-self-start">Description</div>
              <div class="text-900 w-full md:w-10 line-height-3" [innerHTML]="description"></div>
            </li>
            <li class="flex align-items-center py-3 px-2 flex-wrap surface-ground">
@@ -50,16 +50,6 @@
              <div class="text-900 w-full md:w-10">{{ listing.brokerLicencing }}</div>
            </li>
          </ul>
-          <p-galleria [value]="propertyImages" [showIndicators]="true" [showThumbnails]="false" [responsiveOptions]="responsiveOptions" [containerStyle]="{ 'max-width': '640px' }" [numVisible]="5">
-            <ng-template pTemplate="item" let-item>
-              <img src="{{ environment.apiBaseUrl }}/property/{{ listing.id }}/{{ item.name }}" style="width: 100%" />
-            </ng-template>
-            <!-- <ng-template pTemplate="thumbnail" let-item>
-                            <div class="grid grid-nogutter justify-content-center">
-                                <img src="{{environment.apiBaseUrl}}/property/{{listing.id}}/{{item.name}}" />
-                            </div>
-                        </ng-template> -->
-          </p-galleria>
          @if(listing && user && (user.id===listing?.userId || isAdmin())){
          <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/editListing', listing.id]"></button>
          }
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
@@ -1,3 +1,4 @@
+import { Location } from '@angular/common';
 import { Component } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -46,7 +47,6 @@ export class DetailsBusinessListingComponent {
  listing: BusinessListing;
  criteria: ListingCriteria;
  mailinfo: MailInfo;
-  propertyImages: string[] = [];
  environment = environment;
  user: User;
  description: SafeHtml;
@@ -59,27 +59,28 @@ export class DetailsBusinessListingComponent {
    private mailService: MailService,
    private messageService: MessageService,
    private sanitizer: DomSanitizer,
+    private location: Location,
  ) {
    this.userService.getUserObservable().subscribe(user => {
      this.user = user;
+      this.mailinfo = { sender: {}, userId: '', email: user.email };
    });
    this.criteria = onChange(getCriteriaStateObject(), getSessionStorageHandler);
-    this.mailinfo = { sender: {}, userId: '' };
  }

  async ngOnInit() {
    this.listing = await lastValueFrom(this.listingsService.getListingById(this.id, 'business'));
-    this.propertyImages = await this.listingsService.getPropertyImages(this.listing.id);
    this.description = this.sanitizer.bypassSecurityTrustHtml(this.listing.description);
  }
  back() {
-    this.router.navigate(['businessListings']);
+    this.location.back();
  }
  isAdmin() {
    return this.userService.hasAdminRole();
  }
  async mail() {
    this.mailinfo.userId = this.listing.userId;
+    this.mailinfo.listing = this.listing;
    await this.mailService.mail(this.mailinfo);
    this.messageService.add({ severity: 'info', summary: 'Confirmed', detail: 'Your message has been sent to the creator of the listing', life: 3000 });
  }
--- a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
@@ -12,7 +12,7 @@
        <div class="col-12 md:col-6">
          <ul class="list-none p-0 m-0 border-top-1 border-300">
            <li class="flex align-items-center py-3 px-2 flex-wrap">
-              <div class="text-500 w-full md:w-2 font-medium">Description</div>
+              <div class="text-500 w-full md:w-2 font-medium flex align-self-start">Description</div>
              <div class="text-900 w-full md:w-10 line-height-3" [innerHTML]="description"></div>
            </li>
            <li class="flex align-items-center py-3 px-2 flex-wrap surface-ground">
--- a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts
+++ b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts
@@ -1,3 +1,4 @@
+import { Location } from '@angular/common';
 import { Component } from '@angular/core';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
@@ -59,12 +60,13 @@ export class DetailsCommercialPropertyListingComponent {
    private mailService: MailService,
    private messageService: MessageService,
    private sanitizer: DomSanitizer,
+    private location: Location,
  ) {
    this.userService.getUserObservable().subscribe(user => {
      this.user = user;
+      this.mailinfo = { sender: {}, userId: '', email: user.email };
    });
    this.criteria = onChange(getCriteriaStateObject(), getSessionStorageHandler);
-    this.mailinfo = { sender: {}, userId: '' };
  }

  async ngOnInit() {
@@ -73,13 +75,14 @@ export class DetailsCommercialPropertyListingComponent {
    this.description = this.sanitizer.bypassSecurityTrustHtml(this.listing.description);
  }
  back() {
-    this.router.navigate(['commercialPropertyListings']);
+    this.location.back();
  }
  isAdmin() {
    return this.userService.hasAdminRole();
  }
  async mail() {
    this.mailinfo.userId = this.listing.userId;
+    this.mailinfo.listing = this.listing;
    await this.mailService.mail(this.mailinfo);
    this.messageService.add({ severity: 'info', summary: 'Confirmed', detail: 'Your message has been sent to the creator of the listing', life: 3000 });
  }
--- a/bizmatch/src/app/pages/details/details-user/details-user.component.html
+++ b/bizmatch/src/app/pages/details/details-user/details-user.component.html
@@ -1,5 +1,6 @@
 <div class="surface-ground h-full">
  <div class="px-6 py-5">
+    @if (user){
    <div class="surface-card p-4 shadow-2 border-round">
      <!-- <div class="flex justify-content-between align-items-center align-content-center">
                <div class="font-medium text-3xl text-900 mb-3">{{listing?.title}}</div>
@@ -118,5 +119,6 @@
      <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/account']"></button>
      }
    </div>
+    }
  </div>
 </div>
--- a/bizmatch/src/app/pages/details/details-user/details-user.component.ts
+++ b/bizmatch/src/app/pages/details/details-user/details-user.component.ts
@@ -1,10 +1,9 @@
+import { Location } from '@angular/common';
 import { Component } from '@angular/core';
-import { MessageService } from 'primeng/api';
-import { GalleriaModule } from 'primeng/galleria';
-import { SharedModule } from '../../../shared/shared/shared.module';
-
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
+import { MessageService } from 'primeng/api';
+import { GalleriaModule } from 'primeng/galleria';
 import { Observable } from 'rxjs';
 import { BusinessListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
 import { KeyValue, ListingCriteria } from '../../../../../../bizmatch-server/src/models/main.model';
@@ -13,6 +12,7 @@ import { ImageService } from '../../../services/image.service';
 import { ListingsService } from '../../../services/listings.service';
 import { SelectOptionsService } from '../../../services/select-options.service';
 import { UserService } from '../../../services/user.service';
+import { SharedModule } from '../../../shared/shared/shared.module';

@Component({
  selector: 'app-details-user',
@@ -41,6 +41,7 @@ export class DetailsUserComponent {
    public selectOptions: SelectOptionsService,
    private sanitizer: DomSanitizer,
    private imageService: ImageService,
+    private location: Location,
  ) {}

  async ngOnInit() {
@@ -54,7 +55,7 @@ export class DetailsUserComponent {
    this.offeredServices = this.sanitizer.bypassSecurityTrustHtml(this.user.offeredServices);
  }
  back() {
-    this.router.navigate(['brokerListings']);
+    this.location.back();
  }
  isAdmin() {
    return this.userService.hasAdminRole();