Skip to content
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.

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

[CS2103T-T13-4] SweetRewards #136

Open
wants to merge 338 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
338 commits
Select commit Hold shift + click to select a range
1505a41
Add basic support for orders
billyhoce Mar 15, 2024
d84a21c
Edit constructor of Person to have orders, add storage support for Or…
billyhoce Mar 15, 2024
3a8f9c0
Add UI support for Orders, fix styling errors
billyhoce Mar 15, 2024
e7fa960
Fix checkstyle errors
khushi833 Mar 16, 2024
6a2e471
Fix bugs
kinjalagarwal1810 Mar 16, 2024
7686de5
Fix bugs
kinjalagarwal1810 Mar 16, 2024
49b275c
Fix JSON serialisation inconsistencies resulting in Storage bugs
billyhoce Mar 16, 2024
b1f80d3
Fix JUnit tests for AddPointsCommand and LogicManager
kokerinks Mar 16, 2024
5f16986
Fix some failing JUnit tests
kokerinks Mar 16, 2024
1cca547
Merge pull request #1 from kinjalagarwal1810/branch-v1.2-bugfixes
kinjalagarwal1810 Mar 16, 2024
4d2999f
Fix checkstyle errors
kinjalagarwal1810 Mar 16, 2024
5b266cf
Fix checkstyle error
kinjalagarwal1810 Mar 16, 2024
72193ed
Fix checkstyle error
kinjalagarwal1810 Mar 16, 2024
f7ca94b
Add test cases for AddOrderCommand
billyhoce Mar 16, 2024
d264c01
Fix styling and add defensive copy of TypicalPersons
billyhoce Mar 16, 2024
71f3cb9
Add test cases for order parsing
billyhoce Mar 16, 2024
7665104
Fix bugs
kinjalagarwal1810 Mar 17, 2024
e30578f
Fix checkstyle error
kinjalagarwal1810 Mar 17, 2024
579433d
Fix checkstyle error
kinjalagarwal1810 Mar 17, 2024
f615909
Fix bugs and checkstyle errors
khushi833 Mar 17, 2024
0545ae5
Add new testcases
khushi833 Mar 17, 2024
047b577
Fix JUnit tests for AddMemshipCommandParser
kokerinks Mar 17, 2024
849fca5
Merge pull request #1 from kab-dot/add-Membership-Tier-Bugfixes
kab-dot Mar 17, 2024
eab9b7c
Merge pull request #40 from kokerinks/seed-data-command
billyhoce Mar 17, 2024
3366b10
Merge pull request #41 from kokerinks/update-ug-v1.2b
billyhoce Mar 17, 2024
bbf5886
Merge branch 'master' into clear-force-command
kokerinks Mar 17, 2024
45242d4
Fix checkstyle errors
kokerinks Mar 17, 2024
9fab6ee
Merge pull request #39 from kokerinks/clear-force-command
kokerinks Mar 17, 2024
94d8d59
Merge pull request #44 from kab-dot/add-Membership-Tier
kokerinks Mar 17, 2024
8416fa1
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp…
kinjalagarwal1810 Mar 17, 2024
12d665d
Fix checkstyle errors
kinjalagarwal1810 Mar 17, 2024
640cea3
Fix checkstyle errors
kinjalagarwal1810 Mar 17, 2024
6ba26f3
Merge pull request #42 from kinjalagarwal1810/branch-v1.2
kab-dot Mar 17, 2024
2c79ac5
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Mar 17, 2024
c8a7c57
Merge branch 'master' into add-order-command
billyhoce Mar 17, 2024
2e9c989
Fix merge issues
billyhoce Mar 17, 2024
fb97481
Fix javadocs comment
billyhoce Mar 17, 2024
fae22df
Merge pull request #45 from billyhoce/add-order-command
kokerinks Mar 17, 2024
b9a82e2
Improve styling for application
kokerinks Mar 18, 2024
09c1a56
Add orders implementation in DG
billyhoce Mar 18, 2024
707015a
Fixed bug
khushi833 Mar 18, 2024
c7b9bff
Merge pull request #53 from kab-dot/add-Membership-Tier
kab-dot Mar 19, 2024
5bdc8c1
Add new fields to BetterModelClassDiagram and ModelClassDiagram
kokerinks Mar 20, 2024
7fb6b23
Add diagrams for ModelClassDiagrams
kokerinks Mar 20, 2024
7efe5c7
Fix checkstyle errors
kokerinks Mar 20, 2024
324ec96
Change AddCommand COMMAND_WORD to addmem
kokerinks Mar 20, 2024
dadf96e
Implement add points command in DG
kinjalagarwal1810 Mar 20, 2024
6e10499
Merge pull request #50 from kokerinks/improved-ui-v1.2b
billyhoce Mar 20, 2024
c81d18f
Merge pull request #51 from billyhoce/update-dg-implementation-orders
billyhoce Mar 20, 2024
a556592
Merge pull request #58 from kokerinks/v1.2b-model-class-diagrams
kokerinks Mar 20, 2024
469ebd0
Fix bugs in AddPointsSequenceDiagram.puml
kinjalagarwal1810 Mar 20, 2024
cd946d3
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp…
kinjalagarwal1810 Mar 20, 2024
15b3359
Update DG with Membership feature and sequence diagram
khushi833 Mar 20, 2024
2fce5e3
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp…
khushi833 Mar 20, 2024
f57dffe
Fix checkstyle
khushi833 Mar 20, 2024
046ba8f
Merge pull request #59 from kinjalagarwal1810/update-dg-implementatio…
kinjalagarwal1810 Mar 21, 2024
b6c4868
Merge branch 'master' into Update-DG-Membership
kokerinks Mar 21, 2024
dd752be
Merge pull request #60 from kab-dot/Update-DG-Membership
kokerinks Mar 21, 2024
fa7d480
Add labels to details on PersonCard
kokerinks Mar 22, 2024
28e5d0f
Add codedov.yml to remove tests on ui/PersonCard
kokerinks Mar 22, 2024
0945ca5
Fix Checkstyle
kokerinks Mar 22, 2024
76dd3b1
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Mar 23, 2024
a0b3a15
Update membership field to store membership points instead of tier
kokerinks Mar 23, 2024
78df9d1
Add additional JUnits cases for codecov
kokerinks Mar 23, 2024
24ae1a8
Update AddPointsCommand to not allow adding of 0 points
kokerinks Mar 23, 2024
8253a14
Update MESSAGE_USAGE for AddPointsCommand
kokerinks Mar 23, 2024
7eb5ac9
Update MESSAGE_USAGE for AddPointsCommand
kokerinks Mar 23, 2024
db59669
Add separate pane on GUI for orders
billyhoce Mar 23, 2024
49aa6ca
Change Order class to contain an Item and quantity
billyhoce Mar 23, 2024
6772da9
Change seedData COMMAND_WORD to seeddata
kokerinks Mar 25, 2024
0865562
Merge pull request #67 from kokerinks/v1.2b-bugfixes
kinjalagarwal1810 Mar 25, 2024
441792e
Merge pull request #73 from kokerinks/v1.3-bugfixes
kinjalagarwal1810 Mar 25, 2024
542502b
Update UG
kinjalagarwal1810 Mar 25, 2024
4a9f448
Merge pull request #66 from kokerinks/current-pts-function
kokerinks Mar 25, 2024
d27de59
Update UG
kinjalagarwal1810 Mar 25, 2024
cc6e365
Merge branch 'master' into branch-v1.3
kinjalagarwal1810 Mar 25, 2024
5d6940e
Add storage of items and integrated other functionalities
kokerinks Mar 25, 2024
adecfa0
Update tags to allergens
kinjalagarwal1810 Mar 25, 2024
803021c
Update AddMemPointsCommandParser to take in n/NAME instead of just NA…
khushi833 Mar 26, 2024
0a8b404
Fix checkstyle errors
khushi833 Mar 26, 2024
6e405f0
Fix checkstyle errors
khushi833 Mar 26, 2024
07e751e
Fix testcases according to new command
khushi833 Mar 26, 2024
cc5a730
Fixed input for testcases
khushi833 Mar 26, 2024
2c2a1f3
Merge pull request #77 from kab-dot/Update-addmempoints-name-param
billyhoce Mar 26, 2024
00787eb
Fix bugs
kinjalagarwal1810 Mar 26, 2024
043c475
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp…
kinjalagarwal1810 Mar 26, 2024
6ceb665
Fix checkstyle errors
kinjalagarwal1810 Mar 26, 2024
b50b338
Fix checkstyle errors
kinjalagarwal1810 Mar 26, 2024
d8b2844
Fix checkstyle errors
kinjalagarwal1810 Mar 26, 2024
247efea
Fix checkstyle errors
kinjalagarwal1810 Mar 26, 2024
dff66e7
Update UG and related files
kinjalagarwal1810 Mar 26, 2024
21273f8
Edit checkstyle.xml
kinjalagarwal1810 Mar 26, 2024
c1dd05c
Merge branch 'master' into branch-v1.3
kinjalagarwal1810 Mar 26, 2024
8f5b38d
Merge pull request #74 from kinjalagarwal1810/branch-v1.3
kab-dot Mar 26, 2024
c5f9c84
Merge branch 'master' into branch-v1.3-create-allergens
kinjalagarwal1810 Mar 26, 2024
a78713c
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp…
kokerinks Mar 27, 2024
59cbf99
Fix SampleDataUtil: '|' being treated as regex
kokerinks Mar 27, 2024
af932cc
Merge branch 'item-integration' of https://github.com/AY2324S2-CS2103…
billyhoce Mar 28, 2024
27c4e5c
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Mar 28, 2024
5f835da
Change orders to round time down to nearest second
billyhoce Mar 28, 2024
baf0461
Merge pull request #78 from billyhoce/branch-v1.3-round-off-order-time
billyhoce Mar 28, 2024
d466071
Merge pull request #76 from kinjalagarwal1810/branch-v1.3-create-alle…
billyhoce Mar 28, 2024
6bd7cb8
Small javadoc fixes and naming standardisation
billyhoce Mar 28, 2024
368369f
Finalise trial release v1.2.1
billyhoce Mar 28, 2024
2969e8a
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Mar 28, 2024
e23d49b
Fix GUI bug arising from "tag" remnants
billyhoce Mar 28, 2024
1fd9cc3
Add editing Membership Points in edit command
kokerinks Mar 29, 2024
0d96a15
Merge branch 'item-integration' of https://github.com/AY2324S2-CS2103…
kokerinks Mar 29, 2024
1cd128d
Add catalogue to toString of AddressBook
kokerinks Mar 29, 2024
df0927d
Fix testcases for previous commits
kokerinks Mar 29, 2024
3e1429f
Merge remote-tracking branch 'upstream/master' into item-integration
kokerinks Mar 29, 2024
d9a47e8
Add automation of adding points and membership points after every add…
kokerinks Mar 30, 2024
6879bce
Change app title to SweetRewards
kokerinks Mar 31, 2024
3e1c19b
Update bounds on membership tiers to improve scaling
kokerinks Mar 31, 2024
03c5bf4
Update addorder command to ignore case for item name
kokerinks Mar 31, 2024
ba97f92
Update order label to Order History
kokerinks Mar 31, 2024
215d40d
Add test cases for Item and Catalogue classes
billyhoce Mar 31, 2024
7402cd2
Fix styling issues for Catalogue and Item tests
billyhoce Mar 31, 2024
f3a0cd8
Merge pull request #81 from AY2324S2-CS2103T-T13-4/master
billyhoce Apr 1, 2024
1a3c92f
Add testcases for parseMembershipPoints and fix checkstyles
kokerinks Apr 1, 2024
912337a
Merge branch 'item-integration' of https://github.com/AY2324S2-CS2103…
kokerinks Apr 1, 2024
500bd47
Add test for Order constructor
billyhoce Apr 1, 2024
ae8bf61
Add more tests
billyhoce Apr 1, 2024
b2119c8
Fix checkstyle errors
billyhoce Apr 1, 2024
7a1f152
Merge branch 'gui-person-view' into branch-gui-update
billyhoce Apr 1, 2024
61dc2d5
Implement RedeemPointsCommand
kinjalagarwal1810 Apr 2, 2024
9cd6080
Fix checkstyle errors
kinjalagarwal1810 Apr 2, 2024
c8f4864
Fix checkstyle errors
kinjalagarwal1810 Apr 2, 2024
e22f6e5
Add Order.java to codecov.yml ignore
kokerinks Apr 2, 2024
fb1e40e
Add testcases for AddressBook
kokerinks Apr 2, 2024
8bd0d13
Fix checkstyle
kokerinks Apr 2, 2024
a688d46
Add testcases for ModelManager
kokerinks Apr 2, 2024
7b936fb
Merge pull request #68 from AY2324S2-CS2103T-T13-4/item-integration
kokerinks Apr 2, 2024
45811a0
Merge branch 'master' into v1.3-gui-update
kokerinks Apr 2, 2024
8b75170
Fix tests for ModelManager
kokerinks Apr 2, 2024
8913259
Add testcases for MembershipPoints
kokerinks Apr 2, 2024
84c71e9
Add 'help --commands' to list all existing commands
kokerinks Apr 2, 2024
4f7a6c9
Add testcases for new help command
kokerinks Apr 2, 2024
10a0294
Change background and add catalogue panel
billyhoce Apr 2, 2024
4475f4d
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Apr 2, 2024
8613348
Merge branch 'master' into branch-gui-update
billyhoce Apr 2, 2024
cb66550
Add sample catalogue to new instances of SweetRewards
billyhoce Apr 2, 2024
2c7c37f
Merge pull request #84 from kinjalagarwal1810/branch-v1.3b-redeem-points
kinjalagarwal1810 Apr 2, 2024
a7d305c
Overhaul GUI theme and add catalogue panel
billyhoce Apr 2, 2024
a82ddb9
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Apr 2, 2024
aa101d6
Merge branch 'master' into branch-gui-update
billyhoce Apr 2, 2024
e56d238
Fix catalogue and orders not taking up vertical space
billyhoce Apr 2, 2024
b0292c3
Fix checkstyle errors
billyhoce Apr 2, 2024
f8be2ad
Fix ModelStub bug
billyhoce Apr 2, 2024
8b9c9a3
Fix formatting errors
billyhoce Apr 2, 2024
ec50ed0
Implement additem and delitem alongside Catalogue field in Model Manager
khushi833 Apr 3, 2024
9697c43
Fix merge conflicts
khushi833 Apr 3, 2024
a9f749b
Fix checkstyle errors
khushi833 Apr 3, 2024
8d4c612
Update seeddata to contain catalogue
billyhoce Apr 3, 2024
a0ddaa9
Merge pull request #86 from kokerinks/v1.3-gui-update
billyhoce Apr 3, 2024
8d99386
Fix checkstyle errors
kokerinks Apr 3, 2024
187c653
Merge pull request #88 from kokerinks/help-list-command
kokerinks Apr 3, 2024
8ac0c0e
Update UG to v1.3
kinjalagarwal1810 Apr 3, 2024
c784d23
Merge branch 'master' into branch-v1.3-updateUG
kinjalagarwal1810 Apr 3, 2024
d1040c2
Fix testcases for AddItem and DeleteItem
kokerinks Apr 3, 2024
f3948a4
Add GUI table styling, set codecov to ignore UI components
billyhoce Apr 3, 2024
24b0f92
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Apr 3, 2024
d4ddb9c
Merge branch 'master' into branch-gui-update
billyhoce Apr 3, 2024
b8eacc8
Merge pull request #96 from kinjalagarwal1810/branch-v1.3b-updateUG
kab-dot Apr 3, 2024
feab30f
Add additional details to the userguide
khushi833 Apr 3, 2024
20c3d89
Merge pull request #99 from kab-dot/update-ug-with-new-fixes
billyhoce Apr 4, 2024
aa52af9
Update sample catalogue to match tiers better
billyhoce Apr 4, 2024
2fd039a
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Apr 4, 2024
1264522
Merge branch 'master' into branch-gui-update
billyhoce Apr 4, 2024
18d1d19
Merge pull request #93 from billyhoce/branch-gui-update
billyhoce Apr 4, 2024
38e8a2e
Merge branch 'item-integration' of https://github.com/kab-dot/tp into…
billyhoce Apr 4, 2024
fb6030f
Revert change to Model class
billyhoce Apr 4, 2024
a5d2d4d
Fix delitem case sensitivity bug
billyhoce Apr 4, 2024
97a1d30
Merge pull request #2 from billyhoce/catalogue-additem-delitem
kab-dot Apr 4, 2024
ae996b3
Change commandword
khushi833 Apr 4, 2024
d60efb9
Merge branch 'master' into item-integration
khushi833 Apr 4, 2024
f8a22fe
Fixed the help command, added additional commands
khushi833 Apr 4, 2024
8ddb901
Merge pull request #97 from kab-dot/item-integration
kab-dot Apr 4, 2024
2ea9e54
Update error messages for some commands
kokerinks Apr 4, 2024
17c42f9
Update user guide, gui screenshots and link to user guide
billyhoce Apr 4, 2024
24a8d05
Update command error messages and improve find functionality
kokerinks Apr 4, 2024
1646876
Fix styling issues
billyhoce Apr 4, 2024
d778e8e
Fix testcases and checkstyles
kokerinks Apr 4, 2024
1f35002
Update addmempts to softmatch name with Persons in app
kokerinks Apr 4, 2024
2fcd937
Fix name parsing of addorder to be consistent with other commands
billyhoce Apr 4, 2024
3ef5270
Update landing page README.md
kokerinks Apr 4, 2024
51b57a9
Merge pull request #107 from kokerinks/landing-page
billyhoce Apr 4, 2024
3cf2364
Merge pull request #104 from kokerinks/update-error-msgs
billyhoce Apr 4, 2024
1ff188a
Merge pull request #101 from billyhoce/userguide-update-gui-details
billyhoce Apr 4, 2024
de20ddd
Change Version Number to v1.3
billyhoce Apr 4, 2024
eef2c01
Bug fixes
kinjalagarwal1810 Apr 8, 2024
62c018a
Update UG
kinjalagarwal1810 Apr 8, 2024
905218d
Merge pull request #177 from kinjalagarwal1810/branch-v1.4-bugfixes
kokerinks Apr 8, 2024
f89ad5a
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp
billyhoce Apr 12, 2024
95e887c
Fixed reward and membership points of sample members
billyhoce Apr 12, 2024
dd0f00e
Fix GUI display of points in order panel of members
billyhoce Apr 12, 2024
5764ea8
Fix checkstyle errors
billyhoce Apr 12, 2024
acb1973
Fix the bug to allow a single character to be used for additem command
khushi833 Apr 12, 2024
c2c9ac8
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp…
khushi833 Apr 12, 2024
4c9a247
Revert changing of displayed points in person order panel
billyhoce Apr 13, 2024
9015535
Fix bug
khushi833 Apr 13, 2024
6133151
Merge pull request #179 from kab-dot/fix-additem-for-single-character
kab-dot Apr 13, 2024
eaa1d5e
Merge pull request #178 from billyhoce/fix-seed-data-points
billyhoce Apr 14, 2024
4875833
Update sections in DG
kokerinks Apr 14, 2024
d387cb3
Add the relevant tutorial, hyperlinks and planned enhancements to the…
khushi833 Apr 14, 2024
8bac666
Merge branch 'master' of https://github.com/AY2324S2-CS2103T-T13-4/tp…
khushi833 Apr 14, 2024
80bb3b0
Fix checkstyle errors
khushi833 Apr 14, 2024
6dfde23
Fix checkstyle errors
khushi833 Apr 14, 2024
258e822
Add additional sentences for restrictions
khushi833 Apr 14, 2024
ee0d396
Fix checkstyle
kokerinks Apr 14, 2024
5444667
Fix checkstyle
kokerinks Apr 14, 2024
2196757
Merge pull request #183 from kab-dot/ug-fixes-for-v1.4
kinjalagarwal1810 Apr 14, 2024
37b6a14
Update UI component portion of DG
billyhoce Apr 14, 2024
8b44618
Fix bug related to fractional quantities for the addorder command
khushi833 Apr 14, 2024
fbaeb4f
Update DG
kokerinks Apr 14, 2024
be3632f
Merge branch 'v1.4-bugfixes' of https://github.com/AY2324S2-CS2103T-T…
billyhoce Apr 14, 2024
e2e65d3
Update "Architecture", "implementation" sections
billyhoce Apr 14, 2024
8e7986f
Merge pull request #184 from kab-dot/bugfix-addorder-quantities
billyhoce Apr 14, 2024
92e480a
Merge branch 'master' into DG-update
billyhoce Apr 14, 2024
da804da
Update UG
kinjalagarwal1810 Apr 15, 2024
5285ae5
Merge branch 'master' into branch-v1.4-udpateUG
kinjalagarwal1810 Apr 15, 2024
2051a85
Add Appendix: Future Enhancements
billyhoce Apr 15, 2024
b1b5bbc
Add Instructions for manual testing
billyhoce Apr 15, 2024
2fe4bd5
Update the UG
kinjalagarwal1810 Apr 15, 2024
1a766db
Update UG
kinjalagarwal1810 Apr 15, 2024
29f03b6
Change point to point(s)
kinjalagarwal1810 Apr 15, 2024
5f1c4ad
Merge pull request #186 from kinjalagarwal1810/branch-v1.4-udpateUG
kinjalagarwal1810 Apr 15, 2024
f15c777
Merge branch 'master' into v1.4-bugfixes
billyhoce Apr 15, 2024
7a0efa3
Merge pull request #185 from AY2324S2-CS2103T-T13-4/v1.4-bugfixes
billyhoce Apr 15, 2024
f440b56
Big fixes in UG
kinjalagarwal1810 Apr 15, 2024
a356a94
Spelling error in UG
kinjalagarwal1810 Apr 15, 2024
427b19c
Fix formatting issues
billyhoce Apr 15, 2024
778f87c
Merge pull request #188 from kinjalagarwal1810/branch-v1.4-udpateUG
kinjalagarwal1810 Apr 15, 2024
e7881ab
Change version number to 1.4.0
billyhoce Apr 15, 2024
bce6366
Merge pull request #189 from billyhoce/DG-fix-formatting
billyhoce Apr 15, 2024
0c64a11
Update UG
kinjalagarwal1810 Apr 15, 2024
517ad41
Fix UG bugs
kokerinks Apr 15, 2024
44fa545
Merge pull request #190 from kinjalagarwal1810/branch-v1.4-udpateUG
kinjalagarwal1810 Apr 15, 2024
43605a7
Merge branch 'master' into v1.4-ug-fixes
kokerinks Apr 15, 2024
61201a4
Merge pull request #191 from kokerinks/v1.4-ug-fixes
kokerinks Apr 15, 2024
37bff30
Update UG
kinjalagarwal1810 Apr 15, 2024
89d36b2
Merge pull request #192 from kinjalagarwal1810/branch-v1.4-udpateUG
kokerinks Apr 15, 2024
2f6e812
Fix item with numbers bug
billyhoce Apr 15, 2024
f07426f
Merge pull request #193 from billyhoce/final-bug-fix
billyhoce Apr 15, 2024
058528e
Fix bug arising from numbers in item
billyhoce Apr 15, 2024
2d124ee
Merge pull request #194 from billyhoce/final-bug-fix
billyhoce Apr 15, 2024
18272f6
Fix website
billyhoce Apr 15, 2024
89e80fb
Merge pull request #195 from billyhoce/final-bug-fix
billyhoce Apr 15, 2024
c3f7282
Fix naming error for seeddata
billyhoce Apr 15, 2024
c65dea2
Merge pull request #196 from billyhoce/final-bug-fix
billyhoce Apr 15, 2024
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,6 @@ src/test/data/sandbox/
# MacOS custom attributes files created by Finder
.DS_Store
docs/_site/

#
bin/
28 changes: 17 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,20 @@
[![CI Status](https://github.com/se-edu/addressbook-level3/workflows/Java%20CI/badge.svg)](https://github.com/se-edu/addressbook-level3/actions)
[![CI Status](https://github.com/AY2324S2-CS2103T-T13-4/tp/workflows/Java%20CI/badge.svg)](https://github.com/AY2324S2-CS2103T-T13-4/tp/actions)

![Ui](docs/images/Ui.png)

* This is **a sample project for Software Engineering (SE) students**.<br>
Example usages:
* as a starting point of a course project (as opposed to writing everything from scratch)
* as a case study
* The project simulates an ongoing software project for a desktop application (called _AddressBook_) used for managing contact details.
* It is **written in OOP fashion**. It provides a **reasonably well-written** code base **bigger** (around 6 KLoC) than what students usually write in beginner-level SE modules, without being overwhelmingly big.
* It comes with a **reasonable level of user and developer documentation**.
* It is named `AddressBook Level 3` (`AB3` for short) because it was initially created as a part of a series of `AddressBook` projects (`Level 1`, `Level 2`, `Level 3` ...).
* For the detailed documentation of this project, see the **[Address Book Product Website](https://se-education.org/addressbook-level3)**.
* This project is a **part of the se-education.org** initiative. If you would like to contribute code to this project, see [se-education.org](https://se-education.org#https://se-education.org/#contributing) for more info.
# SweetRewards

Welcome to **SweetRewards**, the premier desktop application designed to help small and medium-sized bakery owners efficiently manage their customer loyalty programs. By integration the use of a command-line interface (CLI), we give you the power to control your very own loyalty points systems through an easy-to-use command system!

## Key Features

- **Member Management**: Add, edit, and manage member details effortlessly.
- **Points and Membership Tiers**: Track purchases, manage reward points, and update membership tiers with ease.
- **Order and Catalogue Management**: Seamlessly manage your bakery's product catalogue and customer orders.
- **Data Management**: Automatic saving, with options for manual editing and archiving.

## Getting Started

1. **Installation**: Ensure your device has Java 11 or higher, and download the latest version of SweetRewards.
2. **Initialization**: Use the `seeddata` command to populate your application with sample data, or start adding your members with `addmem`.
3. **Explore Features**: Dive into managing your loyalty program with features like `addorder`, `redeempts`, and more.
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ repositories {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}

run {
enableAssertions = true
}

checkstyle {
toolVersion = '10.2'
}
Expand Down Expand Up @@ -66,7 +70,7 @@ dependencies {
}

shadowJar {
archiveFileName = 'addressbook.jar'
archiveFileName = 'sweetrewards.jar'
}

defaultTasks 'clean', 'test'
8 changes: 8 additions & 0 deletions codecov.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
ignore:
- "src/main/java/seedu/address/ui/PersonCard.java"
- "src/main/java/seedu/address/ui/ResultDisplay.java"
- "src/main/java/seedu/address/logic/model/person/orders/Order.java"
- "src/main/java/seedu/address/ui/PersonListPanel.java"
- "src/main/java/seedu/address/ui/PersonOrdersPanel.java"
- "src/main/java/seedu/address/ui/MainWindow.java"
- "src/main/java/seedu/address/ui/CataloguePanel.java"
56 changes: 23 additions & 33 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,51 +9,41 @@ You can reach us at the email `seer[at]comp.nus.edu.sg`

## Project team

### John Doe
### Lim Kok Liang

<img src="images/johndoe.png" width="200px">
<img src="images/kokerinks.png" width="200px">

[[homepage](http://www.comp.nus.edu.sg/~damithch)]
[[github](https://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github](http://github.com/kokerinks)] [[linkedin](https://www.linkedin.com/in/lim-kok-liang/)]

* Role: Project Advisor
* Role: Testing, Integration
* Responsibilities:

### Jane Doe
### Billy Ho Cheng En

<img src="images/johndoe.png" width="200px">
<img src="images/billyhoce.png" width="200px">

[[github](http://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github](http://github.com/billyhoce)]
[[portfolio](team/billyho.md)]

* Role: Team Lead
* Responsibilities: UI
* Role: Team lead, Deliverables and deadlines
* Responsibilities:

### Johnny Doe
### Khushi Bhagwat

<img src="images/johndoe.png" width="200px">
<img src="images/kab-dot.png" width="200px">

[[github](http://github.com/johndoe)] [[portfolio](team/johndoe.md)]
[[github](http://github.com/kab-dot)]
[[portfolio](team/khushibhagwat.md)]

* Role: Developer
* Responsibilities: Data
* Role: Documentation, Scheduling
* Responsibilities:

### Jean Doe
### Kinjal Agarwal

<img src="images/johndoe.png" width="200px">
<img src="images/kinjalagarwal1810.png" width="200px">

[[github](http://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github](http://github.com/kinjalagarwal1810)]
[[portfolio](team/kinjalagarwal1810.md)]

* Role: Developer
* Responsibilities: Dev Ops + Threading

### James Doe

<img src="images/johndoe.png" width="200px">

[[github](http://github.com/johndoe)]
[[portfolio](team/johndoe.md)]

* Role: Developer
* Responsibilities: UI
* Role: Code Quality
* Responsibilities:
Loading
Loading