diff --git a/.gitignore b/.gitignore index 823d175eb670..b034a08a64d9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,7 @@ lib/* *.log.* *.csv config.json -src/test/data/sandbox/ +src/test/data/sandbox preferences.json .DS_Store ./screenshot*.png diff --git a/README.adoc b/README.adoc index 03eff3a4d191..d590fa751e19 100644 --- a/README.adoc +++ b/README.adoc @@ -1,10 +1,10 @@ -= Address Book (Level 4) += StardyTogether ifdef::env-github,env-browser[:relfileprefix: docs/] -https://travis-ci.org/se-edu/addressbook-level4[image:https://travis-ci.org/se-edu/addressbook-level4.svg?branch=master[Build Status]] -https://ci.appveyor.com/project/damithc/addressbook-level4[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]] -https://coveralls.io/github/se-edu/addressbook-level4?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level4/badge.svg?branch=master[Coverage Status]] -https://www.codacy.com/app/damith/addressbook-level4?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level4&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]] +https://travis-ci.org/CS2103JAN2018-W11-B4/main[image:https://travis-ci.org/CS2103JAN2018-W11-B4/main.svg?branch=master[Build Status]] +https://ci.appveyor.com/project/yeggasd/main[image:https://ci.appveyor.com/api/projects/status/kc7eo8888cc960u0?svg=true[Build status]] +https://coveralls.io/github/CS2103JAN2018-W11-B4/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-W11-B4/main/badge.svg?branch=master[Coverage Status]] +https://app.codacy.com/app/yeggasd/main[image:https://api.codacy.com/project/badge/Grade/81c0e706007944e881b2290412d87325[Codacy Badge]] https://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]] ifdef::env-github[] @@ -15,19 +15,15 @@ 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. -* What's different from https://github.com/se-edu/addressbook-level3[level 3]: -** A more sophisticated GUI that includes a list panel and an in-built Browser. -** More test cases, including automated GUI testing. -** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI. +* This is a desktop Address Book application for students studying in NUS (National University of Singapore). +* Manage the contacts of your friends in University, keep track of your friends' Birthdays, find the location of your lecture venues! +* Share useful information with your friends who are taking the same modules and find a common studying time! +* StardyTogether has a GUI (Graphic User Interface) but most of the user interactions happen using a CLI (Command Line Interface). == Site Map * <> * <> -* <> * <> * <> @@ -36,5 +32,6 @@ endif::[] * Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by _Marco Jakob_. * Libraries used: https://github.com/TomasMikula/EasyBind[EasyBind], https://github.com/TestFX/TestFX[TextFX], https://bitbucket.org/controlsfx/controlsfx/[ControlsFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit4[JUnit4] +* Source code is from AddressBook-Level4 project created by SE-EDU initiative at https://github.com/se-edu/ == Licence : link:LICENSE[MIT] diff --git a/build.gradle b/build.gradle index 50cd2ae52efc..ea71a68a131c 100644 --- a/build.gradle +++ b/build.gradle @@ -46,6 +46,18 @@ dependencies { compile group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0' compile group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4' compile group: 'com.google.guava', name: 'guava', version: '19.0' + compile (group: 'com.google.apis', name: 'google-api-services-oauth2', version: 'v1-rev139-1.23.0') { + exclude group: 'com.google.guava' + } + compile (group: 'com.google.http-client', name: 'google-http-client-jackson2', version: '1.23.0') { + exclude group: 'com.google.guava' + } + compile (group: 'com.google.oauth-client', name: 'google-oauth-client-jetty', version: '1.23.0') { + exclude group: 'com.google.guava' + } + compile (group: 'com.google.apis', name: 'google-api-services-drive', version: 'v2-rev305-1.23.0') { + exclude group: 'com.google.guava' + } testCompile group: 'junit', name: 'junit', version: '4.12' testCompile group: 'org.testfx', name: 'testfx-core', version: testFxVersion @@ -57,7 +69,7 @@ dependencies { } shadowJar { - archiveName = "addressbook.jar" + archiveName = "StardyTogether.jar" destinationDir = file("${buildDir}/jar/") } diff --git a/collated/functional/AzuraAiR-reused.md b/collated/functional/AzuraAiR-reused.md new file mode 100644 index 000000000000..10c7bbdc2e1b --- /dev/null +++ b/collated/functional/AzuraAiR-reused.md @@ -0,0 +1,16 @@ +# AzuraAiR-reused +###### /java/seedu/address/storage/StorageManager.java +``` java + @Override + public void backupAddressBook(ReadOnlyAddressBook addressBook) throws IOException, WrongPasswordException { + logger.fine("Attempting to write to backup data file: "); + addressBookStorage.backupAddressBook(addressBook); + } +``` +###### /java/seedu/address/storage/XmlAddressBookStorage.java +``` java + @Override + public void backupAddressBook(ReadOnlyAddressBook addressBook) throws IOException, WrongPasswordException { + saveAddressBook(addressBook, filePath + ".backup"); + } +``` diff --git a/collated/functional/AzuraAiR.md b/collated/functional/AzuraAiR.md new file mode 100644 index 000000000000..a9a266ba6882 --- /dev/null +++ b/collated/functional/AzuraAiR.md @@ -0,0 +1,1704 @@ +# AzuraAiR +###### /resources/view/BirthdayList.fxml +``` fxml + + + + +