Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
138 commits
Select commit Hold shift + click to select a range
05e5e1a
Adding user account creation feature
Tbusk Jun 18, 2023
fb4bcda
Merge pull request #16 from Tbusk/account-creation
Tbusk Jun 18, 2023
0e306eb
Made new class and added 2 methods to it
etschulte Jun 23, 2023
0201409
Added comments to methods
etschulte Jun 23, 2023
b968354
Creating GUI for main application
Tbusk Jun 23, 2023
2be93fb
Adding pages for add item and import item
Tbusk Jun 24, 2023
7c56162
Updating UI of home and add item page
Tbusk Jun 24, 2023
748259d
Updating UI of estimate page
Tbusk Jun 24, 2023
827a63e
Made ExpenserMain not abstract
etschulte Jun 24, 2023
0b3f172
Merge pull request #20 from Tbusk/ExpenserMain
Tbusk Jun 24, 2023
13694c2
Added Expense feature
etschulte Jun 24, 2023
7b868dd
Updated UI of reports and implemented some functionality
Tbusk Jun 25, 2023
e879f97
Changed month input for income from field to combobox
Tbusk Jun 25, 2023
64f8ad2
Adding comments to file and making slight improvements
Tbusk Jun 25, 2023
5a7d565
Refactoring methods to make use of ExpenserMain
Tbusk Jun 25, 2023
f6af479
Adding methods useful for getting and setting information
Tbusk Jun 25, 2023
df01125
Adding Javadoc comments
Tbusk Jun 25, 2023
545a273
Fixed the Expense feature
etschulte Jun 25, 2023
218e617
Updated methods to return values
etschulte Jun 25, 2023
f330373
Updated parameters
etschulte Jun 25, 2023
337aad0
Merge pull request #21 from Tbusk/ExpenserMain
Tbusk Jun 25, 2023
ad355a9
Updating ExpenserMain with methods
Tbusk Jun 25, 2023
153146c
Fixing merge conflict
Tbusk Jun 26, 2023
bbaaa51
Reapplying User methods to ExpenserMain
Tbusk Jun 26, 2023
0498490
Updating Spacing
Tbusk Jun 26, 2023
e367b25
Refixing merge conflict
Tbusk Jun 26, 2023
229c13c
Adding back data to ExpenserMain
Tbusk Jun 26, 2023
4e8c9f8
Merge branch 'master' into report_gui
Tbusk Jun 26, 2023
0a851eb
Fixing method name conflicts in EWalletAPp
Tbusk Jun 26, 2023
10526cf
Fixing method name conflicts in EWalletApp and User
Tbusk Jun 26, 2023
8301ee8
Feature: Export to CSV + Income and Export Report Filtering
Tbusk Jun 26, 2023
49b197c
Merge pull request #22 from Tbusk/report_gui
Tbusk Jun 26, 2023
20307cf
Added methods to filter income and expense ArrayLists
etschulte Jun 27, 2023
6b6a858
Merge pull request #23 from Tbusk/reports
Tbusk Jun 27, 2023
670671d
Tweaking GUI to use new methods
Tbusk Jun 28, 2023
32a364c
Merge pull request #24 from Tbusk/report_gui
Tbusk Jun 28, 2023
a9ea2b7
Adding file import file reading
Tbusk Jun 29, 2023
6f10831
Refactoring update table methods + updating table on import
Tbusk Jun 30, 2023
36ae23c
Updating type filter in income report panel upon import
Tbusk Jun 30, 2023
43aca32
Updating detailed reports + adding comments + dialog boxes for import…
Tbusk Jun 30, 2023
a828043
Removed unused method
Tbusk Jun 30, 2023
9903895
Merge pull request #25 from Tbusk/import_income
Tbusk Jun 30, 2023
9d4465c
Adding feature: import expenses from csv + refactoring
Tbusk Jul 1, 2023
21f028a
Merge pull request #26 from Tbusk/import_expense
Tbusk Jul 2, 2023
b175676
Added Login Page GUI
etschulte Jul 6, 2023
07024f5
Fixed layout and added button
etschulte Jul 6, 2023
4b751c9
Added create account gui.
etschulte Jul 8, 2023
8c56899
Merge pull request #27 from Tbusk/login_gui
Tbusk Jul 9, 2023
5cfc487
Merge branch 'master' into createAccount_gui
Tbusk Jul 9, 2023
eeb803e
Merge pull request #29 from Tbusk/createAccount_gui
Tbusk Jul 9, 2023
3b2aa89
updated with new logins
etschulte Jul 11, 2023
39e0ea7
Added functionality to create account gui and updated cvs file with test
etschulte Jul 11, 2023
e9028c2
tested create account feature
etschulte Jul 12, 2023
89e4d5d
Added login feature
etschulte Jul 12, 2023
c0e81ce
Merge pull request #30 from Tbusk/createAccount_gui
Tbusk Jul 12, 2023
bc16193
Added message dialogs + fixed login feature + cleared fields after cr…
Tbusk Jul 12, 2023
6e5e952
Fixing account creation bug
Tbusk Jul 12, 2023
190b3d7
Merge pull request #31 from Tbusk/loginFeature
Tbusk Jul 12, 2023
c0035e6
Removing comments
Tbusk Mar 17, 2025
3c3ce51
Creating file containing the application requirements called requirem…
Tbusk Mar 17, 2025
0a6cf47
Adding project config files
Tbusk Mar 17, 2025
ba5145c
Renaming Project
Tbusk Mar 17, 2025
71b3728
Restructuring project tree, switching from eclipse-based project to a…
Tbusk Mar 17, 2025
b386ff8
changing back User Stories title after renaming issue in requirements.md
Tbusk Mar 17, 2025
a9d1a11
Splitting up
Tbusk Mar 17, 2025
d4c9398
Switching from JPanel to JTabbedPane (original)
Tbusk Mar 17, 2025
547e48d
Relocating to different packages
Tbusk Mar 17, 2025
90a44b9
encapsulating variables in Wage
Tbusk Mar 17, 2025
d04619b
Renaming services used in LoginPanel for login action
Tbusk Mar 17, 2025
6095b44
Fixing incorrect naming due to incorrect renaming, and moving to new …
Tbusk Mar 17, 2025
2a632e6
adding target folder to gitignore
Tbusk Mar 17, 2025
694f479
Creating months enum
Tbusk Mar 17, 2025
f1490a1
replacing months array with constant
Tbusk Mar 17, 2025
3cff2b6
replacing months array with constant
Tbusk Mar 17, 2025
f5f0b5f
switching out ArrayList type for List returns for greater flexibility
Tbusk Mar 17, 2025
ea4167f
Fixing renaming issue in CreateAccountPanel
Tbusk Mar 17, 2025
dc0bbd5
creating new constant for expense frequency
Tbusk Mar 17, 2025
8fa46f2
creating new service for filtering
Tbusk Mar 17, 2025
fbcee2f
creating new service for report generation
Tbusk Mar 17, 2025
65e3dff
creating new service for totaling
Tbusk Mar 17, 2025
bccb886
creating new interface to make it easier to use data in expense and w…
Tbusk Mar 17, 2025
119c31a
switching from hard-type to flexible list type, encapsulating variabl…
Tbusk Mar 17, 2025
2742377
implementing interface, making variables final
Tbusk Mar 17, 2025
429ede3
implementing interface, making variables final, applying camelCase to…
Tbusk Mar 17, 2025
45ac9b8
updating parameter names
Tbusk Mar 17, 2025
f642c3f
removing usage of user variable in expenserMain
Tbusk Mar 17, 2025
2406988
removing usage of user variable in expenserMain
Tbusk Mar 17, 2025
1b9f473
removing usage of user variable in expenserMain, removing storing of …
Tbusk Mar 17, 2025
2d39ec6
removing storing of lists, removing usage of expenserMain
Tbusk Mar 17, 2025
b3ff732
removing userAtHand variable. Replacing with one passed by constructo…
Tbusk Mar 17, 2025
9375995
misc cleanup in ImportPanel
Tbusk Mar 17, 2025
39bda45
removing unnecessary lists and instantiation, misc cleanup
Tbusk Mar 17, 2025
c23860c
making username and password temp rather than global
Tbusk Mar 17, 2025
5bde8d6
consolidating getting expenses and wages in update methods
Tbusk Mar 17, 2025
239b855
fixing incorrect file path in UserCreationService
Tbusk Mar 17, 2025
7ded3b0
updating method and variable names for better readability
Tbusk Mar 17, 2025
e7c9adb
updating method calls
Tbusk Mar 17, 2025
b87d872
removing excessive logic chains and coupling when not necessary for a…
Tbusk Mar 17, 2025
fe2d2f6
moving button action logic to new methods
Tbusk Mar 17, 2025
944da7b
fixing report file names
Tbusk Mar 17, 2025
1e7c02f
moving button actions to new methods
Tbusk Mar 17, 2025
a35568a
reorganizing imports
Tbusk Mar 17, 2025
cc7618e
moving button actions into new methods
Tbusk Mar 17, 2025
86daf5e
moving button action into new method
Tbusk Mar 17, 2025
6ff58f0
moving button action into new method
Tbusk Mar 17, 2025
ce862d1
moving button actions into new methods
Tbusk Mar 17, 2025
e1b55c0
moving button action into new method
Tbusk Mar 17, 2025
75c9861
making income and expense reports show correct filtered details
Tbusk Mar 17, 2025
efb2767
reduced menu action handling to one extensible method
Tbusk Mar 17, 2025
45b8441
renaming monthlySavings to totalIncome to reflect usage better.
Tbusk Mar 17, 2025
906dd18
fixing reporting user method calls and filtered balance display
Tbusk Mar 17, 2025
61af891
converting to a record
Tbusk Mar 17, 2025
8387c92
adjusting to use records for Currency, Wage, and Expense
Tbusk Mar 17, 2025
15d522a
moving files and adjusting to use records
Tbusk Mar 17, 2025
e3341d2
renaming and moving methods from ExpenserMain
Tbusk Mar 17, 2025
2c6edd6
Removing unused interface Expenser
Tbusk Mar 17, 2025
ec2208d
adding method to update home panel totals
Tbusk Mar 17, 2025
36b80fa
passing home panel to import panel, renaming expenser
Tbusk Mar 17, 2025
dbd3e87
passing home panel to calls, adding calls to update totals in various…
Tbusk Mar 17, 2025
c0a920e
moving classes
Tbusk Mar 17, 2025
e47614c
adding method to update amount label
Tbusk Mar 17, 2025
2176ecf
adding class to handle importing data
Tbusk Mar 17, 2025
2f45953
cleaning up importing action
Tbusk Mar 17, 2025
3106599
fixing file path issue with checking passwords from the csv.
Tbusk Mar 17, 2025
8a90cf1
removing comments
Tbusk Mar 18, 2025
98229bc
adding junit5 and assertj-swing as dependencies
Tbusk Mar 18, 2025
b018f55
Adding names for gui items to run tests on
Tbusk Mar 18, 2025
c12ccd3
Creating tests for adding income and expenses
Tbusk Mar 18, 2025
9f2913e
adding jackson dataformat csv dependency
Tbusk Mar 19, 2025
48b946c
reformatting csv file
Tbusk Mar 19, 2025
c75ffc6
cleaning username checker a bit
Tbusk Mar 19, 2025
0d64ba9
cleaning user creation service a bit
Tbusk Mar 19, 2025
2d31b25
cleaning password checker a bit
Tbusk Mar 19, 2025
4acb770
adjusting method call name in LoginPanel
Tbusk Mar 19, 2025
830ffac
creating class to handle reading and writing to the credentials csv file
Tbusk Mar 19, 2025
462253b
creating record class to store credentials read from csv file
Tbusk Mar 19, 2025
96ca56f
removing unnecessary logic from create account button action
Tbusk Mar 19, 2025
4c9cad0
refactor: march update 2025 (#32)
Tbusk Dec 1, 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
10 changes: 0 additions & 10 deletions .classpath

This file was deleted.

1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
/bin/
/target/
8 changes: 8 additions & 0 deletions .idea/.gitignore

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

1 change: 1 addition & 0 deletions .idea/.name

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

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

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

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

14 changes: 14 additions & 0 deletions .idea/misc.xml

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

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

17 changes: 0 additions & 17 deletions .project

This file was deleted.

8 changes: 8 additions & 0 deletions UserCredentials.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
username,password
admin,"Password!123"
Test1,"FirstTest1!"
Test2,"SecondTest!2"
Test3,"ThirdTest3!"
Test4,"FourthTest!4"
john,"mySecurePassword!123"
joe,"mySecurePassword!123"
42 changes: 42 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>edu.ferris.seng210</groupId>
<artifactId>ewallet</artifactId>
<version>1.0-SNAPSHOT</version>

<properties>
<maven.compiler.source>23</maven.compiler.source>
<maven.compiler.target>23</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<!-- https://mvnrepository.com/artifact/org.assertj/assertj-swing -->
<dependency>
<groupId>org.assertj</groupId>
<artifactId>assertj-swing</artifactId>
<version>3.17.1</version>
</dependency>

<!-- https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter -->
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.12.1</version>
<scope>test</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-csv -->
<dependency>
<groupId>com.fasterxml.jackson.dataformat</groupId>
<artifactId>jackson-dataformat-csv</artifactId>
<version>2.18.2</version>
</dependency>

</dependencies>

</project>
21 changes: 21 additions & 0 deletions requirements.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Requirements

## User Stories

- As a user I would like to provide an item and a price and get an estimate in number of months needed to save up to buy
this item (based on current monthly saving).
- As a user I would like to load multiple income from an external file all at once returning true if loaded successfully
and false otherwise.
- As a user I would like to load multiple expenses from an external file all at once returning true if loaded successfully
and false otherwise.
- As a user I would like to view my current balance in a different currency and back.
- As a user I would like to choose a report and export it as an external file (any type is fine preferences are csv or JSON)
- As a user I would like to view a detailed report of expense of a certain type , and summary information for expenses
- As a user I would like to view a detailed report of income of a certain type, and summary information for income
- As a user I would like to view a detailed report of all income, and summary information for income
- As a user I would like to view a detailed report of all expenses, and summary information for expenses
- As a user I would like to view a detailed report of all expenses, income, and summary information.
summary information include : total income, total income for each type, total income for each month, total expense, total expense for each type,
total savings (total income- total expenses) to date, if the total savings are less than zero it should be reported as total new debt.
- As a user I'd like to add a monthly income so I can track and report my income all year.
- As a user I'd like to add a monthly expense so I can track and report my expenses
6 changes: 0 additions & 6 deletions src/Currency.java

This file was deleted.

8 changes: 0 additions & 8 deletions src/EWalletApp.java

This file was deleted.

7 changes: 0 additions & 7 deletions src/Expense.java

This file was deleted.

36 changes: 0 additions & 36 deletions src/Expenser.java

This file was deleted.

15 changes: 0 additions & 15 deletions src/User.java

This file was deleted.

8 changes: 0 additions & 8 deletions src/Wage.java

This file was deleted.

Loading