Bugfixes

2024-05-15 17:35:04 -05:00
parent 474d7c63d5
commit f51a298227
39 changed files with 333 additions and 260 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
@@ -4,7 +4,7 @@
      <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>
        <!-- <button pButton pRipple type="button" label="Go back to listings" icon="pi pi-user-plus" class="mr-3 p-button-rounded"></button> -->
-        @if(historyService.canGoBack()){
+        @if(historyService.canGoBack){
        <p-button icon="pi pi-times" [rounded]="true" severity="danger" (click)="historyService.goBack()"></p-button>
        }
      </div>
@@ -60,7 +60,7 @@
              <div class="text-900 w-full md:w-10">{{ listing.brokerLicencing }}</div>
            </li>
          </ul>
-          @if(listing && user && (user.id===listing?.userId || isAdmin())){
+          @if(listing && listingUser && (listingUser.id===listing?.userId || isAdmin())){
          <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/editBusinessListing', listing.id]"></button>
          }
        </div>
--- 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
@@ -6,7 +6,7 @@ import { MessageService } from 'primeng/api';
 import { GalleriaModule } from 'primeng/galleria';
 import { lastValueFrom } from 'rxjs';
 import { BusinessListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
-import { ListingCriteria, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
+import { KeycloakUser, ListingCriteria, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { HistoryService } from '../../../services/history.service';
 import { ListingsService } from '../../../services/listings.service';
@@ -48,7 +48,7 @@ export class DetailsBusinessListingComponent {
  criteria: ListingCriteria;
  mailinfo: MailInfo;
  environment = environment;
-  user: User;
+  user: KeycloakUser;
  listingUser: User;
  description: SafeHtml;
  private history: string[] = [];
@@ -68,7 +68,7 @@ export class DetailsBusinessListingComponent {
        this.history.push(event.urlAfterRedirects);
      }
    });
-    this.mailinfo = { sender: {}, userId: '', email: '' };
+    this.mailinfo = { sender: {}, userId: '', email: '', url: environment.mailinfoUrl };
    this.userService.getUserObservable().subscribe(user => {
      this.user = user;
    });
--- 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
@@ -4,7 +4,7 @@
      <div class="flex justify-content-between align-items-center align-content-center mb-2">
        <div class="font-medium text-3xl text-900 mb-3">{{ listing?.title }}</div>
        <!-- <button pButton pRipple type="button" label="Go back to listings" icon="pi pi-user-plus" class="mr-3 p-button-rounded"></button> -->
-        @if(historyService.canGoBack()){
+        @if(historyService.canGoBack){
        <p-button icon="pi pi-times" [rounded]="true" severity="danger" (click)="historyService.goBack()"></p-button>
        }
      </div>
@@ -43,7 +43,7 @@
            </li>
          </ul>

-          @if(listing && user && (user.id===listing?.userId || isAdmin())){
+          @if(listing && listingUser && (listingUser.id===listing?.userId || isAdmin())){
          <button pButton pRipple label="Edit" icon="pi pi-file-edit" class="w-auto" [routerLink]="['/editCommercialPropertyListing', listing.id]"></button>
          }
        </div>
@@ -51,7 +51,7 @@
        <div class="col-12 md:col-6">
          <p-galleria [value]="propertyImages" [showIndicators]="true" [showThumbnails]="false" [responsiveOptions]="responsiveOptions" [containerStyle]="{ 'max-width': '640px' }" [numVisible]="5">
            <ng-template pTemplate="item" let-item>
-              <img src="pictures/property/{{ listing.imagePath }}/{{ item }}" style="width: 100%" />
+              <img src="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ item }}" style="width: 100%" />
            </ng-template>
          </p-galleria>
          @if (mailinfo){
--- 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
@@ -6,7 +6,7 @@ import { MessageService } from 'primeng/api';
 import { GalleriaModule } from 'primeng/galleria';
 import { lastValueFrom } from 'rxjs';
 import { CommercialPropertyListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
-import { ListingCriteria, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
+import { KeycloakUser, ListingCriteria, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { HistoryService } from '../../../services/history.service';
 import { ListingsService } from '../../../services/listings.service';
@@ -49,9 +49,10 @@ export class DetailsCommercialPropertyListingComponent {
  mailinfo: MailInfo;
  propertyImages: string[] = [];
  environment = environment;
-  user: User;
+  user: KeycloakUser;
  listingUser: User;
  description: SafeHtml;
+  env = environment;
  constructor(
    private activatedRoute: ActivatedRoute,
    private listingsService: ListingsService,
@@ -63,7 +64,7 @@ export class DetailsCommercialPropertyListingComponent {
    private sanitizer: DomSanitizer,
    public historyService: HistoryService,
  ) {
-    this.mailinfo = { sender: {}, userId: '', email: '' };
+    this.mailinfo = { sender: {}, userId: '', email: '', url: environment.mailinfoUrl };
    this.userService.getUserObservable().subscribe(user => {
      this.user = user;
    });
--- a/bizmatch/src/app/pages/details/details-user/details-user.component.html
+++ b/bizmatch/src/app/pages/details/details-user/details-user.component.html
@@ -6,7 +6,7 @@
        <div class="flex align-items-start flex-column lg:flex-row lg:justify-content-between">
          <div class="flex align-items-start flex-column md:flex-row">
            @if(user.hasProfile){
-            <img src="pictures//profile/{{ user.id }}.avif?_ts={{ ts }}" class="mr-5 mb-3 lg:mb-0" style="width: 90px" />
+            <img src="{{ env.imageBaseUrl }}/pictures//profile/{{ user.id }}.avif?_ts={{ ts }}" class="mr-5 mb-3 lg:mb-0" style="width: 90px" />
            } @else {
            <img src="assets/images/person_placeholder.jpg" class="mr-5 mb-3 lg:mb-0" style="width: 90px" />
            }
@@ -30,7 +30,7 @@
                  <!-- <span class="font-medium text-500">Logo</span> -->
                  <div>
                    @if(user.hasCompanyLogo){
-                    <img src="pictures/logo/{{ user.id }}.avif?_ts={{ ts }}" class="mr-5 lg:mb-0" style="height: 60px; max-width: 100px" />
+                    <img src="{{ env.imageBaseUrl }}/pictures/logo/{{ user.id }}.avif?_ts={{ ts }}" class="mr-5 lg:mb-0" style="height: 60px; max-width: 100px" />
                    }
                    <!-- <img *ngIf="!user.hasCompanyLogo" src="assets/images/placeholder.png"
                                            class="mr-5 lg:mb-0" style="height:60px;max-width:100px" /> -->
@@ -40,7 +40,7 @@
              </div>
            </div>
          </div>
-          @if(historyService.canGoBack()){
+          @if(historyService.canGoBack){
          <p-button icon="pi pi-times" [rounded]="true" severity="danger" (click)="historyService.goBack()"></p-button>
          }
        </div>
@@ -121,7 +121,7 @@
                    <div class="p-3 border-1 surface-border border-round surface-card">
                      <div class="text-900 mb-2 flex align-items-center">
                        @if (listing.imageOrder?.length>0){
-                        <img src="pictures/property/{{ listing.imagePath }}/{{ listing.imageOrder[0] }}?_ts={{ ts }}" class="mr-3" style="width: 45px; height: 45px" />
+                        <img src="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ listing.imageOrder[0] }}?_ts={{ ts }}" class="mr-3" style="width: 45px; height: 45px" />
                        } @else {
                        <img src="assets/images/placeholder_properties.jpg" class="mr-3" style="width: 45px; height: 45px" />
                        }
--- a/bizmatch/src/app/pages/details/details-user/details-user.component.ts
+++ b/bizmatch/src/app/pages/details/details-user/details-user.component.ts
@@ -5,7 +5,7 @@ import { MessageService } from 'primeng/api';
 import { GalleriaModule } from 'primeng/galleria';
 import { Observable } from 'rxjs';
 import { BusinessListing, CommercialPropertyListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
-import { ListingCriteria } from '../../../../../../bizmatch-server/src/models/main.model';
+import { KeycloakUser, ListingCriteria } from '../../../../../../bizmatch-server/src/models/main.model';
 import { environment } from '../../../../environments/environment';
 import { HistoryService } from '../../../services/history.service';
 import { ImageService } from '../../../services/image.service';
@@ -25,7 +25,7 @@ import { SharedModule } from '../../../shared/shared/shared.module';
 export class DetailsUserComponent {
  private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
  user: User;
-  user$: Observable<User>;
+  user$: Observable<KeycloakUser>;
  environment = environment;
  criteria: ListingCriteria;
  businessListings: BusinessListing[];
@@ -33,6 +33,7 @@ export class DetailsUserComponent {
  companyOverview: SafeHtml;
  offeredServices: SafeHtml;
  ts = new Date().getTime();
+  env = environment;
  constructor(
    private activatedRoute: ActivatedRoute,
    private router: Router,