diff options
| author | sowgro <tpoke.ferrari@gmail.com> | 2025-03-17 17:17:06 -0400 |
|---|---|---|
| committer | sowgro <tpoke.ferrari@gmail.com> | 2025-03-17 17:17:06 -0400 |
| commit | baf4f2c0189d5c5f8ade40f0ceaed3ab7a7d4754 (patch) | |
| tree | e9213224b8f1b35b860f016a6a3d1318def8aae2 /ufund-ui/src/app/models | |
| parent | bf33fa3ca9f29b1e75cc077ae2eaaf4f5725e4b3 (diff) | |
| parent | d737551fba5617843f3014be6994490dd4328183 (diff) | |
| download | JellySolutions-baf4f2c0189d5c5f8ade40f0ceaed3ab7a7d4754.tar.gz JellySolutions-baf4f2c0189d5c5f8ade40f0ceaed3ab7a7d4754.tar.bz2 JellySolutions-baf4f2c0189d5c5f8ade40f0ceaed3ab7a7d4754.zip | |
Merge remote-tracking branch 'origin/main' into cupboard-component
# Conflicts:
# ufund-api/data/cupboard.json
# ufund-ui/src/app/app.module.ts
Diffstat (limited to 'ufund-ui/src/app/models')
| -rw-r--r-- | ufund-ui/src/app/models/Need.ts | 2 | ||||
| -rw-r--r-- | ufund-ui/src/app/models/User.ts | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/ufund-ui/src/app/models/Need.ts b/ufund-ui/src/app/models/Need.ts index c0425ec..9e97fd4 100644 --- a/ufund-ui/src/app/models/Need.ts +++ b/ufund-ui/src/app/models/Need.ts @@ -1,7 +1,7 @@ export interface Need { name: string, id: number, - filterAttributes: String[], + filterAttributes: string[], type: GoalType; maxGoal: number; current: number; 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 } |