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

Todo list UI and description model #113

Open
wants to merge 89 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
95652e7
updated url in DeveloperGuide.adoc and UserGuide.adoc
WoodySIN Mar 5, 2018
d110f90
Add backup method to AddressBookStorage Interface
Alaru Mar 8, 2018
183640a
Add backup methods to save the addressbook in a separate backup file
Alaru Mar 8, 2018
39c7ae3
update on the repo name from addressbook level 4 to main
WoodySIN Mar 8, 2018
6c5c343
Merge pull request #1 from WoodySIN/master
WoodySIN Mar 8, 2018
3ee33e4
Change tag colours to blue (test not edited yet)
JoonKai1995 Mar 8, 2018
81fe21e
add listTags() function in model,
Pearlissa Mar 8, 2018
e80fd08
update some NFRs on DG
WoodySIN Mar 8, 2018
ad37beb
Put overloaded methods together
Alaru Mar 8, 2018
2ad122f
update on the coverall badge
WoodySIN Mar 8, 2018
648e2d3
Merge pull request #4 from WoodySIN/master
WoodySIN Mar 8, 2018
3d12ff8
Add some Use Cases to DeveloperGuide.adoc
Alaru Mar 8, 2018
5c24d03
implement alias for commands -- add, clear, delete, edit, find, help,…
WoodySIN Mar 8, 2018
11fb268
add listTags() function in model,
Pearlissa Mar 9, 2018
1908e94
add listTags() function in model,
Pearlissa Mar 9, 2018
0fc3092
Add newline at EOF for DarkTheme.css
JoonKai1995 Mar 9, 2018
4b4036b
Merge pull request #5 from Alaru/StorageEnhancement
WoodySIN Mar 9, 2018
5ac3ed9
Merge pull request #6 from Alaru/UseCases
WoodySIN Mar 9, 2018
4791281
Merge pull request #7 from WoodySIN/master
WoodySIN Mar 9, 2018
de190ac
Adjusted indents
JoonKai1995 Mar 9, 2018
5096d46
update team name and product name on UGDG
WoodySIN Mar 9, 2018
566890a
Adjusted indents
JoonKai1995 Mar 9, 2018
bf7d1c2
Adjusted indents
JoonKai1995 Mar 9, 2018
ba44dcf
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main
WoodySIN Mar 9, 2018
6007bd4
add listTags() enhancement
Pearlissa Mar 9, 2018
bb00f77
update developer's guide (user profile, value proposition and user st…
Pearlissa Mar 9, 2018
eae6ce4
Only DeveloperGuide
JoonKai1995 Mar 9, 2018
d525474
update developer's guide (user profile, value proposition and user st…
Pearlissa Mar 9, 2018
af7edbe
Merge pull request #12 from Pearlissa/developer's_guide
WoodySIN Mar 9, 2018
fa771b2
Merge pull request #11 from WoodySIN/master
WoodySIN Mar 9, 2018
bc2ea8e
Only DeveloperGuide
JoonKai1995 Mar 9, 2018
dc7df5c
Merge pull request #13 from JoonKai1995/DeveloperGuide
WoodySIN Mar 9, 2018
c47d77e
Add dummy EmailCommand.java file
Alaru Mar 13, 2018
5062aa5
Add error message if default system mail app cannot be open
Alaru Mar 13, 2018
ea941d1
Update EmailCommand to process the index and open the mail app with m…
Alaru Mar 13, 2018
813f3c2
Add EmailCommandParser
Alaru Mar 13, 2018
a9c3c27
Update AddressBookParser to recognise Email command
Alaru Mar 13, 2018
84e9fbe
Update userguide with email command
Alaru Mar 13, 2018
825dced
Update description of EmailCommand
Alaru Mar 14, 2018
e5d6e16
Changed from help window listing possible commands and examples for use.
Pearlissa Mar 14, 2018
c024340
Update description of EmailCommand
Alaru Mar 14, 2018
680c996
Revert "Update description of EmailCommand"
Alaru Mar 14, 2018
c577bd0
Revert "Update userguide with email command"
Alaru Mar 14, 2018
5e89d55
Merge branch 'EmailCommand' of https://github.com/Alaru/main into Ema…
Alaru Mar 14, 2018
591282b
Reupdate userguide with email command
Alaru Mar 14, 2018
e6d9ebf
Added one EmailCommandTest to check if expected output is correct
Alaru Mar 14, 2018
bb7a16f
Update EmailCommandTest
Alaru Mar 14, 2018
a24f46c
Remove redundant imports
Alaru Mar 14, 2018
925b03e
Update test for systems that do not support Desktop
Alaru Mar 14, 2018
500e7c7
Update test for systems that do not support Desktop v2
Alaru Mar 14, 2018
220882e
Update test for systems that do not support Desktop v3
Alaru Mar 14, 2018
1033ca9
Add EmailCommandParserTest
Alaru Mar 15, 2018
3ae9a35
Update AddressBookParser
Alaru Mar 15, 2018
43a8c87
Implement Matriculation Number
JoonKai1995 Mar 15, 2018
4ed09ac
Updated Styles
JoonKai1995 Mar 15, 2018
1ae44b2
Updated Description in MatriculationNumber
JoonKai1995 Mar 15, 2018
fbc689f
Updated Description in MatriculationNumber
JoonKai1995 Mar 15, 2018
7671403
added ImportCommand and its parser
WoodySIN Mar 15, 2018
ffb81da
Update AboutUs and add pictures
Alaru Mar 15, 2018
bc757e0
Rearrange order in AboutUs
Alaru Mar 15, 2018
a86de4c
Updated profile pic
Alaru Mar 15, 2018
e00a6d8
Updated Description in MatriculationNumber
JoonKai1995 Mar 15, 2018
b115a15
Added Daniel picture
JoonKai1995 Mar 15, 2018
4e62ce3
Added profile picture for about us documentation
Pearlissa Mar 15, 2018
65d98cc
Update coding style of EmailCommandTest
Alaru Mar 16, 2018
81667a5
Merge pull request #19 from JoonKai1995/UserGuide1.1
Alaru Mar 16, 2018
e78cbe9
Added Daniel picture
JoonKai1995 Mar 16, 2018
0b259e6
set some default tag colours
Pearlissa Mar 16, 2018
be4cf39
Merge branch 'master' into v1.1AboutUs
Alaru Mar 16, 2018
1fe7fb2
Update description of EmailCommandTest
Alaru Mar 16, 2018
8eab749
Added Junit test for import command
WoodySIN Mar 16, 2018
527a959
fix a conflict
WoodySIN Mar 16, 2018
e262808
Merge branch 'master' into ImportCommand
WoodySIN Mar 16, 2018
639f894
remove extra import
WoodySIN Mar 16, 2018
e522277
Merge branch 'master' of https://github.com/CS2103JAN2018-F09-B1/main…
WoodySIN Mar 16, 2018
b6d2da6
no message
WoodySIN Mar 16, 2018
f73f219
Merge branch 'ImportCommand' of https://github.com/WoodySIN/main into…
WoodySIN Mar 16, 2018
796af6a
fix unused import in typicalimportFile
WoodySIN Mar 16, 2018
40ef7c4
Merge pull request #23 from Pearlissa/About_Us_profile
WoodySIN Mar 16, 2018
21f0253
Merge pull request #22 from Alaru/v1.1AboutUs
WoodySIN Mar 16, 2018
5d053b5
Merge pull request #18 from JoonKai1995/MatriculationNumber
WoodySIN Mar 16, 2018
2ada6ea
Merge branch 'master' into EmailCommand
WoodySIN Mar 16, 2018
c175e00
Merge pull request #15 from Alaru/EmailCommand
WoodySIN Mar 16, 2018
0f83708
Merge pull request #21 from WoodySIN/ImportCommand
WoodySIN Mar 16, 2018
9812bff
Merge pull request #24 from Pearlissa/UI_defaultTagColours
WoodySIN Mar 16, 2018
474ea1c
Update Feature Contribution
Alaru Mar 19, 2018
6808be2
Merge pull request #26 from Alaru/Features
WoodySIN Mar 19, 2018
c2edc84
added Todo List UI and the description model
WoodySIN Mar 22, 2018
07e207d
editted on the ui component
WoodySIN Mar 22, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ImportInvalid.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
John Doe
98765432
[email protected]
311, Clementi Ave 2, #02-25
owesMoney
friends

Alex Neo
87438807
[email protected]
Blk 30 Geylang Street 29, #06-40
family

Berinice Yu
99272758
[email protected]
Blk 30 Lorong 3 Serangoon Gardens, #07-18
colleagues
friends
30 changes: 30 additions & 0 deletions ImportValid.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addressbook>
<persons>
<name>John Doe</name>
<phone>98765432</phone>
<email>[email protected]</email>
<address>311, Clementi Ave 2, #02-25</address>
<tagged>owesMoney</tagged>
<tagged>friends</tagged>
</persons>
<persons>
<name>Alex Neo</name>
<phone>87438807</phone>
<email>[email protected]</email>
<address>Blk 30 Geylang Street 29, #06-40</address>
<tagged>family</tagged>
</persons>
<persons>
<name>Berinice Yu</name>
<phone>99272758</phone>
<email>[email protected]</email>
<address>Blk 30 Lorong 3 Serangoon Gardens, #07-18</address>
<tagged>colleagues</tagged>
<tagged>friends</tagged>
</persons>
<tags>owesMoney</tags>
<tags>friends</tags>
<tags>family</tags>
<tags>colleagues</tags>
</addressbook>
14 changes: 6 additions & 8 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
= Address Book (Level 4)
= Your TA
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://travis-ci.org/CS2103JAN2018-F09-B1/main[image:https://travis-ci.org/CS2103JAN2018-F09-B1/main.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://coveralls.io/github/CS2103JAN2018-F09-B1/main?branch=master[image:https://coveralls.io/repos/github/CS2103JAN2018-F09-B1/main/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://gitter.im/se-edu/Lobby[image:https://badges.gitter.im/se-edu/Lobby.svg[Gitter chat]]

Expand All @@ -15,13 +15,10 @@ 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).
* This is a desktop "Your TA" application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is an address book cum scheduler targeted at making tracking students for NUS lecturer's easier.
* 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.

== Site Map

Expand All @@ -33,6 +30,7 @@ endif::[]

== Acknowledgements

* This application was adapted from https://github.com/nus-cs2103-AY1718S2/addressbook-level4[AddressBook Level-4]
* 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]
Expand Down
49 changes: 19 additions & 30 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -3,53 +3,42 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 4 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} +
Your TA was developed by the https://github.com/CS2103JAN2018-F09-B1[F09-B1] team. +

We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]

Role: Project Advisor

'''

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

Role: Team Lead +
Responsibilities: UI
Role: Developer +
Responsibilities: Logic

'''

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

=== Daniel Tan
image::joonkai1995.png[width="150", align="left"]
{empty}[http://github.com/JoonKai1995[github]]
Role: Developer +
Responsibilities: Data
Responsibilities: UI

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Responsibilities: Model

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]
=== Ellery Chia
image::ellery.jpg[width="150", align="left"]
{empty}[http://github.com/Alaru[github]]

Role: Developer +
Responsibilities: UI
Responsibilities: Storage

'''
Loading