aknuth
/
bizmatch-project
1
0
Fork 0
Code Issues 7 Pull Requests Packages Projects 5 Releases Wiki Activity

Compare commits

base: aknuth:timo
Branches Tags
aknuth:master
aknuth:timo
aknuth:bizmatch
aknuth:noKeycloak
aknuth:tailwind
aknuth:auth
aknuth:postgres
aknuth:primeng
..
compare: aknuth:master
Branches Tags
aknuth:timo
aknuth:master
aknuth:bizmatch
aknuth:noKeycloak
aknuth:tailwind
aknuth:auth
aknuth:postgres
aknuth:primeng

1 Commits
timo ... master

Author SHA1 Message Date
Andreas Knuth c2d7a53039 dfg 2025-11-30 12:20:01 -06:00
142 changed files with 2700 additions and 11003 deletions
Show Stats Expand all files Collapse all files

32
.claude/settings.local.json
View File

@ -1,32 +0,0 @@
{
"permissions": {
"allow": [
"Bash(npm install)",
"Bash(docker ps:*)",
"Bash(docker cp:*)",
"Bash(docker exec:*)",
"Bash(find:*)",
"Bash(docker restart:*)",
"Bash(npm run build)",
"Bash(rm:*)",
"Bash(npm audit fix:*)",
"Bash(sudo chown:*)",
"Bash(chmod:*)",
"Bash(npm audit:*)",
"Bash(npm view:*)",
"Bash(npm run build:ssr:*)",
"Bash(pkill:*)",
"WebSearch",
"Bash(lsof:*)",
"Bash(xargs:*)",
"Bash(curl:*)",
"Bash(grep:*)",
"Bash(cat:*)",
"Bash(NODE_ENV=development npm run build:ssr:*)",
"Bash(ls:*)",
"WebFetch(domain:angular.dev)",
"Bash(killall:*)",
"Bash(echo:*)"
]
}
}

647
CHANGES.md
View File

@ -1,647 +0,0 @@
# Changelog - BizMatch Project
Dokumentation aller wichtigen Änderungen am BizMatch-Projekt. Diese Datei listet Feature-Implementierungen, Bugfixes, Datenbank-Migrationen und architektonische Verbesserungen auf.
---
## Inhaltsverzeichnis
1. [Datenbank-Änderungen](#1-datenbank-änderungen)
2. [Backend-Änderungen](#2-backend-änderungen)
3. [Frontend-Änderungen](#3-frontend-änderungen)
4. [SEO-Verbesserungen](#4-seo-verbesserungen)
5. [Code-Cleanup & Wartung](#5-code-cleanup--wartung)
6. [Bekannte Issues & Workarounds](#6-bekannte-issues--workarounds)
---
## 1) Datenbank-Änderungen
### 1.1 Schema-Migration: JSON-basierte Speicherung
**Datum:** November 2025
**Status:** ✅ Abgeschlossen
#### Zusammenfassung der Änderungen
Die Datenbank wurde von einem **relationalen Schema** zu einem **JSON-basierten Schema** migriert. Dies bedeutet:
- ✅ **Neue Tabellen wurden erstellt** (`users_json`, `businesses_json`, `commercials_json`)
- ❌ **Alte Tabellen wurden NICHT gelöscht** (`users`, `businesses`, `commercials` existieren noch)
- ✅ **Alle Daten wurden migriert** (kopiert von alten zu neuen Tabellen)
- ✅ **Anwendung nutzt ausschließlich neue Tabellen** (alte Tabellen dienen nur als Backup)
#### Detaillierte Tabellenstruktur
**ALTE Tabellen (nicht mehr in Verwendung, aber noch vorhanden):**
```sql
-- users (relational)
CREATE TABLE users (
id UUID PRIMARY KEY,
email VARCHAR(255),
firstname VARCHAR(100),
lastname VARCHAR(100),
phone VARCHAR(50),
location_name VARCHAR(255),
location_state VARCHAR(2),
location_latitude FLOAT,
location_longitude FLOAT,
customer_type VARCHAR(50),
customer_sub_type VARCHAR(50),
show_in_directory BOOLEAN,
created TIMESTAMP,
updated TIMESTAMP,
-- ... weitere 20+ Spalten
);
-- businesses (relational)
CREATE TABLE businesses (
id UUID PRIMARY KEY,
email VARCHAR(255),
title VARCHAR(500),
asking_price DECIMAL,
established INTEGER,
revenue DECIMAL,
cash_flow DECIMAL,
-- ... weitere 30+ Spalten für alle Business-Eigenschaften
);
-- commercials (relational)
CREATE TABLE commercials (
id UUID PRIMARY KEY,
email VARCHAR(255),
title VARCHAR(500),
asking_price DECIMAL,
property_type VARCHAR(100),
-- ... weitere 25+ Spalten für alle Property-Eigenschaften
);
```
**NEUE Tabellen (aktuell in Verwendung):**
```sql
-- users_json (JSON-basiert)
CREATE TABLE users_json (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
email VARCHAR(255) UNIQUE NOT NULL,
data JSONB NOT NULL
);
-- businesses_json (JSON-basiert)
CREATE TABLE businesses_json (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
email VARCHAR(255) NOT NULL,
data JSONB NOT NULL
);
-- commercials_json (JSON-basiert)
CREATE TABLE commercials_json (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
email VARCHAR(255) NOT NULL,
data JSONB NOT NULL
);
```
#### Was wurde NICHT geändert
**❌ Folgende Dinge wurden NICHT geändert:**
1. **Alte Tabellen existieren weiterhin** - Sie wurden nicht gelöscht, um als Backup zu dienen
2. **Datenbank-Name** - Weiterhin `bizmatch` (keine Änderung)
3. **Datenbank-User** - Weiterhin `bizmatch` (keine Änderung)
4. **Datenbank-Passwort** - Keine Änderung
5. **Datenbank-Port** - Weiterhin `5432` (keine Änderung)
6. **Docker-Container-Name** - Weiterhin `bizmatchdb` (keine Änderung)
7. **Indices** - PostgreSQL JSONB-Indices wurden automatisch erstellt
#### Was wurde geändert
**✅ Folgende Dinge wurden geändert:**
1. **Anwendungs-Code verwendet nur noch neue Tabellen:**
- Backend liest/schreibt nur noch in `users_json`, `businesses_json`, `commercials_json`
- Drizzle ORM Schema wurde aktualisiert (`bizmatch-server/src/drizzle/schema.ts`)
- Alle Services wurden angepasst (user.service.ts, business-listing.service.ts, etc.)
2. **Datenstruktur in JSONB-Spalten:**
- Alle Felder, die vorher einzelne Spalten waren, sind jetzt in der `data`-Spalte als JSON
- Nested Objects möglich (z.B. `location` mit `name`, `state`, `latitude`, `longitude`)
- Arrays direkt im JSON speicherbar (z.B. `imageOrder`, `areasServed`)
3. **Query-Syntax:**
- Statt `WHERE firstname = 'John'` → `WHERE (data->>'firstname') = 'John'`
- Statt `WHERE location_state = 'TX'` → `WHERE (data->'location'->>'state') = 'TX'`
- Haversine-Formel für Radius-Suche nutzt jetzt JSON-Pfade
#### Beispiel: User-Datensatz Vorher/Nachher
**VORHER (relationale Tabelle `users`):**
| id | email | firstname | lastname | phone | location_name | location_state | location_latitude | location_longitude | customer_type | customer_sub_type | show_in_directory | created | updated |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| abc-123 | john@example.com | John | Doe | +1-555-0123 | Austin | TX | 30.2672 | -97.7431 | professional | broker | true | 2025-11-01 | 2025-11-25 |
**NACHHER (JSON-Tabelle `users_json`):**
| id | email | data (JSONB) |
|---|---|---|
| abc-123 | john@example.com | `{"firstname": "John", "lastname": "Doe", "phone": "+1-555-0123", "location": {"name": "Austin", "state": "TX", "latitude": 30.2672, "longitude": -97.7431}, "customerType": "professional", "customerSubType": "broker", "showInDirectory": true, "created": "2025-11-01T10:00:00Z", "updated": "2025-11-25T15:30:00Z"}` |
#### Vorteile der neuen Struktur
- ✅ **Keine Schema-Migrationen mehr nötig** - Neue Felder einfach im JSON hinzufügen
- ✅ **Flexiblere Datenstrukturen** - Nested Objects und Arrays direkt speicherbar
- ✅ **Einfacheres ORM-Mapping** - TypeScript-Interfaces direkt zu JSON serialisierbar
- ✅ **Bessere Performance** - PostgreSQL JSONB ist indexierbar und schnell durchsuchbar
- ✅ **Reduzierte Code-Komplexität** - Weniger Join-Operationen, weniger Spalten-Mapping
#### Migration durchführen (Referenz)
Die Migration wurde bereits durchgeführt. Falls nötig, Backup-Prozess:
```bash
# 1. Backup der alten relationalen Tabellen
docker exec -it bizmatchdb \
pg_dump -U bizmatch -d bizmatch -t users -t businesses -t commercials \
-F c -Z 9 -f /tmp/backup_relational_tables.dump
# 2. Neue Tabellen sind bereits vorhanden und in Verwendung
# 3. Alte Tabellen können bei Bedarf gelöscht werden (NICHT empfohlen vor finalem Produktions-Test)
```
### 1.2 Location-Datenstruktur bei Professionals
**Datum:** November 2025
**Status:** ✅ Abgeschlossen
#### Problem
Professionals-Suche funktionierte nicht, da die Datenstruktur für `location` falsch angenommen wurde.
#### Lösung
- Professionals verwenden `location`-Objekt (nicht `areasServed`-Array)
- Struktur: `{ name: 'Austin', state: 'TX', latitude: 30.2672, longitude: -97.7431 }`
#### Betroffene Queries
- Exact City Search: `location.name` ILIKE-Vergleich
- Radius Search: Haversine-Formel mit `location.latitude` und `location.longitude`
---
## 2) Backend-Änderungen
### 2.1 Professionals Search Fix
**Datei:** `bizmatch-server/src/user/user.service.ts`
**Status:** ✅ Abgeschlossen
#### Änderungen
**Exact City Search (Zeile 28-30):**
```typescript
if (criteria.city && criteria.searchType === 'exact') {
whereConditions.push(sql`(${schema.users_json.data}->'location'->>'name') ILIKE ${criteria.city.name}`);
}
```
**Radius Search (Zeile 32-36):**
```typescript
if (criteria.city && criteria.radius && criteria.searchType === 'radius' && criteria.radius) {
const cityGeo = this.geoService.getCityWithCoords(criteria.state, criteria.city.name);
const distanceQuery = getDistanceQuery(schema.users_json, cityGeo.latitude, cityGeo.longitude);
whereConditions.push(sql`${distanceQuery} <= ${criteria.radius}`);
}
```
**State Filter (Zeile 55-57):**
```typescript
if (criteria.state) {
whereConditions.push(sql`(${schema.users_json.data}->'location'->>'state') = ${criteria.state}`);
}
```
**County Filter (Zeile 51-53):**
```typescript
if (criteria.counties && criteria.counties.length > 0) {
whereConditions.push(or(...criteria.counties.map(county =>
sql`(${schema.users_json.data}->'location'->>'county') ILIKE ${`%${county}%`}`
)));
}
```
### 2.2 TypeScript-Fehler behoben
**Problem:**
Kompilierungsfehler wegen falscher Parameter-Übergabe an `getDistanceQuery()`
**Lösung:**
- ❌ Alt: `getDistanceQuery(schema.users_json.data, 'location', lat, lon)`
- ✅ Neu: `getDistanceQuery(schema.users_json, lat, lon)`
### 2.3 Slug-Unterstützung für SEO-freundliche URLs
**Status:** ✅ Implementiert
Business- und Commercial-Property-Listings können nun über SEO-freundliche Slugs aufgerufen werden:
- `/business/austin-coffee-shop-for-sale` statt `/business/uuid-123-456`
- `/commercial-property/downtown-retail-space-dallas` statt `/commercial-property/uuid-789`
**Implementierung:**
- Automatische Slug-Generierung aus Listing-Titeln
- Slug-basierte Routen in allen Controllern
- Fallback auf ID, falls kein Slug vorhanden
---
## 3) Frontend-Änderungen
### 3.1 Breadcrumbs-Navigation
**Datum:** November 2025
**Status:** ✅ Abgeschlossen
#### Implementierte Komponenten
**Betroffene Seiten:**
- ✅ Business Detail Pages (`details-business-listing.component.ts`)
- ✅ Commercial Property Detail Pages (`details-commercial-property-listing.component.ts`)
- ✅ User Detail Pages (`details-user.component.ts`)
- ✅ 404 Not Found Page (`not-found.component.ts`)
- ✅ Business Listings Overview (`business-listings.component.ts`)
- ✅ Commercial Property Listings Overview (`commercial-property-listings.component.ts`)
**Beispiel-Struktur:**
```
Home > Commercial Properties > Austin Office Space for Sale
Home > Business Listings > Restaurant for Sale in Dallas
Home > 404 - Page Not Found
```
**Komponente:** `bizmatch/src/app/components/breadcrumbs/breadcrumbs.component.ts`
### 3.2 Automatische 50-Meilen-Radius-Auswahl
**Datum:** November 2025
**Status:** ✅ Abgeschlossen
#### Änderungen
Bei Auswahl einer Stadt in den Suchfiltern wird automatisch:
- **Search Type** auf `"radius"` gesetzt
- **Radius** auf `50` Meilen gesetzt
- Filter-UI aktualisiert (Radius-Feld aktiv und ausgefüllt)
**Betroffene Dateien:**
- `bizmatch/src/app/components/search-modal/search-modal.component.ts` (Business)
- `bizmatch/src/app/components/search-modal/search-modal-commercial.component.ts` (Properties)
- `bizmatch/src/app/components/search-modal/search-modal-broker.component.ts` (Professionals)
**Implementierung (Zeilen 255-269 in search-modal.component.ts):**
```typescript
setCity(city: any): void {
const updates: any = {};
if (city) {
updates.city = city;
updates.state = city.state;
// Automatically set radius to 50 miles and enable radius search
updates.searchType = 'radius';
updates.radius = 50;
} else {
updates.city = null;
updates.radius = null;
updates.searchType = 'exact';
}
this.updateCriteria(updates);
}
```
### 3.3 Error Handling Verbesserungen
**Betroffene Komponenten:**
- `details-business-listing.component.ts`
- `details-commercial-property-listing.component.ts`
**Änderungen:**
- ✅ Safe Navigation für `listing.imageOrder` (Null-Check vor forEach)
- ✅ Verbesserte Error-Message-Extraktion mit Optional Chaining
- ✅ Default-Breadcrumbs auch bei Fehlerfall
- ✅ Korrekte Navigation zu 404-Seite bei fehlenden Listings
**Beispiel (Zeile 139 in details-commercial-property-listing.component.ts):**
```typescript
if (this.listing.imageOrder && Array.isArray(this.listing.imageOrder)) {
this.listing.imageOrder.forEach(image => {
const imageURL = `${this.env.imageBaseUrl}/pictures/property/${this.listing.imagePath}/${this.listing.serialId}/${image}`;
this.images.push(new ImageItem({ src: imageURL, thumb: imageURL }));
});
}
```
### 3.4 Business Location Privacy - Stadt-Grenze statt exakter Adresse
**Datum:** November 2025
**Status:** ✅ Abgeschlossen
#### Problem & Motivation
Bei Business-Listings für verkaufende Unternehmen sollte die **exakte Adresse nicht öffentlich angezeigt** werden, um:
- ✅ Konkurrierende Unternehmen nicht zu informieren
- ✅ Kunden nicht zu verunsichern
- ✅ Mitarbeiter vor Verunsicherung zu schützen
Nur die **ungefähre Stadt-Region** soll angezeigt werden. Die genaue Adresse wird erst nach Kontaktaufnahme mitgeteilt.
#### Implementierung
**Betroffene Dateien:**
- `bizmatch/src/app/services/geo.service.ts` - Neue Methode `getCityBoundary()`
- `bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts` - Override von Map-Methoden
**Unterschied: Business vs. Commercial Property**
| Listing-Typ | Map-Anzeige | Adresse-Anzeige | Begründung |
|---|---|---|---|
| **Business Listings** | Stadt-Grenze (rotes Polygon) | Nur Stadt, County, State | Privacy: Verkäufer-Schutz |
| **Commercial Properties** | Exakter Pin-Marker | Vollständige Straßenadresse | Immobilie muss sichtbar sein |
**Technische Umsetzung:**
1. **Nominatim API Integration** ([geo.service.ts:33-37](bizmatch/src/app/services/geo.service.ts#L33-L37)):
```typescript
getCityBoundary(cityName: string, state: string): Observable<any> {
const query = `${cityName}, ${state}, USA`;
let headers = new HttpHeaders().set('X-Hide-Loading', 'true').set('Accept-Language', 'en-US');
return this.http.get(`${this.baseUrl}?q=${encodeURIComponent(query)}&format=json&polygon_geojson=1&limit=1`, { headers });
}
```
2. **City Boundary Polygon** ([details-business-listing.component.ts:322-430](bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts#L322-L430)):
- Lädt Stadt-Grenz-Polygon von OpenStreetMap Nominatim API
- Zeigt rote Umrandung der Stadt (wie Google Maps)
- Unterstützt `Polygon` und `MultiPolygon` Geometrien
- **Fallback:** 8km-Radius-Kreis bei API-Fehler oder fehlenden Daten
3. **Karten-Konfiguration:**
```typescript
// Rotes Polygon (wie Google Maps)
const cityPolygon = polygon(latlngs, {
color: '#ef4444', // Rot
fillColor: '#ef4444', // Rot
fillOpacity: 0.1, // Sehr transparent (90% durchsichtig)
weight: 2 // Linienstärke
});
// Popup zeigt nur allgemeine Information
cityPolygon.bindPopup(`
<div style="padding: 8px;">
<strong>General Area:</strong><br/>
${cityName}, ${county ? county + ', ' : ''}${state}<br/>
<small style="color: #666;">City boundary shown for privacy.<br/>Exact location provided after contact.</small>
</div>
`);
```
4. **Address Control Override:**
- Zeigt nur: "Austin, Travis County, TX"
- **NICHT** angezeigt: Straßenname, Hausnummer, PLZ
5. **OpenStreetMap Link Override:**
- Zoom-Level 11 (Stadt-Ansicht) statt Zoom-Level 15 (Straßen-Ansicht)
- Keine Marker auf exakter Position
**Entwicklungs-Verlauf (Entscheidungen):**
| Ansatz | Grund für Ablehnung | Status |
|---|---|---|
| 2km Fuzzy-Radius | Zu klein - bei wenigen Businesses in Stadt identifizierbar | ❌ Abgelehnt |
| County-Level | Zu groß - schlechte UX, schlechtes SEO | ❌ Abgelehnt |
| Stadt-Center + 8km-Kreis | Funktioniert, aber nicht professionell aussehend | ⚠️ Fallback |
| **Stadt-Grenz-Polygon (wie Google Maps)** | Professionell, präzise, gute Privacy | ✅ **Implementiert** |
**Vorteile der Lösung:**
- ✅ **Privacy by Design** - Exakte Location nicht sichtbar
- ✅ **Professionelles Erscheinungsbild** - Wie Google Maps Stadt-Grenzen
- ✅ **Genaue Stadt-Darstellung** - Nutzt offizielle OSM-Daten
- ✅ **Robust** - Fallback auf Kreis bei API-Problemen
- ✅ **SEO-freundlich** - Stadt-Namen bleiben in Metadaten erhalten
- ✅ **Multi-Polygon Support** - Städte mit mehreren Bereichen (Inseln, etc.)
**Was NICHT geändert wurde:**
- ❌ **Commercial Property Listings** zeigen weiterhin exakte Adressen
- ❌ **User/Professional Locations** zeigen weiterhin Stadt-Pins
- ❌ **Datenbank** - Location-Daten bleiben unverändert gespeichert
- ❌ **Backend** - Keine API-Änderungen nötig
---
## 4) SEO-Verbesserungen
### 4.1 Meta-Tags & Structured Data
**Status:** ✅ Implementiert
**Neue SEO-Features:**
- ✅ Dynamische Title & Description für alle Listing-Seiten
- ✅ Open Graph Tags für Social Media Sharing
- ✅ JSON-LD Structured Data (Schema.org)
- ✅ Canonical URLs
- ✅ Noindex für 404-Seiten
**Implementierung:**
- `bizmatch/src/app/services/seo.service.ts`
- Automatische Meta-Tag-Generierung basierend auf Listing-Daten
### 4.2 Sitemap-Generierung
**Status:** ✅ Implementiert
**Endpunkte:**
- `/bizmatch/sitemap.xml` - Haupt-Sitemap (Index)
- `/bizmatch/sitemap/static.xml` - Statische Seiten
- `/bizmatch/sitemap/business-1.xml` - Business-Listings (paginiert)
- `/bizmatch/sitemap/commercial-1.xml` - Commercial-Properties (paginiert)
**Controller:** `bizmatch-server/src/sitemap/sitemap.controller.ts`
### 4.3 SEO-freundliche 404-Seite
**Datei:** `bizmatch/src/app/components/not-found/not-found.component.ts`
**Features:**
- ✅ Breadcrumbs für bessere Navigation
- ✅ `noindex` Meta-Tag (verhindert Indexierung)
- ✅ Aussagekräftige Title & Description
- ✅ Link zurück zur Homepage
---
## 5) Code-Cleanup & Wartung
### 5.1 Gelöschte temporäre Dateien
**Datum:** November 2025
**Status:** ✅ Abgeschlossen
**Markdown-Dokumentation (7 Dateien):**
- ❌ `DATABASE-FIX-INSTRUCTIONS.md`
- ❌ `DEPLOYMENT-GUIDE.md`
- ❌ `PROFESSIONALS-TAB-IMPLEMENTATION.md`
- ❌ `RESTART-BACKEND.md`
- ❌ `SEO-IMPROVEMENTS-SUMMARY.md`
- ❌ `bizmatch-server/SEO-DEPLOYMENT-SUCCESS.md`
- ❌ `bizmatch-server/TYPESCRIPT-FIX-SUMMARY.md`
**Shell-Scripts (33 Dateien):**
- ❌ Alle `.sh`-Dateien in `bizmatch-server/` (check-*, fix-*, test-*, run-*, setup-*, etc.)
**SQL-Test-Dateien (5 Dateien):**
- ❌ `create-schema.sql`
- ❌ `insert-professionals-json.sql`
- ❌ `insert-professionals-simple.sql`
- ❌ `insert-test-professionals.sql`
- ❌ `insert-test-professionals-fixed.sql`
**Debug-JavaScript (2 Dateien):**
- ❌ `check-db.js`
- ❌ `verify.js`
**Komplette Verzeichnisse:**
- ❌ `bizmatch-server/scripts/` (~13 Dateien)
- ❌ `bizmatch-server/src/scripts/` (~13 Dateien)
- ❌ `.claude/` (Verzeichnis)
**Gesamt:** ~75 temporäre Dateien und 3 Verzeichnisse entfernt
### 5.2 Beibehaltene Konfigurationsdateien
**✅ Wichtige Dateien (nicht gelöscht):**
- `README.md` (Projekt-Dokumentation)
- `bizmatch-server/README.md` (Server-Dokumentation)
- `.eslintrc.js` (Code-Style-Konfiguration)
- `docker-compose.yml` (Container-Konfiguration)
- `.gitignore` (Git-Konfiguration)
---
## 6) Bekannte Issues & Workarounds
### 6.1 Docker-Container-Neustart nach Code-Änderungen
**Problem:**
TypeScript-Kompilierungsfehler können dazu führen, dass der Backend-Container nicht startet.
**Lösung:**
```bash
# Container-Logs prüfen
docker logs bizmatch-app --tail 50
# Bei TypeScript-Fehlern: Container neu starten
docker restart bizmatch-app
# Prüfen, ob App erfolgreich gestartet ist
docker logs bizmatch-app | grep "Nest application successfully started"
```
### 6.2 Database Connection Issues
**Problem:**
`password authentication failed for user "bizmatch"`
**Lösung:**
Siehe [README.md - Abschnitt 4.1](README.md#41-password-authentication-failed-for-user-bizmatch)
### 6.3 Frontend Proxy-Fehler
**Problem:**
`http proxy error: /bizmatch/select-options` während Backend-Neustart
**Lösung:**
- Warten, bis Backend vollständig gestartet ist (~30 Sekunden)
- Frontend-Dev-Server bei Bedarf neu starten: `npm start`
---
## Migration-Guide: JSON-Schema
### Von relationaler DB zu JSON-Schema
**Beispiel: User-Daten**
**Alt (relationale Tabelle):**
```sql
CREATE TABLE users (
id UUID PRIMARY KEY,
email VARCHAR(255),
firstname VARCHAR(100),
lastname VARCHAR(100),
phone VARCHAR(50),
...
);
```
**Neu (JSON-Schema):**
```sql
CREATE TABLE users_json (
id UUID PRIMARY KEY DEFAULT gen_random_uuid(),
email VARCHAR(255),
data JSONB
);
```
**JSON-Struktur in `data`-Spalte:**
```json
{
"firstname": "John",
"lastname": "Doe",
"email": "john.doe@example.com",
"phone": "+1-555-0123",
"customerType": "professional",
"customerSubType": "broker",
"location": {
"name": "Austin",
"state": "TX",
"latitude": 30.2672,
"longitude": -97.7431
},
"showInDirectory": true,
"created": "2025-11-25T10:30:00Z",
"updated": "2025-11-25T10:30:00Z"
}
```
**Query-Beispiele:**
```sql
-- Alle Professionals in Texas finden
SELECT * FROM users_json
WHERE (data->>'customerType') = 'professional'
AND (data->'location'->>'state') = 'TX';
-- Nach Name suchen
SELECT * FROM users_json
WHERE (data->>'firstname') ILIKE '%John%';
-- Radius-Suche (50 Meilen um Austin)
SELECT * FROM users_json
WHERE (
3959 * 2 * ASIN(SQRT(
POWER(SIN((30.2672 - (data->'location'->>'latitude')::float) * PI() / 180 / 2), 2) +
COS(30.2672 * PI() / 180) * COS((data->'location'->>'latitude')::float * PI() / 180) *
POWER(SIN((-97.7431 - (data->'location'->>'longitude')::float) * PI() / 180 / 2), 2)
))
) <= 50;
```
---
## Support & Fragen
Bei Fragen zu diesen Änderungen:
1. README.md für Setup-Informationen konsultieren
2. Docker-Logs prüfen: `docker logs bizmatch-app` und `docker logs bizmatchdb`
3. Git-History für Details zu Änderungen durchsuchen
**Letzte Aktualisierung:** November 2025

27
DOCKER_SYNC_GUIDE.md
View File

@ -1,27 +0,0 @@
# Docker Code Sync Guide
If you have made changes to the backend code and they don't seem to take effect (even though the files on disk are updated), it's because the Docker container is running from a pre-compiled `dist/` directory.
### The Problem
The `bizmatch-app` container compiles the TypeScript code *only once* when the container starts. It does not automatically watch for changes and recompile while running.
### The Solution
You must restart or recreate the container to trigger a new build.
**Option 1: Quick Restart (Recommended)**
Run this in the `bizmatch-server` directory:
```bash
docker-compose restart app
```
**Option 2: Force Rebuild (If changes aren't picked up)**
If a simple restart doesn't work, use this to force a fresh build:
```bash
docker-compose up -d --build app
```
### Summary for Other Laptops
1. **Pull** the latest changes from Git.
2. **Execute** `docker-compose restart app`.
3. **Verify** the logs for the new `WARN` debug messages.
.

73
FINAL_SUMMARY.md
View File

@ -1,73 +0,0 @@
# Final Project Summary & Deployment Guide
## Recent Changes (Last 3 Git Pushes)
Here is a summary of the most recent activity on the repository:
1. **`e3e726d`** - Timo, 3 minutes ago
* **Message**: `feat: Initialize BizMatch application with core UI components, routing, listing pages, backend services, migration scripts, and vulnerability management.`
* **Impact**: Major initialization of the application structure, including core features and security baselines.
2. **`e32e43d`** - Timo, 10 hours ago
* **Message**: `docs: Add comprehensive deployment guide for BizMatch project.`
* **Impact**: Added documentation for deployment procedures.
3. **`b52e47b`** - Timo, 10 hours ago
* **Message**: `feat: Initialize Angular SSR application with core pages, components, and server setup.`
* **Impact**: Initial naming and setup of the Angular SSR environment.
---
## Deployment Instructions
### 1. Prerequisites
* **Node.js**: Version **20.x** or higher is recommended.
* **Package Manager**: `npm`.
### 2. Building for Production (SSR)
The application is configured for **Angular SSR (Server-Side Rendering)**. You must build the application specifically for this mode.
**Steps:**
1. Navigate to the project directory:
```bash
cd bizmatch
```
2. Install dependencies:
```bash
npm install
```
3. Build the project:
```bash
npm run build:ssr
```
* This command executes `node version.js` (to update build versions) and then `ng build --configuration prod`.
* Output will be generated in `dist/bizmatch/browser` and `dist/bizmatch/server`.
### 3. Running the Application
To start the production server:
```bash
npm run serve:ssr
```
* **Entry Point**: `dist/bizmatch/server/server.mjs`
* **Port**: The server listens on `process.env.PORT` or defaults to **4200**.
### 4. Critical Deployment Checks (SSR & Polyfills)
**⚠️ IMPORTANT:**
The application uses a custom **DOM Polyfill** to support third-party libraries that might rely on browser-specific objects (like `window`, `document`) during server-side rendering.
* **Polyfill Location**: `src/ssr-dom-polyfill.ts`
* **Server Verification**: Open `server.ts` and ensure the polyfill is imported **BEFORE** any other imports:
```typescript
// IMPORTANT: DOM polyfill must be imported FIRST
import './src/ssr-dom-polyfill';
```
* **Why is this important?**
If this import is removed or moved down, you may encounter `ReferenceError: window is not defined` or `document is not defined` errors when the server tries to render pages containing Leaflet maps or other browser-only libraries.
### 5. Environment Variables & Security
* Ensure all necessary environment variables (e.g., Database URLs, API Keys) are configured in your deployment environment.
* Since `server.ts` is an Express app, you can extend it to handle specialized headers or proxy configurations if needed.
### 6. Vulnerability Status
* Please refer to `FINAL_VULNERABILITY_STATUS.md` for the most recent security audit and known issues.

210
FINAL_VULNERABILITY_STATUS.md
View File

@ -1,210 +0,0 @@
# Final Vulnerability Status - BizMatch Project
**Updated**: 2026-01-03
**Status**: Production-Ready ✅
---
## 📊 Current Vulnerability Count
### bizmatch-server
- **Total**: 41 vulnerabilities
- **Critical**: 0 ❌
- **High**: 33 (all mjml-related, NOT USED) ✅
- **Moderate**: 7 (dev tools only) ✅
- **Low**: 1 ✅
### bizmatch (Frontend)
- **Total**: 10 vulnerabilities
- **Moderate**: 10 (dev tools + legacy dependencies) ✅
- **All are acceptable for production** ✅
---
## ✅ What Was Fixed
### Backend (bizmatch-server)
1. ✅ **nodemailer** 6.9 → 7.0.12 (Fixed 3 DoS vulnerabilities)
2. ✅ **firebase** 11.3 → 11.9 (Fixed undici vulnerabilities)
3. ✅ **drizzle-kit** 0.23 → 0.31 (Fixed esbuild dev vulnerability)
### Frontend (bizmatch)
1. ✅ **Angular 18 → 19** (Fixed 17 XSS vulnerabilities)
2. ✅ **@angular/fire** 18.0 → 19.2 (Angular 19 compatibility)
3. ✅ **zone.js** 0.14 → 0.15 (Angular 19 requirement)
---
## ⚠️ Remaining Vulnerabilities (ACCEPTABLE)
### bizmatch-server: 33 High (mjml-related)
**Package**: `@nestjs-modules/mailer` depends on `mjml`
**Why These Are Safe**:
```typescript
// mail.module.ts uses Handlebars, NOT MJML!
template: {
adapter: new HandlebarsAdapter({...}), // ← Using Handlebars
// MJML is NOT used anywhere in the code
}
```
**Vulnerabilities**:
- `html-minifier` (ReDoS) - via mjml
- `mjml-*` packages (33 packages) - NOT USED
- `glob` 10.x (Command Injection) - via mjml
- `preview-email` - via mjml
**Mitigation**:
- ✅ MJML is never called in production code
- ✅ Only Handlebars templates are used
- ✅ These packages are dead code in node_modules
- ✅ Production builds don't include unused dependencies
**To verify MJML is not used**:
```bash
cd bizmatch-server
grep -r "mjml" src/ # Returns NO results in source code
```
### bizmatch-server: 7 Moderate (dev tools)
1. **esbuild** (dev server vulnerability) - drizzle-kit dev dependency
2. **pg-promise** (SQL injection) - pg-to-ts type generation tool only
**Why Safe**: Development tools, not in production runtime
### bizmatch: 10 Moderate (legacy deps)
1. **inflight** - deprecated but stable
2. **rimraf** v3 - old version but safe
3. **glob** v7 - old version in dev dependencies
4. **@types/cropperjs** - type definitions only
**Why Safe**: All are development dependencies or stable legacy packages
---
## 🚀 Installation Commands
### Fresh Install (Recommended)
```bash
# Backend
cd /home/timo/bizmatch-project/bizmatch-server
sudo rm -rf node_modules package-lock.json
npm install
# Frontend
cd /home/timo/bizmatch-project/bizmatch
sudo rm -rf node_modules package-lock.json
npm install --legacy-peer-deps
```
### Verify Production Security
```bash
# Check ONLY production dependencies
cd bizmatch-server
npm audit --production
cd ../bizmatch
npm audit --omit=dev
```
---
## 📈 Production Security Score
### Runtime Dependencies Only
**bizmatch-server** (production):
- ✅ **0 Critical**
- ✅ **0 High** (mjml not in runtime)
- ✅ **2 Moderate** (nodemailer already latest)
**bizmatch** (production):
- ✅ **0 High**
- ✅ **3 Moderate** (stable legacy deps)
**Overall Grade**: **A** ✅
---
## 🔍 Security Audit Commands
### Check Production Only
```bash
# Server (excludes dev deps and mjml unused code)
npm audit --production
# Frontend (excludes dev deps)
npm audit --omit=dev
```
### Full Audit (includes dev tools)
```bash
npm audit
```
---
## 🛡️ Why This Is Production-Safe
1. **No Critical Vulnerabilities** ❌→✅
2. **All High-Severity Fixed** (Angular XSS, etc.) ✅
3. **Remaining "High" are Unused Code** (mjml never called) ✅
4. **Dev Dependencies Don't Affect Production** ✅
5. **Latest Versions of All Active Packages** ✅
---
## 📝 Next Steps
### Immediate (Done) ✅
- [x] Update Angular 18 → 19
- [x] Update nodemailer 6 → 7
- [x] Update @angular/fire 18 → 19
- [x] Update firebase to latest
- [x] Update zone.js for Angular 19
### Optional (Future Improvements)
- [ ] Consider replacing `@nestjs-modules/mailer` with direct `nodemailer` usage
- This would eliminate all 33 mjml vulnerabilities from `npm audit`
- Benefit: Cleaner audit report
- Cost: Some refactoring needed
- **Not urgent**: mjml code is dead and never executed
- [ ] Set up Dependabot for automatic security updates
- [ ] Add monthly security audit to CI/CD pipeline
---
## 🔒 Security Best Practices Applied
1. ✅ **Principle of Least Privilege**: Only using necessary features
2. ✅ **Defense in Depth**: Multiple layers (no mjml usage even if vulnerable)
3. ✅ **Keep Dependencies Updated**: Latest stable versions
4. ✅ **Audit Regularly**: Monthly reviews recommended
5. ✅ **Production Hardening**: Dev deps excluded from production
---
## 📞 Support & Questions
**Q: Why do we still see 41 vulnerabilities in `npm audit`?**
A: 33 are in unused mjml code, 7 are dev tools. Only 0-2 affect production runtime.
**Q: Should we remove @nestjs-modules/mailer?**
A: Optional. It works fine with Handlebars. Removal would clean audit report but requires refactoring.
**Q: Are we safe to deploy?**
A: **YES**. All runtime vulnerabilities are fixed. Remaining ones are unused code or dev tools.
**Q: What about future updates?**
A: Run `npm audit` monthly and update packages quarterly.
---
**Security Status**: ✅ **PRODUCTION-READY**
**Risk Level**: 🟢 **LOW**
**Confidence**: 💯 **HIGH**

281
VULNERABILITY_FIXES.md
View File

@ -1,281 +0,0 @@
# Security Vulnerability Fixes
## Overview
This document details all security vulnerability fixes applied to the BizMatch project.
**Date**: 2026-01-03
**Total Vulnerabilities Before**: 81 (45 server + 36 frontend)
**Critical Updates Required**: Yes
---
## 🔴 Critical Fixes (Server)
### 1. Underscore.js Arbitrary Code Execution
**Vulnerability**: CVE (Arbitrary Code Execution)
**Severity**: Critical
**Status**: ✅ **FIXED** (via nodemailer-smtp-transport dependency update)
### 2. HTML Minifier ReDoS
**Vulnerability**: GHSA-pfq8-rq6v-vf5m (ReDoS in kangax html-minifier)
**Severity**: High
**Status**: ✅ **FIXED** (via @nestjs-modules/mailer 2.0.2 → 2.1.0)
**Impact**: Fixes 33 high-severity vulnerabilities in mjml-* packages
---
## 🟠 High Severity Fixes (Frontend)
### 1. Angular XSS Vulnerability
**Vulnerability**: GHSA-58c5-g7wp-6w37 (XSRF Token Leakage via Protocol-Relative URLs)
**Severity**: High
**Package**: @angular/common, @angular/compiler, and all Angular packages
**Status**: ✅ **FIXED** (Angular 18.1.3 → 19.2.16)
**Files Updated**:
- @angular/animations: 18.1.3 → 19.2.16
- @angular/common: 18.1.3 → 19.2.16
- @angular/compiler: 18.1.3 → 19.2.16
- @angular/core: 18.1.3 → 19.2.16
- @angular/forms: 18.1.3 → 19.2.16
- @angular/platform-browser: 18.1.3 → 19.2.16
- @angular/platform-browser-dynamic: 18.1.3 → 19.2.16
- @angular/platform-server: 18.1.3 → 19.2.16
- @angular/router: 18.1.3 → 19.2.16
- @angular/ssr: 18.2.21 → 19.2.16
- @angular/cdk: 18.0.6 → 19.1.5
- @angular/cli: 18.1.3 → 19.2.16
- @angular-devkit/build-angular: 18.1.3 → 19.2.16
- @angular/compiler-cli: 18.1.3 → 19.2.16
### 2. Angular Stored XSS via SVG/MathML
**Vulnerability**: GHSA-v4hv-rgfq-gp49
**Severity**: High
**Status**: ✅ **FIXED** (via Angular 19 update)
---
## 🟡 Moderate Severity Fixes
### 1. Nodemailer Vulnerabilities (Server)
**Vulnerabilities**:
- GHSA-mm7p-fcc7-pg87 (Email to unintended domain)
- GHSA-rcmh-qjqh-p98v (DoS via recursive calls in addressparser)
- GHSA-46j5-6fg5-4gv3 (DoS via uncontrolled recursion)
**Severity**: Moderate
**Package**: nodemailer
**Status**: ✅ **FIXED** (nodemailer 6.9.10 → 7.0.12)
### 2. Undici Vulnerabilities (Frontend)
**Vulnerabilities**:
- GHSA-c76h-2ccp-4975 (Use of Insufficiently Random Values)
- GHSA-cxrh-j4jr-qwg3 (DoS via bad certificate data)
**Severity**: Moderate
**Package**: undici (via Firebase dependencies)
**Status**: ✅ **FIXED** (firebase 11.3.1 → 11.9.0)
### 3. Esbuild Development Server Vulnerability
**Vulnerability**: GHSA-67mh-4wv8-2f99
**Severity**: Moderate
**Status**: ✅ **FIXED** (drizzle-kit 0.23.2 → 0.31.8)
**Note**: Development-only vulnerability, does not affect production
---
## ⚠️ Accepted Risks (Development-Only)
### 1. pg-promise SQL Injection (Server)
**Vulnerability**: GHSA-ff9h-848c-4xfj
**Severity**: Moderate
**Package**: pg-promise (used by pg-to-ts dev tool)
**Status**: ⚠️ **ACCEPTED RISK**
**Reason**:
- No fix available
- Only used in development tool (pg-to-ts)
- Not used in production runtime
- pg-to-ts is only for type generation
### 2. tmp Symbolic Link Vulnerability (Frontend)
**Vulnerability**: GHSA-52f5-9888-hmc6
**Severity**: Low
**Package**: tmp (used by Angular CLI)
**Status**: ⚠️ **ACCEPTED RISK**
**Reason**:
- Development tool only
- Angular CLI dependency
- Not included in production build
### 3. esbuild (Various)
**Vulnerability**: GHSA-67mh-4wv8-2f99
**Severity**: Moderate
**Status**: ⚠️ **PARTIALLY FIXED**
**Reason**:
- Development server only
- Fixed in drizzle-kit
- Remaining instances in vite are dev-only
---
## 📦 Package Updates Summary
### bizmatch-server/package.json
```json
{
"dependencies": {
"@nestjs-modules/mailer": "^2.0.2" → "^2.1.0",
"firebase": "^11.3.1" → "^11.9.0",
"nodemailer": "^6.9.10" → "^7.0.12"
},
"devDependencies": {
"drizzle-kit": "^0.23.2" → "^0.31.8"
}
}
```
### bizmatch/package.json
```json
{
"dependencies": {
"@angular/animations": "^18.1.3" → "^19.2.16",
"@angular/cdk": "^18.0.6" → "^19.1.5",
"@angular/common": "^18.1.3" → "^19.2.16",
"@angular/compiler": "^18.1.3" → "^19.2.16",
"@angular/core": "^18.1.3" → "^19.2.16",
"@angular/forms": "^18.1.3" → "^19.2.16",
"@angular/platform-browser": "^18.1.3" → "^19.2.16",
"@angular/platform-browser-dynamic": "^18.1.3" → "^19.2.16",
"@angular/platform-server": "^18.1.3" → "^19.2.16",
"@angular/router": "^18.1.3" → "^19.2.16",
"@angular/ssr": "^18.2.21" → "^19.2.16"
},
"devDependencies": {
"@angular-devkit/build-angular": "^18.1.3" → "^19.2.16",
"@angular/cli": "^18.1.3" → "^19.2.16",
"@angular/compiler-cli": "^18.1.3" → "^19.2.16"
}
}
```
---
## 🚀 Installation Instructions
### Automatic Installation (Recommended)
```bash
cd /home/timo/bizmatch-project
bash fix-vulnerabilities.sh
```
### Manual Installation
**If you encounter permission errors:**
```bash
# Fix permissions first
cd /home/timo/bizmatch-project/bizmatch-server
sudo rm -rf node_modules package-lock.json
cd /home/timo/bizmatch-project/bizmatch
sudo rm -rf node_modules package-lock.json
# Then install
cd /home/timo/bizmatch-project/bizmatch-server
npm install
cd /home/timo/bizmatch-project/bizmatch
npm install
```
### Verify Installation
```bash
# Check server
cd /home/timo/bizmatch-project/bizmatch-server
npm audit --production
# Check frontend
cd /home/timo/bizmatch-project/bizmatch
npm audit --production
```
---
## ⚠️ Breaking Changes Warning
### Angular 18 → 19 Migration
**Potential Issues**:
1. **Route configuration**: Some routing APIs may have changed
2. **Template syntax**: Check for deprecated template features
3. **Third-party libraries**: Some Angular libraries may not yet support v19
- @angular/fire: Still on v18.0.1 (compatible but check for updates)
- @bluehalo/ngx-leaflet: May need testing
- @ng-select/ng-select: May need testing
**Testing Required**:
```bash
cd /home/timo/bizmatch-project/bizmatch
npm run build
npm run serve:ssr
# Test all major features
```
### Nodemailer 6 → 7 Migration
**Potential Issues**:
1. **SMTP configuration**: Minor API changes
2. **Email templates**: Should be compatible
**Testing Required**:
```bash
# Test email functionality
# - User registration emails
# - Password reset emails
# - Contact form emails
```
---
## 📊 Expected Results
### Before Updates
- **bizmatch-server**: 45 vulnerabilities (4 critical, 33 high, 7 moderate, 1 low)
- **bizmatch**: 36 vulnerabilities (17 high, 13 moderate, 6 low)
### After Updates (Production Only)
- **bizmatch-server**: ~5-10 vulnerabilities (mostly dev-only)
- **bizmatch**: ~3-5 vulnerabilities (mostly dev-only)
### Remaining Vulnerabilities
All remaining vulnerabilities should be:
- Development dependencies only (not in production builds)
- Low/moderate severity
- Acceptable risk or no fix available
---
## 🔒 Security Best Practices
After applying these fixes:
1. **Regular Updates**: Run `npm audit` monthly
2. **Production Builds**: Always use production builds for deployment
3. **Dependency Review**: Review new dependencies before adding
4. **Testing**: Thoroughly test after major updates
5. **Monitoring**: Set up dependabot or similar tools
---
## 📞 Support
If you encounter issues during installation:
1. Check the permission errors first
2. Ensure Node.js and npm are up to date
3. Review breaking changes section
4. Test each component individually
---
**Last Updated**: 2026-01-03
**Next Review**: 2026-02-03 (monthly)

31
bizmatch-server/docker-compose.yml
View File

@ -1,19 +1,21 @@
# ~/git/bizmatch-project/bizmatch-server/docker-compose.yml
services:
app:
image: node:22-alpine
container_name: bizmatch-app
working_dir: /app
volumes:
- ./:/app
- node_modules:/app/node_modules
- ./:/app # Code liegt hier direkt im Ordner der Compose
ports:
- '3001:3001'
- '3001:3000' # Host 3001 -> Container 3000
env_file:
- .env
- path: ./.env
required: true
environment:
- NODE_ENV=development
- NODE_ENV=development # Prod-Modus (vorher stand fälschlich "development")
- DATABASE_URL
command: sh -c "if [ ! -f node_modules/.installed ]; then npm ci && touch node_modules/.installed; fi && npm run build && node dist/src/main.js"
# Hinweis: npm ci nutzt package-lock.json; falls nicht vorhanden, nimm "npm install"
command: sh -c "npm ci && npm run build && node dist/src/main.js"
restart: unless-stopped
depends_on:
- postgres
@ -22,27 +24,22 @@ services:
postgres:
container_name: bizmatchdb
image: postgres:17-alpine
image: postgres:17-alpine # Version pinnen ist stabiler als "latest"
restart: unless-stopped
volumes:
- bizmatch-db-data:/var/lib/postgresql/data
- ${PWD}/bizmatchdb-data:/var/lib/postgresql/data # Daten liegen im Server-Repo
env_file:
- .env
- path: ./.env
required: true
environment:
POSTGRES_DB: ${POSTGRES_DB}
POSTGRES_USER: ${POSTGRES_USER}
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
ports:
- '5434:5432'
- '5433:5432' # Host 5433 -> Container 5432
networks:
- bizmatch
volumes:
bizmatch-db-data:
driver: local
node_modules:
driver: local
networks:
bizmatch:
external: true
external: true # einmalig anlegen: docker network create bizmatch-prod

12
bizmatch-server/fix-sequence.sql
View File

@ -1,12 +0,0 @@
-- Create missing sequence for commercials_json serialId
-- This sequence is required for generating unique serialId values for commercial property listings
CREATE SEQUENCE IF NOT EXISTS commercials_json_serial_id_seq START WITH 100000;
-- Verify the sequence was created
SELECT sequence_name, start_value, last_value
FROM information_schema.sequences
WHERE sequence_name = 'commercials_json_serial_id_seq';
-- Also verify all sequences to check if business listings sequence exists
\ds

22
bizmatch-server/package.json
View File

@ -23,39 +23,35 @@
"drop": "drizzle-kit drop",
"migrate": "tsx src/drizzle/migrate.ts",
"import": "tsx src/drizzle/import.ts",
"generateTypes": "tsx src/drizzle/generateTypes.ts src/drizzle/schema.ts src/models/db.model.ts",
"create-tables": "node src/scripts/create-tables.js",
"seed": "node src/scripts/seed-database.js",
"create-user": "node src/scripts/create-test-user.js",
"seed:all": "npm run create-user && npm run seed",
"setup": "npm run create-tables && npm run seed"
"generateTypes": "tsx src/drizzle/generateTypes.ts src/drizzle/schema.ts src/models/db.model.ts"
},
"dependencies": {
"@nestjs-modules/mailer": "^2.0.2",
"@nestjs/cli": "^11.0.11",
"@nestjs/common": "^11.0.11",
"@nestjs/config": "^4.0.0",
"@nestjs/core": "^11.0.11",
"@nestjs/cli": "^11.0.11",
"@nestjs/platform-express": "^11.0.11",
"@types/stripe": "^8.0.417",
"body-parser": "^1.20.2",
"cls-hooked": "^4.2.2",
"cors": "^2.8.5",
"drizzle-orm": "^0.32.0",
"firebase": "^11.9.0",
"firebase": "^11.3.1",
"firebase-admin": "^13.1.0",
"fs-extra": "^11.2.0",
"groq-sdk": "^0.5.0",
"handlebars": "^4.7.8",
"nest-winston": "^1.9.4",
"nestjs-cls": "^5.4.0",
"nodemailer": "^7.0.12",
"nodemailer": "^6.9.10",
"nodemailer-smtp-transport": "^2.7.4",
"openai": "^4.52.6",
"pg": "^8.11.5",
"pgvector": "^0.2.0",
"reflect-metadata": "^0.2.0",
"rxjs": "^7.8.1",
"sharp": "^0.33.5",
"sharp": "^0.33.2",
"stripe": "^16.8.0",
"tsx": "^4.16.2",
"urlcat": "^3.1.0",
@ -70,11 +66,11 @@
"@nestjs/testing": "^11.0.11",
"@types/express": "^4.17.17",
"@types/multer": "^1.4.11",
"@types/node": "^20.19.25",
"@types/node": "^20.11.19",
"@types/nodemailer": "^6.4.14",
"@types/pg": "^8.11.5",
"commander": "^12.0.0",
"drizzle-kit": "^0.31.8",
"drizzle-kit": "^0.23.0",
"esbuild-register": "^3.5.0",
"eslint": "^8.42.0",
"eslint-config-prettier": "^9.0.0",
@ -90,7 +86,7 @@
"ts-loader": "^9.4.3",
"ts-node": "^10.9.2",
"tsconfig-paths": "^4.2.0",
"typescript": "^5.9.3"
"typescript": "^5.1.3"
},
"jest": {
"moduleFileExtensions": [

117
bizmatch-server/scripts/migrate-slugs.sql
View File

@ -1,117 +0,0 @@
-- =============================================================
-- SEO SLUG MIGRATION SCRIPT
-- Run this directly in your PostgreSQL database
-- =============================================================
-- First, let's see how many listings need slugs
SELECT 'Businesses without slugs: ' || COUNT(*) FROM businesses_json
WHERE data->>'slug' IS NULL OR data->>'slug' = '';
SELECT 'Commercial properties without slugs: ' || COUNT(*) FROM commercials_json
WHERE data->>'slug' IS NULL OR data->>'slug' = '';
-- =============================================================
-- UPDATE BUSINESS LISTINGS WITH SEO SLUGS
-- Format: title-city-state-shortid (e.g., restaurant-austin-tx-a3f7b2c1)
-- =============================================================
UPDATE businesses_json
SET data = jsonb_set(
data::jsonb,
'{slug}',
to_jsonb(
LOWER(
REGEXP_REPLACE(
REGEXP_REPLACE(
CONCAT(
-- Title (first 50 chars, cleaned)
SUBSTRING(
REGEXP_REPLACE(
LOWER(COALESCE(data->>'title', '')),
'[^a-z0-9\s-]', '', 'g'
), 1, 50
),
'-',
-- City or County
REGEXP_REPLACE(
LOWER(COALESCE(data->'location'->>'name', data->'location'->>'county', '')),
'[^a-z0-9\s-]', '', 'g'
),
'-',
-- State
LOWER(COALESCE(data->'location'->>'state', '')),
'-',
-- First 8 chars of UUID
SUBSTRING(id::text, 1, 8)
),
'\s+', '-', 'g' -- Replace spaces with hyphens
),
'-+', '-', 'g' -- Replace multiple hyphens with single
)
)
)
)
WHERE data->>'slug' IS NULL OR data->>'slug' = '';
-- =============================================================
-- UPDATE COMMERCIAL PROPERTIES WITH SEO SLUGS
-- =============================================================
UPDATE commercials_json
SET data = jsonb_set(
data::jsonb,
'{slug}',
to_jsonb(
LOWER(
REGEXP_REPLACE(
REGEXP_REPLACE(
CONCAT(
-- Title (first 50 chars, cleaned)
SUBSTRING(
REGEXP_REPLACE(
LOWER(COALESCE(data->>'title', '')),
'[^a-z0-9\s-]', '', 'g'
), 1, 50
),
'-',
-- City or County
REGEXP_REPLACE(
LOWER(COALESCE(data->'location'->>'name', data->'location'->>'county', '')),
'[^a-z0-9\s-]', '', 'g'
),
'-',
-- State
LOWER(COALESCE(data->'location'->>'state', '')),
'-',
-- First 8 chars of UUID
SUBSTRING(id::text, 1, 8)
),
'\s+', '-', 'g' -- Replace spaces with hyphens
),
'-+', '-', 'g' -- Replace multiple hyphens with single
)
)
)
)
WHERE data->>'slug' IS NULL OR data->>'slug' = '';
-- =============================================================
-- VERIFY THE RESULTS
-- =============================================================
SELECT 'Migration complete! Checking results...' AS status;
-- Show sample of updated slugs
SELECT
id,
data->>'title' AS title,
data->>'slug' AS slug
FROM businesses_json
LIMIT 5;
SELECT
id,
data->>'title' AS title,
data->>'slug' AS slug
FROM commercials_json
LIMIT 5;

162
bizmatch-server/scripts/migrate-slugs.ts
View File

@ -1,162 +0,0 @@
/**
* Migration Script: Generate Slugs for Existing Listings
*
* This script generates SEO-friendly slugs for all existing businesses
* and commercial properties that don't have slugs yet.
*
* Run with: npx ts-node scripts/migrate-slugs.ts
*/
import { Pool } from 'pg';
import { drizzle, NodePgDatabase } from 'drizzle-orm/node-postgres';
import { sql, eq, isNull } from 'drizzle-orm';
import * as schema from '../src/drizzle/schema';
// Slug generation function (copied from utils for standalone execution)
function generateSlug(title: string, location: any, id: string): string {
if (!title || !id) return id; // Fallback to ID if no title
const titleSlug = title
.toLowerCase()
.trim()
.replace(/[^\w\s-]/g, '')
.replace(/\s+/g, '-')
.replace(/-+/g, '-')
.substring(0, 50);
let locationSlug = '';
if (location) {
const locationName = location.name || location.county || '';
const state = location.state || '';
if (locationName) {
locationSlug = locationName
.toLowerCase()
.trim()
.replace(/[^\w\s-]/g, '')
.replace(/\s+/g, '-')
.replace(/-+/g, '-');
}
if (state) {
locationSlug = locationSlug
? `${locationSlug}-${state.toLowerCase()}`
: state.toLowerCase();
}
}
const shortId = id.substring(0, 8);
const parts = [titleSlug, locationSlug, shortId].filter(Boolean);
return parts.join('-').replace(/-+/g, '-').replace(/^-|-$/g, '').toLowerCase();
}
async function migrateBusinessSlugs(db: NodePgDatabase<typeof schema>) {
console.log('🔄 Migrating Business Listings...');
// Get all businesses without slugs
const businesses = await db
.select({
id: schema.businesses_json.id,
email: schema.businesses_json.email,
data: schema.businesses_json.data,
})
.from(schema.businesses_json);
let updated = 0;
let skipped = 0;
for (const business of businesses) {
const data = business.data as any;
// Skip if slug already exists
if (data.slug) {
skipped++;
continue;
}
const slug = generateSlug(data.title || '', data.location || {}, business.id);
// Update with new slug
const updatedData = { ...data, slug };
await db
.update(schema.businesses_json)
.set({ data: updatedData })
.where(eq(schema.businesses_json.id, business.id));
console.log(` ✓ ${data.title?.substring(0, 40)}... → ${slug}`);
updated++;
}
console.log(`✅ Business Listings: ${updated} updated, ${skipped} skipped (already had slugs)`);
return updated;
}
async function migrateCommercialSlugs(db: NodePgDatabase<typeof schema>) {
console.log('\n🔄 Migrating Commercial Properties...');
// Get all commercial properties without slugs
const properties = await db
.select({
id: schema.commercials_json.id,
email: schema.commercials_json.email,
data: schema.commercials_json.data,
})
.from(schema.commercials_json);
let updated = 0;
let skipped = 0;
for (const property of properties) {
const data = property.data as any;
// Skip if slug already exists
if (data.slug) {
skipped++;
continue;
}
const slug = generateSlug(data.title || '', data.location || {}, property.id);
// Update with new slug
const updatedData = { ...data, slug };
await db
.update(schema.commercials_json)
.set({ data: updatedData })
.where(eq(schema.commercials_json.id, property.id));
console.log(` ✓ ${data.title?.substring(0, 40)}... → ${slug}`);
updated++;
}
console.log(`✅ Commercial Properties: ${updated} updated, ${skipped} skipped (already had slugs)`);
return updated;
}
async function main() {
console.log('═══════════════════════════════════════════════════════');
console.log(' SEO SLUG MIGRATION SCRIPT');
console.log('═══════════════════════════════════════════════════════\n');
// Connect to database
const connectionString = process.env.DATABASE_URL || 'postgresql://postgres:postgres@localhost:5432/bizmatch';
console.log(`📡 Connecting to database...`);
const pool = new Pool({ connectionString });
const db = drizzle(pool, { schema });
try {
const businessCount = await migrateBusinessSlugs(db);
const commercialCount = await migrateCommercialSlugs(db);
console.log('\n═══════════════════════════════════════════════════════');
console.log(`🎉 Migration complete! Total: ${businessCount + commercialCount} listings updated`);
console.log('═══════════════════════════════════════════════════════\n');
} catch (error) {
console.error('❌ Migration failed:', error);
process.exit(1);
} finally {
await pool.end();
}
}
main();

119
bizmatch-server/scripts/reproduce-favorites.ts
View File

@ -1,119 +0,0 @@
import { Pool } from 'pg';
import { drizzle, NodePgDatabase } from 'drizzle-orm/node-postgres';
import { sql, eq, and } from 'drizzle-orm';
import * as schema from '../src/drizzle/schema';
import { users_json } from '../src/drizzle/schema';
// Mock JwtUser
interface JwtUser {
email: string;
}
// Logic from UserService.addFavorite
async function addFavorite(db: NodePgDatabase<typeof schema>, id: string, user: JwtUser) {
console.log(`[Action] Adding favorite. Target ID: ${id}, Favoriter Email: ${user.email}`);
await db
.update(schema.users_json)
.set({
data: sql`jsonb_set(${schema.users_json.data}, '{favoritesForUser}',
coalesce((${schema.users_json.data}->'favoritesForUser')::jsonb, '[]'::jsonb) || to_jsonb(${user.email}::text))`,
} as any)
.where(eq(schema.users_json.id, id));
}
// Logic from UserService.getFavoriteUsers
async function getFavoriteUsers(db: NodePgDatabase<typeof schema>, user: JwtUser) {
console.log(`[Action] Fetching favorites for ${user.email}`);
// Corrected query using `?` operator (matches array element check)
const data = await db
.select()
.from(schema.users_json)
.where(sql`${schema.users_json.data}->'favoritesForUser' ? ${user.email}`);
return data;
}
// Logic from UserService.deleteFavorite
async function deleteFavorite(db: NodePgDatabase<typeof schema>, id: string, user: JwtUser) {
console.log(`[Action] Removing favorite. Target ID: ${id}, Favoriter Email: ${user.email}`);
await db
.update(schema.users_json)
.set({
data: sql`jsonb_set(${schema.users_json.data}, '{favoritesForUser}',
(SELECT coalesce(jsonb_agg(elem), '[]'::jsonb)
FROM jsonb_array_elements(coalesce(${schema.users_json.data}->'favoritesForUser', '[]'::jsonb)) AS elem
WHERE elem::text != to_jsonb(${user.email}::text)::text))`,
} as any)
.where(eq(schema.users_json.id, id));
}
async function main() {
console.log('═══════════════════════════════════════════════════════');
console.log(' FAVORITES REPRODUCTION SCRIPT');
console.log('═══════════════════════════════════════════════════════\n');
const connectionString = process.env.DATABASE_URL || 'postgresql://postgres:postgres@localhost:5432/bizmatch';
const pool = new Pool({ connectionString });
const db = drizzle(pool, { schema });
try {
// 1. Find a "professional" user to be the TARGET listing
// filtering by customerType = 'professional' inside the jsonb data
const targets = await db.select().from(users_json).limit(1);
if (targets.length === 0) {
console.error("No users found in DB to test with.");
return;
}
const targetUser = targets[0];
console.log(`Found target user: ID=${targetUser.id}, Email=${targetUser.email}`);
// 2. Define a "favoriter" user (doesn't need to exist in DB for the logic to work, but better if it's realistic)
// We'll just use a dummy email or one from DB if available.
const favoriterEmail = 'test-repro-favoriter@example.com';
const favoriter: JwtUser = { email: favoriterEmail };
// 3. Clear any existing favorite for this pair first
await deleteFavorite(db, targetUser.id, favoriter);
// 4. Add Favorite
await addFavorite(db, targetUser.id, favoriter);
// 5. Verify it was added by checking the raw data
const updatedTarget = await db.select().from(users_json).where(eq(users_json.id, targetUser.id));
const favoritesData = (updatedTarget[0].data as any).favoritesForUser;
console.log(`\n[Check] Raw favoritesForUser data on target:`, favoritesData);
if (!favoritesData || !favoritesData.includes(favoriterEmail)) {
console.error("❌ Add Favorite FAILED. Email not found in favoritesForUser array.");
} else {
console.log("✅ Add Favorite SUCCESS. Email found in JSON.");
}
// 6. Test retrieval using the getFavoriteUsers query
const retrievedFavorites = await getFavoriteUsers(db, favoriter);
console.log(`\n[Check] retrievedFavorites count: ${retrievedFavorites.length}`);
const found = retrievedFavorites.find(u => u.id === targetUser.id);
if (found) {
console.log("✅ Get Favorites SUCCESS. Target user returned in query.");
} else {
console.log("❌ Get Favorites FAILED. Target user NOT returned by query.");
console.log("Query used: favoritesForUser @> [email]");
}
// 7. Cleanup
await deleteFavorite(db, targetUser.id, favoriter);
console.log("\n[Cleanup] Removed test favorite.");
} catch (error) {
console.error('❌ Script failed:', error);
} finally {
await pool.end();
}
}
main();

2
bizmatch-server/src/app.module.ts
View File

@ -25,7 +25,6 @@ import { LoggingInterceptor } from './interceptors/logging.interceptor';
import { UserInterceptor } from './interceptors/user.interceptor';
import { RequestDurationMiddleware } from './request-duration/request-duration.middleware';
import { SelectOptionsModule } from './select-options/select-options.module';
import { SitemapModule } from './sitemap/sitemap.module';
import { UserModule } from './user/user.module';
//loadEnvFiles();
@ -71,7 +70,6 @@ console.log('Loaded environment variables:');
// PaymentModule,
EventModule,
FirebaseAdminModule,
SitemapModule,
],
controllers: [AppController, LogController],
providers: [

4
bizmatch-server/src/drizzle/schema.ts
View File

@ -117,7 +117,6 @@ export const businesses = pgTable(
brokerLicencing: varchar('brokerLicencing', { length: 255 }),
internals: text('internals'),
imageName: varchar('imageName', { length: 200 }),
slug: varchar('slug', { length: 300 }).unique(),
created: timestamp('created'),
updated: timestamp('updated'),
location: jsonb('location'),
@ -126,7 +125,6 @@ export const businesses = pgTable(
locationBusinessCityStateIdx: index('idx_business_location_city_state').on(
sql`((${table.location}->>'name')::varchar), ((${table.location}->>'state')::varchar), ((${table.location}->>'latitude')::float), ((${table.location}->>'longitude')::float)`,
),
slugIdx: index('idx_business_slug').on(table.slug),
}),
);
@ -145,7 +143,6 @@ export const commercials = pgTable(
draft: boolean('draft'),
imageOrder: varchar('imageOrder', { length: 200 }).array(),
imagePath: varchar('imagePath', { length: 200 }),
slug: varchar('slug', { length: 300 }).unique(),
created: timestamp('created'),
updated: timestamp('updated'),
location: jsonb('location'),
@ -154,7 +151,6 @@ export const commercials = pgTable(
locationCommercialsCityStateIdx: index('idx_commercials_location_city_state').on(
sql`((${table.location}->>'name')::varchar), ((${table.location}->>'state')::varchar), ((${table.location}->>'latitude')::float), ((${table.location}->>'longitude')::float)`,
),
slugIdx: index('idx_commercials_slug').on(table.slug),
}),
);

168
bizmatch-server/src/listings/business-listing.service.ts
View File

@ -5,12 +5,11 @@ import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
import { Logger } from 'winston';
import { ZodError } from 'zod';
import * as schema from '../drizzle/schema';
import { businesses_json, PG_CONNECTION } from '../drizzle/schema';
import { businesses_json, PG_CONNECTION, users_json } from '../drizzle/schema';
import { GeoService } from '../geo/geo.service';
import { BusinessListing, BusinessListingSchema } from '../models/db.model';
import { BusinessListingCriteria, JwtUser } from '../models/main.model';
import { getDistanceQuery, splitName } from '../utils';
import { generateSlug, extractShortIdFromSlug, isSlug } from '../utils/slug.utils';
@Injectable()
export class BusinessListingService {
@ -18,51 +17,33 @@ export class BusinessListingService {
@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
@Inject(PG_CONNECTION) private conn: NodePgDatabase<typeof schema>,
private geoService?: GeoService,
) { }
) {}
private getWhereConditions(criteria: BusinessListingCriteria, user: JwtUser): SQL[] {
const whereConditions: SQL[] = [];
this.logger.info('getWhereConditions start', { criteria: JSON.stringify(criteria) });
if (criteria.city && criteria.searchType === 'exact') {
whereConditions.push(sql`(${businesses_json.data}->'location'->>'name') ILIKE ${criteria.city.name}`);
}
if (criteria.city && criteria.radius && criteria.searchType === 'radius' && criteria.radius) {
this.logger.debug('Adding radius search filter', { city: criteria.city.name, radius: criteria.radius });
const cityGeo = this.geoService.getCityWithCoords(criteria.state, criteria.city.name);
whereConditions.push(sql`(${getDistanceQuery(businesses_json, cityGeo.latitude, cityGeo.longitude)} <= ${criteria.radius})`);
whereConditions.push(sql`${getDistanceQuery(businesses_json, cityGeo.latitude, cityGeo.longitude)} <= ${criteria.radius}`);
}
if (criteria.types && criteria.types.length > 0) {
this.logger.warn('Adding business category filter', { types: criteria.types });
// Use explicit SQL with IN for robust JSONB comparison
const typeValues = criteria.types.map(t => sql`${t}`);
whereConditions.push(sql`((${businesses_json.data}->>'type') IN (${sql.join(typeValues, sql`, `)}))`);
whereConditions.push(inArray(sql`${businesses_json.data}->>'type'`, criteria.types));
}
if (criteria.state) {
this.logger.debug('Adding state filter', { state: criteria.state });
whereConditions.push(sql`(${businesses_json.data}->'location'->>'state') = ${criteria.state}`);
}
if (criteria.minPrice !== undefined && criteria.minPrice !== null) {
whereConditions.push(
and(
sql`(${businesses_json.data}->>'price') IS NOT NULL`,
sql`(${businesses_json.data}->>'price') != ''`,
gte(sql`REPLACE(${businesses_json.data}->>'price', ',', '')::double precision`, criteria.minPrice)
)
);
if (criteria.minPrice) {
whereConditions.push(gte(sql`(${businesses_json.data}->>'price')::double precision`, criteria.minPrice));
}
if (criteria.maxPrice !== undefined && criteria.maxPrice !== null) {
whereConditions.push(
and(
sql`(${businesses_json.data}->>'price') IS NOT NULL`,
sql`(${businesses_json.data}->>'price') != ''`,
lte(sql`REPLACE(${businesses_json.data}->>'price', ',', '')::double precision`, criteria.maxPrice)
)
);
if (criteria.maxPrice) {
whereConditions.push(lte(sql`(${businesses_json.data}->>'price')::double precision`, criteria.maxPrice));
}
if (criteria.minRevenue) {
@ -105,33 +86,24 @@ export class BusinessListingService {
whereConditions.push(eq(sql`(${businesses_json.data}->>'franchiseResale')::boolean`, criteria.franchiseResale));
}
if (criteria.title && criteria.title.trim() !== '') {
const searchTerm = `%${criteria.title.trim()}%`;
whereConditions.push(
sql`((${businesses_json.data}->>'title') ILIKE ${searchTerm} OR (${businesses_json.data}->>'description') ILIKE ${searchTerm})`
);
if (criteria.title) {
whereConditions.push(sql`(${businesses_json.data}->>'title') ILIKE ${`%${criteria.title}%`} OR (${businesses_json.data}->>'description') ILIKE ${`%${criteria.title}%`}`);
}
if (criteria.brokerName) {
const { firstname, lastname } = splitName(criteria.brokerName);
if (firstname === lastname) {
whereConditions.push(
sql`((${schema.users_json.data}->>'firstname') ILIKE ${`%${firstname}%`} OR (${schema.users_json.data}->>'lastname') ILIKE ${`%${lastname}%`})`
);
whereConditions.push(sql`(${users_json.data}->>'firstname') ILIKE ${`%${firstname}%`} OR (${users_json.data}->>'lastname') ILIKE ${`%${lastname}%`}`);
} else {
whereConditions.push(
sql`((${schema.users_json.data}->>'firstname') ILIKE ${`%${firstname}%`} AND (${schema.users_json.data}->>'lastname') ILIKE ${`%${lastname}%`})`
);
whereConditions.push(sql`(${users_json.data}->>'firstname') ILIKE ${`%${firstname}%`} AND (${users_json.data}->>'lastname') ILIKE ${`%${lastname}%`}`);
}
}
if (criteria.email) {
whereConditions.push(eq(schema.users_json.email, criteria.email));
whereConditions.push(eq(users_json.email, criteria.email));
}
if (user?.role !== 'admin') {
whereConditions.push(
sql`((${businesses_json.email} = ${user?.email || null}) OR (${businesses_json.data}->>'draft')::boolean IS NOT TRUE)`
);
whereConditions.push(or(eq(businesses_json.email, user?.email), sql`(${businesses_json.data}->>'draft')::boolean IS NOT TRUE`));
}
this.logger.warn('whereConditions count', { count: whereConditions.length });
whereConditions.push(and(sql`(${users_json.data}->>'customerType') = 'professional'`, sql`(${users_json.data}->>'customerSubType') = 'broker'`));
return whereConditions;
}
@ -141,21 +113,17 @@ export class BusinessListingService {
const query = this.conn
.select({
business: businesses_json,
brokerFirstName: sql`${schema.users_json.data}->>'firstname'`.as('brokerFirstName'),
brokerLastName: sql`${schema.users_json.data}->>'lastname'`.as('brokerLastName'),
brokerFirstName: sql`${users_json.data}->>'firstname'`.as('brokerFirstName'),
brokerLastName: sql`${users_json.data}->>'lastname'`.as('brokerLastName'),
})
.from(businesses_json)
.leftJoin(schema.users_json, eq(businesses_json.email, schema.users_json.email));
.leftJoin(users_json, eq(businesses_json.email, users_json.email));
const whereConditions = this.getWhereConditions(criteria, user);
this.logger.warn('Filter Criteria:', { criteria: JSON.stringify(criteria) });
if (whereConditions.length > 0) {
const whereClause = sql.join(whereConditions, sql` AND `);
query.where(sql`(${whereClause})`);
this.logger.warn('Generated SQL:', { sql: query.toSQL().sql, params: query.toSQL().params });
const whereClause = and(...whereConditions);
query.where(whereClause);
}
// Sortierung
@ -231,67 +199,19 @@ export class BusinessListingService {
}
async getBusinessListingsCount(criteria: BusinessListingCriteria, user: JwtUser): Promise<number> {
const countQuery = this.conn.select({ value: count() }).from(businesses_json).leftJoin(schema.users_json, eq(businesses_json.email, schema.users_json.email));
const countQuery = this.conn.select({ value: count() }).from(businesses_json).leftJoin(users_json, eq(businesses_json.email, users_json.email));
const whereConditions = this.getWhereConditions(criteria, user);
if (whereConditions.length > 0) {
const whereClause = sql.join(whereConditions, sql` AND `);
countQuery.where(sql`(${whereClause})`);
const whereClause = and(...whereConditions);
countQuery.where(whereClause);
}
const [{ value: totalCount }] = await countQuery;
return totalCount;
}
/**
* Find business by slug or ID
* Supports both slug (e.g., "restaurant-austin-tx-a3f7b2c1") and UUID
*/
async findBusinessBySlugOrId(slugOrId: string, user: JwtUser): Promise<BusinessListing> {
this.logger.debug(`findBusinessBySlugOrId called with: ${slugOrId}`);
let id = slugOrId;
// Check if it's a slug (contains multiple hyphens) vs UUID
if (isSlug(slugOrId)) {
this.logger.debug(`Detected as slug: ${slugOrId}`);
// Extract short ID from slug and find by slug field
const listing = await this.findBusinessBySlug(slugOrId);
if (listing) {
this.logger.debug(`Found listing by slug: ${slugOrId} -> ID: ${listing.id}`);
id = listing.id;
} else {
this.logger.warn(`Slug not found in database: ${slugOrId}`);
throw new NotFoundException(
`Business listing not found with slug: ${slugOrId}. ` +
`The listing may have been deleted or the URL may be incorrect.`
);
}
} else {
this.logger.debug(`Detected as UUID: ${slugOrId}`);
}
return this.findBusinessesById(id, user);
}
/**
* Find business by slug
*/
async findBusinessBySlug(slug: string): Promise<BusinessListing | null> {
const result = await this.conn
.select()
.from(businesses_json)
.where(sql`${businesses_json.data}->>'slug' = ${slug}`)
.limit(1);
if (result.length > 0) {
return { id: result[0].id, email: result[0].email, ...(result[0].data as BusinessListing) } as BusinessListing;
}
return null;
}
async findBusinessesById(id: string, user: JwtUser): Promise<BusinessListing> {
const conditions = [];
if (user?.role !== 'admin') {
@ -326,7 +246,7 @@ export class BusinessListingService {
const userFavorites = await this.conn
.select()
.from(businesses_json)
.where(sql`${businesses_json.data}->'favoritesForUser' ? ${user.email}`);
.where(arrayContains(sql`${businesses_json.data}->>'favoritesForUser'`, [user.email]));
return userFavorites.map(l => ({ id: l.id, email: l.email, ...(l.data as BusinessListing) }) as BusinessListing);
}
@ -338,13 +258,7 @@ export class BusinessListingService {
const { id, email, ...rest } = data;
const convertedBusinessListing = { email, data: rest };
const [createdListing] = await this.conn.insert(businesses_json).values(convertedBusinessListing).returning();
// Generate and update slug after creation (we need the ID first)
const slug = generateSlug(data.title, data.location, createdListing.id);
const listingWithSlug = { ...(createdListing.data as any), slug };
await this.conn.update(businesses_json).set({ data: listingWithSlug }).where(eq(businesses_json.id, createdListing.id));
return { id: createdListing.id, email: createdListing.email, ...(createdListing.data as BusinessListing), slug } as any;
return { id: createdListing.id, email: createdListing.email, ...(createdListing.data as BusinessListing) };
} catch (error) {
if (error instanceof ZodError) {
const filteredErrors = error.errors
@ -371,21 +285,8 @@ export class BusinessListingService {
if (existingListing.email === user?.email) {
data.favoritesForUser = (<BusinessListing>existingListing.data).favoritesForUser || [];
}
// Regenerate slug if title or location changed
const existingData = existingListing.data as BusinessListing;
let slug: string;
if (data.title !== existingData.title || JSON.stringify(data.location) !== JSON.stringify(existingData.location)) {
slug = generateSlug(data.title, data.location, id);
} else {
// Keep existing slug
slug = (existingData as any).slug || generateSlug(data.title, data.location, id);
}
// Add slug to data before validation
const dataWithSlug = { ...data, slug };
BusinessListingSchema.parse(dataWithSlug);
const { id: _, email, ...rest } = dataWithSlug;
BusinessListingSchema.parse(data);
const { id: _, email, ...rest } = data;
const convertedBusinessListing = { email, data: rest };
const [updateListing] = await this.conn.update(businesses_json).set(convertedBusinessListing).where(eq(businesses_json.id, id)).returning();
return { id: updateListing.id, email: updateListing.email, ...(updateListing.data as BusinessListing) };
@ -407,24 +308,11 @@ export class BusinessListingService {
await this.conn.delete(businesses_json).where(eq(businesses_json.id, id));
}
async addFavorite(id: string, user: JwtUser): Promise<void> {
await this.conn
.update(businesses_json)
.set({
data: sql`jsonb_set(${businesses_json.data}, '{favoritesForUser}',
coalesce((${businesses_json.data}->'favoritesForUser')::jsonb, '[]'::jsonb) || to_jsonb(${user.email}::text))`,
})
.where(eq(businesses_json.id, id));
}
async deleteFavorite(id: string, user: JwtUser): Promise<void> {
await this.conn
.update(businesses_json)
.set({
data: sql`jsonb_set(${businesses_json.data}, '{favoritesForUser}',
(SELECT coalesce(jsonb_agg(elem), '[]'::jsonb)
FROM jsonb_array_elements(coalesce(${businesses_json.data}->'favoritesForUser', '[]'::jsonb)) AS elem
WHERE elem::text != to_jsonb(${user.email}::text)::text))`,
data: sql`jsonb_set(${businesses_json.data}, '{favoritesForUser}', array_remove((${businesses_json.data}->>'favoritesForUser')::jsonb, ${user.email}))`,
})
.where(eq(businesses_json.id, id));
}

25
bizmatch-server/src/listings/business-listings.controller.ts
View File

@ -13,21 +13,18 @@ export class BusinessListingsController {
constructor(
private readonly listingsService: BusinessListingService,
@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
) { }
) {}
@UseGuards(OptionalAuthGuard)
@Get(':id')
async findById(@Request() req, @Param('id') id: string): Promise<any> {
return await this.listingsService.findBusinessesById(id, req.user as JwtUser);
}
@UseGuards(AuthGuard)
@Post('favorites/all')
@Get('favorites/all')
async findFavorites(@Request() req): Promise<any> {
return await this.listingsService.findFavoriteListings(req.user as JwtUser);
}
@UseGuards(OptionalAuthGuard)
@Get(':slugOrId')
async findById(@Request() req, @Param('slugOrId') slugOrId: string): Promise<any> {
// Support both slug (e.g., "restaurant-austin-tx-a3f7b2c1") and UUID
return await this.listingsService.findBusinessBySlugOrId(slugOrId, req.user as JwtUser);
}
@UseGuards(OptionalAuthGuard)
@Get('user/:userid')
async findByUserId(@Request() req, @Param('userid') userid: string): Promise<BusinessListing[]> {
@ -63,17 +60,9 @@ export class BusinessListingsController {
await this.listingsService.deleteListing(id);
}
@UseGuards(AuthGuard)
@Post('favorite/:id')
async addFavorite(@Request() req, @Param('id') id: string) {
await this.listingsService.addFavorite(id, req.user as JwtUser);
return { success: true, message: 'Added to favorites' };
}
@UseGuards(AuthGuard)
@Delete('favorite/:id')
async deleteFavorite(@Request() req, @Param('id') id: string) {
await this.listingsService.deleteFavorite(id, req.user as JwtUser);
return { success: true, message: 'Removed from favorites' };
}
}

30
bizmatch-server/src/listings/commercial-property-listings.controller.ts
View File

@ -15,19 +15,18 @@ export class CommercialPropertyListingsController {
private readonly listingsService: CommercialPropertyService,
private fileService: FileService,
@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger,
) { }
@UseGuards(AuthGuard)
@Post('favorites/all')
async findFavorites(@Request() req): Promise<any> {
return await this.listingsService.findFavoriteListings(req.user as JwtUser);
}
) {}
@UseGuards(OptionalAuthGuard)
@Get(':slugOrId')
async findById(@Request() req, @Param('slugOrId') slugOrId: string): Promise<any> {
// Support both slug (e.g., "office-space-austin-tx-a3f7b2c1") and UUID
return await this.listingsService.findCommercialBySlugOrId(slugOrId, req.user as JwtUser);
@Get(':id')
async findById(@Request() req, @Param('id') id: string): Promise<any> {
return await this.listingsService.findCommercialPropertiesById(id, req.user as JwtUser);
}
@UseGuards(AuthGuard)
@Get('favorites/all')
async findFavorites(@Request() req): Promise<any> {
return await this.listingsService.findFavoriteListings(req.user as JwtUser);
}
@UseGuards(OptionalAuthGuard)
@ -65,18 +64,9 @@ export class CommercialPropertyListingsController {
await this.listingsService.deleteListing(id);
this.fileService.deleteDirectoryIfExists(imagePath);
}
@UseGuards(AuthGuard)
@Post('favorite/:id')
async addFavorite(@Request() req, @Param('id') id: string) {
await this.listingsService.addFavorite(id, req.user as JwtUser);
return { success: true, message: 'Added to favorites' };
}
@UseGuards(AuthGuard)
@Delete('favorite/:id')
async deleteFavorite(@Request() req, @Param('id') id: string) {
await this.listingsService.deleteFavorite(id, req.user as JwtUser);
return { success: true, message: 'Removed from favorites' };
}
}

161
bizmatch-server/src/listings/commercial-property.service.ts
View File

@ -10,8 +10,7 @@ import { FileService } from '../file/file.service';
import { GeoService } from '../geo/geo.service';
import { CommercialPropertyListing, CommercialPropertyListingSchema } from '../models/db.model';
import { CommercialPropertyListingCriteria, JwtUser } from '../models/main.model';
import { getDistanceQuery, splitName } from '../utils';
import { generateSlug, extractShortIdFromSlug, isSlug } from '../utils/slug.utils';
import { getDistanceQuery } from '../utils';
@Injectable()
export class CommercialPropertyService {
@ -20,7 +19,7 @@ export class CommercialPropertyService {
@Inject(PG_CONNECTION) private conn: NodePgDatabase<typeof schema>,
private fileService?: FileService,
private geoService?: GeoService,
) { }
) {}
private getWhereConditions(criteria: CommercialPropertyListingCriteria, user: JwtUser): SQL[] {
const whereConditions: SQL[] = [];
@ -32,10 +31,7 @@ export class CommercialPropertyService {
whereConditions.push(sql`${getDistanceQuery(commercials_json, cityGeo.latitude, cityGeo.longitude)} <= ${criteria.radius}`);
}
if (criteria.types && criteria.types.length > 0) {
this.logger.warn('Adding commercial property type filter', { types: criteria.types });
// Use explicit SQL with IN for robust JSONB comparison
const typeValues = criteria.types.map(t => sql`${t}`);
whereConditions.push(sql`((${commercials_json.data}->>'type') IN (${sql.join(typeValues, sql`, `)}))`);
whereConditions.push(inArray(sql`${commercials_json.data}->>'type'`, criteria.types));
}
if (criteria.state) {
@ -51,32 +47,12 @@ export class CommercialPropertyService {
}
if (criteria.title) {
whereConditions.push(
sql`((${commercials_json.data}->>'title') ILIKE ${`%${criteria.title}%`} OR (${commercials_json.data}->>'description') ILIKE ${`%${criteria.title}%`})`
);
whereConditions.push(sql`(${commercials_json.data}->>'title') ILIKE ${`%${criteria.title}%`} OR (${commercials_json.data}->>'description') ILIKE ${`%${criteria.title}%`}`);
}
if (criteria.brokerName) {
const { firstname, lastname } = splitName(criteria.brokerName);
if (firstname === lastname) {
// Single word: search either first OR last name
whereConditions.push(
sql`((${schema.users_json.data}->>'firstname') ILIKE ${`%${firstname}%`} OR (${schema.users_json.data}->>'lastname') ILIKE ${`%${lastname}%`})`
);
} else {
// Multiple words: search both first AND last name
whereConditions.push(
sql`((${schema.users_json.data}->>'firstname') ILIKE ${`%${firstname}%`} AND (${schema.users_json.data}->>'lastname') ILIKE ${`%${lastname}%`})`
);
}
}
if (user?.role !== 'admin') {
whereConditions.push(
sql`((${commercials_json.email} = ${user?.email || null}) OR (${commercials_json.data}->>'draft')::boolean IS NOT TRUE)`
);
whereConditions.push(or(eq(commercials_json.email, user?.email), sql`(${commercials_json.data}->>'draft')::boolean IS NOT TRUE`));
}
this.logger.warn('whereConditions count', { count: whereConditions.length });
// whereConditions.push(and(eq(schema.users.customerType, 'professional')));
return whereConditions;
}
// #### Find by criteria ########################################
@ -86,13 +62,9 @@ export class CommercialPropertyService {
const query = this.conn.select({ commercial: commercials_json }).from(commercials_json).leftJoin(schema.users_json, eq(commercials_json.email, schema.users_json.email));
const whereConditions = this.getWhereConditions(criteria, user);
this.logger.warn('Filter Criteria:', { criteria: JSON.stringify(criteria) });
if (whereConditions.length > 0) {
const whereClause = sql.join(whereConditions, sql` AND `);
query.where(sql`(${whereClause})`);
this.logger.warn('Generated SQL:', { sql: query.toSQL().sql, params: query.toSQL().params });
const whereClause = and(...whereConditions);
query.where(whereClause);
}
// Sortierung
switch (criteria.sortBy) {
@ -130,8 +102,8 @@ export class CommercialPropertyService {
const whereConditions = this.getWhereConditions(criteria, user);
if (whereConditions.length > 0) {
const whereClause = sql.join(whereConditions, sql` AND `);
countQuery.where(sql`(${whereClause})`);
const whereClause = and(...whereConditions);
countQuery.where(whereClause);
}
const [{ value: totalCount }] = await countQuery;
@ -139,54 +111,6 @@ export class CommercialPropertyService {
}
// #### Find by ID ########################################
/**
* Find commercial property by slug or ID
* Supports both slug (e.g., "office-space-austin-tx-a3f7b2c1") and UUID
*/
async findCommercialBySlugOrId(slugOrId: string, user: JwtUser): Promise<CommercialPropertyListing> {
this.logger.debug(`findCommercialBySlugOrId called with: ${slugOrId}`);
let id = slugOrId;
// Check if it's a slug (contains multiple hyphens) vs UUID
if (isSlug(slugOrId)) {
this.logger.debug(`Detected as slug: ${slugOrId}`);
// Extract short ID from slug and find by slug field
const listing = await this.findCommercialBySlug(slugOrId);
if (listing) {
this.logger.debug(`Found listing by slug: ${slugOrId} -> ID: ${listing.id}`);
id = listing.id;
} else {
this.logger.warn(`Slug not found in database: ${slugOrId}`);
throw new NotFoundException(
`Commercial property listing not found with slug: ${slugOrId}. ` +
`The listing may have been deleted or the URL may be incorrect.`
);
}
} else {
this.logger.debug(`Detected as UUID: ${slugOrId}`);
}
return this.findCommercialPropertiesById(id, user);
}
/**
* Find commercial property by slug
*/
async findCommercialBySlug(slug: string): Promise<CommercialPropertyListing | null> {
const result = await this.conn
.select()
.from(commercials_json)
.where(sql`${commercials_json.data}->>'slug' = ${slug}`)
.limit(1);
if (result.length > 0) {
return { id: result[0].id, email: result[0].email, ...(result[0].data as CommercialPropertyListing) } as CommercialPropertyListing;
}
return null;
}
async findCommercialPropertiesById(id: string, user: JwtUser): Promise<CommercialPropertyListing> {
const conditions = [];
if (user?.role !== 'admin') {
@ -222,7 +146,7 @@ export class CommercialPropertyService {
const userFavorites = await this.conn
.select()
.from(commercials_json)
.where(sql`${commercials_json.data}->'favoritesForUser' ? ${user.email}`);
.where(arrayContains(sql`${commercials_json.data}->>'favoritesForUser'`, [user.email]));
return userFavorites.map(l => ({ id: l.id, email: l.email, ...(l.data as CommercialPropertyListing) }) as CommercialPropertyListing);
}
// #### Find by imagePath ########################################
@ -238,9 +162,18 @@ export class CommercialPropertyService {
// #### CREATE ########################################
async createListing(data: CommercialPropertyListing): Promise<CommercialPropertyListing> {
try {
// Generate serialId based on timestamp + random number (temporary solution until sequence is created)
// This ensures uniqueness without requiring a database sequence
const serialId = Date.now() % 1000000 + Math.floor(Math.random() * 1000);
// Hole die nächste serialId von der Sequence
const sequenceResult = await this.conn.execute(sql`SELECT nextval('commercials_json_serial_id_seq') AS serialid`);
// Prüfe, ob ein gültiger Wert zurückgegeben wurde
if (!sequenceResult.rows || !sequenceResult.rows[0] || sequenceResult.rows[0].serialid === undefined) {
throw new Error('Failed to retrieve serialId from sequence commercials_json_serial_id_seq');
}
const serialId = Number(sequenceResult.rows[0].serialid); // Konvertiere BIGINT zu Number
if (isNaN(serialId)) {
throw new Error('Invalid serialId received from sequence');
}
data.created = data.created ? (typeof data.created === 'string' ? new Date(data.created) : data.created) : new Date();
data.updated = new Date();
@ -249,13 +182,7 @@ export class CommercialPropertyService {
const { id, email, ...rest } = data;
const convertedCommercialPropertyListing = { email, data: rest };
const [createdListing] = await this.conn.insert(commercials_json).values(convertedCommercialPropertyListing).returning();
// Generate and update slug after creation (we need the ID first)
const slug = generateSlug(data.title, data.location, createdListing.id);
const listingWithSlug = { ...(createdListing.data as any), slug };
await this.conn.update(commercials_json).set({ data: listingWithSlug }).where(eq(commercials_json.id, createdListing.id));
return { id: createdListing.id, email: createdListing.email, ...(createdListing.data as CommercialPropertyListing), slug } as any;
return { id: createdListing.id, email: createdListing.email, ...(createdListing.data as CommercialPropertyListing) };
} catch (error) {
if (error instanceof ZodError) {
const filteredErrors = error.errors
@ -282,27 +209,14 @@ export class CommercialPropertyService {
if (existingListing.email === user?.email || !user) {
data.favoritesForUser = (<CommercialPropertyListing>existingListing.data).favoritesForUser || [];
}
// Regenerate slug if title or location changed
const existingData = existingListing.data as CommercialPropertyListing;
let slug: string;
if (data.title !== existingData.title || JSON.stringify(data.location) !== JSON.stringify(existingData.location)) {
slug = generateSlug(data.title, data.location, id);
} else {
// Keep existing slug
slug = (existingData as any).slug || generateSlug(data.title, data.location, id);
}
// Add slug to data before validation
const dataWithSlug = { ...data, slug };
CommercialPropertyListingSchema.parse(dataWithSlug);
const imageOrder = await this.fileService.getPropertyImages(dataWithSlug.imagePath, String(dataWithSlug.serialId));
const difference = imageOrder.filter(x => !dataWithSlug.imageOrder.includes(x)).concat(dataWithSlug.imageOrder.filter(x => !imageOrder.includes(x)));
CommercialPropertyListingSchema.parse(data);
const imageOrder = await this.fileService.getPropertyImages(data.imagePath, String(data.serialId));
const difference = imageOrder.filter(x => !data.imageOrder.includes(x)).concat(data.imageOrder.filter(x => !imageOrder.includes(x)));
if (difference.length > 0) {
this.logger.warn(`changes between image directory and imageOrder in listing ${dataWithSlug.serialId}: ${difference.join(',')}`);
dataWithSlug.imageOrder = imageOrder;
this.logger.warn(`changes between image directory and imageOrder in listing ${data.serialId}: ${difference.join(',')}`);
data.imageOrder = imageOrder;
}
const { id: _, email, ...rest } = dataWithSlug;
const { id: _, email, ...rest } = data;
const convertedCommercialPropertyListing = { email, data: rest };
const [updateListing] = await this.conn.update(commercials_json).set(convertedCommercialPropertyListing).where(eq(commercials_json.id, id)).returning();
return { id: updateListing.id, email: updateListing.email, ...(updateListing.data as CommercialPropertyListing) };
@ -339,25 +253,12 @@ export class CommercialPropertyService {
async deleteListing(id: string): Promise<void> {
await this.conn.delete(commercials_json).where(eq(commercials_json.id, id));
}
// #### ADD Favorite ######################################
async addFavorite(id: string, user: JwtUser): Promise<void> {
await this.conn
.update(commercials_json)
.set({
data: sql`jsonb_set(${commercials_json.data}, '{favoritesForUser}',
coalesce((${commercials_json.data}->'favoritesForUser')::jsonb, '[]'::jsonb) || to_jsonb(${user.email}::text))`,
})
.where(eq(commercials_json.id, id));
}
// #### DELETE Favorite ###################################
async deleteFavorite(id: string, user: JwtUser): Promise<void> {
await this.conn
.update(commercials_json)
.set({
data: sql`jsonb_set(${commercials_json.data}, '{favoritesForUser}',
(SELECT coalesce(jsonb_agg(elem), '[]'::jsonb)
FROM jsonb_array_elements(coalesce(${commercials_json.data}->'favoritesForUser', '[]'::jsonb)) AS elem
WHERE elem::text != to_jsonb(${user.email}::text)::text))`,
data: sql`jsonb_set(${commercials_json.data}, '{favoritesForUser}', array_remove((${commercials_json.data}->>'favoritesForUser')::jsonb, ${user.email}))`,
})
.where(eq(commercials_json.id, id));
}

3
bizmatch-server/src/listings/listings.module.ts
View File

@ -6,7 +6,6 @@ import { UserService } from '../user/user.service';
import { BrokerListingsController } from './broker-listings.controller';
import { BusinessListingsController } from './business-listings.controller';
import { CommercialPropertyListingsController } from './commercial-property-listings.controller';
import { UserListingsController } from './user-listings.controller';
import { FirebaseAdminModule } from 'src/firebase-admin/firebase-admin.module';
import { GeoModule } from '../geo/geo.module';
@ -17,7 +16,7 @@ import { UnknownListingsController } from './unknown-listings.controller';
@Module({
imports: [DrizzleModule, AuthModule, GeoModule,FirebaseAdminModule],
controllers: [BusinessListingsController, CommercialPropertyListingsController, UnknownListingsController, BrokerListingsController, UserListingsController],
controllers: [BusinessListingsController, CommercialPropertyListingsController, UnknownListingsController, BrokerListingsController],
providers: [BusinessListingService, CommercialPropertyService, FileService, UserService, BusinessListingService, CommercialPropertyService, GeoService],
exports: [BusinessListingService, CommercialPropertyService],
})

29
bizmatch-server/src/listings/user-listings.controller.ts
View File

@ -1,29 +0,0 @@
import { Controller, Delete, Param, Post, Request, UseGuards } from '@nestjs/common';
import { AuthGuard } from '../jwt-auth/auth.guard';
import { JwtUser } from '../models/main.model';
import { UserService } from '../user/user.service';
@Controller('listings/user')
export class UserListingsController {
constructor(private readonly userService: UserService) { }
@UseGuards(AuthGuard)
@Post('favorite/:id')
async addFavorite(@Request() req, @Param('id') id: string) {
await this.userService.addFavorite(id, req.user as JwtUser);
return { success: true, message: 'Added to favorites' };
}
@UseGuards(AuthGuard)
@Delete('favorite/:id')
async deleteFavorite(@Request() req, @Param('id') id: string) {
await this.userService.deleteFavorite(id, req.user as JwtUser);
return { success: true, message: 'Removed from favorites' };
}
@UseGuards(AuthGuard)
@Post('favorites/all')
async getFavorites(@Request() req) {
return await this.userService.getFavoriteUsers(req.user as JwtUser);
}
}

5
bizmatch-server/src/main.ts
View File

@ -12,9 +12,6 @@ async function bootstrap() {
const logger = app.get<LoggerService>(WINSTON_MODULE_NEST_PROVIDER);
app.useLogger(logger);
//app.use('/bizmatch/payment/webhook', bodyParser.raw({ type: 'application/json' }));
// Serve static files from pictures directory
app.use('/pictures', express.static('pictures'));
app.setGlobalPrefix('bizmatch');
app.enableCors({
@ -22,6 +19,6 @@ async function bootstrap() {
methods: 'GET,HEAD,PUT,PATCH,POST,DELETE',
allowedHeaders: 'Content-Type, Accept, Authorization, x-hide-loading',
});
await app.listen(process.env.PORT || 3001);
await app.listen(3000);
}
bootstrap();

8
bizmatch-server/src/models/db.model.ts
View File

@ -34,7 +34,6 @@ export const CustomerTypeEnum = z.enum(['buyer', 'seller', 'professional']);
export const SubscriptionTypeEnum = z.enum(['free', 'professional', 'broker']);
export const CustomerSubTypeEnum = z.enum(['broker', 'cpa', 'attorney', 'titleCompany', 'surveyor', 'appraiser']);
export const ListingsCategoryEnum = z.enum(['commercialProperty', 'business']);
export const ShareCategoryEnum = z.enum(['commercialProperty', 'business', 'user']);
export const ZodEventTypeEnum = z.enum(['view', 'print', 'email', 'facebook', 'x', 'linkedin', 'contact', 'favorite', 'emailus', 'pricing']);
export type EventTypeEnum = z.infer<typeof ZodEventTypeEnum>;
const PropertyTypeEnum = z.enum(['retail', 'land', 'industrial', 'office', 'mixedUse', 'multifamily', 'uncategorized']);
@ -187,7 +186,6 @@ export const UserSchema = z
updated: z.date().optional().nullable(),
subscriptionId: z.string().optional().nullable(),
subscriptionPlan: SubscriptionTypeEnum.optional().nullable(),
favoritesForUser: z.array(z.string()),
showInDirectory: z.boolean(),
})
.superRefine((data, ctx) => {
@ -289,7 +287,6 @@ export const BusinessListingSchema = z
brokerLicencing: z.string().optional().nullable(),
internals: z.string().min(5).optional().nullable(),
imageName: z.string().optional().nullable(),
slug: z.string().optional().nullable(),
created: z.date(),
updated: z.date(),
})
@ -336,7 +333,6 @@ export const CommercialPropertyListingSchema = z
draft: z.boolean(),
imageOrder: z.array(z.string()),
imagePath: z.string().nullable().optional(),
slug: z.string().optional().nullable(),
created: z.date(),
updated: z.date(),
})
@ -371,7 +367,7 @@ export const ShareByEMailSchema = z.object({
listingTitle: z.string().optional().nullable(),
url: z.string().url({ message: 'Invalid URL format' }).optional().nullable(),
id: z.string().optional().nullable(),
type: ShareCategoryEnum,
type: ListingsCategoryEnum,
});
export type ShareByEMail = z.infer<typeof ShareByEMailSchema>;
@ -388,6 +384,6 @@ export const ListingEventSchema = z.object({
locationLat: z.string().max(20).optional().nullable(), // Latitude, als String
locationLng: z.string().max(20).optional().nullable(), // Longitude, als String
referrer: z.string().max(255).optional().nullable(), // Referrer URL, optional
additionalData: z.record(z.string(), z.any()).optional().nullable(), // JSON für zusätzliche Daten, z.B. soziale Medien, optional
additionalData: z.record(z.any()).optional().nullable(), // JSON für zusätzliche Daten, z.B. soziale Medien, optional
});
export type ListingEvent = z.infer<typeof ListingEventSchema>;

8
bizmatch-server/src/models/main.model.ts
View File

@ -1,3 +1,4 @@
import Stripe from 'stripe';
import { BusinessListing, CommercialPropertyListing, Sender, SortByOptions, SortByTypes, User } from './db.model';
import { State } from './server.model';
@ -96,7 +97,6 @@ export interface CommercialPropertyListingCriteria extends ListCriteria {
minPrice: number;
maxPrice: number;
title: string;
brokerName: string;
criteriaType: 'commercialPropertyListings';
}
export interface UserListingCriteria extends ListCriteria {
@ -359,8 +359,6 @@ export function createDefaultUser(email: string, firstname: string, lastname: st
updated: new Date(),
subscriptionId: null,
subscriptionPlan: subscriptionPlan,
favoritesForUser: [],
showInDirectory: false,
};
}
export function createDefaultCommercialPropertyListing(): CommercialPropertyListing {
@ -410,6 +408,8 @@ export function createDefaultBusinessListing(): BusinessListing {
listingsCategory: 'business',
};
}
export type StripeSubscription = Stripe.Subscription;
export type StripeUser = Stripe.Customer;
export type IpInfo = {
ip: string;
city: string;
@ -423,6 +423,8 @@ export type IpInfo = {
export interface CombinedUser {
keycloakUser?: KeycloakUser;
appUser?: User;
stripeUser?: StripeUser;
stripeSubscription?: StripeSubscription;
}
export interface RealIpInfo {
ip: string;

57
bizmatch-server/src/scripts/debug-favorites.ts
View File

@ -1,57 +0,0 @@
import { drizzle } from 'drizzle-orm/node-postgres';
import { Client } from 'pg';
import * as schema from '../drizzle/schema';
import { sql } from 'drizzle-orm';
import * as dotenv from 'dotenv';
dotenv.config();
const client = new Client({
connectionString: process.env.PG_CONNECTION,
});
async function main() {
await client.connect();
const db = drizzle(client, { schema });
const testEmail = 'knuth.timo@gmail.com';
const targetEmail = 'target.user@example.com';
console.log('--- Starting Debug Script ---');
// 1. Simulate finding a user to favorite (using a dummy or existing one)
// For safety, let's just query existing users to see if any have favorites set
const usersWithFavorites = await db.select({
id: schema.users_json.id,
email: schema.users_json.email,
favorites: sql`${schema.users_json.data}->'favoritesForUser'`
}).from(schema.users_json);
console.log(`Found ${usersWithFavorites.length} users.`);
const usersWithAnyFavorites = usersWithFavorites.filter(u => u.favorites !== null);
console.log(`Users with 'favoritesForUser' field:`, JSON.stringify(usersWithAnyFavorites, null, 2));
// 2. Test the specific WHERE clause used in the service
// .where(sql`${schema.users_json.data}->'favoritesForUser' @> ${JSON.stringify([user.email])}::jsonb`);
console.log(`Testing query for email: ${testEmail}`);
try {
const result = await db
.select({
id: schema.users_json.id,
email: schema.users_json.email
})
.from(schema.users_json)
.where(sql`${schema.users_json.data}->'favoritesForUser' @> ${JSON.stringify([testEmail])}::jsonb`);
console.log('Query Result:', result);
} catch (e) {
console.error('Query Failed:', e);
}
await client.end();
}
main().catch(console.error);

62
bizmatch-server/src/sitemap/sitemap.controller.ts
View File

@ -1,62 +0,0 @@
import { Controller, Get, Header, Param, ParseIntPipe } from '@nestjs/common';
import { SitemapService } from './sitemap.service';
@Controller()
export class SitemapController {
constructor(private readonly sitemapService: SitemapService) { }
/**
* Main sitemap index - lists all sitemap files
* Route: /sitemap.xml
*/
@Get('sitemap.xml')
@Header('Content-Type', 'application/xml')
@Header('Cache-Control', 'public, max-age=3600')
async getSitemapIndex(): Promise<string> {
return await this.sitemapService.generateSitemapIndex();
}
/**
* Static pages sitemap
* Route: /sitemap/static.xml
*/
@Get('sitemap/static.xml')
@Header('Content-Type', 'application/xml')
@Header('Cache-Control', 'public, max-age=3600')
async getStaticSitemap(): Promise<string> {
return await this.sitemapService.generateStaticSitemap();
}
/**
* Business listings sitemap (paginated)
* Route: /sitemap/business-1.xml, /sitemap/business-2.xml, etc.
*/
@Get('sitemap/business-:page.xml')
@Header('Content-Type', 'application/xml')
@Header('Cache-Control', 'public, max-age=3600')
async getBusinessSitemap(@Param('page', ParseIntPipe) page: number): Promise<string> {
return await this.sitemapService.generateBusinessSitemap(page);
}
/**
* Commercial property sitemap (paginated)
* Route: /sitemap/commercial-1.xml, /sitemap/commercial-2.xml, etc.
*/
@Get('sitemap/commercial-:page.xml')
@Header('Content-Type', 'application/xml')
@Header('Cache-Control', 'public, max-age=3600')
async getCommercialSitemap(@Param('page', ParseIntPipe) page: number): Promise<string> {
return await this.sitemapService.generateCommercialSitemap(page);
}
/**
* Broker profiles sitemap (paginated)
* Route: /sitemap/brokers-1.xml, /sitemap/brokers-2.xml, etc.
*/
@Get('sitemap/brokers-:page.xml')
@Header('Content-Type', 'application/xml')
@Header('Cache-Control', 'public, max-age=3600')
async getBrokerSitemap(@Param('page', ParseIntPipe) page: number): Promise<string> {
return await this.sitemapService.generateBrokerSitemap(page);
}
}

12
bizmatch-server/src/sitemap/sitemap.module.ts
View File

@ -1,12 +0,0 @@
import { Module } from '@nestjs/common';
import { SitemapController } from './sitemap.controller';
import { SitemapService } from './sitemap.service';
import { DrizzleModule } from '../drizzle/drizzle.module';
@Module({
imports: [DrizzleModule],
controllers: [SitemapController],
providers: [SitemapService],
exports: [SitemapService],
})
export class SitemapModule {}

362
bizmatch-server/src/sitemap/sitemap.service.ts
View File

@ -1,362 +0,0 @@
import { Inject, Injectable } from '@nestjs/common';
import { eq, sql } from 'drizzle-orm';
import { NodePgDatabase } from 'drizzle-orm/node-postgres';
import * as schema from '../drizzle/schema';
import { PG_CONNECTION } from '../drizzle/schema';
interface SitemapUrl {
loc: string;
lastmod?: string;
changefreq?: 'always' | 'hourly' | 'daily' | 'weekly' | 'monthly' | 'yearly' | 'never';
priority?: number;
}
interface SitemapIndexEntry {
loc: string;
lastmod?: string;
}
@Injectable()
export class SitemapService {
private readonly baseUrl = 'https://biz-match.com';
private readonly URLS_PER_SITEMAP = 10000; // Google best practice
constructor(@Inject(PG_CONNECTION) private readonly db: NodePgDatabase<typeof schema>) { }
/**
* Generate sitemap index (main sitemap.xml)
* Lists all sitemap files: static, business-1, business-2, commercial-1, etc.
*/
async generateSitemapIndex(): Promise<string> {
const sitemaps: SitemapIndexEntry[] = [];
// Add static pages sitemap
sitemaps.push({
loc: `${this.baseUrl}/bizmatch/sitemap/static.xml`,
lastmod: this.formatDate(new Date()),
});
// Count business listings
const businessCount = await this.getBusinessListingsCount();
const businessPages = Math.ceil(businessCount / this.URLS_PER_SITEMAP) || 1;
for (let page = 1; page <= businessPages; page++) {
sitemaps.push({
loc: `${this.baseUrl}/bizmatch/sitemap/business-${page}.xml`,
lastmod: this.formatDate(new Date()),
});
}
// Count commercial property listings
const commercialCount = await this.getCommercialPropertiesCount();
const commercialPages = Math.ceil(commercialCount / this.URLS_PER_SITEMAP) || 1;
for (let page = 1; page <= commercialPages; page++) {
sitemaps.push({
loc: `${this.baseUrl}/bizmatch/sitemap/commercial-${page}.xml`,
lastmod: this.formatDate(new Date()),
});
}
// Count broker profiles
const brokerCount = await this.getBrokerProfilesCount();
const brokerPages = Math.ceil(brokerCount / this.URLS_PER_SITEMAP) || 1;
for (let page = 1; page <= brokerPages; page++) {
sitemaps.push({
loc: `${this.baseUrl}/bizmatch/sitemap/brokers-${page}.xml`,
lastmod: this.formatDate(new Date()),
});
}
return this.buildXmlSitemapIndex(sitemaps);
}
/**
* Generate static pages sitemap
*/
async generateStaticSitemap(): Promise<string> {
const urls = this.getStaticPageUrls();
return this.buildXmlSitemap(urls);
}
/**
* Generate business listings sitemap (paginated)
*/
async generateBusinessSitemap(page: number): Promise<string> {
const offset = (page - 1) * this.URLS_PER_SITEMAP;
const urls = await this.getBusinessListingUrls(offset, this.URLS_PER_SITEMAP);
return this.buildXmlSitemap(urls);
}
/**
* Generate commercial property sitemap (paginated)
*/
async generateCommercialSitemap(page: number): Promise<string> {
const offset = (page - 1) * this.URLS_PER_SITEMAP;
const urls = await this.getCommercialPropertyUrls(offset, this.URLS_PER_SITEMAP);
return this.buildXmlSitemap(urls);
}
/**
* Build XML sitemap index
*/
private buildXmlSitemapIndex(sitemaps: SitemapIndexEntry[]): string {
const sitemapElements = sitemaps
.map(sitemap => {
let element = ` <sitemap>\n <loc>${sitemap.loc}</loc>`;
if (sitemap.lastmod) {
element += `\n <lastmod>${sitemap.lastmod}</lastmod>`;
}
element += '\n </sitemap>';
return element;
})
.join('\n');
return `<?xml version="1.0" encoding="UTF-8"?>
<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
${sitemapElements}
</sitemapindex>`;
}
/**
* Build XML sitemap string
*/
private buildXmlSitemap(urls: SitemapUrl[]): string {
const urlElements = urls.map(url => this.buildUrlElement(url)).join('\n ');
return `<?xml version="1.0" encoding="UTF-8"?>
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
${urlElements}
</urlset>`;
}
/**
* Build single URL element
*/
private buildUrlElement(url: SitemapUrl): string {
let element = `<url>\n <loc>${url.loc}</loc>`;
if (url.lastmod) {
element += `\n <lastmod>${url.lastmod}</lastmod>`;
}
if (url.changefreq) {
element += `\n <changefreq>${url.changefreq}</changefreq>`;
}
if (url.priority !== undefined) {
element += `\n <priority>${url.priority.toFixed(1)}</priority>`;
}
element += '\n </url>';
return element;
}
/**
* Get static page URLs
*/
private getStaticPageUrls(): SitemapUrl[] {
return [
{
loc: `${this.baseUrl}/`,
changefreq: 'daily',
priority: 1.0,
},
{
loc: `${this.baseUrl}/home`,
changefreq: 'daily',
priority: 1.0,
},
{
loc: `${this.baseUrl}/businessListings`,
changefreq: 'daily',
priority: 0.9,
},
{
loc: `${this.baseUrl}/commercialPropertyListings`,
changefreq: 'daily',
priority: 0.9,
},
{
loc: `${this.baseUrl}/brokerListings`,
changefreq: 'daily',
priority: 0.8,
},
{
loc: `${this.baseUrl}/terms-of-use`,
changefreq: 'monthly',
priority: 0.5,
},
{
loc: `${this.baseUrl}/privacy-statement`,
changefreq: 'monthly',
priority: 0.5,
},
];
}
/**
* Count business listings (non-draft)
*/
private async getBusinessListingsCount(): Promise<number> {
try {
const result = await this.db
.select({ count: sql<number>`count(*)` })
.from(schema.businesses_json)
.where(sql`(${schema.businesses_json.data}->>'draft')::boolean IS NOT TRUE`);
return Number(result[0]?.count || 0);
} catch (error) {
console.error('Error counting business listings:', error);
return 0;
}
}
/**
* Count commercial properties (non-draft)
*/
private async getCommercialPropertiesCount(): Promise<number> {
try {
const result = await this.db
.select({ count: sql<number>`count(*)` })
.from(schema.commercials_json)
.where(sql`(${schema.commercials_json.data}->>'draft')::boolean IS NOT TRUE`);
return Number(result[0]?.count || 0);
} catch (error) {
console.error('Error counting commercial properties:', error);
return 0;
}
}
/**
* Get business listing URLs from database (paginated, slug-based)
*/
private async getBusinessListingUrls(offset: number, limit: number): Promise<SitemapUrl[]> {
try {
const listings = await this.db
.select({
id: schema.businesses_json.id,
slug: sql<string>`${schema.businesses_json.data}->>'slug'`,
updated: sql<Date>`(${schema.businesses_json.data}->>'updated')::timestamptz`,
created: sql<Date>`(${schema.businesses_json.data}->>'created')::timestamptz`,
})
.from(schema.businesses_json)
.where(sql`(${schema.businesses_json.data}->>'draft')::boolean IS NOT TRUE`)
.limit(limit)
.offset(offset);
return listings.map(listing => {
const urlSlug = listing.slug || listing.id;
return {
loc: `${this.baseUrl}/business/${urlSlug}`,
lastmod: this.formatDate(listing.updated || listing.created),
changefreq: 'weekly' as const,
priority: 0.8,
};
});
} catch (error) {
console.error('Error fetching business listings for sitemap:', error);
return [];
}
}
/**
* Get commercial property URLs from database (paginated, slug-based)
*/
private async getCommercialPropertyUrls(offset: number, limit: number): Promise<SitemapUrl[]> {
try {
const properties = await this.db
.select({
id: schema.commercials_json.id,
slug: sql<string>`${schema.commercials_json.data}->>'slug'`,
updated: sql<Date>`(${schema.commercials_json.data}->>'updated')::timestamptz`,
created: sql<Date>`(${schema.commercials_json.data}->>'created')::timestamptz`,
})
.from(schema.commercials_json)
.where(sql`(${schema.commercials_json.data}->>'draft')::boolean IS NOT TRUE`)
.limit(limit)
.offset(offset);
return properties.map(property => {
const urlSlug = property.slug || property.id;
return {
loc: `${this.baseUrl}/commercial-property/${urlSlug}`,
lastmod: this.formatDate(property.updated || property.created),
changefreq: 'weekly' as const,
priority: 0.8,
};
});
} catch (error) {
console.error('Error fetching commercial properties for sitemap:', error);
return [];
}
}
/**
* Format date to ISO 8601 format (YYYY-MM-DD)
*/
private formatDate(date: Date | string): string {
if (!date) return new Date().toISOString().split('T')[0];
const d = typeof date === 'string' ? new Date(date) : date;
return d.toISOString().split('T')[0];
}
/**
* Generate broker profiles sitemap (paginated)
*/
async generateBrokerSitemap(page: number): Promise<string> {
const offset = (page - 1) * this.URLS_PER_SITEMAP;
const urls = await this.getBrokerProfileUrls(offset, this.URLS_PER_SITEMAP);
return this.buildXmlSitemap(urls);
}
/**
* Count broker profiles (professionals with showInDirectory=true)
*/
private async getBrokerProfilesCount(): Promise<number> {
try {
const result = await this.db
.select({ count: sql<number>`count(*)` })
.from(schema.users_json)
.where(sql`
(${schema.users_json.data}->>'customerType') = 'professional'
AND (${schema.users_json.data}->>'showInDirectory')::boolean IS TRUE
`);
return Number(result[0]?.count || 0);
} catch (error) {
console.error('Error counting broker profiles:', error);
return 0;
}
}
/**
* Get broker profile URLs from database (paginated)
*/
private async getBrokerProfileUrls(offset: number, limit: number): Promise<SitemapUrl[]> {
try {
const brokers = await this.db
.select({
email: schema.users_json.email,
updated: sql<Date>`(${schema.users_json.data}->>'updated')::timestamptz`,
created: sql<Date>`(${schema.users_json.data}->>'created')::timestamptz`,
})
.from(schema.users_json)
.where(sql`
(${schema.users_json.data}->>'customerType') = 'professional'
AND (${schema.users_json.data}->>'showInDirectory')::boolean IS TRUE
`)
.limit(limit)
.offset(offset);
return brokers.map(broker => ({
loc: `${this.baseUrl}/details-user/${encodeURIComponent(broker.email)}`,
lastmod: this.formatDate(broker.updated || broker.created),
changefreq: 'weekly' as const,
priority: 0.7,
}));
} catch (error) {
console.error('Error fetching broker profiles for sitemap:', error);
return [];
}
}
}

41
bizmatch-server/src/user/user.service.ts
View File

@ -19,20 +19,17 @@ export class UserService {
@Inject(PG_CONNECTION) private conn: NodePgDatabase<typeof schema>,
private fileService: FileService,
private geoService: GeoService,
) { }
) {}
private getWhereConditions(criteria: UserListingCriteria): SQL[] {
const whereConditions: SQL[] = [];
whereConditions.push(sql`(${schema.users_json.data}->>'customerType') = 'professional'`);
if (criteria.city && criteria.searchType === 'exact') {
whereConditions.push(sql`(${schema.users_json.data}->'location'->>'name') ILIKE ${criteria.city.name}`);
}
if (criteria.city && criteria.radius && criteria.searchType === 'radius' && criteria.radius) {
const cityGeo = this.geoService.getCityWithCoords(criteria.state, criteria.city.name);
const distanceQuery = getDistanceQuery(schema.users_json, cityGeo.latitude, cityGeo.longitude);
whereConditions.push(sql`${distanceQuery} <= ${criteria.radius}`);
whereConditions.push(sql`${getDistanceQuery(schema.users_json, cityGeo.latitude, cityGeo.longitude)} <= ${criteria.radius}`);
}
if (criteria.types && criteria.types.length > 0) {
// whereConditions.push(inArray(schema.users.customerSubType, criteria.types));
@ -49,11 +46,11 @@ export class UserService {
}
if (criteria.counties && criteria.counties.length > 0) {
whereConditions.push(or(...criteria.counties.map(county => sql`(${schema.users_json.data}->'location'->>'county') ILIKE ${`%${county}%`}`)));
whereConditions.push(or(...criteria.counties.map(county => sql`EXISTS (SELECT 1 FROM jsonb_array_elements(${schema.users_json.data}->'areasServed') AS area WHERE area->>'county' ILIKE ${`%${county}%`})`)));
}
if (criteria.state) {
whereConditions.push(sql`(${schema.users_json.data}->'location'->>'state') = ${criteria.state}`);
whereConditions.push(sql`EXISTS (SELECT 1 FROM jsonb_array_elements(${schema.users_json.data}->'areasServed') AS area WHERE area->>'state' = ${criteria.state})`);
}
//never show user which denied
@ -158,34 +155,4 @@ export class UserService {
throw error;
}
}
async addFavorite(id: string, user: JwtUser): Promise<void> {
await this.conn
.update(schema.users_json)
.set({
data: sql`jsonb_set(${schema.users_json.data}, '{favoritesForUser}',
coalesce((${schema.users_json.data}->'favoritesForUser')::jsonb, '[]'::jsonb) || to_jsonb(${user.email}::text))`,
} as any)
.where(eq(schema.users_json.id, id));
}
async deleteFavorite(id: string, user: JwtUser): Promise<void> {
await this.conn
.update(schema.users_json)
.set({
data: sql`jsonb_set(${schema.users_json.data}, '{favoritesForUser}',
(SELECT coalesce(jsonb_agg(elem), '[]'::jsonb)
FROM jsonb_array_elements(coalesce(${schema.users_json.data}->'favoritesForUser', '[]'::jsonb)) AS elem
WHERE elem::text != to_jsonb(${user.email}::text)::text))`,
} as any)
.where(eq(schema.users_json.id, id));
}
async getFavoriteUsers(user: JwtUser): Promise<User[]> {
const data = await this.conn
.select()
.from(schema.users_json)
.where(sql`${schema.users_json.data}->'favoritesForUser' ? ${user.email}`);
return data.map(u => ({ id: u.id, email: u.email, ...(u.data as User) }) as User);
}
}

183
bizmatch-server/src/utils/slug.utils.ts
View File

@ -1,183 +0,0 @@
/**
* Utility functions for generating and parsing SEO-friendly URL slugs
*
* Slug format: {title}-{location}-{short-id}
* Example: italian-restaurant-austin-tx-a3f7b2c1
*/
/**
* Generate a SEO-friendly URL slug from listing data
*
* @param title - The listing title (e.g., "Italian Restaurant")
* @param location - Location object with name, county, and state
* @param id - The listing UUID
* @returns SEO-friendly slug (e.g., "italian-restaurant-austin-tx-a3f7b2c1")
*/
export function generateSlug(title: string, location: any, id: string): string {
if (!title || !id) {
throw new Error('Title and ID are required to generate a slug');
}
// Clean and slugify the title
const titleSlug = title
.toLowerCase()
.trim()
.replace(/[^\w\s-]/g, '') // Remove special characters
.replace(/\s+/g, '-') // Replace spaces with hyphens
.replace(/-+/g, '-') // Replace multiple hyphens with single hyphen
.substring(0, 50); // Limit title to 50 characters
// Get location string
let locationSlug = '';
if (location) {
const locationName = location.name || location.county || '';
const state = location.state || '';
if (locationName) {
locationSlug = locationName
.toLowerCase()
.trim()
.replace(/[^\w\s-]/g, '')
.replace(/\s+/g, '-')
.replace(/-+/g, '-');
}
if (state) {
locationSlug = locationSlug
? `${locationSlug}-${state.toLowerCase()}`
: state.toLowerCase();
}
}
// Get first 8 characters of UUID for uniqueness
const shortId = id.substring(0, 8);
// Combine parts: title-location-id
const parts = [titleSlug, locationSlug, shortId].filter(Boolean);
const slug = parts.join('-');
// Final cleanup
return slug
.replace(/-+/g, '-') // Remove duplicate hyphens
.replace(/^-|-$/g, '') // Remove leading/trailing hyphens
.toLowerCase();
}
/**
* Extract the UUID from a slug
* The UUID is always the last segment (8 characters)
*
* @param slug - The URL slug (e.g., "italian-restaurant-austin-tx-a3f7b2c1")
* @returns The short ID (e.g., "a3f7b2c1")
*/
export function extractShortIdFromSlug(slug: string): string {
if (!slug) {
throw new Error('Slug is required');
}
const parts = slug.split('-');
return parts[parts.length - 1];
}
/**
* Validate if a string looks like a valid slug
*
* @param slug - The string to validate
* @returns true if the string looks like a valid slug
*/
export function isValidSlug(slug: string): boolean {
if (!slug || typeof slug !== 'string') {
return false;
}
// Check if slug contains only lowercase letters, numbers, and hyphens
const slugPattern = /^[a-z0-9-]+$/;
if (!slugPattern.test(slug)) {
return false;
}
// Check if slug has a reasonable length (at least 10 chars for short-id + some content)
if (slug.length < 10) {
return false;
}
// Check if last segment looks like a UUID prefix (8 chars of alphanumeric)
const parts = slug.split('-');
const lastPart = parts[parts.length - 1];
return lastPart.length === 8 && /^[a-z0-9]{8}$/.test(lastPart);
}
/**
* Check if a parameter is a slug (vs a UUID)
*
* @param param - The URL parameter
* @returns true if it's a slug, false if it's likely a UUID
*/
export function isSlug(param: string): boolean {
if (!param) {
return false;
}
// UUIDs have a specific format with hyphens at specific positions
// e.g., "a3f7b2c1-4d5e-6789-abcd-1234567890ef"
const uuidPattern = /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i;
if (uuidPattern.test(param)) {
return false; // It's a UUID
}
// If it contains at least 3 parts (e.g., title-state-id or title-city-state-id) and looks like our slug format, it's probably a slug
return param.split('-').length >= 3 && isValidSlug(param);
}
/**
* Regenerate slug from updated listing data
* Useful when title or location changes
*
* @param title - Updated title
* @param location - Updated location
* @param existingSlug - The current slug (to preserve short-id)
* @returns New slug with same short-id
*/
export function regenerateSlug(title: string, location: any, existingSlug: string): string {
if (!existingSlug) {
throw new Error('Existing slug is required to regenerate');
}
const shortId = extractShortIdFromSlug(existingSlug);
// Reconstruct full UUID from short-id (not possible, so we use full existing slug's ID)
// In practice, you'd need the full UUID from the database
// For now, we'll construct a new slug with the short-id
const titleSlug = title
.toLowerCase()
.trim()
.replace(/[^\w\s-]/g, '')
.replace(/\s+/g, '-')
.replace(/-+/g, '-')
.substring(0, 50);
let locationSlug = '';
if (location) {
const locationName = location.name || location.county || '';
const state = location.state || '';
if (locationName) {
locationSlug = locationName
.toLowerCase()
.trim()
.replace(/[^\w\s-]/g, '')
.replace(/\s+/g, '-')
.replace(/-+/g, '-');
}
if (state) {
locationSlug = locationSlug
? `${locationSlug}-${state.toLowerCase()}`
: state.toLowerCase();
}
}
const parts = [titleSlug, locationSlug, shortId].filter(Boolean);
return parts.join('-').replace(/-+/g, '-').replace(/^-|-$/g, '').toLowerCase();
}

9
bizmatch-server/tsconfig.json
View File

@ -19,12 +19,5 @@
"forceConsistentCasingInFileNames": true,
"noFallthroughCasesInSwitch": false,
"esModuleInterop": true
},
"exclude": [
"node_modules",
"dist",
"src/scripts/seed-database.ts",
"src/scripts/create-test-user.ts",
"src/sitemap"
]
}
}

91
bizmatch/DEPLOYMENT.md
View File

@ -1,91 +0,0 @@
# BizMatch Deployment Guide
## Übersicht
| Umgebung | Befehl | Port | SSR |
|----------|--------|------|-----|
| **Development** | `npm start` | 4200 | ❌ Aus |
| **Production** | `npm run build:ssr` → `npm run serve:ssr` | 4200 | ✅ An |
---
## Development (Lokale Entwicklung)
```bash
cd ~/bizmatch-project/bizmatch
npm start
```
- Läuft auf http://localhost:4200
- Hot-Reload aktiv
- Kein SSR (schneller für Entwicklung)
---
## Production Deployment
### 1. Build erstellen
```bash
npm run build:ssr
```
Erstellt optimierte Bundles in `dist/bizmatch/`
### 2. Server starten
**Direkt (zum Testen):**
```bash
npm run serve:ssr
```
**Mit PM2 (empfohlen für Production):**
```bash
# Einmal PM2 installieren
npm install -g pm2
# Server starten
pm2 start dist/bizmatch/server/server.mjs --name "bizmatch"
# Nach Code-Änderungen
npm run build:ssr && pm2 restart bizmatch
# Logs anzeigen
pm2 logs bizmatch
# Status prüfen
pm2 status
```
### 3. Nginx Reverse Proxy (optional)
```nginx
server {
listen 80;
server_name deinedomain.com;
location / {
proxy_pass http://localhost:4200;
proxy_http_version 1.1;
proxy_set_header Host $host;
proxy_set_header X-Real-IP $remote_addr;
}
}
```
---
## SEO Features (aktiv mit SSR)
- ✅ Server-Side Rendering für alle Seiten
- ✅ Meta-Tags und Titel werden serverseitig generiert
- ✅ Sitemaps unter `/sitemap.xml`
- ✅ robots.txt konfiguriert
- ✅ Strukturierte Daten (Schema.org)
---
## Wichtige Dateien
| Datei | Zweck |
|-------|-------|
| `server.ts` | Express SSR Server |
| `src/main.server.ts` | Angular Server Entry Point |
| `src/ssr-dom-polyfill.ts` | DOM Polyfills für SSR |
| `dist/bizmatch/server/` | Kompilierte Server-Bundles |

13
bizmatch/Dockerfile
View File

@ -1,13 +0,0 @@
FROM node:22-alpine
WORKDIR /app
# GANZEN dist-Ordner kopieren, nicht nur bizmatch
COPY dist ./dist
COPY package*.json ./
RUN npm ci --omit=dev
EXPOSE 4200
CMD ["node", "dist/bizmatch/server/server.mjs"]

275
bizmatch/SSR_ANLEITUNG.md
View File

@ -1,275 +0,0 @@
# BizMatch SSR - Schritt-für-Schritt-Anleitung
## Problem: SSR startet nicht auf neuem Laptop?
Diese Anleitung hilft Ihnen, BizMatch mit Server-Side Rendering (SSR) auf einem neuen Rechner zum Laufen zu bringen.
---
## Voraussetzungen prüfen
```bash
# Node.js Version prüfen (mind. v18 erforderlich)
node --version
# npm Version prüfen
npm --version
# Falls Node.js fehlt oder veraltet ist:
# https://nodejs.org/ → LTS Version herunterladen
```
---
## Schritt 1: Repository klonen (falls noch nicht geschehen)
```bash
git clone https://gitea.bizmatch.net/aknuth/bizmatch-project.git
cd bizmatch-project/bizmatch
```
---
## Schritt 2: Dependencies installieren
**WICHTIG:** Dieser Schritt ist essentiell und wird oft vergessen!
```bash
cd ~/bizmatch-project/bizmatch
npm install
```
> **Tipp:** Bei Problemen versuchen Sie: `rm -rf node_modules package-lock.json && npm install`
---
## ⚠️ WICHTIG: Erstes Setup auf neuem Laptop
**Wenn Sie das Projekt zum ersten Mal auf einem neuen Rechner klonen, müssen Sie ZUERST einen Build erstellen!**
```bash
cd ~/bizmatch-project/bizmatch
# 1. Dependencies installieren
npm install
# 2. Build erstellen (erstellt dist/bizmatch/server/index.server.html)
npm run build:ssr
```
**Warum?**
- Die `dist/` Folder werden NICHT ins Git eingecheckt (`.gitignore`)
- Die Datei `dist/bizmatch/server/index.server.html` fehlt nach `git clone`
- Ohne Build → `npm run serve:ssr` crasht mit "Cannot find index.server.html"
**Nach dem ersten Build** können Sie dann Development-Befehle nutzen.
---
## Schritt 3: Umgebung wählen
### Option A: Entwicklung (OHNE SSR)
Schnellster Weg für lokale Entwicklung:
```bash
npm start
```
- Öffnet automatisch: http://localhost:4200
- Hot-Reload aktiv (Code-Änderungen werden sofort sichtbar)
- **Kein SSR** (schneller für Entwicklung)
### Option B: Development mit SSR
Für SSR-Testing während der Entwicklung:
```bash
npm run dev:ssr
```
- Öffnet: http://localhost:4200
- Hot-Reload aktiv
- **SSR aktiv** (simuliert Production)
- Nutzt DOM-Polyfills via `ssr-dom-preload.mjs`
### Option C: Production Build mit SSR
Für finalen Production-Test:
```bash
# 1. Build erstellen
npm run build:ssr
# 2. Server starten
npm run serve:ssr
```
- Server läuft auf: http://localhost:4200
- **Vollständiges SSR** (wie in Production)
- Kein Hot-Reload (für Änderungen erneut builden)
---
## Schritt 4: Testen
Öffnen Sie http://localhost:4200 im Browser.
### SSR funktioniert, wenn:
1. **Seitenquelltext ansehen** (Rechtsklick → "Seitenquelltext anzeigen"):
- HTML-Inhalt ist bereits vorhanden (nicht nur `<app-root></app-root>`)
- Meta-Tags sind sichtbar
2. **JavaScript deaktivieren** (Chrome DevTools → Settings → Disable JavaScript):
- Seite zeigt Inhalt an (wenn auch nicht interaktiv)
3. **Network-Tab** (Chrome DevTools → Network → Doc):
- HTML-Response enthält bereits gerenderten Content
---
## Häufige Probleme und Lösungen
### Problem 1: `npm: command not found`
**Lösung:** Node.js installieren
```bash
# Ubuntu/Debian
curl -fsSL https://deb.nodesource.com/setup_lts.x | sudo -E bash -
sudo apt-get install -y nodejs
# macOS
brew install node
# Windows
# https://nodejs.org/ → Installer herunterladen
```
### Problem 2: `Cannot find module '@angular/ssr'`
**Lösung:** Dependencies neu installieren
```bash
rm -rf node_modules package-lock.json
npm install
```
### Problem 3: `Error: EADDRINUSE: address already in use :::4200`
**Lösung:** Port ist bereits belegt
```bash
# Prozess finden und beenden
lsof -i :4200
kill -9 <PID>
# Oder anderen Port nutzen
PORT=4300 npm run serve:ssr
```
### Problem 4: `Error loading @angular/platform-server` oder "Cannot find index.server.html"
**Lösung:** Build fehlt oder ist veraltet
```bash
# dist-Ordner löschen und neu builden
rm -rf dist
npm run build:ssr
# Dann starten
npm run serve:ssr
```
**Häufiger Fehler auf neuem Laptop:**
- Nach `git pull` fehlt der `dist/` Ordner komplett
- `index.server.html` wird beim Build erstellt, nicht ins Git eingecheckt
- **Lösung:** Immer erst `npm run build:ssr` ausführen!
### Problem 5: "Seite lädt nicht" oder "White Screen"
**Lösung:**
1. Browser-Cache leeren (Strg+Shift+R / Cmd+Shift+R)
2. DevTools öffnen → Console-Tab → Fehler prüfen
3. Sicherstellen, dass Backend läuft (falls API-Calls)
### Problem 6: "Module not found: Error: Can't resolve 'window'"
**Lösung:** Browser-spezifischer Code wird im SSR-Build verwendet
- Prüfen Sie `ssr-dom-polyfill.ts` - DOM-Mocks sollten vorhanden sein
- Code mit `isPlatformBrowser()` schützen:
```typescript
import { isPlatformBrowser } from '@angular/common';
import { PLATFORM_ID } from '@angular/core';
constructor(@Inject(PLATFORM_ID) private platformId: Object) {}
ngOnInit() {
if (isPlatformBrowser(this.platformId)) {
// Nur im Browser ausführen
window.scrollTo(0, 0);
}
}
```
---
## Production Deployment mit PM2
Für dauerhaften Betrieb (Server-Umgebung):
```bash
# PM2 global installieren
npm install -g pm2
# Production Build
npm run build:ssr
# Server mit PM2 starten
pm2 start dist/bizmatch/server/server.mjs --name "bizmatch"
# Auto-Start bei Server-Neustart
pm2 startup
pm2 save
# Logs anzeigen
pm2 logs bizmatch
# Server neustarten nach Updates
npm run build:ssr && pm2 restart bizmatch
```
---
## Unterschiede der Befehle
| Befehl | SSR | Hot-Reload | Verwendung |
|--------|-----|-----------|------------|
| `npm start` | ❌ | ✅ | Entwicklung (schnell) |
| `npm run dev:ssr` | ✅ | ✅ | Entwicklung mit SSR |
| `npm run build:ssr` | ✅ Build | ❌ | Production Build erstellen |
| `npm run serve:ssr` | ✅ | ❌ | Production Server starten |
---
## Nächste Schritte
1. Für normale Entwicklung: **`npm start`** verwenden
2. Vor Production-Deployment: **`npm run build:ssr`** testen
3. SSR-Funktionalität prüfen (siehe "Schritt 4: Testen")
4. Bei Problemen: Logs prüfen und obige Lösungen durchgehen
---
## Support
Bei weiteren Problemen:
1. **Logs prüfen:** `npm run serve:ssr` zeigt Fehler in der Konsole
2. **Browser DevTools:** Console + Network Tab
3. **Build-Output:** `npm run build:ssr` zeigt Build-Fehler
4. **Node-Version:** `node --version` (sollte ≥ v18 sein)

784
bizmatch/SSR_DOKUMENTATION.md
View File

@ -1,784 +0,0 @@
# BizMatch SSR - Technische Dokumentation
## Was ist Server-Side Rendering (SSR)?
Server-Side Rendering bedeutet, dass die Angular-Anwendung nicht nur im Browser, sondern auch auf dem Server läuft und HTML vorab generiert.
---
## Unterschied: SPA vs. SSR vs. Prerendering
### 1. Single Page Application (SPA) - OHNE SSR
**Ablauf:**
```
Browser → lädt index.html
→ index.html enthält nur <app-root></app-root>
→ lädt JavaScript-Bundles
→ JavaScript rendert die Seite
```
**HTML-Response:**
```html
<!doctype html>
<html>
<head><title>BizMatch</title></head>
<body>
<app-root></app-root> <!-- LEER! -->
<script src="main.js"></script>
</body>
</html>
```
**Nachteile:**
- ❌ Suchmaschinen sehen leeren Content
- ❌ Langsamer "First Contentful Paint"
- ❌ Schlechtes SEO
- ❌ Kein Social-Media-Preview (Open Graph)
---
### 2. Server-Side Rendering (SSR)
**Ablauf:**
```
Browser → fragt Server nach /business/123
→ Server rendert Angular-App mit Daten
→ Server sendet vollständiges HTML
→ Browser zeigt sofort Inhalt
→ JavaScript lädt im Hintergrund
→ Anwendung wird "hydrated" (interaktiv)
```
**HTML-Response:**
```html
<!doctype html>
<html>
<head>
<title>Restaurant "Zum Löwen" | BizMatch</title>
<meta name="description" content="Restaurant in München...">
</head>
<body>
<app-root>
<div class="listing-page">
<h1>Restaurant "Zum Löwen"</h1>
<p>Traditionelles deutsches Restaurant...</p>
<!-- Kompletter gerendeter Content! -->
</div>
</app-root>
<script src="main.js"></script>
</body>
</html>
```
**Vorteile:**
- ✅ Suchmaschinen sehen vollständigen Inhalt
- ✅ Schneller First Contentful Paint
- ✅ Besseres SEO
- ✅ Social-Media-Previews funktionieren
**Nachteile:**
- ⚠️ Komplexere Konfiguration
- ⚠️ Server-Ressourcen erforderlich
- ⚠️ Code muss browser- und server-kompatibel sein
---
### 3. Prerendering (Static Site Generation)
**Ablauf:**
```
Build-Zeit → Rendert ALLE Seiten zu statischen HTML-Dateien
→ /business/123.html, /business/456.html, etc.
→ HTML-Dateien werden auf CDN deployed
```
**Unterschied zu SSR:**
- Prerendering: HTML wird **zur Build-Zeit** generiert
- SSR: HTML wird **zur Request-Zeit** generiert
**BizMatch nutzt SSR, NICHT Prerendering**, weil:
- Listings dynamisch sind (neue Einträge täglich)
- Benutzerdaten personalisiert sind
- Suche und Filter zur Laufzeit erfolgen
---
## Wie funktioniert SSR in BizMatch?
### Architektur-Überblick
```
┌─────────────────────────────────────────────────────────────┐
│ Browser Request │
│ GET /business/restaurant-123 │
└────────────────────────────┬────────────────────────────────┘
│
▼
┌─────────────────────────────────────────────────────────────┐
│ Express Server │
│ (server.ts:30-41) │
├─────────────────────────────────────────────────────────────┤
│ 1. Empfängt Request │
│ 2. Ruft AngularNodeAppEngine auf │
│ 3. Rendert Angular-Komponente serverseitig │
│ 4. Sendet HTML zurück │
└────────────────────────────┬────────────────────────────────┘
│
▼
┌─────────────────────────────────────────────────────────────┐
│ AngularNodeAppEngine │
│ (@angular/ssr/node) │
├─────────────────────────────────────────────────────────────┤
│ 1. Lädt main.server.ts │
│ 2. Bootstrapped Angular in Node.js │
│ 3. Führt Routing aus (/business/restaurant-123) │
│ 4. Rendert Component-Tree zu HTML-String │
│ 5. Injiziert Meta-Tags, Titel │
└────────────────────────────┬────────────────────────────────┘
│
▼
┌─────────────────────────────────────────────────────────────┐
│ Angular Application │
│ (Browser-Code im Server) │
├─────────────────────────────────────────────────────────────┤
│ • Komponenten werden ausgeführt │
│ • API-Calls werden gemacht (TransferState) │
│ • DOM wird SIMULIERT (ssr-dom-polyfill.ts) │
│ • HTML-Output wird generiert │
└─────────────────────────────────────────────────────────────┘
```
---
## Wichtige Dateien und ihre Rolle
### 1. `server.ts` - Express Server
```typescript
const angularApp = new AngularNodeAppEngine();
server.get('*', (req, res, next) => {
angularApp.handle(req) // ← Rendert Angular serverseitig
.then((response) => {
if (response) {
writeResponseToNodeResponse(response, res);
}
});
});
```
**Rolle:**
- HTTP-Server (Express)
- Nimmt Requests entgegen
- Delegiert an Angular SSR Engine
- Sendet gerenderte HTML-Responses zurück
---
### 2. `src/main.server.ts` - Server Entry Point
```typescript
import './ssr-dom-polyfill'; // ← WICHTIG: DOM-Mocks laden
import { bootstrapApplication } from '@angular/platform-browser';
import { AppComponent } from './app/app.component';
import { config } from './app/app.config.server';
const bootstrap = () => bootstrapApplication(AppComponent, config);
export default bootstrap;
```
**Rolle:**
- Entry Point für SSR
- Lädt DOM-Polyfills **VOR** allen anderen Imports
- Bootstrapped Angular im Server-Kontext
---
### 3. `dist/bizmatch/server/index.server.html` - Server Template
**WICHTIG:** Diese Datei wird **beim Build erstellt**, nicht manuell geschrieben!
```bash
# Build-Prozess erstellt automatisch:
npm run build:ssr
→ dist/bizmatch/server/index.server.html ✅
→ dist/bizmatch/server/server.mjs ✅
→ dist/bizmatch/browser/index.csr.html ✅
```
**Quelle:**
- Angular nimmt `src/index.html` als Vorlage
- Fügt SSR-spezifische Meta-Tags hinzu
- Generiert `index.server.html` für serverseitiges Rendering
- Generiert `index.csr.html` für clientseitiges Rendering (Fallback)
**Warum nicht im Git?**
- Build-Artefakte werden nicht eingecheckt (`.gitignore`)
- Jeder Build erstellt sie neu
- Verhindert Merge-Konflikte bei generierten Dateien
**Fehlerquelle bei neuem Laptop:**
```
git clone → dist/ Ordner fehlt
→ index.server.html fehlt
→ npm run serve:ssr crasht ❌
Lösung: → npm run build:ssr
→ index.server.html wird erstellt ✅
```
---
### 4. `src/ssr-dom-polyfill.ts` - DOM-Mocks
```typescript
const windowMock = {
document: { createElement: () => ({ ... }) },
localStorage: { getItem: () => null },
navigator: { userAgent: 'node' },
// ... etc
};
if (typeof window === 'undefined') {
(global as any).window = windowMock;
}
```
**Rolle:**
- Simuliert Browser-APIs in Node.js
- Verhindert `ReferenceError: window is not defined`
- Ermöglicht die Ausführung von Browser-Code im Server
- Kritisch für Libraries wie Leaflet, die `window` erwarten
**Warum notwendig?**
- Angular-Code nutzt `window`, `document`, `localStorage`, etc.
- Node.js hat diese APIs nicht
- Ohne Polyfills: Crash beim Server-Start
---
### 4. `ssr-dom-preload.mjs` - Node.js Preload Script
```javascript
import { isMainThread } from 'node:worker_threads';
if (!isMainThread) {
// Skip polyfills in worker threads (sass, esbuild)
} else {
globalThis.window = windowMock;
globalThis.document = documentMock;
}
```
**Rolle:**
- Wird beim `dev:ssr` verwendet
- Lädt DOM-Mocks **VOR** allen anderen Modulen
- Nutzt Node.js `--import` Flag
- Vermeidet Probleme mit early imports
**Verwendung:**
```bash
NODE_OPTIONS='--import ./ssr-dom-preload.mjs' ng serve
```
---
### 5. `app.config.server.ts` - Server-spezifische Config
Enthält Provider, die nur im Server-Kontext geladen werden:
- `provideServerRendering()`
- Server-spezifische HTTP-Interceptors
- TransferState für API-Daten
---
## Rendering-Ablauf im Detail
### Phase 1: Server-Side Rendering
```
1. Request kommt an: GET /business/restaurant-123
2. Express Router:
→ server.get('*', ...)
3. AngularNodeAppEngine:
→ bootstrapApplication(AppComponent, serverConfig)
→ Angular läuft in Node.js
4. Angular Router:
→ Route /business/:slug matched
→ ListingDetailComponent wird aktiviert
5. Component Lifecycle:
→ ngOnInit() wird ausgeführt
→ API-Call: fetch('/api/listings/restaurant-123')
→ Daten werden geladen
→ Template wird mit Daten gerendert
6. TransferState:
→ API-Response wird in HTML injiziert
→ <script>window.__NG_STATE__ = {...}</script>
7. Meta-Tags:
→ Title-Service setzt <title>
→ Meta-Service setzt <meta name="description">
8. HTML-Output:
→ Komplettes HTML mit Daten
→ Wird an Browser gesendet
```
**Server-Output:**
```html
<!doctype html>
<html>
<head>
<title>Restaurant "Zum Löwen" | BizMatch</title>
<meta name="description" content="Traditionelles Restaurant...">
</head>
<body>
<app-root>
<!-- Vollständig gerenderte Component -->
<div class="listing-detail">
<h1>Restaurant "Zum Löwen"</h1>
<p>Adresse: Hauptstraße 1, München</p>
<!-- etc. -->
</div>
</app-root>
<!-- TransferState: verhindert doppelte API-Calls -->
<script id="ng-state" type="application/json">
{"listings":{"restaurant-123":{...}}}
</script>
<script src="main.js" defer></script>
</body>
</html>
```
---
### Phase 2: Client-Side Hydration
```
1. Browser empfängt HTML:
→ Zeigt sofort gerenderten Content an ✅
→ User sieht Inhalt ohne Verzögerung
2. JavaScript lädt:
→ main.js wird heruntergeladen
→ Angular-Runtime startet
3. Hydration beginnt:
→ Angular scannt DOM
→ Vergleicht Server-HTML mit Client-Template
→ Attachiert Event Listener
→ Aktiviert Interaktivität
4. TransferState wiederverwenden:
→ Liest window.__NG_STATE__
→ Überspringt erneute API-Calls ✅
→ Daten sind bereits vorhanden
5. App ist interaktiv:
→ Buttons funktionieren
→ Routing funktioniert
→ SPA-Verhalten aktiviert
```
**Wichtig:**
- **Kein Flickern** (Server-HTML = Client-HTML)
- **Keine doppelten API-Calls** (TransferState)
- **Schneller First Contentful Paint** (HTML sofort sichtbar)
---
## SSR vs. Non-SSR: Was wird wann gerendert?
### Ohne SSR (`npm start`)
| Zeitpunkt | Server | Browser |
|-----------|--------|---------|
| T0: Request | Sendet leere `index.html` | - |
| T1: HTML empfangen | - | Leeres `<app-root></app-root>` |
| T2: JS geladen | - | Angular startet |
| T3: API-Call | - | Lädt Daten |
| T4: Rendering | - | **Erst jetzt sichtbar** ❌ |
**Time to First Contentful Paint:** ~2-3 Sekunden
---
### Mit SSR (`npm run serve:ssr`)
| Zeitpunkt | Server | Browser |
|-----------|--------|---------|
| T0: Request | Angular rendert + API-Call | - |
| T1: HTML empfangen | - | **Inhalt sofort sichtbar** ✅ |
| T2: JS geladen | - | Hydration beginnt |
| T3: Interaktiv | - | Event Listener attached |
**Time to First Contentful Paint:** ~200-500ms
---
## Prerendering vs. SSR: Wann wird gerendert?
### Prerendering (Static Site Generation)
```
Build-Zeit (npm run build):
→ ng build
→ Rendert /business/1.html
→ Rendert /business/2.html
→ Rendert /business/3.html
→ ...
→ Alle HTML-Dateien auf Server deployed
Request-Zeit:
→ Nginx sendet vorgefertigte HTML-Datei
→ KEIN Server-Side Rendering
```
**Vorteile:**
- Extrem schnell (statisches HTML)
- Kein Node.js-Server erforderlich
- Günstig (CDN-Hosting)
**Nachteile:**
- Nicht für dynamische Daten geeignet
- Re-Build bei jeder Änderung nötig
- Tausende Seiten = lange Build-Zeit
---
### SSR (Server-Side Rendering)
```
Build-Zeit (npm run build:ssr):
→ ng build (Client-Bundles)
→ ng build (Server-Bundles)
→ KEINE HTML-Dateien generiert
Request-Zeit:
→ Node.js Server empfängt Request
→ Angular rendert HTML on-the-fly
→ Frische Daten aus DB
→ Sendet HTML zurück
```
**Vorteile:**
- Immer aktuelle Daten
- Personalisierte Inhalte
- Keine lange Build-Zeit
**Nachteile:**
- Server-Ressourcen erforderlich
- Langsamer als Prerendering (Rendering kostet Zeit)
- Komplexere Infrastruktur
---
### BizMatch: Warum SSR statt Prerendering?
**Gründe:**
1. **Dynamische Listings:**
- Neue Businesses werden täglich hinzugefügt
- Prerendering würde tägliche Re-Builds erfordern
2. **Personalisierte Daten:**
- Benutzer sehen unterschiedliche Inhalte (Favoriten, etc.)
- Prerendering kann nicht personalisieren
3. **Suche und Filter:**
- Unendliche Kombinationen von Filtern
- Unmöglich, alle Varianten vorzurendern
4. **Skalierung:**
- 10.000+ Listings → Prerendering = 10.000+ HTML-Dateien
- SSR = 1 Server, rendert on-demand
---
## Client-Side Hydration im Detail
### Was ist Hydration?
**Hydration** = Angular "erweckt" das Server-HTML zum Leben.
**Ohne Hydration:**
- HTML ist statisch
- Buttons funktionieren nicht
- Routing funktioniert nicht
- Kein JavaScript-Event-Handling
**Nach Hydration:**
- Angular übernimmt Kontrolle
- Event Listener werden attached
- SPA-Routing funktioniert
- Interaktivität aktiviert
---
### Hydration-Ablauf
```typescript
// 1. Server rendert HTML
<button (click)="openModal()">Details</button>
// 2. Browser empfängt HTML
// → Button ist sichtbar, aber (click) funktioniert NICHT
// 3. Angular-JavaScript lädt
// → main.js wird ausgeführt
// 4. Hydration scannt DOM
angular.hydrate({
serverHTML: '<button>Details</button>',
clientTemplate: '<button (click)="openModal()">Details</button>',
// Vergleich: HTML matches Template? ✅
// → Reuse DOM node
// → Attach Event Listener
});
// 5. Button ist jetzt interaktiv
// → (click) funktioniert ✅
```
---
### Probleme bei Hydration
#### Problem 1: Mismatch zwischen Server und Client
**Ursache:**
```typescript
// Server rendert:
<div>Server Time: {{ serverTime }}</div>
// Client rendert:
<div>Server Time: {{ clientTime }}</div> // ← Unterschiedlich!
```
**Folge:**
- Angular erkennt Mismatch
- Wirft Warnung in Console
- Re-rendert Component (Performance-Verlust)
**Lösung:**
- TransferState nutzen für gemeinsame Daten
- `isPlatformServer()` für unterschiedliche Logik
---
#### Problem 2: Browser-only Code wird im Server ausgeführt
**Ursache:**
```typescript
ngOnInit() {
window.scrollTo(0, 0); // ← CRASH: window ist undefined im Server
}
```
**Lösung:**
```typescript
import { isPlatformBrowser } from '@angular/common';
import { PLATFORM_ID } from '@angular/core';
constructor(@Inject(PLATFORM_ID) private platformId: Object) {}
ngOnInit() {
if (isPlatformBrowser(this.platformId)) {
window.scrollTo(0, 0); // ← Nur im Browser
}
}
```
---
## TransferState: Verhindert doppelte API-Calls
### Problem ohne TransferState
```
Server:
→ GET /api/listings/123 ← API-Call 1
→ Rendert HTML mit Daten
Browser (nach JS-Load):
→ GET /api/listings/123 ← API-Call 2 (doppelt!)
→ Re-rendert Component
```
**Problem:**
- Doppelter Netzwerk-Traffic
- Langsamere Hydration
- Flickern beim Re-Render
---
### Lösung: TransferState
**Server-Side:**
```typescript
import { TransferState, makeStateKey } from '@angular/platform-browser';
const LISTING_KEY = makeStateKey<Listing>('listing-123');
ngOnInit() {
this.http.get('/api/listings/123').subscribe(data => {
this.transferState.set(LISTING_KEY, data); // ← Speichern
this.listing = data;
});
}
```
**HTML-Output:**
```html
<script id="ng-state" type="application/json">
{"listing-123": {"name": "Restaurant", "address": "..."}}
</script>
```
**Client-Side:**
```typescript
ngOnInit() {
const cachedData = this.transferState.get(LISTING_KEY, null);
if (cachedData) {
this.listing = cachedData; // ← Wiederverwenden ✅
} else {
this.http.get('/api/listings/123').subscribe(...); // ← Nur wenn nicht cached
}
this.transferState.remove(LISTING_KEY); // ← Cleanup
}
```
**Ergebnis:**
- ✅ Nur 1 API-Call (serverseitig)
- ✅ Kein Flickern
- ✅ Schnellere Hydration
---
## Performance-Vergleich
### Metriken
| Metrik | Ohne SSR | Mit SSR | Verbesserung |
|--------|----------|---------|--------------|
| **Time to First Byte (TTFB)** | 50ms | 200ms | -150ms ❌ |
| **First Contentful Paint (FCP)** | 2.5s | 0.5s | **-2s ✅** |
| **Largest Contentful Paint (LCP)** | 3.2s | 0.8s | **-2.4s ✅** |
| **Time to Interactive (TTI)** | 3.5s | 2.8s | -0.7s ✅ |
| **SEO Score (Lighthouse)** | 60 | 95 | +35 ✅ |
**Wichtig:**
- TTFB ist langsamer (Server muss rendern)
- Aber FCP viel schneller (HTML sofort sichtbar)
- User-Wahrnehmung: SSR fühlt sich schneller an
---
## SEO-Vorteile
### Google Crawler
**Ohne SSR:**
```html
<!-- Google sieht nur: -->
<app-root></app-root>
<script src="main.js"></script>
```
→ ❌ Kein Content indexiert
→ ❌ Kein Ranking
→ ❌ Keine Rich Snippets
---
**Mit SSR:**
```html
<!-- Google sieht: -->
<title>Restaurant "Zum Löwen" | BizMatch</title>
<meta name="description" content="Traditionelles Restaurant in München">
<h1>Restaurant "Zum Löwen"</h1>
<p>Adresse: Hauptstraße 1, 80331 München</p>
<div itemscope itemtype="https://schema.org/Restaurant">
<span itemprop="name">Restaurant "Zum Löwen"</span>
<span itemprop="address">München</span>
</div>
```
→ ✅ Vollständiger Content indexiert
→ ✅ Besseres Ranking
→ ✅ Rich Snippets (Sterne, Adresse, etc.)
---
### Social Media Previews (Open Graph)
**Ohne SSR:**
```html
<!-- Facebook/Twitter sehen nur: -->
<title>BizMatch</title>
```
→ ❌ Kein Preview-Bild
→ ❌ Keine Beschreibung
---
**Mit SSR:**
```html
<meta property="og:title" content="Restaurant 'Zum Löwen'" />
<meta property="og:description" content="Traditionelles Restaurant..." />
<meta property="og:image" content="https://bizmatch.net/images/restaurant.jpg" />
<meta property="og:url" content="https://bizmatch.net/business/restaurant-123" />
```
→ ✅ Schönes Preview beim Teilen
→ ✅ Mehr Klicks
→ ✅ Bessere User Experience
---
## Zusammenfassung
### SSR in BizMatch bedeutet:
1. **Server rendert HTML vorab** (nicht erst im Browser)
2. **Browser zeigt sofort Inhalt** (schneller First Paint)
3. **JavaScript hydrated im Hintergrund** (macht HTML interaktiv)
4. **Kein Flickern, keine doppelten API-Calls** (TransferState)
5. **Besseres SEO** (Google sieht vollständigen Content)
6. **Social-Media-Previews funktionieren** (Open Graph Tags)
### Technischer Stack:
- **@angular/ssr**: SSR-Engine
- **Express**: HTTP-Server
- **AngularNodeAppEngine**: Rendert Angular in Node.js
- **ssr-dom-polyfill.ts**: Simuliert Browser-APIs
- **TransferState**: Verhindert doppelte API-Calls
### Wann wird was gerendert?
- **Build-Zeit:** Nichts (kein Prerendering)
- **Request-Zeit:** Server rendert HTML on-the-fly
- **Nach JS-Load:** Hydration macht HTML interaktiv
### Best Practices:
1. Browser-Code mit `isPlatformBrowser()` schützen
2. TransferState für API-Daten nutzen
3. DOM-Polyfills für Third-Party-Libraries
4. Meta-Tags serverseitig setzen
5. Server-Build vor Deployment testen

26
bizmatch/angular.json
View File

@ -21,17 +21,6 @@
"outputPath": "dist/bizmatch",
"index": "src/index.html",
"browser": "src/main.ts",
"server": "src/main.server.ts",
"prerender": false,
"ssr": {
"entry": "server.ts"
},
"allowedCommonJsDependencies": [
"quill-delta",
"leaflet",
"dayjs",
"qs"
],
"polyfills": [
"zone.js"
],
@ -43,20 +32,12 @@
"input": "public"
},
"src/favicon.ico",
"src/assets",
"src/robots.txt",
{
"glob": "**/*",
"input": "node_modules/leaflet/dist/images",
"output": "assets/leaflet/"
}
"src/assets"
],
"styles": [
"src/styles.scss",
"src/styles/lazy-load.css",
"node_modules/quill/dist/quill.snow.css",
"node_modules/leaflet/dist/leaflet.css",
"node_modules/ngx-sharebuttons/themes/default.scss"
"node_modules/leaflet/dist/leaflet.css"
]
},
"configurations": {
@ -78,8 +59,7 @@
"development": {
"optimization": false,
"extractLicenses": false,
"sourceMap": true,
"ssr": false
"sourceMap": true
},
"dev": {
"fileReplacements": [

10
bizmatch/docker-compose.yml
View File

@ -1,10 +0,0 @@
services:
bizmatch-ssr:
build: .
image: bizmatch-ssr
container_name: bizmatch-ssr
restart: unless-stopped
ports:
- '4200:4200'
environment:
NODE_ENV: DEVELOPMENT

52
bizmatch/package.json
View File

@ -8,36 +8,32 @@
"build": "node version.js && ng build",
"build.dev": "node version.js && ng build --configuration dev --output-hashing=all",
"build.prod": "node version.js && ng build --configuration prod --output-hashing=all",
"build:ssr": "node version.js && ng build --configuration prod",
"build:ssr:dev": "node version.js && ng build --configuration dev",
"watch": "ng build --watch --configuration development",
"test": "ng test",
"serve:ssr": "node dist/bizmatch/server/server.mjs",
"serve:ssr:bizmatch": "node dist/bizmatch/server/server.mjs",
"dev:ssr": "NODE_OPTIONS='--import ./ssr-dom-preload.mjs' ng serve"
"serve:ssr:bizmatch": "node dist/bizmatch/server/server.mjs"
},
"private": true,
"dependencies": {
"@angular/animations": "^19.2.16",
"@angular/cdk": "^19.1.5",
"@angular/common": "^19.2.16",
"@angular/compiler": "^19.2.16",
"@angular/core": "^19.2.16",
"@angular/fire": "^19.2.0",
"@angular/forms": "^19.2.16",
"@angular/platform-browser": "^19.2.16",
"@angular/platform-browser-dynamic": "^19.2.16",
"@angular/platform-server": "^19.2.16",
"@angular/router": "^19.2.16",
"@angular/ssr": "^19.2.16",
"@bluehalo/ngx-leaflet": "^19.0.0",
"@fortawesome/angular-fontawesome": "^1.0.0",
"@angular/animations": "^18.1.3",
"@angular/cdk": "^18.0.6",
"@angular/common": "^18.1.3",
"@angular/compiler": "^18.1.3",
"@angular/core": "^18.1.3",
"@angular/fire": "^18.0.1",
"@angular/forms": "^18.1.3",
"@angular/platform-browser": "^18.1.3",
"@angular/platform-browser-dynamic": "^18.1.3",
"@angular/platform-server": "^18.1.3",
"@angular/router": "^18.1.3",
"@bluehalo/ngx-leaflet": "^18.0.2",
"@fortawesome/angular-fontawesome": "^0.15.0",
"@fortawesome/fontawesome-free": "^6.7.2",
"@fortawesome/fontawesome-svg-core": "^6.7.2",
"@fortawesome/free-brands-svg-icons": "^6.7.2",
"@fortawesome/free-solid-svg-icons": "^6.7.2",
"@ng-select/ng-select": "^14.9.0",
"@ng-select/ng-select": "^13.4.1",
"@ngneat/until-destroy": "^10.0.0",
"@stripe/stripe-js": "^4.3.0",
"@types/cropperjs": "^1.3.0",
"@types/leaflet": "^1.9.12",
"@types/uuid": "^10.0.0",
@ -49,11 +45,12 @@
"leaflet": "^1.9.4",
"memoize-one": "^6.0.0",
"ng-gallery": "^11.0.0",
"ngx-currency": "^19.0.0",
"ngx-currency": "^18.0.0",
"ngx-image-cropper": "^8.0.0",
"ngx-mask": "^18.0.0",
"ngx-quill": "^27.1.2",
"ngx-quill": "^26.0.5",
"ngx-sharebuttons": "^15.0.3",
"ngx-stripe": "^18.1.0",
"on-change": "^5.0.1",
"posthog-js": "^1.259.0",
"quill": "2.0.2",
@ -61,13 +58,12 @@
"tslib": "^2.6.3",
"urlcat": "^3.1.0",
"uuid": "^10.0.0",
"zone.js": "~0.15.0",
"zod": "^4.1.12"
"zone.js": "~0.14.7"
},
"devDependencies": {
"@angular-devkit/build-angular": "^19.2.16",
"@angular/cli": "^19.2.16",
"@angular/compiler-cli": "^19.2.16",
"@angular-devkit/build-angular": "^18.1.3",
"@angular/cli": "^18.1.3",
"@angular/compiler-cli": "^18.1.3",
"@types/express": "^4.17.21",
"@types/jasmine": "~5.1.4",
"@types/node": "^20.14.9",
@ -81,6 +77,6 @@
"karma-jasmine-html-reporter": "~2.1.0",
"postcss": "^8.4.39",
"tailwindcss": "^3.4.4",
"typescript": "~5.7.2"
"typescript": "~5.4.5"
}
}

2
bizmatch/proxy.conf.json
View File

@ -6,7 +6,7 @@
"logLevel": "debug"
},
"/pictures": {
"target": "http://localhost:8081",
"target": "http://localhost:8080",
"secure": false
},
"/ipify": {

118
bizmatch/server.ts
View File

@ -1,82 +1,56 @@
// IMPORTANT: DOM polyfill must be imported FIRST, before any browser-dependent libraries
import './src/ssr-dom-polyfill';
// import { APP_BASE_HREF } from '@angular/common';
// import { CommonEngine } from '@angular/ssr';
// import express from 'express';
// import { fileURLToPath } from 'node:url';
// import { dirname, join, resolve } from 'node:path';
// import bootstrap from './src/main.server';
import { APP_BASE_HREF } from '@angular/common';
import { AngularNodeAppEngine, createNodeRequestHandler, writeResponseToNodeResponse } from '@angular/ssr/node';
import { ɵsetAngularAppEngineManifest as setAngularAppEngineManifest } from '@angular/ssr';
import express from 'express';
import { fileURLToPath } from 'node:url';
import { dirname, join, resolve } from 'node:path';
// // The Express app is exported so that it can be used by serverless Functions.
// export function app(): express.Express {
// const server = express();
// const serverDistFolder = dirname(fileURLToPath(import.meta.url));
// const browserDistFolder = resolve(serverDistFolder, '../browser');
// const indexHtml = join(serverDistFolder, 'index.server.html');
// The Express app is exported so that it can be used by serverless Functions.
export async function app(): Promise<express.Express> {
const server = express();
const serverDistFolder = dirname(fileURLToPath(import.meta.url));
const browserDistFolder = resolve(serverDistFolder, '../browser');
const indexHtml = join(serverDistFolder, 'index.server.html');
// const commonEngine = new CommonEngine();
// Explicitly load and set the Angular app engine manifest
// This is required for environments where the manifest is not auto-loaded
const manifestPath = join(serverDistFolder, 'angular-app-engine-manifest.mjs');
const manifest = await import(manifestPath);
setAngularAppEngineManifest(manifest.default);
// server.set('view engine', 'html');
// server.set('views', browserDistFolder);
const angularApp = new AngularNodeAppEngine();
// // Example Express Rest API endpoints
// // server.get('/api/**', (req, res) => { });
// // Serve static files from /browser
// server.get('*.*', express.static(browserDistFolder, {
// maxAge: '1y'
// }));
server.set('view engine', 'html');
server.set('views', browserDistFolder);
// // All regular routes use the Angular engine
// server.get('*', (req, res, next) => {
// const { protocol, originalUrl, baseUrl, headers } = req;
// Example Express Rest API endpoints
// server.get('/api/**', (req, res) => { });
// Serve static files from /browser
server.get('*.*', express.static(browserDistFolder, {
maxAge: '1y'
}));
// commonEngine
// .render({
// bootstrap,
// documentFilePath: indexHtml,
// url: `${protocol}://${headers.host}${originalUrl}`,
// publicPath: browserDistFolder,
// providers: [{ provide: APP_BASE_HREF, useValue: baseUrl }],
// })
// .then((html) => res.send(html))
// .catch((err) => next(err));
// });
// All regular routes use the Angular engine
server.get('*', async (req, res, next) => {
console.log(`[SSR] Handling request: ${req.method} ${req.url}`);
try {
const response = await angularApp.handle(req);
if (response) {
console.log(`[SSR] Response received for ${req.url}, status: ${response.status}`);
writeResponseToNodeResponse(response, res);
} else {
console.log(`[SSR] No response for ${req.url} - Angular engine returned null`);
console.log(`[SSR] This usually means the route couldn't be rendered. Check for:
1. Browser API usage in components
2. Missing platform checks
3. Errors during component initialization`);
res.sendStatus(404);
}
} catch (err) {
console.error(`[SSR] Error handling ${req.url}:`, err);
console.error(`[SSR] Stack trace:`, err.stack);
next(err);
}
});
// return server;
// }
return server;
}
// function run(): void {
// const port = process.env['PORT'] || 4000;
// Global error handlers for debugging
process.on('unhandledRejection', (reason, promise) => {
console.error('[SSR] Unhandled Rejection at:', promise, 'reason:', reason);
});
// // Start up the Node server
// const server = app();
// server.listen(port, () => {
// console.log(`Node Express server listening on http://localhost:${port}`);
// });
// }
process.on('uncaughtException', (error) => {
console.error('[SSR] Uncaught Exception:', error);
console.error('[SSR] Stack:', error.stack);
});
async function run(): Promise<void> {
const port = process.env['PORT'] || 4200;
// Start up the Node server
const server = await app();
server.listen(port, () => {
console.log(`Node Express server listening on http://localhost:${port}`);
});
}
run();
// run();

30
bizmatch/src/app/app.component.ts
View File

@ -1,7 +1,7 @@
import { CommonModule, isPlatformBrowser } from '@angular/common';
import { AfterViewInit, Component, HostListener, PLATFORM_ID, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { Component, HostListener } from '@angular/core';
import { ActivatedRoute, NavigationEnd, Router, RouterOutlet } from '@angular/router';
import { initFlowbite } from 'flowbite';
import { filter } from 'rxjs/operators';
import build from '../build';
import { ConfirmationComponent } from './components/confirmation/confirmation.component';
@ -25,12 +25,10 @@ import { UserService } from './services/user.service';
templateUrl: './app.component.html',
styleUrl: './app.component.scss',
})
export class AppComponent implements AfterViewInit {
export class AppComponent {
build = build;
title = 'bizmatch';
actualRoute = '';
private platformId = inject(PLATFORM_ID);
private isBrowser = isPlatformBrowser(this.platformId);
public constructor(
public loadingService: LoadingService,
@ -48,27 +46,9 @@ export class AppComponent implements AfterViewInit {
}
// Hier haben Sie Zugriff auf den aktuellen Route-Pfad
this.actualRoute = currentRoute.snapshot.url[0].path;
// Re-initialize Flowbite after navigation to ensure all components are ready
if (this.isBrowser) {
setTimeout(() => {
initFlowbite();
}, 50);
}
});
}
ngOnInit() {
// Navigation tracking moved from constructor
}
ngAfterViewInit() {
// Initialize Flowbite for dropdowns, modals, and other interactive components
// Note: Drawers work automatically with data-drawer-target attributes
if (this.isBrowser) {
initFlowbite();
}
}
ngOnInit() {}
@HostListener('window:keydown', ['$event'])
handleKeyboardEvent(event: KeyboardEvent) {
if (event.shiftKey && event.ctrlKey && event.key === 'V') {

6
bizmatch/src/app/app.config.server.ts
View File

@ -1,15 +1,11 @@
import { mergeApplicationConfig, ApplicationConfig } from '@angular/core';
import { provideServerRendering } from '@angular/platform-server';
import { provideServerRouting } from '@angular/ssr';
import { appConfig } from './app.config';
import { serverRoutes } from './app.routes.server';
const serverConfig: ApplicationConfig = {
providers: [
provideServerRendering(),
provideServerRouting(serverRoutes)
provideServerRendering()
]
};
export const config = mergeApplicationConfig(appConfig, serverConfig);

17
bizmatch/src/app/app.config.ts
View File

@ -1,6 +1,4 @@
import { IMAGE_CONFIG, isPlatformBrowser } from '@angular/common';
import { APP_INITIALIZER, ApplicationConfig, ErrorHandler, PLATFORM_ID, inject } from '@angular/core';
import { provideClientHydration } from '@angular/platform-browser';
import { APP_INITIALIZER, ApplicationConfig, ErrorHandler } from '@angular/core';
import { provideRouter, withEnabledBlockingInitialNavigation, withInMemoryScrolling } from '@angular/router';
import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
@ -11,6 +9,7 @@ import { GALLERY_CONFIG, GalleryConfig } from 'ng-gallery';
import { provideQuillConfig } from 'ngx-quill';
import { provideShareButtonsOptions, SharerMethods, withConfig } from 'ngx-sharebuttons';
import { shareIcons } from 'ngx-sharebuttons/icons';
import { provideNgxStripe } from 'ngx-stripe';
import { environment } from '../environments/environment';
import { routes } from './app.routes';
import { AuthInterceptor } from './interceptors/auth.interceptor';
@ -20,12 +19,10 @@ import { GlobalErrorHandler } from './services/globalErrorHandler';
import { POSTHOG_INIT_PROVIDER } from './services/posthog.factory';
import { SelectOptionsService } from './services/select-options.service';
import { createLogger } from './utils/utils';
// provideClientHydration()
const logger = createLogger('ApplicationConfig');
export const appConfig: ApplicationConfig = {
providers: [
// Temporarily disabled for SSR debugging
// provideClientHydration(),
provideHttpClient(withInterceptorsFromDi()),
{
provide: APP_INITIALIZER,
@ -56,12 +53,6 @@ export const appConfig: ApplicationConfig = {
} as GalleryConfig,
},
{ provide: ErrorHandler, useClass: GlobalErrorHandler }, // Registriere den globalen ErrorHandler
{
provide: IMAGE_CONFIG,
useValue: {
disableImageSizeWarning: true,
},
},
provideShareButtonsOptions(
shareIcons(),
withConfig({
@ -79,6 +70,7 @@ export const appConfig: ApplicationConfig = {
),
...(environment.production ? [POSTHOG_INIT_PROVIDER] : []),
provideAnimations(),
provideNgxStripe('pk_test_IlpbVQhxAXZypLgnCHOCqlj8'),
provideQuillConfig({
modules: {
syntax: true,
@ -93,6 +85,7 @@ export const appConfig: ApplicationConfig = {
}),
provideFirebaseApp(() => initializeApp(environment.firebaseConfig)),
provideAuth(() => getAuth()),
// provideFirestore(() => getFirestore()),
],
};
function initServices(selectOptions: SelectOptionsService) {

8
bizmatch/src/app/app.routes.server.ts
View File

@ -1,8 +0,0 @@
import { RenderMode, ServerRoute } from '@angular/ssr';
export const serverRoutes: ServerRoute[] = [
{
path: '**',
renderMode: RenderMode.Server
}
];

52
bizmatch/src/app/app.routes.ts
View File

@ -1,7 +1,6 @@
import { Routes } from '@angular/router';
import { LogoutComponent } from './components/logout/logout.component';
import { NotFoundComponent } from './components/not-found/not-found.component';
import { TestSsrComponent } from './components/test-ssr/test-ssr.component';
import { EmailAuthorizedComponent } from './components/email-authorized/email-authorized.component';
import { EmailVerificationComponent } from './components/email-verification/email-verification.component';
@ -16,6 +15,7 @@ import { HomeComponent } from './pages/home/home.component';
import { BrokerListingsComponent } from './pages/listings/broker-listings/broker-listings.component';
import { BusinessListingsComponent } from './pages/listings/business-listings/business-listings.component';
import { CommercialPropertyListingsComponent } from './pages/listings/commercial-property-listings/commercial-property-listings.component';
import { PricingComponent } from './pages/pricing/pricing.component';
import { AccountComponent } from './pages/subscription/account/account.component';
import { EditBusinessListingComponent } from './pages/subscription/edit-business-listing/edit-business-listing.component';
import { EditCommercialPropertyListingComponent } from './pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component';
@ -23,14 +23,8 @@ import { EmailUsComponent } from './pages/subscription/email-us/email-us.compone
import { FavoritesComponent } from './pages/subscription/favorites/favorites.component';
import { MyListingComponent } from './pages/subscription/my-listing/my-listing.component';
import { SuccessComponent } from './pages/success/success.component';
import { TermsOfUseComponent } from './pages/legal/terms-of-use.component';
import { PrivacyStatementComponent } from './pages/legal/privacy-statement.component';
export const routes: Routes = [
{
path: 'test-ssr',
component: TestSsrComponent,
},
{
path: 'businessListings',
component: BusinessListingsComponent,
@ -51,25 +45,14 @@ export const routes: Routes = [
component: HomeComponent,
},
// #########
// Listings Details - New SEO-friendly slug-based URLs
// Listings Details
{
path: 'business/:slug',
path: 'details-business-listing/:id',
component: DetailsBusinessListingComponent,
},
{
path: 'commercial-property/:slug',
component: DetailsCommercialPropertyListingComponent,
},
// Backward compatibility redirects for old UUID-based URLs
{
path: 'details-business-listing/:id',
redirectTo: 'business/:id',
pathMatch: 'full',
},
{
path: 'details-commercial-property-listing/:id',
redirectTo: 'commercial-property/:id',
pathMatch: 'full',
component: DetailsCommercialPropertyListingComponent,
},
{
path: 'listing/:id',
@ -161,7 +144,11 @@ export const routes: Routes = [
canActivate: [AuthGuard],
},
// #########
// Email Verification
// Pricing
{
path: 'pricing',
component: PricingComponent,
},
{
path: 'emailVerification',
component: EmailVerificationComponent,
@ -170,6 +157,17 @@ export const routes: Routes = [
path: 'email-authorized',
component: EmailAuthorizedComponent,
},
{
path: 'pricingOverview',
component: PricingComponent,
data: {
pricingOverview: true,
},
},
{
path: 'pricing/:id',
component: PricingComponent,
},
{
path: 'success',
component: SuccessComponent,
@ -179,15 +177,5 @@ export const routes: Routes = [
component: UserListComponent,
canActivate: [AuthGuard],
},
// #########
// Legal Pages
{
path: 'terms-of-use',
component: TermsOfUseComponent,
},
{
path: 'privacy-statement',
component: PrivacyStatementComponent,
},
{ path: '**', redirectTo: 'home' },
];

5
bizmatch/src/app/components/base-input/base-input.component.ts
View File

@ -1,5 +1,6 @@
import { Component, Input } from '@angular/core';
import { ControlValueAccessor } from '@angular/forms';
import { initFlowbite } from 'flowbite';
import { Subscription } from 'rxjs';
import { ValidationMessagesService } from '../validation-messages.service';
@ -24,7 +25,9 @@ export abstract class BaseInputComponent implements ControlValueAccessor {
this.subscription = this.validationMessagesService.messages$.subscribe(() => {
this.updateValidationMessage();
});
// Flowbite is now initialized once in AppComponent
setTimeout(() => {
initFlowbite();
}, 10);
}
ngOnDestroy() {

68
bizmatch/src/app/components/breadcrumbs/breadcrumbs.component.ts
View File

@ -1,68 +0,0 @@
import { CommonModule } from '@angular/common';
import { Component, Input } from '@angular/core';
import { RouterModule } from '@angular/router';
export interface BreadcrumbItem {
label: string;
url?: string;
icon?: string;
}
@Component({
selector: 'app-breadcrumbs',
standalone: true,
imports: [CommonModule, RouterModule],
template: `
<nav aria-label="Breadcrumb" class="mb-4">
<ol
class="flex flex-wrap items-center text-sm text-neutral-600"
itemscope
itemtype="https://schema.org/BreadcrumbList"
>
@for (item of breadcrumbs; track $index) {
<li
class="inline-flex items-center"
itemprop="itemListElement"
itemscope
itemtype="https://schema.org/ListItem"
>
@if ($index > 0) {
<span class="inline-flex items-center mx-2 text-neutral-400 select-none">
<i class="fas fa-chevron-right text-xs"></i>
</span>
}
@if (item.url && $index < breadcrumbs.length - 1) {
<a
[routerLink]="item.url"
class="inline-flex items-center hover:text-blue-600 transition-colors"
itemprop="item"
>
@if (item.icon) {
<i [class]="item.icon + ' mr-1'"></i>
}
<span itemprop="name">{{ item.label }}</span>
</a>
} @else {
<span
class="inline-flex items-center font-semibold text-neutral-900"
itemprop="item"
>
@if (item.icon) {
<i [class]="item.icon + ' mr-1'"></i>
}
<span itemprop="name">{{ item.label }}</span>
</span>
}
<meta itemprop="position" [content]="($index + 1).toString()" />
</li>
}
</ol>
</nav>
`,
styles: []
})
export class BreadcrumbsComponent {
@Input() breadcrumbs: BreadcrumbItem[] = [];
}

13
bizmatch/src/app/components/dropdown/dropdown.component.ts
View File

@ -1,5 +1,4 @@
import { AfterViewInit, Component, ElementRef, HostBinding, Input, OnDestroy, ViewChild, PLATFORM_ID, inject } from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
import { AfterViewInit, Component, ElementRef, HostBinding, Input, OnDestroy, ViewChild } from '@angular/core';
import { createPopper, Instance as PopperInstance } from '@popperjs/core';
@Component({
@ -24,8 +23,6 @@ export class DropdownComponent implements AfterViewInit, OnDestroy {
@HostBinding('class.hidden') isHidden: boolean = true;
private platformId = inject(PLATFORM_ID);
private isBrowser = isPlatformBrowser(this.platformId);
private popperInstance: PopperInstance | null = null;
isVisible: boolean = false;
private clickOutsideListener: any;
@ -33,8 +30,6 @@ export class DropdownComponent implements AfterViewInit, OnDestroy {
private hoverHideListener: any;
ngAfterViewInit() {
if (!this.isBrowser) return;
if (!this.triggerEl) {
console.error('Trigger element is not provided to the dropdown component.');
return;
@ -63,8 +58,6 @@ export class DropdownComponent implements AfterViewInit, OnDestroy {
}
private setupEventListeners() {
if (!this.isBrowser) return;
if (this.triggerType === 'click') {
this.triggerEl.addEventListener('click', () => this.toggle());
} else if (this.triggerType === 'hover') {
@ -81,8 +74,6 @@ export class DropdownComponent implements AfterViewInit, OnDestroy {
}
private removeEventListeners() {
if (!this.isBrowser) return;
if (this.triggerType === 'click') {
this.triggerEl.removeEventListener('click', () => this.toggle());
} else if (this.triggerType === 'hover') {
@ -113,7 +104,7 @@ export class DropdownComponent implements AfterViewInit, OnDestroy {
}
private handleClickOutside(event: MouseEvent) {
if (!this.isVisible || !this.isBrowser) return;
if (!this.isVisible) return;
const clickedElement = event.target as HTMLElement;
if (this.ignoreClickOutsideClass) {

10
bizmatch/src/app/components/email/email.component.ts
View File

@ -17,15 +17,7 @@ import { EMailService } from './email.service';
template: ``,
})
export class EMailComponent {
shareByEMail: ShareByEMail = {
yourName: '',
recipientEmail: '',
yourEmail: '',
type: 'business',
listingTitle: '',
url: '',
id: ''
};
shareByEMail: ShareByEMail = {};
constructor(public eMailService: EMailService, private mailService: MailService, private validationMessagesService: ValidationMessagesService) {}
ngOnInit() {
this.eMailService.shareByEMail$.pipe(untilDestroyed(this)).subscribe(val => {

93
bizmatch/src/app/components/faq/faq.component.ts
View File

@ -1,93 +0,0 @@
import { CommonModule } from '@angular/common';
import { Component, Input, OnInit } from '@angular/core';
import { SeoService } from '../../services/seo.service';
export interface FAQItem {
question: string;
answer: string;
}
@Component({
selector: 'app-faq',
standalone: true,
imports: [CommonModule],
template: `
<section class="bg-white rounded-lg shadow-lg p-6 md:p-8 my-8">
<h2 class="text-2xl md:text-3xl font-bold text-gray-900 mb-6">Frequently Asked Questions</h2>
<div class="space-y-4">
@for (item of faqItems; track $index) {
<div class="border-b border-gray-200 pb-4">
<button
(click)="toggle($index)"
class="w-full text-left flex justify-between items-center py-2 hover:text-blue-600 transition-colors"
[attr.aria-expanded]="openIndex === $index"
>
<h3 class="text-lg font-semibold text-gray-800">{{ item.question }}</h3>
<svg
class="w-5 h-5 transition-transform"
[class.rotate-180]="openIndex === $index"
fill="none"
stroke="currentColor"
viewBox="0 0 24 24"
>
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7" />
</svg>
</button>
@if (openIndex === $index) {
<div class="mt-3 text-gray-600 leading-relaxed">
<p [innerHTML]="item.answer"></p>
</div>
}
</div>
}
</div>
</section>
`,
styles: [`
.rotate-180 {
transform: rotate(180deg);
}
`]
})
export class FaqComponent implements OnInit {
@Input() faqItems: FAQItem[] = [];
openIndex: number | null = null;
constructor(private seoService: SeoService) {}
ngOnInit() {
// Generate and inject FAQ Schema for rich snippets
if (this.faqItems.length > 0) {
const faqSchema = {
'@context': 'https://schema.org',
'@type': 'FAQPage',
'mainEntity': this.faqItems.map(item => ({
'@type': 'Question',
'name': item.question,
'acceptedAnswer': {
'@type': 'Answer',
'text': this.stripHtml(item.answer)
}
}))
};
this.seoService.injectStructuredData(faqSchema);
}
}
toggle(index: number) {
this.openIndex = this.openIndex === index ? null : index;
}
private stripHtml(html: string): string {
const tmp = document.createElement('DIV');
tmp.innerHTML = html;
return tmp.textContent || tmp.innerText || '';
}
ngOnDestroy() {
this.seoService.clearStructuredData();
}
}

994
bizmatch/src/app/components/footer/footer.component.html
View File

File diff suppressed because it is too large Load Diff

10
bizmatch/src/app/components/footer/footer.component.ts
View File

@ -1,9 +1,9 @@
import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { Router, RouterModule } from '@angular/router';
import { NavigationEnd, Router, RouterModule } from '@angular/router';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { initFlowbite } from 'flowbite';
@Component({
selector: 'app-footer',
standalone: true,
@ -17,6 +17,10 @@ export class FooterComponent {
currentYear: number = new Date().getFullYear();
constructor(private router: Router) {}
ngOnInit() {
// Flowbite is now initialized once in AppComponent
this.router.events.subscribe(event => {
if (event instanceof NavigationEnd) {
initFlowbite();
}
});
}
}

229
bizmatch/src/app/components/header/header.component.html
View File

@ -1,209 +1,220 @@
<nav class="bg-white border-neutral-200 dark:bg-neutral-900 print:hidden">
<nav class="bg-white border-gray-200 dark:bg-gray-900 print:hidden">
<div class="max-w-screen-xl flex flex-wrap items-center justify-between mx-auto p-4">
<a routerLink="/home" class="flex items-center space-x-3 rtl:space-x-reverse">
<img src="/assets/images/header-logo.png" class="h-10 w-auto"
alt="BizMatch - Business Marketplace for Buying and Selling Businesses" />
<img src="assets/images/header-logo.png" class="h-10" alt="Flowbite Logo" />
</a>
<div class="flex items-center md:order-2 space-x-3 rtl:space-x-reverse">
<!-- Filter button -->
@if(isFilterUrl()){
<div class="relative">
<button type="button" id="sortDropdownButton"
class="max-sm:hidden px-4 py-2 text-sm font-medium bg-white border border-neutral-200 rounded-lg hover:bg-neutral-100 hover:text-primary-600 dark:bg-neutral-800 dark:text-neutral-400 dark:border-neutral-600 dark:hover:text-white dark:hover:bg-neutral-700"
<button
type="button"
id="sortDropdownButton"
class="max-sm:hidden px-4 py-2 text-sm font-medium bg-white border border-gray-200 rounded-lg hover:bg-gray-100 hover:text-blue-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
(click)="toggleSortDropdown()"
[ngClass]="{ 'text-primary-500': selectOptions.getSortByOption(sortBy) !== 'Sort', 'text-neutral-900': selectOptions.getSortByOption(sortBy) === 'Sort' }">
[ngClass]="{ 'text-blue-500': selectOptions.getSortByOption(sortBy) !== 'Sort', 'text-gray-900': selectOptions.getSortByOption(sortBy) === 'Sort' }"
>
<i class="fas fa-sort mr-2"></i>{{ selectOptions.getSortByOption(sortBy) }}
</button>
<!-- Sort options dropdown -->
<div *ngIf="sortDropdownVisible"
class="absolute right-0 z-50 w-48 md:mt-2 max-md:mt-20 max-md:mr-[-2.5rem] bg-white border border-neutral-200 rounded-lg drop-shadow-custom-bg dark:bg-neutral-800 dark:border-neutral-600">
<ul class="py-1 text-sm text-neutral-700 dark:text-neutral-200">
<div *ngIf="sortDropdownVisible" class="absolute right-0 z-50 w-48 md:mt-2 max-md:mt-20 max-md:mr-[-2.5rem] bg-white border border-gray-200 rounded-lg drop-shadow-custom-bg dark:bg-gray-800 dark:border-gray-600">
<ul class="py-1 text-sm text-gray-700 dark:text-gray-200">
@for(item of sortByOptions; track item){
<li (click)="sortByFct(item.value)"
class="block px-4 py-2 hover:bg-neutral-100 dark:hover:bg-neutral-700 cursor-pointer">{{ item.selectName ?
item.selectName : item.name }}</li>
<li (click)="sortByFct(item.value)" class="block px-4 py-2 hover:bg-gray-100 dark:hover:bg-gray-700 cursor-pointer">{{ item.selectName ? item.selectName : item.name }}</li>
}
</ul>
</div>
</div>
}
<button type="button"
class="flex text-sm bg-neutral-400 rounded-full md:me-0 focus:ring-4 focus:ring-neutral-300 dark:focus:ring-neutral-600"
id="user-menu-button" aria-expanded="false" [attr.data-dropdown-toggle]="user ? 'user-login' : 'user-unknown'">
<button
type="button"
class="flex text-sm bg-gray-400 rounded-full md:me-0 focus:ring-4 focus:ring-gray-300 dark:focus:ring-gray-600"
id="user-menu-button"
aria-expanded="false"
[attr.data-dropdown-toggle]="user ? 'user-login' : 'user-unknown'"
data-dropdown-placement="bottom"
>
<span class="sr-only">Open user menu</span>
@if(isProfessional || (authService.isAdmin() | async) && user?.hasProfile){
<img class="w-8 h-8 rounded-full object-cover" src="{{ profileUrl }}"
alt="{{ user?.firstname }} {{ user?.lastname }} profile photo" width="32" height="32" />
<img class="w-8 h-8 rounded-full object-cover" src="{{ profileUrl }}" alt="user photo" />
} @else {
<i class="flex justify-center items-center text-stone-50 w-8 h-8 rounded-full fa-solid fa-bars"></i>
}
</button>
<!-- Dropdown menu -->
@if(user){
<div
class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-neutral-100 rounded-lg shadow dark:bg-neutral-700 dark:divide-neutral-600"
id="user-login">
<div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded-lg shadow dark:bg-gray-700 dark:divide-gray-600" id="user-login">
<div class="px-4 py-3">
<span class="block text-sm text-neutral-900 dark:text-white">Welcome, {{ user.firstname }} </span>
<span class="block text-sm text-neutral-500 truncate dark:text-neutral-400">{{ user.email }}</span>
<span class="block text-sm text-gray-900 dark:text-white">Welcome, {{ user.firstname }} </span>
<span class="block text-sm text-gray-500 truncate dark:text-gray-400">{{ user.email }}</span>
</div>
<ul class="py-2" aria-labelledby="user-menu-button">
<li>
<a routerLink="/account" (click)="closeDropdown()"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">Account</a>
<a routerLink="/account" (click)="closeDropdown()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Account</a>
</li>
@if((user.customerType==='professional' && user.customerSubType==='broker') || user.customerType==='seller' ||
(authService.isAdmin() | async)){
@if((user.customerType==='professional' && user.customerSubType==='broker') || user.customerType==='seller' || (authService.isAdmin() | async)){
<li>
@if(user.customerType==='professional'){
<a routerLink="/createBusinessListing" (click)="closeDropdown()"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">Create
Listing</a>
<a routerLink="/createBusinessListing" (click)="closeDropdown()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
>Create Listing</a
>
}@else {
<a routerLink="/createCommercialPropertyListing" (click)="closeDropdown()"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">Create
Listing</a>
<a routerLink="/createCommercialPropertyListing" (click)="closeDropdown()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white"
>Create Listing</a
>
}
</li>
<li>
<a routerLink="/myListings" (click)="closeDropdown()"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">My
Listings</a>
<a routerLink="/myListings" (click)="closeDropdown()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">My Listings</a>
</li>
}
<li>
<a routerLink="/myFavorites" (click)="closeDropdown()"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">My
Favorites</a>
<a routerLink="/myFavorites" (click)="closeDropdown()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">My Favorites</a>
</li>
<li>
<a routerLink="/emailUs" (click)="closeDropdown()"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">EMail
Us</a>
<a routerLink="/emailUs" (click)="closeDropdown()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">EMail Us</a>
</li>
<li>
<a routerLink="/logout" (click)="closeDropdown()"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">Logout</a>
<a routerLink="/logout" (click)="closeDropdown()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Logout</a>
</li>
</ul>
@if(authService.isAdmin() | async){
<ul class="py-2">
<li>
<a routerLink="admin/users" (click)="closeDropdown()"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">Users
(Admin)</a>
<a routerLink="admin/users" (click)="closeDropdown()" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Users (Admin)</a>
</li>
</ul>
}
<ul class="py-2 md:hidden">
<li>
<a routerLink="/businessListings"
[ngClass]="{ 'text-primary-600': isActive('/businessListings'), 'text-neutral-700': !isActive('/businessListings') }"
<a
routerLink="/businessListings"
[ngClass]="{ 'text-blue-700': isActive('/businessListings'), 'text-gray-700': !isActive('/businessListings') }"
class="block px-4 py-2 text-sm font-semibold"
(click)="closeMenusAndSetCriteria('businessListings')">Businesses</a>
(click)="closeMenusAndSetCriteria('businessListings')"
>Businesses</a
>
</li>
@if ((numberOfCommercial$ | async) > 0) {
<li>
<a routerLink="/commercialPropertyListings"
[ngClass]="{ 'text-primary-600': isActive('/commercialPropertyListings'), 'text-neutral-700': !isActive('/commercialPropertyListings') }"
<a
routerLink="/commercialPropertyListings"
[ngClass]="{ 'text-blue-700': isActive('/commercialPropertyListings'), 'text-gray-700': !isActive('/commercialPropertyListings') }"
class="block px-4 py-2 text-sm font-semibold"
(click)="closeMenusAndSetCriteria('commercialPropertyListings')">Properties</a>
(click)="closeMenusAndSetCriteria('commercialPropertyListings')"
>Properties</a
>
</li>
} @if ((numberOfBroker$ | async) > 0) {
<li>
<a
routerLink="/brokerListings"
[ngClass]="{ 'text-blue-700': isActive('/brokerListings'), 'text-gray-700': !isActive('/brokerListings') }"
class="block px-4 py-2 text-sm font-semibold"
(click)="closeMenusAndSetCriteria('brokerListings')"
>Professionals</a
>
</li>
}
<li>
<a routerLink="/brokerListings"
[ngClass]="{ 'text-primary-600': isActive('/brokerListings'), 'text-neutral-700': !isActive('/brokerListings') }"
class="block px-4 py-2 text-sm font-semibold"
(click)="closeMenusAndSetCriteria('brokerListings')">Professionals</a>
</li>
</ul>
</div>
} @else {
<div
class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-neutral-100 rounded-lg shadow dark:bg-neutral-700 dark:divide-neutral-600"
id="user-unknown">
<div class="z-50 hidden my-4 text-base list-none bg-white divide-y divide-gray-100 rounded-lg shadow dark:bg-gray-700 dark:divide-gray-600" id="user-unknown">
<ul class="py-2" aria-labelledby="user-menu-button">
<li>
<a routerLink="/login" [queryParams]="{ mode: 'login' }"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">Log
In</a>
<a routerLink="/login" [queryParams]="{ mode: 'login' }" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Log In</a>
</li>
<li>
<a routerLink="/login" [queryParams]="{ mode: 'register' }"
class="block px-4 py-2 text-sm text-neutral-700 hover:bg-neutral-100 dark:hover:bg-neutral-600 dark:text-neutral-200 dark:hover:text-white">Sign
Up</a>
<a routerLink="/login" [queryParams]="{ mode: 'register' }" class="block px-4 py-2 text-sm text-gray-700 hover:bg-gray-100 dark:hover:bg-gray-600 dark:text-gray-200 dark:hover:text-white">Sign Up</a>
</li>
</ul>
<ul class="py-2 md:hidden">
<li>
<a routerLink="/businessListings"
[ngClass]="{ 'text-primary-600': isActive('/businessListings'), 'text-neutral-700': !isActive('/businessListings') }"
<a
routerLink="/businessListings"
[ngClass]="{ 'text-blue-700': isActive('/businessListings'), 'text-gray-700': !isActive('/businessListings') }"
class="block px-4 py-2 text-sm font-bold"
(click)="closeMenusAndSetCriteria('businessListings')">Businesses</a>
(click)="closeMenusAndSetCriteria('businessListings')"
>Businesses</a
>
</li>
@if ((numberOfCommercial$ | async) > 0) {
<li>
<a routerLink="/commercialPropertyListings"
[ngClass]="{ 'text-primary-600': isActive('/commercialPropertyListings'), 'text-neutral-700': !isActive('/commercialPropertyListings') }"
<a
routerLink="/commercialPropertyListings"
[ngClass]="{ 'text-blue-700': isActive('/commercialPropertyListings'), 'text-gray-700': !isActive('/commercialPropertyListings') }"
class="block px-4 py-2 text-sm font-bold"
(click)="closeMenusAndSetCriteria('commercialPropertyListings')">Properties</a>
(click)="closeMenusAndSetCriteria('commercialPropertyListings')"
>Properties</a
>
</li>
} @if ((numberOfBroker$ | async) > 0) {
<li>
<a
routerLink="/brokerListings"
[ngClass]="{ 'text-blue-700': isActive('/brokerListings'), 'text-gray-700': !isActive('/brokerListings') }"
class="block px-4 py-2 text-sm font-bold"
(click)="closeMenusAndSetCriteria('brokerListings')"
>Professionals</a
>
</li>
}
<li>
<a routerLink="/brokerListings"
[ngClass]="{ 'text-primary-600': isActive('/brokerListings'), 'text-neutral-700': !isActive('/brokerListings') }"
class="block px-4 py-2 text-sm font-bold"
(click)="closeMenusAndSetCriteria('brokerListings')">Professionals</a>
</li>
</ul>
</div>
}
</div>
<div class="items-center justify-between hidden w-full md:flex md:w-auto md:order-1" id="navbar-user">
<ul
class="flex flex-col font-medium p-4 md:p-0 mt-4 border border-neutral-100 rounded-lg bg-neutral-50 md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 md:bg-white dark:bg-neutral-800 md:dark:bg-neutral-900 dark:border-neutral-700">
class="flex flex-col font-medium p-4 md:p-0 mt-4 border border-gray-100 rounded-lg bg-gray-50 md:space-x-8 rtl:space-x-reverse md:flex-row md:mt-0 md:border-0 md:bg-white dark:bg-gray-800 md:dark:bg-gray-900 dark:border-gray-700"
>
<li>
<a routerLinkActive="active-link" routerLink="/businessListings"
[ngClass]="{ 'bg-primary-600 text-white md:text-primary-600 md:bg-transparent md:dark:text-primary-500': isActive('/businessListings') }"
class="block py-2 px-3 rounded hover:bg-neutral-100 md:hover:bg-transparent md:hover:text-primary-600 md:p-0 dark:text-white md:dark:hover:text-primary-500 dark:hover:bg-neutral-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-neutral-700 inline-flex items-center"
aria-current="page" (click)="closeMenusAndSetCriteria('businessListings')">
<img src="/assets/images/business_logo.png" alt="Business" class="w-5 h-5 mr-2 object-contain" width="20"
height="20" />
<span>Businesses</span>
</a>
<a
routerLinkActive="active-link"
routerLink="/businessListings"
[ngClass]="{ 'bg-blue-700 text-white md:text-blue-700 md:bg-transparent md:dark:text-blue-500': isActive('/businessListings') }"
class="block py-2 px-3 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
aria-current="page"
(click)="closeMenusAndSetCriteria('businessListings')"
>Businesses</a
>
</li>
@if ((numberOfCommercial$ | async) > 0) {
<li>
<a routerLinkActive="active-link" routerLink="/commercialPropertyListings"
[ngClass]="{ 'bg-primary-600 text-white md:text-primary-600 md:bg-transparent md:dark:text-primary-500': isActive('/commercialPropertyListings') }"
class="block py-2 px-3 rounded hover:bg-neutral-100 md:hover:bg-transparent md:hover:text-primary-600 md:p-0 dark:text-white md:dark:hover:text-primary-500 dark:hover:bg-neutral-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-neutral-700 inline-flex items-center"
(click)="closeMenusAndSetCriteria('commercialPropertyListings')">
<img src="/assets/images/properties_logo.png" alt="Properties" class="w-5 h-5 mr-2 object-contain"
width="20" height="20" />
<span>Properties</span>
</a>
<a
routerLinkActive="active-link"
routerLink="/commercialPropertyListings"
[ngClass]="{ 'bg-blue-700 text-white md:text-blue-700 md:bg-transparent md:dark:text-blue-500': isActive('/commercialPropertyListings') }"
class="block py-2 px-3 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
(click)="closeMenusAndSetCriteria('commercialPropertyListings')"
>Properties</a
>
</li>
} @if ((numberOfBroker$ | async) > 0) {
<li>
<a
routerLinkActive="active-link"
routerLink="/brokerListings"
[ngClass]="{ 'bg-blue-700 text-white md:text-blue-700 md:bg-transparent md:dark:text-blue-500': isActive('/brokerListings') }"
class="block py-2 px-3 rounded hover:bg-gray-100 md:hover:bg-transparent md:hover:text-blue-700 md:p-0 dark:text-white md:dark:hover:text-blue-500 dark:hover:bg-gray-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-gray-700"
(click)="closeMenusAndSetCriteria('brokerListings')"
>Professionals</a
>
</li>
}
<li>
<a routerLinkActive="active-link" routerLink="/brokerListings"
[ngClass]="{ 'bg-primary-600 text-white md:text-primary-600 md:bg-transparent md:dark:text-primary-500': isActive('/brokerListings') }"
class="inline-flex items-center py-2 px-3 rounded hover:bg-neutral-100 md:hover:bg-transparent md:hover:text-primary-600 md:p-0 dark:text-white md:dark:hover:text-primary-500 dark:hover:bg-neutral-700 dark:hover:text-white md:dark:hover:bg-transparent dark:border-neutral-700"
(click)="closeMenusAndSetCriteria('brokerListings')">
<img src="/assets/images/icon_professionals.png" alt="Professionals"
class="w-5 h-5 mr-2 object-contain bg-transparent" style="mix-blend-mode: darken;" />
<span>Professionals</span>
</a>
</li>
</ul>
</div>
</div>
<!-- Mobile filter button -->
<div class="md:hidden flex justify-center pb-4">
<button (click)="toggleSortDropdown()" type="button" id="sortDropdownMobileButton"
class="mx-4 w-1/2 px-4 py-2 text-sm font-medium bg-white border border-neutral-200 rounded-lg hover:bg-neutral-100 hover:text-primary-600 focus:ring-2 focus:ring-primary-600 focus:text-primary-600 dark:bg-neutral-800 dark:text-neutral-400 dark:border-neutral-600 dark:hover:text-white dark:hover:bg-neutral-700"
[ngClass]="{ 'text-primary-500': selectOptions.getSortByOption(sortBy) !== 'Sort', 'text-neutral-900': selectOptions.getSortByOption(sortBy) === 'Sort' }">
<button
(click)="toggleSortDropdown()"
type="button"
id="sortDropdownMobileButton"
class="mx-4 w-1/2 px-4 py-2 text-sm font-medium bg-white border border-gray-200 rounded-lg hover:bg-gray-100 hover:text-blue-700 focus:ring-2 focus:ring-blue-700 focus:text-blue-700 dark:bg-gray-800 dark:text-gray-400 dark:border-gray-600 dark:hover:text-white dark:hover:bg-gray-700"
[ngClass]="{ 'text-blue-500': selectOptions.getSortByOption(sortBy) !== 'Sort', 'text-gray-900': selectOptions.getSortByOption(sortBy) === 'Sort' }"
>
<i class="fas fa-sort mr-2"></i>{{ selectOptions.getSortByOption(sortBy) }}
</button>
</div>

51
bizmatch/src/app/components/header/header.component.ts
View File

@ -1,5 +1,5 @@
import { CommonModule, isPlatformBrowser } from '@angular/common';
import { Component, HostListener, OnDestroy, OnInit, AfterViewInit, PLATFORM_ID, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { Component, HostListener, OnDestroy, OnInit } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { NavigationEnd, Router, RouterModule } from '@angular/router';
import { faUserGear } from '@fortawesome/free-solid-svg-icons';
@ -18,18 +18,18 @@ import { SelectOptionsService } from '../../services/select-options.service';
import { SharedService } from '../../services/shared.service';
import { UserService } from '../../services/user.service';
import { map2User } from '../../utils/utils';
import { DropdownComponent } from '../dropdown/dropdown.component';
import { ModalService } from '../search-modal/modal.service';
@UntilDestroy()
@Component({
selector: 'header',
standalone: true,
imports: [CommonModule, RouterModule, FormsModule],
imports: [CommonModule, RouterModule, DropdownComponent, FormsModule],
templateUrl: './header.component.html',
styleUrl: './header.component.scss',
})
export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
export class HeaderComponent implements OnInit, OnDestroy {
public buildVersion = environment.buildVersion;
user$: Observable<KeycloakUser>;
keycloakUser: KeycloakUser;
@ -42,8 +42,6 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
isMobile: boolean = false;
private destroy$ = new Subject<void>();
prompt: string;
private platformId = inject(PLATFORM_ID);
private isBrowser = isPlatformBrowser(this.platformId);
// Aktueller Listing-Typ basierend auf Route
currentListingType: 'businessListings' | 'commercialPropertyListings' | 'brokerListings' | null = null;
@ -67,25 +65,13 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
public selectOptions: SelectOptionsService,
public authService: AuthService,
private listingService: ListingsService,
) { }
) {}
@HostListener('document:click', ['$event'])
handleGlobalClick(event: Event) {
const target = event.target as HTMLElement;
// Don't close sort dropdown when clicking on sort buttons or user menu button
const excludedIds = ['sortDropdownButton', 'sortDropdownMobileButton', 'user-menu-button'];
if (!excludedIds.includes(target.id) && !target.closest('#user-menu-button')) {
if (target.id !== 'sortDropdownButton' && target.id !== 'sortDropdownMobileButton') {
this.sortDropdownVisible = false;
// Close User Menu if clicked outside
// We check if the click was inside the menu containers
const userLogin = document.getElementById('user-login');
const userUnknown = document.getElementById('user-unknown');
const clickedInsideMenu = (userLogin && userLogin.contains(target)) || (userUnknown && userUnknown.contains(target));
if (!clickedInsideMenu) {
this.closeDropdown();
}
}
}
@ -102,22 +88,19 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
this.numberOfBroker$ = this.userService.getNumberOfBroker(this.createEmptyUserListingCriteria());
this.numberOfCommercial$ = this.listingService.getNumberOfListings('commercialProperty');
// Flowbite is now initialized once in AppComponent
// Flowbite initialisieren
setTimeout(() => {
initFlowbite();
}, 10);
// Profile Photo Updates
this.sharedService.currentProfilePhoto.pipe(untilDestroyed(this)).subscribe(photoUrl => {
this.profileUrl = photoUrl;
});
// User Updates - re-initialize Flowbite when user state changes
// This ensures the dropdown bindings are updated when the dropdown target changes
// User Updates
this.userService.currentUser.pipe(untilDestroyed(this)).subscribe(u => {
const previousUser = this.user;
this.user = u;
// Re-initialize Flowbite if user logged in/out state changed
if ((previousUser === null) !== (u === null) && this.isBrowser) {
setTimeout(() => initFlowbite(), 50);
}
});
// Router Events
@ -235,8 +218,6 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
}
closeDropdown() {
if (!this.isBrowser) return;
const dropdownButton = document.getElementById('user-menu-button');
const dropdownMenu = this.user ? document.getElementById('user-login') : document.getElementById('user-unknown');
@ -247,8 +228,6 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
}
closeMobileMenu() {
if (!this.isBrowser) return;
const targetElement = document.getElementById('navbar-user');
const triggerElement = document.querySelector('[data-collapse-toggle="navbar-user"]');
@ -309,12 +288,6 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
};
}
ngAfterViewInit(): void {
// Flowbite initialization is now handled manually or via AppComponent
}
ngOnDestroy() {
this.destroy$.next();
this.destroy$.complete();

16
bizmatch/src/app/components/login-register/login-register.component.html
View File

@ -1,13 +1,5 @@
<div class="flex flex-col items-center justify-center min-h-screen">
<div class="bg-white p-8 rounded-lg drop-shadow-custom-bg w-full max-w-md">
<!-- Home Button -->
<div class="flex justify-end mb-4">
<a [routerLink]="['/home']" class="inline-flex items-center px-3 py-2 text-sm font-medium text-gray-700 bg-white border border-gray-300 rounded-lg hover:bg-gray-50 transition-colors cursor-pointer">
<i class="fas fa-home mr-2"></i>
Home
</a>
</div>
<h2 class="text-2xl font-bold mb-6 text-center text-gray-800">
{{ isLoginMode ? 'Login' : 'Sign Up' }}
</h2>
@ -33,7 +25,7 @@
type="email"
[(ngModel)]="email"
placeholder="Please enter E-Mail Address"
class="w-full px-3 py-2 pl-10 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
class="w-full px-3 py-2 pl-10 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
/>
<fa-icon [icon]="envelope" class="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400"></fa-icon>
</div>
@ -48,7 +40,7 @@
type="password"
[(ngModel)]="password"
placeholder="Please enter Password"
class="w-full px-3 py-2 pl-10 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
class="w-full px-3 py-2 pl-10 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
/>
<fa-icon [icon]="lock" class="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400"></fa-icon>
</div>
@ -63,7 +55,7 @@
type="password"
[(ngModel)]="confirmPassword"
placeholder="Repeat Password"
class="w-full px-3 py-2 pl-10 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-blue-500"
class="w-full px-3 py-2 pl-10 border rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 focus:border-transparent"
/>
<fa-icon [icon]="lock" class="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400"></fa-icon>
</div>
@ -79,7 +71,7 @@
<!-- <fa-icon [icon]="isLoginMode ? 'fas fas-user-plus' : 'userplus'" class="mr-2"></fa-icon> -->
<i *ngIf="isLoginMode" class="fa-solid fa-user-plus mr-2"></i>
<i *ngIf="!isLoginMode" class="fa-solid fa-arrow-right mr-2"></i>
{{ isLoginMode ? 'Sign in with Email' : 'Sign Up' }}
{{ isLoginMode ? 'Sign in with Email' : 'Register' }}
</button>
<!-- Trennlinie -->

8
bizmatch/src/app/components/login-register/login-register.component.ts
View File

@ -1,7 +1,7 @@
import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
import { ActivatedRoute, Router } from '@angular/router';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { faArrowRight, faEnvelope, faLock, faUserPlus } from '@fortawesome/free-solid-svg-icons';
import { AuthService } from '../../services/auth.service';
@ -9,7 +9,7 @@ import { LoadingService } from '../../services/loading.service';
@Component({
selector: 'app-login-register',
standalone: true,
imports: [CommonModule, FormsModule, FontAwesomeModule, RouterModule],
imports: [CommonModule, FormsModule, FontAwesomeModule],
templateUrl: './login-register.component.html',
})
export class LoginRegisterComponent {
@ -45,7 +45,7 @@ export class LoginRegisterComponent {
.loginWithEmail(this.email, this.password)
.then(userCredential => {
console.log('Successfully logged in:', userCredential);
this.router.navigate([`myListing`]);
this.router.navigate([`home`]);
})
.catch(error => {
console.error('Error during email login:', error);
@ -85,7 +85,7 @@ export class LoginRegisterComponent {
.loginWithGoogle()
.then(userCredential => {
console.log('Successfully logged in with Google:', userCredential);
this.router.navigate([`myListing`]);
this.router.navigate([`home`]);
})
.catch(error => {
console.error('Error during Google login:', error);

5
bizmatch/src/app/components/not-found/not-found.component.html
View File

@ -14,11 +14,6 @@
</section> -->
<section class="bg-white dark:bg-gray-900">
<div class="py-8 px-4 mx-auto max-w-screen-xl lg:py-16 lg:px-6">
<!-- Breadcrumbs -->
<div class="mb-4">
<app-breadcrumbs [breadcrumbs]="breadcrumbs"></app-breadcrumbs>
</div>
<div class="mx-auto max-w-screen-sm text-center">
<h1 class="mb-4 text-7xl tracking-tight font-extrabold lg:text-9xl text-blue-700 dark:text-blue-500">404</h1>
<p class="mb-4 text-3xl tracking-tight font-bold text-gray-900 md:text-4xl dark:text-white">Something's missing.</p>

27
bizmatch/src/app/components/not-found/not-found.component.ts
View File

@ -1,32 +1,11 @@
import { CommonModule } from '@angular/common';
import { Component, OnInit } from '@angular/core';
import { Component } from '@angular/core';
import { RouterModule } from '@angular/router';
import { SeoService } from '../../services/seo.service';
import { BreadcrumbItem, BreadcrumbsComponent } from '../breadcrumbs/breadcrumbs.component';
@Component({
selector: 'app-not-found',
standalone: true,
imports: [CommonModule, RouterModule, BreadcrumbsComponent],
imports: [CommonModule, RouterModule],
templateUrl: './not-found.component.html',
})
export class NotFoundComponent implements OnInit {
breadcrumbs: BreadcrumbItem[] = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: '404 - Page Not Found' }
];
constructor(private seoService: SeoService) {}
ngOnInit(): void {
// Set noindex to prevent 404 pages from being indexed
this.seoService.setNoIndex();
// Set appropriate meta tags for 404 page
this.seoService.updateMetaTags({
title: '404 - Page Not Found | BizMatch',
description: 'The page you are looking for could not be found. Return to BizMatch to browse businesses for sale or commercial properties.',
type: 'website'
});
}
}
export class NotFoundComponent {}

260
bizmatch/src/app/components/search-modal/search-modal-broker.component.html
View File

@ -1,260 +0,0 @@
<div
*ngIf="isModal && (modalService.modalVisible$ | async)?.visible && (modalService.modalVisible$ | async)?.type === 'brokerListings'"
class="fixed inset-0 bg-neutral-600 bg-opacity-50 overflow-y-auto h-full w-full flex items-center justify-center z-50"
>
<div class="relative w-full h-screen max-h-screen">
<div class="relative bg-white rounded-lg shadow h-full">
<div class="flex items-start justify-between p-4 border-b rounded-t bg-primary-600">
<h3 class="text-xl font-semibold text-white p-2 rounded">Professional Search</h3>
<button (click)="closeAndSearch()" type="button" class="text-white bg-transparent hover:bg-gray-200 hover:text-neutral-900 rounded-lg text-sm w-8 h-8 ml-auto inline-flex justify-center items-center">
<svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6" />
</svg>
<span class="sr-only">Close Modal</span>
</button>
</div>
<div class="p-6 space-y-6">
<div class="flex space-x-4 mb-4">
<button class="text-primary-600 font-medium border-b-2 border-primary-600 pb-2">Filter ({{ numberOfResults$ | async }})</button>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-primary-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-neutral-900 bg-white border border-neutral-200 rounded-lg shadow-sm opacity-0 tooltip">
Clear all Filter
<div class="tooltip-arrow" data-popper-arrow></div>
</div>
</div>
<!-- Display active filters as tags -->
<div class="flex flex-wrap gap-2 mb-4" *ngIf="hasActiveFilters()">
<span *ngIf="criteria.state" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
State: {{ criteria.state }} <button (click)="removeFilter('state')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.city" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
City: {{ criteria.city.name }} <button (click)="removeFilter('city')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.types?.length" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Types: {{ criteria.types.join(', ') }} <button (click)="removeFilter('types')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.brokerName" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Professional Name: {{ criteria.brokerName }} <button (click)="removeFilter('brokerName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.companyName" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Company: {{ criteria.companyName }} <button (click)="removeFilter('companyName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.counties?.length" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Areas Served: {{ criteria.counties.join(', ') }} <button (click)="removeFilter('counties')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
</div>
@if(criteria.criteriaType==='brokerListings') {
<div class="grid grid-cols-1 gap-6">
<div class="space-y-4">
<div>
<label for="state" class="block mb-2 text-sm font-medium text-neutral-900">Location - State</label>
<ng-select class="custom" [items]="selectOptions?.states" bindLabel="name" bindValue="value" [ngModel]="criteria.state" (ngModelChange)="setState($event)" name="state"></ng-select>
</div>
<div>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-neutral-900 font-medium" [state]="criteria.state"></app-validated-city>
</div>
<div *ngIf="criteria.city">
<label class="block mb-2 text-sm font-medium text-neutral-900">Search Type</label>
<div class="flex items-center space-x-4">
<label class="inline-flex items-center">
<input type="radio" class="form-radio" name="searchType" [ngModel]="criteria.searchType" (ngModelChange)="updateCriteria({ searchType: $event })" value="exact" />
<span class="ml-2">Exact City</span>
</label>
<label class="inline-flex items-center">
<input type="radio" class="form-radio" name="searchType" [ngModel]="criteria.searchType" (ngModelChange)="updateCriteria({ searchType: $event })" value="radius" />
<span class="ml-2">Radius Search</span>
</label>
</div>
</div>
<div *ngIf="criteria.city && criteria.searchType === 'radius'" class="space-y-2">
<label class="block mb-2 text-sm font-medium text-neutral-900">Select Radius (in miles)</label>
<div class="flex flex-wrap">
@for (radius of [5, 20, 50, 100, 200, 300, 400, 500]; track radius) {
<button
type="button"
class="px-3 py-2 text-xs font-medium text-center border border-neutral-200 hover:bg-gray-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-gray-500' : 'text-neutral-900 bg-white'"
(click)="setRadius(radius)"
>
{{ radius }}
</button>
}
</div>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Professional Type</label>
<ng-select
class="custom"
[items]="selectOptions.customerSubTypes"
bindLabel="name"
bindValue="value"
[ngModel]="criteria.types"
(ngModelChange)="onCategoryChange($event)"
[multiple]="true"
[closeOnSelect]="true"
placeholder="Select professional types"
></ng-select>
</div>
<div>
<label for="brokerName" class="block mb-2 text-sm font-medium text-neutral-900">Professional Name</label>
<input
type="text"
id="brokerName"
[ngModel]="criteria.brokerName"
(ngModelChange)="updateCriteria({ brokerName: $event })"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. John Smith"
/>
</div>
<div>
<label for="companyName" class="block mb-2 text-sm font-medium text-neutral-900">Company Name</label>
<input
type="text"
id="companyName"
[ngModel]="criteria.companyName"
(ngModelChange)="updateCriteria({ companyName: $event })"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. ABC Brokers"
/>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Counties / Areas Served</label>
<ng-select
class="custom"
[items]="counties$ | async"
[multiple]="true"
[loading]="countyLoading"
[typeahead]="countyInput$"
[ngModel]="criteria.counties"
(ngModelChange)="onCountiesChange($event)"
[closeOnSelect]="true"
placeholder="Type to search counties"
></ng-select>
</div>
</div>
</div>
}
</div>
</div>
</div>
</div>
<div *ngIf="!isModal" class="space-y-6 pb-10">
<div class="flex space-x-4 mb-4">
<h3 class="text-xl font-semibold text-neutral-900">Filter ({{ numberOfResults$ | async }})</h3>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-primary-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-neutral-900 bg-white border border-neutral-200 rounded-lg shadow-sm opacity-0 tooltip">
Clear all Filter
<div class="tooltip-arrow" data-popper-arrow></div>
</div>
</div>
<!-- Display active filters as tags -->
<div class="flex flex-wrap gap-2" *ngIf="hasActiveFilters()">
<span *ngIf="criteria.state" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
State: {{ criteria.state }} <button (click)="removeFilter('state')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.city" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
City: {{ criteria.city.name }} <button (click)="removeFilter('city')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.types?.length" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Types: {{ criteria.types.join(', ') }} <button (click)="removeFilter('types')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.brokerName" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Professional Name: {{ criteria.brokerName }} <button (click)="removeFilter('brokerName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.companyName" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Company: {{ criteria.companyName }} <button (click)="removeFilter('companyName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.counties?.length" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Areas Served: {{ criteria.counties.join(', ') }} <button (click)="removeFilter('counties')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
</div>
@if(criteria.criteriaType==='brokerListings') {
<div class="space-y-4">
<div>
<label for="state" class="block mb-2 text-sm font-medium text-neutral-900">Location - State</label>
<ng-select class="custom" [items]="selectOptions?.states" bindLabel="name" bindValue="value" [ngModel]="criteria.state" (ngModelChange)="setState($event)" name="state"></ng-select>
</div>
<div>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-neutral-900 font-medium" [state]="criteria.state"></app-validated-city>
</div>
<div *ngIf="criteria.city">
<label class="block mb-2 text-sm font-medium text-neutral-900">Search Type</label>
<div class="flex items-center space-x-4">
<label class="inline-flex items-center">
<input type="radio" class="form-radio" name="searchType" [ngModel]="criteria.searchType" (ngModelChange)="updateCriteria({ searchType: $event })" value="exact" />
<span class="ml-2">Exact City</span>
</label>
<label class="inline-flex items-center">
<input type="radio" class="form-radio" name="searchType" [ngModel]="criteria.searchType" (ngModelChange)="updateCriteria({ searchType: $event })" value="radius" />
<span class="ml-2">Radius Search</span>
</label>
</div>
</div>
<div *ngIf="criteria.city && criteria.searchType === 'radius'" class="space-y-2">
<label class="block mb-2 text-sm font-medium text-neutral-900">Select Radius (in miles)</label>
<div class="flex flex-wrap">
@for (radius of [5, 20, 50, 100, 200, 300, 400, 500]; track radius) {
<button
type="button"
class="px-3 py-2 text-xs font-medium text-center border border-neutral-200 hover:bg-gray-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-gray-500' : 'text-neutral-900 bg-white'"
(click)="setRadius(radius)"
>
{{ radius }}
</button>
}
</div>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Professional Type</label>
<ng-select
class="custom"
[items]="selectOptions.customerSubTypes"
bindLabel="name"
bindValue="value"
[ngModel]="criteria.types"
(ngModelChange)="onCategoryChange($event)"
[multiple]="true"
[closeOnSelect]="true"
placeholder="Select professional types"
></ng-select>
</div>
<div>
<label for="brokerName" class="block mb-2 text-sm font-medium text-neutral-900">Professional Name</label>
<input
type="text"
id="brokerName"
[ngModel]="criteria.brokerName"
(ngModelChange)="updateCriteria({ brokerName: $event })"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. John Smith"
/>
</div>
<div>
<label for="companyName" class="block mb-2 text-sm font-medium text-neutral-900">Company Name</label>
<input
type="text"
id="companyName"
[ngModel]="criteria.companyName"
(ngModelChange)="updateCriteria({ companyName: $event })"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. ABC Brokers"
/>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Counties / Areas Served</label>
<ng-select
class="custom"
[items]="counties$ | async"
[multiple]="true"
[loading]="countyLoading"
[typeahead]="countyInput$"
[ngModel]="criteria.counties"
(ngModelChange)="onCountiesChange($event)"
[closeOnSelect]="true"
placeholder="Type to search counties"
></ng-select>
</div>
</div>
}
</div>

316
bizmatch/src/app/components/search-modal/search-modal-broker.component.ts
View File

@ -1,316 +0,0 @@
import { CommonModule } from '@angular/common';
import { Component, Input, OnDestroy, OnInit } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { NgSelectModule } from '@ng-select/ng-select';
import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
import { catchError, concat, debounceTime, distinctUntilChanged, map, Observable, of, Subject, switchMap, takeUntil, tap } from 'rxjs';
import { CountyResult, GeoResult, UserListingCriteria } from '../../../../../bizmatch-server/src/models/main.model';
import { FilterStateService } from '../../services/filter-state.service';
import { GeoService } from '../../services/geo.service';
import { SearchService } from '../../services/search.service';
import { SelectOptionsService } from '../../services/select-options.service';
import { UserService } from '../../services/user.service';
import { ValidatedCityComponent } from '../validated-city/validated-city.component';
import { ModalService } from './modal.service';
@UntilDestroy()
@Component({
selector: 'app-search-modal-broker',
standalone: true,
imports: [CommonModule, FormsModule, NgSelectModule, ValidatedCityComponent],
templateUrl: './search-modal-broker.component.html',
styleUrls: ['./search-modal.component.scss'],
})
export class SearchModalBrokerComponent implements OnInit, OnDestroy {
@Input() isModal: boolean = true;
private destroy$ = new Subject<void>();
private searchDebounce$ = new Subject<void>();
// State
criteria: UserListingCriteria;
backupCriteria: any;
// Geo search
counties$: Observable<CountyResult[]>;
countyLoading = false;
countyInput$ = new Subject<string>();
// Results count
numberOfResults$: Observable<number>;
cancelDisable = false;
constructor(
public selectOptions: SelectOptionsService,
public modalService: ModalService,
private geoService: GeoService,
private filterStateService: FilterStateService,
private userService: UserService,
private searchService: SearchService,
) {}
ngOnInit(): void {
// Load counties
this.loadCounties();
if (this.isModal) {
// Modal mode: Wait for messages from ModalService
this.modalService.message$.pipe(untilDestroyed(this)).subscribe(criteria => {
if (criteria?.criteriaType === 'brokerListings') {
this.initializeWithCriteria(criteria);
}
});
this.modalService.modalVisible$.pipe(untilDestroyed(this)).subscribe(val => {
if (val.visible && val.type === 'brokerListings') {
// Reset pagination when modal opens
if (this.criteria) {
this.criteria.page = 1;
this.criteria.start = 0;
}
}
});
} else {
// Embedded mode: Subscribe to state changes
this.subscribeToStateChanges();
}
// Setup debounced search
this.searchDebounce$.pipe(debounceTime(400), takeUntil(this.destroy$)).subscribe(() => {
this.triggerSearch();
});
}
private initializeWithCriteria(criteria: UserListingCriteria): void {
this.criteria = criteria;
this.backupCriteria = JSON.parse(JSON.stringify(criteria));
this.setTotalNumberOfResults();
}
private subscribeToStateChanges(): void {
if (!this.isModal) {
this.filterStateService
.getState$('brokerListings')
.pipe(takeUntil(this.destroy$))
.subscribe(state => {
this.criteria = { ...state.criteria };
this.setTotalNumberOfResults();
});
}
}
private loadCounties(): void {
this.counties$ = concat(
of([]), // default items
this.countyInput$.pipe(
distinctUntilChanged(),
tap(() => (this.countyLoading = true)),
switchMap(term =>
this.geoService.findCountiesStartingWith(term).pipe(
catchError(() => of([])),
map(counties => counties.map(county => county.name)),
tap(() => (this.countyLoading = false)),
),
),
),
);
}
// Filter removal methods
removeFilter(filterType: string): void {
const updates: any = {};
switch (filterType) {
case 'state':
updates.state = null;
updates.city = null;
updates.radius = null;
updates.searchType = 'exact';
break;
case 'city':
updates.city = null;
updates.radius = null;
updates.searchType = 'exact';
break;
case 'types':
updates.types = [];
break;
case 'brokerName':
updates.brokerName = null;
break;
case 'companyName':
updates.companyName = null;
break;
case 'counties':
updates.counties = [];
break;
}
this.updateCriteria(updates);
}
// Professional type handling
onCategoryChange(selectedCategories: string[]): void {
this.updateCriteria({ types: selectedCategories });
}
categoryClicked(checked: boolean, value: string): void {
const types = [...(this.criteria.types || [])];
if (checked) {
if (!types.includes(value)) {
types.push(value);
}
} else {
const index = types.indexOf(value);
if (index > -1) {
types.splice(index, 1);
}
}
this.updateCriteria({ types });
}
// Counties handling
onCountiesChange(selectedCounties: string[]): void {
this.updateCriteria({ counties: selectedCounties });
}
// Location handling
setState(state: string): void {
const updates: any = { state };
if (!state) {
updates.city = null;
updates.radius = null;
updates.searchType = 'exact';
}
this.updateCriteria(updates);
}
setCity(city: any): void {
const updates: any = {};
if (city) {
updates.city = city;
updates.state = city.state;
// Automatically set radius to 50 miles and enable radius search
updates.searchType = 'radius';
updates.radius = 50;
} else {
updates.city = null;
updates.radius = null;
updates.searchType = 'exact';
}
this.updateCriteria(updates);
}
setRadius(radius: number): void {
this.updateCriteria({ radius });
}
onCriteriaChange(): void {
this.triggerSearch();
}
// Debounced search for text inputs
debouncedSearch(): void {
this.searchDebounce$.next();
}
// Clear all filters
clearFilter(): void {
if (this.isModal) {
// In modal: Reset locally
const defaultCriteria = this.getDefaultCriteria();
this.criteria = defaultCriteria;
this.setTotalNumberOfResults();
} else {
// Embedded: Use state service
this.filterStateService.clearFilters('brokerListings');
}
}
// Modal-specific methods
closeAndSearch(): void {
if (this.isModal) {
// Save changes to state
this.filterStateService.setCriteria('brokerListings', this.criteria);
this.modalService.accept();
this.searchService.search('brokerListings');
}
}
close(): void {
if (this.isModal) {
// Discard changes
this.modalService.reject(this.backupCriteria);
}
}
// Helper methods
public updateCriteria(updates: any): void {
if (this.isModal) {
// In modal: Update locally only
this.criteria = { ...this.criteria, ...updates };
this.setTotalNumberOfResults();
} else {
// Embedded: Update through state service
this.filterStateService.updateCriteria('brokerListings', updates);
}
// Trigger search after update
this.debouncedSearch();
}
private triggerSearch(): void {
if (this.isModal) {
// In modal: Only update count
this.setTotalNumberOfResults();
this.cancelDisable = true;
} else {
// Embedded: Full search
this.searchService.search('brokerListings');
}
}
private setTotalNumberOfResults(): void {
this.numberOfResults$ = this.userService.getNumberOfBroker(this.criteria);
}
private getDefaultCriteria(): UserListingCriteria {
return {
criteriaType: 'brokerListings',
types: [],
state: null,
city: null,
radius: null,
searchType: 'exact' as const,
brokerName: null,
companyName: null,
counties: [],
prompt: null,
page: 1,
start: 0,
length: 12,
};
}
hasActiveFilters(): boolean {
if (!this.criteria) return false;
return !!(
this.criteria.state ||
this.criteria.city ||
this.criteria.types?.length ||
this.criteria.brokerName ||
this.criteria.companyName ||
this.criteria.counties?.length
);
}
trackByFn(item: GeoResult): any {
return item.id;
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
}

102
bizmatch/src/app/components/search-modal/search-modal-commercial.component.html
View File

@ -1,12 +1,12 @@
<div
*ngIf="isModal && (modalService.modalVisible$ | async)?.visible && (modalService.modalVisible$ | async)?.type === 'commercialPropertyListings'"
class="fixed inset-0 bg-neutral-600 bg-opacity-50 overflow-y-auto h-full w-full flex items-center justify-center z-50"
class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full flex items-center justify-center z-50"
>
<div class="relative w-full h-screen max-h-screen">
<div class="relative bg-white rounded-lg shadow h-full">
<div class="flex items-start justify-between p-4 border-b rounded-t bg-primary-600">
<div class="flex items-start justify-between p-4 border-b rounded-t bg-blue-600">
<h3 class="text-xl font-semibold text-white p-2 rounded">Commercial Property Listing Search</h3>
<button (click)="closeAndSearch()" type="button" class="text-white bg-transparent hover:bg-gray-200 hover:text-neutral-900 rounded-lg text-sm w-8 h-8 ml-auto inline-flex justify-center items-center">
<button (click)="closeAndSearch()" type="button" class="text-white bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ml-auto inline-flex justify-center items-center">
<svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6" />
</svg>
@ -15,46 +15,43 @@
</div>
<div class="p-6 space-y-6">
<div class="flex space-x-4 mb-4">
<button class="text-primary-600 font-medium border-b-2 border-primary-600 pb-2">Filter ({{ numberOfResults$ | async }})</button>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-primary-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-neutral-900 bg-white border border-neutral-200 rounded-lg shadow-sm opacity-0 tooltip">
<button class="text-blue-600 font-medium border-b-2 border-blue-600 pb-2">Filter ({{ numberOfResults$ | async }})</button>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-blue-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-lg shadow-sm opacity-0 tooltip">
Clear all Filter
<div class="tooltip-arrow" data-popper-arrow></div>
</div>
</div>
<!-- Display active filters as tags -->
<div class="flex flex-wrap gap-2 mb-4" *ngIf="hasActiveFilters()">
<span *ngIf="criteria.state" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.state" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
State: {{ criteria.state }} <button (click)="removeFilter('state')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.city" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.city" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
City: {{ criteria.city.name }} <button (click)="removeFilter('city')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minPrice || criteria.maxPrice" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minPrice || criteria.maxPrice" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Price: {{ criteria.minPrice || 'Any' }} - {{ criteria.maxPrice || 'Any' }} <button (click)="removeFilter('price')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.types.length" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.types.length" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Categories: {{ criteria.types.join(', ') }} <button (click)="removeFilter('types')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.title" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.title" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Title: {{ criteria.title }} <button (click)="removeFilter('title')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.brokerName" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Broker: {{ criteria.brokerName }} <button (click)="removeFilter('brokerName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
</div>
@if(criteria.criteriaType==='commercialPropertyListings') {
<div class="grid grid-cols-1 gap-6">
<div class="space-y-4">
<div>
<label for="state" class="block mb-2 text-sm font-medium text-neutral-900">Location - State</label>
<label for="state" class="block mb-2 text-sm font-medium text-gray-900">Location - State</label>
<ng-select class="custom" [items]="selectOptions?.states" bindLabel="name" bindValue="value" [ngModel]="criteria.state" (ngModelChange)="setState($event)" name="state"></ng-select>
</div>
<div>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-neutral-900 font-medium" [state]="criteria.state"></app-validated-city>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-gray-900 font-medium" [state]="criteria.state"></app-validated-city>
</div>
<div *ngIf="criteria.city">
<label class="block mb-2 text-sm font-medium text-neutral-900">Search Type</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Search Type</label>
<div class="flex items-center space-x-4">
<label class="inline-flex items-center">
<input type="radio" class="form-radio" name="searchType" [ngModel]="criteria.searchType" (ngModelChange)="updateCriteria({ searchType: $event })" value="exact" />
@ -67,13 +64,13 @@
</div>
</div>
<div *ngIf="criteria.city && criteria.searchType === 'radius'" class="space-y-2">
<label class="block mb-2 text-sm font-medium text-neutral-900">Select Radius (in miles)</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Select Radius (in miles)</label>
<div class="flex flex-wrap">
@for (radius of [5, 20, 50, 100, 200, 300, 400, 500]; track radius) {
<button
type="button"
class="px-3 py-2 text-xs font-medium text-center border border-neutral-200 hover:bg-gray-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-gray-500' : 'text-neutral-900 bg-white'"
class="px-3 py-2 text-xs font-medium text-center border border-gray-200 hover:bg-gray-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-gray-500' : 'text-gray-900 bg-white'"
(click)="setRadius(radius)"
>
{{ radius }}
@ -82,7 +79,7 @@
</div>
</div>
<div>
<label for="price" class="block mb-2 text-sm font-medium text-neutral-900">Price</label>
<label for="price" class="block mb-2 text-sm font-medium text-gray-900">Price</label>
<div class="flex items-center space-x-2">
<app-validated-price name="price-from" [ngModel]="criteria.minPrice" (ngModelChange)="updateCriteria({ minPrice: $event })" placeholder="From" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
@ -92,7 +89,7 @@
</div>
</div>
<div>
<label for="title" class="block mb-2 text-sm font-medium text-neutral-900">Title / Description (Free Search)</label>
<label for="title" class="block mb-2 text-sm font-medium text-gray-900">Title / Description (Free Search)</label>
<input
type="text"
id="title"
@ -103,7 +100,7 @@
/>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Category</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Category</label>
<ng-select
class="custom"
[items]="selectOptions.typesOfCommercialProperty"
@ -116,17 +113,6 @@
placeholder="Select categories"
></ng-select>
</div>
<div>
<label for="brokername" class="block mb-2 text-sm font-medium text-neutral-900">Broker Name / Company Name</label>
<input
type="text"
id="brokername"
[ngModel]="criteria.brokerName"
(ngModelChange)="updateCriteria({ brokerName: $event })"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. Brokers Invest"
/>
</div>
</div>
</div>
}
@ -136,45 +122,42 @@
</div>
<div *ngIf="!isModal" class="space-y-6 pb-10">
<div class="flex space-x-4 mb-4">
<h3 class="text-xl font-semibold text-neutral-900">Filter ({{ numberOfResults$ | async }})</h3>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-primary-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-neutral-900 bg-white border border-neutral-200 rounded-lg shadow-sm opacity-0 tooltip">
<h3 class="text-xl font-semibold text-gray-900">Filter ({{ numberOfResults$ | async }})</h3>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-blue-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-lg shadow-sm opacity-0 tooltip">
Clear all Filter
<div class="tooltip-arrow" data-popper-arrow></div>
</div>
</div>
<!-- Display active filters as tags -->
<div class="flex flex-wrap gap-2" *ngIf="hasActiveFilters()">
<span *ngIf="criteria.state" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.state" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
State: {{ criteria.state }} <button (click)="removeFilter('state')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.city" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.city" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
City: {{ criteria.city.name }} <button (click)="removeFilter('city')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minPrice || criteria.maxPrice" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minPrice || criteria.maxPrice" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Price: {{ criteria.minPrice || 'Any' }} - {{ criteria.maxPrice || 'Any' }} <button (click)="removeFilter('price')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.types.length" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.types.length" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Categories: {{ criteria.types.join(', ') }} <button (click)="removeFilter('types')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.title" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.title" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Title: {{ criteria.title }} <button (click)="removeFilter('title')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.brokerName" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Broker: {{ criteria.brokerName }} <button (click)="removeFilter('brokerName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
</div>
@if(criteria.criteriaType==='commercialPropertyListings') {
<div class="space-y-4">
<div>
<label for="state" class="block mb-2 text-sm font-medium text-neutral-900">Location - State</label>
<label for="state" class="block mb-2 text-sm font-medium text-gray-900">Location - State</label>
<ng-select class="custom" [items]="selectOptions?.states" bindLabel="name" bindValue="value" [ngModel]="criteria.state" (ngModelChange)="setState($event)" name="state"></ng-select>
</div>
<div>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-neutral-900 font-medium" [state]="criteria.state"></app-validated-city>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-gray-900 font-medium" [state]="criteria.state"></app-validated-city>
</div>
<div *ngIf="criteria.city">
<label class="block mb-2 text-sm font-medium text-neutral-900">Search Type</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Search Type</label>
<div class="flex items-center space-x-4">
<label class="inline-flex items-center">
<input type="radio" class="form-radio" name="searchType" [ngModel]="criteria.searchType" (ngModelChange)="updateCriteria({ searchType: $event })" value="exact" />
@ -187,13 +170,13 @@
</div>
</div>
<div *ngIf="criteria.city && criteria.searchType === 'radius'" class="space-y-2">
<label class="block mb-2 text-sm font-medium text-neutral-900">Select Radius (in miles)</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Select Radius (in miles)</label>
<div class="flex flex-wrap">
@for (radius of [5, 20, 50, 100, 200, 300, 400, 500]; track radius) {
<button
type="button"
class="px-3 py-2 text-xs font-medium text-center border border-neutral-200 hover:bg-gray-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-gray-500' : 'text-neutral-900 bg-white'"
class="px-3 py-2 text-xs font-medium text-center border border-gray-200 hover:bg-gray-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-gray-500' : 'text-gray-900 bg-white'"
(click)="setRadius(radius)"
>
{{ radius }}
@ -202,7 +185,7 @@
</div>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Category</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Category</label>
<ng-select
class="custom"
[items]="selectOptions.typesOfCommercialProperty"
@ -216,7 +199,7 @@
></ng-select>
</div>
<div>
<label for="price" class="block mb-2 text-sm font-medium text-neutral-900">Price</label>
<label for="price" class="block mb-2 text-sm font-medium text-gray-900">Price</label>
<div class="flex items-center space-x-2">
<app-validated-price name="price-from" [ngModel]="criteria.minPrice" (ngModelChange)="updateCriteria({ minPrice: $event })" placeholder="From" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5"> </app-validated-price>
<span>-</span>
@ -224,7 +207,7 @@
</div>
</div>
<div>
<label for="title" class="block mb-2 text-sm font-medium text-neutral-900">Title / Description (Free Search)</label>
<label for="title" class="block mb-2 text-sm font-medium text-gray-900">Title / Description (Free Search)</label>
<input
type="text"
id="title"
@ -234,17 +217,6 @@
placeholder="e.g. Office Space"
/>
</div>
<div>
<label for="brokername-embedded" class="block mb-2 text-sm font-medium text-neutral-900">Broker Name / Company Name</label>
<input
type="text"
id="brokername-embedded"
[ngModel]="criteria.brokerName"
(ngModelChange)="updateCriteria({ brokerName: $event })"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. Brokers Invest"
/>
</div>
</div>
}
</div>

19
bizmatch/src/app/components/search-modal/search-modal-commercial.component.ts
View File

@ -48,7 +48,7 @@ export class SearchModalCommercialComponent implements OnInit, OnDestroy {
private filterStateService: FilterStateService,
private listingService: ListingsService,
private searchService: SearchService,
) { }
) {}
ngOnInit(): void {
// Load counties
@ -143,9 +143,6 @@ export class SearchModalCommercialComponent implements OnInit, OnDestroy {
case 'title':
updates.title = null;
break;
case 'brokerName':
updates.brokerName = null;
break;
}
this.updateCriteria(updates);
@ -187,9 +184,6 @@ export class SearchModalCommercialComponent implements OnInit, OnDestroy {
if (city) {
updates.city = city;
updates.state = city.state;
// Automatically set radius to 50 miles and enable radius search
updates.searchType = 'radius';
updates.radius = 50;
} else {
updates.city = null;
updates.radius = null;
@ -283,7 +277,6 @@ export class SearchModalCommercialComponent implements OnInit, OnDestroy {
minPrice: null,
maxPrice: null,
title: null,
brokerName: null,
prompt: null,
page: 1,
start: 0,
@ -294,15 +287,7 @@ export class SearchModalCommercialComponent implements OnInit, OnDestroy {
hasActiveFilters(): boolean {
if (!this.criteria) return false;
return !!(
this.criteria.state ||
this.criteria.city ||
this.criteria.minPrice ||
this.criteria.maxPrice ||
this.criteria.types?.length ||
this.criteria.title ||
this.criteria.brokerName
);
return !!(this.criteria.state || this.criteria.city || this.criteria.minPrice || this.criteria.maxPrice || this.criteria.types?.length || this.criteria.title);
}
trackByFn(item: GeoResult): any {

166
bizmatch/src/app/components/search-modal/search-modal.component.html
View File

@ -1,12 +1,12 @@
<div
*ngIf="isModal && (modalService.modalVisible$ | async)?.visible && (modalService.modalVisible$ | async)?.type === 'businessListings'"
class="fixed inset-0 bg-neutral-600 bg-opacity-50 overflow-y-auto h-full w-full flex items-center justify-center z-50"
class="fixed inset-0 bg-gray-600 bg-opacity-50 overflow-y-auto h-full w-full flex items-center justify-center z-50"
>
<div class="relative w-full max-h-full">
<div class="relative bg-white rounded-lg shadow">
<div class="flex items-start justify-between p-4 border-b rounded-t bg-primary-600">
<div class="flex items-start justify-between p-4 border-b rounded-t bg-blue-600">
<h3 class="text-xl font-semibold text-white p-2 rounded">Business Listing Search</h3>
<button (click)="closeAndSearch()" type="button" class="text-white bg-transparent hover:bg-neutral-200 hover:text-neutral-900 rounded-lg text-sm w-8 h-8 ml-auto inline-flex justify-center items-center">
<button (click)="closeAndSearch()" type="button" class="text-white bg-transparent hover:bg-gray-200 hover:text-gray-900 rounded-lg text-sm w-8 h-8 ml-auto inline-flex justify-center items-center">
<svg class="w-3 h-3" aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 14 14">
<path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="m1 1 6 6m0 0 6 6M7 7l6-6M7 7l-6 6" />
</svg>
@ -15,60 +15,60 @@
</div>
<div class="p-6 space-y-6">
<div class="flex space-x-4 mb-4">
<button class="text-primary-600 font-medium border-b-2 border-primary-600 pb-2">Filter ({{ numberOfResults$ | async }})</button>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-primary-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-neutral-900 bg-white border border-neutral-200 rounded-lg shadow-sm opacity-0 tooltip">
<button class="text-blue-600 font-medium border-b-2 border-blue-600 pb-2">Filter ({{ numberOfResults$ | async }})</button>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-blue-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-lg shadow-sm opacity-0 tooltip">
Clear all Filter
<div class="tooltip-arrow" data-popper-arrow></div>
</div>
</div>
<!-- Display active filters as tags -->
<div class="flex flex-wrap gap-2 mb-4" *ngIf="hasActiveFilters()">
<span *ngIf="criteria.state" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.state" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
State: {{ criteria.state }} <button (click)="removeFilter('state')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.city" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.city" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
City: {{ criteria.city.name }} <button (click)="removeFilter('city')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minPrice || criteria.maxPrice" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minPrice || criteria.maxPrice" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Price: {{ criteria.minPrice || 'Any' }} - {{ criteria.maxPrice || 'Any' }} <button (click)="removeFilter('price')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minRevenue || criteria.maxRevenue" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minRevenue || criteria.maxRevenue" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Revenue: {{ criteria.minRevenue || 'Any' }} - {{ criteria.maxRevenue || 'Any' }} <button (click)="removeFilter('revenue')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minCashFlow || criteria.maxCashFlow" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minCashFlow || criteria.maxCashFlow" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Cashflow: {{ criteria.minCashFlow || 'Any' }} - {{ criteria.maxCashFlow || 'Any' }} <button (click)="removeFilter('cashflow')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.title" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.title" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Title: {{ criteria.title }} <button (click)="removeFilter('title')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.types.length" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.types.length" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Categories: {{ criteria.types.join(', ') }} <button (click)="removeFilter('types')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="selectedPropertyType" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="selectedPropertyType" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Property Type: {{ getSelectedPropertyTypeName() }} <button (click)="removeFilter('propertyType')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minNumberEmployees || criteria.maxNumberEmployees" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minNumberEmployees || criteria.maxNumberEmployees" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Employees: {{ criteria.minNumberEmployees || 'Any' }} - {{ criteria.maxNumberEmployees || 'Any' }} <button (click)="removeFilter('employees')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.establishedMin" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.establishedMin" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Established: {{ criteria.establishedMin || 'Any' }} <button (click)="removeFilter('established')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.brokerName" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.brokerName" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Broker: {{ criteria.brokerName }} <button (click)="removeFilter('brokerName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
</div>
<div class="grid grid-cols-1 gap-6">
<div class="space-y-4">
<div>
<label for="state" class="block mb-2 text-sm font-medium text-neutral-900">Location - State</label>
<label for="state" class="block mb-2 text-sm font-medium text-gray-900">Location - State</label>
<ng-select class="custom" [items]="selectOptions?.states" bindLabel="name" bindValue="value" [ngModel]="criteria.state" (ngModelChange)="setState($event)" name="state"></ng-select>
</div>
<div>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-neutral-900 font-medium" [state]="criteria.state"></app-validated-city>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-gray-900 font-medium" [state]="criteria.state"></app-validated-city>
</div>
<div *ngIf="criteria.city">
<label class="block mb-2 text-sm font-medium text-neutral-900">Search Type</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Search Type</label>
<div class="flex items-center space-x-4">
<label class="inline-flex items-center">
<input type="radio" class="form-radio" name="searchType" [ngModel]="criteria.searchType" (ngModelChange)="updateCriteria({ searchType: $event })" value="exact" />
@ -81,13 +81,13 @@
</div>
</div>
<div *ngIf="criteria.city && criteria.searchType === 'radius'" class="space-y-2">
<label class="block mb-2 text-sm font-medium text-neutral-900">Select Radius (in miles)</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Select Radius (in miles)</label>
<div class="flex flex-wrap">
@for (radius of [5, 20, 50, 100, 200, 300, 400, 500]; track radius) {
<button
type="button"
class="px-3 py-2 text-xs font-medium text-center border border-neutral-200 hover:bg-neutral-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-neutral-500' : 'text-neutral-900 bg-white'"
class="px-3 py-2 text-xs font-medium text-center border border-gray-200 hover:bg-gray-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-gray-500' : 'text-gray-900 bg-white'"
(click)="setRadius(radius)"
>
{{ radius }}
@ -96,48 +96,48 @@
</div>
</div>
<div>
<label for="price" class="block mb-2 text-sm font-medium text-neutral-900">Price</label>
<label for="price" class="block mb-2 text-sm font-medium text-gray-900">Price</label>
<div class="flex items-center space-x-2">
<app-validated-price name="price-from" [ngModel]="criteria.minPrice" (ngModelChange)="updateCriteria({ minPrice: $event })" placeholder="From" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5">
<app-validated-price name="price-from" [ngModel]="criteria.minPrice" (ngModelChange)="updateCriteria({ minPrice: $event })" placeholder="From" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
<span>-</span>
<app-validated-price name="price-to" [ngModel]="criteria.maxPrice" (ngModelChange)="updateCriteria({ maxPrice: $event })" placeholder="To" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5">
<app-validated-price name="price-to" [ngModel]="criteria.maxPrice" (ngModelChange)="updateCriteria({ maxPrice: $event })" placeholder="To" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
</div>
</div>
<div>
<label for="salesRevenue" class="block mb-2 text-sm font-medium text-neutral-900">Sales Revenue</label>
<label for="salesRevenue" class="block mb-2 text-sm font-medium text-gray-900">Sales Revenue</label>
<div class="flex items-center space-x-2">
<app-validated-price name="salesRevenue-from" [ngModel]="criteria.minRevenue" (ngModelChange)="updateCriteria({ minRevenue: $event })" placeholder="From" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5">
<app-validated-price name="salesRevenue-from" [ngModel]="criteria.minRevenue" (ngModelChange)="updateCriteria({ minRevenue: $event })" placeholder="From" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
<span>-</span>
<app-validated-price name="salesRevenue-to" [ngModel]="criteria.maxRevenue" (ngModelChange)="updateCriteria({ maxRevenue: $event })" placeholder="To" inputClasses="bg-neutral-50 text-sm !mt-0 p.2.5">
<app-validated-price name="salesRevenue-to" [ngModel]="criteria.maxRevenue" (ngModelChange)="updateCriteria({ maxRevenue: $event })" placeholder="To" inputClasses="bg-gray-50 text-sm !mt-0 p.2.5">
</app-validated-price>
</div>
</div>
<div>
<label for="cashflow" class="block mb-2 text-sm font-medium text-neutral-900">Cashflow</label>
<label for="cashflow" class="block mb-2 text-sm font-medium text-gray-900">Cashflow</label>
<div class="flex items-center space-x-2">
<app-validated-price name="cashflow-from" [ngModel]="criteria.minCashFlow" (ngModelChange)="updateCriteria({ minCashFlow: $event })" placeholder="From" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5">
<app-validated-price name="cashflow-from" [ngModel]="criteria.minCashFlow" (ngModelChange)="updateCriteria({ minCashFlow: $event })" placeholder="From" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
<span>-</span>
<app-validated-price name="cashflow-to" [ngModel]="criteria.maxCashFlow" (ngModelChange)="updateCriteria({ maxCashFlow: $event })" placeholder="To" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5">
<app-validated-price name="cashflow-to" [ngModel]="criteria.maxCashFlow" (ngModelChange)="updateCriteria({ maxCashFlow: $event })" placeholder="To" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
</div>
</div>
<div>
<label for="title" class="block mb-2 text-sm font-medium text-neutral-900">Title / Description (Free Search)</label>
<label for="title" class="block mb-2 text-sm font-medium text-gray-900">Title / Description (Free Search)</label>
<input
type="text"
id="title"
[ngModel]="criteria.title"
(ngModelChange)="updateCriteria({ title: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-full p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. Restaurant"
/>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Category</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Category</label>
<ng-select
class="custom"
[items]="selectOptions.typesOfBusiness"
@ -151,7 +151,7 @@
></ng-select>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Type of Property</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Type of Property</label>
<ng-select
class="custom"
[items]="propertyTypeOptions"
@ -163,14 +163,14 @@
></ng-select>
</div>
<div>
<label for="numberEmployees" class="block mb-2 text-sm font-medium text-neutral-900">Number of Employees</label>
<label for="numberEmployees" class="block mb-2 text-sm font-medium text-gray-900">Number of Employees</label>
<div class="flex items-center space-x-2">
<input
type="number"
id="numberEmployees-from"
[ngModel]="criteria.minNumberEmployees"
(ngModelChange)="updateCriteria({ minNumberEmployees: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-1/2 p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-1/2 p-2.5"
placeholder="From"
/>
<span>-</span>
@ -179,32 +179,32 @@
id="numberEmployees-to"
[ngModel]="criteria.maxNumberEmployees"
(ngModelChange)="updateCriteria({ maxNumberEmployees: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-1/2 p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-1/2 p-2.5"
placeholder="To"
/>
</div>
</div>
<div>
<label for="establishedMin" class="block mb-2 text-sm font-medium text-neutral-900">Minimum years established</label>
<label for="establishedMin" class="block mb-2 text-sm font-medium text-gray-900">Minimum years established</label>
<div class="flex items-center space-x-2">
<input
type="number"
id="establishedMin"
[ngModel]="criteria.establishedMin"
(ngModelChange)="updateCriteria({ establishedMin: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-1/2 p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-1/2 p-2.5"
placeholder="YY"
/>
</div>
</div>
<div>
<label for="brokername" class="block mb-2 text-sm font-medium text-neutral-900">Broker Name / Company Name</label>
<label for="brokername" class="block mb-2 text-sm font-medium text-gray-900">Broker Name / Company Name</label>
<input
type="text"
id="brokername"
[ngModel]="criteria.brokerName"
(ngModelChange)="updateCriteria({ brokerName: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-full p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. Brokers Invest"
/>
</div>
@ -219,60 +219,60 @@
<!-- ################################################################################## -->
<div *ngIf="!isModal" class="space-y-6">
<div class="flex space-x-4 mb-4">
<h3 class="text-xl font-semibold text-neutral-900">Filter ({{ numberOfResults$ | async }})</h3>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-primary-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-neutral-900 bg-white border border-neutral-200 rounded-lg shadow-sm opacity-0 tooltip">
<h3 class="text-xl font-semibold text-gray-900">Filter ({{ numberOfResults$ | async }})</h3>
<i data-tooltip-target="tooltip-light" class="fa-solid fa-trash-can flex self-center ml-2 hover:cursor-pointer text-blue-500" (click)="clearFilter()"></i>
<div id="tooltip-light" role="tooltip" class="absolute z-10 invisible inline-block px-3 py-2 text-sm font-medium text-gray-900 bg-white border border-gray-200 rounded-lg shadow-sm opacity-0 tooltip">
Clear all Filter
<div class="tooltip-arrow" data-popper-arrow></div>
</div>
</div>
<!-- Display active filters as tags -->
<div class="flex flex-wrap gap-2" *ngIf="hasActiveFilters()">
<span *ngIf="criteria.state" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.state" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
State: {{ criteria.state }} <button (click)="removeFilter('state')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.city" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.city" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
City: {{ criteria.city.name }} <button (click)="removeFilter('city')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minPrice || criteria.maxPrice" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minPrice || criteria.maxPrice" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Price: {{ criteria.minPrice || 'Any' }} - {{ criteria.maxPrice || 'Any' }} <button (click)="removeFilter('price')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minRevenue || criteria.maxRevenue" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minRevenue || criteria.maxRevenue" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Revenue: {{ criteria.minRevenue || 'Any' }} - {{ criteria.maxRevenue || 'Any' }} <button (click)="removeFilter('revenue')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minCashFlow || criteria.maxCashFlow" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minCashFlow || criteria.maxCashFlow" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Cashflow: {{ criteria.minCashFlow || 'Any' }} - {{ criteria.maxCashFlow || 'Any' }} <button (click)="removeFilter('cashflow')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.title" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.title" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Title: {{ criteria.title }} <button (click)="removeFilter('title')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.types.length" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.types.length" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Categories: {{ criteria.types.join(', ') }} <button (click)="removeFilter('types')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="selectedPropertyType" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="selectedPropertyType" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Property Type: {{ getSelectedPropertyTypeName() }} <button (click)="removeFilter('propertyType')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.minNumberEmployees || criteria.maxNumberEmployees" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.minNumberEmployees || criteria.maxNumberEmployees" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Employees: {{ criteria.minNumberEmployees || 'Any' }} - {{ criteria.maxNumberEmployees || 'Any' }} <button (click)="removeFilter('employees')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.establishedMin" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.establishedMin" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Years established: {{ criteria.establishedMin || 'Any' }} <button (click)="removeFilter('established')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
<span *ngIf="criteria.brokerName" class="bg-neutral-200 text-neutral-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
<span *ngIf="criteria.brokerName" class="bg-gray-200 text-gray-800 text-xs font-medium px-2.5 py-0.5 rounded flex items-center">
Broker: {{ criteria.brokerName }} <button (click)="removeFilter('brokerName')" class="ml-1 text-red-500 hover:text-red-700">×</button>
</span>
</div>
@if(criteria.criteriaType==='businessListings') {
<div class="space-y-4">
<div>
<label for="state" class="block mb-2 text-sm font-medium text-neutral-900">Location - State</label>
<label for="state" class="block mb-2 text-sm font-medium text-gray-900">Location - State</label>
<ng-select class="custom" [items]="selectOptions?.states" bindLabel="name" bindValue="value" [ngModel]="criteria.state" (ngModelChange)="setState($event)" name="state"></ng-select>
</div>
<div>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-neutral-900 font-medium" [state]="criteria.state"></app-validated-city>
<app-validated-city label="Location - City" name="city" [ngModel]="criteria.city" (ngModelChange)="setCity($event)" labelClasses="text-gray-900 font-medium" [state]="criteria.state"></app-validated-city>
</div>
<div *ngIf="criteria.city">
<label class="block mb-2 text-sm font-medium text-neutral-900">Search Type</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Search Type</label>
<div class="flex items-center space-x-4">
<label class="inline-flex items-center">
<input type="radio" class="form-radio" name="searchType" [ngModel]="criteria.searchType" (ngModelChange)="updateCriteria({ searchType: $event })" value="exact" />
@ -285,13 +285,13 @@
</div>
</div>
<div *ngIf="criteria.city && criteria.searchType === 'radius'" class="space-y-2">
<label class="block mb-2 text-sm font-medium text-neutral-900">Select Radius (in miles)</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Select Radius (in miles)</label>
<div class="flex flex-wrap">
@for (radius of [5, 20, 50, 100, 200, 300, 400, 500]; track radius) {
<button
type="button"
class="px-3 py-2 text-xs font-medium text-center border border-neutral-200 hover:bg-neutral-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-neutral-500' : 'text-neutral-900 bg-white'"
class="px-3 py-2 text-xs font-medium text-center border border-gray-200 hover:bg-gray-500 hover:text-white"
[ngClass]="criteria.radius === radius ? 'text-white bg-gray-500' : 'text-gray-900 bg-white'"
(click)="setRadius(radius)"
>
{{ radius }}
@ -300,46 +300,46 @@
</div>
</div>
<div>
<label for="price" class="block mb-2 text-sm font-medium text-neutral-900">Price</label>
<label for="price" class="block mb-2 text-sm font-medium text-gray-900">Price</label>
<div class="flex items-center space-x-2">
<app-validated-price name="price-from" [ngModel]="criteria.minPrice" (ngModelChange)="updateCriteria({ minPrice: $event })" placeholder="From" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5"> </app-validated-price>
<app-validated-price name="price-from" [ngModel]="criteria.minPrice" (ngModelChange)="updateCriteria({ minPrice: $event })" placeholder="From" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5"> </app-validated-price>
<span>-</span>
<app-validated-price name="price-to" [ngModel]="criteria.maxPrice" (ngModelChange)="updateCriteria({ maxPrice: $event })" placeholder="To" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5"> </app-validated-price>
<app-validated-price name="price-to" [ngModel]="criteria.maxPrice" (ngModelChange)="updateCriteria({ maxPrice: $event })" placeholder="To" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5"> </app-validated-price>
</div>
</div>
<div>
<label for="salesRevenue" class="block mb-2 text-sm font-medium text-neutral-900">Sales Revenue</label>
<label for="salesRevenue" class="block mb-2 text-sm font-medium text-gray-900">Sales Revenue</label>
<div class="flex items-center space-x-2">
<app-validated-price name="salesRevenue-from" [ngModel]="criteria.minRevenue" (ngModelChange)="updateCriteria({ minRevenue: $event })" placeholder="From" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5">
<app-validated-price name="salesRevenue-from" [ngModel]="criteria.minRevenue" (ngModelChange)="updateCriteria({ minRevenue: $event })" placeholder="From" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
<span>-</span>
<app-validated-price name="salesRevenue-to" [ngModel]="criteria.maxRevenue" (ngModelChange)="updateCriteria({ maxRevenue: $event })" placeholder="To" inputClasses="bg-neutral-50 text-sm !mt-0 p.2.5">
<app-validated-price name="salesRevenue-to" [ngModel]="criteria.maxRevenue" (ngModelChange)="updateCriteria({ maxRevenue: $event })" placeholder="To" inputClasses="bg-gray-50 text-sm !mt-0 p.2.5">
</app-validated-price>
</div>
</div>
<div>
<label for="cashflow" class="block mb-2 text-sm font-medium text-neutral-900">Cashflow</label>
<label for="cashflow" class="block mb-2 text-sm font-medium text-gray-900">Cashflow</label>
<div class="flex items-center space-x-2">
<app-validated-price name="cashflow-from" [ngModel]="criteria.minCashFlow" (ngModelChange)="updateCriteria({ minCashFlow: $event })" placeholder="From" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5">
<app-validated-price name="cashflow-from" [ngModel]="criteria.minCashFlow" (ngModelChange)="updateCriteria({ minCashFlow: $event })" placeholder="From" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
<span>-</span>
<app-validated-price name="cashflow-to" [ngModel]="criteria.maxCashFlow" (ngModelChange)="updateCriteria({ maxCashFlow: $event })" placeholder="To" inputClasses="bg-neutral-50 text-sm !mt-0 p-2.5">
<app-validated-price name="cashflow-to" [ngModel]="criteria.maxCashFlow" (ngModelChange)="updateCriteria({ maxCashFlow: $event })" placeholder="To" inputClasses="bg-gray-50 text-sm !mt-0 p-2.5">
</app-validated-price>
</div>
</div>
<div>
<label for="title" class="block mb-2 text-sm font-medium text-neutral-900">Title / Description (Free Search)</label>
<label for="title" class="block mb-2 text-sm font-medium text-gray-900">Title / Description (Free Search)</label>
<input
type="text"
id="title"
[ngModel]="criteria.title"
(ngModelChange)="updateCriteria({ title: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-full p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. Restaurant"
/>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Category</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Category</label>
<ng-select
class="custom"
[items]="selectOptions.typesOfBusiness"
@ -353,7 +353,7 @@
></ng-select>
</div>
<div>
<label class="block mb-2 text-sm font-medium text-neutral-900">Type of Property</label>
<label class="block mb-2 text-sm font-medium text-gray-900">Type of Property</label>
<ng-select
class="custom"
[items]="propertyTypeOptions"
@ -365,14 +365,14 @@
></ng-select>
</div>
<div>
<label for="numberEmployees" class="block mb-2 text-sm font-medium text-neutral-900">Number of Employees</label>
<label for="numberEmployees" class="block mb-2 text-sm font-medium text-gray-900">Number of Employees</label>
<div class="flex items-center space-x-2">
<input
type="number"
id="numberEmployees-from"
[ngModel]="criteria.minNumberEmployees"
(ngModelChange)="updateCriteria({ minNumberEmployees: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-1/2 p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-1/2 p-2.5"
placeholder="From"
/>
<span>-</span>
@ -381,32 +381,32 @@
id="numberEmployees-to"
[ngModel]="criteria.maxNumberEmployees"
(ngModelChange)="updateCriteria({ maxNumberEmployees: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-1/2 p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-1/2 p-2.5"
placeholder="To"
/>
</div>
</div>
<div>
<label for="establishedMin" class="block mb-2 text-sm font-medium text-neutral-900">Minimum years established</label>
<label for="establishedMin" class="block mb-2 text-sm font-medium text-gray-900">Minimum years established</label>
<div class="flex items-center space-x-2">
<input
type="number"
id="establishedMin"
[ngModel]="criteria.establishedMin"
(ngModelChange)="updateCriteria({ establishedMin: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-1/2 p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-1/2 p-2.5"
placeholder="YY"
/>
</div>
</div>
<div>
<label for="brokername" class="block mb-2 text-sm font-medium text-neutral-900">Broker Name / Company Name</label>
<label for="brokername" class="block mb-2 text-sm font-medium text-gray-900">Broker Name / Company Name</label>
<input
type="text"
id="brokername"
[ngModel]="criteria.brokerName"
(ngModelChange)="updateCriteria({ brokerName: $event })"
class="bg-neutral-50 border border-neutral-300 text-sm rounded-lg block w-full p-2.5"
class="bg-gray-50 border border-gray-300 text-sm rounded-lg block w-full p-2.5"
placeholder="e.g. Brokers Invest"
/>
</div>

3
bizmatch/src/app/components/search-modal/search-modal.component.ts
View File

@ -257,9 +257,6 @@ export class SearchModalComponent implements OnInit, OnDestroy {
if (city) {
updates.city = city;
updates.state = city.state;
// Automatically set radius to 50 miles and enable radius search
updates.searchType = 'radius';
updates.radius = 50;
} else {
updates.city = null;
updates.radius = null;

24
bizmatch/src/app/components/test-ssr/test-ssr.component.ts
View File

@ -1,24 +0,0 @@
import { Component } from '@angular/core';
@Component({
selector: 'app-test-ssr',
standalone: true,
template: `
<div>
<h1>SSR Test Component</h1>
<p>If you see this, SSR is working!</p>
</div>
`,
styles: [`
div {
padding: 20px;
background: #f0f0f0;
}
h1 { color: green; }
`]
})
export class TestSsrComponent {
constructor() {
console.log('[SSR] TestSsrComponent constructor called');
}
}

14
bizmatch/src/app/components/tooltip/tooltip.component.ts
View File

@ -1,5 +1,6 @@
import { CommonModule, isPlatformBrowser } from '@angular/common';
import { Component, Input, SimpleChanges, PLATFORM_ID, inject } from '@angular/core';
import { CommonModule } from '@angular/common';
import { Component, Input, SimpleChanges } from '@angular/core';
import { initFlowbite } from 'flowbite';
@Component({
selector: 'app-tooltip',
@ -12,9 +13,6 @@ export class TooltipComponent {
@Input() text: string;
@Input() isVisible: boolean = false;
private platformId = inject(PLATFORM_ID);
private isBrowser = isPlatformBrowser(this.platformId);
ngOnInit() {
this.initializeTooltip();
}
@ -26,12 +24,12 @@ export class TooltipComponent {
}
private initializeTooltip() {
// Flowbite is now initialized once in AppComponent
setTimeout(() => {
initFlowbite();
}, 10);
}
private updateTooltipVisibility() {
if (!this.isBrowser) return;
const tooltipElement = document.getElementById(this.id);
if (tooltipElement) {
if (this.isVisible) {

2
bizmatch/src/app/components/validated-input/validated-input.component.ts
View File

@ -10,7 +10,7 @@ import { ValidationMessagesService } from '../validation-messages.service';
selector: 'app-validated-input',
templateUrl: './validated-input.component.html',
standalone: true,
imports: [CommonModule, FormsModule, TooltipComponent, NgxMaskDirective],
imports: [CommonModule, FormsModule, TooltipComponent, NgxMaskDirective, NgxMaskPipe],
providers: [
{
provide: NG_VALUE_ACCESSOR,

34
bizmatch/src/app/components/validated-price/validated-price.component.ts
View File

@ -1,9 +1,7 @@
import { CommonModule } from '@angular/common';
import { Component, forwardRef, Input, OnInit, OnDestroy } from '@angular/core';
import { Component, forwardRef, Input } from '@angular/core';
import { FormsModule, NG_VALUE_ACCESSOR } from '@angular/forms';
import { NgxCurrencyDirective } from 'ngx-currency';
import { Subject } from 'rxjs';
import { debounceTime, takeUntil } from 'rxjs/operators';
import { BaseInputComponent } from '../base-input/base-input.component';
import { TooltipComponent } from '../tooltip/tooltip.component';
import { ValidationMessagesService } from '../validation-messages.service';
@ -22,39 +20,15 @@ import { ValidationMessagesService } from '../validation-messages.service';
templateUrl: './validated-price.component.html',
styles: `:host{width:100%}`,
})
export class ValidatedPriceComponent extends BaseInputComponent implements OnInit, OnDestroy {
export class ValidatedPriceComponent extends BaseInputComponent {
@Input() inputClasses: string;
@Input() placeholder: string = '';
@Input() debounceTimeMs: number = 400; // Configurable debounce time in milliseconds
private inputChange$ = new Subject<any>();
private destroy$ = new Subject<void>();
constructor(validationMessagesService: ValidationMessagesService) {
super(validationMessagesService);
}
override ngOnInit(): void {
// Setup debounced onChange
this.inputChange$
.pipe(
debounceTime(this.debounceTimeMs),
takeUntil(this.destroy$)
)
.subscribe(value => {
this.value = value;
this.onChange(this.value);
});
}
override ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
onInputChange(event: Event): void {
const newValue = !event ? null : event;
// Send signal to Subject instead of calling onChange directly
this.inputChange$.next(newValue);
this.value = !event ? null : event;
this.onChange(this.value);
}
}

90
bizmatch/src/app/directives/lazy-load-image.directive.ts
View File

@ -1,90 +0,0 @@
import { Directive, ElementRef, Input, OnInit, Renderer2 } from '@angular/core';
@Directive({
selector: 'img[appLazyLoad]',
standalone: true
})
export class LazyLoadImageDirective implements OnInit {
@Input() appLazyLoad: string = '';
@Input() placeholder: string = 'data:image/svg+xml,%3Csvg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 300"%3E%3Crect fill="%23f3f4f6" width="400" height="300"/%3E%3C/svg%3E';
private observer: IntersectionObserver | null = null;
constructor(
private el: ElementRef<HTMLImageElement>,
private renderer: Renderer2
) {}
ngOnInit() {
// Add loading="lazy" attribute for native lazy loading
this.renderer.setAttribute(this.el.nativeElement, 'loading', 'lazy');
// Set placeholder while image loads
if (this.placeholder) {
this.renderer.setAttribute(this.el.nativeElement, 'src', this.placeholder);
}
// Add a CSS class for styling during loading
this.renderer.addClass(this.el.nativeElement, 'lazy-loading');
// Use Intersection Observer for enhanced lazy loading
if ('IntersectionObserver' in window) {
this.observer = new IntersectionObserver(
(entries) => {
entries.forEach((entry) => {
if (entry.isIntersecting) {
this.loadImage();
}
});
},
{
rootMargin: '50px' // Start loading 50px before image enters viewport
}
);
this.observer.observe(this.el.nativeElement);
} else {
// Fallback for browsers without Intersection Observer
this.loadImage();
}
}
private loadImage() {
const img = this.el.nativeElement;
const src = this.appLazyLoad || img.getAttribute('data-src');
if (src) {
// Create a new image to preload
const tempImg = new Image();
tempImg.onload = () => {
this.renderer.setAttribute(img, 'src', src);
this.renderer.removeClass(img, 'lazy-loading');
this.renderer.addClass(img, 'lazy-loaded');
// Disconnect observer after loading
if (this.observer) {
this.observer.disconnect();
}
};
tempImg.onerror = () => {
console.error('Failed to load image:', src);
this.renderer.removeClass(img, 'lazy-loading');
this.renderer.addClass(img, 'lazy-error');
if (this.observer) {
this.observer.disconnect();
}
};
tempImg.src = src;
}
}
ngOnDestroy() {
if (this.observer) {
this.observer.disconnect();
}
}
}

5
bizmatch/src/app/guards/listing-category.guard.ts
View File

@ -19,11 +19,10 @@ export class ListingCategoryGuard implements CanActivate {
return this.http.get<any>(url).pipe(
tap(response => {
const category = response.listingsCategory;
const slug = response.slug || id;
if (category === 'business') {
this.router.navigate(['business', slug]);
this.router.navigate(['details-business-listing', id]);
} else if (category === 'commercialProperty') {
this.router.navigate(['commercial-property', slug]);
this.router.navigate(['details-commercial-property-listing', id]);
} else {
this.router.navigate(['not-found']);
}

90
bizmatch/src/app/pages/details/base-details.component.ts
View File

@ -1,8 +1,6 @@
import { Component, inject, PLATFORM_ID } from '@angular/core';
import { isPlatformBrowser } from '@angular/common';
import { Component } from '@angular/core';
import { Control, DomEvent, DomUtil, icon, Icon, latLng, Layer, Map, MapOptions, Marker, tileLayer } from 'leaflet';
import { BusinessListing, CommercialPropertyListing } from '../../../../../bizmatch-server/src/models/db.model';
@Component({
selector: 'app-base-details',
template: ``,
@ -14,15 +12,9 @@ export abstract class BaseDetailsComponent {
mapOptions: MapOptions;
mapLayers: Layer[] = [];
mapCenter: any;
mapZoom: number = 13;
mapZoom: number = 13; // Standardzoomlevel
protected listing: BusinessListing | CommercialPropertyListing;
protected isBrowser: boolean;
private platformId = inject(PLATFORM_ID);
constructor() {
this.isBrowser = isPlatformBrowser(this.platformId);
// Only initialize mapOptions in browser context
if (this.isBrowser) {
this.mapOptions = {
layers: [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
@ -30,56 +22,27 @@ export abstract class BaseDetailsComponent {
}),
],
zoom: this.mapZoom,
center: latLng(0, 0),
center: latLng(0, 0), // Platzhalter, wird später gesetzt
};
}
}
protected configureMap() {
if (!this.isBrowser) {
return; // Skip on server
}
const latitude = this.listing.location.latitude;
const longitude = this.listing.location.longitude;
if (latitude !== null && latitude !== undefined &&
longitude !== null && longitude !== undefined) {
if (latitude && longitude) {
this.mapCenter = latLng(latitude, longitude);
const addressParts = [];
if (this.listing.location.housenumber) addressParts.push(this.listing.location.housenumber);
if (this.listing.location.street) addressParts.push(this.listing.location.street);
if (this.listing.location.name) addressParts.push(this.listing.location.name);
else if (this.listing.location.county) addressParts.push(this.listing.location.county);
if (this.listing.location.state) addressParts.push(this.listing.location.state);
if (this.listing.location.zipCode) addressParts.push(this.listing.location.zipCode);
const fullAddress = addressParts.join(', ');
const marker = new Marker([latitude, longitude], {
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
new Marker([latitude, longitude], {
icon: icon({
...Icon.Default.prototype.options,
iconUrl: 'assets/leaflet/marker-icon.png',
iconRetinaUrl: 'assets/leaflet/marker-icon-2x.png',
shadowUrl: 'assets/leaflet/marker-shadow.png',
}),
});
if (fullAddress) {
marker.bindPopup(`
<div style="padding: 8px;">
<strong>Location:</strong><br/>
${fullAddress}
</div>
`);
}
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
marker
];
this.mapOptions = {
...this.mapOptions,
@ -88,35 +51,24 @@ export abstract class BaseDetailsComponent {
};
}
}
onMapReady(map: Map) {
if (!this.isBrowser) {
return;
}
const addressParts = [];
if (this.listing.location.housenumber) addressParts.push(this.listing.location.housenumber);
if (this.listing.location.street) addressParts.push(this.listing.location.street);
if (this.listing.location.name) addressParts.push(this.listing.location.name);
else if (this.listing.location.county) addressParts.push(this.listing.location.county);
if (this.listing.location.state) addressParts.push(this.listing.location.state);
if (this.listing.location.zipCode) addressParts.push(this.listing.location.zipCode);
if (addressParts.length > 0) {
if (this.listing.location.street) {
const addressControl = new Control({ position: 'topright' });
addressControl.onAdd = () => {
const container = DomUtil.create('div', 'address-control bg-white p-2 rounded shadow');
const address = addressParts.join(', ');
const address = `${this.listing.location.housenumber ? this.listing.location.housenumber : ''} ${this.listing.location.street}, ${
this.listing.location.name ? this.listing.location.name : this.listing.location.county
}, ${this.listing.location.state}`;
container.innerHTML = `
<div style="max-width: 250px;">
${address}<br/>
<a href="#" id="view-full-map" style="color: #2563eb; text-decoration: underline;">View larger map</a>
</div>
<a href="#" id="view-full-map">View larger map</a>
`;
// Verhindere, dass die Karte durch das Klicken des Links bewegt wird
DomEvent.disableClickPropagation(container);
// Füge einen Event Listener für den Link hinzu
const link = container.querySelector('#view-full-map') as HTMLElement;
if (link) {
DomEvent.on(link, 'click', (e: Event) => {
@ -131,20 +83,12 @@ export abstract class BaseDetailsComponent {
addressControl.addTo(map);
}
}
openFullMap() {
if (!this.isBrowser) {
return;
}
const latitude = this.listing.location.latitude;
const longitude = this.listing.location.longitude;
const address = `${this.listing.location.housenumber} ${this.listing.location.street}, ${this.listing.location.name ? this.listing.location.name : this.listing.location.county}, ${this.listing.location.state}`;
const url = `https://www.openstreetmap.org/?mlat=${latitude}&mlon=${longitude}#map=15/${latitude}/${longitude}`;
window.open(url, '_blank');
}
}

182
bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
View File

@ -1,57 +1,43 @@
<div class="container mx-auto p-4">
<!-- Breadcrumbs for SEO and Navigation -->
@if(breadcrumbs.length > 0) {
<app-breadcrumbs [breadcrumbs]="breadcrumbs"></app-breadcrumbs>
}
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg overflow-hidden relative">
<button (click)="historyService.goBack()"
class="absolute top-4 right-4 bg-red-500 text-white rounded-full w-8 h-8 flex items-center justify-center hover:bg-red-600 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-opacity-50 print:hidden">
<button
(click)="historyService.goBack()"
class="absolute top-4 right-4 bg-red-500 text-white rounded-full w-8 h-8 flex items-center justify-center hover:bg-red-600 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-opacity-50 print:hidden"
>
<i class="fas fa-times"></i>
</button>
@if(listing){
<div class="p-6 flex flex-col lg:flex-row">
<!-- Left column -->
<div class="w-full lg:w-1/2 pr-0 lg:pr-6">
<h1 class="text-2xl font-bold mb-4 break-words">{{ listing.title }}</h1>
<p class="mb-4 break-words" [innerHTML]="description"></p>
<h1 class="text-2xl font-bold mb-4">{{ listing.title }}</h1>
<p class="mb-4" [innerHTML]="description"></p>
<div class="space-y-2">
<div *ngFor="let detail of listingDetails; let i = index" class="flex flex-col sm:flex-row"
[ngClass]="{ 'bg-neutral-100': i % 2 === 0 }">
<div *ngFor="let detail of listingDetails; let i = index" class="flex flex-col sm:flex-row" [ngClass]="{ 'bg-gray-100': i % 2 === 0 }">
<div class="w-full sm:w-1/3 font-semibold p-2">{{ detail.label }}</div>
<div class="w-full sm:w-2/3 p-2 break-words" *ngIf="!detail.isHtml && !detail.isListingBy">{{ detail.value
}}</div>
<div class="w-full sm:w-2/3 p-2" *ngIf="!detail.isHtml && !detail.isListingBy">{{ detail.value }}</div>
<div class="w-full sm:w-2/3 p-2 flex space-x-2 break-words" [innerHTML]="detail.value"
*ngIf="detail.isHtml && !detail.isListingBy"></div>
<div class="w-full sm:w-2/3 p-2 flex space-x-2" [innerHTML]="detail.value" *ngIf="detail.isHtml && !detail.isListingBy"></div>
<div class="w-full sm:w-2/3 p-2 flex space-x-2" *ngIf="detail.isListingBy && listingUser">
<a routerLink="/details-user/{{ listingUser.id }}"
class="text-primary-600 dark:text-primary-500 hover:underline">{{ listingUser.firstname }} {{
listingUser.lastname }}</a>
<div class="relative w-[100px] h-[30px] mr-5 lg:mb-0" *ngIf="listing.imageName">
<img ngSrc="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imageName }}.avif?_ts={{ ts }}" fill
class="object-contain"
alt="Business logo for {{ listingUser.firstname }} {{ listingUser.lastname }}" />
</div>
<div class="w-full sm:w-2/3 p-2 flex space-x-2" *ngIf="detail.isListingBy">
<a routerLink="/details-user/{{ listingUser.id }}" class="text-blue-600 dark:text-blue-500 hover:underline">{{ listingUser.firstname }} {{ listingUser.lastname }}</a>
<img src="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imageName }}.avif?_ts={{ ts }}" class="mr-5 lg:mb-0" style="max-height: 30px; max-width: 100px" />
</div>
</div>
</div>
<div class="py-4 print:hidden">
@if(listing && listingUser && (listingUser?.email===user?.email || (authService.isAdmin() | async))){
<div class="inline">
<button class="share share-edit text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
[routerLink]="['/editBusinessListing', listing.id]">
<button class="share share-edit text-white font-bold text-xs py-1.5 px-2 inline-flex items-center" [routerLink]="['/editBusinessListing', listing.id]">
<i class="fa-regular fa-pen-to-square"></i>
<span class="ml-2">Edit</span>
</button>
</div>
} @if(user){
<div class="inline">
<button class="share share-save text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="toggleFavorite()">
<button class="share share-save text-white font-bold text-xs py-1.5 px-2 inline-flex items-center" (click)="save()" [disabled]="listing.favoritesForUser.includes(user.email)">
<i class="fa-regular fa-heart"></i>
@if(listing.favoritesForUser.includes(user.email)){
<span class="ml-2">Saved ...</span>
@ -64,160 +50,48 @@
<share-button button="print" showText="true" (click)="createEvent('print')"></share-button>
<!-- <share-button button="email" showText="true"></share-button> -->
<div class="inline">
<button class="share share-email text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="showShareByEMail()">
<button class="share share-email text-white font-bold text-xs py-1.5 px-2 inline-flex items-center" (click)="showShareByEMail()">
<i class="fa-solid fa-envelope"></i>
<span class="ml-2">Email</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-facebook text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToFacebook()">
<i class="fab fa-facebook"></i>
<span class="ml-2">Facebook</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-twitter text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToTwitter()">
<i class="fab fa-x-twitter"></i>
<span class="ml-2">X</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-linkedin text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToLinkedIn()">
<i class="fab fa-linkedin"></i>
<span class="ml-2">LinkedIn</span>
</button>
</div>
<share-button button="facebook" showText="true" (click)="createEvent('facebook')"></share-button>
<share-button button="x" showText="true" (click)="createEvent('x')"></share-button>
<share-button button="linkedin" showText="true" (click)="createEvent('linkedin')"></share-button>
</div>
<!-- Karte hinzufügen, wenn Straße vorhanden ist -->
<div *ngIf="listing.location.latitude && listing.location.longitude" class="mt-6">
<h2 class="text-xl font-semibold mb-2">Location Map</h2>
<div *ngIf="listing.location.street" class="mt-6">
<h2 class="text-lg font-semibold mb-2">Location Map</h2>
<!-- <div style="height: 300px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers" [leafletCenter]="mapCenter" [leafletZoom]="mapZoom"></div> -->
<div style="height: 400px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers"
[leafletCenter]="mapCenter" [leafletZoom]="mapZoom" (leafletMapReady)="onMapReady($event)"></div>
<div style="height: 400px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers" [leafletCenter]="mapCenter" [leafletZoom]="mapZoom" (leafletMapReady)="onMapReady($event)"></div>
</div>
</div>
<!-- Right column -->
<div class="w-full lg:w-1/2 mt-6 lg:mt-0 print:hidden">
<h2 class="md:mt-8 mb-4 text-xl font-bold">Contact the Author of this Listing</h2>
<!-- <h2 class="text-lg font-semibold my-4">Contact the Author of this Listing</h2> -->
<div class="md:mt-8 mb-4 text-2xl font-bold mb-4">Contact the Author of this Listing</div>
<p class="text-sm mb-4">Please include your contact info below</p>
<form class="space-y-4">
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<app-validated-input label="Your Name" name="name" [(ngModel)]="mailinfo.sender.name"></app-validated-input>
<app-validated-input label="Your Email" name="email" [(ngModel)]="mailinfo.sender.email"
kind="email"></app-validated-input>
<app-validated-input label="Your Email" name="email" [(ngModel)]="mailinfo.sender.email" kind="email"></app-validated-input>
</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber"
mask="(000) 000-0000"></app-validated-input>
<app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber" mask="(000) 000-0000"></app-validated-input>
<!-- <app-validated-input label="Country/State" name="state" [(ngModel)]="mailinfo.sender.state"></app-validated-input> -->
<app-validated-ng-select label="State" name="state" [(ngModel)]="mailinfo.sender.state"
[items]="selectOptions?.states"></app-validated-ng-select>
<app-validated-ng-select label="State" name="state" [(ngModel)]="mailinfo.sender.state" [items]="selectOptions?.states"></app-validated-ng-select>
</div>
<div>
<app-validated-textarea label="Questions/Comments" name="comments"
[(ngModel)]="mailinfo.sender.comments"></app-validated-textarea>
<app-validated-textarea label="Questions/Comments" name="comments" [(ngModel)]="mailinfo.sender.comments"></app-validated-textarea>
</div>
<button (click)="mail()"
class="w-full sm:w-auto px-4 py-2 bg-primary-600 text-white rounded-md hover:bg-primary-700 focus:outline-none focus:ring-2 focus:ring-primary-500 focus:ring-opacity-50">Submit</button>
<button (click)="mail()" class="w-full sm:w-auto px-4 py-2 bg-blue-600 text-white rounded-md hover:bg-blue-700 focus:outline-none focus:ring-2 focus:ring-blue-500 focus:ring-opacity-50">Submit</button>
</form>
</div>
</div>
}
</div>
<!-- FAQ Section for AEO (Answer Engine Optimization) -->
@if(businessFAQs && businessFAQs.length > 0) {
<div class="container mx-auto p-4 mt-8">
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg p-6">
<h2 class="text-2xl font-bold mb-6 text-gray-900">Frequently Asked Questions</h2>
<div class="space-y-4">
@for (faq of businessFAQs; track $index) {
<details
class="group border border-gray-200 rounded-lg overflow-hidden hover:border-primary-300 transition-colors">
<summary
class="flex items-center justify-between cursor-pointer p-4 bg-gray-50 hover:bg-gray-100 transition-colors">
<h3 class="text-lg font-semibold text-gray-900">{{ faq.question }}</h3>
<svg class="w-5 h-5 text-gray-600 group-open:rotate-180 transition-transform" fill="none"
stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path>
</svg>
</summary>
<div class="p-4 bg-white border-t border-gray-200">
<p class="text-gray-700 leading-relaxed">{{ faq.answer }}</p>
</div>
</details>
}
</div>
<div class="mt-6 p-4 bg-primary-50 border-l-4 border-primary-500 rounded">
<p class="text-sm text-gray-700">
<strong class="text-primary-700">Have more questions?</strong> Contact the seller directly using the form
above or reach out to our support team for assistance.
</p>
</div>
</div>
</div>
}
<!-- Related Listings Section for SEO Internal Linking -->
@if(relatedListings && relatedListings.length > 0) {
<div class="container mx-auto p-4 mt-8">
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg p-6">
<h2 class="text-2xl font-bold mb-6 text-gray-900">Similar Businesses You May Like</h2>
<div class="grid grid-cols-1 md:grid-cols-3 gap-6">
@for (related of relatedListings; track related.id) {
<a [routerLink]="['/business', related.slug || related.id]" class="block group">
<div
class="bg-white rounded-lg border border-gray-200 overflow-hidden hover:shadow-xl transition-all duration-300 hover:scale-[1.02]">
<div class="p-4">
<div class="flex items-center mb-3">
<i [class]="selectOptions.getIconAndTextColorType(related.type)" class="mr-2 text-lg"></i>
<span [class]="selectOptions.getTextColorType(related.type)" class="font-semibold text-sm">{{
selectOptions.getBusiness(related.type) }}</span>
</div>
<h3
class="text-lg font-bold mb-2 text-gray-900 group-hover:text-primary-600 transition-colors line-clamp-2">
{{ related.title }}</h3>
<div class="space-y-1 text-sm text-gray-600">
<div class="flex justify-between">
<span class="font-medium">Price:</span>
<span class="font-bold text-primary-600">${{ related.price?.toLocaleString() || 'Contact' }}</span>
</div>
@if(related.salesRevenue) {
<div class="flex justify-between">
<span class="font-medium">Revenue:</span>
<span>${{ related.salesRevenue?.toLocaleString() }}</span>
</div>
}
<div class="flex justify-between">
<span class="font-medium">Location:</span>
<span>{{ related.location.name || related.location.county }}, {{
selectOptions.getState(related.location.state) }}</span>
</div>
</div>
<div class="mt-4">
<span
class="inline-block bg-primary-100 text-primary-800 text-xs font-medium px-2.5 py-0.5 rounded">View
Details →</span>
</div>
</div>
</div>
</a>
}
</div>
</div>
</div>
}
</div>

638
bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
View File

@ -1,8 +1,8 @@
import { ChangeDetectorRef, Component } from '@angular/core';
import { NgOptimizedImage } from '@angular/common';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { ActivatedRoute, NavigationEnd, Router } from '@angular/router';
import { LeafletModule } from '@bluehalo/ngx-leaflet';
import { ShareButton } from 'ngx-sharebuttons/button';
import { lastValueFrom } from 'rxjs';
import { BusinessListing, EventTypeEnum, ShareByEMail, User } from '../../../../../../bizmatch-server/src/models/db.model';
import { KeycloakUser, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
@ -13,28 +13,24 @@ import { ValidatedInputComponent } from '../../../components/validated-input/val
import { ValidatedNgSelectComponent } from '../../../components/validated-ng-select/validated-ng-select.component';
import { ValidatedTextareaComponent } from '../../../components/validated-textarea/validated-textarea.component';
import { ValidationMessagesService } from '../../../components/validation-messages.service';
import { BreadcrumbItem, BreadcrumbsComponent } from '../../../components/breadcrumbs/breadcrumbs.component';
import { AuditService } from '../../../services/audit.service';
import { GeoService } from '../../../services/geo.service';
import { HistoryService } from '../../../services/history.service';
import { ListingsService } from '../../../services/listings.service';
import { MailService } from '../../../services/mail.service';
import { SelectOptionsService } from '../../../services/select-options.service';
import { SeoService } from '../../../services/seo.service';
import { UserService } from '../../../services/user.service';
import { SharedModule } from '../../../shared/shared/shared.module';
import { createMailInfo, map2User } from '../../../utils/utils';
// Import für Leaflet
// Note: Leaflet requires browser environment - protected by isBrowser checks in base class
import { circle, Circle, Control, DomEvent, DomUtil, icon, Icon, latLng, LatLngBounds, Marker, polygon, Polygon, tileLayer } from 'leaflet';
// Benannte Importe für Leaflet
import dayjs from 'dayjs';
import { AuthService } from '../../../services/auth.service';
import { BaseDetailsComponent } from '../base-details.component';
import { ShareButton } from 'ngx-sharebuttons/button';
@Component({
selector: 'app-details-business-listing',
standalone: true,
imports: [SharedModule, ValidatedInputComponent, ValidatedTextareaComponent, ValidatedNgSelectComponent, LeafletModule, BreadcrumbsComponent, ShareButton, NgOptimizedImage],
imports: [SharedModule, ValidatedInputComponent, ValidatedTextareaComponent, ShareButton, ValidatedNgSelectComponent, LeafletModule],
providers: [],
templateUrl: './details-business-listing.component.html',
styleUrl: '../details.scss',
@ -58,7 +54,7 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
numScroll: 1,
},
];
private id: string | undefined = this.activatedRoute.snapshot.params['slug'] as string | undefined;
private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
override listing: BusinessListing;
mailinfo: MailInfo;
environment = environment;
@ -69,9 +65,6 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
private history: string[] = [];
ts = new Date().getTime();
env = environment;
breadcrumbs: BreadcrumbItem[] = [];
relatedListings: BusinessListing[] = [];
businessFAQs: Array<{ question: string; answer: string }> = [];
constructor(
private activatedRoute: ActivatedRoute,
@ -89,7 +82,6 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
private geoService: GeoService,
public authService: AuthService,
private cdref: ChangeDetectorRef,
private seoService: SeoService,
) {
super();
this.router.events.subscribe(event => {
@ -97,17 +89,11 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
this.history.push(event.urlAfterRedirects);
}
});
this.mailinfo = { sender: { name: '', email: '', phoneNumber: '', state: '', comments: '' }, email: '', url: environment.mailinfoUrl };
this.mailinfo = { sender: {}, email: '', url: environment.mailinfoUrl };
// Initialisiere die Map-Optionen
}
async ngOnInit() {
// Initialize default breadcrumbs first
this.breadcrumbs = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Business Listings', url: '/businessListings' }
];
const token = await this.authService.getToken();
this.keycloakUser = map2User(token);
if (this.keycloakUser) {
@ -119,186 +105,17 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
this.auditService.createEvent(this.listing.id, 'view', this.user?.email);
this.listingUser = await this.userService.getByMail(this.listing.email);
this.description = this.sanitizer.bypassSecurityTrustHtml(this.listing.description);
if (this.listing.location.latitude && this.listing.location.longitude) {
if (this.listing.location.street) {
this.configureMap();
}
// Update SEO meta tags for this business listing
const seoData = {
businessName: this.listing.title,
description: this.listing.description?.replace(/<[^>]*>/g, '').substring(0, 200) || '',
askingPrice: this.listing.price,
city: this.listing.location.name || this.listing.location.county || '',
state: this.listing.location.state,
industry: this.selectOptions.getBusiness(this.listing.type),
images: this.listing.imageName ? [this.listing.imageName] : [],
id: this.listing.id
};
this.seoService.updateBusinessListingMeta(seoData);
// Inject structured data (Schema.org JSON-LD) - Using Product schema for better SEO
const productSchema = this.seoService.generateProductSchema({
businessName: this.listing.title,
description: this.listing.description?.replace(/<[^>]*>/g, '') || '',
images: this.listing.imageName ? [this.listing.imageName] : [],
address: this.listing.location.street,
city: this.listing.location.name,
state: this.listing.location.state,
zip: this.listing.location.zipCode,
askingPrice: this.listing.price,
annualRevenue: this.listing.salesRevenue,
yearEstablished: this.listing.established,
category: this.selectOptions.getBusiness(this.listing.type),
id: this.listing.id,
slug: this.listing.slug
});
const breadcrumbSchema = this.seoService.generateBreadcrumbSchema([
{ name: 'Home', url: '/' },
{ name: 'Business Listings', url: '/businessListings' },
{ name: this.selectOptions.getBusiness(this.listing.type), url: `/business/${this.listing.slug || this.listing.id}` }
]);
// Generate FAQ for AEO (Answer Engine Optimization)
this.businessFAQs = this.generateBusinessFAQ();
const faqSchema = this.seoService.generateFAQPageSchema(this.businessFAQs);
// Inject all schemas including FAQ
this.seoService.injectMultipleSchemas([productSchema, breadcrumbSchema, faqSchema]);
// Generate breadcrumbs
this.breadcrumbs = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Business Listings', url: '/businessListings' },
{ label: this.selectOptions.getBusiness(this.listing.type), url: '/businessListings' },
{ label: this.listing.title }
];
// Load related listings for internal linking (SEO improvement)
this.loadRelatedListings();
} catch (error) {
// Set default breadcrumbs even on error
this.breadcrumbs = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Business Listings', url: '/businessListings' }
];
const errorMessage = error?.error?.message || error?.message || 'An error occurred while loading the listing';
this.auditService.log({ severity: 'error', text: errorMessage });
this.auditService.log({ severity: 'error', text: error.error.message });
this.router.navigate(['notfound']);
}
}
/**
* Load related business listings based on same category, location, and price range
* Improves SEO through internal linking
*/
private async loadRelatedListings() {
try {
this.relatedListings = (await this.listingsService.getRelatedListings(this.listing, 'business', 3)) as BusinessListing[];
} catch (error) {
console.error('Error loading related listings:', error);
this.relatedListings = [];
}
}
/**
* Generate dynamic FAQ based on business listing data fields
* Provides AEO (Answer Engine Optimization) content
*/
private generateBusinessFAQ(): Array<{ question: string; answer: string }> {
const faqs: Array<{ question: string; answer: string }> = [];
// FAQ 1: When was this business established?
if (this.listing.established) {
faqs.push({
question: 'When was this business established?',
answer: `This business was established ${this.listing.established} years ago${this.listing.established >= 10 ? ', demonstrating a proven track record and market stability' : ''}.`
});
}
// FAQ 2: What is the asking price?
if (this.listing.price) {
faqs.push({
question: 'What is the asking price for this business?',
answer: `The asking price for this business is $${this.listing.price.toLocaleString()}.${this.listing.salesRevenue ? ` With an annual revenue of $${this.listing.salesRevenue.toLocaleString()}, this represents a competitive valuation.` : ''}`
});
} else {
faqs.push({
question: 'What is the asking price for this business?',
answer: 'The asking price is available upon request. Please contact the seller for detailed pricing information.'
});
}
// FAQ 3: What is included in the sale?
const includedItems: string[] = [];
if (this.listing.realEstateIncluded) includedItems.push('real estate property');
if (this.listing.ffe) includedItems.push(`furniture, fixtures, and equipment valued at $${this.listing.ffe.toLocaleString()}`);
if (this.listing.inventory) includedItems.push(`inventory worth $${this.listing.inventory.toLocaleString()}`);
if (includedItems.length > 0) {
faqs.push({
question: 'What is included in the sale?',
answer: `The sale includes: ${includedItems.join(', ')}.${this.listing.leasedLocation ? ' The business operates from a leased location.' : ''}${this.listing.franchiseResale ? ' This is a franchise resale opportunity.' : ''}`
});
}
// FAQ 4: How many employees does the business have?
if (this.listing.employees) {
faqs.push({
question: 'How many employees does this business have?',
answer: `The business currently employs ${this.listing.employees} ${this.listing.employees === 1 ? 'person' : 'people'}.${this.listing.supportAndTraining ? ' The seller offers support and training to ensure smooth transition.' : ''}`
});
}
// FAQ 5: What is the annual revenue and cash flow?
if (this.listing.salesRevenue || this.listing.cashFlow) {
let answer = '';
if (this.listing.salesRevenue) {
answer += `The business generates an annual revenue of $${this.listing.salesRevenue.toLocaleString()}.`;
}
if (this.listing.cashFlow) {
answer += ` The annual cash flow is $${this.listing.cashFlow.toLocaleString()}.`;
}
faqs.push({
question: 'What is the financial performance of this business?',
answer: answer.trim()
});
}
// FAQ 6: Why is the business for sale?
if (this.listing.reasonForSale) {
faqs.push({
question: 'Why is this business for sale?',
answer: this.listing.reasonForSale
});
}
// FAQ 7: Where is the business located?
faqs.push({
question: 'Where is this business located?',
answer: `This ${this.selectOptions.getBusiness(this.listing.type)} business is located in ${this.listing.location.name || this.listing.location.county}, ${this.selectOptions.getState(this.listing.location.state)}.`
});
// FAQ 8: Is broker licensing required?
if (this.listing.brokerLicencing) {
faqs.push({
question: 'Is a broker license required for this business?',
answer: this.listing.brokerLicencing
});
}
// FAQ 9: What type of business is this?
faqs.push({
question: 'What type of business is this?',
answer: `This is a ${this.selectOptions.getBusiness(this.listing.type)} business${this.listing.established ? ` that has been operating for ${this.listing.established} years` : ''}.`
});
return faqs;
}
ngOnDestroy() {
this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten
this.seoService.clearStructuredData(); // Clean up SEO structured data
}
async mail() {
@ -334,7 +151,8 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
{ label: 'Category', value: this.selectOptions.getBusiness(this.listing.type) },
{
label: 'Located in',
value: `${this.listing.location.name ? this.listing.location.name : this.listing.location.county ? this.listing.location.county : ''} ${this.listing.location.name || this.listing.location.county ? ', ' : ''
value: `${this.listing.location.name ? this.listing.location.name : this.listing.location.county ? this.listing.location.county : ''} ${
this.listing.location.name || this.listing.location.county ? ', ' : ''
}${this.selectOptions.getState(this.listing.location.state)}`,
},
{ label: 'Asking Price', value: `${this.listing.price ? `$${this.listing.price.toLocaleString()}` : 'undisclosed '}` },
@ -379,33 +197,18 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
}
return result;
}
async toggleFavorite() {
try {
const isFavorited = this.listing.favoritesForUser.includes(this.user.email);
if (isFavorited) {
// Remove from favorites
await this.listingsService.removeFavorite(this.listing.id, 'business');
this.listing.favoritesForUser = this.listing.favoritesForUser.filter(
email => email !== this.user.email
);
} else {
// Add to favorites
await this.listingsService.addToFavorites(this.listing.id, 'business');
save() {
this.listing.favoritesForUser.push(this.user.email);
this.listingsService.save(this.listing, 'business');
this.auditService.createEvent(this.listing.id, 'favorite', this.user?.email);
}
this.cdref.detectChanges();
} catch (error) {
console.error('Error toggling favorite:', error);
}
isAlreadyFavorite() {
return this.listing.favoritesForUser.includes(this.user.email);
}
async showShareByEMail() {
const result = await this.emailService.showShareByEMail({
yourEmail: this.user ? this.user.email : '',
yourName: this.user ? `${this.user.firstname} ${this.user.lastname}` : '',
recipientEmail: '',
yourEmail: this.user ? this.user.email : null,
yourName: this.user ? `${this.user.firstname} ${this.user.lastname}` : null,
url: environment.mailinfoUrl,
listingTitle: this.listing.title,
id: this.listing.id,
@ -424,421 +227,10 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
createEvent(eventType: EventTypeEnum) {
this.auditService.createEvent(this.listing.id, eventType, this.user?.email);
}
shareToFacebook() {
const url = encodeURIComponent(window.location.href);
window.open(`https://www.facebook.com/sharer/sharer.php?u=${url}`, '_blank', 'width=600,height=400');
this.createEvent('facebook');
}
shareToTwitter() {
const url = encodeURIComponent(window.location.href);
const text = encodeURIComponent(this.listing?.title || 'Check out this business listing');
window.open(`https://twitter.com/intent/tweet?url=${url}&text=${text}`, '_blank', 'width=600,height=400');
this.createEvent('x');
}
shareToLinkedIn() {
const url = encodeURIComponent(window.location.href);
window.open(`https://www.linkedin.com/sharing/share-offsite/?url=${url}`, '_blank', 'width=600,height=400');
this.createEvent('linkedin');
}
getDaysListed() {
return dayjs().diff(this.listing.created, 'day');
}
dateInserted() {
return dayjs(this.listing.created).format('DD/MM/YYYY');
}
/**
* Override configureMap to show city boundary polygon for privacy
* Business listings show city boundary instead of exact address
*/
protected override configureMap() {
// For business listings, show city boundary polygon instead of exact location
// This protects seller privacy (competition, employees, customers)
const latitude = this.listing.location.latitude;
const longitude = this.listing.location.longitude;
const cityName = this.listing.location.name;
const county = this.listing.location.county || '';
const state = this.listing.location.state;
// Check if we have valid coordinates (null-safe check)
if (latitude !== null && latitude !== undefined &&
longitude !== null && longitude !== undefined) {
this.mapCenter = latLng(latitude, longitude);
// Case 1: City name available - show city boundary (current behavior)
if (cityName && state) {
this.mapZoom = 11; // Zoom to city level
// Fetch city boundary from Nominatim API
this.geoService.getCityBoundary(cityName, state).subscribe({
next: (data) => {
if (data && data.length > 0 && data[0].geojson && data[0].geojson.type === 'Polygon') {
const coordinates = data[0].geojson.coordinates[0]; // Get outer boundary
// Convert GeoJSON coordinates [lon, lat] to Leaflet LatLng [lat, lon]
const latlngs = coordinates.map((coord: number[]) => latLng(coord[1], coord[0]));
// Create red outlined polygon for city boundary
const cityPolygon = polygon(latlngs, {
color: '#ef4444', // Red color (like Google Maps)
fillColor: '#ef4444',
fillOpacity: 0.1,
weight: 2
});
// Add popup to polygon
cityPolygon.bindPopup(`
<div style="padding: 8px;">
<strong>General Area:</strong><br/>
${cityName}, ${county ? county + ', ' : ''}${state}<br/>
<small style="color: #666;">City boundary shown for privacy.<br/>Exact location provided after contact.</small>
</div>
`);
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
cityPolygon
];
// Fit map to polygon bounds
const bounds = cityPolygon.getBounds();
this.mapOptions = {
...this.mapOptions,
center: bounds.getCenter(),
zoom: this.mapZoom,
};
} else if (data && data.length > 0 && data[0].geojson && data[0].geojson.type === 'MultiPolygon') {
// Handle MultiPolygon case (cities with multiple areas)
const allPolygons: Polygon[] = [];
data[0].geojson.coordinates.forEach((polygonCoords: number[][][]) => {
const latlngs = polygonCoords[0].map((coord: number[]) => latLng(coord[1], coord[0]));
const cityPolygon = polygon(latlngs, {
color: '#ef4444',
fillColor: '#ef4444',
fillOpacity: 0.1,
weight: 2
});
allPolygons.push(cityPolygon);
});
// Add popup to first polygon
if (allPolygons.length > 0) {
allPolygons[0].bindPopup(`
<div style="padding: 8px;">
<strong>General Area:</strong><br/>
${cityName}, ${county ? county + ', ' : ''}${state}<br/>
<small style="color: #666;">City boundary shown for privacy.<br/>Exact location provided after contact.</small>
</div>
`);
}
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
...allPolygons
];
// Calculate combined bounds
if (allPolygons.length > 0) {
const bounds = new LatLngBounds([]);
allPolygons.forEach(p => bounds.extend(p.getBounds()));
this.mapOptions = {
...this.mapOptions,
center: bounds.getCenter(),
zoom: this.mapZoom,
};
}
} else {
// Fallback: Use circle if no polygon data available
this.useFallbackCircle(latitude, longitude, cityName, county, state);
}
},
error: (err) => {
console.error('Error fetching city boundary:', err);
// Fallback: Use circle on error
this.useFallbackCircle(latitude, longitude, cityName, county, state);
}
});
}
// Case 2: Only state available (NEW) - show state-level circle
else if (state) {
this.mapZoom = 6; // Zoom to state level
// Use state-level fallback with larger radius
this.useStateLevelFallback(latitude, longitude, county, state);
}
// Case 3: No location name at all - minimal marker
else {
this.mapZoom = 8;
this.useMinimalMarker(latitude, longitude);
}
}
}
private useFallbackCircle(latitude: number, longitude: number, cityName: string, county: string, state: string) {
this.mapCenter = latLng(latitude, longitude);
this.mapZoom = 11;
const locationCircle = circle([latitude, longitude], {
color: '#ef4444', // Red to match polygon style
fillColor: '#ef4444',
fillOpacity: 0.1,
radius: 8000, // 8km radius circle as fallback
weight: 2
});
locationCircle.bindPopup(`
<div style="padding: 8px;">
<strong>General Area:</strong><br/>
${cityName}, ${county ? county + ', ' : ''}${state}<br/>
<small style="color: #666;">Approximate area shown for privacy.<br/>Exact location provided after contact.</small>
</div>
`);
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
locationCircle
];
this.mapOptions = {
...this.mapOptions,
center: this.mapCenter,
zoom: this.mapZoom,
};
}
/**
* Show state-level boundary polygon
* Used when only state is available without city
*/
private useStateLevelFallback(latitude: number, longitude: number, county: string, state: string) {
this.mapCenter = latLng(latitude, longitude);
// Fetch state boundary from Nominatim API (similar to city boundary)
this.geoService.getStateBoundary(state).subscribe({
next: (data) => {
if (data && data.length > 0 && data[0].geojson) {
// Handle Polygon
if (data[0].geojson.type === 'Polygon') {
const coordinates = data[0].geojson.coordinates[0];
const latlngs = coordinates.map((coord: number[]) => latLng(coord[1], coord[0]));
const statePolygon = polygon(latlngs, {
color: '#ef4444',
fillColor: '#ef4444',
fillOpacity: 0.05, // Very transparent for large area
weight: 2
});
statePolygon.bindPopup(`
<div style="padding: 8px;">
<strong>General Area:</strong><br/>
${county ? county + ', ' : ''}${state}<br/>
<small style="color: #666;">State boundary shown for privacy.<br/>Exact location provided after contact.</small>
</div>
`);
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
statePolygon
];
// Fit map to state bounds
const bounds = statePolygon.getBounds();
this.mapOptions = {
...this.mapOptions,
center: bounds.getCenter(),
zoom: this.mapZoom,
};
}
// Handle MultiPolygon (states with islands, etc.)
else if (data[0].geojson.type === 'MultiPolygon') {
const allPolygons: Polygon[] = [];
data[0].geojson.coordinates.forEach((polygonCoords: number[][][]) => {
const latlngs = polygonCoords[0].map((coord: number[]) => latLng(coord[1], coord[0]));
const statePolygon = polygon(latlngs, {
color: '#ef4444',
fillColor: '#ef4444',
fillOpacity: 0.05,
weight: 2
});
allPolygons.push(statePolygon);
});
if (allPolygons.length > 0) {
allPolygons[0].bindPopup(`
<div style="padding: 8px;">
<strong>General Area:</strong><br/>
${county ? county + ', ' : ''}${state}<br/>
<small style="color: #666;">State boundary shown for privacy.<br/>Exact location provided after contact.</small>
</div>
`);
}
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
...allPolygons
];
// Calculate combined bounds
if (allPolygons.length > 0) {
const bounds = new LatLngBounds([]);
allPolygons.forEach(p => bounds.extend(p.getBounds()));
this.mapOptions = {
...this.mapOptions,
center: bounds.getCenter(),
zoom: this.mapZoom,
};
}
} else {
// Fallback if unexpected format
this.useCircleFallbackForState(latitude, longitude, county, state);
}
} else {
// Fallback if no data
this.useCircleFallbackForState(latitude, longitude, county, state);
}
},
error: (err) => {
console.error('Error fetching state boundary:', err);
// Fallback to circle on error
this.useCircleFallbackForState(latitude, longitude, county, state);
}
});
}
/**
* Fallback: Show circle when state boundary cannot be fetched
*/
private useCircleFallbackForState(latitude: number, longitude: number, county: string, state: string) {
this.mapCenter = latLng(latitude, longitude);
const stateCircle = circle([latitude, longitude], {
color: '#ef4444',
fillColor: '#ef4444',
fillOpacity: 0.05,
weight: 2,
radius: 50000 // 50km
});
stateCircle.bindPopup(`
<div style="padding: 8px;">
<strong>General Area:</strong><br/>
${county ? county + ', ' : ''}${state}<br/>
<small style="color: #666;">Approximate state-level location shown for privacy.<br/>Exact location provided after contact.</small>
</div>
`);
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
stateCircle
];
this.mapOptions = {
...this.mapOptions,
center: this.mapCenter,
zoom: this.mapZoom,
};
}
/**
* Show minimal marker when no location name is available
*/
private useMinimalMarker(latitude: number, longitude: number) {
this.mapCenter = latLng(latitude, longitude);
const marker = new Marker([latitude, longitude], {
icon: icon({
...Icon.Default.prototype.options,
iconUrl: 'assets/leaflet/marker-icon.png',
iconRetinaUrl: 'assets/leaflet/marker-icon-2x.png',
shadowUrl: 'assets/leaflet/marker-shadow.png',
}),
});
marker.bindPopup(`
<div style="padding: 8px;">
<strong>Location</strong><br/>
<small style="color: #666;">Contact seller for exact address</small>
</div>
`);
this.mapLayers = [
tileLayer('https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', {
attribution: '&copy; OpenStreetMap contributors',
}),
marker
];
this.mapOptions = {
...this.mapOptions,
center: this.mapCenter,
zoom: this.mapZoom,
};
}
/**
* Override onMapReady to show privacy-friendly address control
*/
override onMapReady(map: any) {
// Show only city, county, state - no street address
const cityName = this.listing.location.name || '';
const county = this.listing.location.county || '';
const state = this.listing.location.state || '';
if (cityName && state) {
const addressControl = new Control({ position: 'topright' });
addressControl.onAdd = () => {
const container = DomUtil.create('div', 'address-control bg-white p-2 rounded shadow');
const locationText = county ? `${cityName}, ${county}, ${state}` : `${cityName}, ${state}`;
container.innerHTML = `
<div style="max-width: 250px;">
<strong>General Area:</strong><br/>
${locationText}<br/>
<small style="color: #666; font-size: 11px;">Approximate location shown for privacy</small>
</div>
`;
// Prevent map dragging when clicking the control
DomEvent.disableClickPropagation(container);
return container;
};
addressControl.addTo(map);
}
}
/**
* Override openFullMap to open city-area map instead of exact location
*/
override openFullMap() {
const latitude = this.listing.location.latitude;
const longitude = this.listing.location.longitude;
if (latitude && longitude) {
// Open map with zoom level 11 to show large city area, not exact location
const url = `https://www.openstreetmap.org/?mlat=${latitude}&mlon=${longitude}#map=11/${latitude}/${longitude}`;
window.open(url, '_blank');
}
}
}

174
bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
View File

@ -1,58 +1,46 @@
<div class="container mx-auto p-4">
<!-- Breadcrumbs for SEO and Navigation -->
<app-breadcrumbs [breadcrumbs]="breadcrumbs"></app-breadcrumbs>
<div class="bg-white drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg rounded-lg overflow-hidden">
@if(listing){
<div class="p-6 relative">
<h1 class="text-3xl font-bold mb-4 break-words">{{ listing?.title }}</h1>
<button (click)="historyService.goBack()"
class="print:hidden absolute top-4 right-4 bg-red-500 text-white rounded-full w-8 h-8 flex items-center justify-center hover:bg-red-600 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-opacity-50">
<h1 class="text-3xl font-bold mb-4">{{ listing?.title }}</h1>
<button
(click)="historyService.goBack()"
class="print:hidden absolute top-4 right-4 bg-red-500 text-white rounded-full w-8 h-8 flex items-center justify-center hover:bg-red-600 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-opacity-50"
>
<i class="fas fa-times"></i>
</button>
<div class="flex flex-col lg:flex-row">
<div class="w-full lg:w-1/2 pr-0 lg:pr-4">
<p class="mb-4 break-words" [innerHTML]="description"></p>
<p class="mb-4" [innerHTML]="description"></p>
<div class="space-y-2">
<div *ngFor="let detail of propertyDetails; let i = index" class="flex flex-col sm:flex-row"
[ngClass]="{ 'bg-neutral-100': i % 2 === 0 }">
<div *ngFor="let detail of propertyDetails; let i = index" class="flex flex-col sm:flex-row" [ngClass]="{ 'bg-gray-100': i % 2 === 0 }">
<div class="w-full sm:w-1/3 font-semibold p-2">{{ detail.label }}</div>
<!-- Standard Text -->
<div class="w-full sm:w-2/3 p-2 break-words" *ngIf="!detail.isHtml && !detail.isListingBy">{{ detail.value
}}</div>
<div class="w-full sm:w-2/3 p-2" *ngIf="!detail.isHtml && !detail.isListingBy">{{ detail.value }}</div>
<!-- HTML Content (nicht für RouterLink) -->
<div class="w-full sm:w-2/3 p-2 flex space-x-2 break-words" [innerHTML]="detail.value"
*ngIf="detail.isHtml && !detail.isListingBy"></div>
<div class="w-full sm:w-2/3 p-2 flex space-x-2" [innerHTML]="detail.value" *ngIf="detail.isHtml && !detail.isListingBy"></div>
<!-- Speziell für Listing By mit RouterLink -->
<div class="w-full sm:w-2/3 p-2 flex space-x-2" *ngIf="detail.isListingBy && detail.user">
<a [routerLink]="['/details-user', detail.user.id]"
class="text-primary-600 dark:text-primary-500 hover:underline"> {{ detail.user.firstname }} {{
detail.user.lastname }} </a>
<div class="relative w-[100px] h-[30px] mr-5 lg:mb-0" *ngIf="detail.user.hasCompanyLogo">
<img [ngSrc]="detail.imageBaseUrl + '/pictures/logo/' + detail.imagePath + '.avif?_ts=' + detail.ts"
fill class="object-contain"
alt="Company logo for {{ detail.user.firstname }} {{ detail.user.lastname }}" />
</div>
<div class="w-full sm:w-2/3 p-2 flex space-x-2" *ngIf="detail.isListingBy">
<a [routerLink]="['/details-user', detail.user.id]" class="text-blue-600 dark:text-blue-500 hover:underline"> {{ detail.user.firstname }} {{ detail.user.lastname }} </a>
<img *ngIf="detail.user.hasCompanyLogo" [src]="detail.imageBaseUrl + '/pictures/logo/' + detail.imagePath + '.avif?_ts=' + detail.ts" class="mr-5 lg:mb-0" style="max-height: 30px; max-width: 100px" />
</div>
</div>
</div>
<div class="py-4 print:hidden">
@if(listing && listingUser && (listingUser?.email===user?.email || (authService.isAdmin() | async))){
<div class="inline">
<button class="share share-edit text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
[routerLink]="['/editCommercialPropertyListing', listing.id]">
<button class="share share-edit text-white font-bold text-xs py-1.5 px-2 inline-flex items-center" [routerLink]="['/editCommercialPropertyListing', listing.id]">
<i class="fa-regular fa-pen-to-square"></i>
<span class="ml-2">Edit</span>
</button>
</div>
} @if(user){
<div class="inline">
<button class="share share-save text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="toggleFavorite()">
<button class="share share-save text-white font-bold text-xs py-1.5 px-2 inline-flex items-center" (click)="save()" [disabled]="listing.favoritesForUser.includes(user.email)">
<i class="fa-regular fa-heart"></i>
@if(listing.favoritesForUser.includes(user.email)){
<span class="ml-2">Saved ...</span>
@ -65,46 +53,21 @@
<share-button button="print" showText="true" (click)="createEvent('print')"></share-button>
<!-- <share-button button="email" showText="true"></share-button> -->
<div class="inline">
<button class="share share-email text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="showShareByEMail()">
<button class="share share-email text-white font-bold text-xs py-1.5 px-2 inline-flex items-center" (click)="showShareByEMail()">
<i class="fa-solid fa-envelope"></i>
<span class="ml-2">Email</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-facebook text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToFacebook()">
<i class="fab fa-facebook"></i>
<span class="ml-2">Facebook</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-twitter text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToTwitter()">
<i class="fab fa-x-twitter"></i>
<span class="ml-2">X</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-linkedin text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToLinkedIn()">
<i class="fab fa-linkedin"></i>
<span class="ml-2">LinkedIn</span>
</button>
</div>
<share-button button="facebook" showText="true" (click)="createEvent('facebook')"></share-button>
<share-button button="x" showText="true" (click)="createEvent('x')"></share-button>
<share-button button="linkedin" showText="true" (click)="createEvent('linkedin')"></share-button>
</div>
<!-- Karte hinzufügen, wenn Straße vorhanden ist -->
<div *ngIf="listing.location.latitude && listing.location.longitude" class="mt-6">
<div *ngIf="listing.location.street" class="mt-6">
<h2 class="text-lg font-semibold mb-2">Location Map</h2>
<!-- <div style="height: 300px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers" [leafletCenter]="mapCenter" [leafletZoom]="mapZoom"></div> -->
<div style="height: 400px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers"
[leafletCenter]="mapCenter" [leafletZoom]="mapZoom" (leafletMapReady)="onMapReady($event)"></div>
<div style="height: 400px" leaflet [leafletOptions]="mapOptions" [leafletLayers]="mapLayers" [leafletCenter]="mapCenter" [leafletZoom]="mapZoom" (leafletMapReady)="onMapReady($event)"></div>
</div>
</div>
@ -120,29 +83,23 @@
}@else {
<div class="text-2xl font-bold mb-4">Contact the Author of this Listing</div>
}
<p class="text-sm text-neutral-600 mb-4">Please include your contact info below</p>
<p class="text-sm text-gray-600 mb-4">Please include your contact info below</p>
<form class="space-y-4">
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<app-validated-input label="Your Name" name="name"
[(ngModel)]="mailinfo.sender.name"></app-validated-input>
<app-validated-input label="Your Email" name="email" [(ngModel)]="mailinfo.sender.email"
kind="email"></app-validated-input>
<app-validated-input label="Your Name" name="name" [(ngModel)]="mailinfo.sender.name"></app-validated-input>
<app-validated-input label="Your Email" name="email" [(ngModel)]="mailinfo.sender.email" kind="email"></app-validated-input>
</div>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
<app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber"
mask="(000) 000-0000"></app-validated-input>
<app-validated-input label="Phone Number" name="phoneNumber" [(ngModel)]="mailinfo.sender.phoneNumber" mask="(000) 000-0000"></app-validated-input>
<!-- <app-validated-input label="Country/State" name="state" [(ngModel)]="mailinfo.sender.state"></app-validated-input> -->
<app-validated-ng-select label="State" name="state" [(ngModel)]="mailinfo.sender.state"
[items]="selectOptions?.states"></app-validated-ng-select>
<app-validated-ng-select label="State" name="state" [(ngModel)]="mailinfo.sender.state" [items]="selectOptions?.states"></app-validated-ng-select>
</div>
<div>
<app-validated-textarea label="Questions/Comments" name="comments"
[(ngModel)]="mailinfo.sender.comments"></app-validated-textarea>
<app-validated-textarea label="Questions/Comments" name="comments" [(ngModel)]="mailinfo.sender.comments"></app-validated-textarea>
</div>
<div class="flex items-center justify-between">
<button (click)="mail()"
class="bg-primary-500 text-white px-4 py-2 rounded hover:bg-primary-600">Submit</button>
<button (click)="mail()" class="bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600">Submit</button>
</div>
</form>
</div>
@ -151,81 +108,4 @@
</div>
}
</div>
<!-- FAQ Section for AEO (Answer Engine Optimization) -->
@if(propertyFAQs && propertyFAQs.length > 0) {
<div class="container mx-auto p-4 mt-8">
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg p-6">
<h2 class="text-2xl font-bold mb-6 text-gray-900">Frequently Asked Questions</h2>
<div class="space-y-4">
@for (faq of propertyFAQs; track $index) {
<details
class="group border border-gray-200 rounded-lg overflow-hidden hover:border-primary-300 transition-colors">
<summary
class="flex items-center justify-between cursor-pointer p-4 bg-gray-50 hover:bg-gray-100 transition-colors">
<h3 class="text-lg font-semibold text-gray-900">{{ faq.question }}</h3>
<svg class="w-5 h-5 text-gray-600 group-open:rotate-180 transition-transform" fill="none"
stroke="currentColor" viewBox="0 0 24 24">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M19 9l-7 7-7-7"></path>
</svg>
</summary>
<div class="p-4 bg-white border-t border-gray-200">
<p class="text-gray-700 leading-relaxed">{{ faq.answer }}</p>
</div>
</details>
}
</div>
<div class="mt-6 p-4 bg-primary-50 border-l-4 border-primary-500 rounded">
<p class="text-sm text-gray-700">
<strong class="text-primary-700">Have more questions?</strong> Contact the seller directly using the form
above or reach out to our support team for assistance.
</p>
</div>
</div>
</div>
}
<!-- Related Listings Section for SEO Internal Linking -->
@if(relatedListings && relatedListings.length > 0) {
<div class="container mx-auto p-4 mt-8">
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg p-6">
<h2 class="text-2xl font-bold mb-6 text-gray-900">Similar Properties You May Like</h2>
<div class="grid grid-cols-1 md:grid-cols-3 gap-6">
@for (related of relatedListings; track related.id) {
<a [routerLink]="['/commercial-property', related.slug || related.id]" class="block group">
<div
class="bg-white rounded-lg border border-gray-200 overflow-hidden hover:shadow-xl transition-all duration-300 hover:scale-[1.02]">
<div class="p-4">
<div class="flex items-center mb-3">
<i [class]="selectOptions.getIconAndTextColorType(related.type)" class="mr-2 text-lg"></i>
<span [class]="selectOptions.getTextColorType(related.type)" class="font-semibold text-sm">{{
selectOptions.getCommercialProperty(related.type) }}</span>
</div>
<h3
class="text-lg font-bold mb-2 text-gray-900 group-hover:text-primary-600 transition-colors line-clamp-2">
{{ related.title }}</h3>
<div class="space-y-1 text-sm text-gray-600">
<div class="flex justify-between">
<span class="font-medium">Price:</span>
<span class="font-bold text-primary-600">${{ related.price?.toLocaleString() || 'Contact' }}</span>
</div>
<div class="flex justify-between">
<span class="font-medium">Location:</span>
<span>{{ related.location.name || related.location.county }}, {{
selectOptions.getState(related.location.state) }}</span>
</div>
</div>
<div class="mt-4">
<span
class="inline-block bg-primary-100 text-primary-800 text-xs font-medium px-2.5 py-0.5 rounded">View
Details →</span>
</div>
</div>
</div>
</a>
}
</div>
</div>
</div>
}
</div>

199
bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts
View File

@ -1,11 +1,11 @@
import { ChangeDetectorRef, Component, NgZone } from '@angular/core';
import { NgOptimizedImage } from '@angular/common';
import { Component, NgZone } from '@angular/core';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { ActivatedRoute, Router } from '@angular/router';
import { LeafletModule } from '@bluehalo/ngx-leaflet';
import { faTimes } from '@fortawesome/free-solid-svg-icons';
import dayjs from 'dayjs';
import { GalleryModule, ImageItem } from 'ng-gallery';
import { ShareButton } from 'ngx-sharebuttons/button';
import { lastValueFrom } from 'rxjs';
import { CommercialPropertyListing, EventTypeEnum, ShareByEMail, User } from '../../../../../../bizmatch-server/src/models/db.model';
import { CommercialPropertyListingCriteria, ErrorResponse, KeycloakUser, MailInfo } from '../../../../../../bizmatch-server/src/models/main.model';
@ -23,18 +23,15 @@ import { ImageService } from '../../../services/image.service';
import { ListingsService } from '../../../services/listings.service';
import { MailService } from '../../../services/mail.service';
import { SelectOptionsService } from '../../../services/select-options.service';
import { SeoService } from '../../../services/seo.service';
import { UserService } from '../../../services/user.service';
import { SharedModule } from '../../../shared/shared/shared.module';
import { createMailInfo, map2User } from '../../../utils/utils';
import { BaseDetailsComponent } from '../base-details.component';
import { BreadcrumbItem, BreadcrumbsComponent } from '../../../components/breadcrumbs/breadcrumbs.component';
import { ShareButton } from 'ngx-sharebuttons/button';
@Component({
selector: 'app-details-commercial-property-listing',
standalone: true,
imports: [SharedModule, ValidatedInputComponent, ValidatedTextareaComponent, ValidatedNgSelectComponent, GalleryModule, LeafletModule, BreadcrumbsComponent, ShareButton, NgOptimizedImage],
imports: [SharedModule, ValidatedInputComponent, ValidatedTextareaComponent, ShareButton, ValidatedNgSelectComponent, GalleryModule, LeafletModule],
providers: [],
templateUrl: './details-commercial-property-listing.component.html',
styleUrl: '../details.scss',
@ -57,7 +54,7 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
numScroll: 1,
},
];
private id: string | undefined = this.activatedRoute.snapshot.params['slug'] as string | undefined;
private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
override listing: CommercialPropertyListing;
criteria: CommercialPropertyListingCriteria;
mailinfo: MailInfo;
@ -72,9 +69,6 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
faTimes = faTimes;
propertyDetails = [];
images: Array<ImageItem> = [];
relatedListings: CommercialPropertyListing[] = [];
breadcrumbs: BreadcrumbItem[] = [];
propertyFAQs: Array<{ question: string; answer: string }> = [];
constructor(
private activatedRoute: ActivatedRoute,
private listingsService: ListingsService,
@ -91,20 +85,12 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
private auditService: AuditService,
private emailService: EMailService,
public authService: AuthService,
private seoService: SeoService,
private cdref: ChangeDetectorRef,
) {
super();
this.mailinfo = { sender: { name: '', email: '', phoneNumber: '', state: '', comments: '' }, email: '', url: environment.mailinfoUrl };
this.mailinfo = { sender: {}, email: '', url: environment.mailinfoUrl };
}
async ngOnInit() {
// Initialize default breadcrumbs first
this.breadcrumbs = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Commercial Properties', url: '/commercialPropertyListings' }
];
const token = await this.authService.getToken();
this.keycloakUser = map2User(token);
if (this.keycloakUser) {
@ -139,146 +125,22 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
if (this.listing.draft) {
this.propertyDetails.push({ label: 'Draft', value: this.listing.draft ? 'Yes' : 'No' });
}
if (this.listing.imageOrder && Array.isArray(this.listing.imageOrder)) {
this.listing.imageOrder.forEach(image => {
const imageURL = `${this.env.imageBaseUrl}/pictures/property/${this.listing.imagePath}/${this.listing.serialId}/${image}`;
this.images.push(new ImageItem({ src: imageURL, thumb: imageURL }));
});
}
if (this.listing.location.latitude && this.listing.location.longitude) {
if (this.listing.location.street) {
this.configureMap();
}
// Update SEO meta tags for commercial property
const propertyData = {
id: this.listing.id,
propertyType: this.selectOptions.getCommercialProperty(this.listing.type),
propertyDescription: this.listing.description?.replace(/<[^>]*>/g, '').substring(0, 200) || '',
askingPrice: this.listing.price,
city: this.listing.location.name || this.listing.location.county || '',
state: this.listing.location.state,
address: this.listing.location.street || '',
zip: this.listing.location.zipCode || '',
latitude: this.listing.location.latitude,
longitude: this.listing.location.longitude,
squareFootage: (this.listing as any).squareFeet,
yearBuilt: (this.listing as any).yearBuilt,
images: this.listing.imageOrder?.length > 0
? this.listing.imageOrder.map(img =>
`${this.env.imageBaseUrl}/pictures/property/${this.listing.imagePath}/${this.listing.serialId}/${img}`)
: []
};
this.seoService.updateCommercialPropertyMeta(propertyData);
// Add RealEstateListing structured data
const realEstateSchema = this.seoService.generateRealEstateListingSchema(propertyData);
const breadcrumbSchema = this.seoService.generateBreadcrumbSchema([
{ name: 'Home', url: '/' },
{ name: 'Commercial Properties', url: '/commercialPropertyListings' },
{ name: propertyData.propertyType, url: `/details-commercial-property/${this.listing.id}` }
]);
// Generate FAQ for AEO (Answer Engine Optimization)
this.propertyFAQs = this.generatePropertyFAQ();
const faqSchema = this.seoService.generateFAQPageSchema(this.propertyFAQs);
// Inject all schemas including FAQ
this.seoService.injectMultipleSchemas([realEstateSchema, breadcrumbSchema, faqSchema]);
// Generate breadcrumbs for navigation
this.breadcrumbs = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Commercial Properties', url: '/commercialPropertyListings' },
{ label: propertyData.propertyType, url: '/commercialPropertyListings' },
{ label: this.listing.title }
];
// Load related listings for internal linking (SEO improvement)
this.loadRelatedListings();
} catch (error) {
// Set default breadcrumbs even on error
this.breadcrumbs = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Commercial Properties', url: '/commercialPropertyListings' }
];
const errorMessage = error?.error?.message || error?.message || 'An error occurred while loading the listing';
this.auditService.log({ severity: 'error', text: errorMessage });
this.auditService.log({ severity: 'error', text: error.error.message });
this.router.navigate(['notfound']);
}
//this.initFlowbite();
}
/**
* Load related commercial property listings based on same category, location, and price range
* Improves SEO through internal linking
*/
private async loadRelatedListings() {
try {
this.relatedListings = (await this.listingsService.getRelatedListings(this.listing, 'commercialProperty', 3)) as CommercialPropertyListing[];
} catch (error) {
console.error('Error loading related listings:', error);
this.relatedListings = [];
}
}
/**
* Generate dynamic FAQ based on commercial property listing data
* Provides AEO (Answer Engine Optimization) content
*/
private generatePropertyFAQ(): Array<{ question: string; answer: string }> {
const faqs: Array<{ question: string; answer: string }> = [];
// FAQ 1: What type of property is this?
faqs.push({
question: 'What type of commercial property is this?',
answer: `This is a ${this.selectOptions.getCommercialProperty(this.listing.type)} property located in ${this.listing.location.name || this.listing.location.county}, ${this.selectOptions.getState(this.listing.location.state)}.`
});
// FAQ 2: What is the asking price?
if (this.listing.price) {
faqs.push({
question: 'What is the asking price for this property?',
answer: `The asking price for this commercial property is $${this.listing.price.toLocaleString()}.`
});
} else {
faqs.push({
question: 'What is the asking price for this property?',
answer: 'The asking price is available upon request. Please contact the seller for detailed pricing information.'
});
}
// FAQ 3: Where is the property located?
faqs.push({
question: 'Where is this commercial property located?',
answer: `The property is located in ${this.listing.location.name || this.listing.location.county}, ${this.selectOptions.getState(this.listing.location.state)}.${this.listing.location.street ? ' The exact address will be provided after initial contact.' : ''}`
});
// FAQ 4: How long has the property been listed?
const daysListed = this.getDaysListed();
faqs.push({
question: 'How long has this property been on the market?',
answer: `This property was listed on ${this.dateInserted()} and has been on the market for ${daysListed} ${daysListed === 1 ? 'day' : 'days'}.`
});
// FAQ 5: How can I schedule a viewing?
faqs.push({
question: 'How can I schedule a property viewing?',
answer: 'To schedule a viewing of this commercial property, please use the contact form above to get in touch with the listing agent. They will coordinate a convenient time for you to visit the property.'
});
// FAQ 6: What is the zoning for this property?
faqs.push({
question: 'What is this property suitable for?',
answer: `This ${this.selectOptions.getCommercialProperty(this.listing.type)} property is ideal for various commercial uses. Contact the seller for specific zoning information and permitted use details.`
});
return faqs;
}
ngOnDestroy() {
this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten
this.seoService.clearStructuredData(); // Clean up SEO structured data
}
private initFlowbite() {
this.ngZone.runOutsideAngular(() => {
@ -315,33 +177,18 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
getImageIndices(): number[] {
return this.listing && this.listing.imageOrder ? this.listing.imageOrder.slice(1).map((e, i) => i + 1) : [];
}
async toggleFavorite() {
try {
const isFavorited = this.listing.favoritesForUser.includes(this.user.email);
if (isFavorited) {
// Remove from favorites
await this.listingsService.removeFavorite(this.listing.id, 'commercialProperty');
this.listing.favoritesForUser = this.listing.favoritesForUser.filter(
email => email !== this.user.email
);
} else {
// Add to favorites
await this.listingsService.addToFavorites(this.listing.id, 'commercialProperty');
save() {
this.listing.favoritesForUser.push(this.user.email);
this.listingsService.save(this.listing, 'commercialProperty');
this.auditService.createEvent(this.listing.id, 'favorite', this.user?.email);
}
this.cdref.detectChanges();
} catch (error) {
console.error('Error toggling favorite:', error);
}
isAlreadyFavorite() {
return this.listing.favoritesForUser.includes(this.user.email);
}
async showShareByEMail() {
const result = await this.emailService.showShareByEMail({
yourEmail: this.user ? this.user.email : '',
yourName: this.user ? `${this.user.firstname} ${this.user.lastname}` : '',
recipientEmail: '',
yourEmail: this.user ? this.user.email : null,
yourName: this.user ? `${this.user.firstname} ${this.user.lastname}` : null,
url: environment.mailinfoUrl,
listingTitle: this.listing.title,
id: this.listing.id,
@ -359,26 +206,6 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
createEvent(eventType: EventTypeEnum) {
this.auditService.createEvent(this.listing.id, eventType, this.user?.email);
}
shareToFacebook() {
const url = encodeURIComponent(window.location.href);
window.open(`https://www.facebook.com/sharer/sharer.php?u=${url}`, '_blank', 'width=600,height=400');
this.createEvent('facebook');
}
shareToTwitter() {
const url = encodeURIComponent(window.location.href);
const text = encodeURIComponent(this.listing?.title || 'Check out this commercial property');
window.open(`https://twitter.com/intent/tweet?url=${url}&text=${text}`, '_blank', 'width=600,height=400');
this.createEvent('x');
}
shareToLinkedIn() {
const url = encodeURIComponent(window.location.href);
window.open(`https://www.linkedin.com/sharing/share-offsite/?url=${url}`, '_blank', 'width=600,height=400');
this.createEvent('linkedin');
}
getDaysListed() {
return dayjs().diff(this.listing.created, 'day');
}

123
bizmatch/src/app/pages/details/details-user/details-user.component.html
View File

@ -1,9 +1,4 @@
<div class="container mx-auto p-4">
<!-- Breadcrumbs -->
<div class="mb-4">
<app-breadcrumbs [breadcrumbs]="breadcrumbs"></app-breadcrumbs>
</div>
@if(user){
<div class="bg-white drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg rounded-lg overflow-hidden">
<!-- Header -->
@ -11,19 +6,16 @@
<div class="flex items-center space-x-4">
<!-- <img src="https://placehold.co/80x80" alt="Profile picture of Avery Brown smiling" class="w-20 h-20 rounded-full" /> -->
@if(user.hasProfile){
<img ngSrc="{{ env.imageBaseUrl }}/pictures//profile/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}"
class="w-20 h-20 rounded-full object-cover" width="80" height="80" priority
alt="Profile picture of {{ user.firstname }} {{ user.lastname }}" />
<img src="{{ env.imageBaseUrl }}/pictures//profile/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}" class="w-20 h-20 rounded-full object-cover" />
} @else {
<img ngSrc="assets/images/person_placeholder.jpg" class="w-20 h-20 rounded-full" width="80" height="80" priority
alt="Default profile picture" />
<img src="assets/images/person_placeholder.jpg" class="w-20 h-20 rounded-full" />
}
<div>
<h1 class="text-2xl font-bold flex items-center">
{{ user.firstname }} {{ user.lastname }}
<span class="text-yellow-400 ml-2">&#9733;</span>
</h1>
<p class="text-neutral-600">
<p class="text-gray-600">
Company
<span class="mx-1">-</span>
{{ user.companyName }}
@ -35,90 +27,29 @@
</p>
</div>
@if(user.hasCompanyLogo){
<div class="relative w-14 h-14">
<img ngSrc="{{ env.imageBaseUrl }}/pictures/logo/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}" fill
class="object-contain" alt="Company logo of {{ user.companyName }}" />
</div>
<img src="{{ env.imageBaseUrl }}/pictures/logo/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}" class="w-11 h-14" />
}
<!-- <img src="https://placehold.co/45x60" class="w-11 h-14" /> -->
</div>
<button (click)="historyService.goBack()"
class="absolute top-4 right-4 bg-red-500 text-white rounded-full w-8 h-8 flex items-center justify-center hover:bg-red-600 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-opacity-50">
<button
(click)="historyService.goBack()"
class="absolute top-4 right-4 bg-red-500 text-white rounded-full w-8 h-8 flex items-center justify-center hover:bg-red-600 focus:outline-none focus:ring-2 focus:ring-red-500 focus:ring-opacity-50"
>
<i class="fas fa-times"></i>
</button>
</div>
<!-- Description -->
<p class="p-4 text-neutral-700 break-words">{{ user.description }}</p>
<!-- Like and Share Action Buttons -->
<div class="py-4 px-4 print:hidden">
@if(user && keycloakUser && (user?.email===keycloakUser?.email || (authService.isAdmin() | async))){
<div class="inline">
<button class="share share-edit text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
[routerLink]="['/account', user.id]">
<i class="fa-regular fa-pen-to-square"></i>
<span class="ml-2">Edit</span>
</button>
</div>
}
<div class="inline">
<button type="button" class="share share-save text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="toggleFavorite()">
<i class="fa-regular fa-heart"></i>
@if(isAlreadyFavorite()){
<span class="ml-2">Saved ...</span>
}@else {
<span class="ml-2">Save</span>
}
</button>
</div>
<share-button button="print" showText="true" (click)="createEvent('print')"></share-button>
<div class="inline">
<button class="share share-email text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="showShareByEMail()">
<i class="fa-solid fa-envelope"></i>
<span class="ml-2">Email</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-facebook text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToFacebook()">
<i class="fab fa-facebook"></i>
<span class="ml-2">Facebook</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-twitter text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToTwitter()">
<i class="fab fa-x-twitter"></i>
<span class="ml-2">X</span>
</button>
</div>
<div class="inline">
<button type="button"
class="share share-linkedin text-white font-bold text-xs py-1.5 px-2 inline-flex items-center"
(click)="shareToLinkedIn()">
<i class="fab fa-linkedin"></i>
<span class="ml-2">LinkedIn</span>
</button>
</div>
</div>
<p class="p-4 text-gray-700">{{ user.description }}</p>
<!-- Company Profile -->
<div class="p-4">
<h2 class="text-xl font-semibold mb-4">Company Profile</h2>
<p class="text-neutral-700 mb-4 break-words" [innerHTML]="companyOverview"></p>
<p class="text-gray-700 mb-4" [innerHTML]="companyOverview"></p>
<!-- Profile Details -->
<div class="space-y-2">
<div class="flex flex-col sm:flex-row sm:items-center bg-neutral-100">
<div class="flex flex-col sm:flex-row sm:items-center bg-gray-100">
<span class="font-semibold w-40 p-2">Name</span>
<span class="p-2 flex-grow">{{ user.firstname }} {{ user.lastname }}</span>
</div>
@ -127,7 +58,7 @@
<span class="p-2 flex-grow">{{ user.email }}</span>
</div>
@if(user.customerType==='professional'){
<div class="flex flex-col sm:flex-row sm:items-center bg-neutral-100">
<div class="flex flex-col sm:flex-row sm:items-center bg-gray-100">
<span class="font-semibold w-40 p-2">Phone Number</span>
<span class="p-2 flex-grow">{{ formatPhoneNumber(user.phoneNumber) }}</span>
</div>
@ -136,7 +67,7 @@
<span class="font-semibold w-40 p-2">Company Location</span>
<span class="p-2 flex-grow">{{ user.location?.name }} - {{ user.location?.state }}</span>
</div>
<div class="flex flex-col sm:flex-row sm:items-center bg-neutral-100">
<div class="flex flex-col sm:flex-row sm:items-center bg-gray-100">
<span class="font-semibold w-40 p-2">Professional Type</span>
<span class="p-2 flex-grow">{{ selectOptions.getCustomerSubType(user.customerSubType) }}</span>
</div>
@ -146,7 +77,7 @@
<!-- Services -->
<div class="mt-6">
<h3 class="font-semibold mb-2">Services we offer</h3>
<p class="text-neutral-700 mb-4 break-words" [innerHTML]="offeredServices"></p>
<p class="text-gray-700 mb-4" [innerHTML]="offeredServices"></p>
</div>
<!-- Areas Served -->
@ -154,8 +85,7 @@
<h3 class="font-semibold mb-2">Areas (Counties) we serve</h3>
<div class="flex flex-wrap gap-2">
@for (area of user.areasServed; track area) {
<span class="bg-primary-100 text-primary-800 px-2 py-1 rounded-full text-sm">{{ area.county }}{{ area.county ?
'-' : '' }}{{ area.state }}</span>
<span class="bg-blue-100 text-blue-800 px-2 py-1 rounded-full text-sm">{{ area.county }}{{ area.county ? '-' : '' }}{{ area.state }}</span>
}
</div>
</div>
@ -164,8 +94,7 @@
<div class="mt-6">
<h3 class="font-semibold mb-2">Licensed In</h3>
@for (license of user.licensedIn; track license) {
<span class="bg-success-100 text-success-800 px-2 py-1 rounded-full text-sm">{{ license.registerNo }}-{{
license.state }}</span>
<span class="bg-green-100 text-green-800 px-2 py-1 rounded-full text-sm">{{ license.registerNo }}-{{ license.state }}</span>
}
</div>
}
@ -178,13 +107,12 @@
<h2 class="text-xl font-semibold mb-4">My Business Listings For Sale</h2>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
@for (listing of businessListings; track listing) {
<div class="border rounded-lg p-4 hover:cursor-pointer"
[routerLink]="['/business', listing.slug || listing.id]">
<div class="border rounded-lg p-4 hover:cursor-pointer" [routerLink]="['/details-business-listing', listing.id]">
<div class="flex items-center mb-2">
<i [class]="selectOptions.getIconAndTextColorType(listing.type)" class="mr-2"></i>
<span class="font-medium">{{ selectOptions.getBusiness(listing.type) }}</span>
</div>
<p class="text-neutral-700">{{ listing.title }}</p>
<p class="text-gray-700">{{ listing.title }}</p>
</div>
}
</div>
@ -194,26 +122,23 @@
<h2 class="text-xl font-semibold mb-4">My Commercial Property Listings For Sale</h2>
<div class="grid grid-cols-1 md:grid-cols-2 gap-4">
@for (listing of commercialPropListings; track listing) {
<div class="border rounded-lg p-4 hover:cursor-pointer"
[routerLink]="['/commercial-property', listing.slug || listing.id]">
<div class="border rounded-lg p-4 hover:cursor-pointer" [routerLink]="['/details-commercial-property-listing', listing.id]">
<div class="flex items-center space-x-4">
@if (listing.imageOrder?.length>0){
<img
ngSrc="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ listing.serialId }}/{{ listing.imageOrder[0] }}?_ts={{ ts }}"
class="w-12 h-12 object-cover rounded" width="48" height="48"
alt="Property image for {{ listing.title }}" />
<img src="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ listing.serialId }}/{{ listing.imageOrder[0] }}?_ts={{ ts }}" class="w-12 h-12 object-cover rounded" />
} @else {
<img ngSrc="assets/images/placeholder_properties.jpg" class="w-12 h-12 object-cover rounded" width="48"
height="48" alt="Property placeholder image" />
<img src="assets/images/placeholder_properties.jpg" class="w-12 h-12 object-cover rounded" />
}
<div>
<p class="font-medium">{{ selectOptions.getCommercialProperty(listing.type) }}</p>
<p class="text-neutral-700">{{ listing.title }}</p>
<p class="text-gray-700">{{ listing.title }}</p>
</div>
</div>
</div>
}
</div>
} @if( user?.email===keycloakUser?.email || (authService.isAdmin() | async)){
<button class="mt-4 bg-blue-500 text-white px-4 py-2 rounded hover:bg-blue-600" [routerLink]="['/account', user.id]">Edit</button>
}
</div>
</div>

117
bizmatch/src/app/pages/details/details-user/details-user.component.ts
View File

@ -1,16 +1,11 @@
import { ChangeDetectorRef, Component } from '@angular/core';
import { NgOptimizedImage } from '@angular/common';
import { Component } from '@angular/core';
import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
import { ActivatedRoute, Router } from '@angular/router';
import { Observable } from 'rxjs';
import { BusinessListing, CommercialPropertyListing, User, ShareByEMail, EventTypeEnum } from '../../../../../../bizmatch-server/src/models/db.model';
import { BusinessListing, CommercialPropertyListing, User } from '../../../../../../bizmatch-server/src/models/db.model';
import { KeycloakUser, emailToDirName } from '../../../../../../bizmatch-server/src/models/main.model';
import { environment } from '../../../../environments/environment';
import { BreadcrumbItem, BreadcrumbsComponent } from '../../../components/breadcrumbs/breadcrumbs.component';
import { AuthService } from '../../../services/auth.service';
import { AuditService } from '../../../services/audit.service';
import { EMailService } from '../../../components/email/email.service';
import { MessageService } from '../../../components/message/message.service';
import { HistoryService } from '../../../services/history.service';
import { ImageService } from '../../../services/image.service';
import { ListingsService } from '../../../services/listings.service';
@ -18,23 +13,17 @@ import { SelectOptionsService } from '../../../services/select-options.service';
import { UserService } from '../../../services/user.service';
import { SharedModule } from '../../../shared/shared/shared.module';
import { formatPhoneNumber, map2User } from '../../../utils/utils';
import { ShareButton } from 'ngx-sharebuttons/button';
@Component({
selector: 'app-details-user',
standalone: true,
imports: [SharedModule, BreadcrumbsComponent, NgOptimizedImage, ShareButton],
imports: [SharedModule],
templateUrl: './details-user.component.html',
styleUrl: '../details.scss',
})
export class DetailsUserComponent {
private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
user: User;
breadcrumbs: BreadcrumbItem[] = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Professionals', url: '/brokerListings' },
{ label: 'Profile' }
];
user$: Observable<KeycloakUser>;
keycloakUser: KeycloakUser;
environment = environment;
@ -51,16 +40,13 @@ export class DetailsUserComponent {
private router: Router,
private userService: UserService,
private listingsService: ListingsService,
public selectOptions: SelectOptionsService,
private sanitizer: DomSanitizer,
private imageService: ImageService,
public historyService: HistoryService,
public authService: AuthService,
private auditService: AuditService,
private emailService: EMailService,
private messageService: MessageService,
private cdref: ChangeDetectorRef,
) { }
) {}
async ngOnInit() {
this.user = await this.userService.getById(this.id);
@ -73,97 +59,4 @@ export class DetailsUserComponent {
this.companyOverview = this.sanitizer.bypassSecurityTrustHtml(this.user.companyOverview ? this.user.companyOverview : '');
this.offeredServices = this.sanitizer.bypassSecurityTrustHtml(this.user.offeredServices ? this.user.offeredServices : '');
}
/**
* Toggle professional favorite status
*/
async toggleFavorite() {
try {
const isFavorited = this.user.favoritesForUser?.includes(this.keycloakUser.email);
if (isFavorited) {
// Remove from favorites
await this.listingsService.removeFavorite(this.user.id, 'user');
this.user.favoritesForUser = this.user.favoritesForUser.filter(
email => email !== this.keycloakUser.email
);
} else {
// Add to favorites
await this.listingsService.addToFavorites(this.user.id, 'user');
if (!this.user.favoritesForUser) {
this.user.favoritesForUser = [];
}
this.user.favoritesForUser.push(this.keycloakUser.email);
this.auditService.createEvent(this.user.id, 'favorite', this.keycloakUser?.email);
}
this.cdref.detectChanges();
} catch (error) {
console.error('Error toggling favorite', error);
}
}
isAlreadyFavorite(): boolean {
if (!this.keycloakUser?.email || !this.user?.favoritesForUser) return false;
return this.user.favoritesForUser.includes(this.keycloakUser.email);
}
/**
* Show email sharing modal
*/
async showShareByEMail() {
const result = await this.emailService.showShareByEMail({
yourEmail: this.keycloakUser ? this.keycloakUser.email : '',
yourName: this.keycloakUser ? `${this.keycloakUser.firstName} ${this.keycloakUser.lastName}` : '',
recipientEmail: '',
url: environment.mailinfoUrl,
listingTitle: `${this.user.firstname} ${this.user.lastname} - ${this.user.companyName}`,
id: this.user.id,
type: 'user',
});
if (result) {
this.auditService.createEvent(this.user.id, 'email', this.keycloakUser?.email, <ShareByEMail>result);
this.messageService.addMessage({
severity: 'success',
text: 'Your Email has been sent',
duration: 5000,
});
}
}
/**
* Create audit event
*/
createEvent(eventType: EventTypeEnum) {
this.auditService.createEvent(this.user.id, eventType, this.keycloakUser?.email);
}
/**
* Share to Facebook
*/
shareToFacebook() {
const url = encodeURIComponent(window.location.href);
window.open(`https://www.facebook.com/sharer/sharer.php?u=${url}`, '_blank', 'width=600,height=400');
this.createEvent('facebook');
}
/**
* Share to Twitter/X
*/
shareToTwitter() {
const url = encodeURIComponent(window.location.href);
const text = encodeURIComponent(`Check out ${this.user.firstname} ${this.user.lastname} - ${this.user.companyName}`);
window.open(`https://twitter.com/intent/tweet?url=${url}&text=${text}`, '_blank', 'width=600,height=400');
this.createEvent('x');
}
/**
* Share to LinkedIn
*/
shareToLinkedIn() {
const url = encodeURIComponent(window.location.href);
window.open(`https://www.linkedin.com/sharing/share-offsite/?url=${url}`, '_blank', 'width=600,height=400');
this.createEvent('linkedin');
}
}

10
bizmatch/src/app/pages/details/details.scss
View File

@ -58,7 +58,6 @@ button.share {
margin-right: 4px;
margin-left: 2px;
border-radius: 4px;
cursor: pointer;
i {
font-size: 15px;
}
@ -72,15 +71,6 @@ button.share {
.share-email {
background-color: #ff961c;
}
.share-facebook {
background-color: #1877f2;
}
.share-twitter {
background-color: #000000;
}
.share-linkedin {
background-color: #0a66c2;
}
:host ::ng-deep .ng-select-container {
height: 42px !important;
border-radius: 0.5rem;

174
bizmatch/src/app/pages/home/home.component.html
View File

@ -1,32 +1,30 @@
<header class="w-full flex justify-between items-center p-4 bg-white top-0 z-10 h-16 md:h-20">
<img src="/assets/images/header-logo.png" alt="Logo" class="h-8 md:h-10 w-auto" />
<img src="assets/images/header-logo.png" alt="Logo" class="h-8 md:h-10" />
<div class="hidden md:flex items-center space-x-4">
@if(user){
<a routerLink="/account" class="text-primary-600 border border-primary-600 px-3 py-2 rounded">Account</a>
<a routerLink="/account" class="text-blue-600 border border-blue-600 px-3 py-2 rounded">Account</a>
} @else {
<!-- <a routerLink="/pricing" class="text-neutral-800">Pricing</a> -->
<a routerLink="/login" [queryParams]="{ mode: 'login' }"
class="text-primary-600 border border-primary-600 px-3 py-2 rounded">Log In</a>
<a routerLink="/login" [queryParams]="{ mode: 'register' }" class="text-white bg-primary-600 px-4 py-2 rounded">Sign
Up</a>
<!-- <a routerLink="/login" class="text-primary-500 hover:underline">Login/Register</a> -->
<!-- <a routerLink="/pricing" class="text-gray-800">Pricing</a> -->
<a routerLink="/login" [queryParams]="{ mode: 'login' }" class="text-blue-600 border border-blue-600 px-3 py-2 rounded">Log In</a>
<a routerLink="/login" [queryParams]="{ mode: 'register' }" class="text-white bg-blue-600 px-4 py-2 rounded">Register</a>
<!-- <a routerLink="/login" class="text-blue-500 hover:underline">Login/Register</a> -->
}
</div>
<button (click)="toggleMenu()" class="md:hidden text-neutral-600">
<button (click)="toggleMenu()" class="md:hidden text-gray-600">
<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
<path strokeLinecap="round" strokeLinejoin="round" strokeWidth="2" d="M4 6h16M4 12h16m-7 6h7"></path>
</svg>
</button>
</header>
<div *ngIf="isMenuOpen" class="fixed inset-0 bg-neutral-800 bg-opacity-75 z-20">
<div *ngIf="isMenuOpen" class="fixed inset-0 bg-gray-800 bg-opacity-75 z-20">
<div class="flex flex-col items-center justify-center h-full">
<!-- <a href="#" class="text-white text-xl py-2">Pricing</a> -->
@if(user){
<a routerLink="/account" class="text-white text-xl py-2">Account</a>
} @else {
<a routerLink="/login" [queryParams]="{ mode: 'login' }" class="text-white text-xl py-2">Log In</a>
<a routerLink="/login" [queryParams]="{ mode: 'register' }" class="text-white text-xl py-2">Sign Up</a>
<a routerLink="/login" [queryParams]="{ mode: 'register' }" class="text-white text-xl py-2">Register</a>
}
<button (click)="toggleMenu()" class="text-white mt-4">
<svg class="w-6 h-6" fill="none" stroke="currentColor" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
@ -40,7 +38,8 @@
<!-- 1. px-4 für <main> (vorher px-2 sm:px-4) -->
<main class="flex flex-col items-center justify-center px-4 w-full flex-grow">
<div
class="bg-cover-custom pb-12 md:py-20 flex flex-col w-full rounded-xl lg:rounded-2xl md:drop-shadow-custom-md lg:drop-shadow-custom-lg min-h-[calc(100vh_-_20rem)] lg:min-h-[calc(100vh_-_10rem)] max-sm:bg-contain max-sm:bg-bottom max-sm:bg-no-repeat max-sm:min-h-[60vh] max-sm:bg-primary-600">
class="bg-cover-custom pb-12 md:py-20 flex flex-col w-full rounded-xl lg:rounded-2xl md:drop-shadow-custom-md lg:drop-shadow-custom-lg min-h-[calc(100vh_-_20rem)] lg:min-h-[calc(100vh_-_10rem)] max-sm:bg-contain max-sm:bg-bottom max-sm:bg-no-repeat max-sm:min-h-[calc(100vh_-_7rem)] max-sm:bg-blue-600"
>
<div class="flex justify-center w-full">
<!-- 3. Für Mobile: m-2 statt max-w-xs; ab sm: wieder max-width und kein Margin -->
<div class="w-full m-2 sm:m-0 sm:max-w-md md:max-w-xl lg:max-w-2xl xl:max-w-3xl">
@ -53,131 +52,127 @@
<!-- 2) Textblock -->
<div class="relative z-10 mx-auto max-w-4xl px-6 sm:px-6 py-4 sm:py-16 text-center text-white">
<h1
class="text-[1.55rem] sm:text-4xl md:text-5xl lg:text-6xl font-extrabold tracking-tight leading-tight drop-shadow-[0_2px_6px_rgba(0,0,0,0.55)]">
Buy & Sell Businesses and Commercial Properties</h1>
<h1 class="text-[1.55rem] sm:text-4xl md:text-5xl lg:text-6xl font-extrabold tracking-tight leading-tight drop-shadow-[0_2px_6px_rgba(0,0,0,0.55)]">Find businesses for Sale</h1>
<p
class="mt-3 sm:mt-4 text-base sm:text-lg md:text-xl lg:text-2xl font-medium text-white/90 drop-shadow-[0_1.5px_4px_rgba(0,0,0,0.6)]">
Find profitable businesses for sale, commercial real estate, and franchise opportunities across the United
States</p>
<p class="mt-3 sm:mt-4 text-base sm:text-lg md:text-xl lg:text-2xl font-medium text-white/90 drop-shadow-[0_1.5px_4px_rgba(0,0,0,0.6)]">Unlocking Opportunities - Empowering Entrepreneurial Dreams</p>
</div>
</section>
<!-- Restliche Anpassungen (Innenabstände, Button-Paddings etc.) bleiben wie im vorherigen Schritt -->
<div
class="search-form-container bg-white bg-opacity-80 pb-4 md:pb-6 pt-2 px-3 sm:px-4 md:px-6 rounded-lg shadow-lg w-full"
[ngClass]="{ 'pt-6': aiSearch }">
<div class="bg-white bg-opacity-80 pb-4 md:pb-6 pt-2 px-3 sm:px-4 md:px-6 rounded-lg shadow-lg w-full" [ngClass]="{ 'pt-6': aiSearch }">
@if(!aiSearch){
<div
class="text-sm lg:text-base mb-1 text-center text-neutral-500 border-neutral-200 dark:text-neutral-400 dark:border-neutral-700 flex justify-between">
<div class="text-sm lg:text-base mb-1 text-center text-gray-500 border-gray-200 dark:text-gray-400 dark:border-gray-700 flex justify-between">
<ul class="flex flex-wrap -mb-px w-full">
<li class="w-[33%]">
<a (click)="changeTab('business')" [ngClass]="
<a
(click)="changeTab('business')"
[ngClass]="
activeTabAction === 'business'
? ['text-primary-600', 'border-primary-600', 'active', 'dark:text-primary-500', 'dark:border-primary-500']
: ['border-transparent', 'hover:text-neutral-600', 'hover:border-neutral-300', 'dark:hover:text-neutral-300']
? ['text-blue-600', 'border-blue-600', 'active', 'dark:text-blue-500', 'dark:border-blue-500']
: ['border-transparent', 'hover:text-gray-600', 'hover:border-gray-300', 'dark:hover:text-gray-300']
"
class="tab-link hover:cursor-pointer inline-flex items-center justify-center px-1 py-2 md:p-4 border-b-2 rounded-t-lg">
<img src="/assets/images/business_logo.png" alt="Search businesses for sale"
class="tab-icon w-6 h-6 md:w-7 md:h-7 mr-1 md:mr-2 object-contain" width="28" height="28" />
<span>Businesses</span>
</a>
class="hover:cursor-pointer inline-block px-1 py-2 md:p-4 border-b-2 rounded-t-lg"
>Businesses</a
>
</li>
@if ((numberOfCommercial$ | async) > 0) {
<li class="w-[33%]">
<a (click)="changeTab('commercialProperty')" [ngClass]="
<a
(click)="changeTab('commercialProperty')"
[ngClass]="
activeTabAction === 'commercialProperty'
? ['text-primary-600', 'border-primary-600', 'active', 'dark:text-primary-500', 'dark:border-primary-500']
: ['border-transparent', 'hover:text-neutral-600', 'hover:border-neutral-300', 'dark:hover:text-neutral-300']
? ['text-blue-600', 'border-blue-600', 'active', 'dark:text-blue-500', 'dark:border-blue-500']
: ['border-transparent', 'hover:text-gray-600', 'hover:border-gray-300', 'dark:hover:text-gray-300']
"
class="tab-link hover:cursor-pointer inline-flex items-center justify-center px-1 py-2 md:p-4 border-b-2 rounded-t-lg">
<img src="/assets/images/properties_logo.png" alt="Search commercial properties for sale"
class="tab-icon w-6 h-6 md:w-7 md:h-7 mr-1 md:mr-2 object-contain" width="28" height="28" />
<span>Properties</span>
</a>
class="hover:cursor-pointer inline-block px-1 py-2 md:p-4 border-b-2 rounded-t-lg"
>Properties</a
>
</li>
} @if ((numberOfBroker$ | async) > 0) {
<li class="w-[33%]">
<a
(click)="changeTab('broker')"
[ngClass]="
activeTabAction === 'broker'
? ['text-blue-600', 'border-blue-600', 'active', 'dark:text-blue-500', 'dark:border-blue-500']
: ['border-transparent', 'hover:text-gray-600', 'hover:border-gray-300', 'dark:hover:text-gray-300']
"
class="hover:cursor-pointer inline-block px-1 py-2 md:p-4 border-b-2 rounded-t-lg"
>Professionals</a
>
</li>
}
<li class="w-[33%]">
<a (click)="changeTab('broker')" [ngClass]="
activeTabAction === 'broker'
? ['text-primary-600', 'border-primary-600', 'active', 'dark:text-primary-500', 'dark:border-primary-500']
: ['border-transparent', 'hover:text-neutral-600', 'hover:border-neutral-300', 'dark:hover:text-neutral-300']
"
class="tab-link hover:cursor-pointer inline-flex items-center justify-center px-1 py-2 md:p-4 border-b-2 rounded-t-lg">
<img src="/assets/images/icon_professionals.png" alt="Search business professionals and brokers"
class="tab-icon w-6 h-6 md:w-7 md:h-7 mr-1 md:mr-2 object-contain bg-transparent"
style="mix-blend-mode: darken;" />
<span>Professionals</span>
</a>
</li>
</ul>
</div>
} @if(criteria && !aiSearch){
<div
class="w-full max-w-3xl mx-auto bg-white rounded-lg flex flex-col md:flex-row md:border md:border-neutral-300">
<div class="md:flex-none md:w-48 flex-1 md:border-r border-neutral-300 overflow-hidden mb-2 md:mb-0">
<div class="relative max-sm:border border-neutral-300 rounded-md">
<div class="w-full max-w-3xl mx-auto bg-white rounded-lg flex flex-col md:flex-row md:border md:border-gray-300">
<div class="md:flex-none md:w-48 flex-1 md:border-r border-gray-300 overflow-hidden mb-2 md:mb-0">
<div class="relative max-sm:border border-gray-300 rounded-md">
<select
class="appearance-none bg-transparent w-full py-4 px-4 pr-8 focus:outline-none md:border-none rounded-md md:rounded-none min-h-[52px]"
[ngModel]="criteria.types" (ngModelChange)="onTypesChange($event)"
[ngClass]="{ 'placeholder-selected': criteria.types.length === 0 }">
class="appearance-none bg-transparent w-full py-3 px-4 pr-8 focus:outline-none md:border-none rounded-md md:rounded-none"
[ngModel]="criteria.types"
(ngModelChange)="onTypesChange($event)"
[ngClass]="{ 'placeholder-selected': criteria.types.length === 0 }"
>
<option [value]="[]">{{ getPlaceholderLabel() }}</option>
@for(type of getTypes(); track type){
<option [value]="type.value">{{ type.name }}</option>
}
</select>
<div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-neutral-700">
<div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
<i class="fas fa-chevron-down text-xs"></i>
</div>
</div>
</div>
<div class="md:flex-auto md:w-36 flex-grow md:border-r border-neutral-300 mb-2 md:mb-0">
<div class="relative max-sm:border border-neutral-300 rounded-md">
<ng-select class="custom md:border-none rounded-md md:rounded-none" [multiple]="false"
[hideSelected]="true" [trackByFn]="trackByFn" [minTermLength]="2" [loading]="cityLoading"
typeToSearchText="Please enter 2 or more characters" [typeahead]="cityInput$" [ngModel]="cityOrState"
(ngModelChange)="setCityOrState($event)" placeholder="Enter City or State ..." groupBy="type">
@for (city of cities$ | async; track city.id) { @let state = city.type==='city'?city.content.state:'';
@let separator = city.type==='city'?' - ':'';
<div class="md:flex-auto md:w-36 flex-grow md:border-r border-gray-300 mb-2 md:mb-0">
<div class="relative max-sm:border border-gray-300 rounded-md">
<ng-select
class="custom md:border-none rounded-md md:rounded-none"
[multiple]="false"
[hideSelected]="true"
[trackByFn]="trackByFn"
[minTermLength]="2"
[loading]="cityLoading"
typeToSearchText="Please enter 2 or more characters"
[typeahead]="cityInput$"
[ngModel]="cityOrState"
(ngModelChange)="setCityOrState($event)"
placeholder="Enter City or State ..."
groupBy="type"
>
@for (city of cities$ | async; track city.id) { @let state = city.type==='city'?city.content.state:''; @let separator = city.type==='city'?' - ':'';
<ng-option [value]="city">{{ city.content.name }}{{ separator }}{{ state }}</ng-option>
}
</ng-select>
</div>
</div>
@if (criteria.radius && !aiSearch){
<div class="md:flex-none md:w-36 flex-1 md:border-r border-neutral-300 mb-2 md:mb-0">
<div class="relative max-sm:border border-neutral-300 rounded-md">
<div class="md:flex-none md:w-36 flex-1 md:border-r border-gray-300 mb-2 md:mb-0">
<div class="relative max-sm:border border-gray-300 rounded-md">
<select
class="appearance-none bg-transparent w-full py-4 px-4 pr-8 focus:outline-none md:border-none rounded-md md:rounded-none min-h-[52px]"
(ngModelChange)="onRadiusChange($event)" [ngModel]="criteria.radius"
[ngClass]="{ 'placeholder-selected': !criteria.radius }">
class="appearance-none bg-transparent w-full py-3 px-4 pr-8 focus:outline-none md:border-none rounded-md md:rounded-none"
(ngModelChange)="onRadiusChange($event)"
[ngModel]="criteria.radius"
[ngClass]="{ 'placeholder-selected': !criteria.radius }"
>
<option [value]="null">City Radius</option>
@for(dist of selectOptions.distances; track dist){
<option [value]="dist.value">{{ dist.name }}</option>
}
</select>
<div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-neutral-700">
<div class="pointer-events-none absolute inset-y-0 right-0 flex items-center px-2 text-gray-700">
<i class="fas fa-chevron-down text-xs"></i>
</div>
</div>
</div>
}
<div class="bg-primary-500 hover:bg-primary-600 max-sm:rounded-md search-button">
<div class="bg-blue-600 hover:bg-blue-500 transition-colors duration-200 max-sm:rounded-md">
@if( numberOfResults$){
<button
class="w-full h-full text-white font-bold py-2 px-4 md:py-3 md:px-6 focus:outline-none rounded-md md:rounded-none min-h-[52px] flex items-center justify-center gap-2"
(click)="search()">
<i class="fas fa-search"></i>
<span>Search {{ numberOfResults$ | async }}</span>
<button class="w-full h-full text-white font-semibold py-2 px-4 md:py-3 md:px-6 focus:outline-none rounded-md md:rounded-none min-h-[48px]" (click)="search()">
Search ({{ numberOfResults$ | async }})
</button>
}@else {
<button
class="w-full h-full text-white font-bold py-2 px-4 md:py-3 md:px-6 focus:outline-none rounded-md md:rounded-none min-h-[52px] flex items-center justify-center gap-2"
(click)="search()">
<i class="fas fa-search"></i>
<span>Search</span>
</button>
<button class="w-full h-full text-white font-semibold py-2 px-4 md:py-3 md:px-6 focus:outline-none rounded-md md:rounded-none min-h-[48px]" (click)="search()">Search</button>
}
</div>
</div>
@ -186,10 +181,5 @@
</div>
</div>
</div>
<!-- FAQ Section for SEO/AEO -->
<div class="w-full px-4 mt-12 max-w-4xl mx-auto">
<app-faq [faqItems]="faqItems"></app-faq>
</div>
</main>
<!-- ==== ANPASSUNGEN ENDE ==== -->

199
bizmatch/src/app/pages/home/home.component.scss
View File

@ -1,41 +1,8 @@
.bg-cover-custom {
position: relative;
// Prioritize AVIF format (69KB) over JPG (26MB)
background-image: url('/assets/images/flags_bg.avif');
background-size: cover;
background-position: center;
border-radius: 20px;
// Fallback for browsers that don't support AVIF
@supports not (background-image: url('/assets/images/flags_bg.avif')) {
background-image: url('/assets/images/flags_bg.jpg');
}
// Add gradient overlay for better text contrast
&::before {
content: '';
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: linear-gradient(
180deg,
rgba(0, 0, 0, 0.35) 0%,
rgba(0, 0, 0, 0.15) 40%,
rgba(0, 0, 0, 0.05) 70%,
rgba(0, 0, 0, 0) 100%
);
border-radius: 20px;
pointer-events: none;
z-index: 1;
}
// Ensure content stays above overlay
> * {
position: relative;
z-index: 2;
}
}
select:not([size]) {
background-image: unset;
@ -65,11 +32,11 @@ select {
background-color: rgb(125 211 252);
}
:host ::ng-deep .ng-select.ng-select-single .ng-select-container {
min-height: 52px;
height: 48px;
border: none;
background-color: transparent;
.ng-value-container .ng-input {
top: 12px;
top: 10px;
}
span.ng-arrow-wrapper {
display: none;
@ -103,165 +70,3 @@ input[type='text'][name='aiSearchText'] {
box-sizing: border-box; /* Padding und Border in die Höhe und Breite einrechnen */
height: 48px;
}
// Enhanced Search Button Styling
.search-button {
position: relative;
overflow: hidden;
transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
&:hover {
box-shadow: 0 4px 12px rgba(37, 99, 235, 0.4);
filter: brightness(1.05);
}
&:active {
transform: scale(0.98);
}
// Ripple effect
&::after {
content: '';
position: absolute;
top: 50%;
left: 50%;
width: 0;
height: 0;
border-radius: 50%;
background: rgba(255, 255, 255, 0.3);
transform: translate(-50%, -50%);
transition: width 0.6s, height 0.6s;
pointer-events: none;
}
&:active::after {
width: 300px;
height: 300px;
}
}
// Tab Icon Styling
.tab-icon {
font-size: 1rem;
margin-right: 0.5rem;
transition: transform 0.2s ease;
}
.tab-link {
transition: all 0.2s ease-in-out;
&:hover .tab-icon {
transform: scale(1.15);
}
}
// Input Field Hover Effects
select,
.ng-select {
transition: all 0.2s ease-in-out;
&:hover {
background-color: rgba(243, 244, 246, 0.8);
}
&:focus,
&:focus-within {
background-color: white;
box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1);
}
}
// Smooth tab transitions
.tab-content {
animation: fadeInUp 0.3s ease-out;
}
@keyframes fadeInUp {
from {
opacity: 0;
transform: translateY(10px);
}
to {
opacity: 1;
transform: translateY(0);
}
}
// Trust section container - more prominent
.trust-section-container {
box-shadow: 0 4px 16px rgba(0, 0, 0, 0.08);
transition: box-shadow 0.3s ease, transform 0.3s ease;
&:hover {
box-shadow: 0 6px 24px rgba(0, 0, 0, 0.12);
}
}
// Trust badge animations - subtle lowkey style
.trust-badge {
transition: opacity 0.2s ease;
&:hover {
opacity: 0.8;
}
}
.trust-icon {
transition: background-color 0.2s ease, color 0.2s ease;
}
.trust-badge:hover .trust-icon {
background-color: rgb(229, 231, 235); // gray-200
color: rgb(75, 85, 99); // gray-600
}
// Stat counter animation - minimal
.stat-number {
transition: color 0.2s ease;
&:hover {
color: rgb(55, 65, 81); // gray-700 darker
}
}
// Search form container enhancement
.search-form-container {
transition: all 0.3s ease;
backdrop-filter: blur(10px);
&:hover {
background-color: rgba(255, 255, 255, 0.9);
}
}
// Header button improvements
header {
a {
transition: all 0.2s ease-in-out;
&.text-blue-600.border.border-blue-600 {
// Log In button
&:hover {
background-color: rgba(37, 99, 235, 0.05);
box-shadow: 0 2px 8px rgba(37, 99, 235, 0.15);
}
&:active {
transform: scale(0.98);
}
}
&.bg-blue-600 {
// Register button
&:hover {
background-color: rgb(29, 78, 216);
box-shadow: 0 4px 12px rgba(37, 99, 235, 0.3);
filter: brightness(1.05);
}
&:active {
transform: scale(0.98);
}
}
}
}

111
bizmatch/src/app/pages/home/home.component.ts
View File

@ -4,9 +4,9 @@ import { FormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
import { NgSelectModule } from '@ng-select/ng-select';
import { UntilDestroy } from '@ngneat/until-destroy';
import { initFlowbite } from 'flowbite';
import { catchError, concat, distinctUntilChanged, Observable, of, Subject, switchMap, tap } from 'rxjs';
import { BusinessListingCriteria, CityAndStateResult, CommercialPropertyListingCriteria, GeoResult, KeycloakUser, UserListingCriteria } from '../../../../../bizmatch-server/src/models/main.model';
import { FaqComponent, FAQItem } from '../../components/faq/faq.component';
import { ModalService } from '../../components/search-modal/modal.service';
import { TooltipComponent } from '../../components/tooltip/tooltip.component';
import { AiService } from '../../services/ai.service';
@ -16,7 +16,6 @@ import { GeoService } from '../../services/geo.service';
import { ListingsService } from '../../services/listings.service';
import { SearchService } from '../../services/search.service';
import { SelectOptionsService } from '../../services/select-options.service';
import { SeoService } from '../../services/seo.service';
import { UserService } from '../../services/user.service';
import { map2User } from '../../utils/utils';
@ -24,7 +23,7 @@ import { map2User } from '../../utils/utils';
@Component({
selector: 'app-home',
standalone: true,
imports: [CommonModule, FormsModule, RouterModule, NgSelectModule, FaqComponent],
imports: [CommonModule, FormsModule, RouterModule, NgSelectModule, TooltipComponent],
templateUrl: './home.component.html',
styleUrl: './home.component.scss',
})
@ -59,50 +58,6 @@ export class HomeComponent {
showInput: boolean = true;
tooltipTargetBeta = 'tooltipTargetBeta';
// FAQ data optimized for AEO (Answer Engine Optimization) and Featured Snippets
faqItems: FAQItem[] = [
{
question: 'How do I buy a business on BizMatch?',
answer: '<p><strong>Buying a business on BizMatch involves 6 simple steps:</strong></p><ol><li><strong>Browse Listings:</strong> Search our marketplace using filters for industry, location, and price range</li><li><strong>Review Details:</strong> Examine financial information, business operations, and growth potential</li><li><strong>Contact Seller:</strong> Reach out directly through our secure messaging platform</li><li><strong>Due Diligence:</strong> Review financial statements, contracts, and legal documents</li><li><strong>Negotiate Terms:</strong> Work with the seller to agree on price and transition details</li><li><strong>Close Deal:</strong> Complete the purchase with legal and financial advisors</li></ol><p>We recommend working with experienced business brokers and conducting thorough due diligence before making any purchase.</p>'
},
{
question: 'How much does it cost to list a business for sale?',
answer: '<p><strong>BizMatch offers flexible pricing options:</strong></p><ul><li><strong>Free Basic Listing:</strong> Post your business with essential details at no cost</li><li><strong>Premium Listing:</strong> Enhanced visibility with featured placement and priority support</li><li><strong>Broker Packages:</strong> Professional tools for business brokers and agencies</li></ul><p>Contact our team for detailed pricing information tailored to your specific needs.</p>'
},
{
question: 'What types of businesses can I find on BizMatch?',
answer: '<p><strong>BizMatch features businesses across all major industries:</strong></p><ul><li><strong>Food & Hospitality:</strong> Restaurants, cafes, bars, hotels, catering services</li><li><strong>Retail:</strong> Stores, boutiques, online shops, franchises</li><li><strong>Service Businesses:</strong> Consulting firms, cleaning services, healthcare practices</li><li><strong>Manufacturing:</strong> Production facilities, distribution centers, warehouses</li><li><strong>E-commerce:</strong> Online businesses, digital products, subscription services</li><li><strong>Commercial Real Estate:</strong> Office buildings, retail spaces, industrial properties</li></ul><p>Our marketplace serves all business sizes from small local operations to large enterprises across the United States.</p>'
},
{
question: 'How do I know if a business listing is legitimate?',
answer: '<p><strong>Yes, BizMatch verifies all listings.</strong> Here\'s how we ensure legitimacy:</p><ol><li><strong>Seller Verification:</strong> All users must verify their identity and contact information</li><li><strong>Listing Review:</strong> Our team reviews each listing for completeness and accuracy</li><li><strong>Documentation Check:</strong> We verify business registration and ownership documents</li><li><strong>Transparent Communication:</strong> All conversations are logged through our secure platform</li></ol><p><strong>Additional steps you should take:</strong></p><ul><li>Review financial statements and tax returns</li><li>Visit the business location in person</li><li>Consult with legal and financial advisors</li><li>Work with licensed business brokers when appropriate</li><li>Conduct background checks on sellers</li></ul>'
},
{
question: 'Can I sell commercial property on BizMatch?',
answer: '<p><strong>Yes!</strong> BizMatch is a full-service marketplace for both businesses and commercial real estate.</p><p><strong>Property types you can list:</strong></p><ul><li>Office buildings and professional spaces</li><li>Retail locations and shopping centers</li><li>Warehouses and distribution facilities</li><li>Industrial properties and manufacturing plants</li><li>Mixed-use developments</li><li>Land for commercial development</li></ul><p>Our platform connects you with qualified buyers, investors, and commercial real estate professionals actively searching for investment opportunities.</p>'
},
{
question: 'What information should I include when listing my business?',
answer: '<p><strong>A complete listing should include these essential details:</strong></p><ol><li><strong>Financial Information:</strong> Asking price, annual revenue, cash flow, profit margins</li><li><strong>Business Operations:</strong> Years established, number of employees, hours of operation</li><li><strong>Description:</strong> Detailed overview of products/services, customer base, competitive advantages</li><li><strong>Industry Category:</strong> Specific business type and market segment</li><li><strong>Location Details:</strong> City, state, demographic information</li><li><strong>Assets Included:</strong> Equipment, inventory, real estate, intellectual property</li><li><strong>Visual Content:</strong> High-quality photos of business premises and operations</li><li><strong>Growth Potential:</strong> Expansion opportunities and market trends</li></ol><p><strong>Pro tip:</strong> The more detailed and transparent your listing, the more interest it will generate from serious, qualified buyers.</p>'
},
{
question: 'How long does it take to sell a business?',
answer: '<p><strong>Most businesses sell within 6 to 12 months.</strong> The timeline varies based on several factors:</p><p><strong>Factors that speed up sales:</strong></p><ul><li>Realistic pricing based on professional valuation</li><li>Complete and organized financial documentation</li><li>Strong business performance and growth trends</li><li>Attractive location and market conditions</li><li>Experienced business broker representation</li><li>Flexible seller terms and financing options</li></ul><p><strong>Timeline breakdown:</strong></p><ol><li><strong>Months 1-2:</strong> Preparation and listing creation</li><li><strong>Months 3-6:</strong> Marketing and buyer qualification</li><li><strong>Months 7-10:</strong> Negotiations and due diligence</li><li><strong>Months 11-12:</strong> Closing and transition</li></ol>'
},
{
question: 'What is business valuation and why is it important?',
answer: '<p><strong>Business valuation is the process of determining the economic worth of a company.</strong> It calculates the fair market value based on financial performance, assets, and market conditions.</p><p><strong>Why valuation matters:</strong></p><ul><li><strong>Realistic Pricing:</strong> Attracts serious buyers and prevents extended time on market</li><li><strong>Negotiation Power:</strong> Provides data-driven justification for asking price</li><li><strong>Buyer Confidence:</strong> Professional valuations increase trust and credibility</li><li><strong>Financing Approval:</strong> Banks require valuations for business acquisition loans</li></ul><p><strong>Valuation methods include:</strong></p><ol><li><strong>Asset-Based:</strong> Total value of business assets minus liabilities</li><li><strong>Income-Based:</strong> Projected future earnings and cash flow</li><li><strong>Market-Based:</strong> Comparison to similar business sales</li><li><strong>Multiple of Earnings:</strong> Revenue or profit multiplied by industry-standard factor</li></ol>'
},
{
question: 'Do I need a business broker to buy or sell a business?',
answer: '<p><strong>No, but brokers are highly recommended.</strong> You can conduct transactions directly through BizMatch, but professional brokers provide significant advantages:</p><p><strong>Benefits of using a business broker:</strong></p><ul><li><strong>Expert Valuation:</strong> Accurate pricing based on market data and analysis</li><li><strong>Marketing Expertise:</strong> Professional listing creation and buyer outreach</li><li><strong>Qualified Buyers:</strong> Pre-screening to ensure financial capability and serious interest</li><li><strong>Negotiation Skills:</strong> Experience handling complex deal structures and terms</li><li><strong>Confidentiality:</strong> Protect sensitive information during the sales process</li><li><strong>Legal Compliance:</strong> Navigate regulations, contracts, and disclosures</li><li><strong>Time Savings:</strong> Handle paperwork, communications, and coordination</li></ul><p>BizMatch connects you with licensed brokers in your area, or you can manage the transaction yourself using our secure platform and resources.</p>'
},
{
question: 'What financing options are available for buying a business?',
answer: '<p><strong>Business buyers have multiple financing options:</strong></p><ol><li><strong>SBA 7(a) Loans:</strong> Government-backed loans with favorable terms<ul><li>Down payment as low as 10%</li><li>Loan amounts up to $5 million</li><li>Competitive interest rates</li><li>Terms up to 10-25 years</li></ul></li><li><strong>Conventional Bank Financing:</strong> Traditional business acquisition loans<ul><li>Typically require 20-30% down payment</li><li>Based on creditworthiness and business performance</li></ul></li><li><strong>Seller Financing:</strong> Owner provides loan to buyer<ul><li>More flexible terms and requirements</li><li>Often combined with other financing</li><li>Typically 10-30% of purchase price</li></ul></li><li><strong>Investor Partnerships:</strong> Equity financing from partners<ul><li>Shared ownership and profits</li><li>No personal debt obligation</li></ul></li><li><strong>Personal Savings:</strong> Self-funded purchase<ul><li>No interest or loan payments</li><li>Full ownership from day one</li></ul></li></ol><p><strong>Most buyers use a combination of these options</strong> to structure the optimal deal for their situation.</p>'
}
];
constructor(
private router: Router,
private modalService: ModalService,
@ -116,66 +71,12 @@ export class HomeComponent {
private aiService: AiService,
private authService: AuthService,
private filterStateService: FilterStateService,
private seoService: SeoService,
) { }
) {}
async ngOnInit() {
// Flowbite is now initialized once in AppComponent
// Set SEO meta tags for home page
this.seoService.updateMetaTags({
title: 'BizMatch - Buy & Sell Businesses and Commercial Properties',
description: 'Find profitable businesses for sale, commercial real estate, and franchise opportunities across the United States. Browse thousands of listings from verified sellers and brokers.',
keywords: 'business for sale, businesses for sale, buy business, sell business, commercial property, commercial real estate, franchise opportunities, business broker, business marketplace',
type: 'website'
});
// Add Organization schema for brand identity and FAQ schema for AEO
const organizationSchema = this.seoService.generateOrganizationSchema();
const faqSchema = this.seoService.generateFAQPageSchema(
this.faqItems.map(item => ({
question: item.question,
answer: item.answer
}))
);
// Add HowTo schema for buying a business
const howToSchema = this.seoService.generateHowToSchema({
name: 'How to Buy a Business on BizMatch',
description: 'Step-by-step guide to finding and purchasing your ideal business through BizMatch marketplace',
totalTime: 'PT45M',
steps: [
{
name: 'Browse Business Listings',
text: 'Search through thousands of verified business listings using our advanced filters. Filter by industry, location, price range, revenue, and more to find businesses that match your criteria.'
},
{
name: 'Review Business Details',
text: 'Examine the business financials, including annual revenue, cash flow, asking price, and years established. Read the detailed business description and view photos of the operation.'
},
{
name: 'Contact the Seller',
text: 'Use our secure messaging system to contact the seller or business broker directly. Request additional information, financial documents, or schedule a site visit to see the business in person.'
},
{
name: 'Conduct Due Diligence',
text: 'Review all financial statements, tax returns, lease agreements, and legal documents. Verify the business information, inspect the physical location, and consult with legal and financial advisors.'
},
{
name: 'Make an Offer',
text: 'Submit a formal offer based on your valuation and due diligence findings. Negotiate terms including purchase price, payment structure, transition period, and any contingencies.'
},
{
name: 'Close the Transaction',
text: 'Work with attorneys and escrow services to finalize all legal documents, transfer ownership, and complete the purchase. The seller will transfer assets, train you on operations, and help with the transition.'
}
]
});
// Add SearchBox schema for Sitelinks Search
const searchBoxSchema = this.seoService.generateSearchBoxSchema();
this.seoService.injectMultipleSchemas([organizationSchema, faqSchema, howToSchema, searchBoxSchema]);
setTimeout(() => {
initFlowbite();
}, 0);
// Clear all filters and sort options on initial load
this.filterStateService.resetCriteria('businessListings');

201
bizmatch/src/app/pages/legal/privacy-statement.component.html
View File

@ -1,201 +0,0 @@
<div class="container mx-auto px-4 py-8 max-w-4xl">
<div class="bg-white rounded-lg drop-shadow-custom-bg p-6 md:p-8 relative">
<button
(click)="goBack()"
class="absolute top-4 right-4 md:top-6 md:right-6 w-10 h-10 flex items-center justify-center rounded-full bg-red-600 hover:bg-red-700 text-white transition-colors duration-200"
aria-label="Go back"
>
<i class="fas fa-arrow-left text-lg"></i>
</button>
<h1 class="text-3xl font-bold text-neutral-900 mb-6 pr-14">Privacy Statement</h1>
<section id="content" role="main">
<article class="post page">
<section class="entry-content">
<div class="container">
<p class="font-bold mb-4">Privacy Policy</p>
<p class="mb-4">We are committed to protecting your privacy. We have established this statement as a testament to our commitment to your privacy.</p>
<p class="mb-4">This Privacy Policy relates to the use of any personal information you provide to us through this websites.</p>
<p class="mb-4">
By accepting the Privacy Policy during registration or the sending of an enquiry, you expressly consent to our collection, storage, use and disclosure of your personal information as described in this Privacy
Policy.
</p>
<p class="mb-4">
We may update our Privacy Policy from time to time. Our Privacy Policy was last updated in Febuary 2018 and is effective upon acceptance for new users. By continuing to use our websites or otherwise
continuing to deal with us, you accept this Privacy Policy.
</p>
<p class="font-bold mb-4 mt-6">Collection of personal information</p>
<p class="mb-4">Anyone can browse our websites without revealing any personally identifiable information.</p>
<p class="mb-4">However, should you wish to contact a business for sale, a franchise opportunity or an intermediary, we will require you to provide some personal information.</p>
<p class="mb-4">Should you wish to advertise your services, your business (es) or your franchise opportunity, we will require you to provide some personal information.</p>
<p class="mb-4">By providing personal information, you are consenting to the transfer and storage of that information on our servers located in the United States.</p>
<p class="mb-4">We may collect and store the following personal information:</p>
<p class="mb-4">
Your name, email address, physical address, telephone numbers, and (depending on the service used), your business information, financial information, such as credit / payment card details;<br />
transactional information based on your activities on the site; information that you disclose in a forum on any of our websites, feedback, correspondence through our websites, and correspondence sent to
us;<br />
other information from your interaction with our websites, services, content and advertising, including computer and connection information, statistics on page views, traffic to and from the sites, ad data,
IP address and standard web log information;<br />
supplemental information from third parties (for example, if you incur a debt, we will generally conduct a credit check by obtaining additional information about you from a credit bureau, as permitted by law;
or if the information you provide cannot be verified,<br />
we may ask you to send us additional information, or to answer additional questions online to help verify your information).
</p>
<p class="font-bold mb-4 mt-6">How we use your information</p>
<p class="mb-4">
The primary reason we collect your personal information is to improve the services we deliver to you through our website. By registering or sending an enquiry through our website, you agree that we may use
your personal information to:<br />
provide the services and customer support you request;<br />
connect you with relevant parties:<br />
If you are a buyer we will pass some or all of your details on to the seller / intermediary along with any message you have typed. This allows the seller to contact you in order to pursue a possible sale of a
business;<br />
If you are a seller / intermediary, we will disclose your details where you have given us permission to do so;<br />
resolve disputes, collect fees, and troubleshoot problems;<br />
prevent potentially prohibited or illegal activities, and enforce our Terms and Conditions;<br />
customize, measure and improve our services, conduct internal market research, provide content and advertising;<br />
tell you about other Biz-Match products and services, target marketing, send you service updates, and promotional offers based on your communication preferences.
</p>
<p class="font-bold mb-4 mt-6">Our disclosure of your information</p>
<p class="mb-4">
We may disclose personal information to respond to legal requirements, enforce our policies, respond to claims that a listing or other content infringes the rights of others, or protect anyone's rights,
property, or safety.
</p>
<p class="mb-4">
We may also share your personal information with<br />
When you select to register an account as a business buyer, you provide your personal details and we will pass this on to a seller of a business or franchise when you request more information.
</p>
<p class="mb-4">
When you select to register an account as a business broker or seller on the site, we provide a public platform on which to establish your business profile. This profile consists of pertinent facts about your
business along with your personal information; namely, the contact information you provide to facilitate contact between you and other users' of the site. Direct email addresses and telephone numbers will not
be publicly displayed unless you specifically include it on your profile.
</p>
<p class="mb-4">
The information a user includes within the forums provided on the site is publicly available to other users' of the site. Please be aware that any personal information you elect to provide in a public forum
may be used to send you unsolicited messages; we are not responsible for the personal information a user elects to disclose within their public profile, or in the private communications that users' engage in
on the site.
</p>
<p class="mb-4">
We post testimonials on the site obtained from users'. These testimonials may include the name, city, state or region and business of the user. We obtain permission from our users' prior to posting their
testimonials on the site. We are not responsible for any personal information a user selects to include within their testimonial.
</p>
<p class="mb-4">
When you elect to email a friend about the site, or a particular business, we request the third party's email address to send this one time email. We do not share this information with any third parties for
their promotional purposes and only store the information to gauge the effectiveness of our referral program.
</p>
<p class="mb-4">We may share your personal information with our service providers where necessary. We employ the services of a payment processor to fulfil payment for services purchased on the site.</p>
<p class="mb-4">
We works with a number of partners or affiliates, where we provide marketing services for these companies. These third party agents collect your personal information to facilitate your service request and the
information submitted here is governed by their privacy policy.
</p>
<p class="font-bold mb-4 mt-6">Masking Policy</p>
<p class="mb-4">
In some cases, where the third party agent collects your information, the affiliate portal may appear within a BizMatch.net frame. It is presented as a BizMatch.net page for a streamlined user interface
however the data collected on such pages is governed by the third party agent's privacy policy.
</p>
<p class="font-bold mb-4 mt-6">Legal Disclosure</p>
<p class="mb-4">
In certain circumstances, we may be legally required to disclose information collected on the site to law enforcement, government agencies or other third parties. We reserve the right to disclose information
to our service providers and to law enforcement or government agencies where a formal request such as in response to a court order, subpoena or judicial proceeding is made. Where we believe in good faith that
disclosure of information is necessary to prevent imminent physical or financial harm, or loss, or in protecting against illegal activity on the site, we reserve to disclose information.
</p>
<p class="mb-4">
Should the company undergo the merger, acquisition or sale of some or all of its assets, your personal information may likely be a part of the transferred assets. In such an event, your personal information
on the site, would be governed by this privacy statement; any changes to the privacy practices governing your information as a result of transfer would be relayed to you by means of a prominent notice on the
Site, or by email.
</p>
<p class="font-bold mb-4 mt-6">Using information from BizMatch.net website</p>
<p class="mb-4">
In certain cases, (where you are receiving contact details of buyers interested in your business opportunity or a business opportunity you represent), you must comply with data protection laws, and give other
users a chance to remove themselves from your database and a chance to review what information you have collected about them.
</p>
<p class="font-bold mb-4 mt-6">You agree to use BizMatch.net user information only for:</p>
<p class="mb-4">
BizMatch.net transaction-related purposes that are not unsolicited commercial messages;<br />
using services offered through BizMatch.net, or<br />
other purposes that a user expressly chooses.
</p>
<p class="font-bold mb-4 mt-6">Marketing</p>
<p class="mb-4">
We do not sell or rent your personal information to third parties for their marketing purposes without your explicit consent. Where you explicitly express your consent at the point of collection to receive
offers from third party partners or affiliates, we will communicate to you on their behalf. We will not pass your information on.
</p>
<p class="mb-4">
You will receive email marketing communications from us throughout the duration of your relationship with our websites. If you do not wish to receive marketing communications from us you may unsubscribe and /
or change your preferences at any time by following instructions included within a communication or emailing Customer Services.
</p>
<p class="mb-4">If you have an account with one of our websites you can also log in and click the email preferences link to unsubscribe and / or change your preferences.</p>
<p class="mb-4">
Please note that we reserve the right to send all website users notifications and administrative emails where necessary which are considered a part of the service. Given that these messages aren't promotional
in nature, you will be unable to opt-out of them.
</p>
<p class="font-bold mb-4 mt-6">Cookies</p>
<p class="mb-4">
A cookie is a small text file written to your hard drive that contains information about you. Cookies do not contain any personal information about users. Once you close your browser or log out of the
website, the cookie simply terminates. We use cookies so that we can personalise your experience of our websites.
</p>
<p class="mb-4">
If you set up your browser to reject the cookie, you may still use the website however; doing so may interfere with your use of some aspects of our websites. Some of our business partners use cookies on our
site (for example, advertisers). We have no access to or control over these cookies.
</p>
<p class="mb-4">For more information about how BizMatch.net uses cookies please read our Cookie Policy.</p>
<p class="font-bold mb-4 mt-6">Spam, spyware or spoofing</p>
<p class="mb-4">
We and our users do not tolerate spam. Make sure to set your email preferences so we can communicate with you, as you prefer. Please add us to your safe senders list. To report spam or spoof emails, please
contact us using the contact information provided in the Contact Us section of this privacy statement.
</p>
<p class="mb-4">
You may not use our communication tools to send spam or otherwise send content that would breach our Terms and Conditions. We automatically scan and may manually filter messages to check for spam, viruses,
phishing attacks and other malicious activity or illegal or prohibited content. We may also store these messages for back up purposes only.
</p>
<p class="mb-4">
If you send an email to an email address that is not registered in our community, we do not permanently store that email or use that email address for any marketing purpose. We do not rent or sell these email
addresses.
</p>
<p class="font-bold mb-4 mt-6">Account protection</p>
<p class="mb-4">
Your password is the key to your account. Make sure this is stored safely. Use unique numbers, letters and special characters, and do not disclose your password to anyone. If you do share your password or
your personal information with others, remember that you are responsible for all actions taken in the name of your account. If you lose control of your password, you may lose substantial control over your
personal information and may be subject to legally binding actions taken on your behalf. Therefore, if your password has been compromised for any reason, you should immediately notify us and change your
password.
</p>
<p class="font-bold mb-4 mt-6">Accessing, reviewing and changing your personal information</p>
<p class="mb-4">You can view and amend your personal information at any time by logging in to your account online. You must promptly update your personal information if it changes or is inaccurate.</p>
<p class="mb-4">If at any time you wish to close your account, please contact Customer Services and instruct us to do so. We will process your request as soon as we can.</p>
<p class="mb-4">You may also contact us at any time to find out what information we hold about you, what we do with it and ask us to update it for you.</p>
<p class="mb-4">
We do retain personal information from closed accounts to comply with law, prevent fraud, collect any fees owed, resolve disputes, troubleshoot problems, assist with any investigations, enforce our Terms and
Conditions, and take other actions otherwise permitted by law.
</p>
<p class="font-bold mb-4 mt-6">Security</p>
<p class="mb-4">
Your information is stored on our servers located in the USA. We treat data as an asset that must be protected and use a variety of tools (encryption, passwords, physical security, etc.) to protect your
personal information against unauthorized access and disclosure. However, no method of security is 100% effective and while we take every measure to protect your personal information, we make no guarantees of
its absolute security.
</p>
<p class="mb-4">We employ the use of SSL encryption during the transmission of sensitive data across our websites.</p>
<p class="font-bold mb-4 mt-6">Third parties</p>
<p class="mb-4">
Except as otherwise expressly included in this Privacy Policy, this document addresses only the use and disclosure of information we collect from you. If you disclose your information to others, whether they
are buyers or sellers on our websites or other sites throughout the internet, different rules may apply to their use or disclosure of the information you disclose to them. Dynamis does not control the privacy
policies of third parties, and you are subject to the privacy policies of those third parties where applicable.
</p>
<p class="mb-4">We encourage you to ask questions before you disclose your personal information to others.</p>
<p class="font-bold mb-4 mt-6">General</p>
<p class="mb-4">
We may change this Privacy Policy from time to time as we add new products and applications, as we improve our current offerings, and as technologies and laws change. You can determine when this Privacy
Policy was last revised by referring to the "Last Updated" legend at the top of this page.
</p>
<p class="mb-4">
Any changes will become effective upon our posting of the revised Privacy Policy on our affected websites. We will provide notice to you if these changes are material and, where required by applicable law, we
will obtain your consent. This notice may be provided by email, by posting notice of the changes on our affected websites or by other means, consistent with applicable laws.
</p>
<p class="font-bold mb-4 mt-6">Contact Us</p>
<p class="mb-4">
If you have any questions or comments about our privacy policy, and you can't find the answer to your question on our help pages, please contact us using this form or email support&#64;bizmatch.net, or write
to us at BizMatch, 715 S. Tanahua, Corpus Christi, TX 78401.)
</p>
</div>
</section>
</article>
</section>
</div>
</div>

1
bizmatch/src/app/pages/legal/privacy-statement.component.scss
View File

@ -1 +0,0 @@
// Privacy Statement component styles

30
bizmatch/src/app/pages/legal/privacy-statement.component.ts
View File

@ -1,30 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { CommonModule, Location } from '@angular/common';
import { SeoService } from '../../services/seo.service';
@Component({
selector: 'app-privacy-statement',
standalone: true,
imports: [CommonModule],
templateUrl: './privacy-statement.component.html',
styleUrls: ['./privacy-statement.component.scss']
})
export class PrivacyStatementComponent implements OnInit {
constructor(
private seoService: SeoService,
private location: Location
) {}
ngOnInit(): void {
// Set SEO meta tags for Privacy Statement page
this.seoService.updateMetaTags({
title: 'Privacy Statement - BizMatch',
description: 'Learn how BizMatch collects, uses, and protects your personal information. Read our privacy policy and data protection practices.',
type: 'website'
});
}
goBack(): void {
this.location.back();
}
}

150
bizmatch/src/app/pages/legal/terms-of-use.component.html
View File

@ -1,150 +0,0 @@
<div class="container mx-auto px-4 py-8 max-w-4xl">
<div class="bg-white rounded-lg drop-shadow-custom-bg p-6 md:p-8 relative">
<button
(click)="goBack()"
class="absolute top-4 right-4 md:top-6 md:right-6 w-10 h-10 flex items-center justify-center rounded-full bg-red-600 hover:bg-red-700 text-white transition-colors duration-200"
aria-label="Go back"
>
<i class="fas fa-arrow-left text-lg"></i>
</button>
<h1 class="text-3xl font-bold text-neutral-900 mb-6 pr-14">Terms of Use</h1>
<section id="content" role="main">
<article class="post page">
<section class="entry-content">
<div class="container">
<p class="font-bold text-lg mb-4">AGREEMENT BETWEEN USER AND BizMatch</p>
<p class="mb-4">The BizMatch Web Site is comprised of various Web pages operated by BizMatch.</p>
<p class="mb-4">
The BizMatch Web Site is offered to you conditioned on your acceptance without modification of the terms, conditions, and notices contained herein. Your use of the BizMatch Web Site constitutes your
agreement to all such terms, conditions, and notices.
</p>
<p class="font-bold text-lg mb-4 mt-6">MODIFICATION OF THESE TERMS OF USE</p>
<p class="mb-4">
BizMatch reserves the right to change the terms, conditions, and notices under which the BizMatch Web Site is offered, including but not limited to the charges associated with the use of the BizMatch Web
Site.
</p>
<p class="font-bold text-lg mb-4 mt-6">LINKS TO THIRD PARTY SITES</p>
<p class="mb-4">
The BizMatch Web Site may contain links to other Web Sites ("Linked Sites"). The Linked Sites are not under the control of BizMatch and BizMatch is not responsible for the contents of any Linked Site,
including without limitation any link contained in a Linked Site, or any changes or updates to a Linked Site. BizMatch is not responsible for webcasting or any other form of transmission received from any
Linked Site. BizMatch is providing these links to you only as a convenience, and the inclusion of any link does not imply endorsement by BizMatch of the site or any association with its operators.
</p>
<p class="font-bold text-lg mb-4 mt-6">NO UNLAWFUL OR PROHIBITED USE</p>
<p class="mb-4">
As a condition of your use of the BizMatch Web Site, you warrant to BizMatch that you will not use the BizMatch Web Site for any purpose that is unlawful or prohibited by these terms, conditions, and
notices. You may not use the BizMatch Web Site in any manner which could damage, disable, overburden, or impair the BizMatch Web Site or interfere with any other party's use and enjoyment of the BizMatch
Web Site. You may not obtain or attempt to obtain any materials or information through any means not intentionally made available or provided for through the BizMatch Web Sites.
</p>
<p class="font-bold text-lg mb-4 mt-6">USE OF COMMUNICATION SERVICES</p>
<p class="mb-4">
The BizMatch Web Site may contain bulletin board services, chat areas, news groups, forums, communities, personal web pages, calendars, and/or other message or communication facilities designed to enable
you to communicate with the public at large or with a group (collectively, "Communication Services"), you agree to use the Communication Services only to post, send and receive messages and material that
are proper and related to the particular Communication Service. By way of example, and not as a limitation, you agree that when using a Communication Service, you will not:
</p>
<ul class="list-disc pl-6 mb-4 space-y-2">
<li>Defame, abuse, harass, stalk, threaten or otherwise violate the legal rights (such as rights of privacy and publicity) of others.</li>
<li>Publish, post, upload, distribute or disseminate any inappropriate, profane, defamatory, infringing, obscene, indecent or unlawful topic, name, material or information.</li>
<li>Upload files that contain software or other material protected by intellectual property laws (or by rights of privacy of publicity) unless you own or control the rights thereto or have received all necessary consents.</li>
<li>Upload files that contain viruses, corrupted files, or any other similar software or programs that may damage the operation of another's computer.</li>
<li>Advertise or offer to sell or buy any goods or services for any business purpose, unless such Communication Service specifically allows such messages.</li>
<li>Conduct or forward surveys, contests, pyramid schemes or chain letters.</li>
<li>Download any file posted by another user of a Communication Service that you know, or reasonably should know, cannot be legally distributed in such manner.</li>
<li>Falsify or delete any author attributions, legal or other proper notices or proprietary designations or labels of the origin or source of software or other material contained in a file that is uploaded.</li>
<li>Restrict or inhibit any other user from using and enjoying the Communication Services.</li>
<li>Violate any code of conduct or other guidelines which may be applicable for any particular Communication Service.</li>
<li>Harvest or otherwise collect information about others, including e-mail addresses, without their consent.</li>
<li>Violate any applicable laws or regulations.</li>
</ul>
<p class="mb-4">
BizMatch has no obligation to monitor the Communication Services. However, BizMatch reserves the right to review materials posted to a Communication Service and to remove any materials in its sole
discretion. BizMatch reserves the right to terminate your access to any or all of the Communication Services at any time without notice for any reason whatsoever.
</p>
<p class="mb-4">
BizMatch reserves the right at all times to disclose any information as necessary to satisfy any applicable law, regulation, legal process or governmental request, or to edit, refuse to post or to remove
any information or materials, in whole or in part, in BizMatch's sole discretion.
</p>
<p class="mb-4">
Always use caution when giving out any personally identifying information about yourself or your children in any Communication Service. BizMatch does not control or endorse the content, messages or
information found in any Communication Service and, therefore, BizMatch specifically disclaims any liability with regard to the Communication Services and any actions resulting from your participation in
any Communication Service. Managers and hosts are not authorized BizMatch spokespersons, and their views do not necessarily reflect those of BizMatch.
</p>
<p class="mb-4">
Materials uploaded to a Communication Service may be subject to posted limitations on usage, reproduction and/or dissemination. You are responsible for adhering to such limitations if you download the
materials.
</p>
<p class="font-bold text-lg mb-4 mt-6">MATERIALS PROVIDED TO BizMatch OR POSTED AT ANY BizMatch WEB SITE</p>
<p class="mb-4">
BizMatch does not claim ownership of the materials you provide to BizMatch (including feedback and suggestions) or post, upload, input or submit to any BizMatch Web Site or its associated services
(collectively "Submissions"). However, by posting, uploading, inputting, providing or submitting your Submission you are granting BizMatch, its affiliated companies and necessary sublicensees permission
to use your Submission in connection with the operation of their Internet businesses including, without limitation, the rights to: copy, distribute, transmit, publicly display, publicly perform,
reproduce, edit, translate and reformat your Submission; and to publish your name in connection with your Submission.
</p>
<p class="mb-4">
No compensation will be paid with respect to the use of your Submission, as provided herein. BizMatch is under no obligation to post or use any Submission you may provide and may remove any Submission at
any time in BizMatch's sole discretion.
</p>
<p class="mb-4">
By posting, uploading, inputting, providing or submitting your Submission you warrant and represent that you own or otherwise control all of the rights to your Submission as described in this section
including, without limitation, all the rights necessary for you to provide, post, upload, input or submit the Submissions.
</p>
<p class="font-bold text-lg mb-4 mt-6">LIABILITY DISCLAIMER</p>
<p class="mb-4">
THE INFORMATION, SOFTWARE, PRODUCTS, AND SERVICES INCLUDED IN OR AVAILABLE THROUGH THE BizMatch WEB SITE MAY INCLUDE INACCURACIES OR TYPOGRAPHICAL ERRORS. CHANGES ARE PERIODICALLY ADDED TO THE
INFORMATION HEREIN. BizMatch AND/OR ITS SUPPLIERS MAY MAKE IMPROVEMENTS AND/OR CHANGES IN THE BizMatch WEB SITE AT ANY TIME. ADVICE RECEIVED VIA THE BizMatch WEB SITE SHOULD NOT BE RELIED UPON FOR
PERSONAL, MEDICAL, LEGAL OR FINANCIAL DECISIONS AND YOU SHOULD CONSULT AN APPROPRIATE PROFESSIONAL FOR SPECIFIC ADVICE TAILORED TO YOUR SITUATION.
</p>
<p class="mb-4">
BizMatch AND/OR ITS SUPPLIERS MAKE NO REPRESENTATIONS ABOUT THE SUITABILITY, RELIABILITY, AVAILABILITY, TIMELINESS, AND ACCURACY OF THE INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS
CONTAINED ON THE BizMatch WEB SITE FOR ANY PURPOSE. TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, ALL SUCH INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS ARE PROVIDED "AS IS" WITHOUT
WARRANTY OR CONDITION OF ANY KIND. BizMatch AND/OR ITS SUPPLIERS HEREBY DISCLAIM ALL WARRANTIES AND CONDITIONS WITH REGARD TO THIS INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS, INCLUDING
ALL IMPLIED WARRANTIES OR CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT.
</p>
<p class="mb-4">
TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, IN NO EVENT SHALL BizMatch AND/OR ITS SUPPLIERS BE LIABLE FOR ANY DIRECT, INDIRECT, PUNITIVE, INCIDENTAL, SPECIAL, CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF USE, DATA OR PROFITS, ARISING OUT OF OR IN ANY WAY CONNECTED WITH THE USE OR PERFORMANCE OF THE BizMatch WEB SITE, WITH THE DELAY OR INABILITY
TO USE THE BizMatch WEB SITE OR RELATED SERVICES, THE PROVISION OF OR FAILURE TO PROVIDE SERVICES, OR FOR ANY INFORMATION, SOFTWARE, PRODUCTS, SERVICES AND RELATED GRAPHICS OBTAINED THROUGH THE BizMatch
WEB SITE, OR OTHERWISE ARISING OUT OF THE USE OF THE BizMatch WEB SITE, WHETHER BASED ON CONTRACT, TORT, NEGLIGENCE, STRICT LIABILITY OR OTHERWISE, EVEN IF BizMatch OR ANY OF ITS SUPPLIERS HAS BEEN
ADVISED OF THE POSSIBILITY OF DAMAGES. BECAUSE SOME STATES/JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF LIABILITY FOR CONSEQUENTIAL OR INCIDENTAL DAMAGES, THE ABOVE LIMITATION MAY NOT APPLY
TO YOU. IF YOU ARE DISSATISFIED WITH ANY PORTION OF THE BizMatch WEB SITE, OR WITH ANY OF THESE TERMS OF USE, YOUR SOLE AND EXCLUSIVE REMEDY IS TO DISCONTINUE USING THE BizMatch WEB SITE.
</p>
<p class="mb-4">SERVICE CONTACT : info&#64;bizmatch.net</p>
<p class="font-bold text-lg mb-4 mt-6">TERMINATION/ACCESS RESTRICTION</p>
<p class="mb-4">
BizMatch reserves the right, in its sole discretion, to terminate your access to the BizMatch Web Site and the related services or any portion thereof at any time, without notice. GENERAL To the maximum
extent permitted by law, this agreement is governed by the laws of the State of Washington, U.S.A. and you hereby consent to the exclusive jurisdiction and venue of courts in King County, Washington,
U.S.A. in all disputes arising out of or relating to the use of the BizMatch Web Site. Use of the BizMatch Web Site is unauthorized in any jurisdiction that does not give effect to all provisions of these
terms and conditions, including without limitation this paragraph. You agree that no joint venture, partnership, employment, or agency relationship exists between you and BizMatch as a result of this
agreement or use of the BizMatch Web Site. BizMatch's performance of this agreement is subject to existing laws and legal process, and nothing contained in this agreement is in derogation of BizMatch's
right to comply with governmental, court and law enforcement requests or requirements relating to your use of the BizMatch Web Site or information provided to or gathered by BizMatch with respect to such
use. If any part of this agreement is determined to be invalid or unenforceable pursuant to applicable law including, but not limited to, the warranty disclaimers and liability limitations set forth
above, then the invalid or unenforceable provision will be deemed superseded by a valid, enforceable provision that most closely matches the intent of the original provision and the remainder of the
agreement shall continue in effect. Unless otherwise specified herein, this agreement constitutes the entire agreement between the user and BizMatch with respect to the BizMatch Web Site and it supersedes
all prior or contemporaneous communications and proposals, whether electronic, oral or written, between the user and BizMatch with respect to the BizMatch Web Site. A printed version of this agreement and
of any notice given in electronic form shall be admissible in judicial or administrative proceedings based upon or relating to this agreement to the same extent and subject to the same conditions as
other business documents and records originally generated and maintained in printed form. It is the express wish to the parties that this agreement and all related documents be drawn up in English.
</p>
<p class="font-bold text-lg mb-4 mt-6">COPYRIGHT AND TRADEMARK NOTICES:</p>
<p class="mb-4">All contents of the BizMatch Web Site are: Copyright 2011 by Bizmatch Business Solutions and/or its suppliers. All rights reserved.</p>
<p class="font-bold text-lg mb-4 mt-6">TRADEMARKS</p>
<p class="mb-4">The names of actual companies and products mentioned herein may be the trademarks of their respective owners.</p>
<p class="mb-4">
The example companies, organizations, products, people and events depicted herein are fictitious. No association with any real company, organization, product, person, or event is intended or should be
inferred.
</p>
<p class="mb-4">Any rights not expressly granted herein are reserved.</p>
<p class="font-bold text-lg mb-4 mt-6">NOTICES AND PROCEDURE FOR MAKING CLAIMS OF COPYRIGHT INFRINGEMENT</p>
<p class="mb-4">
Pursuant to Title 17, United States Code, Section 512(c)(2), notifications of claimed copyright infringement under United States copyright law should be sent to Service Provider's Designated Agent. ALL
INQUIRIES NOT RELEVANT TO THE FOLLOWING PROCEDURE WILL RECEIVE NO RESPONSE. See Notice and Procedure for Making Claims of Copyright Infringement.
</p>
<p class="mb-4">
We reserve the right to update or revise these Terms of Use at any time without notice. Please check the Terms of Use periodically for changes. The revised terms will be effective immediately as
soon as they are posted on the WebSite and by continuing to use the Site you agree to be bound by the revised terms.
</p>
</div>
</section>
</article>
</section>
</div>
</div>

1
bizmatch/src/app/pages/legal/terms-of-use.component.scss
View File

@ -1 +0,0 @@
// Terms of Use component styles

30
bizmatch/src/app/pages/legal/terms-of-use.component.ts
View File

@ -1,30 +0,0 @@
import { Component, OnInit } from '@angular/core';
import { CommonModule, Location } from '@angular/common';
import { SeoService } from '../../services/seo.service';
@Component({
selector: 'app-terms-of-use',
standalone: true,
imports: [CommonModule],
templateUrl: './terms-of-use.component.html',
styleUrls: ['./terms-of-use.component.scss']
})
export class TermsOfUseComponent implements OnInit {
constructor(
private seoService: SeoService,
private location: Location
) {}
ngOnInit(): void {
// Set SEO meta tags for Terms of Use page
this.seoService.updateMetaTags({
title: 'Terms of Use - BizMatch',
description: 'Read the terms and conditions for using BizMatch marketplace. Learn about user responsibilities, listing guidelines, and platform rules.',
type: 'website'
});
}
goBack(): void {
this.location.back();
}
}

137
bizmatch/src/app/pages/listings/broker-listings/broker-listings.component.html
View File

@ -1,130 +1,78 @@
<div class="flex flex-col md:flex-row">
<!-- Filter Panel for Desktop -->
<div class="hidden md:block w-full md:w-1/4 h-full bg-white shadow-lg p-6 overflow-y-auto z-10">
<app-search-modal-broker [isModal]="false"></app-search-modal-broker>
</div>
<!-- Main Content -->
<div class="w-full p-4">
<div class="container mx-auto">
<!-- Breadcrumbs -->
<div class="mb-4">
<app-breadcrumbs [breadcrumbs]="breadcrumbs"></app-breadcrumbs>
</div>
<!-- SEO-optimized heading -->
<div class="mb-6">
<h1 class="text-3xl md:text-4xl font-bold text-neutral-900 mb-2">Professional Business Brokers & Advisors</h1>
<p class="text-lg text-neutral-600">Connect with licensed business brokers, CPAs, attorneys, and other
professionals across the United States.</p>
</div>
<!-- Mobile Filter Button -->
<div class="md:hidden mb-4">
<button (click)="openFilterModal()"
class="w-full bg-primary-600 text-white py-3 px-4 rounded-lg flex items-center justify-center">
<i class="fas fa-filter mr-2"></i>
Filter Results
</button>
</div>
<div class="container mx-auto px-4 py-8">
@if(users?.length>0){
<h2 class="text-2xl font-semibold text-neutral-800 mb-4">Professional Listings</h2>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
<!-- Professional Cards -->
<!-- Amanda Taylor -->
@for (user of users; track user) {
<div
class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg p-6 flex flex-col justify-between hover:shadow-2xl transition-all duration-300 hover:scale-[1.02] group relative">
<!-- Quick Actions Overlay -->
<div
class="absolute top-4 right-4 flex gap-2 opacity-0 group-hover:opacity-100 transition-opacity duration-200 z-20">
@if(currentUser) {
<button type="button" class="bg-white rounded-full p-2 shadow-lg transition-colors"
[class.bg-red-50]="isFavorite(user)"
[title]="isFavorite(user) ? 'Remove from favorites' : 'Save to favorites'"
(click)="toggleFavorite($event, user)">
<i
[class]="isFavorite(user) ? 'fas fa-heart text-red-500' : 'far fa-heart text-red-500 hover:scale-110 transition-transform'"></i>
</button>
}
<button type="button" class="bg-white rounded-full p-2 shadow-lg hover:bg-blue-50 transition-colors"
title="Share professional" (click)="shareProfessional($event, user)">
<i class="fas fa-share-alt text-blue-500 hover:scale-110 transition-transform"></i>
</button>
</div>
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg p-6 flex flex-col justify-between">
<div class="flex items-start space-x-4">
@if(user.hasProfile){
<img src="{{ env.imageBaseUrl }}/pictures/profile/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}"
[alt]="altText.generateBrokerProfileAlt(user)" class="rounded-md w-20 h-26 object-cover" width="80"
height="104" />
<img src="{{ env.imageBaseUrl }}/pictures/profile/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}" class="rounded-md w-20 h-26 object-cover" />
} @else {
<img src="/assets/images/person_placeholder.jpg" alt="Default business broker placeholder profile photo"
class="rounded-md w-20 h-26 object-cover" width="80" height="104" />
<img src="assets/images/person_placeholder.jpg" class="rounded-md w-20 h-26 object-cover" />
}
<div class="flex-1">
<p class="text-sm text-neutral-800 mb-2">{{ user.description }}</p>
<p class="text-sm text-gray-800 mb-2">{{ user.description }}</p>
<h3 class="text-lg font-semibold">
{{ user.firstname }} {{ user.lastname }}<span
class="bg-neutral-200 text-neutral-700 text-xs font-semibold px-2 py-1 rounded ml-4">{{
user.location?.name }} - {{ user.location?.state }}</span>
{{ user.firstname }} {{ user.lastname }}<span class="bg-gray-200 text-gray-700 text-xs font-semibold px-2 py-1 rounded ml-4">{{ user.location?.name }} - {{ user.location?.state }}</span>
</h3>
<div class="flex items-center space-x-2 mt-2">
<app-customer-sub-type [customerSubType]="user.customerSubType"></app-customer-sub-type>
<p class="text-sm text-neutral-600">{{ user.companyName }}</p>
<p class="text-sm text-gray-600">{{ user.companyName }}</p>
</div>
<div class="flex items-center justify-between my-2"></div>
</div>
</div>
<div class="mt-4 flex justify-between items-center">
@if(user.hasCompanyLogo){
<img src="{{ env.imageBaseUrl }}/pictures/logo/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}"
[alt]="altText.generateCompanyLogoAlt(user.companyName, user.firstname + ' ' + user.lastname)"
class="w-8 h-10 object-contain" width="32" height="40" />
<img src="{{ env.imageBaseUrl }}/pictures/logo/{{ emailToDirName(user.email) }}.avif?_ts={{ ts }}" class="w-8 h-10 object-contain" />
} @else {
<img src="/assets/images/placeholder.png" alt="Default company logo placeholder"
class="w-8 h-10 object-contain" width="32" height="40" />
<img src="assets/images/placeholder.png" class="w-8 h-10 object-contain" />
}
<button
class="bg-success-500 hover:bg-success-600 text-white font-medium py-2 px-4 rounded-full flex items-center"
[routerLink]="['/details-user', user.id]">
<button class="bg-green-500 hover:bg-green-600 text-white font-medium py-2 px-4 rounded-full flex items-center" [routerLink]="['/details-user', user.id]">
View Full profile
<i class="fas fa-arrow-right ml-2"></i>
</button>
</div>
</div>
}
</div>
} @else if (users?.length===0){
<!-- Empty State -->
<div class="w-full flex items-center flex-wrap justify-center gap-10 py-12">
<div class="w-full flex items-center flex-wrap justify-center gap-10">
<div class="grid gap-4 w-60">
<svg class="mx-auto" xmlns="http://www.w3.org/2000/svg" width="154" height="161" viewBox="0 0 154 161"
fill="none">
<svg class="mx-auto" xmlns="http://www.w3.org/2000/svg" width="154" height="161" viewBox="0 0 154 161" fill="none">
<path
d="M0.0616455 84.4268C0.0616455 42.0213 34.435 7.83765 76.6507 7.83765C118.803 7.83765 153.224 42.0055 153.224 84.4268C153.224 102.42 147.026 118.974 136.622 132.034C122.282 150.138 100.367 161 76.6507 161C52.7759 161 30.9882 150.059 16.6633 132.034C6.25961 118.974 0.0616455 102.42 0.0616455 84.4268Z"
fill="#EEF2FF" />
fill="#EEF2FF"
/>
<path
d="M96.8189 0.632498L96.8189 0.632384L96.8083 0.630954C96.2034 0.549581 95.5931 0.5 94.9787 0.5H29.338C22.7112 0.5 17.3394 5.84455 17.3394 12.4473V142.715C17.3394 149.318 22.7112 154.662 29.338 154.662H123.948C130.591 154.662 135.946 149.317 135.946 142.715V38.9309C135.946 38.0244 135.847 37.1334 135.648 36.2586L135.648 36.2584C135.117 33.9309 133.874 31.7686 132.066 30.1333C132.066 30.1331 132.065 30.1329 132.065 30.1327L103.068 3.65203C103.068 3.6519 103.067 3.65177 103.067 3.65164C101.311 2.03526 99.1396 0.995552 96.8189 0.632498Z"
fill="white" stroke="#E5E7EB" />
fill="white"
stroke="#E5E7EB"
/>
<ellipse cx="80.0618" cy="81" rx="28.0342" ry="28.0342" fill="#EEF2FF" />
<path
d="M99.2393 61.3061L99.2391 61.3058C88.498 50.5808 71.1092 50.5804 60.3835 61.3061C49.6423 72.0316 49.6422 89.4361 60.3832 100.162C71.109 110.903 88.4982 110.903 99.2393 100.162C109.965 89.4363 109.965 72.0317 99.2393 61.3061ZM105.863 54.6832C120.249 69.0695 120.249 92.3985 105.863 106.785C91.4605 121.171 68.1468 121.171 53.7446 106.785C39.3582 92.3987 39.3582 69.0693 53.7446 54.683C68.1468 40.2965 91.4605 40.2966 105.863 54.6832Z"
stroke="#E5E7EB" />
<path
d="M110.782 119.267L102.016 110.492C104.888 108.267 107.476 105.651 109.564 102.955L118.329 111.729L110.782 119.267Z"
stroke="#E5E7EB" />
stroke="#E5E7EB"
/>
<path d="M110.782 119.267L102.016 110.492C104.888 108.267 107.476 105.651 109.564 102.955L118.329 111.729L110.782 119.267Z" stroke="#E5E7EB" />
<path
d="M139.122 125.781L139.122 125.78L123.313 109.988C123.313 109.987 123.313 109.987 123.312 109.986C121.996 108.653 119.849 108.657 118.521 109.985L118.871 110.335L118.521 109.985L109.047 119.459C107.731 120.775 107.735 122.918 109.044 124.247L109.047 124.249L124.858 140.06C128.789 143.992 135.191 143.992 139.122 140.06C143.069 136.113 143.069 129.728 139.122 125.781Z"
fill="#A5B4FC" stroke="#818CF8" />
fill="#A5B4FC"
stroke="#818CF8"
/>
<path
d="M83.185 87.2285C82.5387 87.2285 82.0027 86.6926 82.0027 86.0305C82.0027 83.3821 77.9987 83.3821 77.9987 86.0305C77.9987 86.6926 77.4627 87.2285 76.8006 87.2285C76.1543 87.2285 75.6183 86.6926 75.6183 86.0305C75.6183 80.2294 84.3831 80.2451 84.3831 86.0305C84.3831 86.6926 83.8471 87.2285 83.185 87.2285Z"
fill="#4F46E5" />
fill="#4F46E5"
/>
<path
d="M93.3528 77.0926H88.403C87.7409 77.0926 87.2049 76.5567 87.2049 75.8946C87.2049 75.2483 87.7409 74.7123 88.403 74.7123H93.3528C94.0149 74.7123 94.5509 75.2483 94.5509 75.8946C94.5509 76.5567 94.0149 77.0926 93.3528 77.0926Z"
fill="#4F46E5" />
fill="#4F46E5"
/>
<path
d="M71.5987 77.0925H66.6488C65.9867 77.0925 65.4507 76.5565 65.4507 75.8945C65.4507 75.2481 65.9867 74.7122 66.6488 74.7122H71.5987C72.245 74.7122 72.781 75.2481 72.781 75.8945C72.781 76.5565 72.245 77.0925 71.5987 77.0925Z"
fill="#4F46E5" />
fill="#4F46E5"
/>
<rect x="38.3522" y="21.5128" width="41.0256" height="2.73504" rx="1.36752" fill="#4F46E5" />
<rect x="38.3522" y="133.65" width="54.7009" height="5.47009" rx="2.73504" fill="#A5B4FC" />
<rect x="38.3522" y="29.7179" width="13.6752" height="2.73504" rx="1.36752" fill="#4F46E5" />
@ -133,27 +81,16 @@
<circle cx="67.0702" cy="31.0854" r="1.36752" fill="#4F46E5" />
</svg>
<div>
<h2 class="text-center text-black text-xl font-semibold leading-loose pb-2">There're no professionals here
</h2>
<p class="text-center text-black text-base font-normal leading-relaxed pb-4">Try changing your filters to
<br />see professionals
</p>
<h2 class="text-center text-black text-xl font-semibold leading-loose pb-2">There’re no professionals here</h2>
<p class="text-center text-black text-base font-normal leading-relaxed pb-4">Try changing your filters to <br />see professionals</p>
<div class="flex gap-3">
<button (click)="clearAllFilters()"
class="w-full px-3 py-2 rounded-full border border-neutral-300 text-neutral-900 text-xs font-semibold leading-4">Clear
Filter</button>
<button (click)="clearAllFilters()" class="w-full px-3 py-2 rounded-full border border-gray-300 text-gray-900 text-xs font-semibold leading-4">Clear Filter</button>
</div>
</div>
</div>
</div>
}
<!-- Pagination -->
@if(pageCount>1){
<div class="mt-8">
<app-paginator [page]="page" [pageCount]="pageCount" (pageChange)="onPageChange($event)"></app-paginator>
</div>
}
</div>
</div>
</div>
@if(pageCount>1){
<app-paginator [page]="page" [pageCount]="pageCount" (pageChange)="onPageChange($event)"></app-paginator>
}

152
bizmatch/src/app/pages/listings/broker-listings/broker-listings.component.ts
View File

@ -1,41 +1,30 @@
import { CommonModule, NgOptimizedImage } from '@angular/common';
import { ChangeDetectorRef, Component, OnDestroy, OnInit } from '@angular/core';
import { ChangeDetectorRef, Component } from '@angular/core';
import { FormsModule } from '@angular/forms';
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
import { UntilDestroy } from '@ngneat/until-destroy';
import { Subject, takeUntil } from 'rxjs';
import { BusinessListing, SortByOptions, User } from '../../../../../../bizmatch-server/src/models/db.model';
import { LISTINGS_PER_PAGE, ListingType, UserListingCriteria, emailToDirName, KeycloakUser } from '../../../../../../bizmatch-server/src/models/main.model';
import { LISTINGS_PER_PAGE, ListingType, UserListingCriteria, emailToDirName } from '../../../../../../bizmatch-server/src/models/main.model';
import { environment } from '../../../../environments/environment';
import { BreadcrumbItem, BreadcrumbsComponent } from '../../../components/breadcrumbs/breadcrumbs.component';
import { CustomerSubTypeComponent } from '../../../components/customer-sub-type/customer-sub-type.component';
import { PaginatorComponent } from '../../../components/paginator/paginator.component';
import { SearchModalBrokerComponent } from '../../../components/search-modal/search-modal-broker.component';
import { ModalService } from '../../../components/search-modal/modal.service';
import { AltTextService } from '../../../services/alt-text.service';
import { CriteriaChangeService } from '../../../services/criteria-change.service';
import { FilterStateService } from '../../../services/filter-state.service';
import { ImageService } from '../../../services/image.service';
import { ListingsService } from '../../../services/listings.service';
import { SearchService } from '../../../services/search.service';
import { SelectOptionsService } from '../../../services/select-options.service';
import { UserService } from '../../../services/user.service';
import { AuthService } from '../../../services/auth.service';
import { assignProperties, resetUserListingCriteria, map2User } from '../../../utils/utils';
import { assignProperties, getCriteriaProxy, resetUserListingCriteria } from '../../../utils/utils';
@UntilDestroy()
@Component({
selector: 'app-broker-listings',
standalone: true,
imports: [CommonModule, FormsModule, RouterModule, PaginatorComponent, CustomerSubTypeComponent, BreadcrumbsComponent, SearchModalBrokerComponent],
imports: [CommonModule, FormsModule, RouterModule, NgOptimizedImage, PaginatorComponent, CustomerSubTypeComponent],
templateUrl: './broker-listings.component.html',
styleUrls: ['./broker-listings.component.scss', '../../pages.scss'],
})
export class BrokerListingsComponent implements OnInit, OnDestroy {
private destroy$ = new Subject<void>();
breadcrumbs: BreadcrumbItem[] = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Professionals', url: '/brokerListings' }
];
export class BrokerListingsComponent {
environment = environment;
listings: Array<BusinessListing>;
users: Array<User>;
@ -57,9 +46,7 @@ export class BrokerListingsComponent implements OnInit, OnDestroy {
page = 1;
pageCount = 1;
sortBy: SortByOptions = null; // Neu: Separate Property
currentUser: KeycloakUser | null = null; // Current logged-in user
constructor(
public altText: AltTextService,
public selectOptions: SelectOptionsService,
private listingsService: ListingsService,
private userService: UserService,
@ -71,43 +58,23 @@ export class BrokerListingsComponent implements OnInit, OnDestroy {
private searchService: SearchService,
private modalService: ModalService,
private criteriaChangeService: CriteriaChangeService,
private filterStateService: FilterStateService,
private authService: AuthService,
) {
this.criteria = getCriteriaProxy('brokerListings', this) as UserListingCriteria;
this.init();
this.loadSortBy();
// this.searchService.currentCriteria.pipe(untilDestroyed(this)).subscribe(({ criteria }) => {
// if (criteria.criteriaType === 'brokerListings') {
// this.search();
// }
// });
}
private loadSortBy() {
const storedSortBy = sessionStorage.getItem('professionalsSortBy');
this.sortBy = storedSortBy && storedSortBy !== 'null' ? (storedSortBy as SortByOptions) : null;
}
async ngOnInit(): Promise<void> {
// Get current logged-in user
const token = await this.authService.getToken();
this.currentUser = map2User(token);
// Subscribe to FilterStateService for criteria changes
this.filterStateService
.getState$('brokerListings')
.pipe(takeUntil(this.destroy$))
.subscribe(state => {
this.criteria = state.criteria as UserListingCriteria;
this.sortBy = state.sortBy;
async ngOnInit() {}
async init() {
this.search();
});
// Subscribe to SearchService for search triggers
this.searchService.searchTrigger$
.pipe(takeUntil(this.destroy$))
.subscribe(type => {
if (type === 'brokerListings') {
this.search();
}
});
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
}
async search() {
const usersReponse = await this.userService.search(this.criteria);
@ -125,7 +92,7 @@ export class BrokerListingsComponent implements OnInit, OnDestroy {
this.search();
}
reset() { }
reset() {}
// New methods for filter actions
clearAllFilters() {
@ -151,93 +118,4 @@ export class BrokerListingsComponent implements OnInit, OnDestroy {
this.criteria = assignProperties(this.criteria, modalResult.criteria);
}
}
/**
* Check if professional/user is already in current user's favorites
*/
isFavorite(professional: User): boolean {
if (!this.currentUser?.email || !professional.favoritesForUser) return false;
return professional.favoritesForUser.includes(this.currentUser.email);
}
/**
* Toggle favorite status for a professional
*/
async toggleFavorite(event: Event, professional: User): Promise<void> {
event.stopPropagation();
event.preventDefault();
if (!this.currentUser?.email) {
// User not logged in - redirect to login
this.router.navigate(['/login']);
return;
}
try {
console.log('Toggling favorite for:', professional.email, 'Current user:', this.currentUser.email);
console.log('Before update, favorites:', professional.favoritesForUser);
if (this.isFavorite(professional)) {
// Remove from favorites
await this.listingsService.removeFavorite(professional.id, 'user');
professional.favoritesForUser = professional.favoritesForUser.filter(
email => email !== this.currentUser!.email
);
} else {
// Add to favorites
await this.listingsService.addToFavorites(professional.id, 'user');
if (!professional.favoritesForUser) {
professional.favoritesForUser = [];
}
// Use spread to create new array reference
professional.favoritesForUser = [...professional.favoritesForUser, this.currentUser.email];
}
console.log('After update, favorites:', professional.favoritesForUser);
this.cdRef.markForCheck();
this.cdRef.detectChanges();
} catch (error) {
console.error('Error toggling favorite:', error);
}
}
/**
* Share professional profile
*/
async shareProfessional(event: Event, user: User): Promise<void> {
event.stopPropagation();
event.preventDefault();
const url = `${window.location.origin}/details-user/${user.id}`;
const title = `${user.firstname} ${user.lastname} - ${user.companyName}`;
// Try native share API first (works on mobile and some desktop browsers)
if (navigator.share) {
try {
await navigator.share({
title: title,
text: `Check out this professional: ${title}`,
url: url,
});
} catch (err) {
// User cancelled or share failed - fall back to clipboard
this.copyToClipboard(url);
}
} else {
// Fallback: open Facebook share dialog
const encodedUrl = encodeURIComponent(url);
window.open(`https://www.facebook.com/sharer/sharer.php?u=${encodedUrl}`, '_blank', 'width=600,height=400');
}
}
/**
* Copy URL to clipboard and show feedback
*/
private copyToClipboard(url: string): void {
navigator.clipboard.writeText(url).then(() => {
console.log('Link copied to clipboard!');
}).catch(err => {
console.error('Failed to copy link:', err);
});
}
}

226
bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
View File

@ -7,173 +7,106 @@
<!-- Main Content -->
<div class="w-full p-4">
<div class="container mx-auto">
<!-- Breadcrumbs -->
<div class="mb-4">
<app-breadcrumbs [breadcrumbs]="breadcrumbs"></app-breadcrumbs>
</div>
<!-- SEO-optimized heading -->
<div class="mb-6">
<h1 class="text-3xl md:text-4xl font-bold text-neutral-900 mb-2">Businesses for Sale</h1>
<p class="text-lg text-neutral-600">Discover profitable business opportunities across the United States. Browse
verified listings from business owners and brokers.</p>
</div>
<!-- Loading Skeleton -->
@if(isLoading) {
<h2 class="text-2xl font-semibold text-neutral-800 mb-4">Loading Business Listings...</h2>
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
@for (item of [1,2,3,4,5,6]; track item) {
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg overflow-hidden">
<div class="p-6 animate-pulse">
<!-- Category icon and text -->
<div class="flex items-center mb-4">
<div class="w-5 h-5 bg-neutral-200 rounded mr-2"></div>
<div class="h-5 bg-neutral-200 rounded w-32"></div>
</div>
<!-- Title -->
<div class="h-7 bg-neutral-200 rounded w-3/4 mb-4"></div>
<!-- Badges -->
<div class="flex justify-between mb-4">
<div class="h-6 bg-neutral-200 rounded-full w-20"></div>
<div class="h-6 bg-neutral-200 rounded-full w-16"></div>
</div>
<!-- Details -->
<div class="space-y-2 mb-4">
<div class="h-4 bg-neutral-200 rounded w-full"></div>
<div class="h-4 bg-neutral-200 rounded w-5/6"></div>
<div class="h-4 bg-neutral-200 rounded w-4/6"></div>
<div class="h-4 bg-neutral-200 rounded w-3/4"></div>
<div class="h-4 bg-neutral-200 rounded w-2/3"></div>
</div>
<!-- Button -->
<div class="h-12 bg-neutral-200 rounded-full w-full mt-4"></div>
</div>
</div>
}
</div>
} @else if(listings?.length > 0) {
<h2 class="text-2xl font-semibold text-neutral-800 mb-4">Available Business Listings</h2>
@if(listings?.length > 0) {
<div class="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-6">
@for (listing of listings; track listing.id) {
<div
class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg overflow-hidden hover:shadow-2xl transition-all duration-300 hover:scale-[1.02] group">
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg overflow-hidden hover:shadow-xl">
<div class="p-6 flex flex-col h-full relative z-[0]">
<!-- Quick Actions Overlay -->
<div
class="absolute top-4 right-4 flex gap-2 opacity-0 group-hover:opacity-100 transition-opacity duration-200 z-20">
@if(user) {
<button class="bg-white rounded-full p-2 shadow-lg transition-colors"
[class.bg-red-50]="isFavorite(listing)"
[title]="isFavorite(listing) ? 'Remove from favorites' : 'Save to favorites'"
(click)="toggleFavorite($event, listing)">
<i
[class]="isFavorite(listing) ? 'fas fa-heart text-red-500' : 'far fa-heart text-red-500 hover:scale-110 transition-transform'"></i>
</button>
}
<button type="button" class="bg-white rounded-full p-2 shadow-lg hover:bg-blue-50 transition-colors"
title="Share listing" (click)="shareListing($event, listing)">
<i class="fas fa-share-alt text-blue-500 hover:scale-110 transition-transform"></i>
</button>
</div>
<div class="flex items-center mb-4">
<i [class]="selectOptions.getIconAndTextColorType(listing.type)" class="mr-2 text-xl"></i>
<span [class]="selectOptions.getTextColorType(listing.type)" class="font-bold text-lg">{{
selectOptions.getBusiness(listing.type) }}</span>
<span [class]="selectOptions.getTextColorType(listing.type)" class="font-bold text-lg">{{ selectOptions.getBusiness(listing.type) }}</span>
</div>
<h2 class="text-xl font-semibold mb-4">
{{ listing.title }}
@if(listing.draft) {
<span
class="bg-amber-100 text-amber-800 border border-amber-300 text-sm font-medium me-2 ml-2 px-2.5 py-0.5 rounded">Draft</span>
<span class="bg-red-100 text-red-800 text-sm font-medium me-2 ml-2 px-2.5 py-0.5 rounded dark:bg-red-900 dark:text-red-300">Draft</span>
}
</h2>
<div class="flex justify-between">
<span
class="w-fit inline-flex items-center justify-center px-2 py-1 mb-4 text-xs font-bold leading-none bg-neutral-200 text-neutral-700 rounded-full">
<span class="w-fit inline-flex items-center justify-center px-2 py-1 mb-4 text-xs font-bold leading-none bg-gray-200 text-gray-700 rounded-full">
{{ selectOptions.getState(listing.location.state) }}
</span>
@if (getListingBadge(listing); as badge) {
<span
class="mb-4 h-fit inline-flex items-center justify-center px-2 py-1 text-xs font-bold leading-none rounded-full border"
class="mb-4 h-fit inline-flex items-center justify-center px-2 py-1 text-xs font-bold leading-none rounded-full"
[ngClass]="{
'bg-emerald-100 text-emerald-800 border-emerald-300': badge === 'NEW',
'bg-teal-100 text-teal-800 border-teal-300': badge === 'UPDATED'
}">
'bg-emerald-100 text-emerald-800': badge === 'NEW',
'bg-blue-100 text-blue-800': badge === 'UPDATED'
}"
>
{{ badge }}
</span>
}
</div>
<p class="text-base font-bold text-neutral-800 mb-2">
<p class="text-base font-bold text-gray-800 mb-2">
<strong>Asking price:</strong>
<span class="text-success-600">
<span class="text-green-600">
{{ listing?.price != null ? (listing.price | currency : 'USD' : 'symbol' : '1.0-0') : 'undisclosed' }}
</span>
</p>
<p class="text-sm text-neutral-600 mb-2">
<p class="text-sm text-gray-600 mb-2">
<strong>Sales revenue:</strong>
{{ listing?.salesRevenue != null ? (listing.salesRevenue | currency : 'USD' : 'symbol' : '1.0-0') :
'undisclosed' }}
{{ listing?.salesRevenue != null ? (listing.salesRevenue | currency : 'USD' : 'symbol' : '1.0-0') : 'undisclosed' }}
</p>
<p class="text-sm text-neutral-600 mb-2">
<p class="text-sm text-gray-600 mb-2">
<strong>Net profit:</strong>
{{ listing?.cashFlow != null ? (listing.cashFlow | currency : 'USD' : 'symbol' : '1.0-0') : 'undisclosed'
}}
{{ listing?.cashFlow != null ? (listing.cashFlow | currency : 'USD' : 'symbol' : '1.0-0') : 'undisclosed' }}
</p>
<p class="text-sm text-neutral-600 mb-2">
<strong>Location:</strong> {{ listing.location.name ? listing.location.name : listing.location.county ?
listing.location.county : this.selectOptions.getState(listing.location.state) }}
<p class="text-sm text-gray-600 mb-2">
<strong>Location:</strong> {{ listing.location.name ? listing.location.name : listing.location.county ? listing.location.county : this.selectOptions.getState(listing.location.state) }}
</p>
<p class="text-sm text-neutral-600 mb-4"><strong>Years established:</strong> {{ listing.established }}</p>
@if(listing.imageName) {
<img [appLazyLoad]="env.imageBaseUrl + '/pictures/logo/' + listing.imageName + '.avif?_ts=' + ts"
[alt]="altText.generateListingCardLogoAlt(listing)"
class="absolute bottom-[80px] right-[20px] h-[45px] w-auto" width="100" height="45" />
}
<p class="text-sm text-gray-600 mb-4"><strong>Years established:</strong> {{ listing.established }}</p>
<img src="{{ env.imageBaseUrl }}/pictures/logo/{{ listing.imageName }}.avif?_ts={{ ts }}" alt="Company logo" class="absolute bottom-[80px] right-[20px] h-[45px] w-auto" />
<div class="flex-grow"></div>
<button
class="bg-success-600 text-white px-5 py-3 rounded-full w-full flex items-center justify-center mt-4 transition-all duration-200 hover:bg-success-700 hover:shadow-lg group/btn"
[routerLink]="['/business', listing.slug || listing.id]">
<span class="font-semibold">View Opportunity</span>
<i class="fas fa-arrow-right ml-2 group-hover/btn:translate-x-1 transition-transform duration-200"></i>
class="bg-green-500 text-white px-5 py-3 rounded-full w-full flex items-center justify-center mt-4 transition-colors duration-200 hover:bg-green-600"
[routerLink]="['/details-business-listing', listing.id]"
>
View Full Listing
<i class="fas fa-arrow-right ml-2"></i>
</button>
</div>
</div>
}
</div>
} @else if (listings?.length === 0) {
<div class="w-full flex items-center flex-wrap justify-center gap-10 py-12">
<div class="grid gap-6 max-w-2xl w-full">
<svg class="mx-auto" xmlns="http://www.w3.org/2000/svg" width="154" height="161" viewBox="0 0 154 161"
fill="none">
<div class="w-full flex items-center flex-wrap justify-center gap-10">
<div class="grid gap-4 w-60">
<svg class="mx-auto" xmlns="http://www.w3.org/2000/svg" width="154" height="161" viewBox="0 0 154 161" fill="none">
<path
d="M0.0616455 84.4268C0.0616455 42.0213 34.435 7.83765 76.6507 7.83765C118.803 7.83765 153.224 42.0055 153.224 84.4268C153.224 102.42 147.026 118.974 136.622 132.034C122.282 150.138 100.367 161 76.6507 161C52.7759 161 30.9882 150.059 16.6633 132.034C6.25961 118.974 0.0616455 102.42 0.0616455 84.4268Z"
fill="#EEF2FF" />
fill="#EEF2FF"
/>
<path
d="M96.8189 0.632498L96.8189 0.632384L96.8083 0.630954C96.2034 0.549581 95.5931 0.5 94.9787 0.5H29.338C22.7112 0.5 17.3394 5.84455 17.3394 12.4473V142.715C17.3394 149.318 22.7112 154.662 29.338 154.662H123.948C130.591 154.662 135.946 149.317 135.946 142.715V38.9309C135.946 38.0244 135.847 37.1334 135.648 36.2586L135.648 36.2584C135.117 33.9309 133.874 31.7686 132.066 30.1333C132.066 30.1331 132.065 30.1329 132.065 30.1327L103.068 3.65203C103.068 3.6519 103.067 3.65177 103.067 3.65164C101.311 2.03526 99.1396 0.995552 96.8189 0.632498Z"
fill="white" stroke="#E5E7EB" />
fill="white"
stroke="#E5E7EB"
/>
<ellipse cx="80.0618" cy="81" rx="28.0342" ry="28.0342" fill="#EEF2FF" />
<path
d="M99.2393 61.3061L99.2391 61.3058C88.498 50.5808 71.1092 50.5804 60.3835 61.3061C49.6423 72.0316 49.6422 89.4361 60.3832 100.162C71.109 110.903 88.4982 110.903 99.2393 100.162C109.965 89.4363 109.965 72.0317 99.2393 61.3061ZM105.863 54.6832C120.249 69.0695 120.249 92.3985 105.863 106.785C91.4605 121.171 68.1468 121.171 53.7446 106.785C39.3582 92.3987 39.3582 69.0693 53.7446 54.683C68.1468 40.2965 91.4605 40.2966 105.863 54.6832Z"
stroke="#E5E7EB" />
<path
d="M110.782 119.267L102.016 110.492C104.888 108.267 107.476 105.651 109.564 102.955L118.329 111.729L110.782 119.267Z"
stroke="#E5E7EB" />
stroke="#E5E7EB"
/>
<path d="M110.782 119.267L102.016 110.492C104.888 108.267 107.476 105.651 109.564 102.955L118.329 111.729L110.782 119.267Z" stroke="#E5E7EB" />
<path
d="M139.122 125.781L139.122 125.78L123.313 109.988C123.313 109.987 123.313 109.987 123.312 109.986C121.996 108.653 119.849 108.657 118.521 109.985L118.871 110.335L118.521 109.985L109.047 119.459C107.731 120.775 107.735 122.918 109.044 124.247L109.047 124.249L124.858 140.06C128.789 143.992 135.191 143.992 139.122 140.06C143.069 136.113 143.069 129.728 139.122 125.781Z"
fill="#A5B4FC" stroke="#818CF8" />
fill="#A5B4FC"
stroke="#818CF8"
/>
<path
d="M83.185 87.2285C82.5387 87.2285 82.0027 86.6926 82.0027 86.0305C82.0027 86.0305 82.0027 83.3821 77.9987 83.3821C77.9987 83.3821 77.9987 86.0305 77.9987 86.0305C77.9987 86.6926 77.4627 87.2285 76.8006 87.2285C76.1543 87.2285 75.6183 86.6926 75.6183 86.0305C75.6183 80.2294 84.3831 80.2451 84.3831 86.0305C84.3831 86.6926 83.8471 87.2285 83.185 87.2285Z"
fill="#4F46E5" />
fill="#4F46E5"
/>
<path
d="M93.3528 77.0926H88.403C87.7409 77.0926 87.2049 76.5567 87.2049 75.8946C87.2049 75.2483 87.7409 74.7123 88.403 74.7123H93.3528C94.0149 74.7123 94.5509 75.2483 94.5509 75.8946C94.5509 76.5567 94.0149 77.0926 93.3528 77.0926Z"
fill="#4F46E5" />
fill="#4F46E5"
/>
<path
d="M71.5987 77.0925H66.6488C65.9867 77.0925 65.4507 76.5565 65.4507 75.8945C65.4507 75.2481 65.9867 74.7122 66.6488 74.7122H71.5987C72.245 74.7122 72.781 75.2481 72.781 75.8945C72.781 76.5565 72.245 77.0925 71.5987 77.0925Z"
fill="#4F46E5" />
fill="#4F46E5"
/>
<rect x="38.3522" y="21.5128" width="41.0256" height="2.73504" rx="1.36752" fill="#4F46E5" />
<rect x="38.3522" y="133.65" width="54.7009" height="5.47009" rx="2.73504" fill="#A5B4FC" />
<rect x="38.3522" y="29.7179" width="13.6752" height="2.73504" rx="1.36752" fill="#4F46E5" />
@ -181,66 +114,11 @@
<circle cx="61.6001" cy="31.0854" r="1.36752" fill="#4F46E5" />
<circle cx="67.0702" cy="31.0854" r="1.36752" fill="#4F46E5" />
</svg>
<div class="text-center">
<h2 class="text-black text-2xl font-semibold leading-loose pb-2">No listings found</h2>
<p class="text-neutral-600 text-base font-normal leading-relaxed pb-6">We couldn't find any businesses
matching your criteria.<br />Try adjusting your filters or explore popular categories below.</p>
<!-- Action Buttons -->
<div class="flex flex-col sm:flex-row gap-3 justify-center mb-8">
<button (click)="clearAllFilters()"
class="px-6 py-3 rounded-full bg-primary-600 text-white text-sm font-semibold hover:bg-primary-700 transition-colors">
<i class="fas fa-redo mr-2"></i>Clear All Filters
</button>
<button [routerLink]="['/home']"
class="px-6 py-3 rounded-full border-2 border-neutral-300 text-neutral-700 text-sm font-semibold hover:border-primary-600 hover:text-primary-600 transition-colors">
<i class="fas fa-home mr-2"></i>Back to Home
</button>
</div>
<!-- Popular Categories Suggestions -->
<div class="mt-8 p-6 bg-neutral-50 rounded-lg">
<h3 class="text-lg font-semibold text-neutral-800 mb-4">
<i class="fas fa-fire text-orange-500 mr-2"></i>Popular Categories
</h3>
<div class="grid grid-cols-2 md:grid-cols-3 gap-3">
<button (click)="filterByCategory('foodAndRestaurant')"
class="px-4 py-2 bg-white rounded-lg border border-neutral-200 hover:border-primary-500 hover:bg-primary-50 text-sm text-neutral-700 hover:text-primary-600 transition-all">
<i class="fas fa-utensils mr-2"></i>Restaurants
</button>
<button (click)="filterByCategory('retail')"
class="px-4 py-2 bg-white rounded-lg border border-neutral-200 hover:border-primary-500 hover:bg-primary-50 text-sm text-neutral-700 hover:text-primary-600 transition-all">
<i class="fas fa-store mr-2"></i>Retail
</button>
<button (click)="filterByCategory('realEstate')"
class="px-4 py-2 bg-white rounded-lg border border-neutral-200 hover:border-primary-500 hover:bg-primary-50 text-sm text-neutral-700 hover:text-primary-600 transition-all">
<i class="fas fa-building mr-2"></i>Real Estate
</button>
<button (click)="filterByCategory('service')"
class="px-4 py-2 bg-white rounded-lg border border-neutral-200 hover:border-primary-500 hover:bg-primary-50 text-sm text-neutral-700 hover:text-primary-600 transition-all">
<i class="fas fa-cut mr-2"></i>Services
</button>
<button (click)="filterByCategory('franchise')"
class="px-4 py-2 bg-white rounded-lg border border-neutral-200 hover:border-primary-500 hover:bg-primary-50 text-sm text-neutral-700 hover:text-primary-600 transition-all">
<i class="fas fa-handshake mr-2"></i>Franchise
</button>
<button (click)="filterByCategory('professional')"
class="px-4 py-2 bg-white rounded-lg border border-neutral-200 hover:border-primary-500 hover:bg-primary-50 text-sm text-neutral-700 hover:text-primary-600 transition-all">
<i class="fas fa-briefcase mr-2"></i>Professional
</button>
</div>
</div>
<!-- Helpful Tips -->
<div class="mt-6 p-4 bg-primary-50 border border-primary-100 rounded-lg text-left">
<h4 class="font-semibold text-primary-900 mb-2 flex items-center">
<i class="fas fa-lightbulb mr-2"></i>Search Tips
</h4>
<ul class="text-sm text-primary-800 space-y-1">
<li>• Try expanding your search radius</li>
<li>• Consider adjusting your price range</li>
<li>• Browse all categories to discover opportunities</li>
</ul>
<div>
<h2 class="text-center text-black text-xl font-semibold leading-loose pb-2">There’s no listing here</h2>
<p class="text-center text-black text-base font-normal leading-relaxed pb-4">Try changing your filters to <br />see listings</p>
<div class="flex gap-3">
<button (click)="clearAllFilters()" class="w-full px-3 py-2 rounded-full border border-gray-300 text-gray-900 text-xs font-semibold leading-4">Clear Filter</button>
</div>
</div>
</div>
@ -253,7 +131,5 @@
</div>
<!-- Filter Button for Mobile -->
<button (click)="openFilterModal()"
class="md:hidden fixed bottom-4 right-4 bg-primary-500 text-white p-3 rounded-full shadow-lg z-20"><i
class="fas fa-filter"></i> Filter</button>
<button (click)="openFilterModal()" class="md:hidden fixed bottom-4 right-4 bg-blue-500 text-white p-3 rounded-full shadow-lg z-20"><i class="fas fa-filter"></i> Filter</button>
</div>

167
bizmatch/src/app/pages/listings/business-listings/business-listings.component.ts
View File

@ -7,28 +7,22 @@ import { Subject, takeUntil } from 'rxjs';
import dayjs from 'dayjs';
import { BusinessListing, SortByOptions } from '../../../../../../bizmatch-server/src/models/db.model';
import { BusinessListingCriteria, KeycloakUser, LISTINGS_PER_PAGE, ListingType, emailToDirName } from '../../../../../../bizmatch-server/src/models/main.model';
import { BusinessListingCriteria, LISTINGS_PER_PAGE, ListingType, emailToDirName } from '../../../../../../bizmatch-server/src/models/main.model';
import { environment } from '../../../../environments/environment';
import { BreadcrumbItem, BreadcrumbsComponent } from '../../../components/breadcrumbs/breadcrumbs.component';
import { PaginatorComponent } from '../../../components/paginator/paginator.component';
import { ModalService } from '../../../components/search-modal/modal.service';
import { SearchModalComponent } from '../../../components/search-modal/search-modal.component';
import { LazyLoadImageDirective } from '../../../directives/lazy-load-image.directive';
import { AltTextService } from '../../../services/alt-text.service';
import { AuthService } from '../../../services/auth.service';
import { FilterStateService } from '../../../services/filter-state.service';
import { ImageService } from '../../../services/image.service';
import { ListingsService } from '../../../services/listings.service';
import { SearchService } from '../../../services/search.service';
import { SelectOptionsService } from '../../../services/select-options.service';
import { SeoService } from '../../../services/seo.service';
import { map2User } from '../../../utils/utils';
@UntilDestroy()
@Component({
selector: 'app-business-listings',
standalone: true,
imports: [CommonModule, FormsModule, RouterModule, PaginatorComponent, SearchModalComponent, LazyLoadImageDirective, BreadcrumbsComponent],
imports: [CommonModule, FormsModule, RouterModule, PaginatorComponent, SearchModalComponent],
templateUrl: './business-listings.component.html',
styleUrls: ['./business-listings.component.scss', '../../pages.scss'],
})
@ -53,19 +47,8 @@ export class BusinessListingsComponent implements OnInit, OnDestroy {
// UI state
ts = new Date().getTime();
emailToDirName = emailToDirName;
isLoading = false;
// Breadcrumbs
breadcrumbs: BreadcrumbItem[] = [
{ label: 'Home', url: '/', icon: 'fas fa-home' },
{ label: 'Business Listings' }
];
// User for favorites
user: KeycloakUser | null = null;
constructor(
public altText: AltTextService,
public selectOptions: SelectOptionsService,
private listingsService: ListingsService,
private router: Router,
@ -75,23 +58,9 @@ export class BusinessListingsComponent implements OnInit, OnDestroy {
private modalService: ModalService,
private filterStateService: FilterStateService,
private route: ActivatedRoute,
private seoService: SeoService,
private authService: AuthService,
) { }
async ngOnInit(): Promise<void> {
// Load user for favorites functionality
const token = await this.authService.getToken();
this.user = map2User(token);
// Set SEO meta tags for business listings page
this.seoService.updateMetaTags({
title: 'Businesses for Sale - Find Profitable Business Opportunities | BizMatch',
description: 'Browse thousands of businesses for sale across the United States. Find restaurants, franchises, retail stores, and more. Verified listings from business owners and brokers.',
keywords: 'businesses for sale, buy a business, business opportunities, franchise for sale, restaurant for sale, retail business for sale, business broker listings',
type: 'website'
});
) {}
ngOnInit(): void {
// Subscribe to state changes
this.filterStateService
.getState$('businessListings')
@ -113,9 +82,6 @@ export class BusinessListingsComponent implements OnInit, OnDestroy {
async search(): Promise<void> {
try {
// Show loading state
this.isLoading = true;
// Get current criteria from service
this.criteria = this.filterStateService.getCriteria('businessListings') as BusinessListingCriteria;
@ -132,12 +98,6 @@ export class BusinessListingsComponent implements OnInit, OnDestroy {
this.pageCount = Math.ceil(this.totalRecords / LISTINGS_PER_PAGE);
this.page = this.criteria.page || 1;
// Hide loading state
this.isLoading = false;
// Update pagination SEO links
this.updatePaginationSEO();
// Update view
this.cdRef.markForCheck();
this.cdRef.detectChanges();
@ -146,7 +106,6 @@ export class BusinessListingsComponent implements OnInit, OnDestroy {
// Handle error appropriately
this.listings = [];
this.totalRecords = 0;
this.isLoading = false;
this.cdRef.markForCheck();
}
}
@ -205,126 +164,8 @@ export class BusinessListingsComponent implements OnInit, OnDestroy {
getDaysListed(listing: BusinessListing) {
return dayjs().diff(listing.created, 'day');
}
/**
* Filter by popular category
*/
filterByCategory(category: string): void {
this.filterStateService.updateCriteria('businessListings', {
types: [category],
page: 1,
start: 0,
length: LISTINGS_PER_PAGE,
});
// Search will be triggered automatically through state subscription
}
/**
* Check if listing is already in user's favorites
*/
isFavorite(listing: BusinessListing): boolean {
if (!this.user?.email || !listing.favoritesForUser) return false;
return listing.favoritesForUser.includes(this.user.email);
}
/**
* Toggle favorite status for a listing
*/
async toggleFavorite(event: Event, listing: BusinessListing): Promise<void> {
event.stopPropagation();
event.preventDefault();
if (!this.user?.email) {
// User not logged in - redirect to login or show message
this.router.navigate(['/login']);
return;
}
try {
if (this.isFavorite(listing)) {
// Remove from favorites
await this.listingsService.removeFavorite(listing.id, 'business');
listing.favoritesForUser = listing.favoritesForUser.filter(email => email !== this.user!.email);
} else {
// Add to favorites
await this.listingsService.addToFavorites(listing.id, 'business');
if (!listing.favoritesForUser) {
listing.favoritesForUser = [];
}
listing.favoritesForUser.push(this.user.email);
}
this.cdRef.detectChanges();
} catch (error) {
console.error('Error toggling favorite:', error);
}
}
/**
* Share a listing - opens native share dialog or copies to clipboard
*/
async shareListing(event: Event, listing: BusinessListing): Promise<void> {
event.stopPropagation();
event.preventDefault();
const url = `${window.location.origin}/business/${listing.slug || listing.id}`;
const title = listing.title || 'Business Listing';
// Try native share API first (works on mobile and some desktop browsers)
if (navigator.share) {
try {
await navigator.share({
title: title,
text: `Check out this business: ${title}`,
url: url,
});
} catch (err) {
// User cancelled or share failed - fall back to clipboard
this.copyToClipboard(url);
}
} else {
// Fallback: open Facebook share dialog
const encodedUrl = encodeURIComponent(url);
window.open(`https://www.facebook.com/sharer/sharer.php?u=${encodedUrl}`, '_blank', 'width=600,height=400');
}
}
/**
* Copy URL to clipboard and show feedback
*/
private copyToClipboard(url: string): void {
navigator.clipboard.writeText(url).then(() => {
// Could add a toast notification here
console.log('Link copied to clipboard!');
}).catch(err => {
console.error('Failed to copy link:', err);
});
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
// Clean up pagination links when leaving the page
this.seoService.clearPaginationLinks();
}
/**
* Update pagination SEO links (rel="next/prev") and CollectionPage schema
*/
private updatePaginationSEO(): void {
const baseUrl = `${this.seoService.getBaseUrl()}/businessListings`;
// Inject rel="next" and rel="prev" links
this.seoService.injectPaginationLinks(baseUrl, this.page, this.pageCount);
// Inject CollectionPage schema for paginated results
const collectionSchema = this.seoService.generateCollectionPageSchema({
name: 'Businesses for Sale',
description: 'Browse thousands of businesses for sale across the United States. Find restaurants, franchises, retail stores, and more.',
totalItems: this.totalRecords,
itemsPerPage: LISTINGS_PER_PAGE,
currentPage: this.page,
baseUrl: baseUrl
});
this.seoService.injectStructuredData(collectionSchema);
}
}

55
bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
View File

@ -7,59 +7,22 @@
<!-- Main Content -->
<div class="w-full p-4">
<div class="container mx-auto">
<!-- Breadcrumbs -->
<div class="mb-4">
<app-breadcrumbs [breadcrumbs]="breadcrumbs"></app-breadcrumbs>
</div>
<!-- SEO-optimized heading -->
<div class="mb-6">
<h1 class="text-3xl md:text-4xl font-bold text-neutral-900 mb-2">Commercial Properties for Sale</h1>
<p class="text-lg text-neutral-600">Find office buildings, retail spaces, warehouses, and industrial properties across the United States. Investment opportunities from verified sellers and commercial real estate brokers.</p>
</div>
@if(listings?.length > 0) {
<h2 class="text-2xl font-semibold text-neutral-800 mb-4">Available Commercial Property Listings</h2>
<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
@for (listing of listings; track listing.id) {
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg overflow-hidden flex flex-col h-full group relative">
<!-- Quick Actions Overlay -->
<div class="absolute top-4 right-4 z-10 flex gap-2 opacity-0 group-hover:opacity-100 transition-opacity duration-200">
@if(user) {
<button
class="bg-white rounded-full p-2 shadow-lg transition-colors"
[class.bg-red-50]="isFavorite(listing)"
[class.opacity-100]="isFavorite(listing)"
[title]="isFavorite(listing) ? 'Remove from favorites' : 'Save to favorites'"
(click)="toggleFavorite($event, listing)">
<i [class]="isFavorite(listing) ? 'fas fa-heart text-red-500' : 'far fa-heart text-red-500 hover:scale-110 transition-transform'"></i>
</button>
}
<button type="button" class="bg-white rounded-full p-2 shadow-lg hover:bg-blue-50 transition-colors"
title="Share property" (click)="shareProperty($event, listing)">
<i class="fas fa-share-alt text-blue-500 hover:scale-110 transition-transform"></i>
</button>
</div>
<div class="bg-white rounded-lg drop-shadow-custom-bg-mobile md:drop-shadow-custom-bg overflow-hidden flex flex-col h-full">
@if (listing.imageOrder?.length>0){
<img [appLazyLoad]="env.imageBaseUrl + '/pictures/property/' + listing.imagePath + '/' + listing.serialId + '/' + listing.imageOrder[0]"
[alt]="altText.generatePropertyListingAlt(listing)"
class="w-full h-48 object-cover"
width="400"
height="192" />
<img src="{{ env.imageBaseUrl }}/pictures/property/{{ listing.imagePath }}/{{ listing.serialId }}/{{ listing.imageOrder[0] }}" alt="Image" class="w-full h-48 object-cover" />
} @else {
<img [appLazyLoad]="'assets/images/placeholder_properties.jpg'"
[alt]="'Commercial property placeholder - ' + listing.title"
class="w-full h-48 object-cover"
width="400"
height="192" />
<img src="assets/images/placeholder_properties.jpg" alt="Image" class="w-full h-48 object-cover" />
}
<div class="p-4 flex flex-col flex-grow">
<span [class]="selectOptions.getTextColorTypeOfCommercial(listing.type)" class="text-sm font-semibold"
><i [class]="selectOptions.getIconAndTextColorTypeOfCommercials(listing.type)" class="mr-1"></i> {{ selectOptions.getCommercialProperty(listing.type) }}</span
>
<div class="flex items-center justify-between my-2">
<span class="bg-neutral-200 text-neutral-700 text-xs font-semibold px-2 py-1 rounded">{{ selectOptions.getState(listing.location.state) }}</span>
<p class="text-sm text-neutral-600 mb-4">
<span class="bg-gray-200 text-gray-700 text-xs font-semibold px-2 py-1 rounded">{{ selectOptions.getState(listing.location.state) }}</span>
<p class="text-sm text-gray-600 mb-4">
<strong>{{ getDaysListed(listing) }} days listed</strong>
</p>
</div>
@ -69,10 +32,10 @@
<span class="bg-red-100 text-red-800 text-sm font-medium me-2 ml-2 px-2.5 py-0.5 rounded dark:bg-red-900 dark:text-red-300">Draft</span>
}
</h3>
<p class="text-neutral-600 mb-2">{{ listing.location.name ? listing.location.name : listing.location.county }}</p>
<p class="text-gray-600 mb-2">{{ listing.location.name ? listing.location.name : listing.location.county }}</p>
<p class="text-xl font-bold mb-4">{{ listing.price | currency : 'USD' : 'symbol' : '1.0-0' }}</p>
<div class="flex-grow"></div>
<button [routerLink]="['/commercial-property', listing.slug || listing.id]" class="bg-success-500 text-white px-4 py-2 rounded-full w-full hover:bg-success-600 transition duration-300 mt-auto">
<button [routerLink]="['/details-commercial-property-listing', listing.id]" class="bg-green-500 text-white px-4 py-2 rounded-full w-full hover:bg-green-600 transition duration-300 mt-auto">
View Full Listing <i class="fas fa-arrow-right ml-1"></i>
</button>
</div>
@ -126,7 +89,7 @@
<h2 class="text-center text-black text-xl font-semibold leading-loose pb-2">There’s no listing here</h2>
<p class="text-center text-black text-base font-normal leading-relaxed pb-4">Try changing your filters to <br />see listings</p>
<div class="flex gap-3">
<button (click)="clearAllFilters()" class="w-full px-3 py-2 rounded-full border border-neutral-300 text-neutral-900 text-xs font-semibold leading-4">Clear Filter</button>
<button (click)="clearAllFilters()" class="w-full px-3 py-2 rounded-full border border-gray-300 text-gray-900 text-xs font-semibold leading-4">Clear Filter</button>
</div>
</div>
</div>
@ -139,5 +102,5 @@
</div>
<!-- Filter Button for Mobile -->
<button (click)="openFilterModal()" class="md:hidden fixed bottom-4 right-4 bg-primary-500 text-white p-3 rounded-full shadow-lg z-20"><i class="fas fa-filter"></i> Filter</button>
<button (click)="openFilterModal()" class="md:hidden fixed bottom-4 right-4 bg-blue-500 text-white p-3 rounded-full shadow-lg z-20"><i class="fas fa-filter"></i> Filter</button>
</div>

142
bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.ts
View File

@ -6,28 +6,22 @@ import { UntilDestroy } from '@ngneat/until-destroy';
import dayjs from 'dayjs';
import { Subject, takeUntil } from 'rxjs';
import { CommercialPropertyListing, SortByOptions } from '../../../../../../bizmatch-server/src/models/db.model';
import { CommercialPropertyListingCriteria, KeycloakUser, LISTINGS_PER_PAGE, ResponseCommercialPropertyListingArray } from '../../../../../../bizmatch-server/src/models/main.model';
import { CommercialPropertyListingCriteria, LISTINGS_PER_PAGE, ResponseCommercialPropertyListingArray } from '../../../../../../bizmatch-server/src/models/main.model';
import { environment } from '../../../../environments/environment';
import { BreadcrumbItem, BreadcrumbsComponent } from '../../../components/breadcrumbs/breadcrumbs.component';
import { PaginatorComponent } from '../../../components/paginator/paginator.component';
import { ModalService } from '../../../components/search-modal/modal.service';
import { SearchModalCommercialComponent } from '../../../components/search-modal/search-modal-commercial.component';
import { LazyLoadImageDirective } from '../../../directives/lazy-load-image.directive';
import { AltTextService } from '../../../services/alt-text.service';
import { FilterStateService } from '../../../services/filter-state.service';
import { ImageService } from '../../../services/image.service';
import { ListingsService } from '../../../services/listings.service';
import { SearchService } from '../../../services/search.service';
import { SelectOptionsService } from '../../../services/select-options.service';
import { SeoService } from '../../../services/seo.service';
import { AuthService } from '../../../services/auth.service';
import { map2User } from '../../../utils/utils';
@UntilDestroy()
@Component({
selector: 'app-commercial-property-listings',
standalone: true,
imports: [CommonModule, FormsModule, RouterModule, PaginatorComponent, SearchModalCommercialComponent, LazyLoadImageDirective, BreadcrumbsComponent],
imports: [CommonModule, FormsModule, RouterModule, PaginatorComponent, SearchModalCommercialComponent],
templateUrl: './commercial-property-listings.component.html',
styleUrls: ['./commercial-property-listings.component.scss', '../../pages.scss'],
})
@ -52,17 +46,7 @@ export class CommercialPropertyListingsComponent implements OnInit, OnDestroy {
// UI state
ts = new Date().getTime();
// Breadcrumbs
breadcrumbs: BreadcrumbItem[] = [
{ label: 'Home', url: '/home', icon: 'fas fa-home' },
{ label: 'Commercial Properties' }
];
// User for favorites
user: KeycloakUser | null = null;
constructor(
public altText: AltTextService,
public selectOptions: SelectOptionsService,
private listingsService: ListingsService,
private router: Router,
@ -72,23 +56,9 @@ export class CommercialPropertyListingsComponent implements OnInit, OnDestroy {
private modalService: ModalService,
private filterStateService: FilterStateService,
private route: ActivatedRoute,
private seoService: SeoService,
private authService: AuthService,
) {}
async ngOnInit(): Promise<void> {
// Load user for favorites functionality
const token = await this.authService.getToken();
this.user = map2User(token);
// Set SEO meta tags for commercial property listings page
this.seoService.updateMetaTags({
title: 'Commercial Properties for Sale - Office, Retail, Industrial Real Estate | BizMatch',
description: 'Browse commercial real estate listings including office buildings, retail spaces, warehouses, and industrial properties. Investment opportunities from verified sellers and brokers across the United States.',
keywords: 'commercial property for sale, commercial real estate, office building for sale, retail space for sale, warehouse for sale, industrial property, investment property, commercial property listings',
type: 'website'
});
ngOnInit(): void {
// Subscribe to state changes
this.filterStateService
.getState$('commercialPropertyListings')
@ -117,9 +87,6 @@ export class CommercialPropertyListingsComponent implements OnInit, OnDestroy {
this.pageCount = Math.ceil(this.totalRecords / LISTINGS_PER_PAGE);
this.page = this.criteria.page || 1;
// Update pagination SEO links
this.updatePaginationSEO();
// Update view
this.cdRef.markForCheck();
this.cdRef.detectChanges();
@ -191,111 +158,8 @@ export class CommercialPropertyListingsComponent implements OnInit, OnDestroy {
this.router.navigate(['/details-commercial-property-listing', listingId]);
}
/**
* Check if listing is already in user's favorites
*/
isFavorite(listing: CommercialPropertyListing): boolean {
if (!this.user?.email || !listing.favoritesForUser) return false;
return listing.favoritesForUser.includes(this.user.email);
}
/**
* Toggle favorite status for a listing
*/
async toggleFavorite(event: Event, listing: CommercialPropertyListing): Promise<void> {
event.stopPropagation();
event.preventDefault();
if (!this.user?.email) {
// User not logged in - redirect to login
this.router.navigate(['/login']);
return;
}
try {
if (this.isFavorite(listing)) {
// Remove from favorites
await this.listingsService.removeFavorite(listing.id, 'commercialProperty');
listing.favoritesForUser = listing.favoritesForUser.filter(email => email !== this.user!.email);
} else {
// Add to favorites
await this.listingsService.addToFavorites(listing.id, 'commercialProperty');
if (!listing.favoritesForUser) {
listing.favoritesForUser = [];
}
listing.favoritesForUser.push(this.user.email);
}
this.cdRef.detectChanges();
} catch (error) {
console.error('Error toggling favorite:', error);
}
}
ngOnDestroy(): void {
this.destroy$.next();
this.destroy$.complete();
// Clean up pagination links when leaving the page
this.seoService.clearPaginationLinks();
}
/**
* Update pagination SEO links (rel="next/prev") and CollectionPage schema
*/
private updatePaginationSEO(): void {
const baseUrl = `${this.seoService.getBaseUrl()}/commercialPropertyListings`;
// Inject rel="next" and rel="prev" links
this.seoService.injectPaginationLinks(baseUrl, this.page, this.pageCount);
// Inject CollectionPage schema for paginated results
const collectionSchema = this.seoService.generateCollectionPageSchema({
name: 'Commercial Properties for Sale',
description: 'Browse commercial real estate listings including office buildings, retail spaces, warehouses, and industrial properties across the United States.',
totalItems: this.totalRecords,
itemsPerPage: LISTINGS_PER_PAGE,
currentPage: this.page,
baseUrl: baseUrl
});
this.seoService.injectStructuredData(collectionSchema);
}
/**
* Share property listing
*/
async shareProperty(event: Event, listing: CommercialPropertyListing): Promise<void> {
event.stopPropagation();
event.preventDefault();
const url = `${window.location.origin}/commercial-property/${listing.slug || listing.id}`;
const title = listing.title || 'Commercial Property Listing';
// Try native share API first (works on mobile and some desktop browsers)
if (navigator.share) {
try {
await navigator.share({
title: title,
text: `Check out this property: ${title}`,
url: url,
});
} catch (err) {
// User cancelled or share failed - fall back to clipboard
this.copyToClipboard(url);
}
} else {
// Fallback: open Facebook share dialog
const encodedUrl = encodeURIComponent(url);
window.open(`https://www.facebook.com/sharer/sharer.php?u=${encodedUrl}`, '_blank', 'width=600,height=400');
}
}
/**
* Copy URL to clipboard and show feedback
*/
private copyToClipboard(url: string): void {
navigator.clipboard.writeText(url).then(() => {
console.log('Link copied to clipboard!');
}).catch(err => {
console.error('Failed to copy link:', err);
});
}
}

26
bizmatch/src/app/pages/login/login.component.ts
View File

@ -2,7 +2,9 @@ import { CommonModule } from '@angular/common';
import { Component } from '@angular/core';
import { ActivatedRoute, Router, RouterModule } from '@angular/router';
import { lastValueFrom } from 'rxjs';
import { AuthService } from '../../services/auth.service';
import { SubscriptionsService } from '../../services/subscriptions.service';
import { UserService } from '../../services/user.service';
import { map2User } from '../../utils/utils';
@ -19,6 +21,7 @@ export class LoginComponent {
private activatedRoute: ActivatedRoute,
private router: Router,
private subscriptionService: SubscriptionsService,
private authService: AuthService,
) {}
async ngOnInit() {
@ -26,17 +29,18 @@ export class LoginComponent {
const keycloakUser = map2User(token);
const email = keycloakUser.email;
const user = await this.userService.getByMail(email);
// if (!user.subscriptionPlan) {
// const subscriptions = await lastValueFrom(this.subscriptionService.getAllSubscriptions(user.email));
// const activeSubscription = subscriptions.filter(s => s.status === 'active');
// if (activeSubscription.length > 0) {
// user.subscriptionPlan = activeSubscription[0].metadata['plan'] === 'Broker Plan' ? 'broker' : 'professional';
// this.userService.saveGuaranteed(user);
// } else {
// this.router.navigate([`/home`]);
// return;
// }
// }
if (!user.subscriptionPlan) {
//this.router.navigate(['/pricing']);
const subscriptions = await lastValueFrom(this.subscriptionService.getAllSubscriptions(user.email));
const activeSubscription = subscriptions.filter(s => s.status === 'active');
if (activeSubscription.length > 0) {
user.subscriptionPlan = activeSubscription[0].metadata['plan'] === 'Broker Plan' ? 'broker' : 'professional';
this.userService.saveGuaranteed(user);
} else {
this.router.navigate([`/pricing`]);
return;
}
}
this.router.navigate([`/${this.page}`]);
}
}

148
bizmatch/src/app/pages/pricing/pricing.component.html Normal file
View File

@ -0,0 +1,148 @@
<div class="container mx-auto px-4 py-16">
<h1 class="text-4xl font-bold text-center mb-12">Choose the Right Plan for Your Business</h1>
<div
[ngClass]="{
'grid gap-8 mx-auto': true,
'md:grid-cols-3 max-w-7xl': !user || !user.subscriptionPlan,
'md:grid-cols-2 max-w-4xl': user && user.subscriptionPlan
}"
>
@if(!user || !user.subscriptionPlan) {
<!-- Free Plan -->
<div class="bg-white rounded-lg shadow-lg overflow-hidden flex flex-col h-full">
<div class="px-6 py-8 bg-gray-50 text-center border-b">
<h3 class="text-2xl font-semibold text-gray-700">Buyer & Seller</h3>
<p class="mt-4 text-gray-600">Commercial Properties</p>
<p class="mt-4 text-4xl font-bold text-gray-900">Free</p>
<p class="mt-2 text-gray-600">Forever</p>
</div>
<div class="px-6 py-8 flex-grow">
<ul class="text-sm text-gray-600">
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Create property listings
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Get early access to new listings
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Extended search functionality
</li>
</ul>
</div>
@if(!pricingOverview){
<div class="px-6 py-4 mt-auto">
<button (click)="register()" class="w-full bg-blue-500 text-white rounded-full px-4 py-2 font-semibold hover:bg-blue-600 transition duration-300">Sign Up Now</button>
</div>
}
</div>
}
<!-- Professional Plan -->
<div class="bg-white rounded-lg shadow-lg overflow-hidden flex flex-col h-full">
<div class="px-6 py-8 bg-blue-50 text-center border-b">
<h3 class="text-2xl font-semibold text-gray-700">Professional</h3>
<p class="mt-4 text-gray-600">CPA, Attorney, Title Company, etc.</p>
<p class="mt-4 text-4xl font-bold text-gray-900">$29</p>
<p class="mt-2 text-gray-600">per month</p>
</div>
<div class="px-6 py-8 flex-grow">
<ul class="text-sm text-gray-600">
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Professionals Directory listing
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
3-Month Free Trial
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Detailed visitor statistics
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
In-portal contact forms
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
One-month refund guarantee
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Premium support
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Price stability
</li>
</ul>
</div>
@if(!pricingOverview){
<div class="px-6 py-4 mt-auto">
<button (click)="register('price_1PpSkpDjmFBOcNBs9UDPgBos')" class="w-full bg-blue-500 text-white rounded-full px-4 py-2 font-semibold hover:bg-blue-600 transition duration-300">Get Started</button>
</div>
}
</div>
<!-- Business Broker Plan -->
<div class="bg-white rounded-lg shadow-lg overflow-hidden border-2 border-blue-500 flex flex-col h-full">
<div class="px-6 py-8 bg-blue-500 text-center border-b">
<h3 class="text-2xl font-semibold text-white">Business Broker</h3>
<p class="mt-4 text-blue-100">Create & Manage Listings</p>
<p class="mt-4 text-4xl font-bold text-white">$49</p>
<p class="mt-2 text-blue-100">per month</p>
</div>
<div class="px-6 py-8 flex-grow">
<ul class="text-sm text-gray-600">
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Create business listings
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Professionals Directory listing
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
3-Month Free Trial
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Detailed visitor statistics
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
In-portal contact forms
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
One-month refund guarantee
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Premium support
</li>
<li class="mb-4 flex items-center">
<i class="fas fa-check text-green-500 mr-2"></i>
Price stability
</li>
</ul>
</div>
@if(!pricingOverview){
<div class="px-6 py-4 mt-auto">
<button (click)="register('price_1PpSmRDjmFBOcNBsaaSp2nk9')" class="w-full bg-blue-500 text-white rounded-full px-4 py-2 font-semibold hover:bg-blue-600 transition duration-300">Start Listing Now</button>
</div>
}
</div>
</div>
<div class="mt-16 text-center">
<h2 class="text-2xl font-semibold mb-4">Not sure which plan is right for you?</h2>
<p class="text-gray-600 mb-8">Contact our sales team for a personalized recommendation.</p>
<a routerLink="/emailUs" class="bg-blue-500 text-white rounded-full px-6 py-3 font-semibold hover:bg-blue-600 transition duration-300">Contact Sales</a>
</div>
</div>

11
bizmatch/src/app/pages/pricing/pricing.component.scss Normal file
View File

@ -0,0 +1,11 @@
:host {
height: 100%;
}
// .container {
// background-image: url(../../../assets/images/index-bg.jpg), url(../../../assets/images/pricing-4.svg);
// //background-image: url(../../../assets/images/corpusChristiSkyline.jpg);
// background-size: cover;
// background-position: center;
// height: 100vh;
// }

103
bizmatch/src/app/pages/pricing/pricing.component.ts Normal file
View File

@ -0,0 +1,103 @@
import { HttpClient } from '@angular/common/http';
import { Component } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { StripeService } from 'ngx-stripe';
import { switchMap } from 'rxjs';
import { User } from '../../../../../bizmatch-server/src/models/db.model';
import { Checkout, KeycloakUser } from '../../../../../bizmatch-server/src/models/main.model';
import { environment } from '../../../environments/environment';
import { AuditService } from '../../services/audit.service';
import { AuthService } from '../../services/auth.service';
import { UserService } from '../../services/user.service';
import { SharedModule } from '../../shared/shared/shared.module';
import { map2User } from '../../utils/utils';
@Component({
selector: 'app-pricing',
standalone: true,
imports: [SharedModule],
templateUrl: './pricing.component.html',
styleUrl: './pricing.component.scss',
})
export class PricingComponent {
private apiBaseUrl = environment.apiBaseUrl;
private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
pricingOverview: boolean | undefined = this.activatedRoute.snapshot.data['pricingOverview'] as boolean | undefined;
keycloakUser: KeycloakUser;
user: User;
constructor(
private http: HttpClient,
private stripeService: StripeService,
private activatedRoute: ActivatedRoute,
private userService: UserService,
private router: Router,
private auditService: AuditService,
private authService: AuthService,
) {}
async ngOnInit() {
const token = await this.authService.getToken();
this.keycloakUser = map2User(token);
if (this.keycloakUser) {
this.user = await this.userService.getByMail(this.keycloakUser.email);
const originalKeycloakUser = await this.userService.getKeycloakUser(this.keycloakUser.id);
const priceId = originalKeycloakUser.attributes && originalKeycloakUser.attributes['priceID'] ? originalKeycloakUser.attributes['priceID'][0] : null;
if (priceId) {
originalKeycloakUser.attributes['priceID'] = null;
await this.userService.updateKeycloakUser(originalKeycloakUser);
}
if (!this.user.subscriptionPlan) {
if (this.id === 'free' || priceId === 'free') {
this.user.subscriptionPlan = 'free';
await this.userService.saveGuaranteed(this.user);
this.router.navigate([`/account`]);
} else if (this.id || priceId) {
const base64PriceId = this.id ? this.id : priceId;
this.checkout({ priceId: atob(base64PriceId), email: this.keycloakUser.email, name: `${this.keycloakUser.firstName} ${this.keycloakUser.lastName}` });
}
}
} else {
this.pricingOverview = false;
}
}
async register(priceId?: string) {
if (this.keycloakUser) {
if (!priceId) {
this.user = await this.userService.getByMail(this.keycloakUser.email);
this.user.subscriptionPlan = 'free';
await this.userService.saveGuaranteed(this.user);
this.router.navigate([`/account`]);
} else {
this.checkout({ priceId: priceId, email: this.keycloakUser.email, name: `${this.keycloakUser.firstName} ${this.keycloakUser.lastName}` });
}
} else {
// if (priceId) {
// this.keycloakService.register({
// redirectUri: `${window.location.origin}/pricing/${btoa(priceId)}`,
// });
// } else {
// this.keycloakService.register({ redirectUri: `${window.location.origin}/pricing/free` });
// }
}
}
checkout(checkout: Checkout) {
// Check the server.js tab to see an example implementation
this.http
.post(`${this.apiBaseUrl}/bizmatch/payment/create-checkout-session`, checkout)
.pipe(
switchMap((session: any) => {
return this.stripeService.redirectToCheckout({ sessionId: session.id });
}),
)
.subscribe(result => {
// If `redirectToCheckout` fails due to a browser or network
// error, you should display the localized error message to your
// customer using `error.message`.
if (result.error) {
alert(result.error.message);
}
});
}
}

119
bizmatch/src/app/pages/subscription/account/account.component.html
View File

@ -6,10 +6,8 @@
<div class="grid grid-cols-1 md:grid-cols-3 gap-4">
<div class="md:col-span-2">
<label for="email" class="block text-sm font-medium text-gray-700">E-mail (required)</label>
<input type="email" id="email" name="email" [(ngModel)]="user.email" disabled
class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500" />
<p class="text-xs text-gray-500 mt-1">You can only modify your email by contacting us at
support&#64;bizmatch.net</p>
<input type="email" id="email" name="email" [(ngModel)]="user.email" disabled class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500" />
<p class="text-xs text-gray-500 mt-1">You can only modify your email by contacting us at support&#64;bizmatch.net</p>
</div>
@if (isProfessional || (authService.isAdmin() | async)){
<div class="flex flex-row items-center justify-around md:space-x-4">
@ -18,21 +16,20 @@
<div class="w-20 h-20 w-full rounded-md flex items-center justify-center relative">
@if(user?.hasCompanyLogo){
<img src="{{ companyLogoUrl }}" alt="Company logo" class="max-w-full max-h-full" />
<div
class="absolute top-[-0.5rem] right-[0rem] bg-white rounded-full p-1 drop-shadow-custom-bg hover:cursor-pointer"
(click)="deleteConfirm('logo')">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
class="w-4 h-4 text-gray-600">
<div class="absolute top-[-0.5rem] right-[0rem] bg-white rounded-full p-1 drop-shadow-custom-bg hover:cursor-pointer" (click)="deleteConfirm('logo')">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" class="w-4 h-4 text-gray-600">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
</svg>
</div>
} @else {
<img src="/assets/images/placeholder.png" class="max-w-full max-h-full" />
<img src="assets/images/placeholder.png" class="max-w-full max-h-full" />
}
</div>
<button type="button"
<button
type="button"
class="mt-2 w-full px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
(click)="uploadCompanyLogo()">
(click)="uploadCompanyLogo()"
>
Upload
</button>
</div>
@ -41,21 +38,20 @@
<div class="w-20 h-20 w-full rounded-md flex items-center justify-center relative">
@if(user?.hasProfile){
<img src="{{ profileUrl }}" alt="Profile picture" class="max-w-full max-h-full" />
<div
class="absolute top-[-0.5rem] right-[0rem] bg-white rounded-full p-1 drop-shadow-custom-bg hover:cursor-pointer"
(click)="deleteConfirm('profile')">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor"
class="w-4 h-4 text-gray-600">
<div class="absolute top-[-0.5rem] right-[0rem] bg-white rounded-full p-1 drop-shadow-custom-bg hover:cursor-pointer" (click)="deleteConfirm('profile')">
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke="currentColor" class="w-4 h-4 text-gray-600">
<path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M6 18L18 6M6 6l12 12" />
</svg>
</div>
} @else {
<img src="/assets/images/placeholder.png" class="max-w-full max-h-full" />
<img src="assets/images/placeholder.png" class="max-w-full max-h-full" />
}
</div>
<button type="button"
<button
type="button"
class="mt-2 w-full px-4 py-2 border border-gray-300 rounded-md shadow-sm text-sm font-medium text-gray-700 bg-white hover:bg-gray-50 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-indigo-500"
(click)="uploadProfile()">
(click)="uploadProfile()"
>
Upload
</button>
</div>
@ -78,13 +74,11 @@
@if ((authService.isAdmin() | async) && !id){
<div>
<label for="customerType" class="block text-sm font-medium text-gray-700">User Type</label>
<span
class="bg-blue-100 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300">ADMIN</span>
<span class="bg-blue-100 text-blue-800 text-sm font-medium me-2 px-2.5 py-0.5 rounded dark:bg-blue-900 dark:text-blue-300">ADMIN</span>
</div>
}@else{
<app-validated-select label="Customer Type" name="customerType" [(ngModel)]="user.customerType"
[options]="customerTypeOptions"></app-validated-select>
<app-validated-select label="Customer Type" name="customerType" [(ngModel)]="user.customerType" [options]="customerTypeOptions"></app-validated-select>
} @if (isProfessional){
<!-- <div>
<label for="customerSubType" class="block text-sm font-medium text-gray-700">Professional Type</label>
@ -92,8 +86,7 @@
<option *ngFor="let subType of customerSubTypes" [value]="subType">{{ subType | titlecase }}</option>
</select>
</div> -->
<app-validated-select label="Professional Type" name="customerSubType" [(ngModel)]="user.customerSubType"
[options]="customerSubTypeOptions"></app-validated-select>
<app-validated-select label="Professional Type" name="customerSubType" [(ngModel)]="user.customerSubType" [options]="customerSubTypeOptions"></app-validated-select>
}
</div>
@if (isProfessional){
@ -106,10 +99,8 @@
<label for="description" class="block text-sm font-medium text-gray-700">Describe yourself</label>
<input type="text" id="description" name="description" [(ngModel)]="user.description" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500" />
</div> -->
<app-validated-input label="Company Name" name="companyName"
[(ngModel)]="user.companyName"></app-validated-input>
<app-validated-input label="Describe Yourself" name="description"
[(ngModel)]="user.description"></app-validated-input>
<app-validated-input label="Company Name" name="companyName" [(ngModel)]="user.companyName"></app-validated-input>
<app-validated-input label="Describe Yourself" name="description" [(ngModel)]="user.description"></app-validated-input>
</div>
<div class="grid grid-cols-1 md:grid-cols-3 gap-4">
@ -125,14 +116,11 @@
<label for="companyLocation" class="block text-sm font-medium text-gray-700">Company Location</label>
<input type="text" id="companyLocation" name="companyLocation" [(ngModel)]="user.companyLocation" class="mt-1 block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500" />
</div> -->
<app-validated-input label="Your Phone Number" name="phoneNumber" [(ngModel)]="user.phoneNumber"
mask="(000) 000-0000"></app-validated-input>
<app-validated-input label="Company Website" name="companyWebsite"
[(ngModel)]="user.companyWebsite"></app-validated-input>
<app-validated-input label="Your Phone Number" name="phoneNumber" [(ngModel)]="user.phoneNumber" mask="(000) 000-0000"></app-validated-input>
<app-validated-input label="Company Website" name="companyWebsite" [(ngModel)]="user.companyWebsite"></app-validated-input>
<!-- <app-validated-input label="Company Location" name="companyLocation" [(ngModel)]="user.companyLocation"></app-validated-input> -->
<!-- <app-validated-city label="Company Location" name="location" [(ngModel)]="user.location"></app-validated-city> -->
<app-validated-location label="Company Location" name="location"
[(ngModel)]="user.location"></app-validated-location>
<app-validated-location label="Company Location" name="location" [(ngModel)]="user.location"></app-validated-location>
</div>
<!-- <div>
@ -140,21 +128,21 @@
<quill-editor [(ngModel)]="user.companyOverview" name="companyOverview" [modules]="quillModules"></quill-editor>
</div> -->
<div>
<app-validated-quill label="Company Overview" name="companyOverview"
[(ngModel)]="user.companyOverview"></app-validated-quill>
<app-validated-quill label="Company Overview" name="companyOverview" [(ngModel)]="user.companyOverview"></app-validated-quill>
</div>
<div>
<!-- <label for="offeredServices" class="block text-sm font-medium text-gray-700">Services We Offer</label>
<quill-editor [(ngModel)]="user.offeredServices" name="offeredServices" [modules]="quillModules"></quill-editor> -->
<app-validated-quill label="Services We Offer" name="offeredServices"
[(ngModel)]="user.offeredServices"></app-validated-quill>
<app-validated-quill label="Services We Offer" name="offeredServices" [(ngModel)]="user.offeredServices"></app-validated-quill>
</div>
<div>
<h3 class="text-lg font-medium text-gray-700 mb-2 relative w-fit">
Areas We Serve @if(getValidationMessage('areasServed')){
<div [attr.data-tooltip-target]="tooltipTargetAreasServed"
class="absolute inline-flex items-center justify-center w-6 h-6 text-xs font-bold text-white bg-red-500 border-2 border-white rounded-full -top-2 dark:border-gray-900 hover:cursor-pointer">
<div
[attr.data-tooltip-target]="tooltipTargetAreasServed"
class="absolute inline-flex items-center justify-center w-6 h-6 text-xs font-bold text-white bg-red-500 border-2 border-white rounded-full -top-2 dark:border-gray-900 hover:cursor-pointer"
>
!
</div>
<app-tooltip [id]="tooltipTargetAreasServed" [text]="getValidationMessage('areasServed')"></app-tooltip>
@ -171,25 +159,19 @@
@for (areasServed of user.areasServed; track areasServed; let i=$index){
<div class="grid grid-cols-12 md:gap-4 gap-1 mb-3 md:mb-1">
<div class="col-span-6">
<ng-select [items]="selectOptions?.states" bindLabel="name" bindValue="value"
[(ngModel)]="areasServed.state" (ngModelChange)="setState(i, $event)" name="areasServed_state{{ i }}">
</ng-select>
<ng-select [items]="selectOptions?.states" bindLabel="name" bindValue="value" [(ngModel)]="areasServed.state" (ngModelChange)="setState(i, $event)" name="areasServed_state{{ i }}"> </ng-select>
</div>
<div class="col-span-5">
<!-- <input type="text" id="county{{ i }}" name="county{{ i }}" [(ngModel)]="areasServed.county" class="block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500" /> -->
<app-validated-county name="county{{ i }}" [(ngModel)]="areasServed.county"
labelClasses="text-gray-900 font-medium" [state]="areasServed.state"
[readonly]="!areasServed.state"></app-validated-county>
<app-validated-county name="county{{ i }}" [(ngModel)]="areasServed.county" labelClasses="text-gray-900 font-medium" [state]="areasServed.state" [readonly]="!areasServed.state"></app-validated-county>
</div>
<div class="col-span-1">
<button type="button" class="px-2 py-1 bg-red-500 text-white rounded-md h-[42px] w-8"
(click)="removeArea(i)">-</button>
<button type="button" class="px-2 py-1 bg-red-500 text-white rounded-md h-[42px] w-8" (click)="removeArea(i)">-</button>
</div>
</div>
}
<div class="mt-2">
<button type="button" class="px-2 py-1 bg-green-500 text-white rounded-md mr-2 h-[42px] w-8"
(click)="addArea()">+</button>
<button type="button" class="px-2 py-1 bg-green-500 text-white rounded-md mr-2 h-[42px] w-8" (click)="addArea()">+</button>
<span class="text-sm text-gray-500 ml-2">[Add more Areas or remove existing ones.]</span>
</div>
@ -198,8 +180,10 @@
<div>
<h3 class="text-lg font-medium text-gray-700 mb-2 relative">
Licensed In@if(getValidationMessage('licensedIn')){
<div [attr.data-tooltip-target]="tooltipTargetLicensed"
class="absolute inline-flex items-center justify-center w-6 h-6 text-xs font-bold text-white bg-red-500 border-2 border-white rounded-full -top-2 dark:border-gray-900 hover:cursor-pointer">
<div
[attr.data-tooltip-target]="tooltipTargetLicensed"
class="absolute inline-flex items-center justify-center w-6 h-6 text-xs font-bold text-white bg-red-500 border-2 border-white rounded-full -top-2 dark:border-gray-900 hover:cursor-pointer"
>
!
</div>
<app-tooltip [id]="tooltipTargetLicensed" [text]="getValidationMessage('licensedIn')"></app-tooltip>
@ -216,23 +200,26 @@
@for (licensedIn of user.licensedIn; track licensedIn; let i=$index){
<div class="grid grid-cols-12 md:gap-4 gap-1 mb-3 md:mb-1">
<div class="col-span-6">
<ng-select [items]="selectOptions?.states" bindLabel="name" bindValue="value" [(ngModel)]="licensedIn.state"
name="licensedIn_state{{ i }}"> </ng-select>
<ng-select [items]="selectOptions?.states" bindLabel="name" bindValue="value" [(ngModel)]="licensedIn.state" name="licensedIn_state{{ i }}"> </ng-select>
</div>
<div class="col-span-5">
<input type="text" id="licenseNumber{{ i }}" name="licenseNumber{{ i }}" [(ngModel)]="licensedIn.registerNo"
class="block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500" />
<input
type="text"
id="licenseNumber{{ i }}"
name="licenseNumber{{ i }}"
[(ngModel)]="licensedIn.registerNo"
class="block w-full rounded-md border-gray-300 shadow-sm focus:border-indigo-500 focus:ring-indigo-500"
/>
</div>
<button type="button" class="px-2 py-1 bg-red-500 text-white rounded-md h-[42px] w-8"
(click)="removeLicence(i)">-</button>
<button type="button" class="px-2 py-1 bg-red-500 text-white rounded-md h-[42px] w-8" (click)="removeLicence(i)">-</button>
</div>
}
<div class="mt-2">
<button type="button" class="px-2 py-1 bg-green-500 text-white rounded-md mr-2 h-[42px] w-8"
(click)="addLicence()">+</button>
<button type="button" class="px-2 py-1 bg-green-500 text-white rounded-md mr-2 h-[42px] w-8" (click)="addLicence()">+</button>
<span class="text-sm text-gray-500 ml-2">[Add more licenses or remove existing ones.]</span>
</div>
</div>
}
<div class="flex items-center !my-8">
<label class="flex items-center cursor-pointer">
<div class="relative">
@ -242,12 +229,9 @@
<div class="ml-3 text-gray-700 font-medium">Show your profile in Professional Directory</div>
</label>
</div>
}
<div class="flex justify-start">
<button type="submit"
class="px-4 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500"
(click)="updateProfile(user)">
<button type="submit" class="px-4 py-2 bg-blue-500 text-white rounded-md hover:bg-blue-600 focus:outline-none focus:ring-2 focus:ring-offset-2 focus:ring-blue-500" (click)="updateProfile(user)">
Update Profile
</button>
</div>
@ -330,6 +314,5 @@
</div>
}
</div>
<app-image-crop-and-upload [uploadParams]="uploadParams"
(uploadFinished)="uploadFinished($event)"></app-image-crop-and-upload>
<app-image-crop-and-upload [uploadParams]="uploadParams" (uploadFinished)="uploadFinished($event)"></app-image-crop-and-upload>
<app-confirmation></app-confirmation>

20
bizmatch/src/app/pages/subscription/account/account.component.ts
View File

@ -3,6 +3,10 @@ import { ChangeDetectorRef, Component } from '@angular/core';
import { ActivatedRoute, Router } from '@angular/router';
import { faTrash } from '@fortawesome/free-solid-svg-icons';
import { NgSelectModule } from '@ng-select/ng-select';
import { initFlowbite } from 'flowbite';
import { NgxCurrencyDirective } from 'ngx-currency';
import { ImageCropperComponent } from 'ngx-image-cropper';
import { QuillModule } from 'ngx-quill';
import { lastValueFrom } from 'rxjs';
import { User } from '../../../../../../bizmatch-server/src/models/db.model';
@ -11,8 +15,10 @@ import { environment } from '../../../../environments/environment';
import { ConfirmationComponent } from '../../../components/confirmation/confirmation.component';
import { ConfirmationService } from '../../../components/confirmation/confirmation.service';
import { ImageCropAndUploadComponent, UploadReponse } from '../../../components/image-crop-and-upload/image-crop-and-upload.component';
import { MessageComponent } from '../../../components/message/message.component';
import { MessageService } from '../../../components/message/message.service';
import { TooltipComponent } from '../../../components/tooltip/tooltip.component';
import { ValidatedCityComponent } from '../../../components/validated-city/validated-city.component';
import { ValidatedCountyComponent } from '../../../components/validated-county/validated-county.component';
import { ValidatedInputComponent } from '../../../components/validated-input/validated-input.component';
import { ValidatedLocationComponent } from '../../../components/validated-location/validated-location.component';
@ -35,12 +41,16 @@ import { TOOLBAR_OPTIONS } from '../../utils/defaults';
imports: [
SharedModule,
QuillModule,
NgxCurrencyDirective,
NgSelectModule,
ImageCropperComponent,
ConfirmationComponent,
ImageCropAndUploadComponent,
MessageComponent,
ValidatedInputComponent,
ValidatedSelectComponent,
ValidatedQuillComponent,
ValidatedCityComponent,
TooltipComponent,
ValidatedCountyComponent,
ValidatedLocationComponent,
@ -68,6 +78,7 @@ export class AccountComponent {
customerSubTypeOptions: Array<{ value: string; label: string }> = [];
tooltipTargetAreasServed = 'tooltip-areasServed';
tooltipTargetLicensed = 'tooltip-licensedIn';
// subscriptions: StripeSubscription[] | any[];
constructor(
public userService: UserService,
private geoService: GeoService,
@ -82,12 +93,15 @@ export class AccountComponent {
private sharedService: SharedService,
private titleCasePipe: TitleCasePipe,
private validationMessagesService: ValidationMessagesService,
// private subscriptionService: SubscriptionsService,
private datePipe: DatePipe,
private router: Router,
public authService: AuthService,
) { }
) {}
async ngOnInit() {
// Flowbite is now initialized once in AppComponent
setTimeout(() => {
initFlowbite();
}, 10);
if (this.id) {
this.user = await this.userService.getById(this.id);
} else {
@ -152,7 +166,7 @@ export class AccountComponent {
ngOnDestroy() {
this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten
}
printInvoice(invoice: Invoice) { }
printInvoice(invoice: Invoice) {}
async updateProfile(user: User) {
try {

18
bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.ts
View File

@ -37,14 +37,17 @@ import { TOOLBAR_OPTIONS } from '../../utils/defaults';
standalone: true,
imports: [
SharedModule,
ArrayToStringPipe,
DragDropModule,
QuillModule,
NgxCurrencyDirective,
NgSelectModule,
ValidatedInputComponent,
ValidatedQuillComponent,
ValidatedNgSelectComponent,
ValidatedPriceComponent,
ValidatedTextareaComponent,
ValidatedCityComponent,
ValidatedLocationComponent,
],
providers: [],
@ -125,21 +128,14 @@ export class EditBusinessListingComponent {
this.messageService.addMessage({ severity: 'success', text: 'Listing changes have been persisted', duration: 3000 });
this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten
} catch (error) {
console.error('Error saving listing:', error);
let errorText = 'An error occurred while saving the listing - Please check your inputs';
if (error.error && Array.isArray(error.error?.message)) {
this.validationMessagesService.updateMessages(error.error.message);
errorText = 'Please fix the validation errors highlighted in the form';
} else if (error.error?.message) {
errorText = `Error: ${error.error.message}`;
}
this.messageService.addMessage({
severity: 'danger',
text: errorText,
text: 'An error occurred while saving the profile - Please check your inputs',
duration: 5000,
});
if (error.error && Array.isArray(error.error?.message)) {
this.validationMessagesService.updateMessages(error.error.message);
}
}
}

19
bizmatch/src/app/pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component.ts
View File

@ -41,9 +41,12 @@ import { TOOLBAR_OPTIONS } from '../../utils/defaults';
standalone: true,
imports: [
SharedModule,
ArrayToStringPipe,
DragDropModule,
QuillModule,
NgxCurrencyDirective,
NgSelectModule,
ImageCropperComponent,
ConfirmationComponent,
DragDropMixedComponent,
ValidatedInputComponent,
@ -51,6 +54,7 @@ import { TOOLBAR_OPTIONS } from '../../utils/defaults';
ValidatedNgSelectComponent,
ValidatedPriceComponent,
ValidatedLocationComponent,
ValidatedCityComponent,
ImageCropAndUploadComponent,
],
providers: [],
@ -173,21 +177,14 @@ export class EditCommercialPropertyListingComponent {
this.messageService.addMessage({ severity: 'success', text: 'Listing changes have been persisted', duration: 3000 });
this.validationMessagesService.clearMessages(); // Löschen Sie alle bestehenden Validierungsnachrichten
} catch (error) {
console.error('Error saving listing:', error);
let errorText = 'An error occurred while saving the listing - Please check your inputs';
if (error.error && Array.isArray(error.error?.message)) {
this.validationMessagesService.updateMessages(error.error.message);
errorText = 'Please fix the validation errors highlighted in the form';
} else if (error.error?.message) {
errorText = `Error: ${error.error.message}`;
}
this.messageService.addMessage({
severity: 'danger',
text: errorText,
text: 'An error occurred while saving the profile',
duration: 5000,
});
if (error.error && Array.isArray(error.error?.message)) {
this.validationMessagesService.updateMessages(error.error.message);
}
}
}

Some files were not shown because too many files have changed in this diff Show More