diff options
| -rw-r--r-- | ufund-api/src/main/resources/application.properties | 6 | ||||
| -rw-r--r-- | ufund-ui/src/app/components/dashboard/dashboard.component.html | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/ufund-api/src/main/resources/application.properties b/ufund-api/src/main/resources/application.properties index 70cb171..2679f88 100644 --- a/ufund-api/src/main/resources/application.properties +++ b/ufund-api/src/main/resources/application.properties @@ -1,9 +1,9 @@ # rename to application.properties server.error.include-message=always -cupboard.file=data/cupboard.json -users.file=data/users.json -authKeys.file=data/userAuths.json +cupboard.file=ufund-api/data/cupboard.json +users.file=ufund-api/data/users.json +authKeys.file=ufund-api/data/userAuths.json spring.jackson.mapper.auto-detect-getters=false spring.jackson.mapper.auto-detect-setters=false diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html index c73849f..09dc311 100644 --- a/ufund-ui/src/app/components/dashboard/dashboard.component.html +++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html @@ -1,5 +1,4 @@ -<p>dashboard works!</p> -<ul> - <li><a routerLink="/cupboard">Go to the Cupboard</a></li> - <li><a routerLink="/basket">Go to my basket</a></li> -</ul> + +<h1>Dashboard</h1> +<app-cupboard></app-cupboard> +<app-funding-basket></app-funding-basket> |