Merge remote-tracking branch 'origin/main' into cupboard-component

# Conflicts:
#	ufund-api/data/cupboard.json
#	ufund-ui/src/app/app.module.ts

1 files changed, 7 insertions, 1 deletions

diff --git a/ufund-ui/src/app/models/User.ts b/ufund-ui/src/app/models/User.ts
index 46fe4a1..141f8aa 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';
 
+enum userType {
+    HELPER,
+    MANAGER
+}
+
 export interface User {
   username: string;
-  cupboard: Need[];
+  basket: Need[];
+  type: userType
 }