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

[F10-4] MeNUS #73

Open
wants to merge 2,215 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
2215 commits
Select commit Hold shift + click to select a range
962c06b
Merge branch 'master' of https://github.com/yican95/main into docs/PPP
yican95 Nov 10, 2018
5f65421
docs: Update UI component pptx and png
azhikai Nov 10, 2018
1496404
Merge branch 'master' into hotfix/readme-dg
azhikai Nov 10, 2018
db0691a
UserGuide.adoc: Update menu commands
yican95 Nov 10, 2018
797f675
DeveloperGuide.adoc: Update menu implementation
yican95 Nov 10, 2018
a0b88a2
Update PPP
m4dkip Nov 10, 2018
2137104
Update User Guide
m4dkip Nov 10, 2018
f98365b
Update PPP
yican95 Nov 10, 2018
91a1fcb
Improve example for record-sales
HyperionNKJ Nov 10, 2018
135f4a8
UserGuide.adoc: Update macros
yican95 Nov 10, 2018
bde4721
DeveloperGuide: Update text
azhikai Nov 10, 2018
f96c525
Update edit-ing to include field on/ if edit by name
rebstan97 Nov 10, 2018
1c2c4fe
Issue #286 bugfix
HyperionNKJ Nov 10, 2018
7f711b3
Update tests
rebstan97 Nov 10, 2018
4bcd068
Remove unused imports
rebstan97 Nov 10, 2018
922887d
Fix checkstyle errors
rebstan97 Nov 10, 2018
ad8e6eb
Fix checkstyle error
rebstan97 Nov 10, 2018
92f09f5
Remove MenuCommandTestUtil
rebstan97 Nov 10, 2018
431ec68
Add stockUp test in RestaurantBookParser
rebstan97 Nov 10, 2018
5c70cf8
Fix wrong import order
rebstan97 Nov 10, 2018
cd5e366
Rename variables with NUMUNITS to NUM_UNIT
rebstan97 Nov 10, 2018
a001ec2
Add code annotation
rebstan97 Nov 10, 2018
3422c64
Fix errors
rebstan97 Nov 10, 2018
5f6332f
Fix errors
rebstan97 Nov 10, 2018
5770415
Fix checkstyle error
HyperionNKJ Nov 10, 2018
44c22f5
Change internal representation of records in SalesReport
HyperionNKJ Nov 10, 2018
e330934
Merge pull request #284 from AZhiKai/hotfix/readme-dg
azhikai Nov 11, 2018
5b53bfc
Update PPP
yican95 Nov 11, 2018
ada340e
Add annotations for test code
rebstan97 Nov 11, 2018
49cef9e
Update PPP
yican95 Nov 11, 2018
34e9472
Add tests to improve code coverage
rebstan97 Nov 11, 2018
75fd740
Update userguide
rebstan97 Nov 11, 2018
808192b
Merge branch 'master' into Bug-fixes
rebstan97 Nov 11, 2018
fe95bc2
Add model null checks, Update javadocs in Model
HyperionNKJ Nov 11, 2018
e520e66
Update PPP
yican95 Nov 11, 2018
3ae9dc4
team/azhikai: Update PPP
azhikai Nov 11, 2018
c61dad3
Rename class name
azhikai Nov 11, 2018
566ec1e
Add test for RecordListPanel
HyperionNKJ Nov 11, 2018
53e670c
Merge branch 'master' into bugfix/issue286
HyperionNKJ Nov 11, 2018
cf1d05f
FindAccountCommand: Add command class
azhikai Nov 11, 2018
52d78d0
HelpCommand: Remove full stop
azhikai Nov 11, 2018
acf9291
Merge pull request #287 from HyperionNKJ/bugfix/issue286
HyperionNKJ Nov 11, 2018
c679308
Merge branch 'master' into docs/PPP
rebstan97 Nov 11, 2018
fffa3b2
Merge branch 'master' into code/annotate
HyperionNKJ Nov 11, 2018
3a1b20a
Update PPP
rebstan97 Nov 11, 2018
920dd38
FindAccountCommandParser: Accept command
azhikai Nov 11, 2018
2f953bd
Fix typo in PPP
m4dkip Nov 11, 2018
ca759b7
Merge branch 'master' of https://github.com/m4dkip/main into updatePPP
m4dkip Nov 11, 2018
f7693f5
Update PPP
yican95 Nov 11, 2018
f5c8e38
Update UG
m4dkip Nov 11, 2018
e8dab8c
DeveloperGuide.adoc: Add figure reference
yican95 Nov 11, 2018
fae5d28
Update DG with figure numbers
m4dkip Nov 11, 2018
c858191
Update user guide
rebstan97 Nov 11, 2018
5c3162a
Merge branch 'master' into Bug-fixes
rebstan97 Nov 11, 2018
1f64e48
FindAccountCommand: Update predicate to check for substring
azhikai Nov 11, 2018
4141bc9
UsernameContainsKeywordPredicate: Update javadoc
azhikai Nov 11, 2018
bd80e06
Update menu diagrams
yican95 Nov 11, 2018
c709912
UsernameContainsKeywordPredicateTest: Add more tests
azhikai Nov 11, 2018
af2abb4
DeveloperGuide.adoc: Remove export menu usecase
yican95 Nov 11, 2018
37cb54c
Update version 2.0 features and command history
rebstan97 Nov 11, 2018
8ce7b03
Merge pull request #288 from rebstan97/Bug-fixes
rebstan97 Nov 11, 2018
2243662
FindAccountCommandTest: Add tests
azhikai Nov 11, 2018
75069eb
Merge branch 'master' into docs/PPP
rebstan97 Nov 11, 2018
c3f9c40
RestaurantBookParserTest: Add test for find-account command
azhikai Nov 11, 2018
cba631e
Fix error in formatting
rebstan97 Nov 11, 2018
b36914f
Change representation of Price from float to double
HyperionNKJ Nov 11, 2018
90d5990
Update command summary
rebstan97 Nov 11, 2018
9f0cdd4
Update Figure numbers
m4dkip Nov 11, 2018
2534506
Change internal representation of ReportBuilder
HyperionNKJ Nov 11, 2018
e03a61a
Update commands
HyperionNKJ Nov 11, 2018
30fde10
UserGuide: Update find-account section
azhikai Nov 11, 2018
a44b724
UserGuide.adoc: Update command summary
yican95 Nov 11, 2018
5e42ec1
FindAccountCommand: Catches exception if multiple keywords provided
azhikai Nov 11, 2018
2ea7807
DeveloperGuide.adoc: Add figure number
yican95 Nov 11, 2018
0f701c7
FindAccountCommandTest: Improve test
azhikai Nov 11, 2018
442cc79
FindAccountCommandTest: Update comment
azhikai Nov 11, 2018
56c9f7c
FindAccountCommandParserTest: Add tests for parser
azhikai Nov 11, 2018
8a4dc6b
UserGuide.adoc: Fix typo
yican95 Nov 11, 2018
0aa9d2c
Cropped sequence diagrams for delete ingredient feature
rebstan97 Nov 11, 2018
93d05b4
DeveloperGuide.adoc: Update menu implementation
yican95 Nov 11, 2018
4d83cc7
Update menu implementation
yican95 Nov 11, 2018
9753a4a
Update PPP
yican95 Nov 11, 2018
2391b34
Update UG (Capitalization)
m4dkip Nov 11, 2018
b0ea430
Update PPP
yican95 Nov 11, 2018
b6cc58a
docs/diagram: Update sequence diagram
azhikai Nov 11, 2018
33cefb1
docs/images: Update user session activity diagram
azhikai Nov 11, 2018
4746c1f
Fix typo
yican95 Nov 11, 2018
bf38896
DeveloperGuide.adoc: Fix typo
yican95 Nov 11, 2018
ed52385
Update UG (Remove fullstops)
m4dkip Nov 11, 2018
f8587d4
Remove full stops for notes and warnings
rebstan97 Nov 11, 2018
99f4b1c
docs/diagrams: Fix storage component
azhikai Nov 11, 2018
b4cc865
Add assert messages
HyperionNKJ Nov 11, 2018
ea9ad9f
Merge branch 'master' into code/annotate
HyperionNKJ Nov 11, 2018
4a2a8c7
team/azhikai: Update PPP
azhikai Nov 11, 2018
a301f5a
UserGuide: Update command format note
azhikai Nov 11, 2018
107afe3
DeveloperGuide: Improve account section
azhikai Nov 11, 2018
440260b
Merge branch 'master' into feature/find-account
azhikai Nov 11, 2018
8a96449
UserGuide: Increase UI highlight image size
azhikai Nov 11, 2018
b85ddd0
Update PPP (New PR links)
m4dkip Nov 11, 2018
079677c
team/azhikai: Shift minor enhancement section
azhikai Nov 11, 2018
58da11b
Merge pull request #292 from AZhiKai/feature/find-account
azhikai Nov 11, 2018
285b7ae
Update comments
HyperionNKJ Nov 11, 2018
46caa38
Merge branch 'master' into code/annotate
HyperionNKJ Nov 11, 2018
3a9dca8
UserGuide: Update key feature section
azhikai Nov 11, 2018
9e23f47
team/azhikai: Improve language
azhikai Nov 11, 2018
0a9d611
Merge branch 'master' into feature/ug-dg-ppp
azhikai Nov 11, 2018
bd4709f
Logic: Fix typo
yican95 Nov 11, 2018
775e556
UserGuide.adoc: Fix typo
yican95 Nov 11, 2018
c85a871
UserGuide: Remove punctuation marks
azhikai Nov 11, 2018
4745437
Update PPP (Update links)
m4dkip Nov 11, 2018
a984ad3
Update UG
HyperionNKJ Nov 11, 2018
56b4250
Update PPP (Add credits to Natty)
m4dkip Nov 11, 2018
200f65e
Update PPP
yican95 Nov 11, 2018
ec20590
RecordSalesCommand: Rephrase messages
HyperionNKJ Nov 11, 2018
f7633ea
Fix checkstyle error
HyperionNKJ Nov 11, 2018
34670c1
Logic: Update invalid command message
yican95 Nov 11, 2018
82f70fd
DeveloperGuide: Add activity diagram for password proceessing
azhikai Nov 11, 2018
e86577f
Merge pull request #293 from HyperionNKJ/code/annotate
HyperionNKJ Nov 11, 2018
e01621e
Update DG (Diagrams)
m4dkip Nov 11, 2018
918e60c
docs/diagrams: Update user session activity diagram
azhikai Nov 11, 2018
cf4422f
DeveloperGuide: Improve sentence phrasing
azhikai Nov 11, 2018
dbfebc3
Update PPP
yican95 Nov 11, 2018
1df3c5e
UserGuide: Rephrase introduction
azhikai Nov 11, 2018
aa96f51
Merge branch 'master' of https://github.com/yican95/main into docs/PPP
yican95 Nov 11, 2018
cb00c49
team/azhikai: Update PPP
azhikai Nov 11, 2018
f40f993
UserGuide: Remove alias from command summary
azhikai Nov 11, 2018
4ae9ca0
Update UG
rebstan97 Nov 11, 2018
98f530d
Update UG
HyperionNKJ Nov 11, 2018
b6ca0a3
Merge branch 'master' into docs/UGDGPPP
HyperionNKJ Nov 11, 2018
2c02106
Update UG
HyperionNKJ Nov 11, 2018
03c3753
Update UG
HyperionNKJ Nov 11, 2018
1e0ec55
Update UG
HyperionNKJ Nov 11, 2018
69db376
Update UG
HyperionNKJ Nov 11, 2018
0a063cf
Update UG
HyperionNKJ Nov 11, 2018
bde4953
Update DG
HyperionNKJ Nov 11, 2018
448d4f9
Update DG
HyperionNKJ Nov 11, 2018
5995712
Add figure number
HyperionNKJ Nov 11, 2018
15bd43b
Remove full stop
HyperionNKJ Nov 12, 2018
9a1e6af
Model: Update message constraints
yican95 Nov 12, 2018
25519d1
Model:Update message constraints
yican95 Nov 12, 2018
a9f7bf4
Logic: Update message usage
yican95 Nov 12, 2018
9f57a39
Logic: Update message usage
yican95 Nov 12, 2018
8a12b8f
Logic: Update message usage
yican95 Nov 12, 2018
4d507bc
UserGuide.adoc: Update menu commands
yican95 Nov 12, 2018
8ecbb7a
Update DG
rebstan97 Nov 12, 2018
a1f87ff
Merge branch 'master' into docs/PPP
rebstan97 Nov 12, 2018
be6e8e8
Update PPP
HyperionNKJ Nov 12, 2018
0a2b8cb
Update DG
rebstan97 Nov 12, 2018
180a311
Update DG
rebstan97 Nov 12, 2018
02e8506
Logic: Update DeleteItemByName to show all items after deleting item
yican95 Nov 12, 2018
df57344
Update DG (Add transparency to images)
m4dkip Nov 12, 2018
5ddf618
Update DG (More information on Natty parsing date)
m4dkip Nov 12, 2018
777da34
Update DG (New parameters)
m4dkip Nov 12, 2018
f236b2c
Update DG
rebstan97 Nov 12, 2018
df5a99c
Update PPP
rebstan97 Nov 12, 2018
714ff70
Update UG & DG
yican95 Nov 12, 2018
8ee6f8c
Change "Inventory" to "Ingredients"
azhikai Nov 12, 2018
63f4607
Merge branch 'master' into feature/ug-dg-ppp
azhikai Nov 12, 2018
419fb9f
Test: Add JUnit test
yican95 Nov 12, 2018
205f78f
docs/diagrams: Fix sequence diagram error
azhikai Nov 12, 2018
786aaf0
Update message
yican95 Nov 12, 2018
e789577
DeveloperGuide: Add login for instructions for manual test
azhikai Nov 12, 2018
71bef28
Remark: Privatize data and utilize toString()
azhikai Nov 12, 2018
d1fb2ec
Update message
yican95 Nov 12, 2018
93a2ba3
Update message
yican95 Nov 12, 2018
ea3a1dc
UserGuide.adoc: Update menu commands
yican95 Nov 12, 2018
3c4cc90
Model: Update comment
m4dkip Nov 12, 2018
936e4ab
Update DG (Model diagram)
m4dkip Nov 12, 2018
503c272
SampleDataUtil: Add method to get sample data
azhikai Nov 12, 2018
fe7ec4d
Logic: Add message for DiscountItemCommand
yican95 Nov 12, 2018
8882d70
DeveloperGuide: Add saving data, log out and change password to MT
azhikai Nov 12, 2018
96e5850
Update UG & DG
yican95 Nov 12, 2018
0c2c268
Update UG & DG
yican95 Nov 12, 2018
a30aa3d
Update UG & DG
yican95 Nov 12, 2018
3a6b0d2
DeveloperGuide: Include all commands in MT
azhikai Nov 12, 2018
9024140
DeveloperGuide.adoc: Update menu implementation
yican95 Nov 12, 2018
cee9976
Update DG (Instructions for Manual Testing)
m4dkip Nov 12, 2018
367b409
SampleDataUtil: Add more data
azhikai Nov 12, 2018
e153dda
Update PPP (New contribution)
m4dkip Nov 12, 2018
eeb977d
Update PPP, UG & DG
yican95 Nov 12, 2018
47472be
Merge branch 'master' of https://github.com/m4dkip/main into updatePPP
m4dkip Nov 12, 2018
b17479d
DeveloperGuide: Update use case
azhikai Nov 12, 2018
7110293
Update DG and PPP (Language and tagging)
m4dkip Nov 12, 2018
4be5ba6
FindAccountCommand: Update message usage
azhikai Nov 12, 2018
76888e5
team/zhikai: Update PPP
azhikai Nov 12, 2018
381003c
DeveloperGuide: Update user session note
azhikai Nov 12, 2018
8e222ed
Merge pull request #285 from m4dkip/updatePPP
m4dkip Nov 12, 2018
4bc8573
DeveloperGuide: Fix line break
azhikai Nov 12, 2018
fafe95c
Merge branch 'master' into hotfix/issue-295
azhikai Nov 12, 2018
8629892
Merge branch 'master' of https://github.com/yican95/main into docs/PPP
yican95 Nov 12, 2018
df0d1bb
Merge branch 'master' into feature/ug-dg-ppp
azhikai Nov 12, 2018
03b965c
Merge pull request #296 from AZhiKai/hotfix/issue-295
azhikai Nov 12, 2018
fec0c97
docs/diagram: Update model to include Name for account
azhikai Nov 12, 2018
d401a3e
team/zhikai: Update title
azhikai Nov 12, 2018
2e9b843
Update DG & PPP
yican95 Nov 12, 2018
a1ed0e6
team/zhikai: Rephrased sentence and bold sub titles
azhikai Nov 12, 2018
7efa0f9
UserGuide: Change TIP to NOTE
azhikai Nov 12, 2018
b0c1faa
Merge branch 'master' of https://github.com/yican95/main into docs/PPP
yican95 Nov 12, 2018
47459e4
Add instructions for manual testing
rebstan97 Nov 12, 2018
59bbf04
team/azhikai: Add point to documentation
azhikai Nov 12, 2018
6d833ee
Update DG & PPP
yican95 Nov 12, 2018
583e3e6
Update DG
rebstan97 Nov 12, 2018
caacc48
DeveloperGuide: Remove redundant points from use case
azhikai Nov 12, 2018
73930e3
Merge pull request #282 from yican95/docs/PPP
yican95 Nov 12, 2018
53c7340
team/azhikai: Added new point to documentation
azhikai Nov 12, 2018
afaec34
Final updates to DG and PPP
rebstan97 Nov 12, 2018
72e924f
Update PPP
HyperionNKJ Nov 12, 2018
109182c
Merge branch 'master' into feature/ug-dg-ppp
azhikai Nov 12, 2018
d2d32bb
Update PPP
rebstan97 Nov 12, 2018
7fd4dba
Merge branch 'master' into docs/PPP
rebstan97 Nov 12, 2018
7022228
UG/DG: Update to Yi Can's portion
azhikai Nov 12, 2018
9676283
Update DG
rebstan97 Nov 12, 2018
07389b4
UG/DG: Correctly enclosed params in gray tag
azhikai Nov 12, 2018
c70479b
Fix minor typos
rebstan97 Nov 12, 2018
704d5f5
Update PPP
HyperionNKJ Nov 12, 2018
8953591
Fix typo in PPP
rebstan97 Nov 12, 2018
c9befba
Update PPP
HyperionNKJ Nov 12, 2018
4c10a12
Update PPP
HyperionNKJ Nov 12, 2018
45f9844
Merge pull request #290 from rebstan97/docs/PPP
rebstan97 Nov 12, 2018
aa81446
Update PPP
HyperionNKJ Nov 12, 2018
d8efb05
UG/DG: Update callouts
azhikai Nov 12, 2018
f526330
Merge branch 'master' into feature/ug-dg-ppp
azhikai Nov 12, 2018
d4fbaf7
UserGuide: Remove fullstop from block
azhikai Nov 12, 2018
f232a32
Update UG & DG
yican95 Nov 12, 2018
df494fe
Update PPP
yican95 Nov 12, 2018
66eb2c0
DevelopGuide.adoc: Update figure number
yican95 Nov 12, 2018
a7ce2f9
DeveloperGuide: Hard-link contact page URL
azhikai Nov 12, 2018
f62f35e
DG: Fix alignment
azhikai Nov 12, 2018
6bf31eb
Update PPP
HyperionNKJ Nov 12, 2018
0aefe32
Merge branch 'master' into docs/UGDGPPP
HyperionNKJ Nov 12, 2018
80baf1f
Update sampledata
HyperionNKJ Nov 12, 2018
f8cca66
Merge pull request #294 from HyperionNKJ/docs/UGDGPPP
azhikai Nov 12, 2018
0e6b1f2
Merge branch 'master' of https://github.com/yican95/main into docs/menu
yican95 Nov 12, 2018
c627732
DG: Fix alignment
azhikai Nov 12, 2018
f427354
SampleDataUtil.java: Update indentation
yican95 Nov 12, 2018
ee454d6
UG: Correct syntax error
azhikai Nov 12, 2018
6fcbe5c
Merge pull request #297 from yican95/docs/menu
azhikai Nov 12, 2018
5fd3f3b
Merge branch 'master' into feature/ug-dg-ppp
azhikai Nov 12, 2018
33966dc
team/kaijun: Update PPP
azhikai Nov 12, 2018
0fcdd25
DeveloperGuide: Update figure number
azhikai Nov 12, 2018
60b25cb
Fix KJ's PPP
azhikai Nov 12, 2018
f0d39eb
Merge pull request #291 from AZhiKai/feature/ug-dg-ppp
azhikai Nov 12, 2018
d04a18b
UG: Fix formatting
azhikai Nov 12, 2018
5ea0d19
Merge pull request #298 from AZhiKai/master
azhikai Nov 12, 2018
26eb76a
Update AboutUs.adoc
azhikai Apr 30, 2020
dead7cf
Cleanup images
azhikai Apr 30, 2020
cb35292
Cleanup images
azhikai Apr 30, 2020
43d0969
Cleanup images
azhikai Apr 30, 2020
b8e524a
Cleanup images
azhikai Apr 30, 2020
b6cdf99
Cleanup images
azhikai Apr 30, 2020
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
35 changes: 35 additions & 0 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
---
name: Bug report
about: Create a report to help us improve

---

**Describe the bug**
A clear and concise description of what the bug is.

**To Reproduce**
Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error

**Expected behavior**
A clear and concise description of what you expected to happen.

**Screenshots**
If applicable, add screenshots to help explain your problem.

**Desktop (please complete the following information):**
- OS: [e.g. iOS]
- Browser [e.g. chrome, safari]
- Version [e.g. 22]

**Smartphone (please complete the following information):**
- Device: [e.g. iPhone6]
- OS: [e.g. iOS8.1]
- Browser [e.g. stock browser, safari]
- Version [e.g. 22]

**Additional context**
Add any other context about the problem here.
17 changes: 17 additions & 0 deletions .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
---
name: Feature request
about: Suggest an idea for this project

---

**Is your feature request related to a problem? Please describe.**
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

**Describe the solution you'd like**
A clear and concise description of what you want to happen.

**Describe alternatives you've considered**
A clear and concise description of any alternative solutions or features you've considered.

**Additional context**
Add any other context or screenshots about the feature request here.
30 changes: 16 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
= Address Book (Level 4)
= MeNUS
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&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]]
_**M**anage your eatery menus **e**fficiently, in **NUS**._

https://travis-ci.org/CS2103-AY1819S1-F10-4/main[image:https://travis-ci.org/CS2103-AY1819S1-F10-4/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/AZhiKai/main-j2jk6[image:https://ci.appveyor.com/api/projects/status/5kwkxt5khmfo0q31/branch/master?svg=true[Build status]]
https://coveralls.io/github/CS2103-AY1819S1-F10-4/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-F10-4/main/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/AZhiKai/organisation_main?utm_source=github.com&utm_medium=referral&utm_content=CS2103-AY1819S1-F10-4/main&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/299f6df960044215a511a90d281af954[Codacy code quality]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -15,24 +16,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.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* This is a desktop menu application. It has a GUI but most of the user interactions happen using a CLI (Command Line
Interface) which is oriented for typist user.
* It is a Java sample application intended for https://github.com/orgs/CS2103-AY1819S1-F10-4/people[students]
learning Software Engineering in https://nus-cs2103-ay1819s1.github.io/cs2103-website/[CS2103T] at the http://www.nus.edu.sg/[National University of Singapore] (NUS).
* The target user group is F&B owners who operate one or more eatery in NUS. This application aims to improve
the
effectiveness and efficiency of managing their eatery' menus.

== Site Map

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

== Acknowledgements

* This application was built based on https://github.com/se-edu/addressbook-level4[Address Book (Level 4)], an
initiative of the https://se-edu.github.io/Team.html[se-edu] team.
* 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://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
Expand Down
39 changes: 19 additions & 20 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ dependencies {

testRuntimeOnly group: 'org.testfx', name: 'testfx-internal-java9', version: testFxVersion
testRuntimeOnly group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-9+181'
testRuntimeOnly group:'org.junit.vintage', name:'junit-vintage-engine', version: jUnitVersion
testRuntimeOnly group: 'org.junit.vintage', name: 'junit-vintage-engine', version: jUnitVersion
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
}

Expand All @@ -93,7 +93,7 @@ task wrapper(type: Wrapper) {

task coverage(type: JacocoReport) {
sourceDirectories = files(sourceSets.main.allSource.srcDirs)
classDirectories = files(sourceSets.main.output)
classDirectories = files(sourceSets.main.output)
executionData = files(jacocoTestReport.executionData)
afterEvaluate {
classDirectories = files(classDirectories.files.collect {
Expand Down Expand Up @@ -176,10 +176,10 @@ task headless {
println 'Setting headless mode properties.'
test {
systemProperties = [
'testfx.robot': 'glass',
'testfx.headless': 'true',
'prism.order': 'sw',
'prism.text': 't2k',
'testfx.robot' : 'glass',
'testfx.headless': 'true',
'prism.order' : 'sw',
'prism.text' : 't2k',
]
}
}
Expand All @@ -194,22 +194,21 @@ asciidoctor {
outputDir "${buildDir}/docs"

options = [
template_dirs: [file("${sourceDir}/templates")],
template_dirs: [file("${sourceDir}/templates")],
]

attributes = [
linkcss: true,
stylesheet: 'gh-pages.css',
'source-highlighter': 'coderay',
icons: 'font',
experimental: true,
sectlinks: true,
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
linkcss : true,
stylesheet : 'gh-pages.css',
'source-highlighter': 'coderay',
icons : 'font',
experimental : true,
sectlinks : true,
idprefix : '', // for compatibility with GitHub preview
idseparator : '-',
'site-root' : "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name' : 'MeNUS',
'site-githuburl' : 'https://github.com/CS2103-AY1819S1-F10-4/main',
]

options['template_dirs'].each {
Expand All @@ -229,7 +228,7 @@ asciidoctor.dependsOn copyStylesheets
task deployOfflineDocs(type: Copy) {
into('src/main/resources/docs')

from ("${asciidoctor.outputDir}/html5") {
from("${asciidoctor.outputDir}/html5") {
include 'stylesheets/*'
include 'images/*'
include 'HelpWindow.html'
Expand Down
55 changes: 28 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,54 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 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} +
MeNUS was developed by the https://CS2103-AY1819S1-F10-4.github.io/main/AboutUs.html[Project Team]
shown below based on the previous work of the https://se-edu.github.io/Team.html[se-edu] team. +

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

== Project Team

=== 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>>]
=== Ang Zhi Kai
image::azhikai.png[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~azhikai[homepage]] [https://github.com/azhikai[github]] [<<johndoe#, portfolio>>]

Role: Project Advisor
Role: Team Lead +
Responsibilities: Model + Logic

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Tan Ying Zi Rebecca
image::rebstan97.png[width="150", align="left"]
{empty}[http://github.com/rebstan97[github]] [<<johndoe#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Role: Quality Assurance +
Responsibilities: Model

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Ong Ming Xian
image::m4dkip.png[width="150", align="left"]
{empty}[http://github.com/m4dkip[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Data
Role: Back-end +
Responsibilities: Storage

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Lee Yi Can
image::yican95.png[width="150", align="left"]
{empty}[http://github.com/yican95[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Back-end + Front End +
Responsibilities: Logic + UI

'''

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

Role: Developer +
Responsibilities: UI
Role: Back-end +
Responsibilities: 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-level4/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/CS2103-AY1819S1-F10-4/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 `azhikai [at] comp.nus.edu.sg`
2 changes: 1 addition & 1 deletion docs/DeveloperGuide.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 4 - Developer Guide
= MeNUS - Developer Guide
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand Down
2 changes: 1 addition & 1 deletion docs/UserGuide.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 4 - User Guide
= MeNUS - User Guide
:site-section: UserGuide
:toc:
:toc-title:
Expand Down
Binary file added docs/images/azhikai.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/images/damithc.jpg
Binary file not shown.
Binary file added docs/images/hyperionnkj.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/images/lejolly.jpg
Binary file not shown.
Binary file removed docs/images/m133225.jpg
Binary file not shown.
Binary file added docs/images/m4dkip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/rebstan97.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/yican95.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/images/yijinl.jpg
Binary file not shown.
Binary file removed docs/images/yl_coder.jpg
Binary file not shown.