Merge remote-tracking branch 'refs/remotes/origin/main' into funding_basket

# Conflicts:
#	ufund-ui/src/app/components/funding-basket/funding-basket.component.ts

1 files changed, 8 insertions, 2 deletions

diff --git a/ufund-ui/src/app/models/User.ts b/ufund-ui/src/app/models/User.ts
index 46fe4a1..b640e04 100644
--- a/ufund-ui/src/app/models/User.ts
+++ b/ufund-ui/src/app/models/User.ts
@@ -1,6 +1,12 @@
 import {Need} from './Need';
 
+export enum userType {
+    HELPER,
+    MANAGER
+}
+
 export interface User {
-  username: string;
-  cupboard: Need[];
+    username: string;
+    basket: Need[];
+    type: userType
 }