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-F13-4] Ezwatchlist #202

Open
wants to merge 897 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
897 commits
Select commit Hold shift + click to select a range
308e407
Display error message when user tries to execute watch, edit or delet…
jcjjjared Nov 8, 2019
50abc20
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 8, 2019
68c60f9
Fixed checkstyle
jcjjjared Nov 8, 2019
f179ae5
Edited tests
wongchuankai Nov 8, 2019
ad32109
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 8, 2019
69bae31
Merge pull request #235 from wongchuankai/editedbugs
wongchuankai Nov 8, 2019
9245498
Update UserGuide.adoc
heze8 Nov 8, 2019
34c412c
Update UserGuide.adoc
heze8 Nov 8, 2019
674e0bf
Added user guide.
heze8 Nov 9, 2019
ddf7d73
Update search
michelleykw Nov 9, 2019
2b42930
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
michelleykw Nov 9, 2019
7467eb9
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 9, 2019
810af1c
Fix watch command usage message spacing
jcjjjared Nov 9, 2019
8b6a581
Added database
michelleykw Nov 9, 2019
9b7d426
Added PPP
michelleykw Nov 9, 2019
6352b3c
Added WatchListParser parseCommand_watch() test
jcjjjared Nov 9, 2019
bcf348f
no message
heze8 Nov 9, 2019
434dffc
Added some tests
jcjjjared Nov 9, 2019
5a0e2af
Merge pull request #236 from heze8/branch-caleb-master
heze8 Nov 9, 2019
f612e5a
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 9, 2019
1a1635f
Merge pull request #231 from jcjjjared/master
jcjjjared Nov 9, 2019
22f3b75
Added more WatchCommand tests
jcjjjared Nov 9, 2019
08eeb55
Merge pull request #237 from jcjjjared/master
jcjjjared Nov 9, 2019
ca16b2d
added more test coverage
wongchuankai Nov 9, 2019
e6133da
Merge branch 'master' into testcoverage
wongchuankai Nov 9, 2019
be40084
Update TvShowTest.java
wongchuankai Nov 9, 2019
0ef19c8
Update IsWatchedTest.java
wongchuankai Nov 9, 2019
d5cf243
Update TvShowTest.java
wongchuankai Nov 9, 2019
9c9b3b0
Update TvShowTest.java
wongchuankai Nov 9, 2019
d089fe1
Update IsWatchedTest.java
wongchuankai Nov 9, 2019
20a69c4
Merge pull request #238 from wongchuankai/testcoverage
wongchuankai Nov 9, 2019
2128e32
merged conflicts
wongchuankai Nov 9, 2019
584fc3d
Merge pull request #239 from wongchuankai/testcoverage
wongchuankai Nov 9, 2019
464db42
Fixed WatchCommand test failure
jcjjjared Nov 10, 2019
2b24d4e
Merge pull request #240 from jcjjjared/master
jcjjjared Nov 10, 2019
554a31b
Edited WatchCommand docs
jcjjjared Nov 10, 2019
eda4b9f
Merge pull request #241 from jcjjjared/master
jcjjjared Nov 10, 2019
e005ff8
Merge branch
michelleykw Nov 10, 2019
9a3b3fe
Update user guide on search command parser feature
michelleykw Nov 10, 2019
7a2539e
Update UG
michelleykw Nov 10, 2019
53190cd
added test coverage
wongchuankai Nov 10, 2019
e30e0ee
Update UiPartTest.java
wongchuankai Nov 10, 2019
869a61d
Merge pull request #242 from wongchuankai/testcoverage
wongchuankai Nov 10, 2019
5da6968
a
wongchuankai Nov 10, 2019
10c7345
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 10, 2019
01da990
Edit search and ug
michelleykw Nov 10, 2019
6c9a992
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
michelleykw Nov 10, 2019
f8a1b11
edited sync command
wongchuankai Nov 10, 2019
5535d24
edited sync command
wongchuankai Nov 10, 2019
97d0ef8
tests
wongchuankai Nov 10, 2019
3950379
Merge pull request #243 from wongchuankai/testcoverage
wongchuankai Nov 10, 2019
62508d1
user guide sync command update addcommand
wongchuankai Nov 10, 2019
400f958
edited ug dg
wongchuankai Nov 10, 2019
a092f8c
update search command parser test
michelleykw Nov 10, 2019
f351fb2
test
wongchuankai Nov 10, 2019
72745f8
Merge pull request #244 from wongchuankai/testcoverage
wongchuankai Nov 10, 2019
3c318c9
Updated user guide and developer guide
jcjjjared Nov 10, 2019
1eec57e
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 10, 2019
f23f8b6
Ensure 'database' works
michelleykw Nov 10, 2019
5dc0eeb
Fixed the problem that statistics does not work when there is no entr…
tswuxia Nov 10, 2019
f113583
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
tswuxia Nov 10, 2019
e4ca5c7
update search command test
michelleykw Nov 10, 2019
524e7f9
Merge pull request #245 from tswuxia/branch-v1.2
tswuxia Nov 10, 2019
68ae809
Merge branch
michelleykw Nov 10, 2019
af10f20
Fixed travis error
michelleykw Nov 10, 2019
00e30cc
Fixed checkstyle
michelleykw Nov 10, 2019
ba1e89c
Corrected checkstyle error
michelleykw Nov 10, 2019
b71981e
update search command test
michelleykw Nov 10, 2019
75584aa
update test
michelleykw Nov 10, 2019
5692225
Updated UG, DG, PPP
jcjjjared Nov 10, 2019
cde0f08
update test
michelleykw Nov 10, 2019
437050a
corrected checkstyle
michelleykw Nov 10, 2019
151fecd
Merge pull request #247 from jcjjjared/master
jcjjjared Nov 10, 2019
c47a4e7
Updated PPP
jcjjjared Nov 10, 2019
1c7cfd8
update test
michelleykw Nov 10, 2019
6f10a16
corrected checkstyle error
michelleykw Nov 10, 2019
3515d88
test
michelleykw Nov 10, 2019
b20949e
update test
michelleykw Nov 10, 2019
1efc7c3
Updated WatchActivityDiagram
jcjjjared Nov 10, 2019
662ba1d
update
michelleykw Nov 10, 2019
7572de3
test
michelleykw Nov 10, 2019
f39a040
test
michelleykw Nov 10, 2019
be570dc
test
michelleykw Nov 10, 2019
0105855
test
michelleykw Nov 10, 2019
57eceea
test
michelleykw Nov 10, 2019
65bd6e5
update test
michelleykw Nov 10, 2019
ec575f6
Refactored dev guide
jcjjjared Nov 10, 2019
05aa690
Merge pull request #248 from jcjjjared/master
jcjjjared Nov 10, 2019
82cc9c6
Updated PPP
jcjjjared Nov 10, 2019
cfe3402
update test
michelleykw Nov 10, 2019
2e1f8ac
Merge pull request #249 from jcjjjared/master
jcjjjared Nov 10, 2019
8df08da
update test
michelleykw Nov 10, 2019
06352ba
update test
michelleykw Nov 10, 2019
9532f2c
Merge pull request #246 from michelleykw/master
michelleykw Nov 10, 2019
922a9ff
update ug
michelleykw Nov 10, 2019
c8b146d
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
michelleykw Nov 10, 2019
dac259b
added ppp
wongchuankai Nov 10, 2019
aeac913
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 10, 2019
145c6ee
Updated pdf
jcjjjared Nov 10, 2019
868c679
Merge pull request #251 from michelleykw/master
michelleykw Nov 10, 2019
37f8dd7
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 10, 2019
42d77fe
Merge pull request #252 from wongchuankai/testcoverage
wongchuankai Nov 10, 2019
e6a7255
Update UG
michelleykw Nov 10, 2019
3f7a548
Update search command to primarily search from online unless specified
michelleykw Nov 10, 2019
2ccdcba
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 10, 2019
11482a4
Merge pull request #254 from wongchuankai/testcoverage
wongchuankai Nov 10, 2019
6e78299
Update UG
michelleykw Nov 10, 2019
9a0c338
Corrected checkstyle error
michelleykw Nov 10, 2019
e4be492
Merge pull request #253 from michelleykw/master
michelleykw Nov 10, 2019
e4941df
Update UG and loading panel text
michelleykw Nov 10, 2019
ccf4878
UG
michelleykw Nov 10, 2019
a8628f8
UG
michelleykw Nov 10, 2019
a359e19
UG
michelleykw Nov 10, 2019
04f8506
UG
michelleykw Nov 10, 2019
9a786cc
UG whitespace
michelleykw Nov 10, 2019
082477e
UG
michelleykw Nov 10, 2019
f5c3abf
UG images
michelleykw Nov 10, 2019
6dc6531
Update UG
michelleykw Nov 10, 2019
02e9cf4
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
michelleykw Nov 10, 2019
463246d
Merge pull request #255 from michelleykw/master
michelleykw Nov 10, 2019
3590127
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
d03a84d
Update wongchuankai.adoc
wongchuankai Nov 11, 2019
51d39ca
Update wongchuankai.adoc
wongchuankai Nov 11, 2019
ee9f547
Updated UG command summary
jcjjjared Nov 11, 2019
8449c5f
Updated AboutUs PPP links
jcjjjared Nov 11, 2019
67dde81
Fixed the problem that statistics does not work when there is few ent…
tswuxia Nov 11, 2019
0f3e74f
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
2efa465
Merge pull request #257 from tswuxia/branch-v1.2
tswuxia Nov 11, 2019
ebb9bb9
Merge pull request #256 from jcjjjared/master
jcjjjared Nov 11, 2019
9f6d302
PPP
wongchuankai Nov 11, 2019
8366b91
Merge pull request #258 from wongchuankai/testcoverage
wongchuankai Nov 11, 2019
82e444d
User Guide
heze8 Nov 11, 2019
55d77a9
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
dc964ab
PPP developer GUide
heze8 Nov 11, 2019
2d8d4a7
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
heze8 Nov 11, 2019
0a21843
Fixed apiutil
heze8 Nov 11, 2019
de25810
test
heze8 Nov 11, 2019
7a43289
test fixed
heze8 Nov 11, 2019
7a1102c
Merge pull request #259 from heze8/branch-caleb-master
heze8 Nov 11, 2019
b4dd627
Updated PPP to include table
jcjjjared Nov 11, 2019
3a24db0
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
7436fa1
ppp
heze8 Nov 11, 2019
3a05e2b
Update AboutUs.adoc
heze8 Nov 11, 2019
ae4473b
Updated PPP
jcjjjared Nov 11, 2019
99209a7
Merge pull request #260 from jcjjjared/master
jcjjjared Nov 11, 2019
c657c4f
no message
heze8 Nov 11, 2019
87b619f
Reduced pages of my ppp
heze8 Nov 11, 2019
0a8d763
no message
heze8 Nov 11, 2019
f7d523c
Merge pull request #261 from heze8/branch-caleb-master
heze8 Nov 11, 2019
2dc617c
no message
heze8 Nov 11, 2019
50c100b
no message
heze8 Nov 11, 2019
a3244bb
a
wongchuankai Nov 11, 2019
3738003
Merge pull request #262 from heze8/branch-caleb-master
heze8 Nov 11, 2019
95e56b8
Deleted appendix
heze8 Nov 11, 2019
5393435
DG
heze8 Nov 11, 2019
d665755
Mostly finished UGDGPPP but haven't changed the sequence diagrams.
tswuxia Nov 11, 2019
f7aa0d0
Merge pull request #263 from heze8/branch-caleb-master
heze8 Nov 11, 2019
de46ad8
Update AddCommand.java
wongchuankai Nov 11, 2019
d7e52b8
Update WatchListParser.java
wongchuankai Nov 11, 2019
cdc4270
a
wongchuankai Nov 11, 2019
4be53d3
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 11, 2019
849cbad
ppp
wongchuankai Nov 11, 2019
ac8a5ab
a
wongchuankai Nov 11, 2019
af1d0cb
Merge pull request #264 from wongchuankai/testcoverage
wongchuankai Nov 11, 2019
f14a17a
Updated About full names
jcjjjared Nov 11, 2019
d767192
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
bce4f27
Merge pull request #265 from jcjjjared/master
jcjjjared Nov 11, 2019
b90a67a
Fix view on github link
jcjjjared Nov 11, 2019
1eb52b7
Rename add2.png
jcjjjared Nov 11, 2019
7377dcf
Added offline images for the offline storage
heze8 Nov 11, 2019
5e5741f
Merge pull request #266 from jcjjjared/master
jcjjjared Nov 11, 2019
5d0f09f
Done with UGDG
tswuxia Nov 11, 2019
5f5baf8
Update UGDG
michelleykw Nov 11, 2019
12eac5e
Changed Search Activity Diagram
michelleykw Nov 11, 2019
53a2361
Updated UG watch command
jcjjjared Nov 11, 2019
71272eb
Update UG watch command
jcjjjared Nov 11, 2019
c02332e
Resolve merge conflict
tswuxia Nov 11, 2019
8589545
Merge pull request #269 from jcjjjared/master
jcjjjared Nov 11, 2019
66a2fcb
Update UG watch command figure number
jcjjjared Nov 11, 2019
00300ec
Merge pull request #270 from jcjjjared/master
jcjjjared Nov 11, 2019
5d0839c
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
tswuxia Nov 11, 2019
d0671a0
Merge pull request #267 from heze8/master
heze8 Nov 11, 2019
8321732
Fix sync link problem
jcjjjared Nov 11, 2019
58af598
Edited Search Command Parser
michelleykw Nov 11, 2019
4af8a0a
Merge pull request #271 from jcjjjared/master
jcjjjared Nov 11, 2019
0a91cf7
Update DG
michelleykw Nov 11, 2019
8cfac02
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
michelleykw Nov 11, 2019
4c5dc7d
Diagrams changed
tswuxia Nov 11, 2019
4eaef58
fix travis checkstyle
tswuxia Nov 11, 2019
787ce8c
Updated WatchActivityDiagram color
jcjjjared Nov 11, 2019
1e69bae
Edit DG
michelleykw Nov 11, 2019
a0198b6
Edit checkstyle
michelleykw Nov 11, 2019
3b66925
Merge pull request #273 from jcjjjared/master
jcjjjared Nov 11, 2019
9f9ba8d
Checkstyle
michelleykw Nov 11, 2019
7c1fefd
Merge pull request #272 from michelleykw/master
michelleykw Nov 11, 2019
d5a2976
Change colour
michelleykw Nov 11, 2019
c96fff2
colour
michelleykw Nov 11, 2019
9995d69
diagram
michelleykw Nov 11, 2019
a7abeaa
Fixed poster alignment problem
tswuxia Nov 11, 2019
a039e9a
Changed WatchActivityDiagram font
jcjjjared Nov 11, 2019
ff655cd
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
b2d4c6c
size
michelleykw Nov 11, 2019
aeae332
size
michelleykw Nov 11, 2019
0e38a6f
Merge pull request #275 from michelleykw/master
michelleykw Nov 11, 2019
6f82309
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
tswuxia Nov 11, 2019
d16846c
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
29a8844
Generated PPP pdf
tswuxia Nov 11, 2019
b9bc415
Merge pull request #268 from tswuxia/branch-v1.2
tswuxia Nov 11, 2019
cb2240b
Update UG
michelleykw Nov 11, 2019
39b0965
Merge pull request #276 from michelleykw/master
michelleykw Nov 11, 2019
1f780f6
Update ppp
michelleykw Nov 11, 2019
9a241a2
edited ppp udgb
wongchuankai Nov 11, 2019
148f763
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 11, 2019
4d4cbc0
Merge pull request #277 from michelleykw/master
michelleykw Nov 11, 2019
e4730b5
edited udgb
wongchuankai Nov 11, 2019
6a2097c
updated ppp ugdg
wongchuankai Nov 11, 2019
41349fd
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 11, 2019
0bbab6e
edited ppp
wongchuankai Nov 11, 2019
aceeffc
update user guide developer guide
wongchuankai Nov 11, 2019
2ad1a33
Merge pull request #279 from wongchuankai/testcoverage
wongchuankai Nov 11, 2019
4868712
Update PPP
michelleykw Nov 11, 2019
a8148f8
Edit UG
michelleykw Nov 11, 2019
84a1e5b
Merge pull request #280 from michelleykw/master
michelleykw Nov 11, 2019
dbd79a9
update PPP, UGDG
wongchuankai Nov 11, 2019
f97f1d3
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/ma…
wongchuankai Nov 11, 2019
53b9ba4
Added some manual testing cases
jcjjjared Nov 11, 2019
a4313dd
no message
jcjjjared Nov 11, 2019
7156281
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
ae24204
Merge pull request #281 from wongchuankai/testcoverage
wongchuankai Nov 11, 2019
146af1c
Merge pull request #282 from jcjjjared/master
jcjjjared Nov 11, 2019
543928c
Edited one line of code
jcjjjared Nov 11, 2019
e8c22f8
Revert "Update PPP"
jcjjjared Nov 11, 2019
7f2de65
Merge branch 'master' of https://github.com/AY1920S1-CS2103T-F13-4/main
jcjjjared Nov 11, 2019
c8ca4b1
Merge pull request #285 from AY1920S1-CS2103T-F13-4/revert-280-master
jcjjjared Nov 11, 2019
0b21ed2
Merge pull request #284 from jcjjjared/master
jcjjjared Nov 11, 2019
2633e7e
Revert "Revert "Update PPP""
jcjjjared Nov 11, 2019
41f3933
Merge pull request #286 from AY1920S1-CS2103T-F13-4/revert-285-revert…
jcjjjared Nov 11, 2019
8f20c64
Add files via upload
wongchuankai Nov 11, 2019
1d4f606
Update UserGuide.adoc
wongchuankai Nov 11, 2019
ed8a520
Delete Sync1.PNG
wongchuankai Nov 11, 2019
a88b446
Add files via upload
wongchuankai Nov 11, 2019
ccf56eb
Delete Sync2.PNG
wongchuankai Nov 11, 2019
502e495
Delete Sync3.PNG
wongchuankai Nov 11, 2019
dd91c2a
Delete Sync4.PNG
wongchuankai Nov 11, 2019
0befd65
Delete Sync5.PNG
wongchuankai Nov 11, 2019
42676d4
Delete Sync6.PNG
wongchuankai Nov 11, 2019
a3b9e12
Add files via upload
wongchuankai Nov 11, 2019
39c2dd4
Update UserGuide.adoc
wongchuankai Nov 11, 2019
d55e45d
Update michelleykw.adoc
michelleykw Nov 12, 2019
0a06761
Update michelleykw.adoc
michelleykw Nov 12, 2019
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: 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

# Poster Storage
src/main/resources/images/posters/

# Ui Poster to prevent bugs
docs/images/Ui.png
61 changes: 41 additions & 20 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,36 +1,57 @@
= Address Book (Level 3)
= EzWatchList
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://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]
:imagesDir: /docs/images
https://travis-ci.org/AY1920S1-CS2103T-F13-4/main[image:https://travis-ci.org/AY1920S1-CS2103T-F13-4/main.svg?branch=master[Build Status]]
https://coveralls.io/github/AY1920S1-CS2103T-F13-4/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2103T-F13-4/main/badge.svg?branch=master[Coverage Status]]

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

ifndef::env-github[]
image::images/Ui.png[width="600"]
endif::[]
++++
</p>
<p align="center">
<img src="https://github.com/AY1920S1-CS2103T-F13-4/main/raw/master/docs/images/Ui.png" alt="Ui.png" width="900">
</p>

* 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.
++++

Tired of using multiple sources on the internet to keep track of all your movies and tv shows that you want to watch? EzWatchlist is a solution to your entertainment problems!

EzWatchlist is a desktop application for cinepliles to manage their favourite movies and tv series with a clean and intuitive interface.
It was built for users who enjoy using a Command Line Interface (CLI) while still having the benefits of a Graphical User Interface (GUI).

=== Features

Spending too much time looking for shows?

* Get recommendations for shows by using our https://ay1920s1-cs2103t-f13-4.github.io/main/UserGuide.html#movie-and-tv-show-recommendations[recommendations feature]

Forgetting the shows you want to watch?

* Keep track of shows with our inbuilt https://ay1920s1-cs2103t-f13-4.github.io/main/UserGuide.html#watchlist-page[watchlist.]

Curious about your watching habits?

* Check out our https://ay1920s1-cs2103t-f13-4.github.io/main/UserGuide.html#statistics-page[statistics page]

More features

* Integrated with an online database of shows, allowing you to search and get information about shows.
* Will work and function even without internet.
* No installation required.
* Auto-saves.

Excited to use it? Head straight to our <<UserGuide#, User Guide>> for a more detailed explanation of our application.

== 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_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
* An Adressbook project this application was built upon created by https://se-education.org[SE-EDU initiative]
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5], https://www.themoviedb.org/documentation/api[TMDB api], https://github.com/holgerbrandl/themoviedbapi[Java Wrapper of TMDB]

== Licence : link:LICENSE[MIT]
20 changes: 15 additions & 5 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,18 @@ plugins {
}

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

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

repositories {
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
maven {
url "https://jcenter.bintray.com"
}
jcenter()
}

checkstyle {
Expand Down Expand Up @@ -57,17 +61,24 @@ 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-swing', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-swing', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-swing', 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'

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion

testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion

compile group: 'info.movito', name: 'themoviedbapi', version:'1.10'
compile group: 'org.slf4j', name: 'slf4j-log4j12', version: '1.7.28'
compile group: 'ch.qos.logback', name:'logback-core', version: '1.0.9'
}

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

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -133,9 +144,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-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
'site-name': 'EzWatchlist',
'site-githuburl': 'https://github.com/AY1920S1-CS2103T-F13-4/main',
]

options['template_dirs'].each {
Expand Down
52 changes: 25 additions & 27 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,51 @@
: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} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
Ezwatchlist was developed by a group of students 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>>]
=== Caleb Goh Ee Gen
image::heze8.png[width="150", align="left"]
{empty} [https://github.com/heze8[github]] [<<heze8#, portfolio>>]

Role: Project Advisor
Role: Team Lead +
Responsibilities: Online database API, Recommendations, Image Retrieval

'''

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

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

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Chiang Jiajun Jared
image::jcjjjared.png[width="150", align="left"]
{empty}[http://github.com/jcjjjared[github]] [<<jcjjjared#, portfolio>>]

Role: Developer +
Responsibilities: Data
Role: Integration +
Responsibilities: Main Logic

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Testing +
Responsibilities: Component Logic

'''

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

Role: Developer +
Responsibilities: UI
Role: Documentation +
Responsibilities: Search and Tag Logic

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

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S1-CS2103T-F13-4/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
* *Email us* : You can also reach us at `ezwatchlist [at] gmail.com`
8 changes: 4 additions & 4 deletions docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= EzWatchlist - 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/AY1920S1-CS2103T-F13-4/main/tree/master

== Build Automation

Expand All @@ -34,14 +34,14 @@ When a pull request has changes to asciidoc files, you can use https://www.netli

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`].
. Update the version number in link:{repoURL}/src/main/java/seedu/ezwatchlist/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`
. 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, EzWatchlist 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