Hey {{ name }},
-You got an inquiry a
-- {{inquiry}} -
\ No newline at end of file diff --git a/bizmatch-server/dist/main.d.ts b/bizmatch-server/dist/main.d.ts deleted file mode 100644 index cb0ff5c..0000000 --- a/bizmatch-server/dist/main.d.ts +++ /dev/null @@ -1 +0,0 @@ -export {}; diff --git a/bizmatch-server/dist/models/main.model.d.ts b/bizmatch-server/dist/models/main.model.d.ts deleted file mode 100644 index 482cf85..0000000 --- a/bizmatch-server/dist/models/main.model.d.ts +++ /dev/null @@ -1,126 +0,0 @@ -export interface KeyValue { - name: string; - value: string; -} -export interface KeyValueStyle { - name: string; - value: string; - icon: string; - bgColorClass: string; - textColorClass: string; -} -export type SelectOption-
- @if (listing && (listing.listingsCategory==='business' || listing.listingsCategory==='professionals_brokers')){
+
-
Description{{listing?.description}}@@ -36,7 +36,7 @@
-
Located in-{{selectOptions.getLocation(listing.location)}}+{{selectOptions.getState(listing.state)}}
-
Asking Price@@ -63,7 +63,7 @@{{listing.brokerLicencing}}
}
- @if (listing && (listing.listingsCategory==='professionals_brokers')){
+
@if (listing && (listing.listingsCategory==='investment')){
-
Located in-{{selectOptions.getLocation(listing.location)}}+{{selectOptions.getState(listing.state)}}
-
EMaildiff --git a/bizmatch/src/app/pages/listings/listings.component.html b/bizmatch/src/app/pages/listings/listings.component.html index f607d06..b276f35 100644 --- a/bizmatch/src/app/pages/listings/listings.component.html +++ b/bizmatch/src/app/pages/listings/listings.component.html @@ -10,8 +10,8 @@ [style]="{ width: '100%'}">
-
-
}
@@ -94,17 +94,17 @@
Asking price: {{listing.price | currency}}
Sales revenue: {{listing.salesRevenue | currency}}
Net profit: {{listing.cashFlow | currency}}
-Location: {{selectOptions.getLocation(listing.location)}}
+Location: {{selectOptions.getState(listing.state)}}
Established: {{listing.established}}
} @if (listing.listingsCategory==='professionals_brokers'){ -Location: {{selectOptions.getLocation(listing.location)}}
+Location: {{selectOptions.getState(listing.state)}}
EMail: {{listing.email}}
Website: {{listing.website}}
} @if (listing.listingsCategory==='investment'){ -Location: {{selectOptions.getLocation(listing.location)}}
+Location: {{selectOptions.getState(listing.state)}}
EMail: {{listing.email}}
Website: {{listing.website}}
Phone Number: {{listing.phoneNumber}}
diff --git a/bizmatch/src/app/pages/listings/listings.component.ts b/bizmatch/src/app/pages/listings/listings.component.ts index 0d2c8a4..b192b27 100644 --- a/bizmatch/src/app/pages/listings/listings.component.ts +++ b/bizmatch/src/app/pages/listings/listings.component.ts @@ -34,9 +34,9 @@ export class ListingsComponent { maxPrice: string; minPrice: string; type:string; - locations = []; - locationsSet = new Set(); - location:string; + states = []; + statesSet = new Set(); + state:string; first: number = 0; rows: number = 12; totalRecords:number = 0; @@ -61,25 +61,25 @@ export class ListingsComponent { } async init(){ this.listings=await this.listingsService.getListings(this.criteria); - this.setLocations(); + this.setStates(); this.filteredListings=[...this.listings]; this.totalRecords=this.listings.length this.filteredListings=[...this.listings].splice(this.first,this.rows); this.cdRef.markForCheck(); this.cdRef.detectChanges(); } - setLocations(){ - this.locationsSet=new Set(); + setStates(){ + this.statesSet=new Set(); this.listings.forEach(l=>{ - if (l.location){ - this.locationsSet.add(l.location) + if (l.state){ + this.statesSet.add(l.state) } }) - this.locations = [...this.locationsSet].map((ls) =>({name:this.selectOptions.getLocation(ls as string),value:ls})) + this.states = [...this.statesSet].map((ls) =>({name:this.selectOptions.getState(ls as string),value:ls})) } async search() { this.listings= await this.listingsService.getListings(this.criteria); - this.setLocations(); + this.setStates(); this.totalRecords=this.listings.length this.filteredListings =[...this.listings].splice(this.first,this.rows); this.cdRef.markForCheck(); diff --git a/bizmatch/src/app/pages/subscription/account/account.component.html b/bizmatch/src/app/pages/subscription/account/account.component.html index 3927124..0a6c0ef 100644 --- a/bizmatch/src/app/pages/subscription/account/account.component.html +++ b/bizmatch/src/app/pages/subscription/account/account.component.html @@ -8,41 +8,90 @@
- =[];
uploadUrl:string;
maxFileSize=1000000;
- imageUrl:string;
- constructor(public userService: UserService, private subscriptionService: SubscriptionsService,private messageService: MessageService) {
+ companyLogoUrl:string;
+ profileUrl:string;
+ constructor(public userService: UserService,
+ private subscriptionService: SubscriptionsService,
+ private messageService: MessageService,
+ private geoService:GeoService,
+ public selectOptions:SelectOptionsService,
+ private cdref:ChangeDetectorRef) {
this.user=this.userService.getUser()
+
}
async ngOnInit(){
- this.imageUrl = `${environment.apiBaseUrl}/profile_${this.user.id}`
+ this.profileUrl = `${environment.apiBaseUrl}/profile_${this.user.id}`
+ this.companyLogoUrl = `${environment.apiBaseUrl}/profile_${this.user.id}`
this.userSubscriptions=await lastValueFrom(this.subscriptionService.getAllSubscriptions());
this.uploadUrl = `${environment.apiBaseUrl}/bizmatch/account/uploadPhoto/${this.user.id}`;
+ if (!this.user.licensedIn || this.user.licensedIn?.length===0){
+ this.user.licensedIn = [{name:'',value:''}]
+ }
+ this.user=await this.userService.getById(this.user.id);
}
printInvoice(invoice:Invoice){}
- updateProfile(user:User){
- this.messageService.add({ severity: 'warn', summary: 'Information', detail: 'This function is not yet available, please send an email to info@bizmatch.net for changes to your customer data', life: 15000 });
+
+ async updateProfile(user:User){
+ //this.messageService.add({ severity: 'warn', summary: 'Information', detail: 'This function is not yet available, please send an email to info@bizmatch.net for changes to your customer data', life: 15000 });
+ await this.userService.save(this.user);
}
- onUpload(event:any){
+
+
+ onUploadCompanyLogo(event:any){
const uniqueSuffix = '?_ts=' + new Date().getTime();
- this.imageUrl = `${environment.apiBaseUrl}/profile_${this.user.id}${uniqueSuffix}` //`http://IhrServer:Port/${newImagePath}${uniqueSuffix}`;
+ this.companyLogoUrl = `${environment.apiBaseUrl}/company_${this.user.id}${uniqueSuffix}` //`http://IhrServer:Port/${newImagePath}${uniqueSuffix}`;
+ }
+ onUploadProfilePicture(event:any){
+ const uniqueSuffix = '?_ts=' + new Date().getTime();
+ this.profileUrl = `${environment.apiBaseUrl}/profile_${this.user.id}${uniqueSuffix}` //`http://IhrServer:Port/${newImagePath}${uniqueSuffix}`;
}
setImageToFallback(event: Event) {
(event.target as HTMLImageElement).src = `/assets/images/placeholder.png`; // Pfad zum Platzhalterbild
}
+
+
+ suggestions: string[] | undefined;
+
+ async search(event: AutoCompleteCompleteEvent) {
+ const result = await lastValueFrom(this.geoService.findCitiesStartingWith(event.query))
+ this.suggestions = result.map(r=>`${r.city} - ${r.state_code}`).slice(0,5);
+ }
+ addLicence(){
+ this.user.licensedIn.push({name:'',value:''});
+ }
+ removeLicence(){
+ this.user.licensedIn.splice(this.user.licensedIn.length-2,1);
+ }
}
diff --git a/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.html b/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.html
index dd636cc..71a4ac9 100644
--- a/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.html
@@ -18,14 +18,6 @@
- @if (listing.listingsCategory==='business' || listing.listingsCategory==='professionals_brokers'){
-
+
-
-
+
+
You can only modify your email by contacting us at emailchange@bizmatch.net
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ @for (licensedIn of user.licensedIn; track licensedIn.value){
+
+
+
+ }
+
+
+
+
+
+
+
+
- Profile Picture
- ![]()
-
-
-
+
+ Company Logo
+ (is shown in every offer)
+ ![]()
+
+
+ Your Profile Picture
+ ![]()
+
Membership Level
diff --git a/bizmatch/src/app/pages/subscription/account/account.component.scss b/bizmatch/src/app/pages/subscription/account/account.component.scss
index 990c335..169cc11 100644
--- a/bizmatch/src/app/pages/subscription/account/account.component.scss
+++ b/bizmatch/src/app/pages/subscription/account/account.component.scss
@@ -6,4 +6,7 @@
padding: 1px 1px;
object-fit: contain;
}
-
\ No newline at end of file
+
+.wfull{
+ width: 100%;
+}
\ No newline at end of file
diff --git a/bizmatch/src/app/pages/subscription/account/account.component.ts b/bizmatch/src/app/pages/subscription/account/account.component.ts
index 6fff93a..ed5b8bd 100644
--- a/bizmatch/src/app/pages/subscription/account/account.component.ts
+++ b/bizmatch/src/app/pages/subscription/account/account.component.ts
@@ -1,4 +1,4 @@
-import { Component } from '@angular/core';
+import { ChangeDetectorRef, Component } from '@angular/core';
import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { InputTextModule } from 'primeng/inputtext';
@@ -23,7 +23,9 @@ import { lastValueFrom } from 'rxjs';
import { MessageService } from 'primeng/api';
import { environment } from '../../../../environments/environment';
import { FileUploadModule } from 'primeng/fileupload';
-import { Invoice, Subscription, User } from '../../../../../../common-models/src/main.model';
+import { AutoCompleteCompleteEvent, Invoice, Subscription, User } from '../../../../../../common-models/src/main.model';
+import { GeoService } from '../../../services/geo.service';
+import { ChangeDetectionStrategy } from '@angular/compiler';
@Component({
@@ -41,24 +43,58 @@ export class AccountComponent {
userSubscriptions:Array
-
- }
-
-
-
-
@@ -40,21 +32,22 @@
[style]="{ width: '100%'}">
}
-
-
-
+
+
+
- @if (listing.listingsCategory==='professionals_brokers'){
-
-
+
-
-
-
+
+
+
+
- }
- @if (listing.listingsCategory==='professionals_brokers' || listing.listingsCategory==='investment'){
+
-
-
-
-
-
-
-
-
-
+
-
-
-
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
-
-
+
+
+
-
-
+
+
+
+
+
+
+
+
-
+
+
+
}
+
+
+
+
@if (mode==='create'){
diff --git a/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.scss b/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.scss
index e69de29..4f09e5c 100644
--- a/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.scss
+++ b/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.scss
@@ -0,0 +1,3 @@
+.translate-y-5{
+ transform: translateY(5px);
+}
\ No newline at end of file
diff --git a/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.ts b/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.ts
index 93417f9..cbdd022 100644
--- a/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.ts
+++ b/bizmatch/src/app/pages/subscription/edit-listing/edit-listing.component.ts
@@ -25,7 +25,11 @@ import { ArrayToStringPipe } from '../../../pipes/array-to-string.pipe';
import { UserService } from '../../../services/user.service';
import { SharedModule } from '../../../shared/shared/shared.module';
import { MessageService } from 'primeng/api';
-import { BusinessListing, ListingType, User } from '../../../../../../common-models/src/main.model';
+import { AutoCompleteCompleteEvent, BusinessListing, ListingType, User } from '../../../../../../common-models/src/main.model';
+import { GeoResult, GeoService } from '../../../services/geo.service';
+
+
+
@Component({
selector: 'create-listing',
standalone: true,
@@ -43,7 +47,13 @@ export class EditListingComponent {
listing:ListingType = createGenericObject();
private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
user:User;
- constructor(public selectOptions:SelectOptionsService,private router: Router,private activatedRoute: ActivatedRoute,private listingsService:ListingsService,public userService: UserService,private messageService: MessageService){
+ constructor(public selectOptions:SelectOptionsService,
+ private router: Router,
+ private activatedRoute: ActivatedRoute,
+ private listingsService:ListingsService,
+ public userService: UserService,
+ private messageService: MessageService,
+ private geoService:GeoService){
this.user=this.userService.getUser();
// Abonniere Router-Events, um den aktiven Link zu ermitteln
this.router.events.subscribe(event => {
@@ -62,10 +72,10 @@ export class EditListingComponent {
this.listing.listingsCategory='business';
}
}
- updateSummary(value: string): void {
- const lines = value.split('\n');
- (this.listing).summary = lines.filter(l=>l.trim().length>0);
- }
+ // updateSummary(value: string): void {
+ // const lines = value.split('\n');
+ // (this.listing).summary = lines.filter(l=>l.trim().length>0);
+ // }
async update(id:string){
await this.listingsService.update(this.listing,this.listing.id);
this.messageService.add({ severity: 'info', summary: 'Confirmed', detail: 'Listing has been updated', life: 3000 });
@@ -74,4 +84,11 @@ export class EditListingComponent {
await this.listingsService.create(this.listing);
this.messageService.add({ severity: 'info', summary: 'Confirmed', detail: 'Listing has been created', life: 3000 });
}
+
+ suggestions: string[] | undefined;
+
+ async search(event: AutoCompleteCompleteEvent) {
+ const result = await lastValueFrom(this.geoService.findCitiesStartingWith(event.query,this.listing.state))//[...Array(5).keys()].map(item => event.query + '-' + item);
+ this.suggestions = result.map(r=>r.city).slice(0,5);
+ }
}
diff --git a/bizmatch/src/app/pages/subscription/favorites/favorites.component.html b/bizmatch/src/app/pages/subscription/favorites/favorites.component.html
index 3fe2393..16cd4bf 100644
--- a/bizmatch/src/app/pages/subscription/favorites/favorites.component.html
+++ b/bizmatch/src/app/pages/subscription/favorites/favorites.component.html
@@ -18,7 +18,7 @@
{{ listing.title }}
{{ selectOptions.getListingsCategory(listing.listingsCategory) }}
- {{ selectOptions.getLocation(listing.location) }}
+ {{ selectOptions.getState(listing.state) }}
diff --git a/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html b/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
index 479228c..26f655f 100644
--- a/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
@@ -20,7 +20,7 @@
{{ listing.title }}
{{ selectOptions.getListingsCategory(listing.listingsCategory) }}
- {{ selectOptions.getLocation(listing.location) }}
+ {{ selectOptions.getState(listing.location) }}
diff --git a/bizmatch/src/app/services/geo.service.ts b/bizmatch/src/app/services/geo.service.ts
new file mode 100644
index 0000000..8c36ac9
--- /dev/null
+++ b/bizmatch/src/app/services/geo.service.ts
@@ -0,0 +1,18 @@
+import { Injectable } from '@angular/core';
+import { environment } from '../../environments/environment';
+import { Observable } from 'rxjs';
+import { HttpClient } from '@angular/common/http';
+export interface GeoResult { city: string; state: string; state_code: string }
+@Injectable({
+ providedIn: 'root'
+})
+export class GeoService {
+
+ private apiBaseUrl = environment.apiBaseUrl;
+ constructor(private http: HttpClient) { }
+
+ findCitiesStartingWith(prefix:string, state?:string):Observable{
+ const stateString = state?`/${state}`:''
+ return this.http.get(`${this.apiBaseUrl}/bizmatch/geo/${prefix}${stateString}`);
+ }
+}
diff --git a/bizmatch/src/app/services/select-options.service.ts b/bizmatch/src/app/services/select-options.service.ts
index 681166c..f27404a 100644
--- a/bizmatch/src/app/services/select-options.service.ts
+++ b/bizmatch/src/app/services/select-options.service.ts
@@ -20,7 +20,7 @@ export class SelectOptionsService {
this.prices = allSelectOptions.prices;
this.listingCategories = allSelectOptions.listingCategories;
this.categories = allSelectOptions.categories;
- this.locations = allSelectOptions.locations;
+ this.states = allSelectOptions.locations;
}
public typesOfBusiness: Array;
@@ -30,10 +30,10 @@ export class SelectOptionsService {
public categories: Array;
- public locations: Array;
+ public states: Array;
- getLocation(value:string):string{
- return this.locations.find(l=>l.value===value)?.name
+ getState(value:string):string{
+ return this.states.find(l=>l.value===value)?.name
}
getBusiness(value:string):string{
diff --git a/bizmatch/src/app/services/user.service.ts b/bizmatch/src/app/services/user.service.ts
index d0c2e69..ec91b26 100644
--- a/bizmatch/src/app/services/user.service.ts
+++ b/bizmatch/src/app/services/user.service.ts
@@ -1,20 +1,25 @@
import { Injectable, Signal, WritableSignal, computed, effect, signal } from '@angular/core';
import { Component } from '@angular/core';
import { jwtDecode } from 'jwt-decode';
-import { Observable, distinctUntilChanged, filter, from, map } from 'rxjs';
+import { Observable, distinctUntilChanged, filter, from, lastValueFrom, map } from 'rxjs';
import { CommonModule } from '@angular/common';
import { KeycloakService } from './keycloak.service';
import { JwtToken, User } from '../../../../common-models/src/main.model';
+import { environment } from '../../environments/environment';
+import { HttpClient } from '@angular/common/http';
@Injectable({
providedIn: 'root'
})
export class UserService {
-
+ private apiBaseUrl = environment.apiBaseUrl;
+ // -----------------------------
+ // Keycloak services
+ // -----------------------------
private user$ = new Observable();
private user:User
public $isLoggedIn : Signal;
- constructor(public keycloak:KeycloakService){
+ constructor(public keycloak:KeycloakService,private http: HttpClient){
this.user$ = from(this.keycloak.getToken()).pipe(
filter(t => !!t),
distinctUntilChanged(),
@@ -50,15 +55,12 @@ export class UserService {
const token = await this.keycloak.getToken();
this.user = this.map2User(token);
}
- getUserName(){
- return this.user?.username
- }
+
private map2User(jwt:string):User{
const token = jwtDecode(jwt);
return {
id:token.user_id,
- username:token.preferred_username,
firstname:token.given_name,
lastname:token.family_name,
email:token.email
@@ -91,4 +93,14 @@ export class UserService {
register(url:string){
this.keycloak.register({redirectUri:url});
}
+
+ // -----------------------------
+ // Redis services
+ // -----------------------------
+ async save(user:User):Promise{
+ return await lastValueFrom(this.http.post(`${this.apiBaseUrl}/bizmatch/user`,user));
+ }
+ async getById(id:string):Promise{
+ return await lastValueFrom(this.http.get(`${this.apiBaseUrl}/bizmatch/user/${id}`));
+ }
}
diff --git a/bizmatch/src/app/shared/shared/shared.module.ts b/bizmatch/src/app/shared/shared/shared.module.ts
index 1b8a3ff..756d8ae 100644
--- a/bizmatch/src/app/shared/shared/shared.module.ts
+++ b/bizmatch/src/app/shared/shared/shared.module.ts
@@ -20,14 +20,15 @@ import { InputNumberModule } from 'primeng/inputnumber';
import { ConfirmDialogModule } from 'primeng/confirmdialog';
import { ConfirmPopupModule } from 'primeng/confirmpopup';
import { ToastModule } from 'primeng/toast';
-
+import { AutoCompleteModule } from 'primeng/autocomplete';
+import { InputSwitchModule } from 'primeng/inputswitch';
@NgModule({
declarations: [],
imports: [
- CommonModule, StyleClassModule, DividerModule,ButtonModule, TableModule, InputTextModule, DropdownModule, FormsModule, ChipModule,InputTextareaModule, RouterModule,FontAwesomeModule,MenuAccountComponent,InputNumberModule,ConfirmDialogModule,ConfirmPopupModule, ToastModule, CheckboxModule
+ CommonModule, StyleClassModule, DividerModule,ButtonModule, TableModule, InputTextModule, DropdownModule, FormsModule, ChipModule,InputTextareaModule, RouterModule,FontAwesomeModule,MenuAccountComponent,InputNumberModule,ConfirmDialogModule,ConfirmPopupModule, ToastModule, CheckboxModule, AutoCompleteModule,InputSwitchModule
],
exports:[
- CommonModule, StyleClassModule, DividerModule,ButtonModule, TableModule, InputTextModule, DropdownModule, FormsModule, ChipModule,InputTextareaModule,RouterModule,FontAwesomeModule,MenuAccountComponent,InputNumberModule,ConfirmDialogModule,ConfirmPopupModule, ToastModule, CheckboxModule
+ CommonModule, StyleClassModule, DividerModule,ButtonModule, TableModule, InputTextModule, DropdownModule, FormsModule, ChipModule,InputTextareaModule,RouterModule,FontAwesomeModule,MenuAccountComponent,InputNumberModule,ConfirmDialogModule,ConfirmPopupModule, ToastModule, CheckboxModule, AutoCompleteModule, TagModule,InputSwitchModule
]
})
export class SharedModule { }
diff --git a/common-models/src/main.model.ts b/common-models/src/main.model.ts
index e814b55..7925cb3 100644
--- a/common-models/src/main.model.ts
+++ b/common-models/src/main.model.ts
@@ -18,24 +18,30 @@ export interface Listing {
userId: string;
title: string;
description: Array;
- location: string;//enum
+ country: string;
+ city: string,
+ state: string;//enum
favoritesForUser:Array;
hideImage?:boolean;
+ draft?:boolean;
created:Date;
updated:Date;
}
export interface BusinessListing extends Listing {
listingsCategory: 'business'; //enum
- summary: Array;
+ // summary: Array;
type: string; //enum
price?: number;
realEstateIncluded?: boolean;
+ leasedLocation?:boolean;
+ franchiseResale?:boolean;
salesRevenue?: number;
cashFlow?: number;
- netProfit?: number;
- inventory?: string;
+ // netProfit?: number;
+ supportAndTraining?: string;
employees?: number;
established?: number;
+ internalListingNumber?:number;
reasonForSale?: string;
brokerLicencing?: string;
internals?: string;
@@ -68,13 +74,22 @@ export interface ListingCriteria {
listingsCategory:'business'|'professionals_brokers'|'investment',
category:'professional|broker'
}
-export interface User {
+export interface UserBase {
id: string;
- username: string;
firstname: string;
lastname: string;
email: string;
+ phoneNumber?: string;
+ companyOverview?:string;
+ companyWebsite?:string;
+ companyLocation?:string;
+ offeredServices?:string;
+ areasServed?:string;
}
+export interface User extends UserBase {
+ licensedIn?:KeyValue[];
+}
+
export interface Subscription {
id: string;
userId:string
@@ -126,4 +141,8 @@ export interface PageEvent {
rows: number;
page: number;
pageCount: number;
-}
\ No newline at end of file
+}
+export interface AutoCompleteCompleteEvent {
+ originalEvent: Event;
+ query: string;
+ }
\ No newline at end of file