schema

2026-02-07 16:02:52 +01:00
24 changed files with 108 additions and 222 deletions
--- a/bizmatch-server/src/config/pictures.config.ts
+++ b/bizmatch-server/src/config/pictures.config.ts
@@ -1,4 +0,0 @@
-// Single source of truth for the pictures directory.
-// MUST match the container-side path of the volume mount in docker-compose.yml:
-//   ./bizmatch-server/pictures:/app/dist/pictures
-export const PICTURES_DIR = process.env.PICTURES_DIR || '/app/dist/pictures';
--- a/bizmatch-server/src/file/file.service.ts
+++ b/bizmatch-server/src/file/file.service.ts
@@ -3,15 +3,14 @@ import fs from 'fs-extra';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import sharp from 'sharp';
 import { Logger } from 'winston';
-import { PICTURES_DIR } from '../config/pictures.config';

@Injectable()
 export class FileService {
  constructor(@Inject(WINSTON_MODULE_PROVIDER) private readonly logger: Logger) {
-    fs.ensureDirSync(`${PICTURES_DIR}`);
-    fs.ensureDirSync(`${PICTURES_DIR}/profile`);
-    fs.ensureDirSync(`${PICTURES_DIR}/logo`);
-    fs.ensureDirSync(`${PICTURES_DIR}/property`);
+    fs.ensureDirSync(`./pictures`);
+    fs.ensureDirSync(`./pictures/profile`);
+    fs.ensureDirSync(`./pictures/logo`);
+    fs.ensureDirSync(`./pictures/property`);
  }
  // ############
  // Profile
@@ -23,10 +22,10 @@ export class FileService {
      .avif({ quality }) // Verwende AVIF
      //.webp({ quality }) // Verwende Webp
      .toBuffer();
-    await sharp(output).toFile(`${PICTURES_DIR}/profile/${adjustedEmail}.avif`);
+    await sharp(output).toFile(`./pictures/profile/${adjustedEmail}.avif`);
  }
  hasProfile(adjustedEmail: string) {
-    return fs.existsSync(`${PICTURES_DIR}/profile/${adjustedEmail}.avif`);
+    return fs.existsSync(`./pictures/profile/${adjustedEmail}.avif`);
  }
  // ############
  // Logo
@@ -38,18 +37,18 @@ export class FileService {
      .avif({ quality }) // Verwende AVIF
      //.webp({ quality }) // Verwende Webp
      .toBuffer();
-    await sharp(output).toFile(`${PICTURES_DIR}/logo/${adjustedEmail}.avif`); // Ersetze Dateierweiterung
-    // await fs.outputFile(`${PICTURES_DIR}/logo/${userId}`, file.buffer);
+    await sharp(output).toFile(`./pictures/logo/${adjustedEmail}.avif`); // Ersetze Dateierweiterung
+    // await fs.outputFile(`./pictures/logo/${userId}`, file.buffer);
  }
  hasCompanyLogo(adjustedEmail: string) {
-    return fs.existsSync(`${PICTURES_DIR}/logo/${adjustedEmail}.avif`) ? true : false;
+    return fs.existsSync(`./pictures/logo/${adjustedEmail}.avif`) ? true : false;
  }
  // ############
  // Property
  // ############
  async getPropertyImages(imagePath: string, serial: string): Promise<string[]> {
    const result: string[] = [];
-    const directory = `${PICTURES_DIR}/property/${imagePath}/${serial}`;
+    const directory = `./pictures/property/${imagePath}/${serial}`;
    if (fs.existsSync(directory)) {
      const files = await fs.readdir(directory);
      files.forEach(f => {
@@ -61,7 +60,7 @@ export class FileService {
    }
  }
  async hasPropertyImages(imagePath: string, serial: string): Promise<boolean> {
-    const directory = `${PICTURES_DIR}/property/${imagePath}/${serial}`;
+    const directory = `./pictures/property/${imagePath}/${serial}`;
    if (fs.existsSync(directory)) {
      const files = await fs.readdir(directory);
      return files.length > 0;
@@ -70,7 +69,7 @@ export class FileService {
    }
  }
  async storePropertyPicture(file: Express.Multer.File, imagePath: string, serial: string): Promise<string> {
-    const directory = `${PICTURES_DIR}/property/${imagePath}/${serial}`;
+    const directory = `./pictures/property/${imagePath}/${serial}`;
    fs.ensureDirSync(`${directory}`);
    const imageName = await this.getNextImageName(directory);
    //await fs.outputFile(`${directory}/${imageName}`, file.buffer);
@@ -112,7 +111,7 @@ export class FileService {
  }

  deleteDirectoryIfExists(imagePath) {
-    const dirPath = `${PICTURES_DIR}/property/${imagePath}`;
+    const dirPath = `pictures/property/${imagePath}`;
    try {
      const exists = fs.pathExistsSync();
      if (exists) {
--- a/bizmatch-server/src/image/image.controller.ts
+++ b/bizmatch-server/src/image/image.controller.ts
@@ -6,7 +6,6 @@ import { Logger } from 'winston';
 import { FileService } from '../file/file.service';
 import { CommercialPropertyService } from '../listings/commercial-property.service';
 import { SelectOptionsService } from '../select-options/select-options.service';
-import { PICTURES_DIR } from '../config/pictures.config';

@Controller('image')
 export class ImageController {
@@ -29,7 +28,7 @@ export class ImageController {
  @UseGuards(AuthGuard)
  @Delete('propertyPicture/:imagePath/:serial/:imagename')
  async deletePropertyImagesById(@Param('imagePath') imagePath: string, @Param('serial') serial: string, @Param('imagename') imagename: string): Promise<any> {
-    this.fileService.deleteImage(`${PICTURES_DIR}/property/${imagePath}/${serial}/${imagename}`);
+    this.fileService.deleteImage(`pictures/property/${imagePath}/${serial}/${imagename}`);
    await this.listingService.deleteImage(imagePath, serial, imagename);
  }
  // ############
@@ -44,7 +43,7 @@ export class ImageController {
  @UseGuards(AuthGuard)
  @Delete('profile/:email/')
  async deleteProfileImagesById(@Param('email') email: string): Promise<any> {
-    this.fileService.deleteImage(`${PICTURES_DIR}/profile/${email}.avif`);
+    this.fileService.deleteImage(`pictures/profile/${email}.avif`);
  }
  // ############
  // Logo
@@ -58,6 +57,6 @@ export class ImageController {
  @UseGuards(AuthGuard)
  @Delete('logo/:email/')
  async deleteLogoImagesById(@Param('email') adjustedEmail: string): Promise<any> {
-    this.fileService.deleteImage(`${PICTURES_DIR}/logo/${adjustedEmail}.avif`);
+    this.fileService.deleteImage(`pictures/logo/${adjustedEmail}.avif`);
  }
 }
--- a/bizmatch-server/src/listings/business-listing.service.ts
+++ b/bizmatch-server/src/listings/business-listing.service.ts
@@ -10,7 +10,7 @@ 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, isUUID } from '../utils/slug.utils';
+import { generateSlug, extractShortIdFromSlug, isSlug } from '../utils/slug.utils';

@Injectable()
 export class BusinessListingService {
@@ -271,9 +271,6 @@ export class BusinessListingService {
      }
    } else {
      this.logger.debug(`Detected as UUID: ${slugOrId}`);
-      if (!isUUID(slugOrId)) {
-        throw new BadRequestException(`Invalid identifier format: ${slugOrId}`);
-      }
    }

    return this.findBusinessesById(id, user);
--- a/bizmatch-server/src/listings/commercial-property.service.ts
+++ b/bizmatch-server/src/listings/commercial-property.service.ts
@@ -11,7 +11,7 @@ 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, isUUID } from '../utils/slug.utils';
+import { generateSlug, extractShortIdFromSlug, isSlug } from '../utils/slug.utils';

@Injectable()
 export class CommercialPropertyService {
@@ -166,9 +166,6 @@ export class CommercialPropertyService {
      }
    } else {
      this.logger.debug(`Detected as UUID: ${slugOrId}`);
-      if (!isUUID(slugOrId)) {
-        throw new BadRequestException(`Invalid identifier format: ${slugOrId}`);
-      }
    }

    return this.findCommercialPropertiesById(id, user);
--- a/bizmatch-server/src/listings/unknown-listings.controller.ts
+++ b/bizmatch-server/src/listings/unknown-listings.controller.ts
@@ -1,10 +1,9 @@
-import { Controller, Get, Inject, Param, Request, UseGuards, BadRequestException } from '@nestjs/common';
+import { Controller, Get, Inject, Param, Request, UseGuards } from '@nestjs/common';
 import { WINSTON_MODULE_PROVIDER } from 'nest-winston';
 import { OptionalAuthGuard } from 'src/jwt-auth/optional-auth.guard';
 import { Logger } from 'winston';
 import { BusinessListingService } from './business-listing.service';
 import { CommercialPropertyService } from './commercial-property.service';
-import { isUUID } from '../utils/slug.utils';

@Controller('listings/undefined')
 export class UnknownListingsController {
@@ -17,9 +16,6 @@ export class UnknownListingsController {
  @UseGuards(OptionalAuthGuard)
  @Get(':id')
  async findById(@Request() req, @Param('id') id: string): Promise<any> {
-    if (!isUUID(id)) {
-      throw new BadRequestException(`Invalid identifier format: ${id}`);
-    }
    try {
      return await this.businessListingsService.findBusinessesById(id, req.user);
    } catch (error) {
--- a/bizmatch-server/src/main.ts
+++ b/bizmatch-server/src/main.ts
@@ -4,7 +4,6 @@ import express from 'express';
 import helmet from 'helmet';
 import { WINSTON_MODULE_NEST_PROVIDER } from 'nest-winston';
 import { AppModule } from './app.module';
-import { PICTURES_DIR } from './config/pictures.config';

 async function bootstrap() {
  const server = express();
@@ -15,12 +14,7 @@ async function bootstrap() {
  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_DIR));
-  // Prevent browsers from caching 404s on /pictures/*
-  app.use('/pictures', (_req, res) => {
-    res.set('Cache-Control', 'no-store');
-    res.status(404).end();
-  });
+  app.use('/pictures', express.static('pictures'));

  app.setGlobalPrefix('bizmatch');

@@ -60,17 +54,6 @@ async function bootstrap() {
    }),
  );

-  // Reject CSS/JS sourcemap requests before they reach any API controller.
-  // Sourcemap URLs resolve relative to the current page URL and can match
-  // wildcard route params (e.g. /bizmatch/user/default.css.map → @Get(':id')).
-  app.use((req, res, next) => {
-    if (req.path.endsWith('.css.map') || req.path.endsWith('.js.map')) {
-      res.status(404).end();
-      return;
-    }
-    next();
-  });
-
  await app.listen(process.env.PORT || 3001);
 }
 bootstrap();
--- a/bizmatch-server/src/user/user.controller.ts
+++ b/bizmatch-server/src/user/user.controller.ts
@@ -10,7 +10,6 @@ import { OptionalAuthGuard } from 'src/jwt-auth/optional-auth.guard';
 import { User } from '../models/db.model';
 import { JwtUser, Subscription, UserListingCriteria } from '../models/main.model';
 import { UserService } from './user.service';
-import { isUUID } from '../utils/slug.utils';

@Controller('user')
 export class UserController {
@@ -30,9 +29,6 @@ export class UserController {
  @UseGuards(OptionalAuthGuard)
  @Get(':id')
  async findById(@Param('id') id: string): Promise<User> {
-    if (!isUUID(id)) {
-      throw new BadRequestException(`Invalid identifier format: ${id}`);
-    }
    const user = await this.userService.getUserById(id);
    return user;
  }
@@ -85,9 +81,6 @@ export class UserController {
  @UseGuards(AuthGuard)
  @Get('subscriptions/:id')
  async findSubscriptionsById(@Param('id') id: string): Promise<Subscription[]> {
-    if (!isUUID(id)) {
-      throw new BadRequestException(`Invalid identifier format: ${id}`);
-    }
    const subscriptions = [];
    const user = await this.userService.getUserById(id);
    subscriptions.forEach(s => {
--- a/bizmatch-server/src/utils/slug.utils.ts
+++ b/bizmatch-server/src/utils/slug.utils.ts
@@ -107,13 +107,6 @@ export function isValidSlug(slug: string): boolean {
  return lastPart.length === 8 && /^[a-z0-9]{8}$/.test(lastPart);
 }

-/**
- * Check if a string is a valid UUID v4
- */
-export function isUUID(param: string): boolean {
-  return /^[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}$/i.test(param);
-}
-
 /**
 * Check if a parameter is a slug (vs a UUID)
 *
--- a/bizmatch/angular.json
+++ b/bizmatch/angular.json
@@ -101,7 +101,7 @@
              ],
              "optimization": true,
              "extractLicenses": false,
-              "sourceMap": false,
+              "sourceMap": true,
              "outputHashing": "all"
            }
          },
--- a/bizmatch/src/app/components/header/header.component.html
+++ b/bizmatch/src/app/components/header/header.component.html
@@ -29,10 +29,9 @@
        </div>
      </div>
      }
-      <div class="relative">
      <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" (click)="toggleUserMenu()">
+        id="user-menu-button" aria-expanded="false" [attr.data-dropdown-toggle]="user ? 'user-login' : 'user-unknown'">
        <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 }}"
@@ -44,8 +43,8 @@
      <!-- Dropdown menu -->
      @if(user){
      <div
-        class="absolute right-0 z-50 mt-2 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" [class.hidden]="!userMenuVisible">
+        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="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>
@@ -123,8 +122,8 @@
      </div>
      } @else {
      <div
-        class="absolute right-0 z-50 mt-2 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" [class.hidden]="!userMenuVisible">
+        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">
        <ul class="py-2" aria-labelledby="user-menu-button">
          <li>
            <a routerLink="/login" [queryParams]="{ mode: 'login' }"
@@ -162,7 +161,6 @@
      </div>
      }
    </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">
--- a/bizmatch/src/app/components/header/header.component.ts
+++ b/bizmatch/src/app/components/header/header.component.ts
@@ -4,7 +4,7 @@ import { FormsModule } from '@angular/forms';
 import { NavigationEnd, Router, RouterModule } from '@angular/router';
 import { APP_ICONS } from '../../utils/fontawesome-icons';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { Collapse } from 'flowbite';
+import { Collapse, Dropdown, initFlowbite } from 'flowbite';
 import { filter, Observable, Subject, takeUntil } from 'rxjs';

 import { SortByOptions, User } from '../../../../../bizmatch-server/src/models/db.model';
@@ -38,8 +38,8 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
  faUserGear = APP_ICONS.faUserGear;
  profileUrl: string;
  env = environment;
+  private filterDropdown: Dropdown | null = null;
  isMobile: boolean = false;
-  userMenuVisible = false;
  private destroy$ = new Subject<void>();
  prompt: string;
  private platformId = inject(PLATFORM_ID);
@@ -109,9 +109,15 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
      this.profileUrl = photoUrl;
    });

-    // User Updates
+    // User Updates - re-initialize Flowbite when user state changes
+    // This ensures the dropdown bindings are updated when the dropdown target changes
    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
@@ -229,7 +235,15 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
  }

  closeDropdown() {
-    this.userMenuVisible = false;
+    if (!this.isBrowser) return;
+
+    const dropdownButton = document.getElementById('user-menu-button');
+    const dropdownMenu = this.user ? document.getElementById('user-login') : document.getElementById('user-unknown');
+
+    if (dropdownButton && dropdownMenu) {
+      const dropdown = new Dropdown(dropdownMenu, dropdownButton);
+      dropdown.hide();
+    }
  }

  closeMobileMenu() {
@@ -272,10 +286,6 @@ export class HeaderComponent implements OnInit, OnDestroy, AfterViewInit {
    this.sortDropdownVisible = !this.sortDropdownVisible;
  }

-  toggleUserMenu() {
-    this.userMenuVisible = !this.userMenuVisible;
-  }
-
  get isProfessional() {
    return this.user?.customerType === 'professional';
  }
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.html
@@ -99,7 +99,7 @@
          </div>
        </div>
        <!-- Karte hinzufügen, wenn Straße vorhanden ist -->
-        <div *ngIf="listing.location?.latitude && listing.location?.longitude" class="mt-6">
+        <div *ngIf="listing.location.latitude && listing.location.longitude" class="mt-6">
          <h2 class="text-xl 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"
@@ -135,16 +135,6 @@
        </form>
      </div>
    </div>
-
-    <!-- Disclaimer: volle Breite, unterhalb beider Spalten -->
-    <div class="px-6 pb-6">
-      <p class="disclaimer text-sm text-neutral-500 leading-relaxed border-t border-neutral-200 pt-4">
-        The information on this listing has been provided by either the seller or a business broker representing the
-        seller. BizMatch, Inc. has no interest or stake in the sale of this business and has not verified any of the
-        information and assumes no responsibility for its accuracy, veracity, or completeness. See our full
-        <a class="text-primary-600 hover:underline hover:cursor-pointer" routerLink="/terms-of-use">Terms of Use</a>.
-      </p>
-    </div>
    }
  </div>

@@ -213,8 +203,8 @@
                }
                <div class="flex justify-between">
                  <span class="font-medium">Location:</span>
-                  <span>{{ related.location ? (related.location.name || related.location.county) : '—' }}, {{
-                    selectOptions.getState(related.location?.state) }}</span>
+                  <span>{{ related.location.name || related.location.county }}, {{
+                    selectOptions.getState(related.location.state) }}</span>
                </div>
              </div>
              <div class="mt-4">
--- a/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
+++ b/bizmatch/src/app/pages/details/details-business-listing/details-business-listing.component.ts
@@ -1,5 +1,5 @@
-import { NgOptimizedImage } from '@angular/common';
 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';
@@ -7,13 +7,13 @@ 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';
 import { environment } from '../../../../environments/environment';
-import { BreadcrumbItem, BreadcrumbsComponent } from '../../../components/breadcrumbs/breadcrumbs.component';
 import { EMailService } from '../../../components/email/email.service';
 import { MessageService } from '../../../components/message/message.service';
 import { ValidatedInputComponent } from '../../../components/validated-input/validated-input.component';
 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';
@@ -26,13 +26,13 @@ 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';
 import dayjs from 'dayjs';
-import { circle, Control, DomEvent, DomUtil, icon, Icon, latLng, LatLngBounds, Marker, polygon, Polygon, tileLayer } from 'leaflet';
-import { provideShareButtonsOptions, SharerMethods, withConfig } from 'ngx-sharebuttons';
-import { ShareButton } from 'ngx-sharebuttons/button';
-import { shareIcons } from 'ngx-sharebuttons/icons';
 import { AuthService } from '../../../services/auth.service';
 import { BaseDetailsComponent } from '../base-details.component';
+import { ShareButton } from 'ngx-sharebuttons/button';
+import { provideShareButtonsOptions, SharerMethods, withConfig } from 'ngx-sharebuttons';
+import { shareIcons } from 'ngx-sharebuttons/icons';
@Component({
  selector: 'app-details-business-listing',
  standalone: true,
@@ -376,6 +376,7 @@ export class DetailsBusinessListingComponent extends BaseDetailsComponent {
      { label: 'Support & Training', value: this.listing.supportAndTraining },
      { label: 'Reason for Sale', value: this.listing.reasonForSale },
      { label: 'Broker licensing', value: this.listing.brokerLicencing },
+      { label: 'Listed since', value: `${this.dateInserted()} - ${this.getDaysListed()} days` },
      {
        label: 'Listing by',
        value: null, // Wird nicht verwendet
--- a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
+++ b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.html
@@ -100,7 +100,7 @@
            </div>
          </div>
          <!-- Karte hinzufügen, wenn Straße vorhanden ist -->
-          <div *ngIf="listing.location?.latitude && listing.location?.longitude" class="mt-6">
+          <div *ngIf="listing.location.latitude && listing.location.longitude" 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"
@@ -148,16 +148,6 @@
          </div>
        </div>
      </div>
-
-      <!-- Disclaimer: volle Breite, unterhalb beider Spalten -->
-      <div class="pt-6">
-        <p class="disclaimer text-sm text-neutral-500 leading-relaxed border-t border-neutral-200 pt-4">
-          The information on this listing has been provided by either the seller or a business broker representing the
-          seller. BizMatch, Inc. has no interest or stake in the sale of this business and has not verified any of the
-          information and assumes no responsibility for its accuracy, veracity, or completeness. See our full
-          <a class="text-primary-600 hover:underline hover:cursor-pointer" routerLink="/terms-of-use">Terms of Use</a>.
-        </p>
-      </div>
    </div>
    }
  </div>
@@ -221,8 +211,8 @@
                </div>
                <div class="flex justify-between">
                  <span class="font-medium">Location:</span>
-                  <span>{{ related.location ? (related.location.name || related.location.county) : '—' }}, {{
-                    selectOptions.getState(related.location?.state) }}</span>
+                  <span>{{ related.location.name || related.location.county }}, {{
+                    selectOptions.getState(related.location.state) }}</span>
                </div>
              </div>
              <div class="mt-4">
--- a/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts
+++ b/bizmatch/src/app/pages/details/details-commercial-property-listing/details-commercial-property-listing.component.ts
@@ -1,18 +1,15 @@
-import { NgOptimizedImage } from '@angular/common';
 import { ChangeDetectorRef, Component, NgZone } from '@angular/core';
+import { NgOptimizedImage } from '@angular/common';
 import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 import { ActivatedRoute, Router } from '@angular/router';
 import { LeafletModule } from '@bluehalo/ngx-leaflet';
+import { APP_ICONS } from '../../../utils/fontawesome-icons';
 import dayjs from 'dayjs';
 import { GALLERY_CONFIG, GalleryConfig, GalleryModule, ImageItem } from 'ng-gallery';
-import { provideShareButtonsOptions, SharerMethods, withConfig } from 'ngx-sharebuttons';
-import { ShareButton } from 'ngx-sharebuttons/button';
-import { shareIcons } from 'ngx-sharebuttons/icons';
 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';
 import { environment } from '../../../../environments/environment';
-import { BreadcrumbItem, BreadcrumbsComponent } from '../../../components/breadcrumbs/breadcrumbs.component';
 import { EMailService } from '../../../components/email/email.service';
 import { MessageService } from '../../../components/message/message.service';
 import { ValidatedInputComponent } from '../../../components/validated-input/validated-input.component';
@@ -29,9 +26,12 @@ 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 { APP_ICONS } from '../../../utils/fontawesome-icons';
 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';
+import { provideShareButtonsOptions, SharerMethods, withConfig } from 'ngx-sharebuttons';
+import { shareIcons } from 'ngx-sharebuttons/icons';

@Component({
  selector: 'app-details-commercial-property-listing',
@@ -145,6 +145,7 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
        { label: 'Located in', value: this.selectOptions.getState(this.listing.location.state) },
        { label: this.listing.location.name ? 'City' : 'County', value: this.listing.location.name ? this.listing.location.name : this.listing.location.county },
        { label: 'Asking Price:', value: `$${this.listing.price?.toLocaleString()}` },
+        { label: 'Listed since', value: `${this.dateInserted()} - ${this.getDaysListed()} days` },
        {
          label: 'Listing by',
          value: null, // Wird nicht verwendet
@@ -161,7 +162,7 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
      }
      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}?_ts=${new Date(this.listing.updated).getTime()}`;
+          const imageURL = `${this.env.imageBaseUrl}/pictures/property/${this.listing.imagePath}/${this.listing.serialId}/${image}`;
          this.images.push(new ImageItem({ src: imageURL, thumb: imageURL }));
        });
      }
@@ -185,7 +186,7 @@ export class DetailsCommercialPropertyListingComponent extends BaseDetailsCompon
        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}?_ts=${new Date(this.listing.updated).getTime()}`)
+            `${this.env.imageBaseUrl}/pictures/property/${this.listing.imagePath}/${this.listing.serialId}/${img}`)
          : []
      };
      this.seoService.updateCommercialPropertyMeta(propertyData);
--- a/bizmatch/src/app/pages/details/details.scss
+++ b/bizmatch/src/app/pages/details/details.scss
@@ -1,4 +1,4 @@
-:host ::ng-deep p:not(.disclaimer) {
+:host ::ng-deep p {
  display: block;
  //margin-top: 1em;
  //margin-bottom: 1em;
--- a/bizmatch/src/app/pages/home/home.component.ts
+++ b/bizmatch/src/app/pages/home/home.component.ts
@@ -136,44 +136,13 @@ export class HomeComponent {
    // FAQ content is preserved in component for future use when FAQ section is made visible
    const organizationSchema = this.seoService.generateOrganizationSchema();

-    // 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();

    // Inject schemas (FAQ schema excluded - content not visible to users)
-    this.seoService.injectMultipleSchemas([organizationSchema, howToSchema, searchBoxSchema]);
+    this.seoService.injectMultipleSchemas([organizationSchema, searchBoxSchema]);

    // Clear all filters and sort options on initial load
    this.filterStateService.resetCriteria('businessListings');
--- a/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
+++ b/bizmatch/src/app/pages/listings/business-listings/business-listings.component.html
@@ -95,7 +95,7 @@
            <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">
-                {{ selectOptions.getState(listing.location?.state) }}
+                {{ selectOptions.getState(listing.location.state) }}
              </span>

              @if (getListingBadge(listing); as badge) {
@@ -127,8 +127,8 @@
              }}
            </p>
            <p class="text-sm text-neutral-600 mb-2">
-              <strong>Location:</strong> {{ listing.location ? (listing.location.name ? listing.location.name : listing.location.county ?
-              listing.location.county : selectOptions.getState(listing.location.state)) : '—' }}
+              <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) {
--- a/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
+++ b/bizmatch/src/app/pages/listings/commercial-property-listings/commercial-property-listings.component.html
@@ -44,7 +44,7 @@
            </button>
          </div>
          @if (listing.imageOrder?.length>0){
-          <img [appLazyLoad]="env.imageBaseUrl + '/pictures/property/' + listing.imagePath + '/' + listing.serialId + '/' + listing.imageOrder[0] + '?_ts=' + listing.updated"
+          <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"
@@ -61,7 +61,7 @@
              ><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>
+              <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">
                <strong>{{ getDaysListed(listing) }} days listed</strong>
              </p>
@@ -72,7 +72,7 @@
              <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 ? (listing.location.name ? listing.location.name : listing.location.county) : '—' }}</p>
+            <p class="text-neutral-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">
--- a/bizmatch/src/app/pages/subscription/favorites/favorites.component.html
+++ b/bizmatch/src/app/pages/subscription/favorites/favorites.component.html
@@ -21,9 +21,9 @@
            <td class="py-2 px-4">{{ $any(listing).title }}</td>
            <td class="py-2 px-4">{{ $any(listing).listingsCategory === 'commercialProperty' ? 'Commercial Property' :
              'Business' }}</td>
-            <td class="py-2 px-4">{{ listing.location ? (listing.location.name ? listing.location.name : listing.location.county) : '—' }}, {{
-              listing.location?.state || '' }}</td>
-            <td class="py-2 px-4">${{ $any(listing).price ? $any(listing).price.toLocaleString() : 'Price on Request' }}</td>
+            <td class="py-2 px-4">{{ listing.location.name ? listing.location.name : listing.location.county }}, {{
+              listing.location.state }}</td>
+            <td class="py-2 px-4">${{ $any(listing).price.toLocaleString() }}</td>
            <td class="py-2 px-4 flex">
              @if($any(listing).listingsCategory==='business'){
              <button class="bg-green-500 text-white w-10 h-10 flex items-center justify-center rounded-full mr-2"
@@ -74,9 +74,9 @@
        <h2 class="text-xl font-semibold mb-2">{{ $any(listing).title }}</h2>
        <p class="text-gray-600 mb-2">Category: {{ $any(listing).listingsCategory === 'commercialProperty' ? 'Commercial
          Property' : 'Business' }}</p>
-        <p class="text-gray-600 mb-2">Located in: {{ listing.location ? (listing.location.name ? listing.location.name :
-          listing.location.county) : '—' }}, {{ listing.location?.state || '' }}</p>
-        <p class="text-gray-600 mb-2">Price: ${{ $any(listing).price ? $any(listing).price.toLocaleString() : 'Price on Request' }}</p>
+        <p class="text-gray-600 mb-2">Located in: {{ listing.location.name ? listing.location.name :
+          listing.location.county }}, {{ listing.location.state }}</p>
+        <p class="text-gray-600 mb-2">Price: ${{ $any(listing).price.toLocaleString() }}</p>
        <div class="flex justify-start">
          @if($any(listing).listingsCategory==='business'){
          <button class="bg-green-500 text-white w-10 h-10 flex items-center justify-center rounded-full mr-2"
--- a/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
+++ b/bizmatch/src/app/pages/subscription/my-listing/my-listing.component.html
@@ -72,7 +72,7 @@
          <tr *ngFor="let listing of myListings" class="border-b">
            <td class="py-2 px-4">{{ listing.title }}</td>
            <td class="py-2 px-4">{{ listing.listingsCategory === 'commercialProperty' ? 'Commercial Property' : 'Business' }}</td>
-            <td class="py-2 px-4">{{ listing.location ? (listing.location.name ? listing.location.name : listing.location.county ? listing.location.county : selectOptions.getState(listing.location.state)) : '—' }}</td>
+            <td class="py-2 px-4">{{ listing.location.name ? listing.location.name : listing.location.county ? listing.location.county : this.selectOptions.getState(listing.location.state) }}</td>
            <td class="py-2 px-4">${{ listing.price ? listing.price.toLocaleString() : '' }}</td>
            <td class="py-2 px-4 flex justify-center">
              {{ listing.internalListingNumber ?? '—' }}
@@ -132,7 +132,7 @@
        <h2 class="text-xl font-semibold mb-2">{{ listing.title }}</h2>
        <p class="text-gray-600 mb-2">Category: {{ listing.listingsCategory === 'commercialProperty' ? 'Commercial Property' : 'Business' }}</p>
        <p class="text-gray-600 mb-2">Located in: {{ listing.location?.name ? listing.location.name : listing.location?.county }} - {{ listing.location?.state }}</p>
-        <p class="text-gray-600 mb-2">Price: ${{ listing.price ? listing.price.toLocaleString() : 'Price on Request' }}</p>
+        <p class="text-gray-600 mb-2">Price: ${{ listing.price.toLocaleString() }}</p>
        <p class="text-gray-600 mb-2">Internal #: {{ listing.internalListingNumber ?? '—' }}</p>
        <div class="flex items-center gap-2 mb-2">
          <span class="text-gray-600">Publication Status:</span>
--- a/bizmatch/src/index.html
+++ b/bizmatch/src/index.html
@@ -66,39 +66,7 @@
  <!-- Note: Organization and WebSite schemas are now injected dynamically by SeoService -->
  <!-- with more complete data (telephone, foundingDate, knowsAbout, dual search actions) -->

-  <!-- LocalBusiness Schema for local visibility -->
-  <script type="application/ld+json">
-    {
-      "@context": "https://schema.org",
-      "@type": "LocalBusiness",
-      "@id": "https://www.bizmatch.net/#localbusiness",
-      "name": "BizMatch",
-      "description": "Business brokerage and commercial real estate marketplace connecting buyers and sellers across the United States.",
-      "url": "https://www.bizmatch.net",
-      "logo": "https://www.bizmatch.net/assets/images/bizmatch-logo.png",
-      "image": "https://www.bizmatch.net/assets/images/bizmatch-logo.png",
-      "priceRange": "$$",
-      "address": {
-        "@type": "PostalAddress",
-        "streetAddress": "1001 Blucher Street",
-        "addressLocality": "Corpus Christi",
-        "addressRegion": "TX",
-        "postalCode": "78401",
-        "addressCountry": "US"
-      },
-      "geo": {
-        "@type": "GeoCoordinates",
-        "latitude": "27.7876",
-        "longitude": "-97.3940"
-      },
-      "areaServed": {
-        "@type": "Country",
-        "name": "United States"
-      },
-      "serviceType": ["Business Brokerage", "Commercial Real Estate", "Business For Sale Listings"],
-      "knowsAbout": ["Business Sales", "Commercial Properties", "Franchise Opportunities", "Business Valuation"]
-    }
-  </script>
+
 </head>

 <body class="flex flex-col min-h-screen">
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,40 +1,39 @@
 services:
-  # --- FRONTEND (SSR) ---
+  # --- FRONTEND ---
  bizmatch-ssr:
    build:
-      context: .
+      context: .                   # Pfad zum Angular Ordner
      dockerfile: bizmatch/Dockerfile
+    image: bizmatch-ssr
    container_name: bizmatch-ssr
+    extra_hosts:
+      - "localhost:host-gateway"    
    restart: unless-stopped
-    # In der Produktion brauchen wir keine Ports nach außen (Caddy regelt das intern)
-    networks:
-      - bizmatch
-    volumes:
-      - ./bizmatch-server/pictures:/app/pictures
+    ports:
+      - '4200:4000'                # Extern 4200 -> Intern 4000 (SSR)
    environment:
      NODE_ENV: production
-      # WICHTIG: Die URL, unter der das SSR-Frontend die API intern erreicht
-      API_INTERNAL_URL: http://bizmatch-app:3001
+    volumes:
+      - ./bizmatch-server/pictures:/app/pictures

  # --- BACKEND ---
  app:
    build:
-      context: ./bizmatch-server
+      context: ./bizmatch-server   # Pfad zum NestJS Ordner
      dockerfile: Dockerfile
+    image: bizmatch-server:latest
    container_name: bizmatch-app
    restart: unless-stopped
+    ports:
+      - '3001:3001'
    env_file:
-      - ./bizmatch-server/.env
-    environment:
-      # MUST match the container-side path of the volume mount below
-      PICTURES_DIR: /app/dist/pictures
+      - ./bizmatch-server/.env     # Pfad zur .env Datei
    depends_on:
      - postgres
    networks:
      - bizmatch
-    volumes:
-      # Das Backend braucht ebenfalls Zugriff auf den Bilder-Ordner zum Speichern!
-      - ./bizmatch-server/pictures:/app/dist/pictures 
+    # WICHTIG: Kein Volume Mapping für node_modules im Prod-Modus!
+    # Das Image bringt alles fertig mit.

  # --- DATABASE ---
  postgres:
@@ -45,12 +44,19 @@ services:
      - bizmatch-db-data:/var/lib/postgresql/data
    env_file:
      - ./bizmatch-server/.env
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    ports:
+      - '5434:5432'
    networks:
      - bizmatch

 volumes:
  bizmatch-db-data:
+    driver: local

 networks:
  bizmatch:
-    external: true # Wir nutzen das gleiche Netzwerk wie für Caddy
+    external: false  # Oder true, falls du es manuell erstellt hast