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

[F11-2] Concierge #68

Open
wants to merge 559 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 250 commits
Commits
Show all changes
559 commits
Select commit Hold shift + click to select a range
4f6643a
Resolve merge conflict from #153 and #162
Oct 29, 2018
d9583b7
LogInCommandParser.java: Add parseAndHash method for password
pikulet Oct 29, 2018
dc1235f
ModelManager.java: Create username field
pikulet Oct 29, 2018
780d331
Model.java: Introduce InvalidPasswordException
pikulet Oct 29, 2018
1cdf159
fix style
Oct 29, 2018
2dd1762
PasswordHashUtil.java: Add reference site
pikulet Oct 30, 2018
4d8c5d6
PasswordsStorage.java: Add password storage interface
pikulet Oct 30, 2018
b6eae31
UserPrefs.java: Add functionality to read in password file path
pikulet Oct 30, 2018
573cd51
XmlUtilTest and XmlSerializableConciergeTest: update with new format …
Oct 30, 2018
8b72ea3
XmlSerializableConciergeTest: update
Oct 30, 2018
d3b349f
TypicalConcerge: Refactor name of getTypicalConcierge -> getTypicalCo…
Oct 30, 2018
d1e5d0d
fix style
Oct 30, 2018
1307c4b
XmlConciergeStorageTest: update tests and relevant xml files used for…
Oct 30, 2018
ddce539
XmlSerializableConciergeTest: update tests and add relevant XML files…
Oct 30, 2018
d4c4387
Fix checkstyle errors
pikulet Oct 30, 2018
0fb0a26
Merge branch 'master' into sign-in-feature
pikulet Oct 30, 2018
2f6edc6
XmlUtilTest: update the format of how tests are conducted, RoomListPa…
Oct 30, 2018
0485eaf
DarkTheme.css: update with roomCardPane
Oct 30, 2018
a4b92a5
JsonUtil.java: Add functionality to parse string to jsonnode
pikulet Oct 31, 2018
2f2774f
fix codacy style
Oct 31, 2018
4b9ffef
fix style
Oct 31, 2018
59944aa
[v1.3] XML tests (#166)
adamwth Oct 31, 2018
bb30a9e
HashingException.java: move to model/util, Rename InvalidPasswordExce…
pikulet Oct 31, 2018
580ee77
InvalidLogInException: Add support for invalid username and password
pikulet Oct 31, 2018
5dbd9cf
Fix checkstyle errors
pikulet Oct 31, 2018
0767c5a
Merge branch 'master' into sign-in-feature
pikulet Oct 31, 2018
495cb57
PasswordHashList.java: Add support for retrieving password hashes
pikulet Oct 31, 2018
24331b8
LogInHelper.java: Add functionality to manage login
pikulet Oct 31, 2018
134f643
Model.java: redirect login features to LogInHelper
pikulet Oct 31, 2018
6ba8ff7
LogInCommand.java: Catch InvalidLogInException
pikulet Oct 31, 2018
a49bf77
Add Javadocs and fix checkstyle errors
pikulet Oct 31, 2018
2411658
Merge pull request #171 from adamwth/guest-checkin
adamwth Oct 31, 2018
d72cfbe
PasswordHashList.java: Resolve NullPointerException caused by invalid…
pikulet Oct 31, 2018
e0fe381
ConciergeParser.java: Add functionality to accept login command
pikulet Oct 31, 2018
33f343c
LogInHelper.java: Enforce lowercase comparison of hashed passwords
pikulet Oct 31, 2018
1a1ed7d
Concierge.java: add support for checked-in guest list, Rooms and othe…
Oct 31, 2018
e4a8085
StorageManager.java: Add passwordstorage as parameter for constructor
pikulet Oct 31, 2018
5cfac08
LogInHelper.java: improve code quality with equalsIgnoreCase method
pikulet Oct 31, 2018
a282b71
Fix checkstyle issues
pikulet Oct 31, 2018
342388a
Update data/passwords.json
pikulet Oct 31, 2018
a137ec2
LogInCommand.java: Add case-sensitive specification
pikulet Oct 31, 2018
0507de5
Merge branch 'master' into user-guide-update
pikulet Oct 31, 2018
987e490
Add login command documentation
pikulet Oct 31, 2018
2c4fa14
Remove delete documentation, update command summary
pikulet Oct 31, 2018
deeed22
Rename LogInHelper to LogInExecutor
pikulet Oct 31, 2018
ddcf03a
Add LogInVerifier.java and UnauthorisedCommandException
pikulet Oct 31, 2018
97b54ae
LogicManager.java: Add sign-in verification
pikulet Oct 31, 2018
976c6e8
Model.java: add method to get username
pikulet Oct 31, 2018
09ef8e4
Rename LogInExecutor to LogInManager
pikulet Oct 31, 2018
5bd0fa8
AddCommandTest.java: Override "getUsername" method
pikulet Oct 31, 2018
8f19f2a
Add LogInUtil to allow for simulated log-ins
pikulet Oct 31, 2018
763baa1
SystemTests: Add login before attempting to execute delete
pikulet Oct 31, 2018
dc779da
pass_testing.json: change password to hashed version
pikulet Oct 31, 2018
8a32f1b
Fix checkstyle errors
pikulet Oct 31, 2018
a6d7995
ClearCommandSystemTest.java: remove support for asserting login success
pikulet Oct 31, 2018
d355c7f
Fix checkstyle issues (for travis)
pikulet Oct 31, 2018
a1b2ab8
TypicalConcierge & TypicalRooms: Refactor to move all typical room se…
Oct 31, 2018
1e7e64c
all: fixed some Codacy detected issues
teowz46 Oct 31, 2018
228e9e0
XmlSerializableConcierge: change menu storage to list
teowz46 Oct 31, 2018
4bbd279
Merge remote-tracking branch 'upstream/master' into service
teowz46 Oct 31, 2018
210e0eb
test: change try catch to throws Exception for tests where no excepti…
teowz46 Oct 31, 2018
0d87d3e
Concierge: add guest list for checked-in guests and support for said …
Oct 31, 2018
d4cc2cf
ParserUtil: renamed FLAG_ARCHIVED_GUEST to FLAG_CHECKED_IN_GUEST and …
Oct 31, 2018
edd5f2f
XmlSerializableConcierge: add support to build checked-in guest list …
Oct 31, 2018
7ed0324
ListCommand: refactor arguments
Oct 31, 2018
3b3adab
PasswordHashList.java: add test unit
pikulet Oct 31, 2018
aa915e3
ParserUtil.java: Add support for whitespace before passwords
pikulet Oct 31, 2018
26d1dc0
Fix codacy issues
pikulet Oct 31, 2018
6f0f8ad
Fix typo
pikulet Oct 31, 2018
3a08087
LogInManager.java: Add signOut method
pikulet Oct 31, 2018
063e00b
Fix style issues
pikulet Oct 31, 2018
527bd97
Add LogOutCommand
pikulet Oct 31, 2018
b4a2d30
Fix style issues
pikulet Oct 31, 2018
8e7f3ab
Fix checkstyle issues
pikulet Oct 31, 2018
695c05c
Merge pull request #164 from pikulet/user-guide-update
adamwth Nov 1, 2018
4417324
TypicalConcierge: fix bug
Nov 1, 2018
e57708e
Room: add support for adding tags
Nov 1, 2018
251954b
Concierge: add addTag method
Nov 1, 2018
23a90ee
Model: add addTag method
Nov 1, 2018
7be9269
TypicalTags: add class for typical tags for both guests and rooms
Nov 1, 2018
9dc30e6
test: add more expenses tests, fix existing tests
teowz46 Nov 1, 2018
8406e8d
LogInManagerTest: add isSignedIn test
pikulet Nov 1, 2018
68e1c17
fix tests
Nov 1, 2018
e9a38df
Resolve merge conflict from #171
Nov 1, 2018
1801731
fix style
Nov 1, 2018
ff2517c
.gitignore: add dynamic XML test files to gitignore
Nov 1, 2018
93d673e
build.gradle: configure gradle build to show exception stack trace
Nov 1, 2018
0cbbc10
CommandTestUtil: attempt to fix travis bug
Nov 1, 2018
17b2757
Merge branch 'master' into sign-in-feature
pikulet Nov 1, 2018
469d6e3
fix style
Nov 1, 2018
0476541
test: add integration tests for Expenses related classes in other cla…
teowz46 Nov 1, 2018
e72cb73
all: fix checkstyle errors
teowz46 Nov 1, 2018
bdd8366
Merge branch 'master' into service
teowz46 Nov 1, 2018
33c01fa
ServiceCommandTest: fix Codacy style error
teowz46 Nov 1, 2018
db8156f
Add LogInManagerTest
pikulet Nov 1, 2018
6c49d83
Fix checkstyle errors
pikulet Nov 1, 2018
bec942b
AddCommand: refactor, update all AddCommand related tests
Nov 1, 2018
486b713
test: add more tests based on Coveralls
teowz46 Nov 1, 2018
b400f1a
RoomUtil: add utility methods for room commands, update and fix tests
Nov 1, 2018
883332e
fix style
Nov 1, 2018
401e5bf
all: fix checkstyle errors
teowz46 Nov 1, 2018
e51a5ab
[v1.3] List checked in guests (#178)
adamwth Nov 1, 2018
f1d1897
Merge remote-tracking branch 'upstream/master' into sign-in-feature
pikulet Nov 1, 2018
a17e778
test: fix Codacy errors
teowz46 Nov 1, 2018
a606c1b
Merge pull request #168 from pikulet/sign-in-feature
adamwth Nov 1, 2018
63d5e56
Merge branch 'master' into service
teowz46 Nov 1, 2018
25e8982
Resolve merge conflict from #168
Nov 1, 2018
af28bdb
Merge branch 'master' into service
teowz46 Nov 1, 2018
07b1796
all: fix bugs due to merging
teowz46 Nov 1, 2018
3d933cc
all: fix checkstyle errors due to merge
teowz46 Nov 1, 2018
803c851
Merge pull request #158 from teowz46/service
adamwth Nov 1, 2018
3ff713c
[v1.3] Update test descriptions (#179)
adamwth Nov 1, 2018
7e61656
[v1.3] Update UserGuide (#181)
adamwth Nov 1, 2018
68d0709
UserGuide: add section for service
teowz46 Nov 1, 2018
1a7c0e9
Merge remote-tracking branch 'upstream/master' into service
teowz46 Nov 1, 2018
d283cbe
Modify "Find" Function (#169)
JiaqingTan Nov 1, 2018
13e9c84
Concierge: urgent fix to checkout
Nov 1, 2018
90e383d
Merge pull request #183 from teowz46/service
teowz46 Nov 1, 2018
3ef1e34
fix style
Nov 1, 2018
45ca374
UserGuide: remove "Coming in v1.3"
teowz46 Nov 1, 2018
8e033eb
Merge remote-tracking branch 'upstream/master' into service
teowz46 Nov 1, 2018
caad29f
User guide: Documentation for add, clear, login/ logout, and select (…
pikulet Nov 1, 2018
5254889
Merge pull request #185 from adamwth/list-checked-in-guests
adamwth Nov 1, 2018
d6ceb82
UserGuide: add additional stuff for service command
teowz46 Nov 1, 2018
dc57981
Merge branch 'master' into service
teowz46 Nov 1, 2018
5e128b5
Minor edits for UserGuide (#190)
teowz46 Nov 2, 2018
ecc8b05
[v1.4] User Guide update and Ui.png fix (#188)
adamwth Nov 2, 2018
db20779
UserGuide.adoc: Update to provide admin account (#191)
pikulet Nov 2, 2018
d46b45b
Merge remote-tracking branch 'upstream/master' into service
teowz46 Nov 2, 2018
55dc874
Merge branch 'service' of https://github.com/teowz46/main into service
teowz46 Nov 2, 2018
f834695
UserGuide: update
Nov 2, 2018
b22b0f5
mainapp: update
Nov 2, 2018
61fd832
include passwords.json
Nov 2, 2018
8ec9726
update preferences.json
Nov 2, 2018
5fb702d
UserGuide: update
Nov 2, 2018
23a0299
fix style'
Nov 2, 2018
225d704
UserGuide: update (#195)
adamwth Nov 2, 2018
565de77
Merge remote-tracking branch 'upstream/master'
teowz46 Nov 4, 2018
a5401a2
Room: fix addExpense bug
teowz46 Nov 4, 2018
68718fc
all: fix checkstyle errors and failing test
teowz46 Nov 4, 2018
2a7e2fc
Merge pull request #212 from teowz46/menu
adamwth Nov 4, 2018
2a68a1e
RoomDetailedCard: add FlowPane for Expenses
teowz46 Nov 4, 2018
be23352
Merge remote-tracking branch 'upstream/master' into expense
teowz46 Nov 4, 2018
1203ce7
Expenses: fix checkstyle error
teowz46 Nov 4, 2018
442b001
test: fix failing tests due to expenses
teowz46 Nov 5, 2018
3f21754
RoomDetailedCardTest: add comparisons for "Expenses", "Active booking…
teowz46 Nov 5, 2018
c94ff2f
RoomDetailedCardTest: add one more test for expenses FlowPane
teowz46 Nov 5, 2018
bb92820
[v1.4] Select command fix (#211)
adamwth Nov 5, 2018
794aeaf
Expenses: fix toStringTotalCost method throwing MoneyLimitExceededExc…
teowz46 Nov 5, 2018
8d76a85
RoomDetailedCardHandle: modify equals()
teowz46 Nov 5, 2018
8494d65
Merge pull request #213 from teowz46/expense
adamwth Nov 5, 2018
b1ade19
resolve merge conflict
Nov 6, 2018
2919238
[v1.4] User Guide update (#220)
adamwth Nov 7, 2018
d200b49
[v1.4] Select command tests (#219)
adamwth Nov 7, 2018
3e46751
Merge remote-tracking branch 'upstream/master'
Nov 7, 2018
bc79eba
Autocomplete feature (#221)
neilish3re Nov 8, 2018
f59c3b7
[v1.4] Reassign command (#222)
adamwth Nov 8, 2018
909c735
[v1.4] Docs update (#225)
adamwth Nov 8, 2018
b6643eb
Merge remote-tracking branch 'upstream/master'
Nov 8, 2018
4c84c21
Revert "[v1.4] Docs update (#225)"
adamwth Nov 8, 2018
cf3ae42
Revert "[v1.4] Reassign command (#222)"
adamwth Nov 8, 2018
dd438a0
Revert "Autocomplete feature (#221)"
adamwth Nov 8, 2018
9411261
Merge pull request #227 from CS2103-AY1819S1-F11-2/revert-221-Autocom…
adamwth Nov 8, 2018
37bcc00
Merge remote-tracking branch 'upstream/master'
Nov 8, 2018
ab0838b
Create PPP template
pikulet Nov 8, 2018
608ce13
Bug Fixes, Changes and Added Functionality (#224)
JiaqingTan Nov 9, 2018
970d47e
Address the issues in the PE-dry-run (#229)
pikulet Nov 9, 2018
e711170
Update README.adoc
pikulet Nov 9, 2018
75d9b00
Remove edit command (#233)
pikulet Nov 10, 2018
60f7158
[LogIn module improvements] Add default login account, erase command …
pikulet Nov 10, 2018
ab5f45c
Merge remote-tracking branch 'upstream/master' into portfolio
pikulet Nov 10, 2018
8ceeb82
Update UserGuide.adoc: Login
pikulet Nov 10, 2018
ee16c0c
Merge remote-tracking branch 'upstream/master'
Nov 10, 2018
0ae9a37
Readme: update
Nov 10, 2018
e0ad198
MainWindow and UiManager: change AB icon to Concierge icon
Nov 10, 2018
fabb114
Merge pull request #234 from pikulet/portfolio
adamwth Nov 10, 2018
1e7ec87
UserGuide: beautify
Nov 10, 2018
c4d7d2d
UserGuide: update Ui.png and FAQ
Nov 10, 2018
46ae3b5
DeveloperGuide: update
Nov 10, 2018
44d3ec0
TypicalConcierge: change ab to concierge
Nov 10, 2018
fb1635e
DeveloperGuide: add activity diagram for checkIn
Nov 10, 2018
92381c4
XmlAdaptedRoom: fix IllegalValueException due to expenses present in …
teowz46 Nov 10, 2018
4186912
adamwth.adoc: add PPP
Nov 10, 2018
2fac28a
fix style
Nov 10, 2018
6234801
SampleDataUtil: add two more expense types into sample
teowz46 Nov 10, 2018
6b5aed5
Merge remote-tracking branch 'upstream/master'
Nov 10, 2018
02d21e0
Resolve merge conflict
Nov 10, 2018
1a08983
UserGuide: update service section with the two adjustment expense types
teowz46 Nov 10, 2018
e6ade99
UserGuide: add v2.0 section
Nov 10, 2018
c6885c8
UserGuide: update
Nov 10, 2018
0cebd8b
UserGuide: fix minor stuff
teowz46 Nov 10, 2018
6dee7c1
UserGuide: try fixing icon size
Nov 10, 2018
e88e3f4
AboutUs: update with link to PPP
Nov 10, 2018
736edf2
adamwth.adoc: update PPP
Nov 10, 2018
2342ac9
UGDG: update
Nov 10, 2018
d2f8e2c
UG: update image size
Nov 10, 2018
cb48a71
UG: update image size
Nov 10, 2018
ee1efb4
Merge pull request #238 from adamwth/adam-ppp
adamwth Nov 10, 2018
69e1cf4
UserGuide: minor fix (#239)
adamwth Nov 10, 2018
28ac5b1
Update config.json
JiaqingTan Nov 11, 2018
54742a2
update author names for reposense (#230)
neilish3re Nov 11, 2018
0115580
DeveloperGuide: add ServiceCommand stuff with a flowchart
teowz46 Nov 11, 2018
776575f
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46 Nov 11, 2018
0a74fe1
[v1.4] Update Adam's PPP (#244)
adamwth Nov 11, 2018
fe75060
ModelClassDiagram: update with current structure
teowz46 Nov 11, 2018
60c5b76
ModelClassDiagram: update the better diagram also
teowz46 Nov 11, 2018
c8fae31
UserGuide and DevGuide documentation (#235)
pikulet Nov 11, 2018
51a6011
Fix implementation of resetUndoRedoHistory (#236)
pikulet Nov 11, 2018
a65c4b3
DeveloperGuide: add sequence diagram for addExpense
teowz46 Nov 11, 2018
af51381
DeveloperGuide: make addExpense sequence diagram bigger
teowz46 Nov 11, 2018
0650c70
Autocomplete Feature (#237)
neilish3re Nov 11, 2018
a5c7916
DeveloperGuide: add more design considerations
teowz46 Nov 11, 2018
c2be068
all: fix checkstyle errors
teowz46 Nov 11, 2018
00e2abc
Documentation updates, test cases, comments (#246)
pikulet Nov 11, 2018
3578f0b
Change Application Name to "Concierge", edit PPP (#243)
JiaqingTan Nov 11, 2018
3233656
UserGuide, DevGuide, PPP documentation (#245)
neilish3re Nov 11, 2018
4d9f6e1
docs: add my own PPP
teowz46 Nov 11, 2018
d37709b
XmlAdaptedRoomTest: add more tests to increase coverage
teowz46 Nov 11, 2018
507a397
XmlAdaptedRoomTest: fix checkstyle errors
teowz46 Nov 11, 2018
7f938d8
Update doc images from jpg to png format (#249)
neilish3re Nov 11, 2018
58700e6
UserGuide: add minor corrections
teowz46 Nov 12, 2018
e177b85
UG and DG updates for Expenses stuff (#247)
teowz46 Nov 12, 2018
db39bcd
Change uppercase PNG to lowercase png (#250)
neilish3re Nov 12, 2018
d1a7a6b
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46 Nov 12, 2018
5511dc6
UserGuide and DeveloperGuide: minor edits from previous PR
teowz46 Nov 12, 2018
a7a14fd
UserGuide: use important icon
teowz46 Nov 12, 2018
09a16c0
UserGuide: fix some formatting errors
teowz46 Nov 12, 2018
01ff4f3
UG and DG updates (#252)
teowz46 Nov 12, 2018
87112f6
UserGuide: rearrange stuff in service
teowz46 Nov 12, 2018
3c5352e
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46 Nov 12, 2018
61a6397
More UG updates (#253)
teowz46 Nov 12, 2018
acb4536
AboutUs: update my PPP link
teowz46 Nov 12, 2018
5d6ded3
Updated LogicComponentClassDiagram (#251)
neilish3re Nov 12, 2018
787fa8c
AboutUs: update my pic
teowz46 Nov 12, 2018
298d416
Merge remote-tracking branch 'upstream/master' into user-dev-guide
teowz46 Nov 12, 2018
9dd368f
Merge pull request #254 from teowz46/user-dev-guide
teowz46 Nov 12, 2018
31fa3a1
Renaming of parser in Logic Component Class Diagram (#255)
neilish3re Nov 12, 2018
9f6e7d2
AddExpenseSequenceDiagram: fix out of alignment objects (#256)
teowz46 Nov 12, 2018
fbb4eed
README: update link for ConciergeFinal.png to show properly in index.…
teowz46 Nov 12, 2018
a8d9903
Remove gitter badge
pikulet Nov 12, 2018
e5f8172
[v1.4] Docs update (#257)
adamwth Nov 12, 2018
36b4638
Update to UserGuide for List + Find (#261)
JiaqingTan Nov 12, 2018
f692f06
Update documentation (#260)
pikulet Nov 12, 2018
a20c63b
[v1.4] SampleDataUtil: add yesterday-today booking to r/005 (#263)
adamwth Nov 12, 2018
c7b7174
Update PPP links (#262) - forced merge
pikulet Nov 12, 2018
7573517
README (#264)
teowz46 Nov 12, 2018
c857168
DeveloperGuide: add manual testing instructions for service (#265)
teowz46 Nov 12, 2018
8f9c6c7
Add instructions for manual testing: list, find, autocomplete (#266)
pikulet Nov 12, 2018
7d02fae
DG: update manual test instructions for checkin, checkout, reassign (…
adamwth Nov 12, 2018
4bd7e62
DG fix (#268)
adamwth Nov 13, 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
  •  
  •  
  •  
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,17 @@ lib/*
*.csv
config.json
src/test/data/sandbox/
preferences.json
.DS_Store
./screenshot*.png
classes/
/data/
/bin/
src/main/resources/docs/
out/
/data/
/commands_log/*
/src/test/data/XmlUtilTest/validConcierge.xml
/src/test/data/XmlUtilTest/validGuest.xml
/src/test/data/XmlUtilTest/validRoom.xml
/src/test/data/XmlUtilTest/invalidGuest.xml
/src/test/data/XmlUtilTest/invalidRoom.xml
/src/test/data/XmlSerializableConciergeTest/typicalConcierge.xml
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Permission is hereby granted, free of charge, to any person 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 guests 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
30 changes: 14 additions & 16 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,33 +1,30 @@
= Address Book (Level 4)
= Concierge v1.3
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-F11-2/main[image:https://travis-ci.org/CS2103-AY1819S1-F11-2/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/CS2103-AY1819S1-F11-2/main[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/CS2103-AY1819S1-F11-2/main?branch=master[image:https://coveralls.io/repos/github/CS2103-AY1819S1-F11-2/main/badge.svg?branch=master[Coverage Status]]
image:https://api.codacy.com/project/badge/Grade/e246831fbe73495b83cc53e409ff7fb1["Codacy code quality", link="https://www.codacy.com/app/adamwth/main?utm_source=github.com&utm_medium=referral&utm_content=CS2103-AY1819S1-F11-2/main&utm_campaign=Badge_Grade"]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]
image::docs/images/ConciergeFinal.png[width="600"]

* 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.
* Concierge is a desktop Hotel Management application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a concise Java application intended for small hotels looking for a simple application to manage basic hotel features.
* Value Proposition
** A simple, intuitive and free command line tool for managing a small-scale hotel.
** Hassle-free for receptionists in managing day-to-day hotel operations.
** A logistics tool that generates insightful reports for hotel managers to
assess hotel efficiency.

== Site Map

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

Expand All @@ -36,5 +33,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]
* The original source of the code is Concierge - level 4 : https://github.com/se-edu/

== Licence : link:LICENSE[MIT]
30 changes: 30 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"authors":
[
{
"githubId": "adamwth",
"displayName": "CHEW ... SOON",
"authorNames": ["adamwth", "Adam"]
},
{
"githubId": "pikulet",
"displayName": "JOYCE...HUHUI",
"authorNames": ["pikulet", "Joyce"]
},
{
"githubId": "neilish3re",
"displayName": "NEIL ...MEHTA",
"authorNames": ["neilish3re"]
},
{
"githubId": "JIaqingTan",
"displayName": "TAN J...AQING",
"authorNames": ["JIaqingTan"]
},
{
"githubId": "teowz46",
"displayName": "TEO W...ZHENG",
"authorNames": ["teowz46"]
}
]
}
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -134,6 +134,7 @@ test {

testLogging {
events TestLogEvent.FAILED, TestLogEvent.SKIPPED
exceptionFormat 'full'

// Prints the currently running test's name in the CI's build log,
// so that we can check if tests are being silently skipped or
Expand Down Expand Up @@ -207,9 +208,8 @@ asciidoctor {
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)
'site-name': 'Concierge',
'site-githuburl': 'https://github.com/CS2103-AY1819S1-F11-2/main',
]

options['template_dirs'].each {
Expand Down
8 changes: 8 additions & 0 deletions data/passwords.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"pikulet" : "4903262D17B8E56B032447C80C2C0C168AED4BB363DE18C244B4E30D0857F810",
"adamwth" : "91B03EE37E544D65620D0676DC0B6C1B37BE278E560DB8EA8BBD0A77C41881E2",
"teowz46" : "1FE3B194339D27FC2E6F001068CE1546F7FECD2EF6AEF0135D91B6EE1533CEF4",
"JiaqingTan" : "1D0C04FFE64271D4417878FA261350CEA01E1E11D5E2064A0EC1DCA81A0BBA62",
"neilish3re" : "F016C5149686E7AD2C7FACC4AFDBE116CCE6B4C77700661B584734927EF47146",
"admin" : "F6302296B934FD23629EF2252A746C1F2B57A7D0446F069232A007FE0A1F046E"
}
52 changes: 29 additions & 23 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,59 @@
: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.}_ +
Concierge was developed by the CS2103 F11-2 team. +
{empty} +
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>>]
=== Adam Chew Yong Soon
image::adamwth.png[width="150", align="left"]
{empty}[https://github.com/adamwth[github]] [<<johndoe#, portfolio>>]

Role: Project Advisor
Role: Team Lead +
Responsibilities: UI Design, Model Component, JavaFX expert +
Side-responsiblities: Scheduling and tracking, Integration

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Joyce Yeo Shu Hui
image::pikulet.png[width="150", align="left"]
{empty}[http://github.com/pikulet[github]] [<<johndoe#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Documentation, Storage Component, IntelliJ expert +
Side-responsiblities: Deliverables and deadlines

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Teo Wei Zheng
image::teowz46.png[width="150", align="left"]
{empty}[http://github.com/teowz46[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: Logic Component, Travis CI expert +
Side-responsiblities: Deliverables and deadlines

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]
=== Tan Jia Qing
image::jiaqingtan.png[width="150", align="left"]
{empty}[http://github.com/JiaqingTan[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: UI Design & Implementation, UI Component, JavaFX expert +
Side-responsiblities: Code quality

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Testing, Commons Component, JUnit expert +
Side-responsiblities: Git expert


'''
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-F11-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 `thetravisthingy [at] gmail.com`.

Loading