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

[Huang Zhenxin] ip #249

Open
wants to merge 69 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
ec544ea
added Format
Hzxin Jan 19, 2021
36ea37f
implement add
Hzxin Jan 19, 2021
00974a0
add Task.java
Hzxin Jan 20, 2021
3ce9d79
Complete add and lsit feature
Hzxin Jan 20, 2021
14a32f9
Modify Task and complete Done feature
Hzxin Jan 20, 2021
b30b526
implement Todo
Hzxin Jan 20, 2021
8003231
fix bug for todo, add Deadline
Hzxin Jan 20, 2021
b0b8d22
bug fix for todo,deadline
Hzxin Jan 20, 2021
11f33a3
Simplifed code
Hzxin Jan 20, 2021
b78adb1
Bug fix for not adding event and deadline
Hzxin Jan 20, 2021
08786b1
Minor bug fix
Hzxin Jan 20, 2021
31f4e3a
A-TextUiTesting
Hzxin Jan 20, 2021
41befe9
Implement exception
Hzxin Jan 20, 2021
f6fb507
Add excepetions
Hzxin Jan 20, 2021
5f07877
change structure of taskList from array to arrayList
Hzxin Jan 20, 2021
3b31da6
Level-5, implemented Exception
Hzxin Jan 20, 2021
6304023
small change to variable name
Hzxin Jan 20, 2021
e91d398
Added JavacDoc
Hzxin Jan 20, 2021
36a0a9d
Added DukeDriver for simplicity
Hzxin Jan 22, 2021
200542a
Simplified Duke driver, modify exceptions and format
Hzxin Jan 22, 2021
c6f0ae8
Implemented Delete function
Hzxin Jan 22, 2021
dd0a77c
Javac doc
Hzxin Jan 22, 2021
792ef35
Allow Storing and loading of tasks, added more Format message, added …
Hzxin Jan 22, 2021
fe62045
Add in date and time feature, able to recognise yyyy-mm-dd format
Hzxin Jan 22, 2021
faa528e
merge with 8
Hzxin Jan 22, 2021
03cc005
updated text-ui-test with no date/Duke.txt file exists
Hzxin Jan 22, 2021
6a15b6c
Add InputProcessor to process user input and extract data for use
Hzxin Jan 27, 2021
baecee4
Change Format.java to Ui.java, modify Ui
Hzxin Jan 27, 2021
bd0b358
Add Command and subCommand, rename InputProcessor to Parser
Hzxin Jan 27, 2021
5659b8d
package the program into command, driver, exceptions, task, ui and utils
Hzxin Jan 27, 2021
e4b7bbe
Move Duke under package duke
Hzxin Jan 27, 2021
a65bcf2
Restructure Duke.exception, add in ParserTest, and new enum class Com…
Hzxin Jan 28, 2021
174ddbd
Pass excepetions handling to Parser, add in more Junit test for Parser
Hzxin Jan 28, 2021
bf65ada
add DateAndTimeTest TaskStorageTest, TaskTest
Hzxin Jan 29, 2021
5343518
Completed JavaDoc
Hzxin Jan 30, 2021
2b27c25
Fix according to java coding standard
Hzxin Jan 30, 2021
0350ec5
Implement find function and added TaskList class
Hzxin Jan 30, 2021
8e1e88a
Merge branch-A-CodingStandard
Hzxin Jan 30, 2021
d812a57
Fully merge branch-A-CodingStyle
Hzxin Jan 30, 2021
f066fe9
Resolve conflict for merging branch-Level-9
Hzxin Jan 30, 2021
df155f9
Add gradle support
Hzxin Jan 31, 2021
73e10a3
Change code according to checkstyle
Hzxin Jan 31, 2021
aac97e3
Fix some coding style issues
Hzxin Feb 1, 2021
abfaa7e
Remove capacity variable from Task and add getter for list size in Ta…
Hzxin Feb 1, 2021
5ec78ef
Gradle set up for JavaFx
Hzxin Feb 3, 2021
e0f0ae6
remove DukeDriver, implement GUI
Hzxin Feb 4, 2021
d2f5c98
Adjust GUI
Hzxin Feb 8, 2021
03fd31d
Add assertions
Hzxin Feb 8, 2021
5c5bdb9
Improve code quality
Hzxin Feb 8, 2021
ed73da6
Merge pull request #1 from Hzxin/branch-A-Assertions
Hzxin Feb 8, 2021
758eba4
Merge branch 'master' into branch-A-CodeQuality
Hzxin Feb 9, 2021
1bfef75
Merge pull request #2 from Hzxin/branch-A-CodeQuality
Hzxin Feb 9, 2021
057fd6b
Remove unneccessary line
Hzxin Feb 9, 2021
e0198bd
Improve code quality v1.2
Hzxin Feb 9, 2021
eec89bc
Merge branch 'branch-A-CodeQuality'
Hzxin Feb 9, 2021
6e63523
Improve code quality v2.0
Hzxin Feb 9, 2021
69be05d
Add statistics
Hzxin Feb 11, 2021
d431e8f
Complete JavaDocs and improve CodeQuality
Hzxin Feb 11, 2021
4e88e86
Improve CodeQuality
Hzxin Feb 11, 2021
d4ecfc2
Modify Test
Hzxin Feb 15, 2021
abdbfa8
A-BetterGui
Hzxin Feb 15, 2021
bd4056b
Add Ui.png
Hzxin Feb 15, 2021
0798a24
Add user guide
Hzxin Feb 15, 2021
172d77f
Modify User guide
Hzxin Feb 15, 2021
227568d
Modify User guy
Hzxin Feb 15, 2021
0b4c2df
minor bug fix
Hzxin Feb 15, 2021
dbec446
Finalize code
Hzxin Feb 17, 2021
b2faa0e
Small bug fix
Hzxin Feb 17, 2021
d7c7323
Bug fix for wrong response in Parser
Hzxin Feb 17, 2021
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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Duke project template
# duke project template

This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.

Expand All @@ -12,7 +12,7 @@ Prerequisites: JDK 11, update Intellij to the most recent version.
1. Select the project directory, and click `OK`.
1. If there are any further prompts, accept the defaults.
1. Configure the project to use **JDK 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).
1. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()`. If the setup is correct, you should see something like the below:
1. After that, locate the `src/main/java/duke.java` file, right-click it, and choose `Run duke.main()`. If the setup is correct, you should see something like the below:
```
Hello from
____ _
Expand Down
53 changes: 53 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
plugins {
id 'java'
id 'checkstyle'
id 'application'
id 'com.github.johnrengelman.shadow' version '5.1.0'
}

group 'org.example'
version ''

repositories {
mavenCentral()
}

dependencies {

implementation 'org.junit.jupiter:junit-jupiter:5.4.2'
implementation 'org.junit.jupiter:junit-jupiter:5.4.2'
testCompile group: 'junit', name: 'junit', version: '4.12'


//JavaFx
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()
}

application {
mainClassName = "duke.Duke"
}

shadowJar {
archiveBaseName = "Duke"
archiveClassifier = null
}

checkstyle {
toolVersion = '8.29'
}
Loading