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

[AY1920S1-CS2113T-W13-3] SGTravel #71

Open
wants to merge 801 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
801 commits
Select commit Hold shift + click to select a range
e565376
Remove unused import statements
Jefferson111 Nov 4, 2019
9fa1643
Add javadoc
Jefferson111 Nov 4, 2019
4a1fe83
Fix display wrong info to user bug
Jefferson111 Nov 4, 2019
45301f9
Command advertise exceptions
Jefferson111 Nov 4, 2019
aeb30d5
Add javadoc
Jefferson111 Nov 4, 2019
332d26c
Add java docs
Jefferson111 Nov 4, 2019
4c2fce4
Fix ex
Jefferson111 Nov 4, 2019
9d44027
Fix exceptions thrown
Jefferson111 Nov 4, 2019
ba36bf2
Remove unsused imports
Jefferson111 Nov 4, 2019
ae526b9
Highlight exceptions
Jefferson111 Nov 4, 2019
1ad4a63
Fix exceptions thrown
Jefferson111 Nov 4, 2019
c397ada
Remove unused imports
Jefferson111 Nov 4, 2019
6d23956
Remove unused imports
Jefferson111 Nov 4, 2019
f388467
Cleanup commons package
Jefferson111 Nov 4, 2019
d92d98c
Fix recommendation day too long bug
Jefferson111 Nov 4, 2019
27892d3
Remove observableLists
Jefferson111 Nov 4, 2019
5d1c3ed
Update UserGuide.adoc
Jefferson111 Nov 4, 2019
4878d6f
Fix checkstyle
Jefferson111 Nov 4, 2019
9234cdd
Update stub to not write
Jefferson111 Nov 4, 2019
2315872
Fixed profile bug and create test
hongchuan97 Nov 5, 2019
7821ebf
Fixed profile bug
hongchuan97 Nov 5, 2019
1531603
ModelStub does not save
Jefferson111 Nov 5, 2019
b38278b
Update storageStub
Jefferson111 Nov 5, 2019
11db849
Merge remote-tracking branch 'upstream/master'
hongchuan97 Nov 5, 2019
9b0b037
Merge pull request #184 from AY1920S1-CS2113T-W13-3/bugFix2
Jefferson111 Nov 5, 2019
883a4b9
resolve merge confilct
hongchuan97 Nov 5, 2019
776f042
fixed codacy
hongchuan97 Nov 5, 2019
db22882
Merge pull request #185 from hongchuan97/master
hongchuan97 Nov 5, 2019
340f3bc
Delete itineraries.txt
Jefferson111 Nov 5, 2019
ecf0364
Delete unused request
Jefferson111 Nov 5, 2019
150a53d
Fix display bug
Jefferson111 Nov 5, 2019
4c2a80c
Fix Event allowed to have same Venue bug
Jefferson111 Nov 5, 2019
8ada53f
remove static
Jefferson111 Nov 5, 2019
46643ab
Fix bug to check whether date is logical
Jefferson111 Nov 5, 2019
f5d3671
remove unused imports
Jefferson111 Nov 5, 2019
7e26df2
Change bug fix to parser class instead of command class
Jefferson111 Nov 5, 2019
2d5259a
Add missing 's'
Jefferson111 Nov 5, 2019
430177e
Interface of logic
Jefferson111 Nov 5, 2019
6be3bad
Add help command
Jefferson111 Nov 5, 2019
ef3b552
Remove unused imports
Jefferson111 Nov 5, 2019
912f3e2
fix checkstyle
Jefferson111 Nov 5, 2019
967c7c1
Now u can rename ur recommendations list before adding
Sukrut1881 Nov 5, 2019
69212ce
Merge pull request #187 from Sukrut1881/SukrutMinorChanges
Sukrut1881 Nov 5, 2019
bc388aa
Fix test
Jefferson111 Nov 5, 2019
cd875d5
Fix imports
Jefferson111 Nov 5, 2019
4a7674c
add ApiParser and ApiConstraintParser tests
Inno97 Nov 5, 2019
cf83d8c
Merge branch 'master' into master
Inno97 Nov 5, 2019
17263ff
fix merge errors and cleanup
Inno97 Nov 5, 2019
5ac4dd0
backup search requests
Jefferson111 Nov 5, 2019
b6cfda5
Fix test
Jefferson111 Nov 5, 2019
8485b5d
Merge branch 'bugFix3'
Jefferson111 Nov 5, 2019
6191a2f
fix travis and codacy
Inno97 Nov 5, 2019
2d949e1
Merge branch 'master' into master
Inno97 Nov 5, 2019
8a1e1b1
fix travis
Inno97 Nov 5, 2019
bf22325
Merge branch 'master' of https://github.com/Inno97/main
Inno97 Nov 5, 2019
dfc2317
Update UserGuide.adoc
Jefferson111 Nov 5, 2019
d8b4741
Merge pull request #188 from Inno97/master
Inno97 Nov 5, 2019
3f00c5e
Fix calendar bug
Jefferson111 Nov 5, 2019
efc51b4
Fixed extra space at end of addThisList name
Sukrut1881 Nov 5, 2019
d850d22
Merge pull request #189 from Sukrut1881/master
Sukrut1881 Nov 5, 2019
e3afead
refactor RouteNodeShowCommand methods to ApiParser and finish tests f…
Inno97 Nov 5, 2019
31adaeb
fix travis and codacy
Inno97 Nov 5, 2019
6380df2
fix travis
Inno97 Nov 5, 2019
4b67dbf
Merge pull request #190 from Inno97/master
Inno97 Nov 5, 2019
df973c9
Fix venue bug
Jefferson111 Nov 6, 2019
f909c68
Provide sample data for new user
Jefferson111 Nov 6, 2019
2e81df6
Allow tests to pass
Jefferson111 Nov 6, 2019
2270043
Merge pull request #192 from AY1920S1-CS2113T-W13-3/sampleData
Jefferson111 Nov 6, 2019
fdf9bdb
Fix travis
Jefferson111 Nov 6, 2019
7ef0f00
Add more pleasant dates
Jefferson111 Nov 6, 2019
0aa860a
Rename duke to sgtravel package
Jefferson111 Nov 6, 2019
34a18e9
Add image into edit section
Jefferson111 Nov 6, 2019
0e16363
Merge pull request #193 from AY1920S1-CS2113T-W13-3/PleasantDates
Jefferson111 Nov 6, 2019
a0f1ae8
Update UserGuide.adoc
Inno97 Nov 6, 2019
720806c
Update UserGuide.adoc
Inno97 Nov 6, 2019
3d2e313
fix ApiParserTest
Inno97 Nov 6, 2019
5b94627
fix merge conflict
Inno97 Nov 6, 2019
c3e6ba7
cleanup Route commands and UI
Inno97 Nov 6, 2019
00179a8
cleanup Route model classes
Inno97 Nov 6, 2019
c83b3f7
fix RouteGenerateCommand giving NullPointerException when creating Tr…
Inno97 Nov 6, 2019
36c0a18
fix codacy
Inno97 Nov 6, 2019
29d670d
add creating of custom points in RouteNodeAddCommand
Inno97 Nov 7, 2019
1c9153c
Merge pull request #194 from Inno97/master
Inno97 Nov 7, 2019
9cd4c20
Update UserGuide.adoc
Jefferson111 Nov 7, 2019
065aad4
Update UG
Jefferson111 Nov 7, 2019
859e0c2
Add warning caption
Jefferson111 Nov 7, 2019
52d5294
Update UG
Jefferson111 Nov 7, 2019
52b3bf0
Update UserGuide.adoc
Sukrut1881 Nov 7, 2019
d0e246e
No more agenda List
Sukrut1881 Nov 7, 2019
2eb1755
Deleted AgendaList
Sukrut1881 Nov 7, 2019
b474a61
Implemented the Delete command
Sukrut1881 Nov 7, 2019
8416b55
Fixed Delte command bug
Sukrut1881 Nov 7, 2019
3318a20
cleanup
Inno97 Nov 7, 2019
2d24b05
cleanup Conversation classes
Inno97 Nov 7, 2019
009dd9b
fix codestyle and codacy
Inno97 Nov 7, 2019
a017b97
Merge pull request #195 from Inno97/master
Inno97 Nov 7, 2019
d09d19d
Deleted obsolete hotelLocation from Itinerary
Sukrut1881 Nov 7, 2019
ad66c4c
Refactored Storage
Sukrut1881 Nov 7, 2019
bac4a9c
Refactor storage fix
Sukrut1881 Nov 7, 2019
ece60ca
Checkstyle fixes
Sukrut1881 Nov 7, 2019
fe22307
Merge Conflict Fix
Sukrut1881 Nov 7, 2019
a0adfaf
Fixed codacy
Sukrut1881 Nov 7, 2019
6a8d44e
Update UserGuide.adoc
Inno97 Nov 8, 2019
fad0b34
Add files via upload
Inno97 Nov 8, 2019
0bc7f43
Update UserGuide.adoc
Inno97 Nov 8, 2019
1f3b0aa
Update UserGuide.adoc
Inno97 Nov 8, 2019
6c637bb
Update UserGuide.adoc
Inno97 Nov 8, 2019
dea3518
Update UserGuide.adoc
Inno97 Nov 8, 2019
53d7c7d
Add fav list feature in profile
hongchuan97 Nov 8, 2019
434e02a
Added missing JavaDocs to Recommend, Itinerary, Agenda and DoneCommand
Sukrut1881 Nov 8, 2019
5b56a68
resolve confilct
hongchuan97 Nov 8, 2019
4407f13
Merge pull request #196 from Sukrut1881/SukrutEdit
Sukrut1881 Nov 8, 2019
bfa198d
Edited/Added JavaDoc for all my code
Sukrut1881 Nov 8, 2019
4dee67a
makeItinerary function is now in NewItineraryCommandParser
Sukrut1881 Nov 8, 2019
d67e437
Refactored checkValidDate and added 2 negative tests
Sukrut1881 Nov 8, 2019
6016353
Fixed issue of possible null string for addThisList newName
Sukrut1881 Nov 8, 2019
f0f9c93
Added exception header commands
Sukrut1881 Nov 8, 2019
95d8d7e
Resolve merge conflict
hongchuan97 Nov 8, 2019
bc8bfbc
Additional parser
hongchuan97 Nov 8, 2019
6d2c2ff
Fixed bug
hongchuan97 Nov 8, 2019
f165989
Fixed repeated days and venues from newItineraryCommand
Sukrut1881 Nov 8, 2019
da60fe7
Fixed listItinerary command
Sukrut1881 Nov 8, 2019
303ea8a
Fixed tests and added logger
Sukrut1881 Nov 8, 2019
5fcbbba
Fixed Checkstyle
Sukrut1881 Nov 8, 2019
e8c15b4
Fixed SundayVacay days in samples/itineraries.txt
Sukrut1881 Nov 8, 2019
184aa78
Minor Logger Change
Sukrut1881 Nov 8, 2019
7057ddb
Fixed Codacy
Sukrut1881 Nov 8, 2019
578be89
Delete itineraries.txt
Jefferson111 Nov 9, 2019
a7e9833
Merge pull request #197 from hongchuan97/master
hongchuan97 Nov 9, 2019
135a290
Merge branch 'master' into SukrutFurtherEdit
Sukrut1881 Nov 9, 2019
54f39c2
Fixed Merge Conflict
Sukrut1881 Nov 9, 2019
b01fb7d
Update Model.java
Sukrut1881 Nov 9, 2019
8b88e9d
Update ModelManager.java
Sukrut1881 Nov 9, 2019
5973559
Update Storage.java
Sukrut1881 Nov 9, 2019
30180ae
Update Parser.java
Sukrut1881 Nov 9, 2019
f8c6c18
Merge pull request #198 from Sukrut1881/SukrutFurtherEdit
Sukrut1881 Nov 9, 2019
e0b379d
Fixed Merge conflicts
Sukrut1881 Nov 9, 2019
1f40312
Cannot add a single recommendation twice
Sukrut1881 Nov 9, 2019
3c382f1
Fixed Chekcstyle
Sukrut1881 Nov 9, 2019
241a005
Merge pull request #199 from Sukrut1881/SukrutFurtherEdit
Sukrut1881 Nov 9, 2019
e8b7a5d
Fixed AddThisList issue
Sukrut1881 Nov 9, 2019
9075c18
Merge pull request #200 from Sukrut1881/master
Sukrut1881 Nov 9, 2019
f2ad5cb
Added My Commands.pngs for UG
Sukrut1881 Nov 9, 2019
2073d9d
Update UserGuide.adoc
Sukrut1881 Nov 9, 2019
d907dcf
Update UserGuide.adoc
Sukrut1881 Nov 9, 2019
2ab020e
fixed profile bug
hongchuan97 Nov 9, 2019
c241ed8
Add sample data for favourite
hongchuan97 Nov 9, 2019
889b51b
fixed checkstyle
hongchuan97 Nov 9, 2019
7e3c8b0
Create DeveloperGuide.adoc
Jefferson111 Nov 9, 2019
ca26d19
Add images
Jefferson111 Nov 9, 2019
5570356
Add images
Jefferson111 Nov 9, 2019
ef7d7b7
cleanup some files
Inno97 Nov 9, 2019
8ec48ba
Merge branch 'master' into master
Inno97 Nov 9, 2019
ed177c9
Delete '
Jefferson111 Nov 9, 2019
6ca1b4b
Add images
Jefferson111 Nov 9, 2019
c3a1890
Fix link
Jefferson111 Nov 9, 2019
f3bf5b3
cleanup and remove mrt component in routegenerate
Inno97 Nov 9, 2019
28310d6
Add images
Jefferson111 Nov 9, 2019
7f9c013
Fix wrong message shown
Jefferson111 Nov 9, 2019
2f89e6f
fix tests, travis and codacy
Inno97 Nov 9, 2019
f645d70
Merge pull request #201 from Inno97/master
Inno97 Nov 9, 2019
487a637
revert changes
hongchuan97 Nov 9, 2019
e806138
Update DG
Jefferson111 Nov 9, 2019
939afcf
Bug fix for wrong message displayed
Jefferson111 Nov 9, 2019
ebe8d4f
Update DeveloperGuide.adoc
Jefferson111 Nov 9, 2019
f3ff2f3
Merge branch 'JCodeQuality'
Jefferson111 Nov 9, 2019
80ce77c
User Guide Update
Sukrut1881 Nov 9, 2019
4cf8cc8
Fix images
Jefferson111 Nov 9, 2019
a4f19b2
Merge branch 'work'
Jefferson111 Nov 9, 2019
9b0b9ac
Fix javadoc
Jefferson111 Nov 9, 2019
0d463d2
Update UserGuide.adoc
Jefferson111 Nov 9, 2019
20e0aea
Fix my bug
Jefferson111 Nov 9, 2019
ffc9d21
Add missing space
Jefferson111 Nov 9, 2019
dd9e016
Update UserGuide
hongchuan97 Nov 9, 2019
9867101
Fixed image rendering
hongchuan97 Nov 9, 2019
39552c4
update UserGuide
hongchuan97 Nov 9, 2019
2393641
fixed image rendering
hongchuan97 Nov 9, 2019
fd2d327
Add files via upload
Inno97 Nov 10, 2019
ad2b7cc
Update DeveloperGuide.adoc
Inno97 Nov 10, 2019
bed9dfa
LOD
Jefferson111 Nov 10, 2019
011ad57
Javadoc
Jefferson111 Nov 10, 2019
1d9ed4f
Remove unused imports
Jefferson111 Nov 10, 2019
189ba82
Logging
Jefferson111 Nov 10, 2019
c200b22
javadoc
Jefferson111 Nov 10, 2019
92b3a63
update javadoc
Jefferson111 Nov 10, 2019
8e2c635
Update DeveloperGuide.adoc
Inno97 Nov 10, 2019
1f91ed8
Add files via upload
Inno97 Nov 10, 2019
ffcab3d
Move class
Jefferson111 Nov 10, 2019
47be1a4
Rename exception
Jefferson111 Nov 10, 2019
7208421
Update message displayed
Jefferson111 Nov 10, 2019
0f4d87a
Remove print stacktrace
Jefferson111 Nov 10, 2019
ced708d
Fix bug
Jefferson111 Nov 10, 2019
72879b1
Daniel's removal
Jefferson111 Nov 10, 2019
11900ac
Fix bug
Jefferson111 Nov 10, 2019
d36ebfa
Fix tests
Jefferson111 Nov 10, 2019
dcd67ed
Fix test
Jefferson111 Nov 10, 2019
b305baf
Add files via upload
Sukrut1881 Nov 10, 2019
9aae71d
Move messages to Message class
Jefferson111 Nov 10, 2019
caf4a0b
Add files via upload
Sukrut1881 Nov 10, 2019
e3a718e
Update DeveloperGuide.adoc
Sukrut1881 Nov 10, 2019
8092cc3
Add files via upload
Sukrut1881 Nov 10, 2019
839df32
Merge branch 'work'
Jefferson111 Nov 10, 2019
fa9ee42
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-W13-3/main
Jefferson111 Nov 10, 2019
7ca6f7e
Update manual testing and editing section
Jefferson111 Nov 10, 2019
2bcb927
Add files via upload
Sukrut1881 Nov 10, 2019
6fd94ed
Update DeveloperGuide.adoc
Sukrut1881 Nov 10, 2019
165dea7
Update DeveloperGuide.adoc
Sukrut1881 Nov 10, 2019
4d39b16
Update DeveloperGuide.adoc
Sukrut1881 Nov 10, 2019
ff628dc
Add files via upload
Inno97 Nov 10, 2019
c755e37
Update DeveloperGuide.adoc
Inno97 Nov 10, 2019
a006ac8
Update UserGuide.adoc
Inno97 Nov 10, 2019
f9df74d
Add files via upload
Inno97 Nov 10, 2019
3558e22
Add files via upload
Sukrut1881 Nov 10, 2019
879f14b
Add files via upload
Sukrut1881 Nov 10, 2019
d098456
Update DeveloperGuide.adoc
Sukrut1881 Nov 10, 2019
32043ad
Update DeveloperGuide.adoc
Sukrut1881 Nov 10, 2019
d93b254
Update DeveloperGuide.adoc
Jefferson111 Nov 10, 2019
017c4c3
Update DeveloperGuide.adoc
Sukrut1881 Nov 10, 2019
913cd39
Update README.adoc
Sukrut1881 Nov 10, 2019
d08cbb1
Update README.adoc
Sukrut1881 Nov 10, 2019
9d9e022
Update image
Jefferson111 Nov 10, 2019
6f7e2b0
Merge branch 'master' of https://github.com/AY1920S1-CS2113T-W13-3/main
Jefferson111 Nov 10, 2019
926f1e6
Update UserGuide.adoc
Jefferson111 Nov 10, 2019
8bd967c
Update UserGuide.adoc
Jefferson111 Nov 10, 2019
8799332
Update UserGuide.adoc
Inno97 Nov 10, 2019
675142d
Update UserGuide.adoc
Sukrut1881 Nov 10, 2019
1b9b061
Update UserGuide.adoc
Sukrut1881 Nov 10, 2019
740ffb9
Update DeveloperGuide.adoc
Inno97 Nov 10, 2019
5ca35be
Add files via upload
Inno97 Nov 10, 2019
98f4b5d
Update DeveloperGuide.adoc
Inno97 Nov 10, 2019
25f3757
update developerGuide
hongchuan97 Nov 10, 2019
95ab3c0
update developerGuide.adoc
hongchuan97 Nov 10, 2019
e785790
Update UserGuide.adoc
Jefferson111 Nov 11, 2019
c4048e4
Update DeveloperGuide.adoc
hongchuan97 Nov 11, 2019
d822710
Update DeveloperGuide.adoc
Jefferson111 Nov 11, 2019
00c4b9f
Add files via upload
Inno97 Nov 11, 2019
7a76d7a
Update README.adoc
Jefferson111 Nov 11, 2019
716c6b6
Update README.adoc
Jefferson111 Nov 11, 2019
20c4883
Update README.adoc
Jefferson111 Nov 11, 2019
f439ac1
Fix travis
Jefferson111 Nov 11, 2019
365ea20
Rename and fix travis
Jefferson111 Nov 11, 2019
f248687
Code quality
Jefferson111 Nov 11, 2019
948892b
Fix tests
Jefferson111 Nov 11, 2019
2fa4024
Update UserGuide.adoc
Sukrut1881 Nov 11, 2019
fb453fa
Update UserGuide.adoc
Inno97 Nov 11, 2019
8458643
Update UserGuide.adoc
Sukrut1881 Nov 11, 2019
3a5b2ff
Update UserGuide.adoc
Sukrut1881 Nov 11, 2019
a3c8b2b
Update UserGuide.adoc
Sukrut1881 Nov 11, 2019
ac833ad
Update DeveloperGuide.adoc
Inno97 Nov 11, 2019
74a56d4
Update DeveloperGuide.adoc
Inno97 Nov 11, 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
  •  
  •  
  •  
12 changes: 12 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,15 @@ src/main/resources/docs/
.DS_Store
*.iml
bin/

# CS2113 stuff
tasks.txt
tasks1.txt
/events.txt
/data/events.txt
events.txt
/profile.txt
/routes.txt
/data/recommendations.txt
/favourite.txt
/itineraries.txt
23 changes: 23 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
language: java
matrix:
include:
- jdk: openjdk11

script: >-
./config/travis/run-checks.sh &&
./gradlew clean checkstyleMain checkstyleTest headless allTests coverage coveralls
#deploy:
# skip_cleanup: true
# provider: script
# script: ./config/travis/deploy_github_pages.sh
# on:
# branch: master

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
- rm -fr $HOME/.gradle/caches/*/plugin-resolution/

cache:
directories:
- $HOME/.gradle/caches/
- $HOME/.gradle/wrapper/
2 changes: 1 addition & 1 deletion CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Contributors

Display | Name | Github Profile | Homepage
Display | Name | Github Profile | Homepage |
---|:---:|:---:|:---:
![](https://avatars0.githubusercontent.com/u/22460123?s=100) | Jeffry Lum | [Github](https://github.com/j-lum/) | [Homepage](https://se.kasugano.moe)
![](https://avatars0.githubusercontent.com/u/1673303?s=100) | Damith C. Rajapakse | [Github](https://github.com/damithc/) | [Homepage](https://www.comp.nus.edu.sg/~damithch/)
Expand Down
40 changes: 40 additions & 0 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
= SGTravel
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/AY1920S1-CS2113T-W13-3/main[image:https://travis-ci.org/AY1920S1-CS2113T-W13-3/main.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/Jefferson111/main/branch/master[image:https://ci.appveyor.com/api/projects/status/4mjh6mbu4s7uy36n/branch/master?svg=true[Build status]]
https://coveralls.io/github/AY1920S1-CS2113T-W13-3/main?branch=master[image:https://coveralls.io/repos/github/AY1920S1-CS2113T-W13-3/main/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/manual/Jefferson111/main?utm_source=github.com&utm_medium=referral&utm_content=AY1920S1-CS2113T-W13-3/main&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/d553600e4c394c78989c71999eb35dcc[Codacy Badge]]
https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

ifdef::env-github[]
[.center]
image:docs/images/sader_thonk.png[width="64" height="64" align="center"]
endif::[]

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

* The project aims to build a product named `SGTravel`, a Personal Assistant Travel Planning application for Singapore Tourists!
* This app has route planning, profile page, edit location and recommended itineraries feature up and running.
* The latest release, version 1.4 was completed on 11/11/2019
* The project showcases what we have learnt from our OOP and Software Engineering module and was made in the AY19/20 Semester 1 iteration of CS2113/T
* This project was originally expanded on the Duke Chatbot project.
* Project by - Daniel, Hong Chuan, Sukrut and Jefferson!

== Site Map

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

== Acknowledgements

* Most parts of this sample application came from https://github.com/j-lum/duke[Duke] by someone.
* 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[TestFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5], https://github.com/google/gson[GSON], https://github.com/apache/commons-lang[Apache]

== Licence : link:LICENSE[MIT]
16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Setting up

[![Coverage Status](https://coveralls.io/repos/github/AY1920S1-CS2113T-W13-3/main/badge.svg?branch=master)](https://coveralls.io/github/AY1920S1-CS2113T-W13-3/main?branch=master)
[![Build Status](https://travis-ci.org/AY1920S1-CS2113T-W13-3/main.svg?branch=master)](https://travis-ci.org/AY1920S1-CS2113T-W13-3/main)
[![Build status](https://ci.appveyor.com/api/projects/status/4mjh6mbu4s7uy36n/branch/master?svg=true)](https://ci.appveyor.com/project/Jefferson111/main/branch/master)
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/d553600e4c394c78989c71999eb35dcc)](https://www.codacy.com/manual/Jefferson111/main?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=AY1920S1-CS2113T-W13-3/main&amp;utm_campaign=Badge_Grade)
[![Gitter chat](https://badges.gitter.im/se-edu/Lobby.svg)](https://gitter.im/se-edu/Lobby)

**Prerequisites**

* JDK 11
Expand All @@ -20,7 +26,11 @@
1. Ensure that your src folder is checked. Keep clicking `Next`.
1. Click `Finish`.

# Tutorials
# Developer Guide

https://docs.google.com/document/d/1jau7lCh6TdFEZnxJQyfkELXFryA56I4-Jf6dzDFwSI0/edit?usp=sharing

# Tutorials

Duke Increment | Tutorial
---------------|---------------
Expand All @@ -35,5 +45,5 @@ Duke Increment | Tutorial

# Feedback, Bug Reports

* If you have feedback or bug reports, please post in [se-edu/duke issue tracker](https://github.com/se-edu/duke/issues).
* We welcome pull requests too.
* If you have feedback or bug reports, please post in [se-edu/sgtravel issue tracker](https://github.com/se-edu/duke/issues).
* We welcome pull requests too.
18 changes: 18 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# AppVeyor configuration file
# For more details see https://www.appveyor.com/docs/build-configuration/

# Call on gradle to build and run tests
# --no-daemon: Prevent the daemon from launching to prevent file-in-use errors
# when we cache the ~/.gradle directory
build_script:
- gradlew.bat --no-daemon assemble checkstyleMain checkstyleTest

test_script:
- gradlew.bat --no-daemon headless allTests

environment:
JAVA_HOME: C:\Program Files\Java\jdk11 # Use 64-bit Java

# Files/folders to preserve between builds to speed them up
cache:
- C:\Users\appveyor\.gradle
192 changes: 192 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,192 @@
import org.gradle.api.tasks.testing.logging.TestLogEvent

plugins {
id 'java'
id 'jacoco'
id 'checkstyle'
id 'org.openjfx.javafxplugin' version '0.0.7'
id 'com.github.kt3k.coveralls' version '2.8.4'
id 'com.github.johnrengelman.shadow' version '5.1.0'
id 'org.asciidoctor.jvm.convert' version '2.3.0'
id 'application'
}

// Specifies the entry point of the application
mainClassName = 'sgtravel.Launcher'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

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

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

checkstyle {
toolVersion = '8.23'
}

jacocoTestReport {
reports {
xml.enabled = true
html.enabled = true
}
}

task coverage(type: JacocoReport) {
sourceDirectories.from files(sourceSets.main.allSource.srcDirs)
classDirectories.from files(sourceSets.main.output)
executionData.from files(jacocoTestReport.executionData)
afterEvaluate {
classDirectories.from files(classDirectories.files.collect {
fileTree(dir: it, exclude: ['**/*.jar'])
})
}
reports {
html.enabled = true
xml.enabled = true
}
}

coveralls {
sourceDirs = sourceSets.main.allSource.srcDirs.absolutePath
jacocoReportPath = "${buildDir}/reports/jacoco/coverage/coverage.xml"
}

tasks.coveralls {
dependsOn coverage
}

test {
useJUnitPlatform()
}

dependencies {
String testFxVersion = '4.0.15-alpha'
String jUnitVersion = '5.5.0'
String javaFxVersion = '11'

implementation group: 'com.google.code.gson', name: 'gson', version: '2.8.5'
implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.9'
implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-base', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-controls', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: javaFxVersion, classifier: 'linux'
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: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'linux'

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.9.9.3'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.9.9'

testImplementation group: 'org.testfx', name: 'testfx-core', version: testFxVersion

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

testRuntimeOnly group: 'org.testfx', name: 'openjfx-monocle', version: 'jdk-11+26'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
}

shadowJar {
archiveBaseName = "SGTravel"
archiveVersion = "1.4"
archiveClassifier = null
archiveAppendix = null
}

task(guiTests)
task(nonGuiTests)

// Run `test` task if `guiTests` or `nonGuiTests` is specified
guiTests.dependsOn test
nonGuiTests.dependsOn test

task(allTests)

// `allTests` implies both `guiTests` and `nonGuiTests`
allTests.dependsOn guiTests
allTests.dependsOn nonGuiTests

test {
systemProperty 'testfx.setup.timeout', '60000'

testLogging {
events TestLogEvent.FAILED, TestLogEvent.SKIPPED

// 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
// stalling the build.
if (System.env.'CI') {
events << TestLogEvent.STARTED
}
}

jacoco {
destinationFile = new File("${buildDir}/jacoco/test.exec")
}

doFirst {
boolean runGuiTests = gradle.taskGraph.hasTask(guiTests)
boolean runNonGuiTests = gradle.taskGraph.hasTask(nonGuiTests)

if (!runGuiTests && !runNonGuiTests) {
runGuiTests = true
runNonGuiTests = true
}

if (runNonGuiTests) {
test.include 'sgtravel/**'
}

if (runGuiTests) {
}

if (!runGuiTests) {
}
}
}

task headless {
doLast {
println 'Setting headless mode properties.'
test {
systemProperties = [
'testfx.robot': 'glass',
'testfx.headless': 'true',
'prism.order': 'sw',
'prism.text': 't2k',
]
}
}
}

// Makes sure that headless properties are set before running tests
test.mustRunAfter headless

defaultTasks 'clean', 'headless', 'allTests', 'coverage', 'coveralls'

run {
enableAssertions = true
}
Loading