Shared services

projects/common/src/fm/models/list.item.acl.rights.ts

@@ -1,5 +1,5 @@
-import { IItem } from '@farmmaps/common';
 import { IAclRights } from './acl.rights';
+import { IItem } from './item';
 
 export interface IListItemAclRights extends IItem {
   aclRights: IAclRights[]

projects/common/src/fm/models/shared.item.ts

@@ -1,4 +1,4 @@
-import { IUser } from '@farmmaps/common';
+import { IUser } from "../common.module";
 
 export interface ISharedItem {
     code: string,

projects/common/src/fm/services/cache-service.ts

@@ -1,8 +1,9 @@
 import { Injectable } from '@angular/core';
-import { IItem, ItemService } from '@farmmaps/common';
 import { OAuthService } from 'angular-oauth2-oidc';
 import { Observable, ReplaySubject, Subscription, timer } from 'rxjs';
 import { catchError, take } from 'rxjs/operators';
+import { IItem } from '../models/item';
+import { ItemService } from './item.service';
 
 const REFRESH_INTERVAL = 15 * 60 * 1000;  // 15m
 

projects/common/src/fm/services/shared-item.service.ts

@@ -1,9 +1,10 @@
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { AppConfig, IListItem } from '@farmmaps/common';
 import { Observable } from 'rxjs';
 import { IListItemAclRights } from '../models/list.item.acl.rights';
 import { ISharedItem } from '../models/shared.item';
+import { AppConfig } from '../shared/app.config';
+import { IListItem } from '../models/list.item';
 
 @Injectable({
   providedIn: 'root'

projects/common/src/fm/services/user-data.service.ts

@@ -1,7 +1,8 @@
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { AppConfig, IUser } from '@farmmaps/common';
 import { Observable } from 'rxjs';
+import { AppConfig } from '../shared/app.config';
+import { IUser } from '../models/user';
 
 @Injectable({
   providedIn: 'root'