From 4f896c94ba36446c76e84ed9f6e3163797ef6e40 Mon Sep 17 00:00:00 2001
From: William Newman <3382274+newmanw@users.noreply.github.com>
Date: Wed, 14 Aug 2024 11:12:47 -0600
Subject: [PATCH] Use core-lib User entity

---
 web-app/src/app/entities/user/entities.user.ts               | 5 -----
 .../app/ingress/authentication/authentication.component.ts   | 2 +-
 .../src/app/ingress/authentication/local/signup.component.ts | 2 +-
 web-app/src/app/ingress/ingress.component.ts                 | 4 ++--
 web-app/src/app/mage/mage.component.ts                       | 2 +-
 web-app/src/app/user/user.service.ts                         | 2 +-
 6 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 web-app/src/app/entities/user/entities.user.ts

diff --git a/web-app/src/app/entities/user/entities.user.ts b/web-app/src/app/entities/user/entities.user.ts
deleted file mode 100644
index 4d37bdb5b..000000000
--- a/web-app/src/app/entities/user/entities.user.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface User {
-  username: string
-  displayName: string,
-  active: boolean
-}
\ No newline at end of file
diff --git a/web-app/src/app/ingress/authentication/authentication.component.ts b/web-app/src/app/ingress/authentication/authentication.component.ts
index ee8b9dcd4..cdfbffddb 100644
--- a/web-app/src/app/ingress/authentication/authentication.component.ts
+++ b/web-app/src/app/ingress/authentication/authentication.component.ts
@@ -1,6 +1,6 @@
 import { Component, EventEmitter, Input, OnChanges, Output, SimpleChanges } from '@angular/core'
 import { Api, AuthenticationStrategy } from '../../api/api.entity'
-import { User } from '../../entities/user/entities.user'
+import { User } from 'core-lib-src/user'
 import * as _ from 'underscore'
 
 export interface AuthenticationEvent {
diff --git a/web-app/src/app/ingress/authentication/local/signup.component.ts b/web-app/src/app/ingress/authentication/local/signup.component.ts
index 4567efb91..0b7c25c5c 100644
--- a/web-app/src/app/ingress/authentication/local/signup.component.ts
+++ b/web-app/src/app/ingress/authentication/local/signup.component.ts
@@ -1,8 +1,8 @@
 import { Component, EventEmitter, Output } from '@angular/core';
 import { FormControl, FormGroup, Validators } from '@angular/forms';
 import { PasswordStrength } from '../../../entities/password/entities.password';
-import { User } from '../../../entities/user/entities.user';
 import { UserService } from '../../../user/user.service';
+import { User } from 'core-lib-src/user';
 
 export interface SignupEvent {
   reason: 'signup' | 'cancel'
diff --git a/web-app/src/app/ingress/ingress.component.ts b/web-app/src/app/ingress/ingress.component.ts
index 07ac4fc4f..154b19e78 100644
--- a/web-app/src/app/ingress/ingress.component.ts
+++ b/web-app/src/app/ingress/ingress.component.ts
@@ -4,12 +4,12 @@ import { ActivatedRoute } from '@angular/router'
 import { UserService } from '../user/user.service'
 import { AuthorizationEvent } from './authorization/authorization.component'
 import { LocalStorageService } from '../http/local-storage.service'
-import { User } from '../entities/user/entities.user'
 import { DiscalimeCloseEvent, DiscalimerCloseReason } from './disclaimer/disclaimer.component'
 import { animate, style, transition, trigger } from '@angular/animations'
 import { SignupEvent } from './authentication/local/signup.component'
-import { InitializedEvent } from './setup/initialize.component'
 import * as _ from 'underscore'
+import { User } from 'core-lib-src/user'
+import { InitializedEvent } from './intialize/initialize.component'
 
 enum IngressState {
   Initialize,
diff --git a/web-app/src/app/mage/mage.component.ts b/web-app/src/app/mage/mage.component.ts
index 2f3b3ecc8..036d0c9de 100644
--- a/web-app/src/app/mage/mage.component.ts
+++ b/web-app/src/app/mage/mage.component.ts
@@ -4,7 +4,7 @@ import { FilterService } from '../filter/filter.service';
 import { MatSidenav } from '@angular/material/sidenav';
 import { LocationService } from '../user/location/location.service';
 import { ActivatedRoute } from '@angular/router';
-import { User } from '../entities/user/entities.user';
+import { User } from 'core-lib-src/user';
 import * as _ from 'underscore';
 
 @Component({
diff --git a/web-app/src/app/user/user.service.ts b/web-app/src/app/user/user.service.ts
index 954ac722c..f12bc8187 100644
--- a/web-app/src/app/user/user.service.ts
+++ b/web-app/src/app/user/user.service.ts
@@ -4,7 +4,7 @@ import { Router } from '@angular/router'
 import { Observable, Subject } from 'rxjs'
 import { LocalStorageService } from '../http/local-storage.service'
 import { BYPASS_TOKEN } from '../http/token.interceptor'
-import { User } from '../entities/user/entities.user'
+import { User } from 'core-lib-src/user'
 
 @Injectable({
   providedIn: 'root'