@if(listing && user && (user.id===listing?.userId || isAdmin())){
}
diff --git 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
index 0d20b84..9ee3b87 100644
--- 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 });
}
diff --git 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
index f2aa1f3..0265946 100644
--- 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 @@
diff --git a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.scss b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.scss
index 57253e1..3ea0761 100644
--- a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.scss
+++ b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.scss
@@ -1,23 +1,26 @@
#sky-line {
- background-image: url(../../../../assets/images/bw-sky.jpg);
- height: 204px;
- background-position: bottom;
- background-size: cover;
- margin-bottom: -1px;
+ background-image: url(../../../../assets/images/bw-sky.jpg);
+ height: 204px;
+ background-position: bottom;
+ background-size: cover;
+ margin-bottom: -1px;
}
-.search{
- background-color: #343F69;
+.search {
+ background-color: #343f69;
}
::ng-deep p-paginator div {
- background-color: var(--surface-200) !important;
- // background-color: var(--surface-400) !important;
+ background-color: var(--surface-200) !important;
+ // background-color: var(--surface-400) !important;
}
.rounded-image {
- border-radius: 6px;
- // width: 100px;
- max-width: 100px;
- height: 45px;
- border: 1px solid rgba(0,0,0,0.2);
- padding: 1px 1px;
- object-fit: contain;
-}
\ No newline at end of file
+ border-radius: 6px;
+ // width: 100px;
+ max-width: 100px;
+ height: 45px;
+ border: 1px solid rgba(0, 0, 0, 0.2);
+ padding: 1px 1px;
+ object-fit: contain;
+}
+::ng-deep span.p-button-label {
+ font-weight: 500;
+}
diff --git a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.ts b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.ts
index f8601c1..c5a003e 100644
--- a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.ts
+++ b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.ts
@@ -6,10 +6,12 @@ import onChange from 'on-change';
import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { DropdownModule } from 'primeng/dropdown';
+import { InputGroupModule } from 'primeng/inputgroup';
import { InputTextModule } from 'primeng/inputtext';
import { PaginatorModule } from 'primeng/paginator';
import { StyleClassModule } from 'primeng/styleclass';
import { ToggleButtonModule } from 'primeng/togglebutton';
+import { TooltipModule } from 'primeng/tooltip';
import { BusinessListing } from '../../../../../../bizmatch-server/src/models/db.model';
import { ListingCriteria, ListingType } from '../../../../../../bizmatch-server/src/models/main.model';
import { environment } from '../../../../environments/environment';
@@ -21,7 +23,21 @@ import { createGenericObject, getCriteriaStateObject, getSessionStorageHandler }
@Component({
selector: 'app-business-listings',
standalone: true,
- imports: [CommonModule, StyleClassModule, ButtonModule, CheckboxModule, InputTextModule, DropdownModule, FormsModule, StyleClassModule, ToggleButtonModule, RouterModule, PaginatorModule],
+ imports: [
+ CommonModule,
+ StyleClassModule,
+ ButtonModule,
+ CheckboxModule,
+ InputTextModule,
+ DropdownModule,
+ FormsModule,
+ StyleClassModule,
+ ToggleButtonModule,
+ RouterModule,
+ PaginatorModule,
+ InputGroupModule,
+ TooltipModule,
+ ],
templateUrl: './business-listings.component.html',
styleUrl: './business-listings.component.scss',
})
@@ -36,10 +52,10 @@ export class BusinessListingsComponent {
type: string;
states = [];
state: string;
- first: number = 0;
- rows: number = 12;
totalRecords: number = 0;
ts = new Date().getTime();
+ first: number = 0;
+ rows: number = 12;
public category: 'business' | 'commercialProperty' | 'professionals_brokers' | undefined;
constructor(
@@ -56,7 +72,6 @@ export class BusinessListingsComponent {
this.activatedRoute.params.subscribe(params => {
if (this.activatedRoute.snapshot.fragment === '') {
this.criteria = onChange(createGenericObject
(), getSessionStorageHandler);
- this.first = 0;
}
this.category = (params).type;
this.init();
@@ -68,6 +83,11 @@ export class BusinessListingsComponent {
this.states = statesResult.map(s => s.state).map(ls => ({ name: this.selectOptions.getState(ls as string), value: ls }));
this.search();
}
+ refine() {
+ this.criteria.start = 0;
+ this.criteria.page = 0;
+ this.search();
+ }
async search() {
const listingReponse = await this.listingsService.getListings(this.criteria, 'business');
this.listings = listingReponse.data;
@@ -85,4 +105,7 @@ export class BusinessListingsComponent {
imageErrorHandler(listing: ListingType) {
// listing.hideImage = true; // Bild ausblenden, wenn es nicht geladen werden kann
}
+ reset() {
+ this.criteria.title = null;
+ }
}
diff --git a/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html b/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
index 6ada800..872eabb 100644
--- a/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
+++ b/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
@@ -5,8 +5,31 @@
-
}
@@ -121,7 +122,7 @@
diff --git a/bizmatch/src/app/pages/subscription/account/account.component.ts b/bizmatch/src/app/pages/subscription/account/account.component.ts
index f7fa798..f74b8f7 100644
--- a/bizmatch/src/app/pages/subscription/account/account.component.ts
+++ b/bizmatch/src/app/pages/subscription/account/account.component.ts
@@ -57,17 +57,25 @@ export class AccountComponent {
public dialogService: DialogService,
) {}
async ngOnInit() {
- const email = this.userService.getUser().email;
- this.user = await this.userService.getByMail(email);
- this.userLicensedIn = this.user.licensedIn.map(l => {
- return { name: l.split('|')[0], value: l.split('|')[1] };
- });
+ const keycloakUser = this.userService.getKeycloakUser();
+ const email = keycloakUser.email;
+ try {
+ this.user = await this.userService.getByMail(email);
+ } catch (e) {
+ this.user = { email, firstname: keycloakUser.firstname, lastname: keycloakUser.lastname };
+ this.user = await this.userService.save(this.user);
+ }
+ this.userLicensedIn = this.user.licensedIn
+ ? this.user.licensedIn.map(l => {
+ return { name: l.split('|')[0], value: l.split('|')[1] };
+ })
+ : [];
this.userSubscriptions = await lastValueFrom(this.subscriptionService.getAllSubscriptions());
if (!this.user.licensedIn || this.user.licensedIn?.length === 0) {
this.user.licensedIn = [''];
}
- this.profileUrl = this.user.hasProfile ? `${environment.apiBaseUrl}/profile/${this.user.id}.avif` : `/assets/images/placeholder.png`;
- this.companyLogoUrl = this.user.hasCompanyLogo ? `${environment.apiBaseUrl}/logo/${this.user.id}.avif` : `/assets/images/placeholder.png`;
+ this.profileUrl = this.user.hasProfile ? `profile/${this.user.id}.avif` : `/assets/images/placeholder.png`;
+ this.companyLogoUrl = this.user.hasCompanyLogo ? `logo/${this.user.id}.avif` : `/assets/images/placeholder.png`;
}
printInvoice(invoice: Invoice) {}
diff --git a/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html b/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html
index 44121c1..8e86c8f 100644
--- a/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html
@@ -36,16 +36,7 @@