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

[CS2103-F10-2] iFridge #90

Open
wants to merge 789 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
789 commits
Select commit Hold shift + click to select a range
aa6f8a3
Make MergeBoughtSequenceDiagram using plantUML
ManasVegi Nov 7, 2019
1ae3e7d
Merge branch 'master' into wk12-Documentation
ManasVegi Nov 7, 2019
d98c26f
Add Shopping Undo Command Test
evelynejuliet Nov 7, 2019
70ce8fa
Merge branch 'master' into branch-add-undoshoppingtest
evelynejuliet Nov 7, 2019
9f3cc2e
Add Reminder Command and Reminder Command Parser Test
evelynejuliet Nov 7, 2019
7f68bbd
Merge branch 'branch-add-undoshoppingtest' of https://github.com/evel…
evelynejuliet Nov 7, 2019
61acbb1
fix checkstyle
evelynejuliet Nov 7, 2019
7ccbc35
Add Shopping Redo Command Test
evelynejuliet Nov 7, 2019
9ea61d4
Merge pull request #233 from evelynejuliet/branch-add-undoshoppingtest
zhangxuan97 Nov 8, 2019
315a3dd
Handle parsing of float with exponent
kelvinnharris Nov 8, 2019
5bd05c7
Resolve checkstyle violations
kelvinnharris Nov 8, 2019
17e91d3
Merge branch 'master' into fix-bugs
kelvinnharris Nov 8, 2019
0f223d4
Merge branch 'fix-bugs' of https://github.com/kelvinnharris/main into…
kelvinnharris Nov 8, 2019
fa17a77
Edit UI
evelynejuliet Nov 8, 2019
6acd056
Add tests for list waste command
zhangxuan97 Nov 8, 2019
d638f9f
Add test for feedback waste command
zhangxuan97 Nov 8, 2019
3d0ca85
Merge pull request #235 from kelvinnharris/fix-bugs
evelynejuliet Nov 8, 2019
b904594
Merge branch 'master' into branch-edit-ui-2
kelvinnharris Nov 8, 2019
ec69720
Merge pull request #236 from evelynejuliet/branch-edit-ui-2
kelvinnharris Nov 8, 2019
0c006af
Finish AddGroceryCommandTest
kelvinnharris Nov 8, 2019
4d72b73
Add coveralls badge in README
kelvinnharris Nov 8, 2019
0218ebd
Merge pull request #237 from kelvinnharris/add-coveralls
kelvinnharris Nov 8, 2019
5a601b1
Make Sequence and Activity diagrams using PlantUML for DG
ManasVegi Nov 8, 2019
83f090b
Update MergeBought feature in DG
ManasVegi Nov 8, 2019
23a868c
Update DG
zhangxuan97 Nov 8, 2019
9e4252f
Update README to credit respective libraries and PPP
zhangxuan97 Nov 8, 2019
db329e4
Fix incorrect repo URL in DG and add more details on model class diagram
zhangxuan97 Nov 8, 2019
1b60f1f
Update UG to give details on flexible month formats
zhangxuan97 Nov 8, 2019
a73165d
Add tests for waste report command
zhangxuan97 Nov 8, 2019
84ccc15
Finish EditGroceryCommandTest and fix some bugs
kelvinnharris Nov 8, 2019
5a12af6
Update PPP, DG, javadocs and add more tests
evelynejuliet Nov 9, 2019
366b244
Commented out RedoTemplateCommandTest
evelynejuliet Nov 9, 2019
4427944
Finish EditGroceryCommandParserTest
kelvinnharris Nov 9, 2019
8c25289
Fix checkstyle
kelvinnharris Nov 9, 2019
3283a31
Merge branch 'master' into tests
kelvinnharris Nov 9, 2019
7a874f4
Fix RedoTemplateCommand
evelynejuliet Nov 9, 2019
7f2120b
Fix checkstyleTest
evelynejuliet Nov 9, 2019
8cf0573
Update user guide and sample data
kelvinnharris Nov 9, 2019
f288da9
Merge branch 'tests' of https://github.com/kelvinnharris/main into tests
kelvinnharris Nov 9, 2019
30998b9
Fix waste report tests (missing checks for equality in waste report i…
zhangxuan97 Nov 9, 2019
c3e76bd
Add tests for waste list storage
zhangxuan97 Nov 9, 2019
1d23066
Add newlines at end of test data
zhangxuan97 Nov 9, 2019
27f66c3
Add ReminderCommandParserTest and ReminderDefaultCommandParseTest
evelynejuliet Nov 9, 2019
3ae4b95
Add more test to ReminderDefaultCommandParserTest
evelynejuliet Nov 9, 2019
eeb8f8b
Fix checkstyleTest
evelynejuliet Nov 9, 2019
a43c34d
Fix more bugs related to non integer input for ReminderCommand and Re…
evelynejuliet Nov 9, 2019
e1ae8ba
Merge branch 'master' into branch-update
evelynejuliet Nov 9, 2019
2706462
Merge pull request #239 from evelynejuliet/branch-update
evelynejuliet Nov 9, 2019
ad780d3
Update tests for waste list storage
zhangxuan97 Nov 9, 2019
d09cfbc
Merge branch 'master' into wk12-tests
zhangxuan97 Nov 9, 2019
ab76913
Make PPP
ManasVegi Nov 9, 2019
d6b663c
Merge branch 'master' into wk12-Documentation
ManasVegi Nov 9, 2019
30faae3
Add details to clarify implementation of waste report in DG
zhangxuan97 Nov 9, 2019
f4728e8
Attempt to fix checkstyle errors
zhangxuan97 Nov 9, 2019
1053a20
Documentation updates
zhangxuan97 Nov 9, 2019
b41f2a7
Add Javadoc for non-trivial methods for waste month and waste statistics
zhangxuan97 Nov 9, 2019
b63eb21
Merge pull request #238 from zhangxuan97/wk12-tests
kelvinnharris Nov 9, 2019
622c14c
Merge branch 'master' into tests
kelvinnharris Nov 9, 2019
864dad3
Merge pull request #240 from kelvinnharris/tests
zhangxuan97 Nov 9, 2019
2bfefa7
Finish JsonGroceryListStorageTest
kelvinnharris Nov 9, 2019
ff76297
Add manual testing section fo waste list and update the general manua…
zhangxuan97 Nov 9, 2019
8357580
Update site name
zhangxuan97 Nov 9, 2019
263e728
Merge branch 'master' into wk12-Documentation
ManasVegi Nov 9, 2019
9e082e0
Finish JsonSerializableGroceryListTest
kelvinnharris Nov 9, 2019
c319a65
fix incorrect link
zhangxuan97 Nov 9, 2019
3095299
fix checkstyle violations
zhangxuan97 Nov 9, 2019
4fcc9bd
Finish JsonAdaptedGroceryItemTest
kelvinnharris Nov 9, 2019
fe17862
remove command summary section from PPP (exceed page limit)
zhangxuan97 Nov 9, 2019
517b1f1
Finish StorageManagerTest
kelvinnharris Nov 9, 2019
8b1db85
Create storage.grocerylist package in tests
kelvinnharris Nov 9, 2019
ff9572e
Make ShoppingItem equals method check for all attributes
ManasVegi Nov 9, 2019
c770914
Delete unused class
ManasVegi Nov 9, 2019
a150a65
Update Ui.png
evelynejuliet Nov 9, 2019
78755d8
Merge branch 'master' into branch-update-ui-png
evelynejuliet Nov 9, 2019
e392f73
Merge pull request #241 from zhangxuan97/wk12-documentation-updates
kelvinnharris Nov 9, 2019
b43494c
Merge branch 'master' into more-tests
kelvinnharris Nov 9, 2019
e22391c
Merge branch 'master' into branch-update-ui-png
kelvinnharris Nov 9, 2019
bd0c02b
Merge pull request #242 from evelynejuliet/branch-update-ui-png
kelvinnharris Nov 9, 2019
158c16c
Change JsonGroceryListStorageTest content
kelvinnharris Nov 9, 2019
99083fa
Add newline at EOF
kelvinnharris Nov 9, 2019
9956130
Merge branch 'more-tests' of https://github.com/kelvinnharris/main in…
kelvinnharris Nov 9, 2019
3394909
Merge branch 'master' into more-tests
kelvinnharris Nov 9, 2019
0598fc6
Merge pull request #243 from kelvinnharris/more-tests
evelynejuliet Nov 9, 2019
6505c3f
Abstract out some code
ManasVegi Nov 9, 2019
ed427b1
Merge branch 'master' into wk12-DocumentationAndTweaks
ManasVegi Nov 9, 2019
9b36460
Edit AddTemplteItemCommandTest
teika97 Nov 9, 2019
b6769b5
Add Manual Testing, Update App Logo
evelynejuliet Nov 10, 2019
c3adc92
Added fix to allow waste list to contain duplicates
zhangxuan97 Nov 10, 2019
3c06300
add newline at EOF
zhangxuan97 Nov 10, 2019
2b6030b
Merge pull request #244 from evelynejuliet/branch-update-manual-testing
zhangxuan97 Nov 10, 2019
a177348
Merge branch 'master' into wk12-wastelist-update
zhangxuan97 Nov 10, 2019
23e0e37
Merge pull request #245 from zhangxuan97/wk12-wastelist-update
evelynejuliet Nov 10, 2019
2ba3f52
Fix links to java file, update ArchitectureSequenceDiagram
kelvinnharris Nov 9, 2019
4f169bb
Update contributions in PPP
kelvinnharris Nov 10, 2019
ecc9be7
Update sequence diagram DG
kelvinnharris Nov 10, 2019
78e7645
Update Amount in DG and UG
kelvinnharris Nov 10, 2019
5b32ba4
Update DG for glist use
kelvinnharris Nov 10, 2019
8551695
Update manual testing for grocery list
kelvinnharris Nov 10, 2019
c2fbdd2
Update user guide
kelvinnharris Nov 10, 2019
f476536
Fix regex bug in Amount class
kelvinnharris Nov 10, 2019
354c25b
Update Javadoc
kelvinnharris Nov 10, 2019
7305790
Add newline to EOF
kelvinnharris Nov 10, 2019
01809dc
Manual testing guidelines in Developer Guide
ManasVegi Nov 10, 2019
f813c05
Add manual testing guidelines to PPP
ManasVegi Nov 10, 2019
7f51d64
Small change to UserGuide
ManasVegi Nov 10, 2019
441beb7
limited ppp to 10 pages
zhangxuan97 Nov 10, 2019
1d8a99d
simple changes
zhangxuan97 Nov 10, 2019
4ff1422
Add storage class diagram to DG and PPP
ManasVegi Nov 10, 2019
ac02904
Remove some unnecessary code
ManasVegi Nov 10, 2019
d78a5af
Handle the case when bought amount unit type is different from that o…
ManasVegi Nov 10, 2019
c8baced
Handle consistency when shopping name edited and improve efficiency d…
ManasVegi Nov 10, 2019
c973709
Fix bug: when item fully bought, loses its urgent tag
ManasVegi Nov 10, 2019
0ad2c1d
Improve isCompletelyBought method's efficiency
ManasVegi Nov 10, 2019
bf5d0b3
Newline at EOF
ManasVegi Nov 10, 2019
bdf0520
Dupicate check before unit check when editing shopping items
ManasVegi Nov 10, 2019
6c1944a
Remove an unnecessary test that cannot be checked in runtime
ManasVegi Nov 10, 2019
1ea1a37
Correct minor issue in typical shopping item
ManasVegi Nov 10, 2019
ebbb530
Merge branch 'master' into wk12-DocumentationAndTweaks
ManasVegi Nov 10, 2019
25532bd
Fix major bug by making unitdictionary check bought list also
ManasVegi Nov 10, 2019
50f25a4
Update PPP
ManasVegi Nov 10, 2019
7968b4c
Update ppp and removed proposed undo redo in DG
evelynejuliet Nov 10, 2019
c3c53ef
Make PPP smaller
ManasVegi Nov 10, 2019
aedb791
Convert PPP to pdf
ManasVegi Nov 10, 2019
2cc4230
Add newline at EOF
ManasVegi Nov 10, 2019
0ca4fc2
Fix tests
ManasVegi Nov 10, 2019
e7201f5
Edit Developer’s Guide
teika97 Nov 11, 2019
2aba0db
Add tests
teika97 Nov 11, 2019
05f5893
Minor change on docs
kelvinnharris Nov 11, 2019
9dba8e7
Add manual testing
teika97 Nov 11, 2019
8eff9cc
Minor fix on PPP and DG
kelvinnharris Nov 11, 2019
4e257ad
Edit UserGuide
teika97 Nov 11, 2019
b16c194
Merge pull request #246 from kelvinnharris/docs-update
evelynejuliet Nov 11, 2019
c50954b
Add newline
evelynejuliet Nov 11, 2019
01cbe9f
Edit UG, DG and PPP
teika97 Nov 11, 2019
7d31e93
Merge branch 'master' into wk12-DocumentationAndTweaks
ManasVegi Nov 11, 2019
271e92e
Minor changes to PPP
evelynejuliet Nov 11, 2019
3a44233
Add tests for AddTemplate and Urgent shopping commands
ManasVegi Nov 11, 2019
c448a4f
Merge branch 'master' into branch-update-ppp
zhangxuan97 Nov 11, 2019
512deb7
Merge branch 'master' into wk12-documentation-changes
evelynejuliet Nov 11, 2019
9bc1dcd
Merge pull request #249 from ManasVegi/wk12-DocumentationAndTweaks
ManasVegi Nov 11, 2019
49c7200
Merge branch 'master' into wk12-documentation-changes
zhangxuan97 Nov 11, 2019
c2eed38
Merge branch 'master' into branch-update-ppp
evelynejuliet Nov 11, 2019
7ac96f2
Merge pull request #247 from zhangxuan97/wk12-documentation-changes
zhangxuan97 Nov 11, 2019
763876c
Merge branch 'master' into branch-update-ppp
zhangxuan97 Nov 11, 2019
7496f83
Merge pull request #248 from evelynejuliet/branch-update-ppp
ManasVegi Nov 11, 2019
6295c1a
Fix remDefault sequence diagram
evelynejuliet Nov 11, 2019
55a7a16
Delete shopping item when amount is 0
ManasVegi Nov 11, 2019
d0e5748
Delete all unused classes
ManasVegi Nov 11, 2019
05e6e00
Edit Comments and JavaDocs to exclude unused classes
ManasVegi Nov 11, 2019
10c0e8a
Update details in ParserUtilTest to match food items
ManasVegi Nov 11, 2019
b6b6b4c
Update UG and DG to edit restrictions of edit shopping command
ManasVegi Nov 11, 2019
24e9cc9
Merge pull request #250 from evelynejuliet/branch-minor-update
ManasVegi Nov 11, 2019
1c06a90
Merge branch 'master' into wk12-RemoveUnnecessaryClassesAndBugFixes
ManasVegi Nov 11, 2019
9ff6ed0
Merge pull request #251 from ManasVegi/wk12-RemoveUnnecessaryClassesA…
zhangxuan97 Nov 11, 2019
239b85b
Edit tests
teika97 Nov 11, 2019
1aa5950
Fix bug: check unit dictionary when editing grocery item's name
ManasVegi Nov 11, 2019
dbdfa3d
Merge branch 'master' into Tests
teika97 Nov 11, 2019
1ac6c14
Edit testUtils
teika97 Nov 11, 2019
4cf5518
Add PPP for teika97
teika97 Nov 11, 2019
196252e
Add EOF
teika97 Nov 11, 2019
ee4e6e0
Remove unused methods in LogicManagerTest
ManasVegi Nov 11, 2019
53b5326
Abstract out duplicate code
ManasVegi Nov 11, 2019
21ed838
Merge pull request #252 from teika97/Tests
ManasVegi Nov 11, 2019
2530e6d
Remove unused class: AddressBookBuilder
ManasVegi Nov 11, 2019
8fc130e
Improve equals method of UniqueTemplateList to handle for empty templ…
ManasVegi Nov 11, 2019
b6f9f67
Test for ModelManager
ManasVegi Nov 11, 2019
8af405b
Refactor code to get rid of 'Person' and improve code quality
ManasVegi Nov 11, 2019
15b5186
Merge branch 'master' into wk12-FinalChanges
ManasVegi Nov 11, 2019
f49c682
Refactor code to improve code quality
ManasVegi Nov 11, 2019
c76dfc5
Update pdf
evelynejuliet Nov 11, 2019
01f1aff
More refactoring to remove occurences of Person and AddressBook
ManasVegi Nov 11, 2019
f729027
Merge pull request #253 from evelynejuliet/branch-update-pdf
ManasVegi Nov 11, 2019
0c0d51a
Merge branch 'master' into wk12-FinalChanges
ManasVegi Nov 11, 2019
66dd33f
Edit User Guide
evelynejuliet Nov 11, 2019
aaf1a07
Update pdf
evelynejuliet Nov 11, 2019
ad9a072
Fix checkstyle issues
ManasVegi Nov 11, 2019
29c6e47
Merge branch 'wk12-FinalChanges' of https://github.com/ManasVegi/main…
ManasVegi Nov 11, 2019
e2fc7c3
Merge pull request #254 from ManasVegi/wk12-FinalChanges
zhangxuan97 Nov 11, 2019
3dcc60c
Make cardView more compact
kelvinnharris Nov 11, 2019
61c62c5
Merge branch 'evelynejuliet-branch-edit-ug'
evelynejuliet Nov 11, 2019
37f490e
Delete evelynejuliet.pdf
evelynejuliet Nov 11, 2019
ee51fd9
Delete pdf
evelynejuliet Nov 11, 2019
6f222e8
Edit pdf
evelynejuliet Nov 11, 2019
b378231
Merge pull request #257 from evelynejuliet/branch-edit-pdf
teika97 Nov 11, 2019
caec6f0
fix crash in app
zhangxuan97 Nov 11, 2019
a3f6815
Merge branch 'master' into wk13-minor
zhangxuan97 Nov 11, 2019
e32ab21
Merge pull request #258 from zhangxuan97/wk13-minor
kelvinnharris Nov 11, 2019
3cfe2cd
Change CommandBox color
kelvinnharris Nov 11, 2019
68248c0
Update Ui.png
kelvinnharris Nov 11, 2019
2baa7f4
Minor fix
kelvinnharris Nov 11, 2019
a40d0c2
Add newline at EOF
kelvinnharris Nov 11, 2019
5684996
Minor fix on SplitPane
kelvinnharris Nov 11, 2019
f13d8ed
Edit to DG, UG and PPP, resolve bug found in checking for duplicate t…
teika97 Nov 11, 2019
3e1fe8b
Merge branch 'master' into test_final
teika97 Nov 11, 2019
ca6c700
Update PPP pdf for manasvegi
ManasVegi Nov 11, 2019
cb20ccd
Fix badly cropped Ui
kelvinnharris Nov 11, 2019
4284b69
Merge branch 'master' into wk12-FinalChanges
ManasVegi Nov 11, 2019
a0bfb3b
Merge branch 'master' into update-cardview
kelvinnharris Nov 11, 2019
f8c5916
Resolve checkStyle violation
teika97 Nov 11, 2019
a7a29b1
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F10-2/mai…
teika97 Nov 11, 2019
a39c8a3
Merge pull request #261 from ManasVegi/wk12-FinalChanges
zhangxuan97 Nov 11, 2019
1ef620a
Merge branch 'master' into test_final: Update PPP pdf for manasvegi
teika97 Nov 11, 2019
604e109
Merge branch 'master' into update-cardview
zhangxuan97 Nov 11, 2019
e9aa6fb
Merge pull request #259 from kelvinnharris/update-cardview
zhangxuan97 Nov 11, 2019
04281c6
Merge branch 'master' of https://github.com/AY1920S1-CS2103-F10-2/mai…
teika97 Nov 11, 2019
e3246aa
Merge branch 'test_final' of https://github.com/teika97/main into tes…
teika97 Nov 11, 2019
20a0482
Merge pull request #260 from teika97/test_final
zhangxuan97 Nov 11, 2019
4462c9c
Fix remDefault
evelynejuliet Nov 11, 2019
985eaa1
Minor fix
kelvinnharris Nov 11, 2019
d7a4b24
Fix bought status of shopping items in SampleDataUtil
ManasVegi Nov 11, 2019
bc21b88
Merge pull request #262 from evelynejuliet/branch-edit-remdefault
zhangxuan97 Nov 11, 2019
73862a4
Merge branch 'master' into wk12-FinalChanges
ManasVegi Nov 11, 2019
a1f9c0d
Merge branch 'master' into lastest-last-commit
ManasVegi Nov 11, 2019
683110f
Fix UG
evelynejuliet Nov 11, 2019
a4f3ac5
Edit DG, Activity Diagram, PPP
teika97 Nov 11, 2019
86d5a23
Merge pull request #263 from kelvinnharris/lastest-last-commit
evelynejuliet Nov 11, 2019
8d9a5b9
Merge branch 'master' into test_final
teika97 Nov 11, 2019
3f34a7f
Merge branch 'master' into branch-minor-edit-ug
teika97 Nov 11, 2019
e76015e
Merge pull request #266 from teika97/test_final
evelynejuliet Nov 11, 2019
40559cf
Merge branch 'master' into branch-minor-edit-ug
evelynejuliet Nov 11, 2019
97df77a
Merge branch 'master' into wk12-FinalChanges
ManasVegi Nov 11, 2019
23d20a8
Merge pull request #265 from evelynejuliet/branch-minor-edit-ug
evelynejuliet Nov 11, 2019
f53d151
Merge branch 'master' into wk12-FinalChanges
ManasVegi Nov 11, 2019
615503d
Merge pull request #264 from ManasVegi/wk12-FinalChanges
zhangxuan97 Nov 11, 2019
5327567
Update About Us
evelynejuliet Nov 11, 2019
ca180df
Add updateMapWithBoughtItems method
teika97 Nov 11, 2019
52749b1
Minor update to DG
evelynejuliet Nov 11, 2019
7f45f40
Fix bug: addition of bought amount displayed in UI when bought items …
ManasVegi Nov 11, 2019
288ae21
Add comment
teika97 Nov 11, 2019
0a38675
Resolve checkStyle violations - imports
teika97 Nov 11, 2019
94ad510
Merge pull request #268 from teika97/bug_fix
teika97 Nov 11, 2019
e385b31
Merge branch 'master' into wk12-FinalChanges
ManasVegi Nov 11, 2019
14963a7
update command summary in UG
zhangxuan97 Nov 11, 2019
7fb9e14
Merge branch 'master' into ug-changes
zhangxuan97 Nov 11, 2019
a22f74a
Merge pull request #269 from ManasVegi/wk12-FinalChanges
evelynejuliet Nov 11, 2019
c8f4d90
Merge branch 'master' into branch-update-aboutus
evelynejuliet Nov 11, 2019
a72c304
Merge branch 'master' into ug-changes
zhangxuan97 Nov 11, 2019
069a257
Merge pull request #267 from evelynejuliet/branch-update-aboutus
evelynejuliet Nov 11, 2019
f22bbc9
Merge branch 'master' into ug-changes
teika97 Nov 11, 2019
e36f19d
update DG
zhangxuan97 Nov 11, 2019
af8576a
Merge pull request #270 from zhangxuan97/ug-changes
teika97 Nov 11, 2019
1e0c442
Correct the name of portfolio page for ManasVegi
ManasVegi Nov 12, 2019
48a9fcf
Merge branch 'master' into AmendPPPName
ManasVegi Nov 12, 2019
4fbef93
Merge pull request #271 from ManasVegi/AmendPPPName
ManasVegi Nov 12, 2019
84afc46
Fix the link of PPP for ManasVegi
ManasVegi Nov 16, 2019
50ed491
Merge branch 'master' into AmendPPPName
ManasVegi Nov 16, 2019
e07b490
Merge pull request #273 from ManasVegi/AmendPPPName
ManasVegi Nov 16, 2019
395eefe
Amend AboutUs
ManasVegi Nov 16, 2019
9efef2b
Merge branch 'master' into AmendPPPName
ManasVegi Nov 16, 2019
53f8cd8
Merge pull request #274 from ManasVegi/AmendPPPName
ManasVegi Nov 16, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store
UserGuide.pdf
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ MIT License

Copyright (c) 2016 Software Engineering Education - FOSS Resources

Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any food obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Software, and to permit foods to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
Expand Down
22 changes: 11 additions & 11 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
= Address Book (Level 3)
= iFridge
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
image:https://travis-ci.org/AY1920S1-CS2103-F10-2/main.svg?branch=master["Build Status", link="https://travis-ci.org/AY1920S1-CS2103-F10-2/main"]
https://coveralls.io/github/AY1920S1-CS2103-F10-2/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2103-F10-2/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,22 +12,25 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* If you want to manage your food items without hassle, iFridge is the application made for you!
* This application is made for tech savvy individuals to manage the food in their fridge, control Wastage, and create Shopping Lists.
* This is a desktop application for managing Food in a Fridge. It has a GUI but most of the user interactions happen using a Command Line Interface.
* With reminders for food expiring soon and periodic feedback about the waste generated, iFridge will make sure you review and minimize waste.
* You can create template lists (list of items that you would like to have in your fridge at any time).
* And, with a single command, you can generate a shopping list of items that are in your template list but not yet there in the Fridge!

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== Acknowledgements

* Some parts of this application were inspired by https://se-education.org by SE-EDU initiative.
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5], http://natty.joestelmach.com/[Natty], http://www.jfree.org/jfreechart/[JFreeChart]

== Licence : link:LICENSE[MIT]
Binary file added TemplateListCommandUIActivityDiagram.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ plugins {
}

// Specifies the entry point of the application
mainClassName = 'seedu.address.Main'
mainClassName = 'seedu.ifridge.Main'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
Expand Down Expand Up @@ -64,10 +64,16 @@ dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion

testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion

// https://mvnrepository.com/artifact/com.joestelmach/natty
compile group: 'com.joestelmach', name: 'natty', version: '0.13'

// https://mvnrepository.com/artifact/org.jfree/jfreechart-fx
compile group: 'org.jfree', name: 'jfreechart-fx', version: '1.0.1'
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'iFridge.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -133,8 +139,8 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level3',
'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
'site-name': 'iFridge',
'site-githuburl': 'https://github.com/AY1920S1-CS2103-F10-2/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
55 changes: 27 additions & 28 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,52 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
iFridge was developed by the https://AY1920S1-CS2103-F10-2.github.io/docs/Team.html[AY1920S1-CS2103-F10-2] team. +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team
== CS2103-F10-2

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Tie Ying Kathleen
image::teika97.png[width="150", align="left"]
{empty}[http://github.com/teika97[github]] [<<teika97#, portfolio>>]

Role: Project Advisor
Role: Team Lead + Scheduling and tracking
Responsibilities: In charge of UI

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Kelvin Harris
image::kelvinnharris.png[width="150", align="left"]
{empty}[https://github.com/kelvinnharris[github]] [<<kelvinnharris#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Role: Integration +
Responsibilities: In charge of Model

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Evelyne Juliet
image::evelynejuliet.png[width="150", align="left"]
{empty}[https://github.com/evelynejuliet[github]] [<<evelynejuliet#, portfolio>>]

Role: Developer +
Responsibilities: Data
Role: Code Quality +
Responsibilities: In charge of Commons

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Zhang Xuan
image::zhangxuan97.png[width="150", align="left"]
{empty}[https://github.com/zhangxuan97[github]] [<<zhangxuan97#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Documentation +
Responsibilities: In charge of Storage

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Manas Vegi
image::manasvegi.png[width="150", align="left"]
{empty}[https://github.com/manasvegi[github]] [<<manasvegi#, portfolio>>]

Role: Developer +
Responsibilities: UI
Role: Testing +
Responsibilities: In charge of Logic

'''
4 changes: 2 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2103-F10-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
* *Email us* : You can also reach us at `https://github.com/AY1920S1-CS2103-F10-2`
4 changes: 2 additions & 2 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= iFridge - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand All @@ -12,7 +12,7 @@ ifdef::env-github[]
:note-caption: :information_source:
:warning-caption: :warning:
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level3/tree/master
:repoURL: https://github.com/AY1920S1-CS2103-F10-2/main/tree/master

== Build Automation

Expand Down
Loading