location eingebaut, back buttons angeglichen, paging & criteria korrigiert

bizmatch/src/app/pages/subscription/account/account.component.html

@@ -71,13 +71,14 @@
             <option *ngFor="let type of customerTypes" [value]="type">{{ type | titlecase }}</option>
           </select>
         </div> -->
-        @if (!isAdmin()){
-        <app-validated-select label="Customer Type" name="customerType" [(ngModel)]="user.customerType" [options]="customerTypeOptions"></app-validated-select>
-        }@else{
+        @if (isAdmin() && !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>
         </div>
+
+        }@else{
+        <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>

bizmatch/src/app/pages/subscription/account/account.component.ts

@@ -56,7 +56,7 @@ import { TOOLBAR_OPTIONS } from '../../utils/defaults';
   styleUrl: './account.component.scss',
 })
 export class AccountComponent {
-  private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
+  id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
   user: User;
   subscriptions: Array<Subscription>;
   userSubscriptions: Array<Subscription> = [];

bizmatch/src/app/pages/subscription/edit-business-listing/edit-business-listing.component.html

@@ -52,8 +52,10 @@
         </div>
       </div> -->
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <app-validated-ng-select label="State" name="state" [(ngModel)]="listing.location.state" [items]="selectOptions?.states"></app-validated-ng-select>
-        <app-validated-input label="City" name="city" [(ngModel)]="listing.location.city"></app-validated-input>
+        <!-- <app-validated-ng-select label="State" name="state" [(ngModel)]="listing.location.state" [items]="selectOptions?.states"></app-validated-ng-select>
+        <app-validated-input label="City" name="city" [(ngModel)]="listing.location.city"></app-validated-input> -->
+        <app-validated-city label="Location" name="location" [(ngModel)]="listing.location"></app-validated-city>
+        <app-validated-price label="Price" name="price" [(ngModel)]="listing.price"></app-validated-price>
       </div>
 
       <!-- <div class="flex mb-4 space-x-4">
@@ -83,8 +85,8 @@
         </div>
       </div> -->
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <app-validated-price label="Price" name="price" [(ngModel)]="listing.price"></app-validated-price>
         <app-validated-price label="Sales Revenue" name="salesRevenue" [(ngModel)]="listing.salesRevenue"></app-validated-price>
+        <app-validated-price label="Cash Flow" name="cashFlow" [(ngModel)]="listing.cashFlow"></app-validated-price>
       </div>
 
       <!-- <div class="mb-4">
@@ -99,9 +101,9 @@
           currencyMask
         />
       </div> -->
-      <div>
-        <app-validated-price label="Cash Flow" name="cashFlow" [(ngModel)]="listing.cashFlow"></app-validated-price>
-      </div>
+      <!-- <div>
+        
+      </div> -->
 
       <!-- <div class="flex mb-4 space-x-4">
         <div class="w-1/2">

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

@@ -17,6 +17,7 @@ import { AutoCompleteCompleteEvent, ImageProperty, createDefaultBusinessListing,
 
 import { environment } from '../../../../environments/environment';
 import { MessageService } from '../../../components/message/message.service';
+import { ValidatedCityComponent } from '../../../components/validated-city/validated-city.component';
 import { ValidatedInputComponent } from '../../../components/validated-input/validated-input.component';
 import { ValidatedNgSelectComponent } from '../../../components/validated-ng-select/validated-ng-select.component';
 import { ValidatedPriceComponent } from '../../../components/validated-price/validated-price.component';
@@ -45,6 +46,7 @@ import { TOOLBAR_OPTIONS } from '../../utils/defaults';
     ValidatedNgSelectComponent,
     ValidatedPriceComponent,
     ValidatedTextareaComponent,
+    ValidatedCityComponent,
   ],
   providers: [],
   templateUrl: './edit-business-listing.component.html',

bizmatch/src/app/pages/subscription/edit-commercial-property-listing/edit-commercial-property-listing.component.html

@@ -35,8 +35,9 @@
         <label for="type" class="block text-sm font-bold text-gray-700 mb-1">Property Category</label>
         <ng-select [items]="typesOfCommercialProperty" bindLabel="name" bindValue="value" [(ngModel)]="listing.type" name="type"> </ng-select>
       </div> -->
-      <div>
+      <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
         <app-validated-ng-select label="Property Category" name="type" [(ngModel)]="listing.type" [items]="typesOfCommercialProperty"></app-validated-ng-select>
+        <app-validated-city label="Location" name="location" [(ngModel)]="listing.location"></app-validated-city>
       </div>
 
       <!-- <div class="flex mb-4 space-x-4">
@@ -49,10 +50,11 @@
           <input type="text" id="city" [(ngModel)]="listing.city" name="city" class="w-full p-2 border border-gray-300 rounded-md" />
         </div>
       </div> -->
-      <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-        <app-validated-ng-select label="State" name="state" [(ngModel)]="listing.location.state" [items]="selectOptions?.states"></app-validated-ng-select>
-        <app-validated-input label="City" name="city" [(ngModel)]="listing.location.city"></app-validated-input>
-      </div>
+      <!-- <div class="grid grid-cols-1 md:grid-cols-2 gap-4"> -->
+      <!-- <app-validated-ng-select label="State" name="state" [(ngModel)]="listing.location.state" [items]="selectOptions?.states"></app-validated-ng-select>
+        <app-validated-input label="City" name="city" [(ngModel)]="listing.location.city"></app-validated-input> -->
+
+      <!-- </div> -->
 
       <!-- <div class="flex mb-4 space-x-4">
         <div class="w-1/2">

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

@@ -21,6 +21,7 @@ import { ConfirmationComponent } from '../../../components/confirmation/confirma
 import { ConfirmationService } from '../../../components/confirmation/confirmation.service';
 import { DragDropMixedComponent } from '../../../components/drag-drop-mixed/drag-drop-mixed.component';
 import { MessageService } from '../../../components/message/message.service';
+import { ValidatedCityComponent } from '../../../components/validated-city/validated-city.component';
 import { ValidatedInputComponent } from '../../../components/validated-input/validated-input.component';
 import { ValidatedNgSelectComponent } from '../../../components/validated-ng-select/validated-ng-select.component';
 import { ValidatedPriceComponent } from '../../../components/validated-price/validated-price.component';
@@ -50,6 +51,7 @@ import { TOOLBAR_OPTIONS } from '../../utils/defaults';
     ValidatedQuillComponent,
     ValidatedNgSelectComponent,
     ValidatedPriceComponent,
+    ValidatedCityComponent,
   ],
   providers: [],
   templateUrl: './edit-commercial-property-listing.component.html',