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

[T16-3] FoodZoom #124

Open
wants to merge 854 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
854 commits
Select commit Hold shift + click to select a range
c92a25e
Merge pull request #118 from kohchihao/updateuipng
kohchihao Oct 31, 2018
dcf082d
Merge changes from Master
rrtheonlyone Oct 31, 2018
31c07bc
Fix inaccuracies with map
rrtheonlyone Oct 31, 2018
5050de4
Update placeholder image for map
rrtheonlyone Oct 31, 2018
849dc5e
Change link to point to new placeholder
rrtheonlyone Oct 31, 2018
0313aae
Modify title pane - prepare for dashboard release
rrtheonlyone Oct 31, 2018
298f02d
Fix style issues
rrtheonlyone Oct 31, 2018
19e8938
Merge from map-upgrade and add new logic to display
rrtheonlyone Nov 1, 2018
18cb800
Add icons for statistics
rrtheonlyone Nov 1, 2018
56470fb
Add fxml file for statistics pane
rrtheonlyone Nov 1, 2018
1f8412e
Add statistics panel controller
rrtheonlyone Nov 1, 2018
13408d3
Update styling
rrtheonlyone Nov 1, 2018
c831193
Add documentation for functions and optimize imports
rrtheonlyone Nov 1, 2018
37b078e
Update title for bar graph
rrtheonlyone Nov 1, 2018
23ebe10
Add newline at EOF for css file
rrtheonlyone Nov 1, 2018
df1a4d2
DeveloperGuide.adoc: Update Model UML diagram
kohchihao Nov 1, 2018
8fe3db6
Merge pull request #102 from rrtheonlyone/map-upgrade
rrtheonlyone Nov 1, 2018
7754e63
Merge pull request #121 from rrtheonlyone/dashboard-statistics
rrtheonlyone Nov 1, 2018
6e8d7a8
Home Command added
rrtheonlyone Nov 1, 2018
f9b6767
Added home command to available commands
rrtheonlyone Nov 1, 2018
b707244
Create new event - triggered when home command is executed
rrtheonlyone Nov 1, 2018
4788fe4
Update UI Logic - go back to dashboard and de-select elements
rrtheonlyone Nov 1, 2018
fa51776
Refactor UI logic
rrtheonlyone Nov 1, 2018
693172b
Add test for home command
rrtheonlyone Nov 1, 2018
9099564
Fix style issues
rrtheonlyone Nov 1, 2018
5bacdf5
Merge pull request #123 from rrtheonlyone/home-command
rrtheonlyone Nov 1, 2018
438edbb
Fix bug in progress bar
rrtheonlyone Nov 1, 2018
a01889a
UserGuide.adoc: Add command section
kohchihao Nov 1, 2018
4249428
UserGuide.adoc: Update style
kohchihao Nov 1, 2018
a64c520
UserGuide.adoc: Update /order find command title
kohchihao Nov 1, 2018
1339240
Merge pull request #126 from kohchihao/updateug-v1.3.1
kohchihao Nov 1, 2018
dcb6f24
Merge pull request #127 from kohchihao/updateug-v1.3.1-orderfind
kohchihao Nov 1, 2018
f4a1450
Merge pull request #125 from rrtheonlyone/progress-bar-fix
rrtheonlyone Nov 2, 2018
5c63ab5
Add better placeholder image
rrtheonlyone Nov 1, 2018
5a2d751
Map now uses another placeholder
rrtheonlyone Nov 1, 2018
391d556
Update map panel title'
rrtheonlyone Nov 1, 2018
51082b1
Update styling
rrtheonlyone Nov 1, 2018
320fb2b
Update sample data
rrtheonlyone Nov 1, 2018
723f708
Merge pull request #128 from rrtheonlyone/ui-cleanup
rrtheonlyone Nov 2, 2018
01a9bee
Basic update to placeholder
rrtheonlyone Nov 2, 2018
8ebd69a
Merge pull request #129 from rrtheonlyone/order-panel-touchup
rrtheonlyone Nov 2, 2018
63b1ad9
Modified User guide
rrtheonlyone Nov 2, 2018
778184e
Add a sentence
rrtheonlyone Nov 2, 2018
20649d4
Update Ui.png
rrtheonlyone Nov 2, 2018
6dce831
Fix typo in user guide
rrtheonlyone Nov 2, 2018
a3f3e86
Merge pull request #130 from rrtheonlyone/user-guide-addition
rrtheonlyone Nov 2, 2018
4f8c10e
Add DoneCommand.java
kohchihao Nov 3, 2018
b68ccd6
OrderCommandParser.java: Add DoneCommand
kohchihao Nov 3, 2018
a0e4b4a
DoneCommand.java: Add constructor
kohchihao Nov 3, 2018
086b61d
Add DoneCommandParser.java
kohchihao Nov 3, 2018
3582dff
OrderCommandParser.java: update DoneCommand
kohchihao Nov 3, 2018
30f8d37
EditCommand.java: Update typo in example
kohchihao Nov 3, 2018
b872762
Deliveryman.java: Add new removeOrder() method
kohchihao Nov 3, 2018
5c5dce0
DoneCommand.java: Update execute()
kohchihao Nov 3, 2018
7fd375c
DoneCommand.java: Update removeOrderFromDeliveryman()
kohchihao Nov 3, 2018
fcd383e
DeleteCommand.java: Update execute to only allow delete of pending an…
kohchihao Nov 3, 2018
4994337
DoneCommand.java: Update execute()
kohchihao Nov 3, 2018
651791b
Update with new methods
kohchihao Nov 3, 2018
432e2db
Update builders
kohchihao Nov 3, 2018
a0c969f
Order.java: Add new setStatusCompleted() method
kohchihao Nov 3, 2018
3c95bc0
DoneCommand.java: Update execute method
kohchihao Nov 3, 2018
331c32a
Add DoneCommandTest.java
kohchihao Nov 3, 2018
0542f49
Add comments
kohchihao Nov 3, 2018
7a22c28
DoneCommandTest.java: Add suitable test
kohchihao Nov 3, 2018
10004a3
Add DoneCommandParserTest.java
kohchihao Nov 3, 2018
be3940c
ModelClassDiagram.png: update
kohchihao Nov 3, 2018
e841ded
Add new Command for deliveryman selection
juxd Nov 4, 2018
a30626f
Update style
juxd Nov 4, 2018
5a733e4
Add tests
juxd Nov 4, 2018
9ba342d
Update docs
juxd Nov 4, 2018
13b80ba
Remove undo & redo commands
juxd Nov 5, 2018
3684dd4
DoneCommand.java: Update behavior
kohchihao Nov 5, 2018
ba44ab1
Add Jin Ying's PPP
Nov 5, 2018
1e4590b
DoneCommand.java: Update style
kohchihao Nov 5, 2018
7c4b530
OrderStatus.java: Add isOngoingStatus()
kohchihao Nov 5, 2018
c7f301d
DeleteCommand.java: Update to use isOngoingStatus()
kohchihao Nov 5, 2018
72182c0
DeleteCommand.java: Update imports
kohchihao Nov 5, 2018
cac7f57
Add kohchihao.adoc
kohchihao Nov 5, 2018
1e82cd4
Merge pull request #122 from kohchihao/updatedevelopermodeldiagram
kohchihao Nov 5, 2018
86861ee
User.java: Update isSameUser() method
kohchihao Nov 5, 2018
2ccdcb7
Add restriction for Index to be smaller than Integer.MAX_INT
monmanuela Nov 5, 2018
57cf834
Add explanation on date time and unique identifier of orders
monmanuela Nov 5, 2018
375fa32
Add clarification on deliveryman find
monmanuela Nov 5, 2018
c251146
Fix typo
monmanuela Nov 5, 2018
03a678d
LoginCommand.java: Update messages
kohchihao Nov 5, 2018
e1ddd5e
UserGuide.adoc: Add more defense
kohchihao Nov 5, 2018
719d95b
Remove undo/redo implementation details from DG
monmanuela Nov 5, 2018
4e6df14
DeveloperGuide.adoc: Update Logic component
Nov 5, 2018
9baecb5
UserGuide.adoc: Add /order done command
kohchihao Nov 5, 2018
9c39582
Merge pull request #152 from juxd/add-deliveryman-select
kohchihao Nov 5, 2018
9c15388
Add Assign Command sequence diagrams
monmanuela Nov 5, 2018
2c2a48e
DoneCommand.java: Update execute() to use functional
kohchihao Nov 5, 2018
e6331c9
DoneCommand.java: Update setStateCompleted position
kohchihao Nov 5, 2018
6582c95
Add Assign implementation in DG
monmanuela Nov 5, 2018
a41b0bf
Add tags in UG
monmanuela Nov 5, 2018
fc33366
Add PPP
monmanuela Nov 5, 2018
be5312c
Modify link in AboutUs
monmanuela Nov 5, 2018
a6a7505
Add code contribution
monmanuela Nov 5, 2018
03c9f6a
jinyingtan.adoc: Add Intro and Code Contribution
Nov 6, 2018
655379f
Merge pull request #163 from kohchihao/pe-docs-fixes
Nov 6, 2018
a3cb960
Merge pull request #162 from monmanuela/bug-docs
Nov 6, 2018
9c70d68
Merge pull request #157 from juxd/remove-undo-redo
kohchihao Nov 6, 2018
95ff0a3
Merge pull request #159 from jinyingtan/PPP-JY
kohchihao Nov 6, 2018
bb6ae13
Merge pull request #160 from kohchihao/chihaoppp
kohchihao Nov 6, 2018
25f6769
Merge branch 'master' into DG-assign
kohchihao Nov 6, 2018
4cef076
Merge pull request #165 from monmanuela/DG-assign
kohchihao Nov 6, 2018
41e446b
Update string to partial match
Nov 6, 2018
389a721
Update deliveryman find to throw error if empty value is given
Nov 6, 2018
c3cbe80
Fix invalid date for order find command
Nov 6, 2018
047a0c4
Update OrderPredicateUtil test
Nov 6, 2018
d297a1e
Update commands example
Nov 6, 2018
d553957
Merge pull request #131 from kohchihao/orderdone
kohchihao Nov 6, 2018
60bda80
Update UserGuide
Nov 6, 2018
e998e53
DeveloperGuide.adoc: Fix typo under Logic Component
Nov 6, 2018
5a25dcd
kohchihao.adoc: add my reposense
kohchihao Nov 6, 2018
382c1c1
monikamanuela.adoc: Add reposense
kohchihao Nov 6, 2018
ff2b99c
jinyingtan.adoc: Add reposense
kohchihao Nov 6, 2018
e7812ca
Update monikamanuela.adoc to monmanuela.adoc
kohchihao Nov 6, 2018
f0c5c29
Merge pull request #167 from kohchihao/updatechihaoppp
kohchihao Nov 6, 2018
6525052
UserGuide.adoc: Fix typo in order find command
Nov 6, 2018
e541fc2
Merge pull request #161 from kohchihao/fixessignupbug
kohchihao Nov 6, 2018
0391c48
Add new implementation section for dashboard
rrtheonlyone Nov 6, 2018
718a25c
Add new design consideration
rrtheonlyone Nov 6, 2018
eae2fbf
New image for developer guide
rrtheonlyone Nov 6, 2018
16edde5
Update UI component diagram
rrtheonlyone Nov 6, 2018
1635ae6
Change wrong file names
rrtheonlyone Nov 6, 2018
b75038c
Minor change to appendix H - delete an order
rrtheonlyone Nov 6, 2018
32be9a1
Tweaked writeup in implementation and fixed small error in diagram
rrtheonlyone Nov 6, 2018
565cce4
Add new images for DG
rrtheonlyone Nov 6, 2018
d756099
Add image labels to developer guide
rrtheonlyone Nov 6, 2018
080fd45
Resize Image
rrtheonlyone Nov 6, 2018
d824384
Update reference for content page
rrtheonlyone Nov 7, 2018
5ccaa71
Merge pull request #166 from jinyingtan/Issues-PEDRY
Nov 7, 2018
d49219f
Add find order by status
Nov 4, 2018
5f7bb43
Add and update tests for find order by status
Nov 4, 2018
ca5ca23
Resolve Merge Conflict
Nov 7, 2018
cc0772c
OrderStatusContainsKeywordPredicate.java: Fix typo
Nov 7, 2018
f32ded5
Update DG for Storage Component (#168)
juxd Nov 7, 2018
bc21dbd
DeveloperGuide.adoc: Fix typo
Nov 7, 2018
8cf3328
Merge pull request #169 from rrtheonlyone/dg-change
monmanuela Nov 7, 2018
8234519
Merge pull request #164 from jinyingtan/LogicDiagramUML
monmanuela Nov 7, 2018
969e1b0
Merge pull request #155 from jinyingtan/OrderFind-Status
Nov 7, 2018
ecb3207
Update UI element to text item to prevent label getting cut off
rrtheonlyone Nov 7, 2018
30dbbd0
Fix minor bug in progress bar UI display
rrtheonlyone Nov 7, 2018
e2f8582
Improve Order Select Display
rrtheonlyone Nov 7, 2018
85ded02
Update styling and add new icon
rrtheonlyone Nov 7, 2018
d293e65
Add PPP
rrtheonlyone Nov 7, 2018
dc95b75
Update tags for guides - to reference in PPP
rrtheonlyone Nov 7, 2018
15c11c5
Update aboutus page
rrtheonlyone Nov 7, 2018
e0c046a
Add newline at EOF for css file
rrtheonlyone Nov 7, 2018
6954442
Update links in PPP
rrtheonlyone Nov 7, 2018
ed4e97c
Update Label to Text for id to fix system tests
rrtheonlyone Nov 7, 2018
a92cb3d
Julius PPP (#172)
juxd Nov 8, 2018
202dfba
Rename PPP to github username
rrtheonlyone Nov 8, 2018
373be2f
Fix typo
monmanuela Nov 8, 2018
fc7acec
Add caption to Ui image
monmanuela Nov 8, 2018
16b19cb
Fix caption
monmanuela Nov 8, 2018
c7d94ab
Fix PPP adoc (#175)
juxd Nov 8, 2018
107699e
Merge pull request #176 from monmanuela/PPP-fix
monmanuela Nov 8, 2018
0b10a61
Merge pull request #173 from rrtheonlyone/ppp
kohchihao Nov 8, 2018
81f9ed6
DeveloperGuide.adoc: Add login,signup,order done to appendix H
kohchihao Nov 8, 2018
4cf5bd0
DeveloperGuide.adoc: Remove trailing white spaces
kohchihao Nov 8, 2018
a852a76
DeveloperGuide.adoc: Remove trailing white spaces
kohchihao Nov 8, 2018
1dc89db
DeveloperGuide.adoc: Fix capitalization
kohchihao Nov 10, 2018
6a9315a
DeveloperGuide.adoc: Update appendix H: mark an order
kohchihao Nov 10, 2018
14e805c
Merge pull request #177 from kohchihao/v1.4-appendixh
kohchihao Nov 10, 2018
ece9833
Merge pull request #171 from rrtheonlyone/ui-updates
rrtheonlyone Nov 10, 2018
df5261f
Add test cases for assign and update test case for delete order
monmanuela Nov 8, 2018
1e54d40
Update prerequisite for assign order test cases
monmanuela Nov 10, 2018
f5f12b5
Add newlines
monmanuela Nov 10, 2018
8f77987
Merge pull request #178 from monmanuela/appendixH
monmanuela Nov 10, 2018
02b779c
Fix deliveryman appendix (#179)
juxd Nov 11, 2018
201ae53
Change command success message for deliveryman select
rrtheonlyone Nov 11, 2018
8a81c00
Update methods to force panel change to home when the lists are modified
rrtheonlyone Nov 11, 2018
e099c94
Revamp display card to prevent UI freeze during deployment
rrtheonlyone Nov 11, 2018
8504492
Update fxml file for deliveryman display
rrtheonlyone Nov 11, 2018
15156c0
Add new java class to show list of orders with deliveryman
rrtheonlyone Nov 11, 2018
f50d04c
Add fxml file for order display on deliveryman panel
rrtheonlyone Nov 11, 2018
94ca350
Update styling
rrtheonlyone Nov 11, 2018
d0df945
Appendix H: Find and Edit for Order (#180)
Nov 11, 2018
eca6b28
Rename variables - style
rrtheonlyone Nov 11, 2018
7802039
Rename variables for deliveryman display card
rrtheonlyone Nov 11, 2018
20cb1dd
Update new variables in FXML and style sheets
rrtheonlyone Nov 11, 2018
2afe1a6
Modify panel change asserts to fix systemtests
rrtheonlyone Nov 11, 2018
e82cedb
Update event empty check() to fix tests - back home event raised
rrtheonlyone Nov 11, 2018
2e98f4d
Merge pull request #183 from rrtheonlyone/ui-bug-fix
rrtheonlyone Nov 11, 2018
60f6cc7
Add check to prevent placeholder from growing too big
rrtheonlyone Nov 11, 2018
dde67d2
Add image screenshot to UG explanation on assign order
monmanuela Nov 11, 2018
e879062
Name.java: Update equals method to use equalsIgnoreCase
kohchihao Nov 11, 2018
dc6f79e
kohchihao.adoc: Add order done
kohchihao Nov 11, 2018
52b27c2
Merge pull request #190 from kohchihao/deliverymannamebug
kohchihao Nov 11, 2018
d60f6d4
Merge pull request #193 from kohchihao/chihao-ppp-update
kohchihao Nov 11, 2018
311c7e1
Update UG on what orders can be edited, deleted, and assigned
monmanuela Nov 11, 2018
47d78ac
Change error message shown for assigning a completed order
monmanuela Nov 11, 2018
06850a3
Allows order clear if the list only contains pending or completed orders
monmanuela Nov 11, 2018
57cddc1
Change error message shown for editing a completed order
monmanuela Nov 11, 2018
e3d8553
Refactor in delete command for abstraction
monmanuela Nov 11, 2018
c2f2f35
Change base orders in typical orders for consistency and fix tests
monmanuela Nov 11, 2018
a01a29b
UserGuide.adoc: Add images to login,logout,signup,orderdone
kohchihao Nov 11, 2018
0b91a9e
UserGuide.adoc: Remove login/logout/signup images
kohchihao Nov 11, 2018
4ae2f81
Add caption for assign order images
monmanuela Nov 11, 2018
b5d4ba2
Merge pull request #185 from rrtheonlyone/map-limit
monmanuela Nov 11, 2018
39019ab
Merge pull request #194 from kohchihao/ug-img-update
monmanuela Nov 11, 2018
702cc98
UserGuide.adoc: Fix caption typo
kohchihao Nov 12, 2018
0dab47c
Update PPP
rrtheonlyone Nov 12, 2018
8f35959
Add picture to user guide
rrtheonlyone Nov 12, 2018
bbb8f7a
Add new pictures
rrtheonlyone Nov 12, 2018
8b1b976
Merge pull request #198 from kohchihao/ug-img-update
kohchihao Nov 12, 2018
521f7de
Update Appendix H and did minor tweaks for dashboard implementation
rrtheonlyone Nov 12, 2018
902a09f
Tweaks to PPP
rrtheonlyone Nov 12, 2018
2c98d39
Small change to user guide
rrtheonlyone Nov 12, 2018
028e85a
Update prequisites for developer guide
rrtheonlyone Nov 12, 2018
300080b
Reduce image size in developer guide:
rrtheonlyone Nov 12, 2018
6b2bfe2
Update dead link
rrtheonlyone Nov 12, 2018
545ee59
Remove wrong character
rrtheonlyone Nov 12, 2018
7222247
Add acknowledgement in README
rrtheonlyone Nov 12, 2018
f68d04f
Merge pull request #189 from monmanuela/UG-img
monmanuela Nov 12, 2018
7072809
Remove one line in asciidoctor.css to fix links in pdf
monmanuela Nov 12, 2018
c239569
Merge pull request #199 from rrtheonlyone/documentation
rrtheonlyone Nov 12, 2018
edea963
Merge pull request #200 from rrtheonlyone/readme-update
rrtheonlyone Nov 12, 2018
73ddb65
Update food to have the same behaviour as address
Nov 11, 2018
d0a3ee5
Update order find name to have the same behaviour as food and address
Nov 11, 2018
698c611
Update Deliveryman find name to same behaviour as order find name
Nov 11, 2018
1997901
Add back the removed line and use @media print instead
monmanuela Nov 12, 2018
8bf0a71
DeveloperGuide.adoc: Update Order Find for AppendixH
Nov 11, 2018
51394df
UserGuide.adoc: Update docs for order find and deliveryman find
Nov 11, 2018
2ef1645
jinyingtan.adoc: Add Deliveryman Find UserGuide
Nov 11, 2018
1797448
UserGuide.adoc: Update styles
Nov 11, 2018
cc37331
UserGuide.adoc: Update docs for order find
Nov 12, 2018
53ed147
Merge pull request #195 from monmanuela/fix-edit-msg
monmanuela Nov 12, 2018
e345e22
Merge pull request #201 from monmanuela/fix-pdf-links
monmanuela Nov 12, 2018
ebf39ff
Add failing test - title should be foodzoom
rrtheonlyone Nov 12, 2018
7e72ad5
Fix failing test - title changed
rrtheonlyone Nov 12, 2018
042859a
Merge pull request #196 from jinyingtan/Find-Bugs
monmanuela Nov 12, 2018
a175c29
Add order limit to deliveryman
juxd Nov 11, 2018
9bbb5c2
Add test for order limit
juxd Nov 11, 2018
d71aca9
Update documentation
juxd Nov 11, 2018
4928821
Merge pull request #202 from rrtheonlyone/config-change
rrtheonlyone Nov 12, 2018
cce7b6c
Add a line in UG.adoc [hotfix]
monmanuela Nov 12, 2018
7c4396e
Fix successful assignment bug
juxd Nov 12, 2018
d57f2de
Merge pull request #197 from juxd/add-assign-limit
rrtheonlyone Nov 12, 2018
b34df7e
Tweaks to PPP (#203)
rrtheonlyone Nov 12, 2018
d03f541
Tweaks to PPP
rrtheonlyone Nov 12, 2018
24d5242
Add more description to User Guide section
rrtheonlyone Nov 12, 2018
43da5eb
Merge pull request #204 from rrtheonlyone/ppp-upgrade
rrtheonlyone Nov 12, 2018
d70c164
DeveloperGuide.adoc: Add deliveryman find for AppendixH
Nov 12, 2018
47a3bbf
DeveloperGuide.adoc: Update find command expected message
Nov 12, 2018
d614af8
Merge pull request #205 from jinyingtan/docs-v1.4
Nov 12, 2018
ce1a3ed
Fix docs and PPP
juxd Nov 12, 2018
fb4d98e
Merge pull request #206 from juxd/julius-new-ppp
rrtheonlyone Nov 12, 2018
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
  •  
  •  
  •  
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ lib/*
*.log
*.log.*
*.csv
config.json
/config.json
src/test/data/sandbox/
preferences.json
.DS_Store
Expand All @@ -18,3 +18,7 @@ classes/
/bin/
src/main/resources/docs/
out/

# VSCode
.project
.classpath
21 changes: 8 additions & 13 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
= Address Book (Level 4)
= FoodZoom
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://travis-ci.org/CS2103-AY1819S1-T16-3/main[image:https://travis-ci.org/CS2103-AY1819S1-T16-3/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/juxd/main/branch/master[image:https://ci.appveyor.com/api/projects/status/bv2mp10bqjo93700/branch/master?svg=true[Build status]]
https://coveralls.io/github/CS2103-AY1819S1-T16-3/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-T16-3/main/badge.svg?branch=master[Coverage Status]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

ifdef::env-github[]
Expand All @@ -15,19 +14,14 @@ 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.
Welcome to FoodZoom! FoodZoom is a desktop food delivery management application designed for food businesses to streamline their delivery process. FoodZoom is responsive and quick, allowing managers to plan routes for order delivery and dispatch them to delivery men using a Command Line Interface (CLI). The delivery men can also use this application to view their delivery routes and increase their efficiency.

Make your food delivery system more seamless today with FoodZoom!

== Site Map

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

Expand All @@ -36,5 +30,6 @@ endif::[]
* 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]
* AddressBook-Level4 project is created by SE-EDU initiative at https://github.com/se-edu/

== Licence : link:LICENSE[MIT]
32 changes: 32 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"ignoreGlobList": ["about-us/**", "**index.html"],
"ignoreCommitList": [],
"authors":
[
{
"githubId": "kohchihao",
"displayName": "Koh Chi Hao",
"authorNames": ["Marcus Koh"]
},
{
"githubId": "jinyingtan",
"displayName": "Tan Jin Ying",
"authorNames": ["Jin Ying"]
},
{
"githubId": "monmanuela",
"displayName": "Monika Manuela Hengki",
"authorNames": ["Monika", "Monika Manuela Hengki"]
},
{
"githubId": "juxd",
"displayName": "Julius Sander",
"authorNames": ["Julius S"]
},
{
"githubId": "rrtheonlyone",
"displayName": "Rahul Rajesh",
"authorNames": ["Rahul Rajesh"]
}
]
}
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ dependencies {
implementation group: 'org.controlsfx', name: 'controlsfx', version: '8.40.11'
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
implementation group: 'com.google.guava', name: 'guava', version: '19.0'
implementation group: 'com.google.guava', name: 'guava', version: '26.0-jre'
implementation group: 'javax.xml.bind', name: 'jaxb-api', version: '2.2.8'
implementation group: 'com.sun.xml.bind', name: 'jaxb-impl', version: '2.3.0'
implementation group: 'com.sun.xml.bind', name: 'jaxb-core', version: '2.3.0'
Expand Down
49 changes: 22 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,48 @@
: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} +
FoodZoom was developed by Team https://github.com/CS2103-AY1819S1-T16-3[T16-3] 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>>]
=== Rahul
image::rrtheonlyone.png[width="150", align="left"]
{empty}[https://github.com/rrtheonlyone[github]] [https://www.linkedin.com/in/rahul-rajesh-979919110/[portfolio]]

Role: Project Advisor
Roles: Integration, code quality

'''

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

Role: Team Lead +
Responsibilities: UI
Roles: Code quality and testing +

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Monika Manuela
image::monmanuela.png[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [https://www.linkedin.com/in/monika-manuela-hengki-a9383a54[portfolio]]

Role: Developer +
Responsibilities: Data
Roles: Team lead, UI +

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Koh Chi Hao
image::kohchihao.png[width="150", align="left"]
{empty}[https://github.com/kohchihao[github]] [https://www.kohchihao.com/[portfolio]]

Role: Developer +
Responsibilities: Dev Ops + Threading
Roles: Scheduling and tracking deliverables and deadlines +

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Tan Jin Ying
image::jinyingtan.png[width="150", align="left"]
{empty}[https://github.com/jinyingtan[github]] [https://www.tanjinying.com/[portfolio]]

Role: Developer +
Responsibilities: UI
Role: Documentation, UI +

'''
5 changes: 3 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
: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-T16-3/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 `e0176905 [at] comp.nus.edu.sg`
Loading