Commit graph

140 commits

Author SHA1 Message Date
jastornig
ea64b54de2 Merge branch 'fix-category-search-on-home' into 'main'
fix: category search input cannot be cleared

See merge request thschleicher/interaktive-systeme!50
2024-01-05 21:47:19 +00:00
Jakob Stornig
457b098883 fix: category search input cannot be cleared 2024-01-05 22:44:21 +01:00
jastornig
050446f971 Merge branch 'fix-loading-symbol' into 'main'
Fix loading symbol

See merge request thschleicher/interaktive-systeme!49
2024-01-05 20:35:22 +00:00
jastornig
bb37035e3b Merge branch 'main' into 'fix-loading-symbol'
# Conflicts:
#   app/(tabs)/budget/category.tsx
#   components/common/loadingSymbol.tsx
2024-01-05 20:34:49 +00:00
Jakob Stornig
7dd17798c4 fix last issues 2024-01-05 21:33:13 +01:00
Thomas Schleicher
a59958d618 Merge branch '59-implement-updating-a-category' into 'main'
Resolve "implement updating a category"

Closes #59

See merge request thschleicher/interaktive-systeme!48
2024-01-05 19:56:55 +00:00
Thomas Schleicher
d7bb318c24 Resolve "implement updating a category" 2024-01-05 19:56:55 +00:00
thschleicher
497c556a87 removed "entered" log, fixed loading symbol, implemented category update with editing 2024-01-05 20:53:47 +01:00
jastornig
0ddfe3e606 Update .gitlab-ci.yml file 2024-01-05 18:41:42 +00:00
Jakob Stornig
67cc3d3c29 update ci 2024-01-05 19:20:54 +01:00
jastornig
8ff3435c2b Merge branch '53-loading-simple' into 'main'
Resolve "loading simple"

Closes #53

See merge request thschleicher/interaktive-systeme!40
2024-01-05 16:46:33 +00:00
jastornig
123e358f9e Merge branch '57-implement-and-split-edit-category-from-add-category' into 'main'
Resolve "Implement and Split edit Category from add Category"

Closes #57

See merge request thschleicher/interaktive-systeme!46
2024-01-05 16:45:25 +00:00
Thomas Schleicher
d3b7c61c67 Resolve "Implement and Split edit Category from add Category" 2024-01-05 16:45:25 +00:00
jastornig
bf939fb807 Merge branch '56-edit-expense' into 'main'
Resolve "edit Expense"

Closes #56

See merge request thschleicher/interaktive-systeme!43
2024-01-05 14:37:15 +00:00
Jakob Stornig
5b71fa74b1 feat: edit expense 2024-01-05 15:26:09 +01:00
jastornig
21ea0bfe07 Merge branch '58-stats-page-database-connection' into 'main'
Resolve "stats page, database connection"

Closes #58

See merge request thschleicher/interaktive-systeme!47
2024-01-05 13:56:58 +00:00
Walcher
c0a70a0ed5 finishing up 2024-01-05 14:52:20 +01:00
Walcher
8b68a7b7b0 made it possible to pass an override backgroundcolor to widget 2024-01-05 14:50:33 +01:00
Walcher
7e29e4f016 added "Financial" Advice 2024-01-05 14:43:15 +01:00
Walcher
d9db03af61 added SavingsOverview 2024-01-05 14:32:41 +01:00
Walcher
9544b3eabb added database connection 2024-01-05 14:32:30 +01:00
Walcher
cec3a4d238 add savings mock data to DEV_populateDatabase 2024-01-05 14:23:47 +01:00
Thomas Schleicher
99f3fbcaa7 Merge branch '54-categories-detailed-view-on-press' into 'main'
Resolve "Categories, detailed view on Press"

Closes #54

See merge request thschleicher/interaktive-systeme!45
2024-01-05 12:27:56 +00:00
Thomas Schleicher
412e88d007 Resolve "Categories, detailed view on Press" 2024-01-05 12:27:56 +00:00
Thomas Schleicher
b927b0e8a0 Merge branch 'repair' into 'main'
fixed the budget element and implemented onPress

See merge request thschleicher/interaktive-systeme!44
2024-01-05 10:05:27 +00:00
thschleicher
7606c5d1b8 fixed the budget element and implemented onPress 2024-01-05 10:52:02 +01:00
jastornig
deda54152b Update .gitlab-ci.yml file 2024-01-05 00:55:22 +00:00
jastornig
404ad5a928 Update .gitlab-ci.yml file 2024-01-05 00:53:09 +00:00
jastornig
afb52998d9 Merge branch '50-plusscreen' into 'main'
Resolve "PlusScreen"

Closes #50

See merge request thschleicher/interaktive-systeme!39
2024-01-05 00:05:20 +00:00
Jakob Stornig
c240febec8 fix: no space on modal search bar 2024-01-05 00:46:40 +01:00
Jakob Stornig
36679279c1 feat: Add expense screen 2024-01-05 00:46:40 +01:00
Jakob Stornig
e1efed5b21 changed name of SearchBar to TextInputBar 2024-01-05 00:39:52 +01:00
Jakob Stornig
5876fcaf8e feat: now has onchange functionality. clear works now 2024-01-05 00:37:06 +01:00
Jakob Stornig
93d16fc08a feat: amountField 2024-01-05 00:37:06 +01:00
Thomas Schleicher
0ea9acde38 Merge branch '52-add-category-modal' into 'main'
Resolve "Add Category Modal"

Closes #52

See merge request thschleicher/interaktive-systeme!38
2024-01-03 17:31:59 +00:00
Thomas Schleicher
9204d6f235 Resolve "Add Category Modal" 2024-01-03 17:31:59 +00:00
carol
3f864c8922 circle 2024-01-02 16:31:34 +01:00
jastornig
d2837c12b3 Merge branch '51-skill-issue' into 'main'
Resolve "skill issue"

Closes #51

See merge request thschleicher/interaktive-systeme!36
2024-01-02 13:51:52 +00:00
Jakob Stornig
a51dee6795 fix: image not shown 2024-01-02 14:50:42 +01:00
Walcher
62e71d1b49 everything refactored 2024-01-02 14:38:47 +01:00
jastornig
e0b99b41f3 Update .gitlab-ci.yml file 2024-01-02 13:24:10 +00:00
jastornig
5ba46cb3b3 Update .gitlab-ci.yml file 2024-01-02 13:20:31 +00:00
jastornig
0240eb2562 Merge branch '5-budget' into 'main'
Resolve "Budget"

Closes #5

See merge request thschleicher/interaktive-systeme!29
2024-01-02 12:49:13 +00:00
Thomas Schleicher
69610de100 Resolve "Budget" 2024-01-02 12:49:13 +00:00
jastornig
645b805aa7 Update .gitlab-ci.yml file 2023-12-31 18:51:01 +00:00
jastornig
e209918232 Update .gitlab-ci.yml file 2023-12-31 18:46:05 +00:00
jastornig
9dceb2e6ae Update .gitlab-ci.yml file 2023-12-31 18:42:42 +00:00
jastornig
b036fb51a1 Update .gitlab-ci.yml file 2023-12-31 18:37:48 +00:00
jastornig
953d2f2a56 Update .gitlab-ci.yml file 2023-12-31 18:00:57 +00:00
jastornig
8ba8f036ef Update .gitlab-ci.yml file 2023-12-31 17:37:02 +00:00