Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

[CS2103T-W16-01] B B Productive #22

Open
wants to merge 805 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
805 commits
Select commit Hold shift + click to select a range
c4c1c10
update diagrams
BransonNg Apr 10, 2020
34a4e5a
update diagram
BransonNg Apr 10, 2020
2f66f67
update
BransonNg Apr 10, 2020
6e43a65
PetManagerTest
FyonnOh Apr 10, 2020
ccbc6fe
Handle Invalid PetJson
FyonnOh Apr 10, 2020
a0323b0
refactor daily target from String to DailyTarget
Permas-Teo Apr 11, 2020
02f38b1
add methods to Model
Permas-Teo Apr 11, 2020
3fa6726
update AddCommandTest
Permas-Teo Apr 11, 2020
86127ff
new diagram pics
BransonNg Apr 11, 2020
fd722e5
add new diagram
BransonNg Apr 11, 2020
d70c7d4
reduce coupling by removing Statistics class from DoneCommand and Pom…
Permas-Teo Apr 11, 2020
db40eaf
Handle invalid PetJson 0.1
FyonnOh Apr 11, 2020
a467c66
Added tests for recurring in Add and Edit parser
artlee06 Apr 11, 2020
55d84ca
Add AdaptedPetTest
FyonnOh Apr 11, 2020
4692e1e
Gradlew Format
FyonnOh Apr 11, 2020
c755c15
new diagrams
BransonNg Apr 11, 2020
57e4cb0
new diagrams
BransonNg Apr 11, 2020
246d859
Edited Typical Tasks to have reminders and recurring
artlee06 Apr 11, 2020
0057daf
Ran a gradle format
artlee06 Apr 11, 2020
22cf9d0
updated UG
BransonNg Apr 11, 2020
cfe809a
Implement SetCommandTest
FyonnOh Apr 11, 2020
4e8bf99
update images
BransonNg Apr 11, 2020
6d74117
update getStatistics method in ModelManager to return ReadOnlyStatistics
Permas-Teo Apr 11, 2020
c474ee9
update diagrams
BransonNg Apr 11, 2020
608e116
Merge branch 'master' into dg/arthur
artlee06 Apr 11, 2020
9536b20
remove unnecessary methods to reduce coupling
Permas-Teo Apr 11, 2020
414f225
Merge branch 'master' into arthur/UG and gradle format
artlee06 Apr 11, 2020
477385f
Merge branch 'arthur/UG' of https://github.com/AY1920S2-CS2103T-W16-1…
artlee06 Apr 11, 2020
e620cbd
Removed trailing white spaces
artlee06 Apr 11, 2020
e8b0a38
Removed trailing whitespaces
artlee06 Apr 11, 2020
cdad1ab
update diagrams
BransonNg Apr 11, 2020
544f2fe
at auto complete
BransonNg Apr 11, 2020
19a5f0d
nearly done
BransonNg Apr 11, 2020
53fa98c
update
BransonNg Apr 11, 2020
5990e2c
Setup basics of SetCommandParserTest
FyonnOh Apr 11, 2020
8859bc3
Adapted observer pattern to update result display on recurring behaviour
artlee06 Apr 11, 2020
cba3c72
Ran a gradle format
artlee06 Apr 11, 2020
f5c473b
Add JsonPetStorageTest
FyonnOh Apr 11, 2020
8925115
gradlew format
FyonnOh Apr 11, 2020
d6da72c
Updated recurring activity diagram with new logic
artlee06 Apr 11, 2020
b9ee073
temp
BransonNg Apr 11, 2020
b25d7c8
update SetCommand
FyonnOh Apr 11, 2020
67bed76
comment out SetCommandParserTest
FyonnOh Apr 11, 2020
5540170
Prettier formating for css, background color change
artlee06 Apr 11, 2020
430a1e1
Merge pull request #301 from AY1920S2-CS2103T-W16-1/refactor/statistics
Permas-Teo Apr 11, 2020
0dd2aac
Merge pull request #311 from AY1920S2-CS2103T-W16-1/Fyonn/SetCommands…
Permas-Teo Apr 11, 2020
1aeddee
Merge pull request #307 from AY1920S2-CS2103T-W16-1/test/259-recurrin…
artlee06 Apr 11, 2020
4df9d04
Merge branch 'dev' into feature/updateDisplay-on-Recurr
artlee06 Apr 11, 2020
186a3d8
Ran a gradle formatr
artlee06 Apr 11, 2020
fe4a8f7
Merge pull request #309 from AY1920S2-CS2103T-W16-1/feature/updateDis…
artlee06 Apr 11, 2020
a46c48d
otw
BransonNg Apr 11, 2020
584bf13
branson/refactor (#300)
BransonNg Apr 11, 2020
b4bb80e
make message more readable
BransonNg Apr 11, 2020
0478ac4
Fixes Pom bugs. (#319)
Hardoh Apr 11, 2020
f709cf2
handle new commands
BransonNg Apr 11, 2020
8497f7c
add storage for Daily Target
Permas-Teo Apr 12, 2020
bb0037a
update JsonSerializableStatisticsTest
Permas-Teo Apr 12, 2020
a1a4721
Merge pull request #320 from AY1920S2-CS2103T-W16-1/feature/storage-d…
Permas-Teo Apr 12, 2020
2283f8d
Test/storage (#321)
Permas-Teo Apr 12, 2020
606e0c4
Add level 3 hangry images
FyonnOh Apr 12, 2020
3945d8f
Permas/refactor (#322)
Permas-Teo Apr 12, 2020
81390fa
Merge branch 'dev' of https://github.com/AY1920S2-CS2103T-W16-1/main …
FyonnOh Apr 12, 2020
8f4f610
remove duplicate method in Pet.java
FyonnOh Apr 12, 2020
2d9c440
Fix travis format errors
FyonnOh Apr 12, 2020
cc4fde4
Fix travis error
FyonnOh Apr 12, 2020
1c96189
Add new Test Case
FyonnOh Apr 12, 2020
85cd508
Merge pull request #306 from AY1920S2-CS2103T-W16-1/Fyonn/PetTest
FyonnOh Apr 12, 2020
895d462
remove list all for edit
BransonNg Apr 12, 2020
47d589d
remove otherComandResult types
BransonNg Apr 12, 2020
9b2f1a8
name variable bug
BransonNg Apr 12, 2020
1e2c2d3
works
BransonNg Apr 12, 2020
5d7f99c
update to sort refactor
BransonNg Apr 12, 2020
4155e1a
update Sort
BransonNg Apr 12, 2020
3e27ce8
update UG
BransonNg Apr 12, 2020
3152825
update diagrams
BransonNg Apr 12, 2020
792b993
remove debug prints
BransonNg Apr 12, 2020
2e3d7ec
DG updated
BransonNg Apr 12, 2020
1a79c54
Update UserGuide (#302)
Permas-Teo Apr 12, 2020
6803419
Updates Pomodoro User Guide. (#303)
Hardoh Apr 12, 2020
4bbb01e
Added userguide content (#292)
artlee06 Apr 12, 2020
25e7b10
update diagram
BransonNg Apr 12, 2020
f65a44c
Adds a sequence diagram for pomodoro manager. (#304)
Hardoh Apr 12, 2020
c2f3eaa
Permas/dg diagrams (#323)
Permas-Teo Apr 12, 2020
7b9edd6
done
BransonNg Apr 12, 2020
d12a4e6
remove ws
BransonNg Apr 12, 2020
51d3faa
Just one diagram (#324)
Hardoh Apr 12, 2020
0723229
temp
BransonNg Apr 12, 2020
e645e2a
handle multiple test cases
BransonNg Apr 12, 2020
c22066a
fix test case
BransonNg Apr 12, 2020
7c54339
Updates Hardoh's PPP (#326)
Hardoh Apr 12, 2020
c707adb
remove ws
BransonNg Apr 12, 2020
24109a3
works
BransonNg Apr 12, 2020
c0e0a46
Update Permas PPP (#327)
Permas-Teo Apr 12, 2020
d930dad
format
BransonNg Apr 13, 2020
2d96f3e
update editcommandParser
BransonNg Apr 13, 2020
3a462ec
update
BransonNg Apr 13, 2020
72f8aed
Updated diagram and wording
artlee06 Apr 13, 2020
d158892
update diagrams
BransonNg Apr 13, 2020
cc1911a
add new find and tag commands
BransonNg Apr 13, 2020
da455e4
add tag and find enhancement
BransonNg Apr 13, 2020
6a063cd
update
BransonNg Apr 13, 2020
76f1feb
handle coveralls
BransonNg Apr 13, 2020
37c94a7
Merge branch 'dev' of https://github.com/AY1920S2-CS2103T-W16-1/main …
BransonNg Apr 13, 2020
bcd27a1
update coveralls
BransonNg Apr 13, 2020
a82c171
Merge branch 'master' into branson/UG-DG
BransonNg Apr 13, 2020
7812443
update UG
BransonNg Apr 13, 2020
670fe49
update coveralls
BransonNg Apr 13, 2020
67aec64
update coveralls
BransonNg Apr 13, 2020
9efac87
update devops
BransonNg Apr 13, 2020
570fa6a
Removed trailing whitespaces
artlee06 Apr 13, 2020
1f3f40d
Merge branch 'master' into arthur/UG
artlee06 Apr 13, 2020
cbb29c5
Updated with callouts and more success pictures
artlee06 Apr 13, 2020
4738a95
update DG
BransonNg Apr 13, 2020
87aa9c6
update to PPP
BransonNg Apr 13, 2020
b77dd43
cleanup
BransonNg Apr 13, 2020
7e0e592
Updated PPP and userguide tags
artlee06 Apr 13, 2020
169b369
Updated tags
artlee06 Apr 13, 2020
4739aa7
Updated tags for DG
artlee06 Apr 13, 2020
9bf229b
rename
BransonNg Apr 13, 2020
377aec6
Minor styling and typography
artlee06 Apr 13, 2020
32643e2
new tests
BransonNg Apr 13, 2020
7a9bd23
Fixed bug for extra reminders triggered
artlee06 Apr 13, 2020
9b8b258
Clean up print statement and added javadoc
artlee06 Apr 13, 2020
e8258a1
Permas/refactor (#331)
Permas-Teo Apr 13, 2020
bc3f301
add find command tests
BransonNg Apr 13, 2020
85cf261
comments
BransonNg Apr 13, 2020
1efed4e
format code
BransonNg Apr 13, 2020
9628af2
remove whitespaces
BransonNg Apr 13, 2020
72efdc0
branson/UG-DG (#308)
BransonNg Apr 13, 2020
87ca853
Added more comments
artlee06 Apr 13, 2020
004addd
update UG, DG (#328)
Permas-Teo Apr 13, 2020
e1353b2
Added Quickstart graphic
artlee06 Apr 13, 2020
502160c
Changed title for DG
artlee06 Apr 13, 2020
921f9e8
Changed title, previous was merge
artlee06 Apr 13, 2020
0934e72
clean up
BransonNg Apr 13, 2020
b6a0c71
Merge branch 'master' into arthur/UG
artlee06 Apr 13, 2020
7280c86
Removed some trailing whitespaces
artlee06 Apr 13, 2020
7e7b508
Merge pull request #332 from AY1920S2-CS2103T-W16-1/bug/318-extraremi…
artlee06 Apr 13, 2020
5183d8a
Merge pull request #330 from AY1920S2-CS2103T-W16-1/ug/style
artlee06 Apr 13, 2020
80261fe
Merge pull request #298 from AY1920S2-CS2103T-W16-1/dg/arthur
artlee06 Apr 13, 2020
ea49e9e
Removed whitespaces
artlee06 Apr 13, 2020
7961bc7
update diagram
BransonNg Apr 13, 2020
fdfb064
Merge branch 'dev' into branson/dryrun
BransonNg Apr 13, 2020
06de5b4
Merge pull request #329 from AY1920S2-CS2103T-W16-1/arthur/UG
artlee06 Apr 13, 2020
5ee5431
Merge pull request #325 from AY1920S2-CS2103T-W16-1:branson/dryrun
BransonNg Apr 13, 2020
25fa3dc
Merge branch 'dev' into documentation-arthur
artlee06 Apr 13, 2020
cf66a67
Merge branch 'dev' into documentation-arthur
artlee06 Apr 13, 2020
321e292
Updated parse methods for recurring
artlee06 Apr 13, 2020
f71aebe
Ran gradle format
artlee06 Apr 13, 2020
f580fd4
Merge pull request #305 from AY1920S2-CS2103T-W16-1/documentation-arthur
artlee06 Apr 13, 2020
21acb25
update new
BransonNg Apr 13, 2020
fe780a7
Added new line for add and edit
artlee06 Apr 13, 2020
0c1bce9
Extra tasklist section (#336)
artlee06 Apr 13, 2020
820858b
update DG
FyonnOh Apr 13, 2020
8d1f06f
temp
BransonNg Apr 13, 2020
8ec2be7
Merge branch 'master' into dev
BransonNg Apr 13, 2020
0452bcd
Merge branch 'master' into branson/UG-DG
BransonNg Apr 13, 2020
53989db
update pics
BransonNg Apr 13, 2020
0cd278f
update result display
BransonNg Apr 13, 2020
af3142d
update feedback display
BransonNg Apr 13, 2020
725b5ba
update to pass travis
BransonNg Apr 13, 2020
b0a4645
add Setttings Diagrams
FyonnOh Apr 13, 2020
960a580
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/ma…
FyonnOh Apr 13, 2020
308d46a
update
BransonNg Apr 13, 2020
49e7f8d
add EOF
BransonNg Apr 13, 2020
e43948c
update
BransonNg Apr 13, 2020
3337b1e
Merge branch 'master' into branson/UG-DG
BransonNg Apr 13, 2020
8436133
fix test case
BransonNg Apr 13, 2020
e4d4b4e
Adds content for edit tasklist
artlee06 Apr 13, 2020
64c1f86
Merge branch 'master' into dg/arthur-edit-tasklist
artlee06 Apr 13, 2020
c2a3575
update Set commands portion of DG
FyonnOh Apr 13, 2020
057d8db
update DG
FyonnOh Apr 13, 2020
f88bd06
update diagrams
BransonNg Apr 13, 2020
8722839
done
BransonNg Apr 13, 2020
7f0961f
Edited DG changes for PPP and replaced screenshots
artlee06 Apr 13, 2020
4418574
Removed EOF
artlee06 Apr 13, 2020
4e5e97d
Merge pull request #338 from AY1920S2-CS2103T-W16-1/dg/arthur-edit-ta…
artlee06 Apr 13, 2020
0859ca5
update EOF
BransonNg Apr 13, 2020
9afaf68
update diagram
BransonNg Apr 13, 2020
0979c9a
Moved Task class diagram upwards
artlee06 Apr 13, 2020
2c025e2
update
BransonNg Apr 13, 2020
a8437aa
update UserGuide (#340)
Permas-Teo Apr 13, 2020
742b19c
Links the portfolios correctly.
Hardoh Apr 13, 2020
03d8e0e
update
BransonNg Apr 13, 2020
d62a757
Merge branch 'master' into branson/UG-DG
BransonNg Apr 13, 2020
3b2c3b1
Merge pull request #339 from AY1920S2-CS2103T-W16-1:branson/UG-DG
BransonNg Apr 13, 2020
0e9e8bd
update DeveloperGuide (#335)
Permas-Teo Apr 13, 2020
294ce49
update DG reference and missing files
BransonNg Apr 13, 2020
d5fbb88
update ppp
BransonNg Apr 13, 2020
0a3ad64
resolving travis error
FyonnOh Apr 13, 2020
485bd98
Updated tags for DG and UG
artlee06 Apr 13, 2020
c7d4aa5
Merge pull request #337 from AY1920S2-CS2103T-W16-1/Fyonn/newDG
artlee06 Apr 13, 2020
c577136
Update permas-teo.adoc (#341)
Permas-Teo Apr 13, 2020
7a6105a
Added artlee06 profile image
artlee06 Apr 13, 2020
a5f4a61
Updates pomodoro manual testing.
Hardoh Apr 13, 2020
ed9d646
add manual testing
BransonNg Apr 13, 2020
1bcdf06
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
BransonNg Apr 13, 2020
03aae75
add manual testing (#342)
Permas-Teo Apr 13, 2020
e8b20cb
fix link issue
BransonNg Apr 13, 2020
28d2816
Ug/fyonn (#334)
FyonnOh Apr 13, 2020
878ecf8
fix display
BransonNg Apr 13, 2020
8258a7d
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
BransonNg Apr 13, 2020
8df6eab
Update UserGuide.adoc
Permas-Teo Apr 13, 2020
da33a5c
Update UserGuide.adoc
Permas-Teo Apr 13, 2020
28235c1
Update ppp
FyonnOh Apr 13, 2020
d899fac
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
FyonnOh Apr 13, 2020
7733a90
Update UserGuide.adoc
Permas-Teo Apr 13, 2020
756cf7b
handle switch cases
BransonNg Apr 13, 2020
fb2dddc
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
BransonNg Apr 13, 2020
c576f5a
Added test hack for recurtype
artlee06 Apr 13, 2020
95e4475
update puml
BransonNg Apr 13, 2020
a1afead
Merge pull request #343 from AY1920S2-CS2103T-W16-1/fix/testability
artlee06 Apr 13, 2020
d70d56e
Update PPP
FyonnOh Apr 13, 2020
4544e08
Update UserGuide.adoc
Permas-Teo Apr 13, 2020
159cd85
update tag
BransonNg Apr 13, 2020
5b965ee
Update permas-teo.adoc
Permas-Teo Apr 13, 2020
aa631af
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
BransonNg Apr 13, 2020
99cba00
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
BransonNg Apr 13, 2020
bddbae9
remove coverage badge
BransonNg Apr 13, 2020
035298d
Fyonn DG
FyonnOh Apr 13, 2020
b9b5b2f
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
FyonnOh Apr 13, 2020
8349fb6
done with updating end of PPP
BransonNg Apr 13, 2020
d8fef66
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
BransonNg Apr 13, 2020
41f824a
Update DeveloperGuide.adoc
Permas-Teo Apr 13, 2020
6a5cf38
display Ui
BransonNg Apr 13, 2020
b2ee598
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
BransonNg Apr 13, 2020
1c5f18c
Update DeveloperGuide.adoc
Permas-Teo Apr 13, 2020
4850454
Merge branch 'master' of https://github.com/AY1920S2-CS2103T-W16-1/main
BransonNg Apr 13, 2020
5b75a88
Final Fix (#346)
BransonNg Apr 15, 2020
117cc41
Changed fonts to suit coverpage
artlee06 Apr 16, 2020
c394174
Merge pull request #347 from AY1920S2-CS2103T-W16-1/feature/finalCSSc…
artlee06 Apr 16, 2020
0363578
Ensured that headers are sofiapro as well
artlee06 Apr 16, 2020
9a852d6
Finalized UG for 2101
artlee06 Apr 16, 2020
76a846b
Removed trailing white spaces
artlee06 Apr 16, 2020
7fbd263
Merge pull request #348 from AY1920S2-CS2103T-W16-1/UG-final-changes
artlee06 Apr 16, 2020
b6c1d31
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
9676c8c
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
361c451
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
c876919
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
c70c68b
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
a194e73
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
f83f66d
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
066df29
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
c9401b5
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
0e11d1f
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
6266349
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
ca4a5da
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
3313144
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
c320ae1
Update UserGuide.adoc
Permas-Teo Apr 17, 2020
0ed45a9
Merge pull request #349 from AY1920S2-CS2103T-W16-1/2101
artlee06 Apr 17, 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
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin/main" path="src/main/java">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/main" path="src/main/resources">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/java">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/resources">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
2 changes: 2 additions & 0 deletions .coveralls.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
service_name: travis-pro
repo_token: SCvBddjwp28IJDn529jfjrWwYb9AyJOjp
6 changes: 6 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,9 @@ src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store

/bin/

/.vscode
.classpath
.project
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>main</name>
<comment>Project main created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
13 changes: 13 additions & 0 deletions .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
arguments=
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
java.home=C\:/Program Files/Java/jdk-11.0.2
jvm.arguments=
offline.mode=false
override.workspace.settings=true
show.console.view=true
show.executions.view=true
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ matrix:

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

deploy:
skip_cleanup: true
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
gem 'coveralls', require: false
20 changes: 5 additions & 15 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,36 +1,26 @@
= Address Book (Level 3)
= BB Productive
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://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://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]]
https://travis-ci.org/AY1920S2-CS2103T-W16-1/main[image:https://api.travis-ci.org/AY1920S2-CS2103T-W16-1/main.svg?branch=master[Build Status]]


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

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.
* This is a desktop Task manager application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java application to help anyone manage their tasks and time with Pomodoro techniques.
* 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.

== 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_.
* This project was built upon AddressBook-Level3 project created by SE-EDU initiative at https://se-education.org/[this site].
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]

== Licence : link:LICENSE[MIT]
25 changes: 22 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ 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 'com.github.sherter.google-java-format' version '0.8'
id 'application'
}

Expand All @@ -37,6 +38,21 @@ jacocoTestReport {
}
}

googleJavaFormat {
source 'src/main'
source 'src/test'
include '**/*.java'
options style: 'AOSP'
}

import com.github.sherter.googlejavaformatgradleplugin.GoogleJavaFormat

task format(type: GoogleJavaFormat) {
source 'src/main'
source 'src/test'
include '**/*.java'
}

test {
useJUnitPlatform()
}
Expand All @@ -57,6 +73,9 @@ dependencies {
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'linux'

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'
Expand All @@ -67,7 +86,7 @@ dependencies {
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -133,8 +152,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': 'BB Productive',
'site-githuburl': 'https://github.com/AY1920S2-CS2103T-W16-1/main',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

Expand Down
48 changes: 22 additions & 26 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,49 @@
: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.}_ +
BB Productive was developed by the https://ay1920s2-cs2103t-w16-1.github.io/main/team/hardoh.html[W-16-1] team. +
_{The project is a task manager which incorporates Pomodor techniques to help our users manage their tasks better. We also have statistics provided and a pet to keep reward you for completing tasks.}_ +
{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>>]
=== Hardy Shein
image::hardoh.png[width="150", align="left"]
{empty}[https://github.com/hardoh[github]] [<<hardoh#, portfolio>>]

Role: Project Advisor
Role: Team Lead

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Documentation, Code Quality

'''

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

Role: Developer +
Responsibilities: Data
Role: Deliverables, Testing

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Ui/Design, Scheduling and tracking

'''

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

Role: Developer +
Responsibilities: UI
Role: Git expert, Integration

'''
7 changes: 4 additions & 3 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-level3/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`

* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103T-W16-1/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Email us* : You can also reach us at `[email protected]`

14 changes: 3 additions & 11 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -20,28 +20,20 @@ See <<UsingGradle#, UsingGradle.adoc>> to learn how to use Gradle for build auto

== Continuous Integration

We use https://travis-ci.org/[Travis CI] and https://www.appveyor.com/[AppVeyor] to perform _Continuous Integration_ on our projects. See <<UsingTravis#, UsingTravis.adoc>> and <<UsingAppVeyor#, UsingAppVeyor.adoc>> for more details.

== Coverage Reporting

We use https://coveralls.io/[Coveralls] to track the code coverage of our projects. See <<UsingCoveralls#, UsingCoveralls.adoc>> for more details.

== Documentation Previews

When a pull request has changes to asciidoc files, you can use https://www.netlify.com/[Netlify] to see a preview of how the HTML version of those asciidoc files will look like when the pull request is merged. See <<UsingNetlify#, UsingNetlify.adoc>> for more details.
We use https://travis-ci.org/[Travis CI] to perform _Continuous Integration_ on our projects. See <<UsingTravis#, UsingTravis.adoc>> for more details.

== Making a Release

Here are the steps to create a new release.

. Update the version number in link:{repoURL}/src/main/java/seedu/address/MainApp.java[`MainApp.java`].
. Generate a JAR file <<UsingGradle#creating-the-jar-file, using Gradle>>.
. Tag the repo with the version number. e.g. `v0.1`
. Tag the repo with the version number. e.g. `v1.4`
. https://help.github.com/articles/creating-releases/[Create a new release using GitHub] and upload the JAR file you created.

== Managing Dependencies

A project often depends on third-party libraries. For example, Address Book depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:
A project often depends on third-party libraries. For example, BB Productive depends on the https://github.com/FasterXML/jackson[Jackson library] for JSON parsing. Managing these _dependencies_ can be automated using Gradle. For example, Gradle can download the dependencies automatically, which is better than these alternatives:

[loweralpha]
. Include those libraries in the repo (this bloats the repo size)
Expand Down
Loading