Commit graph

162 commits

Author SHA1 Message Date
Walcher
bdc2ca22f6 Refactor category type to use enum 2024-01-25 19:34:44 +01:00
Tocuro
6ca505d505 updated Database.ts to use ENUM for Category Type 2024-01-25 19:32:55 +01:00
Tocuro
114ad92818 ?? 2024-01-25 19:32:55 +01:00
jastornig
305e110da5 Merge branch '67-date-filtering-on-home-screen' into 'main'
Resolve "date filtering on home screen"

Closes #67

See merge request thschleicher/interaktive-systeme!58
2024-01-25 18:28:17 +00:00
jastornig
4ec0f214f7 Merge branch 'main' into '67-date-filtering-on-home-screen'
# Conflicts:
#   components/index.tsx
2024-01-25 18:26:46 +00:00
Jakob Stornig
8149ec234f A few changes:
Auto fill amount category edit
Empty list component
calendar filtering
in category screen, expenses can be added directly
2024-01-25 19:18:15 +01:00
Thomas Schleicher
0edc962bc9 Merge branch '66-graph' into 'main'
Resolve "graph"

Closes #66

See merge request thschleicher/interaktive-systeme!57
2024-01-25 17:50:49 +00:00
thschleicher
0e22e63ce9 graph works + unmount on blur 2024-01-25 18:49:24 +01:00
thschleicher
4b06a217c5 graph works 2024-01-25 18:39:16 +01:00
thschleicher
84dbae49c1 graph working kinda 2024-01-25 17:33:02 +01:00
thschleicher
ab2ef25615 first attempt at graph 2024-01-25 17:20:56 +01:00
jastornig
e0f3cf947c Merge branch '65-filter-on-budget-screen' into 'main'
Resolve "filter on budget screen"

Closes #65

See merge request thschleicher/interaktive-systeme!56
2024-01-25 15:44:07 +00:00
Jakob Stornig
716a41cffd feat: filter by name category 2024-01-25 16:42:43 +01:00
jastornig
79405f318d Merge branch '63-routing-back-refresh' into 'main'
Resolve "Routing Back Refresh"

Closes #63

See merge request thschleicher/interaktive-systeme!54
2024-01-25 15:16:13 +00:00
Thomas Schleicher
62a1267f1e Merge branch '64-delete-cateogry-button-on-edit-screen' into 'main'
Resolve "delete-cateogry-button-on-edit-screen"

Closes #64

See merge request thschleicher/interaktive-systeme!55
2024-01-25 15:15:15 +00:00
Jakob Stornig
c46eec06a5 Fix: refresh 2024-01-25 16:11:04 +01:00
thschleicher
7fecf8c5d9 implemented delete button and fixed routing interaction with db 2024-01-25 16:06:52 +01:00
thschleicher
4ddc76faa4 fixed euro sign on expense item (dont judge me I know this isnt the correct branch) and fixed the async storage so it acctually loads on the info 2024-01-25 15:38:50 +01:00
jastornig
7a77b9ca79 Merge branch 'filter-on-home-screen' into 'main'
feat: filter functionality on Home screen

See merge request thschleicher/interaktive-systeme!53
2024-01-20 16:04:09 +00:00
Jakob Stornig
bc3d243ffc feat: filter functionality on Home screen
Long press on any day to remove filter
2024-01-20 17:01:08 +01:00
jastornig
b27b178308 Merge branch 'fix-navigation' into 'main'
Major refactoring: navigation does not break anymore. the user can now...

See merge request thschleicher/interaktive-systeme!52
2024-01-20 11:03:48 +00:00
Jakob Stornig
1beee68bff Major refactoring: navigation does not break anymore. the user can now navigate between the tabs without loosing context 2024-01-20 11:54:25 +01:00
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