diff options
| author | sowgro <tpoke.ferrari@gmail.com> | 2025-03-17 23:16:29 -0400 |
|---|---|---|
| committer | sowgro <tpoke.ferrari@gmail.com> | 2025-03-17 23:16:29 -0400 |
| commit | 68515441acd77d3356e8ec8b58700411661fec13 (patch) | |
| tree | f3e08e4eecb5c06c8149d56ca08253a3c2d92607 /ufund-ui/src/app/components/dashboard/dashboard.component.html | |
| parent | 7a5c5073e9e410b3ccc3ab7902a0d6f558277c7d (diff) | |
| parent | 275a6062007380389b7a8f1b8958e8033b4f0925 (diff) | |
| download | JellySolutions-68515441acd77d3356e8ec8b58700411661fec13.tar.gz JellySolutions-68515441acd77d3356e8ec8b58700411661fec13.tar.bz2 JellySolutions-68515441acd77d3356e8ec8b58700411661fec13.zip | |
Merge remote-tracking branch 'refs/remotes/origin/main' into funding_basket
# Conflicts:
# ufund-ui/src/app/components/funding-basket/funding-basket.component.ts
Diffstat (limited to 'ufund-ui/src/app/components/dashboard/dashboard.component.html')
| -rw-r--r-- | ufund-ui/src/app/components/dashboard/dashboard.component.html | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ufund-ui/src/app/components/dashboard/dashboard.component.html b/ufund-ui/src/app/components/dashboard/dashboard.component.html index 9c5fce9..fc8baf0 100644 --- a/ufund-ui/src/app/components/dashboard/dashboard.component.html +++ b/ufund-ui/src/app/components/dashboard/dashboard.component.html @@ -1 +1,5 @@ -<p>dashboard works!</p> + +<h1>Dashboard</h1> +<input type="button" value="Back to Login" (click)="back()"> +<app-cupboard></app-cupboard> +<app-funding-basket></app-funding-basket>
\ No newline at end of file |