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

[Toh Zhen Yu, Nicholas] iP #457

Open
wants to merge 52 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
3b19ba1
Add Gradle support
May 24, 2020
d6b1456
level-1
nicktohzyu Aug 19, 2020
49fdaf1
add greet
nicktohzyu Aug 19, 2020
52ff3b3
level2
nicktohzyu Aug 19, 2020
48f8a1e
task tostring for done status
nicktohzyu Aug 19, 2020
1c9189f
mark task as done
nicktohzyu Aug 19, 2020
d91440c
Level 4
nicktohzyu Aug 20, 2020
28ca00a
automated testing
nicktohzyu Aug 20, 2020
b2c3edd
filter invalid input
nicktohzyu Aug 20, 2020
17f4128
Update Duke.java
nicktohzyu Aug 20, 2020
f74aa3c
abstract out Tasks class
nicktohzyu Aug 24, 2020
73ecf65
serialization
nicktohzyu Aug 24, 2020
9d526f1
data storage
nicktohzyu Aug 24, 2020
dea5581
implement LocalDate for Event and Deadline
nicktohzyu Aug 24, 2020
f128e30
Merge branch 'branch-Level-8' into master
nicktohzyu Aug 24, 2020
d3d481d
OOP UI
nicktohzyu Aug 24, 2020
43fd410
OOP Storage
nicktohzyu Aug 24, 2020
eba4197
OOP Parser
nicktohzyu Aug 24, 2020
68f0af7
add message on successful load
nicktohzyu Aug 24, 2020
92603f8
fix serialization bug, rename Tasks to TaskList
nicktohzyu Aug 24, 2020
54597fe
fix styling
nicktohzyu Aug 24, 2020
24f5318
A-JUnit
nicktohzyu Aug 25, 2020
9d2e2e4
Create MANIFEST.MF
nicktohzyu Aug 25, 2020
a7ae636
cleanup TaskList
nicktohzyu Aug 26, 2020
8dfb179
A-CodingStandard
nicktohzyu Aug 26, 2020
99b108f
Add javadocs
nicktohzyu Aug 26, 2020
f143e67
Level-9
nicktohzyu Aug 26, 2020
3607d1a
Merge tag 'Level-9' into master
nicktohzyu Aug 26, 2020
316ab12
Merge tag 'A-CodingStandard' into master
nicktohzyu Aug 26, 2020
42e8830
Update TaskList.java
nicktohzyu Aug 26, 2020
3f2e05e
Remove redundant code
nicktohzyu Aug 26, 2020
a75fcee
build.gradle: Update version to 8.29
Aug 29, 2020
34f572c
Merge branch 'add-gradle-support'
nicktohzyu Sep 2, 2020
d24d425
Update build.gradle
nicktohzyu Sep 2, 2020
6de3764
Update build.gradle
nicktohzyu Sep 8, 2020
9933b7b
Update .gitignore
nicktohzyu Sep 8, 2020
6a8c20a
Update .gitignore
nicktohzyu Sep 8, 2020
0177fda
Merge branch 'branch-Level-10' into master
nicktohzyu Sep 8, 2020
0a4bb48
add assertions
nicktohzyu Sep 9, 2020
02bc264
improve code quality
nicktohzyu Sep 9, 2020
7671eb9
Merge pull request #2 from nicktohzyu/branch-A-CodeQuality
nicktohzyu Sep 9, 2020
dc66c72
Merge pull request #1 from nicktohzyu/branch-A-Assertions
nicktohzyu Sep 9, 2020
aedb323
move tasks to package
nicktohzyu Sep 11, 2020
41238c8
Fix imports and remove unreachable statement
nicktohzyu Sep 14, 2020
9132476
Update .gitignore
nicktohzyu Sep 14, 2020
1467d91
C-sort
nicktohzyu Sep 14, 2020
7b29628
implement GUI part 1 to 3
nicktohzyu Sep 16, 2020
29d63f0
refactor fxml
nicktohzyu Sep 16, 2020
d7274aa
Update Parser.java
nicktohzyu Sep 16, 2020
98466a8
Merge branch 'branch-Level-10' into master
nicktohzyu Sep 16, 2020
16f9125
improve gui
nicktohzyu Sep 16, 2020
4fd75cc
update readme and ui screenshot
nicktohzyu Sep 16, 2020
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ bin/

/text-ui-test/ACTUAL.txt
text-ui-test/EXPECTED-UNIX.TXT

gradle/
gradlew*

tasks.ser
63 changes: 63 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
plugins {
id 'java'
id 'application'
id 'checkstyle'
id 'com.github.johnrengelman.shadow' version '5.1.0'
}

repositories {
mavenCentral()
}

dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.5.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.5.0'
String javaFxVersion = '11'
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'
}

test {
useJUnitPlatform()

testLogging {
events "passed", "skipped", "failed"

showExceptions true
exceptionFormat "full"
showCauses true
showStackTraces true
showStandardStreams = false
}
}

application {
mainClassName = "Launcher"
}

shadowJar {
archiveBaseName = "duke"
archiveClassifier = null
}

checkstyle {
toolVersion = '8.29'
}

run{
standardInput = System.in
}

tasks.withType(JavaCompile) {
options.encoding = 'UTF-8'
}
131 changes: 125 additions & 6 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,138 @@

## Features

### Feature 1
Description of feature.
### Feature 1: View tasks
Shows all tasks with status and date.

### Feature 2: Add a task
Tasks can be in the form of a todo [T], deadline [D], or event [E].

### Feature 3: Mark as done
Marks specified task as done.

### Feature 4: Delete a task
Deletes a specific task.

### Feature 5: Sort tasks
Sorts tasks by dates.

### Feature 6: Exit the program
Saves all data and closes the window for you.

## Usage

### `Keyword` - Describe action
### `todo` - Adds a todo item to the list

Format: `todo DESCRIPTION`

Example of usage:

`todo fail CS2103T`

Expected outcome:

Got it. I've added this task:
[T][✘] fail CS2103T
You now have ... tasks in the list.

### `deadline` - Adds a deadline item to the list, with a specified date

Format: `deadline DESCRIPTION /by YYYY-MM-DD`

Example of usage:

`deadline fail CS2103T /by 2020-12-01`

Expected outcome:

Got it. I've added this task:
[D][✘] fail CS2103T (by: 2020-12-01)
You now have ... tasks in the list.

### `event` - Adds an event item to the list, with a specified date

Format: `event DESCRIPTION /at YYYY-MM-DD`

Example of usage:

`event fail CS2103T /at 2020-12-02`

Expected outcome:

Got it. I've added this task:
[E][✘] fail CS2103T (at: 2020-12-02)
You now have ... tasks in the list.

### `list` - Shows all current tasks

Format: `list`

Example of usage:

`list`

Expected outcome:

If there are no items in the list:

Theres currently nothing in your list.

If there are existing items in the list, it may look something like:

1. [T][✓] fail CS2103T
2. [D][✓] fail CS2103T (by: 2020-12-01)
3. [E][✓] fail CS2103T (at: 2020-12-02)

### `done` - Marks a current task as done

Format: `done ITEM NUMBER`

Example of usage:

`done 1`

Expected outcome:

Nice, I've marked this item as done:
[T][✓] fail CS2103T

### `delete` - Deletes an item from the list.

Format: `delete ITEM NUMBER`

Example of usage:

`delete 1`

Expected outcome:

Noted, I've removed this task:
[T][✓] fail CS2103T
You now have ... items in the list.

### `sort` - Shows all current tasks

Format: `sort`

Example of usage:

`sort`

Expected outcome:

Tasks sorted by date
1. [D][✓] fail CS2103T (by: 2020-12-01)
2. [E][✓] fail CS2103T (at: 2020-12-02)
3. [T][✓] fail CS2103T

### `bye` - Exits the program.

Describe action and its outcome.
Format: `bye`

Example of usage:

`keyword (optional arguments)`
`bye`

Expected outcome:

`outcome`
The window closes.
Binary file added docs/Ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
5 changes: 5 additions & 0 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading