aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java3
-rw-r--r--ufund-ui/src/app/components/cupboard/cupboard.component.ts2
-rw-r--r--ufund-ui/src/app/components/funding-basket/funding-basket.component.ts3
-rw-r--r--ufund-ui/src/app/services/users.service.ts5
4 files changed, 0 insertions, 13 deletions
diff --git a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
index ee7dbcf..6e900aa 100644
--- a/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
+++ b/ufund-api/src/main/java/com/ufund/api/ufundapi/persistence/UserFileDAO.java
@@ -80,19 +80,16 @@ public class UserFileDAO implements UserDAO {
@Override
public User updateUser(User user) throws IOException {
- System.out.println("HOW TO FORK AND KILL CHILD " + user);
synchronized (users) {
if (users.containsKey(user.getUsername())) {
// var old = users.put(user.getUsername(), user);
// user.copyPassword(old);
if (user.getNeeds() == null || user.getType() == null) {
- System.out.println("CRUTCH DATA");
User oldData = users.get(user.getUsername());
User crutch = new User(oldData.getUsername(), 0, new ArrayList<Integer>(), oldData.getType());
crutch.copyPassword(oldData);
users.put(user.getUsername(), crutch);
} else {
- System.out.println("GOOD DATA");
var old = users.put(user.getUsername(), user);
user.copyPassword(old);
}
diff --git a/ufund-ui/src/app/components/cupboard/cupboard.component.ts b/ufund-ui/src/app/components/cupboard/cupboard.component.ts
index 13eddad..24b3e2d 100644
--- a/ufund-ui/src/app/components/cupboard/cupboard.component.ts
+++ b/ufund-ui/src/app/components/cupboard/cupboard.component.ts
@@ -106,7 +106,6 @@ export class CupboardComponent implements OnInit {
console.log(need.id, need, "need updated");
this.cupboardService.updateNeed(need.id, need)
.pipe(catchError((ex, r) => {
- console.log(ex.status);
if (ex.status == 500) {
this.statusText.next("Fields cannot be blank");
} else if (ex.status == 400) {
@@ -142,7 +141,6 @@ export class CupboardComponent implements OnInit {
console.log("form submitted. creating need: ", need);
this.cupboardService.createNeed(need)
.pipe(catchError((ex, r) => {
- console.log(ex.status);
if (ex.status == 500) {
this.statusText.next("Fields cannot be blank");
} else if (ex.status == 400) {
diff --git a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
index 66b9fd1..e654711 100644
--- a/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
+++ b/ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
@@ -40,7 +40,6 @@ export class FundingBasketComponent implements OnInit {
this.isValid = true;
for (let c of document.getElementById("funding-basket")?.querySelectorAll('.contribution')!) {
let contribution = c as HTMLInputElement;
- console.log(contribution.value, contribution.id);
contribution.setAttribute("style","");
if ( contribution.value == '' || contribution.valueAsNumber <= 0) {
this.isValid = false;
@@ -52,11 +51,9 @@ export class FundingBasketComponent implements OnInit {
let contribution = c as HTMLInputElement;
let need = await firstValueFrom(this.cupboardService.getNeed(+contribution.id));
need.current +=+ contribution.value;
- console.log(need);
this.usersService.removeNeed(+need.id);
this.cupboardService.updateNeed(need.id, need)
.pipe(catchError((ex, r) => {
- console.log(ex.status);
if (ex.status == 500) {
this.statusText.next('Fields cannot be blank');
} else if (ex.status == 400) {
diff --git a/ufund-ui/src/app/services/users.service.ts b/ufund-ui/src/app/services/users.service.ts
index ddbd322..dba8185 100644
--- a/ufund-ui/src/app/services/users.service.ts
+++ b/ufund-ui/src/app/services/users.service.ts
@@ -45,10 +45,6 @@ export class UsersService {
}
updateUser(user: User): Observable<User> {
- console.log("REMOVING USER IN ANGULAR: ", user)
- console.log(user, user.basket)
- console.log(this.apiKey)
-
return this.http.put<User>(`${this.url}/${user.username}`,user, this.httpOptions2)
}
@@ -90,7 +86,6 @@ export class UsersService {
let newArr = this.basket.getValue().filter(v => v.id != id);
this.basket.next(newArr);
this.getCurrentUser()!.basket = newArr.map(need => need.id);
- console.log(this.getCurrentUser()!.basket)
this.updateUser(this.getCurrentUser()!).subscribe(() => {
this.refreshBasket();
error: (err: any) => {