Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[CS2103-W14-3] Naggy Joel #15

Open
wants to merge 779 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
779 commits
Select commit Hold shift + click to select a range
9a451f8
Remove unwanted code
Apr 9, 2020
c64fa6c
Merge pull request #171 from AY1920S2-CS2103-W14-3/branch-resolve-und…
hhjoel Apr 9, 2020
66afab9
UndoCommand can now have "GETDETAIL" CommandType
hhjoel Apr 9, 2020
5e832d3
Changed AddInfoCommand to create new ArrayList class when adding info
hhjoel Apr 9, 2020
49aa615
Person class toString() method changed to include \n --> more elegant
hhjoel Apr 9, 2020
fcb38e1
EditCommand now shows get() details of the edited Person
hhjoel Apr 9, 2020
11c797d
Travis check
hhjoel Apr 9, 2020
2bd85c8
Reworked test for Travis, to include FiltererdPersonsResults for Edit…
hhjoel Apr 9, 2020
3245099
Edited EditCommandTest for Travis
hhjoel Apr 10, 2020
66267dc
minor edits to findcommand
sarahcxh Apr 10, 2020
745aceb
Minor edits to prefixes of (ev)add and message of (ev)delete so it is…
sarahcxh Apr 10, 2020
07a0ad1
Fixed UG
sarahcxh Apr 10, 2020
ad3cfe9
Merge pull request #172 from AY1920S2-CS2103-W14-3/Fixing-FindCommand…
ElysiaTanZY Apr 10, 2020
3737aa1
Updated algo of schedule command
Apr 10, 2020
e5b43ba
Removed unnecessary code
Apr 10, 2020
e01232b
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 10, 2020
905faab
Change EditCommand to show the get() panel
hhjoel Apr 10, 2020
a787ce8
Worked EditCommandTest for Travis
hhjoel Apr 10, 2020
db3b518
Optimised imports for Travis
hhjoel Apr 10, 2020
0e23705
Changed import order for Travis
hhjoel Apr 10, 2020
4240a89
Reworked undo/redo for(ab)addnote
hhjoel Apr 10, 2020
3b02958
Fixed bugs with findcommand
sarahcxh Apr 10, 2020
5d46cb9
Rework undo/redo for (ab)editnote, separated (ab)get's updateFiltered…
hhjoel Apr 10, 2020
3f86b34
Reworked undo/for deleteInfoCommand --> cleared undo/redo for entire …
hhjoel Apr 10, 2020
5b1e7ce
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 10, 2020
11f5f28
Merge pull request #174 from AY1920S2-CS2103-W14-3/branch-resolve-und…
hhjoel Apr 10, 2020
5c8499a
edited parser to check if line number is integer
Vanessa1098 Apr 10, 2020
4fe27ca
Worked undo/redo for (ev)add
hhjoel Apr 10, 2020
27cd44c
Worked undo/redo for (ev)delete, minor text change for (ev)delete suc…
hhjoel Apr 10, 2020
0a68002
Work undo/redo for (st)delete - new command
hhjoel Apr 10, 2020
248a453
Minor changes to (st)edit text for clarity, Worked undo/redo for (ev)…
hhjoel Apr 10, 2020
3dba52f
Merge pull request #177 from AY1920S2-CS2103-W14-3/branch-resolve-und…
hhjoel Apr 10, 2020
dc73b03
Solved price point for (rt) issue in UG
hhjoel Apr 10, 2020
17bf566
Solved price point for (rt) issue in UG (2)
hhjoel Apr 10, 2020
8a265b5
Solved price point for (rt) issue in UG (3)
hhjoel Apr 10, 2020
054be99
Solved price point for (rt) issue in UG (4)
hhjoel Apr 10, 2020
1907907
Solved price point for (rt) issue in UG (5)
hhjoel Apr 10, 2020
afb2773
Re-did regex for Price to allow for only 1, 2, or 3 dollar signs
hhjoel Apr 10, 2020
e258de6
Merge pull request #178 from AY1920S2-CS2103-W14-3/branch-solving-iss…
hhjoel Apr 10, 2020
b49f84c
Added tests for delete and edit assignment.
Apr 11, 2020
af7883b
Added tests for status and title.
Apr 11, 2020
4d36a40
Added tests to LogicManager.
Apr 11, 2020
38d2672
Edited checkstyle
Apr 11, 2020
a9e1f43
Added tests for EditAssignmentDescriptor
Apr 11, 2020
905f11d
edited size of main window panels
Vanessa1098 Apr 11, 2020
850435c
Added test for ScheduleCommandParser and ShowBirthdayCommandParser.
Apr 11, 2020
c0facea
Updated tests for EditCommandParser
Apr 11, 2020
890aaa4
Merge pull request #175 from AY1920S2-CS2103-W14-3/branch-linenum
ElysiaTanZY Apr 11, 2020
6ec5d54
Added tests for birthday.
Apr 11, 2020
f528e4d
Removed unwanted code.
Apr 11, 2020
aa06ff5
Updated checkstyle
Apr 11, 2020
37b1aa2
Added (rt)edit, changed Visit class to use validation Regex, updated …
hhjoel Apr 11, 2020
5ffc509
Optimize imports
hhjoel Apr 11, 2020
5230225
Optimized more imports
hhjoel Apr 11, 2020
74d2a95
Merge pull request #181 from AY1920S2-CS2103-W14-3/branch-(rt)edit
hhjoel Apr 11, 2020
414a3ec
Removed some tests and added tests to assignmentList
Apr 11, 2020
c2f4440
Changed (ab)edit and (ab)delete | minor edit to (ab)edit description …
hhjoel Apr 11, 2020
7c7de8d
Merge pull request #182 from AY1920S2-CS2103-W14-3/branch-change-(ab)…
hhjoel Apr 11, 2020
c558c2e
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 11, 2020
34df373
Renamed files so that it is consistent with UG and DG
Apr 11, 2020
025cac5
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Apr 11, 2020
3465523
Merge branch 'master' into branch-tests
Apr 11, 2020
5dd20bf
Merge pull request #179 from AY1920S2-CS2103-W14-3/branch-tests
ElysiaTanZY Apr 11, 2020
8e334d2
Edited PersonTest
Apr 11, 2020
8bba877
Fix Find-Command
sarahcxh Apr 11, 2020
3efd28e
Cosmetic changes
Apr 11, 2020
5f1693b
Removed logger
sarahcxh Apr 11, 2020
32b09bd
Minor edits
sarahcxh Apr 11, 2020
49b805b
Merge pull request #183 from AY1920S2-CS2103-W14-3/branch-Fix-FindCom…
ElysiaTanZY Apr 11, 2020
655b348
Cosmetic changes
Apr 11, 2020
413bce7
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 11, 2020
28712eb
edited get command such that it is not dependent on the previous filt…
Vanessa1098 Apr 11, 2020
00ffba3
Refactored code
Apr 11, 2020
f88f4ef
can now delete all tags if only -t/ is specified
Apr 11, 2020
7760cc8
Updated tests for editCommandParser
Apr 11, 2020
dba0590
Merge pull request #185 from AY1920S2-CS2103-W14-3/branch-enhancements
hhjoel Apr 11, 2020
a156c51
Update EditCommand.java
hhjoel Apr 11, 2020
e451962
edited filteredPersonList displayed on 2nd panel when in find command…
Vanessa1098 Apr 11, 2020
c37e8a2
Made edits to how the results for schedule are displayed so that the …
Apr 12, 2020
ef5de77
edited test cases
Vanessa1098 Apr 12, 2020
dbee444
Made some minor changes to convert from float to bigDecimal more accu…
Apr 12, 2020
83d26ec
fixed checkstyle
Vanessa1098 Apr 12, 2020
7c932a3
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 12, 2020
b6ced13
edited PPP and minor changes to DG
Vanessa1098 Apr 12, 2020
0447d00
edited PPP
Vanessa1098 Apr 12, 2020
00df553
Merge pull request #187 from AY1920S2-CS2103-W14-3/branch-cosmetic-ch…
Vanessa1098 Apr 12, 2020
a18b901
Added nidorinas.adoc
sarahcxh Apr 12, 2020
2d5c737
Changed variable name
Apr 12, 2020
e03e464
initial commit
sarahcxh Apr 12, 2020
e8feaa2
Removed unwanted sections from PPP
sarahcxh Apr 12, 2020
9ed9c6b
edited DG and (ab)delete in UG
Vanessa1098 Apr 12, 2020
7f7a64d
edited PPP
Vanessa1098 Apr 12, 2020
30cfd5a
Edited DG manual testing
Vanessa1098 Apr 12, 2020
e90ff31
Changed function name
Apr 12, 2020
c25dd45
edited DG & UG
Vanessa1098 Apr 12, 2020
8d81abd
edited the restaurant list displayed when editing a restaurant detail…
Vanessa1098 Apr 12, 2020
83c52b0
fix checkstyle
Vanessa1098 Apr 12, 2020
c6145d5
Removed visited restaurant command to concise it in editRestaurant, e…
Vanessa1098 Apr 12, 2020
42bc4d7
edited DG & UG to include EditRestaurantCommand
Vanessa1098 Apr 12, 2020
9fdc35b
Updated DG & made minor changes to FindRestaurantCommandParser
sarahcxh Apr 12, 2020
1eda97b
edited DG
Vanessa1098 Apr 12, 2020
185f53b
edited UG
Vanessa1098 Apr 12, 2020
f2dccf6
edited UG
Vanessa1098 Apr 12, 2020
e062cae
edited DG
Vanessa1098 Apr 12, 2020
493452c
Update DG & minor changes to FindCommand
sarahcxh Apr 12, 2020
9c949f2
Fixed bug in FindCommand
sarahcxh Apr 12, 2020
674877a
Joel PPP Draft 1
hhjoel Apr 12, 2020
3f077fa
Checkstyle
hhjoel Apr 12, 2020
d474667
fixed alphabetical sorting for assignments
Vanessa1098 Apr 12, 2020
12c946a
Added tests for Restaurants, its components, and RestaurantBook
hhjoel Apr 12, 2020
18af061
Merge pull request #192 from AY1920S2-CS2103-W14-3/branch-tests-for-(rt)
hhjoel Apr 12, 2020
729c381
Merge pull request #191 from AY1920S2-CS2103-W14-3/update-DG-and-Find…
sarahcxh Apr 12, 2020
d1d197c
Updated DG for Schoolwork Tracker
Apr 12, 2020
a7bfe77
Merge pull request #184 from AY1920S2-CS2103-W14-3/branch-fix-get
Vanessa1098 Apr 12, 2020
27cc2f9
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 12, 2020
fca2dac
Updated PPP and DG
Apr 12, 2020
1eebbe4
PPP Draft 2
hhjoel Apr 12, 2020
4e7b03d
Draft 3
hhjoel Apr 12, 2020
ef7a704
Draft 4
hhjoel Apr 12, 2020
d28e39a
Draft 5
hhjoel Apr 12, 2020
c19a453
Merge pull request #190 from AY1920S2-CS2103-W14-3/branch-edit-docs
ElysiaTanZY Apr 13, 2020
1f0fc59
Updated PPP
Apr 13, 2020
7d50303
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
1cf002c
Updated diagrams.
Apr 13, 2020
7fe8925
Added schedule tag
Apr 13, 2020
dc6dad9
Updated PPP
Apr 13, 2020
92fecdd
Merge pull request #193 from AY1920S2-CS2103-W14-3/branch-DG-Elysia
Vanessa1098 Apr 13, 2020
bc6dbe2
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
e7df09f
Edited edit person so that -t/ t/friend adds the tag friend as well
Apr 13, 2020
6bad945
edited DG & UG tags and PPP
Vanessa1098 Apr 13, 2020
04d65b0
Updated UG and edited the isValidWorkload()
Apr 13, 2020
bca8ba8
Updated Ui.png
Apr 13, 2020
e52d406
Updated checkstyle
Apr 13, 2020
53598c9
Updated checkstyle
Apr 13, 2020
2982663
edited PPP and DG tags
Vanessa1098 Apr 13, 2020
62e1c9f
Changed picture size
Apr 13, 2020
6210656
Edited UG based on comments
Apr 13, 2020
de878a3
Merge pull request #194 from AY1920S2-CS2103-W14-3/branch-UG
Vanessa1098 Apr 13, 2020
417b87b
Merge pull request #195 from AY1920S2-CS2103-W14-3/branch-xj-ppp
Vanessa1098 Apr 13, 2020
8a51bec
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
68731ea
Update DeveloperGuide.adoc
Vanessa1098 Apr 13, 2020
58b411d
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
690025f
Edited grammar mistakes in DG
Apr 13, 2020
0fdbdff
removed space
Apr 13, 2020
4e92b86
Removed useless Remark attribute in Restaurant
hhjoel Apr 13, 2020
c64d545
Merge pull request #196 from AY1920S2-CS2103-W14-3/branch-delete-rema…
hhjoel Apr 13, 2020
4662239
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
926dca1
edited DG
Vanessa1098 Apr 13, 2020
c8bc433
Merge pull request #197 from AY1920S2-CS2103-W14-3/branch-dg
Vanessa1098 Apr 13, 2020
bdeb144
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
839cba1
removed unused method in UniqueRestaurantList
hhjoel Apr 13, 2020
1463cb4
Updated PPP to include UG
Apr 13, 2020
47654bf
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Apr 13, 2020
49e7e7b
Merge pull request #188 from AY1920S2-CS2103-W14-3/branch-Sarah-PPP
ElysiaTanZY Apr 13, 2020
a6c19a5
Changed the link for suggestions given to other teams
Apr 13, 2020
e3d776b
Added rtClassDiagram
hhjoel Apr 13, 2020
be4d121
Changed assignmentSchedule to schoolworkTracker to be consistent with…
Apr 13, 2020
cc95a16
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
d54c2ab
edited uml diagram
Vanessa1098 Apr 13, 2020
114645a
Merge pull request #198 from AY1920S2-CS2103-W14-3/branch-edit-uml
Vanessa1098 Apr 13, 2020
3a511de
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
6c8e2e9
Activity Diagram for (rt)add
hhjoel Apr 13, 2020
f2542bf
Removed unrequired code and updated DG diagrams.
Apr 13, 2020
81e2368
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Apr 13, 2020
fc888da
Replaced rtClassDiagram
hhjoel Apr 13, 2020
ba6da4e
removed useless bdayList attribute in ModelState
hhjoel Apr 13, 2020
e404c65
Updated manual testing portion of DG
Apr 13, 2020
13578c4
Updated DG
Apr 13, 2020
5b25c55
Fix to FindRestaurantCommand
sarahcxh Apr 13, 2020
8bebb83
Minor change to usage of FindRestaurantCommand
sarahcxh Apr 13, 2020
e8389b6
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
0779b64
Fixed FindRestaurantCommand & findCommand
sarahcxh Apr 13, 2020
3a97bfa
cosmetic changes
Apr 13, 2020
668d353
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
9114280
Updated UG
Apr 13, 2020
ddf984b
changed the intro a bit
Apr 13, 2020
71ce5ef
Updated UG
Apr 13, 2020
116c983
cosmetic changes
Apr 13, 2020
3de3ddb
cosmetic changes
Apr 13, 2020
ba9e356
edited schedule command
Apr 13, 2020
01ebb8b
Refactored ModelManager
hhjoel Apr 13, 2020
16c37d5
uploaded required images for DG
hhjoel Apr 13, 2020
2cdc876
Updated UG
Apr 13, 2020
5955a0d
Updated DG and UG to reflect new prefixes for event
Apr 13, 2020
1f2109b
Changed UG, DG and minor edits to findCommand
sarahcxh Apr 13, 2020
74c4085
Prelim
hhjoel Apr 13, 2020
36b5622
Merge pull request #200 from AY1920S2-CS2103-W14-3/branch-Joel-PPP
hhjoel Apr 13, 2020
9ba4a90
draft 1
hhjoel Apr 13, 2020
b4120e4
Changed AB3 to Naggy Joel
Apr 13, 2020
c8fba09
Changed prefixes, edited UG and DG
sarahcxh Apr 13, 2020
70136f2
draft 2
hhjoel Apr 13, 2020
2d73fc1
Merge pull request #201 from AY1920S2-CS2103-W14-3/fix-(ev)edit
hhjoel Apr 13, 2020
3f1e8f4
updated PPP
Apr 13, 2020
d6adbdf
updated image files
hhjoel Apr 13, 2020
11d54cf
Shifted stuff around
Apr 13, 2020
622bf01
removed learning outcomes
Apr 13, 2020
2248e63
Removed unwanted line
Apr 13, 2020
7f1c8fa
Merge branch 'master' into branch-DG-PPP
Vanessa1098 Apr 13, 2020
f2730f2
Merge pull request #199 from AY1920S2-CS2103-W14-3/branch-DG-PPP
Vanessa1098 Apr 13, 2020
2e98596
Updated PPP.
Apr 13, 2020
30a8771
Minor edits to UG
sarahcxh Apr 13, 2020
b784dd8
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
sarahcxh Apr 13, 2020
ab678fd
edited Ui to prevent text overflow
Vanessa1098 Apr 13, 2020
ec705b1
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
4c1bc64
Update DeveloperGuide.adoc
Vanessa1098 Apr 13, 2020
80ba06b
draft 3
hhjoel Apr 13, 2020
77e104c
Merge pull request #202 from AY1920S2-CS2103-W14-3/branch-fix-ui
Vanessa1098 Apr 13, 2020
a39c63a
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
d648532
UG formatting
sarahcxh Apr 13, 2020
c2d0237
Merge branches 'master' and 'master' of https://github.com/AY1920S2-C…
sarahcxh Apr 13, 2020
06d5f97
wrapped text for name in bday and edited message usage
Vanessa1098 Apr 13, 2020
82d24d3
Merge pull request #203 from AY1920S2-CS2103-W14-3/branch-minor-changes
Vanessa1098 Apr 13, 2020
fcb68c8
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
e5ec7a9
Changed AboutUs
sarahcxh Apr 13, 2020
c1abe3b
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
sarahcxh Apr 13, 2020
a0733ba
Added spacing to DG
sarahcxh Apr 13, 2020
8864d07
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
230861e
draft 4
hhjoel Apr 13, 2020
1d9f963
updated cosmetic stuff
Apr 13, 2020
38b5ef9
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Apr 13, 2020
de8119c
Updated UG
Apr 13, 2020
3b804e2
draft 5
hhjoel Apr 13, 2020
977d330
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
d309ef7
Merge branch 'master' into branch-Joel-DG
hhjoel Apr 13, 2020
5e73286
Merge pull request #204 from AY1920S2-CS2103-W14-3/branch-Joel-DG
hhjoel Apr 13, 2020
868c348
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
6450606
draft 6
hhjoel Apr 13, 2020
5a5b693
Update Ui to wrap text for remarks in bday card
Apr 13, 2020
840c980
draft 6
hhjoel Apr 13, 2020
a25a1d8
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
3ce3380
edited UG
Vanessa1098 Apr 13, 2020
6b67a65
edited DG
Vanessa1098 Apr 13, 2020
abdcaa6
Merge pull request #205 from AY1920S2-CS2103-W14-3/branch-UG
Vanessa1098 Apr 13, 2020
3b4a797
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
9a6c745
Edited use cases
Apr 13, 2020
be74a59
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Apr 13, 2020
f3ce439
Merge branch 'master' of https://github.com/AY1920S2-CS2103-W14-3/main
Vanessa1098 Apr 13, 2020
ad1b5f3
minor edits to PPP
Apr 13, 2020
1c6fe8c
draft 7
hhjoel Apr 13, 2020
2544622
Merge pull request #206 from AY1920S2-CS2103-W14-3/branch-Joel-DG2
hhjoel Apr 13, 2020
50be87d
Update elysiatanzy.adoc
hhjoel Apr 13, 2020
b7b3e78
Update joellimhh.adoc
hhjoel Apr 13, 2020
ce92b86
Update nidorinas.adoc
hhjoel Apr 13, 2020
29c23e1
edited DG
Vanessa1098 Apr 13, 2020
7f81cdb
Update joellimhh.adoc
hhjoel Apr 13, 2020
283d95c
Update joellimhh.adoc
hhjoel Apr 13, 2020
c02948c
edited DG use case
Vanessa1098 Apr 13, 2020
bc09c17
Update joellimhh.adoc
hhjoel Apr 13, 2020
811aacc
Merge pull request #207 from AY1920S2-CS2103-W14-3/branch-edit-DG
Vanessa1098 Apr 13, 2020
b720ba6
Rename joellimhh.adoc to hhjoel.adoc
hhjoel Apr 15, 2020
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
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@ matrix:
- jdk: openjdk11

script: >-
./config/travis/run-checks.sh &&
./gradlew clean checkstyleMain checkstyleTest test coverage coveralls asciidoctor

./config/travis/run-checks.sh &&
./gradlew clean checkstyleMain checkstyleTest test coverage coveralls asciidoctor
deploy:
skip_cleanup: true
provider: script
Expand Down
15 changes: 7 additions & 8 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
= Address Book (Level 3)
= Naggy Joel
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://travis-ci.org/AY1920S2-CS2103-W14-3/main[image:https://travis-ci.org/AY1920S2-CS2103-W14-3/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://coveralls.io/github/AY1920S2-CS2103-W14-3/main?branch=master[image:https://coveralls.io/repos/github/AY1920S2-CS2103-W14-3/main/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]


ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
endif::[]
Expand All @@ -15,22 +14,22 @@ 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.
* This is a desktop Social Life Management application that has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It aims to help you manage all aspects of your social life, ranging from your contacts to your tasks at hand and where is a good hangout spot.
* It helps you be the best friend that you can ever be!

== Site Map

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

== Acknowledgements

* 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_.
* Original source of the code: AddressBook-Level3 project created by SE-EDU initiative, https://se-education.org
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
18 changes: 14 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,16 @@ plugins {
id 'com.github.kt3k.coveralls' version '2.4.0'
id 'com.github.johnrengelman.shadow' version '4.0.4'
id 'org.asciidoctor.convert' version '1.5.6'
id 'org.openjfx.javafxplugin' version '0.0.7'
id 'application'
}

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

application {
mainClassName = 'seedu.address.Main'
}

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
Expand All @@ -25,6 +30,11 @@ repositories {
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}

javafx {
version = "11.0.2"
modules = [ 'javafx.controls', 'javafx.fxml' ]
}

checkstyle {
toolVersion = '8.1'
}
Expand Down Expand Up @@ -67,7 +77,7 @@ dependencies {
}

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

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

Expand Down
43 changes: 17 additions & 26 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,44 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
{empty} +
Naggy Joel was developed by the https://ay1920s2-cs2103-w14-3.github.io/main/AboutUs.html[Naggy Joel] 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>>]

Role: Project Advisor

'''

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

Role: Team Lead +
Responsibilities: UI
Responsibilities: Documentation

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Joel Lim
image::hhjoel.png[width="150", align="left"]
{empty}[http://github.com/hhjoel[github]] [<<joellimhh#, portfolio>>]

Role: Developer +
Responsibilities: Data
Responsibilities: UI, Intellij expert, Sourcetree expert

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Deliverables & deadlines, testing

'''

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

Role: Developer +
Responsibilities: UI
Responsibilities: Code quality, scheduling & tracking

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

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103-W14-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 `xinjie.kwan@u.nus.edu`
4 changes: 2 additions & 2 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= Naggy Joel - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand All @@ -12,7 +12,7 @@ ifdef::env-github[]
:note-caption: :information_source:
:warning-caption: :warning:
endif::[]
:repoURL: https://github.com/se-edu/addressbook-level3/tree/master
:repoURL: https://github.com/AY1920S2-CS2103-W14-3/main

== Build Automation

Expand Down
Loading