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-F12-4] ezFoodie #80

Open
wants to merge 601 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
601 commits
Select commit Hold shift + click to select a range
d96e8f0
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 5, 2021
f8832f1
The draft for PPP of zzybluebell
zzybluebell Nov 5, 2021
153a1a7
update ppp-zzybluebell
zzybluebell Nov 5, 2021
c529608
update ppp-zzybluebell
zzybluebell Nov 5, 2021
cd10ad3
update new line in PPP-zzybluebell EOF
zzybluebell Nov 5, 2021
5e43945
Merge branch 'master' into fix-bugs
HolmesJJ Nov 5, 2021
36ee26e
update ppp-zzybluebell
zzybluebell Nov 5, 2021
eb6ae3f
Merge pull request #189 from HolmesJJ/fix-bugs
HolmesJJ Nov 5, 2021
b0104fa
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 5, 2021
ba59478
Merge branch 'master' into zzybluebell-PPP
zzybluebell Nov 5, 2021
1db8c5f
update ppp-zzybluebell
zzybluebell Nov 5, 2021
6df7c96
Merge pull request #190 from zzybluebell/zzybluebell-PPP
zzybluebell Nov 5, 2021
4cf093e
Merge pull request #26 from zzybluebell/zzybluebell-PPP
zzybluebell Nov 5, 2021
cc8491e
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
zzybluebell Nov 5, 2021
b793735
Update UG to indicate expected behaviour when an invalid member field
Nov 5, 2021
87d4604
Update part of UG.
Nov 5, 2021
4720b71
Merge pull request #191 from Morrow1ndy/master
Morrow1ndy Nov 5, 2021
2dbfc80
Update UG and UI related issues.
Nov 5, 2021
218bc68
Update ViewCommand in UG.
Nov 5, 2021
6d94998
Update UI for text arrangement.
Nov 5, 2021
ff2f34c
Update help window and fix bugs in UG
mukundrs Nov 5, 2021
2e94df1
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
zzybluebell Nov 6, 2021
323decb
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 6, 2021
83f1702
Update nice UI
HolmesJJ Nov 6, 2021
5e2d65d
Merge branch 'master' into fix-bugs
HolmesJJ Nov 6, 2021
de9dd5a
Merge pull request #194 from HolmesJJ/fix-bugs
HolmesJJ Nov 6, 2021
00e2ced
Minor changes to UG.
Nov 6, 2021
1fc591d
Add purpose section to UG.
Nov 6, 2021
ab46eab
Format UG.
Nov 6, 2021
315de4d
Format UG.
Nov 6, 2021
0b1ccd9
points related with add, edit, delet
zzybluebell Nov 6, 2021
c2d6c8d
Merge branch 'master' into master
Morrow1ndy Nov 6, 2021
d11eeac
redeem points in editTransactionCommand
zzybluebell Nov 6, 2021
c2bd1b8
Merge pull request #192 from Morrow1ndy/master
HolmesJJ Nov 6, 2021
75198a7
fix minor javadoc
zzybluebell Nov 6, 2021
16a7fb8
Update UserGuide.md
mukundrs Nov 6, 2021
5e24ece
Merge pull request #195 from zzybluebell/update-bug-redeem-point
HolmesJJ Nov 6, 2021
9a4b830
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 6, 2021
c39bb3f
Fix small bugs
HolmesJJ Nov 6, 2021
ee8cb8f
Merge pull request #196 from HolmesJJ/fix-bugs
HolmesJJ Nov 6, 2021
82fe9c4
Add test for Reservation and update DG
mukundrs Nov 6, 2021
e57fcd7
Revert "Fix incorrect prefixes in UG"
stephanie-csy Nov 6, 2021
4b1735a
Merge branch 'master' of https://github.com/AY2122S1-CS2103T-F12-4/tp
stephanie-csy Nov 6, 2021
efba71e
Add my PPP and update UG
stephanie-csy Nov 6, 2021
3644cd7
Merge branch 'master' into master
stephanie-csy Nov 6, 2021
183cf0b
Merge pull request #193 from mukundrs/master
stephanie-csy Nov 6, 2021
70b9c20
Merge branch 'master' into master
mukundrs Nov 6, 2021
ea0442a
Merge pull request #197 from stephanie-csy/master
mukundrs Nov 6, 2021
05d5743
Merge remote-tracking branch 'upstream/master'
mukundrs Nov 6, 2021
b417cec
Merge remote-tracking branch 'upstream/master'
mukundrs Nov 6, 2021
6a86e2c
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 7, 2021
2146569
update ug
zzybluebell Nov 7, 2021
153a719
Fix documentation bugs, update DG, add ReservationTest
mukundrs Nov 7, 2021
a2960f3
Add PPP draft for morrow1ndy.
Nov 7, 2021
348b5cb
Update GUI for MainWindow, HelpWindow and SummaryWindow
Nov 7, 2021
c7f4b37
Fix checkstyle issues.
Nov 7, 2021
c4a525a
Delete .classpath
Morrow1ndy Nov 7, 2021
effbe4b
Delete org.eclipse.buildship.core.prefs
Morrow1ndy Nov 7, 2021
2452d20
Update CommandBox.java
Morrow1ndy Nov 7, 2021
fefe3c8
Update HelpBox.java
Morrow1ndy Nov 7, 2021
9f2d961
Update HelpWindow.java
Morrow1ndy Nov 7, 2021
09f59f0
Update MainWindow.java
Morrow1ndy Nov 7, 2021
c51aec8
Update MemberCard.java
Morrow1ndy Nov 7, 2021
4d1fb3a
Update MemberCard.java
Morrow1ndy Nov 7, 2021
a9d6e8c
Update MemberDetailsCard.java
Morrow1ndy Nov 7, 2021
372123f
Update MemberDetailsListPanel.java
Morrow1ndy Nov 7, 2021
58105d4
Update MemberListPanel.java
Morrow1ndy Nov 7, 2021
4c8c506
Update MemberViewWindow.java
Morrow1ndy Nov 7, 2021
7c35a6f
Update MemberViewWindow.java
Morrow1ndy Nov 7, 2021
25d4586
Update ReservationCard.java
Morrow1ndy Nov 7, 2021
308782e
Update ReservationListPanel.java
Morrow1ndy Nov 7, 2021
4f129f8
Update ResultDisplay.java
Morrow1ndy Nov 7, 2021
2f29b6a
Update StatusBarFooter.java
Morrow1ndy Nov 7, 2021
17d3183
Update SummaryBox.java
Morrow1ndy Nov 7, 2021
111177c
Update SummaryBox.java
Morrow1ndy Nov 7, 2021
6db2f16
Update SummaryWindow.java
Morrow1ndy Nov 7, 2021
8e0d784
Update TransactionCard.java
Morrow1ndy Nov 7, 2021
456c53d
Update TransactionCard.java
Morrow1ndy Nov 7, 2021
f8de351
Update TransactionListPanel.java
Morrow1ndy Nov 7, 2021
da17964
Update UiManager.java
Morrow1ndy Nov 7, 2021
3d77917
Update UiManager.java
Morrow1ndy Nov 7, 2021
d03b1cb
Update UiManager.java
Morrow1ndy Nov 7, 2021
ab669fa
Update DarkTheme.css
Morrow1ndy Nov 7, 2021
827cdca
Update DarkTheme.
Nov 7, 2021
548fe7b
Update text displayed in HelpWindow.
Nov 7, 2021
e7e414c
Update MemberCard.java
Morrow1ndy Nov 7, 2021
1988699
Update HelpBox.java
Morrow1ndy Nov 7, 2021
4a7ad2b
Fix minor bugs on Summary Window and checkstyle issues.
Nov 7, 2021
1d1d236
Merge branch 'master' of https://github.com/Morrow1ndy/tp
Nov 7, 2021
ccaa3a5
Delete morrow1ndy.md
Morrow1ndy Nov 7, 2021
f8a4a5b
Merge pull request #200 from Morrow1ndy/master
HolmesJJ Nov 7, 2021
8d5a95c
update UG
zzybluebell Nov 7, 2021
672bf23
Merge pull request #199 from mukundrs/master
HolmesJJ Nov 7, 2021
2bad431
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 7, 2021
ee92835
Merge branch 'master' into update-UG
zzybluebell Nov 7, 2021
7a38066
update checkstytle about UG
zzybluebell Nov 7, 2021
9249950
minor change for testcase
zzybluebell Nov 7, 2021
9a9f283
update format in UG
zzybluebell Nov 7, 2021
cf46513
update hyperlink
zzybluebell Nov 7, 2021
a040150
update help png
zzybluebell Nov 7, 2021
ea8acd0
update hyperlink
zzybluebell Nov 7, 2021
970ab9c
update ug
zzybluebell Nov 7, 2021
b0ccebe
update quickstart in ug
zzybluebell Nov 7, 2021
f18cd16
commit format
zzybluebell Nov 7, 2021
249c85f
related bugs
zzybluebell Nov 7, 2021
64d50b4
update bugs
zzybluebell Nov 7, 2021
e70309c
update format
zzybluebell Nov 7, 2021
889033f
update format
zzybluebell Nov 7, 2021
cc1d927
update format
zzybluebell Nov 7, 2021
6bfc21c
format change
zzybluebell Nov 7, 2021
22303cc
update format
zzybluebell Nov 7, 2021
f9e3eb1
format commit
zzybluebell Nov 7, 2021
4c2453c
update format
zzybluebell Nov 7, 2021
5c292b2
update format
zzybluebell Nov 7, 2021
15b5fb1
update fix
zzybluebell Nov 7, 2021
1882b5d
update format
zzybluebell Nov 7, 2021
16da5bc
update format
zzybluebell Nov 7, 2021
d61eded
format update
zzybluebell Nov 7, 2021
33750d9
change size of font
zzybluebell Nov 7, 2021
e24025e
change size
zzybluebell Nov 7, 2021
43a9ad7
change format
zzybluebell Nov 7, 2021
8af2c2f
update details
zzybluebell Nov 7, 2021
a24d1d2
update minor changes
zzybluebell Nov 7, 2021
6bc7d3a
minor change
zzybluebell Nov 7, 2021
a499074
minor changes
zzybluebell Nov 7, 2021
47a781b
minor changes
zzybluebell Nov 7, 2021
ecca8a0
Merge pull request #198 from zzybluebell/update-UG
zzybluebell Nov 7, 2021
a4a2c3c
Merge pull request #27 from zzybluebell/update-UG
zzybluebell Nov 7, 2021
766a32a
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
zzybluebell Nov 7, 2021
87ffdf5
Update DG
HolmesJJ Nov 7, 2021
90b8787
Fix small issue
HolmesJJ Nov 7, 2021
d0bb4ee
Final fix bugs
HolmesJJ Nov 8, 2021
1979b49
Add bottom exit hint
HolmesJJ Nov 8, 2021
1b4b089
Update UI
HolmesJJ Nov 8, 2021
558d914
Merge pull request #202 from HolmesJJ/fix-bugs
zzybluebell Nov 8, 2021
79bbf3b
Update readme
HolmesJJ Nov 8, 2021
681bb0d
Update width of the Ui
HolmesJJ Nov 8, 2021
742d810
Merge pull request #203 from HolmesJJ/fix-bugs
HolmesJJ Nov 8, 2021
c8cf8f4
Merge branch 'master' into update-dg
HolmesJJ Nov 8, 2021
80ac0ca
Merge pull request #204 from HolmesJJ/update-dg
mukundrs Nov 8, 2021
5c63b37
Update DG with delete reservation, update my PPP
stephanie-csy Nov 8, 2021
b06245f
Merge branch 'master' of https://github.com/AY2122S1-CS2103T-F12-4/tp
stephanie-csy Nov 8, 2021
dafdd69
Merge branch 'master' into update-dg
HolmesJJ Nov 8, 2021
4870d2b
Merge pull request #205 from stephanie-csy/master
mukundrs Nov 8, 2021
7a096f6
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
zzybluebell Nov 8, 2021
70ddc86
update ug
zzybluebell Nov 8, 2021
ed6d592
minor change
zzybluebell Nov 8, 2021
21413da
update changes in ug
zzybluebell Nov 8, 2021
1822d78
update changes
zzybluebell Nov 8, 2021
6dbeb89
update changes
zzybluebell Nov 8, 2021
f53ad29
update changes
zzybluebell Nov 8, 2021
1bc66a6
update changes
zzybluebell Nov 8, 2021
6edb5bf
minor changes
zzybluebell Nov 8, 2021
447795a
minor changes
zzybluebell Nov 8, 2021
8d722df
minor changes
zzybluebell Nov 8, 2021
e7120ba
minor changes
zzybluebell Nov 8, 2021
47dd241
minor changes
zzybluebell Nov 8, 2021
08a1111
minor changes
zzybluebell Nov 8, 2021
0daeaef
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 8, 2021
c65f0bc
Merge branch 'master' into update-UG
zzybluebell Nov 8, 2021
1a16b99
update changes
zzybluebell Nov 8, 2021
22721b0
minor changes
zzybluebell Nov 8, 2021
a3a6fe0
minor changes
zzybluebell Nov 8, 2021
f765b08
Merge pull request #206 from zzybluebell/update-UG
zzybluebell Nov 8, 2021
ecf573d
Merge pull request #28 from zzybluebell/update-UG
zzybluebell Nov 8, 2021
cad690c
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
zzybluebell Nov 8, 2021
5ca1b2e
Merge branch 'master' into update-dg
HolmesJJ Nov 8, 2021
8186077
Update DG
HolmesJJ Nov 8, 2021
e6cd619
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 8, 2021
5fb4029
Merge branch 'master' into update-UG
zzybluebell Nov 8, 2021
a74e8d4
Update partial comments for test classes.
Nov 8, 2021
d11a06e
Merge branch 'master' of https://github.com/Morrow1ndy/tp
Nov 8, 2021
b85c60e
Fix bugs in UG
mukundrs Nov 8, 2021
d6812c0
Fix bugs in UG, update my PPP
mukundrs Nov 8, 2021
f0e32fb
Updates comments in Test classes partially.
Nov 8, 2021
ab0ffbc
Delete undesired file.
Nov 8, 2021
90232a2
Merge branch 'master' into master
mukundrs Nov 8, 2021
b41fc29
Add comments for Test classes.
Nov 8, 2021
89f7719
Fix typo.
Morrow1ndy Nov 8, 2021
4d8b269
Merge pull request #209 from Morrow1ndy/master
HolmesJJ Nov 8, 2021
3590f9c
Minor bug fixes in UG
mukundrs Nov 8, 2021
6e01f28
PPP-zzybluebell
zzybluebell Nov 8, 2021
9f35644
Merge remote-tracking branch 'upstream/master'
mukundrs Nov 8, 2021
26d1f10
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
mukundrs Nov 8, 2021
53af020
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
zzybluebell Nov 8, 2021
b5c3f93
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 8, 2021
5ba8678
Merge branch 'master' into update-UG
zzybluebell Nov 8, 2021
528e19c
Fix small issues
HolmesJJ Nov 8, 2021
a1fed27
Fix minor bugs in UG
mukundrs Nov 8, 2021
96a4b51
Merge pull request #207 from HolmesJJ/update-dg
mukundrs Nov 8, 2021
767e531
update minor changes
zzybluebell Nov 8, 2021
e5ebf67
Merge pull request #211 from zzybluebell/update-UG
zzybluebell Nov 8, 2021
87d8490
Merge pull request #29 from zzybluebell/update-UG
zzybluebell Nov 8, 2021
826380b
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
zzybluebell Nov 8, 2021
0fca9a7
DG in zzy features
zzybluebell Nov 8, 2021
3be99c9
Merge pull request #208 from mukundrs/master
zzybluebell Nov 8, 2021
a692b38
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
zzybluebell Nov 8, 2021
5f1a74f
minor change
zzybluebell Nov 8, 2021
d4306ab
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 8, 2021
3ad5f35
Merge branch 'master' into update-UG
zzybluebell Nov 8, 2021
332a95f
Final update for app
HolmesJJ Nov 8, 2021
a8045ab
Merge branch 'master' into app-final-update
HolmesJJ Nov 8, 2021
fcbf931
update changes
zzybluebell Nov 8, 2021
177e28f
minor changes
zzybluebell Nov 8, 2021
9976d9c
minor changes
zzybluebell Nov 8, 2021
b06dbdb
Fix hug
HolmesJJ Nov 8, 2021
395e074
Merge pull request #213 from HolmesJJ/app-final-update
HolmesJJ Nov 8, 2021
5f7c93e
update changes
zzybluebell Nov 8, 2021
cced18d
update changes
zzybluebell Nov 8, 2021
f23f5fc
update changes
zzybluebell Nov 8, 2021
8fd71d9
update changes
zzybluebell Nov 8, 2021
b92c15b
Merge pull request #212 from zzybluebell/update-UG
mukundrs Nov 8, 2021
db4a025
minor changes
zzybluebell Nov 8, 2021
5e38276
update changes
zzybluebell Nov 8, 2021
83b8243
final chanegs
zzybluebell Nov 8, 2021
18644a5
update changes
zzybluebell Nov 8, 2021
de6578f
update changes
zzybluebell Nov 8, 2021
252a905
update changes
zzybluebell Nov 8, 2021
a5d60c2
final changes
zzybluebell Nov 8, 2021
6833dbf
update ppp
zzybluebell Nov 8, 2021
b12f341
Merge pull request #214 from zzybluebell/update-UG
zzybluebell Nov 8, 2021
8689f8a
Update UG and fix bugs in UML diagrams
mukundrs Nov 8, 2021
79a34a2
Update DG
HolmesJJ Nov 8, 2021
0e7954e
Update DG.
Nov 8, 2021
1f81655
Revert "Update DG."
Nov 8, 2021
c047e9a
minor changes
zzybluebell Nov 8, 2021
2e62732
Revert "Revert "Update DG.""
Nov 8, 2021
88503b7
Revert back
Nov 8, 2021
a8fc66f
Merge branch 'AY2122S1-CS2103T-F12-4:master' into master
Morrow1ndy Nov 8, 2021
f888c36
Update final UG.
Nov 8, 2021
7c3948a
minor change
zzybluebell Nov 8, 2021
31e3667
Merge pull request #216 from Morrow1ndy/master
HolmesJJ Nov 8, 2021
06980d0
Fix bugs in UG, UML diagrams and update my PPP
mukundrs Nov 8, 2021
8c434d9
Merge branch 'master' into update-dg
HolmesJJ Nov 8, 2021
f3d7dae
Merge pull request #215 from HolmesJJ/update-dg
mukundrs Nov 8, 2021
d9d0851
Merge pull request #217 from zzybluebell/update-UG
mukundrs Nov 8, 2021
237ba73
Update PPP
mukundrs Nov 8, 2021
065b4ed
Update PPP for morrow1ndy.
Nov 8, 2021
1c5cd95
Merge pull request #218 from mukundrs/master
stephanie-csy Nov 8, 2021
323f840
Merge pull request #219 from Morrow1ndy/master
stephanie-csy Nov 8, 2021
d32c2bc
changes
zzybluebell Nov 8, 2021
70d24e2
Merge branch 'master' of https://github.com/zzybluebell/tp
zzybluebell Nov 8, 2021
d8b151d
Merge branch 'master' into update-UG
zzybluebell Nov 8, 2021
33b1236
UG fix error
zzybluebell Nov 8, 2021
111780a
changes in UG and ppp
zzybluebell Nov 8, 2021
ce5c132
update changes
zzybluebell Nov 8, 2021
08e27db
changes minor
zzybluebell Nov 8, 2021
0ed0ca4
changes
zzybluebell Nov 8, 2021
2302783
Delete .project
zzybluebell Nov 8, 2021
aaa681e
Merge pull request #220 from zzybluebell/update-UG
zzybluebell Nov 8, 2021
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
  •  
  •  
  •  
37 changes: 26 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,29 @@
[![CI Status](https://github.com/se-edu/addressbook-level3/workflows/Java%20CI/badge.svg)](https://github.com/se-edu/addressbook-level3/actions)
# ezFoodie :takeout_box:

[![CI Status](https://github.com/AY2122S1-CS2103T-F12-4/tp/workflows/Java%20CI/badge.svg)](https://github.com/AY2122S1-CS2103T-F12-4/tp/actions)
[![codecov](https://codecov.io/gh/AY2122S1-CS2103T-F12-4/tp/branch/master/graph/badge.svg)](https://codecov.io/gh/AY2122S1-CS2103T-F12-4/tp)

![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.
* Have you faced some issues when managing the members in your restaurant? `ezFoodie` is here!

* `ezFoodie` is a desktop application that helps restaurants **keep track of their ever-growing list of members**. It is optimized for using via a **Command Line Interface (CLI)** while still having the benefits of a **Graphical User Interface (GUI)**. If you can type fast, ezFoodie can get your member management tasks done faster than traditional GUI applications.

* If you are interested in using `ezFoodie`, head over to the [_Quick Start_ section of the **User Guide**](https://ay2122s1-cs2103t-f12-4.github.io/tp/UserGuide.html#quick-start).

* If you are interested in developing `ezFoodie`, the [**Developer Guide**](https://ay2122s1-cs2103t-f12-4.github.io/tp/DeveloperGuide.html) is a good place to start.

## Acknowledgements

This project developed based on the **[Address Book Product Website](https://se-education.org/addressbook-level3)** project. Which is a part of the se-education.org initiative.

The icons of the project were obtained from [ezfoodie_icon](https://www.brandcrowd.com/), [member_icon](https://www.percici.com/), [summary_icon](https://www.pngwing.com/)

Libraries used:

* [JavaFX](https://openjfx.io/)
* [Jackson](https://github.com/FasterXML/jackson)
* [JUnit5](https://github.com/junit-team/junit5)
* [PlantUML](https://plantuml.com/)

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 information.
6 changes: 5 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ test {
finalizedBy jacocoTestReport
}

run {
enableAssertions = true
}

task coverage(type: JacocoReport) {
sourceDirectories.from files(sourceSets.main.allSource.srcDirs)
classDirectories.from files(sourceSets.main.output)
Expand Down Expand Up @@ -66,7 +70,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'ezfoodie.jar'
}

defaultTasks 'clean', 'test'
16 changes: 8 additions & 8 deletions config/checkstyle/checkstyle.xml
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE module PUBLIC
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">
"-//Checkstyle//DTD Checkstyle Configuration 1.3//EN"
"https://checkstyle.org/dtds/configuration_1_3.dtd">

<!--
This configuration file enforces rules for a modified version of the module's code standard at
Expand Down Expand Up @@ -56,11 +56,11 @@
4. THIRD_PARTY_PACKAGE: defined as com imports
-->
<module name="CustomImportOrder">
<property name="customImportOrderRules"
value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
<property name="specialImportsRegExp" value="^org\."/>
<property name="thirdPartyPackageRegExp" value="^com\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
<property name="customImportOrderRules"
value="STATIC###STANDARD_JAVA_PACKAGE###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE"/>
<property name="specialImportsRegExp" value="^org\."/>
<property name="thirdPartyPackageRegExp" value="^com\."/>
<property name="sortImportsInGroupAlphabetically" value="true"/>
</module>

<!-- Checks for redundant import statements.
Expand Down Expand Up @@ -216,7 +216,7 @@
some other variants which we don't publicized to promote consistency).
-->
<property name="reliefPattern"
value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
value="fall through|Fall through|fallthru|Fallthru|falls through|Falls through|fallthrough|Fallthrough|No break|NO break|no break|continue on"/>
</module>

<module name="MissingSwitchDefault"/>
Expand Down
9 changes: 9 additions & 0 deletions copyright.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,12 @@ Copyright by Susumu Yoshida - http://www.mcdodesign.com/
Copyright by Jan Jan Kovařík - http://glyphicons.com/
- calendar.png
- edit.png

Copyright by BrandCrowd - https://www.brandcrowd.com/
- ezfoodie_icon.png

Copyright by Percici - https://www.percici.com/
- member_icon.png

Copyright by PNGWing - https://www.pngwing.com/
- summary_icon.png
67 changes: 40 additions & 27 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,68 @@ title: About Us

We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).

You can reach us at the email `seer[at]comp.nus.edu.sg`
You can reach us via email, as indicated below.

## Project team

### John Doe
---

### Hu Jiajun `[email protected]`

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

[[homepage](http://www.comp.nus.edu.sg/~damithch)]
[[github](https://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github@holmesjj](http://github.com/holmesjj)]
[[portfolio@holmesjj](team/holmesjj.md)]

* Role: Project Advisor
* Role: Tech lead, Git expert
* Responsibilities: Scheduling and tracking

---

### Jane Doe
### Raja Sudalaimuthu Mukund `[email protected]`

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

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

* Role: Team Lead
* Responsibilities: UI
* Role: Developer
* Responsibilities: Documentation, deliverables and deadlines

---

### Johnny Doe
### Zhang Zhiyao `[email protected]`

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

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

* Role: Developer
* Responsibilities: Data
* Responsibilities: Integration, Testing and Documents

### Jean Doe
---

### Chen Shi Yao, Stephanie `[email protected]`

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

[[github](http://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github@stephanie-csy](http://github.com/stephanie-csy)]
[[portfolio@stephanie-csy](team/stephanie-csy.md)]

* Role: Developer
* Responsibilities: Dev Ops + Threading
* Responsibilities: Code quality

---

### James Doe
### Yang Yuzhao `[email protected]`

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

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

* Role: Developer
* Responsibilities: UI
* Responsibilities: Integration

---
Loading