Skip to content

Merge Main to viewHistory #42

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ppywan wants to merge 112 commits into
base: viewHistory
Choose a base branch
from
Open

Merge Main to viewHistory #42

Show file tree
Hide file tree
Changes from 44 commits
Commits
Show all changes
112 commits
Select commit Hold shift + click to select a range
ad0b45c
Rough AutoSave GUI
angelajj465 Nov 11, 2025
0ce0ea6
Created GroupViewFrame with Join Group, Create Group, and view My Gro…
infrared92 Nov 12, 2025
c2a8075
UI for Join Group created. (2.1)
infrared92 Nov 13, 2025
94483e5
UI for CreateGroupFrame created. (2.2)
infrared92 Nov 13, 2025
521816f
initial commit:
amyjqian Nov 10, 2025
84a9f5c
renamed
amyjqian Nov 11, 2025
752abb4
added participants field
amyjqian Nov 11, 2025
fd31873
saving local changes before rebasing
angelajj465 Nov 13, 2025
8c4acfd
Moved AutoSave.java into src folder
angelajj465 Nov 13, 2025
2ccfbbd
Added AutoSave panel and demo frame.
angelajj465 Nov 13, 2025
ad91978
Save AutoSave panel.
angelajj465 Nov 13, 2025
ce5c44b
Settle Up - Suggested Payments UI
Lucy-1123 Nov 13, 2025
1d36af7
Attribute Settled added for Expense class
Lucy-1123 Nov 13, 2025
5ba7893
Merge pull request #11 from amyjqian/group_view_v1
infrared92 Nov 14, 2025
23d87af
Merge pull request #12 from amyjqian/Mark-as-Settled
infrared92 Nov 14, 2025
01cc0dc
Merge pull request #13 from amyjqian/viewHistory
infrared92 Nov 14, 2025
ea035d2
Update README with group members information
infrared92 Nov 15, 2025
24db284
Bring correct file from AutoSaveGUI
angelajj465 Nov 15, 2025
31834ad
Deleted wrong AutoSave file
angelajj465 Nov 15, 2025
6b55af8
Changed package from "view" to "main.view"
infrared92 Nov 16, 2025
e7c4819
Merge remote-tracking branch 'origin/ui_v1' into ui_v1
infrared92 Nov 16, 2025
3141468
Changed UI text
infrared92 Nov 16, 2025
2ddf01b
Changed UI text
infrared92 Nov 16, 2025
a318fc7
Merge pull request #29 from amyjqian/ui_v1
infrared92 Nov 16, 2025
92f0ff6
added use cases
infrared92 Nov 16, 2025
2d2c3cf
Created template for categorization
hanekawatsubasasuperfan Nov 17, 2025
a8c3bc2
temp commit: workspace changes
angelajj465 Nov 17, 2025
94a9c23
Remove misc/xml merge conflict
angelajj465 Nov 17, 2025
06514e2
save current work.
angelajj465 Nov 17, 2025
227fe3a
Stop tracking IDE and build files.
angelajj465 Nov 17, 2025
524b4e2
stop tracking compiled .class files
angelajj465 Nov 17, 2025
03989bd
save local changes temporarily
angelajj465 Nov 17, 2025
ca9095c
Merge branch 'main' into AutoSaveGUI
angelajj465 Nov 17, 2025
ab694d2
AutoSave use case implementation.
angelajj465 Nov 18, 2025
491493d
changed participants to checkbox menu
amyjqian Nov 18, 2025
582ea8a
Created mock text and interactor for create_group
infrared92 Nov 18, 2025
7f33d80
added .iml file
amyjqian Nov 18, 2025
0196236
added .xml file
amyjqian Nov 18, 2025
d41ee0a
Added a boolean settled attribute + isSettled() method
Lucy-1123 Nov 18, 2025
f73e6cd
Added a getExpense() method
Lucy-1123 Nov 18, 2025
79e438c
Merge branch 'main' into modify_expense_entity
infrared92 Nov 18, 2025
0e7fea1
Merge pull request #31 from amyjqian/modify_expense_entity
infrared92 Nov 18, 2025
6b0a19c
Merge branch 'main' into Settle-Entity-Changes
infrared92 Nov 18, 2025
98c53c5
Merge pull request #33 from amyjqian/Settle-Entity-Changes
infrared92 Nov 18, 2025
b8b538b
changes
amyjqian Nov 18, 2025
c0ded6f
Merge branch 'main' into feat/participants
amyjqian Nov 18, 2025
1ac08fc
Merge pull request #30 from amyjqian/feat/participants
amyjqian Nov 18, 2025
cc02b91
expense frame
amyjqian Nov 18, 2025
65c954b
Added a setSettled() method for marking expenses as settled
Lucy-1123 Nov 18, 2025
a1fb0bc
AutoSave usecase.
angelajj465 Nov 18, 2025
1476e4e
changed group entity
amyjqian Nov 18, 2025
cbcc2ff
Merge branch 'main' into Settle-Entity-Changes
infrared92 Nov 18, 2025
0c11b39
Merge pull request #34 from amyjqian/Settle-Entity-Changes
infrared92 Nov 18, 2025
5732af5
save local changes before merging.
angelajj465 Nov 18, 2025
de64a08
Interface adapters added
infrared92 Nov 19, 2025
4f9c442
Generic ViewModel created
infrared92 Nov 19, 2025
4e2fb8b
CreateGroupViewModel created
infrared92 Nov 19, 2025
4b6c377
CreateGroup controller, interactor, state and view model updated
infrared92 Nov 20, 2025
4b7072a
gitignore changes.
angelajj465 Nov 20, 2025
9a0a4bd
add_expense usecase
amyjqian Nov 20, 2025
01a1543
expense entity
amyjqian Nov 20, 2025
ece76ae
add_expense usecase
amyjqian Nov 20, 2025
b04eb72
Pushing most recent changes.
infrared92 Nov 20, 2025
71a47a4
Updated entities to reflect API parameters
infrared92 Nov 23, 2025
c29f7d9
login
hanekawatsubasasuperfan Nov 24, 2025
5351956
Most recent versions of Group use cases
infrared92 Nov 25, 2025
82a5fa0
add expense usecase
amyjqian Nov 25, 2025
798253f
display data
hanekawatsubasasuperfan Nov 29, 2025
7796e5c
Most recent versions of Group use cases
infrared92 Nov 29, 2025
457e563
finish add expense usecase with api calls
amyjqian Nov 29, 2025
7a7c2eb
Updated controller and UI to update CreateGroup view
infrared92 Nov 30, 2025
dfb22fa
Controllers updated
infrared92 Nov 30, 2025
7527e64
Final presenters (without failure conditions)
infrared92 Nov 30, 2025
dd0e2fe
entities
amyjqian Nov 30, 2025
39a1077
entities - users
amyjqian Nov 30, 2025
fc9b9cb
Merge pull request #40 from amyjqian/add_expense
infrared92 Nov 30, 2025
04acec3
fixed groups
amyjqian Nov 30, 2025
2d89d23
fixed buildExpenseRequestBody
amyjqian Nov 30, 2025
de4974f
saving tests
angelajj465 Dec 1, 2025
b9a0a0c
gitignore changes
angelajj465 Dec 1, 2025
db00a28
changing .gitignore
angelajj465 Dec 1, 2025
e3fb156
Merge remote-tracking branch 'origin/main' into AutoSaveGUI
angelajj465 Dec 1, 2025
c94cdc9
update view to include description vs category
hanekawatsubasasuperfan Dec 1, 2025
db0961f
Everything but JoinGroup updated
infrared92 Dec 1, 2025
f50f087
add appbuilder
ppywan Dec 1, 2025
fcf6697
refactor
hanekawatsubasasuperfan Dec 1, 2025
50ab653
move AppBuilder
ppywan Dec 1, 2025
34ed2e0
refactor
hanekawatsubasasuperfan Dec 1, 2025
ecb2357
Merge remote-tracking branch 'origin/group_use-cases_without_join' in…
angelajj465 Dec 1, 2025
2f0d7d3
refactor
hanekawatsubasasuperfan Dec 1, 2025
7fcb757
Merge branch 'group_use-cases_without_join' of https://github.com/amy…
hanekawatsubasasuperfan Dec 1, 2025
57dbd12
add branch
ppywan Dec 1, 2025
62cd04e
update files
ppywan Dec 1, 2025
007bd5f
Merge branch 'group_use-cases_without_join' into pseudomain-with-view…
ppywan Dec 1, 2025
7cf6ee3
reorganized files
angelajj465 Dec 1, 2025
b922a61
merged group use-case without join
ppywan Dec 1, 2025
009cff9
merged AutoSaveGUI into pseudomain-with-view-history
angelajj465 Dec 1, 2025
510e310
deleted tests
angelajj465 Dec 1, 2025
4c24d0e
Delete .env
ppywan Dec 1, 2025
3e1cf9f
Merge branch 'pseudomain-with-view-history' of https://github.com/amy…
hanekawatsubasasuperfan Dec 1, 2025
65a959f
merge and add viewChart button
hanekawatsubasasuperfan Dec 2, 2025
91d5a91
Merge pull request #43 from amyjqian/displayData
infrared92 Dec 2, 2025
89b91a9
Delete src/main directory
hanekawatsubasasuperfan Dec 2, 2025
b8f680a
Merge pull request #46 from amyjqian/tanSiru-patch-2
angelajj465 Dec 2, 2025
e28a340
Delete java/use_case directory
hanekawatsubasasuperfan Dec 2, 2025
826b7e3
Merge pull request #48 from amyjqian/tanSiru-patch-4
amyjqian Dec 2, 2025
5c39ffe
Delete target/classes directory
hanekawatsubasasuperfan Dec 2, 2025
a1b7a22
Delete .idea directory
hanekawatsubasasuperfan Dec 2, 2025
b76faaf
Merge pull request #49 from amyjqian/tanSiru-patch-5
infrared92 Dec 2, 2025
01e3b46
Merge pull request #50 from amyjqian/tanSiru-patch-6
infrared92 Dec 2, 2025
d4236e3
Delete pom.xml
infrared92 Dec 2, 2025
06d7633
Merge pull request #51 from amyjqian/infrared92-patch-1
angelajj465 Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
git rm --cached .idea/workspace.xml
git rm --cached .idea/workspace.xml
git rm --cached bill-splitter-app.iml
8 changes: 8 additions & 0 deletions .idea/.gitignore
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 16 additions & 0 deletions .idea/checkstyle-idea.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 13 additions & 0 deletions .idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/encodings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 20 additions & 0 deletions .idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

124 changes: 124 additions & 0 deletions .idea/uiDesigner.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading