Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
d839859
Add Gradle support
May 24, 2020
7b4399b
Duke.java: Added formatAnswer method for formatting Duke's outputs
juayhee Jan 19, 2022
20727de
Duke.java: Updated main(): Duke will now echo all commands (except ex…
juayhee Jan 19, 2022
97f6a4d
Duke.java: Fixed javadocs formatting
juayhee Jan 19, 2022
ed4337c
Command.java: Added Command class
juayhee Jan 19, 2022
cdbfc4d
* Abstracted commands - Duke.main() now only calls a CommandFactory t…
juayhee Jan 19, 2022
8723e8a
Formatting
juayhee Jan 20, 2022
d966605
TaskManager.java: Added TaskManager, to manage a todo list for the user.
juayhee Jan 20, 2022
e873f1c
Updated scope of abstract method in Command to public
juayhee Jan 20, 2022
a0644ae
Added AddTaskCommand and ListCommand
juayhee Jan 20, 2022
d0aec24
TaskManager.java: Changed taskList to use ArrayList instead of array …
juayhee Jan 20, 2022
1d0ed92
AddTaskCommand.java:
juayhee Jan 20, 2022
7fd4062
ListCommand.java: Added formatted taskList printing.
juayhee Jan 20, 2022
2f8c2dc
Added support for marking tasks as done/undone
juayhee Jan 20, 2022
bfabfc4
Revert "Added support for marking tasks as done/undone"
juayhee Jan 20, 2022
d0c7e0d
Revert "Revert "Added support for marking tasks as done/undone""
juayhee Jan 20, 2022
61656f5
Added Mark and UnmarkCommand, for keeping track of completion status …
juayhee Jan 20, 2022
57956c4
Formatting update
juayhee Jan 20, 2022
3cf225d
Mark/Unmark formatting update
juayhee Jan 20, 2022
248b305
Task inheritance
juayhee Jan 20, 2022
d82d80f
Added 3 types of tasks
juayhee Jan 20, 2022
b101bbd
Task.java: Updated tto become general parent class for the different …
juayhee Jan 20, 2022
8287dd3
CommandFactory.java: Added factory methods for 3 new tasks (Event, De…
juayhee Jan 20, 2022
3db0f4a
AddTaskCommand.java: Now adds the appropriate task to the TaskManager…
juayhee Jan 20, 2022
cfdfd2a
DeadlineTask: Formatting
juayhee Jan 20, 2022
2af976f
DeadlineTask.java: Comment update
juayhee Jan 20, 2022
4db97ca
EventTask.java: Completed functionality
juayhee Jan 20, 2022
47f5f59
Duke lines
juayhee Jan 20, 2022
966526c
Semi-automated testing
juayhee Jan 20, 2022
30de0fd
Exception handling:
juayhee Jan 20, 2022
5beda05
Added delete functionality for deleting tasks from the task list
juayhee Jan 20, 2022
d937b63
test commit
juayhee Feb 1, 2022
be5f127
Delete README.md copy
juayhee Feb 1, 2022
69a5f11
Update EXPECTED.TXT
juayhee Feb 2, 2022
74a2c76
Fix Issue #1
juayhee Feb 2, 2022
5a8e292
Duke.java: Add tasklist.txt file on init functionality
juayhee Feb 2, 2022
f69c29e
Update gitignore
juayhee Feb 2, 2022
7ad1b73
Merge branch 'master' of https://github.com/juayhee/ip
juayhee Feb 3, 2022
44d9e53
Update Duke.java
juayhee Feb 3, 2022
fb0dcd4
Update Duke.java
juayhee Feb 3, 2022
27ab11c
Update AddTaskCommand.java
juayhee Feb 3, 2022
c5b41cb
Merge branch 'master' into branch-Level-7
juayhee Feb 3, 2022
5d651b4
Update Task.java
juayhee Feb 3, 2022
3d44bb3
Update AddTaskCommand.java
juayhee Feb 3, 2022
bc740e1
Refactor the way Duke updates tasklist.txt
juayhee Feb 3, 2022
b2a7783
Add task saving ability
juayhee Feb 3, 2022
5d6fe8d
Added Duke functionality
juayhee Feb 4, 2022
a4f8f9c
Fix reader mistake in TaskManager.java
juayhee Feb 4, 2022
f15ab5d
Change file writing process
juayhee Feb 4, 2022
bbeb23c
TaskManager.java: Delete unused code
juayhee Feb 4, 2022
0956cbd
Change DeadlineTask.java
juayhee Feb 4, 2022
c083eea
Change date display
juayhee Feb 4, 2022
2ef087b
Merge branch 'branch-Level-8'
juayhee Feb 4, 2022
759928f
Add Ui to manage user interactions
juayhee Feb 4, 2022
3840260
ByeCommand.java: Move system print to Ui
juayhee Feb 4, 2022
80f7830
ListCommand.java: Move system print to Ui
juayhee Feb 4, 2022
e26c321
Ui.java: Improve output format of printAddTask()
juayhee Feb 4, 2022
b234b5f
MarkCommand.java: Move system print to ui
juayhee Feb 6, 2022
db98dc6
MarkCommand.java: Deprecate unused code
juayhee Feb 6, 2022
0bed81c
Duke.java: Move introduction print to ui
juayhee Feb 6, 2022
2361f53
DeleteCommand.java: Move delete confirmation print to ui
juayhee Feb 6, 2022
52bda78
UnmarkCommand.java: Move delete confirmation print to ui
juayhee Feb 6, 2022
85b1867
Delete a bunch of deprecated code
juayhee Feb 6, 2022
73ac0f4
Delete EchoCommand.java
juayhee Feb 6, 2022
c183af8
Duke.java: Delete deprecated formatting code
juayhee Feb 6, 2022
1d1dc1d
Rename TaskManager to TaskList
juayhee Feb 6, 2022
8096783
Replace CommandFactory with Parser
juayhee Feb 6, 2022
89bc29c
Refactor code
juayhee Feb 6, 2022
e31eb90
Move all files into package: duke
juayhee Feb 6, 2022
d786f16
Update gitignore
juayhee Feb 6, 2022
f7f91d0
no message
juayhee Feb 6, 2022
c19fdea
no message
juayhee Feb 6, 2022
a2f29b8
no message
juayhee Feb 6, 2022
1007b0c
no message
juayhee Feb 6, 2022
a5ce67d
Duke.java: Fix error where duke tries to load the tasklist before the…
juayhee Feb 6, 2022
7e7952b
Add ParserTest to test the parser for Duke
juayhee Feb 7, 2022
8019fe1
Update ParserTest with more tests
juayhee Feb 7, 2022
4d7e4e8
Add TaskTest.java to test Task.java of Duke
juayhee Feb 7, 2022
f804901
no message
juayhee Feb 7, 2022
4510ca1
Add javadocs header comments
juayhee Feb 7, 2022
8c54d0b
Formatting
juayhee Feb 7, 2022
1f545cd
Add search function for tasks
juayhee Feb 7, 2022
f373b0b
Merge branch 'branch-A-CodingStandard'
juayhee Feb 7, 2022
258aec9
Merge branch 'branch-A-JavaDoc'
juayhee Feb 7, 2022
684b1ed
Fix additional whitespaces during printing of list
juayhee Feb 7, 2022
20443e1
Merge remote-tracking branch 'origin/add-gradle-support'
juayhee Feb 9, 2022
f7cdf58
Gradle integration
juayhee Feb 9, 2022
2b225c7
Add GUI classes
juayhee Feb 9, 2022
ad9f2d3
Add GUI mockup
juayhee Feb 9, 2022
0921ff0
Add DialogBox stuff
juayhee Feb 9, 2022
80c0521
Edit GUI to make Duke display text on one side and the user display t…
juayhee Feb 14, 2022
6ade60a
Refactor userText variable
juayhee Feb 14, 2022
baf32d6
Link DukeGUI inputs to Duke
juayhee Feb 14, 2022
1944558
DukeGUI now prints output correctly
juayhee Feb 14, 2022
00d3761
Fix output formatting
juayhee Feb 14, 2022
2263420
Update Gradle build file
juayhee Feb 18, 2022
9988e6f
Add assertions
juayhee Feb 18, 2022
31c8ffb
Delete dead code
juayhee Feb 18, 2022
256c1e4
Merge pull request #3 from juayhee/branch-A-CodeQuality
juayhee Feb 18, 2022
46aa19e
Merge branch 'master' into branch-A-Assertions
juayhee Feb 18, 2022
5006aec
Merge pull request #4 from juayhee/branch-A-Assertions
juayhee Feb 18, 2022
a59d26f
Add command aliases to Duke
juayhee Feb 18, 2022
874de1e
Add product website, fix bugs
juayhee Feb 18, 2022
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ bin/

/text-ui-test/ACTUAL.txt
text-ui-test/EXPECTED-UNIX.TXT
tasklist.txt
59 changes: 59 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
plugins {
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '5.1.0'
}

repositories {
mavenCentral()
}

dependencies {
String javaFxVersion = '11'

// Junit
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'

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 = "duke.Launcher"
}

shadowJar {
archiveBaseName = "duke"
archiveClassifier = null
}


run{
standardInput = System.in
}
61 changes: 47 additions & 14 deletions docs/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,61 @@

## Features

### Feature-ABC
### Feature - Add Todo Task

Description of the feature.
Add a todo task to the list

### Feature-XYZ
Example of usage:
`todo (task)`
`t (task)`

Description of the feature.
### Feature - Add Deadline Task

## Usage
Add a deadline task to the list

### `Keyword` - Describe action
Example of usage:
`deadline (task) /by (date in YYYY-MM-DD format)`
`d (task) /by (date in YYYY-MM-DD format)`

Describe the action and its outcome.
### Feature - Add Event Task

Example of usage:
Add an event task to the list

`keyword (optional arguments)`
Example of usage:
`event (task) /at (event location)`
`e (task) /at (event location)`

Expected outcome:
### Feature - List tasks

Description of the outcome.
Lists the current tasklist

Example of usage:
`list`
`l`

### Feature - Mark and unmark tasks

Mark and unmark tasks as done

Example of usage:
`mark (index of task in list)`
`unmark (index of task in list)`
`m (index)`
`um (index)`

### Feature - Remove tasks

Remove tasks from list

Example of usage:
`delete (index of task in list)`
`del (index)`

### Feature - Find tasks

Find tasks in list based on matching text

Example of usage:
`find (text to search)`
`f (text)`

```
expected output
```
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
183 changes: 183 additions & 0 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading