change imports

This commit is contained in:
2024-02-29 10:49:08 -06:00
parent 5146c8e919
commit 2ce2c2e564
26 changed files with 124 additions and 355 deletions

View File

@@ -10,10 +10,10 @@ import { filter } from 'rxjs/operators';
import { FooterComponent } from './components/footer/footer.component';
import { KeycloakService } from './services/keycloak.service';
import { KeycloakEventType } from './models/keycloak-event';
import { ListingCriteria, User } from './models/main.model';
import { createGenericObject } from './utils/utils';
import onChange from 'on-change';
import { UserService } from './services/user.service';
import {ListingCriteria, User} from '../../../common-models/src/main.model'
@Component({
selector: 'app-root',
standalone: true,

View File

@@ -4,7 +4,6 @@ import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { InputTextModule } from 'primeng/inputtext';
import {StyleClassModule} from 'primeng/styleclass';
import { KeyValue } from '../../models/main.model';
import { DropdownModule } from 'primeng/dropdown';
import { FormsModule } from '@angular/forms';
import { UserService } from '../../services/user.service';

View File

@@ -6,11 +6,11 @@ import { MenubarModule } from 'primeng/menubar';
import { OverlayPanelModule } from 'primeng/overlaypanel';
import { environment } from '../../../environments/environment';
import { UserService } from '../../services/user.service';
import { User } from '../../models/main.model';
import { TabMenuModule } from 'primeng/tabmenu';
import { Observable } from 'rxjs';
import { faUserGear } from '@fortawesome/free-solid-svg-icons';
import { Router } from '@angular/router';
import { User } from '../../../../../common-models/src/main.model';
@Component({
selector: 'header',

View File

@@ -1 +0,0 @@
../../../../common-models/src/main.model.ts

View File

@@ -3,7 +3,6 @@ import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { InputTextModule } from 'primeng/inputtext';
import { StyleClassModule } from 'primeng/styleclass';
import { BusinessListing, InvestmentsListing, KeyValue, ListingCriteria, ProfessionalsBrokersListing, User } from '../../models/main.model';
import { SelectOptionsService } from '../../services/select-options.service';
import { DropdownModule } from 'primeng/dropdown';
import { FormsModule } from '@angular/forms';
@@ -19,6 +18,7 @@ import { ListingsService } from '../../services/listings.service';
import { UserService } from '../../services/user.service';
import onChange from 'on-change';
import { getCriteriaStateObject, getSessionStorageHandler } from '../../utils/utils';
import { ListingCriteria, ListingType, User } from '../../../../../common-models/src/main.model';
@Component({
selector: 'app-details',
standalone: true,
@@ -30,7 +30,7 @@ export class DetailsComponent {
// listings: Array<BusinessListing>;
private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
listing: BusinessListing|ProfessionalsBrokersListing|InvestmentsListing;
listing: ListingType;
user:User;
criteria:ListingCriteria
constructor(private activatedRoute: ActivatedRoute,private listingsService:ListingsService,private router:Router,private userService:UserService,public selectOptions: SelectOptionsService){

View File

@@ -1,6 +1,5 @@
import { Component } from '@angular/core';
import { DropdownModule } from 'primeng/dropdown';
import { KeyValue, ListingCriteria } from '../../models/main.model';
import { FormsModule } from '@angular/forms';
import { CommonModule } from '@angular/common';
import { BrowserAnimationsModule, NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -13,6 +12,7 @@ import { SelectOptionsService } from '../../services/select-options.service';
import { UserService } from '../../services/user.service';
import onChange from 'on-change';
import { getCriteriaStateObject, getSessionStorageHandler } from '../../utils/utils';
import { ListingCriteria } from '../../../../../common-models/src/main.model';
@Component({
selector: 'app-home',
standalone: true,

View File

@@ -3,7 +3,6 @@ import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { InputTextModule } from 'primeng/inputtext';
import { StyleClassModule } from 'primeng/styleclass';
import { BusinessListing, InvestmentsListing, KeyValue, ListingCriteria, ListingType, PageEvent, ProfessionalsBrokersListing, } from '../../models/main.model';
import { SelectOptionsService } from '../../services/select-options.service';
import { DropdownModule } from 'primeng/dropdown';
import { FormsModule } from '@angular/forms';
@@ -17,6 +16,7 @@ import onChange from 'on-change';
import { createGenericObject, getCriteriaStateObject, getSessionStorageHandler } from '../../utils/utils';
import { InitEditableRow } from 'primeng/table';
import { environment } from '../../../environments/environment';
import { ListingCriteria, ListingType } from '../../../../../common-models/src/main.model';
@Component({
selector: 'app-listings',
standalone: true,

View File

@@ -3,7 +3,6 @@ import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { InputTextModule } from 'primeng/inputtext';
import { StyleClassModule } from 'primeng/styleclass';
import { BusinessListing, KeyValue } from '../../models/main.model';
import { SelectOptionsService } from '../../services/select-options.service';
import { DropdownModule } from 'primeng/dropdown';
import { FormsModule } from '@angular/forms';

View File

@@ -3,7 +3,6 @@ import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { InputTextModule } from 'primeng/inputtext';
import { StyleClassModule } from 'primeng/styleclass';
import { BusinessListing, Invoice, KeyValue, Subscription, User } from '../../../models/main.model';
import { SelectOptionsService } from '../../../services/select-options.service';
import { DropdownModule } from 'primeng/dropdown';
import { FormsModule } from '@angular/forms';
@@ -24,6 +23,7 @@ import { lastValueFrom } from 'rxjs';
import { MessageService } from 'primeng/api';
import { environment } from '../../../../environments/environment';
import { FileUploadModule } from 'primeng/fileupload';
import { Invoice, Subscription, User } from '../../../../../../common-models/src/main.model';
@Component({

View File

@@ -3,7 +3,6 @@ import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { InputTextModule } from 'primeng/inputtext';
import { StyleClassModule } from 'primeng/styleclass';
import { BusinessListing, InvestmentsListing, Invoice, KeyValue, ProfessionalsBrokersListing, User } from '../../../models/main.model';
import { SelectOptionsService } from '../../../services/select-options.service';
import { DropdownModule } from 'primeng/dropdown';
import { FormsModule } from '@angular/forms';
@@ -26,6 +25,7 @@ import { ArrayToStringPipe } from '../../../pipes/array-to-string.pipe';
import { UserService } from '../../../services/user.service';
import { SharedModule } from '../../../shared/shared/shared.module';
import { MessageService } from 'primeng/api';
import { BusinessListing, ListingType, User } from '../../../../../../common-models/src/main.model';
@Component({
selector: 'create-listing',
standalone: true,
@@ -40,7 +40,7 @@ export class EditListingComponent {
location:string;
mode:'edit'|'create';
separator:'\n\n'
listing:BusinessListing|ProfessionalsBrokersListing|InvestmentsListing = createGenericObject<BusinessListing>();
listing:ListingType = createGenericObject<BusinessListing>();
private id: string | undefined = this.activatedRoute.snapshot.params['id'] as string | undefined;
user:User;
constructor(public selectOptions:SelectOptionsService,private router: Router,private activatedRoute: ActivatedRoute,private listingsService:ListingsService,public userService: UserService,private messageService: MessageService){

View File

@@ -3,7 +3,6 @@ import { ButtonModule } from 'primeng/button';
import { CheckboxModule } from 'primeng/checkbox';
import { InputTextModule } from 'primeng/inputtext';
import { StyleClassModule } from 'primeng/styleclass';
import { BusinessListing, Invoice, KeyValue, User } from '../../../models/main.model';
import { SelectOptionsService } from '../../../services/select-options.service';
import { DropdownModule } from 'primeng/dropdown';
import { FormsModule } from '@angular/forms';

View File

@@ -1,12 +1,12 @@
import { Component } from '@angular/core';
import { MenuAccountComponent } from '../../menu-account/menu-account.component';
import dataListings from '../../../../assets/data/listings.json';
import { BusinessListing, User } from '../../../models/main.model';
import { SharedModule } from '../../../shared/shared/shared.module';
import { UserService } from '../../../services/user.service';
import { lastValueFrom } from 'rxjs';
import { ListingsService } from '../../../services/listings.service';
import { SelectOptionsService } from '../../../services/select-options.service';
import { BusinessListing, User } from '../../../../../../common-models/src/main.model';
@Component({
selector: 'app-favorites',

View File

@@ -1,13 +1,13 @@
import { ChangeDetectorRef, Component } from '@angular/core';
import { MenuAccountComponent } from '../../menu-account/menu-account.component';
import dataListings from '../../../../assets/data/listings.json';
import { BusinessListing, ListingType, User } from '../../../models/main.model';
import { SharedModule } from '../../../shared/shared/shared.module';
import { UserService } from '../../../services/user.service';
import { ListingsService } from '../../../services/listings.service';
import { lastValueFrom } from 'rxjs';
import { SelectOptionsService } from '../../../services/select-options.service';
import { ConfirmationService, MessageService } from 'primeng/api';
import { BusinessListing, ListingType, User } from '../../../../../../common-models/src/main.model';
@Component({
selector: 'app-my-listing',
standalone: true,

View File

@@ -1,8 +1,8 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { Observable, lastValueFrom } from 'rxjs';
import { BusinessListing, ListingCriteria } from '../models/main.model';
import { environment } from '../../environments/environment';
import { BusinessListing, ListingCriteria } from '../../../../common-models/src/main.model';
@Injectable({
providedIn: 'root'

View File

@@ -1,9 +1,9 @@
import { Injectable } from '@angular/core';
import { KeyValue, KeyValueStyle } from '../models/main.model';
import { HttpClient } from '@angular/common/http';
import { InitEditableRow } from 'primeng/table';
import { lastValueFrom } from 'rxjs';
import { environment } from '../../environments/environment';
import { KeyValue, KeyValueStyle } from '../../../../common-models/src/main.model';
@Injectable({
providedIn: 'root',

View File

@@ -1,8 +1,8 @@
import { Injectable } from '@angular/core';
import { Observable } from 'rxjs';
import { Subscription } from '../models/main.model';
import { environment } from '../../environments/environment';
import { HttpClient } from '@angular/common/http';
import { Subscription } from '../../../../common-models/src/main.model';
@Injectable({
providedIn: 'root'

View File

@@ -3,8 +3,8 @@ import { Component } from '@angular/core';
import { jwtDecode } from 'jwt-decode';
import { Observable, distinctUntilChanged, filter, from, map } from 'rxjs';
import { CommonModule } from '@angular/common';
import { JwtToken, User } from '../models/main.model';
import { KeycloakService } from './keycloak.service';
import { JwtToken, User } from '../../../../common-models/src/main.model';
@Injectable({
providedIn: 'root'

View File

@@ -1,5 +1,5 @@
import { INFO, ConsoleFormattedStream, createLogger as _createLogger, stdSerializers } from "browser-bunyan";
import { ListingCriteria } from "../models/main.model";
import { ListingCriteria } from "../../../../common-models/src/main.model";
export function createGenericObject<T>(): T {
// Ein leeres Objekt vom Typ T erstellen