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

[flyingsalsa] ip #617

Open
wants to merge 140 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 65 commits
Commits
Show all changes
140 commits
Select commit Hold shift + click to select a range
68c58c1
Add Gradle support
May 24, 2020
03523ec
Bump gradle and lib version
Eclipse-Dominator Aug 5, 2023
81a9c53
build.gradle: Prevent generating a second JAR file
aureliony Jul 16, 2024
835935b
Duke.java: modify for Level-0
flyingsalsa Aug 22, 2024
0134609
Update Parser.java
flyingsalsa Aug 22, 2024
204c46d
Update Parser.java to take user input for Level-1
flyingsalsa Aug 22, 2024
277051d
Add Storage.java
flyingsalsa Aug 22, 2024
c395360
Modify Store.java to use Task Array
flyingsalsa Aug 22, 2024
d27a7f0
Modify Parse.java to save Text to Storage
flyingsalsa Aug 22, 2024
56d5606
Remove Echo from Parser
flyingsalsa Aug 22, 2024
d451c6f
Modify Duke to work with Parser for Level-2
flyingsalsa Aug 22, 2024
6c9be8d
Add mark and unmark to Parser for Level-3
flyingsalsa Aug 23, 2024
bee4594
Merge pull request #1 from flyingsalsa/develop
flyingsalsa Aug 23, 2024
64b3558
Add Todo, Event and Dealine.java
flyingsalsa Aug 23, 2024
cc75c82
Update todo.java to be functional
flyingsalsa Aug 23, 2024
4ad5e38
Modify Parser to incorporate Deadline and Event
flyingsalsa Aug 23, 2024
7027ba0
Update logic for Parser for Level-4
flyingsalsa Aug 23, 2024
053eca0
Add input.txt and expected.txt
flyingsalsa Aug 23, 2024
3c228b5
Add deletion to Parser
flyingsalsa Aug 23, 2024
13be10a
Change error messages for niche cases
flyingsalsa Aug 23, 2024
0a3b8e0
Update README.md
flyingsalsa Aug 23, 2024
22c3e2a
Update README.md
flyingsalsa Aug 23, 2024
13e3830
Update Code to conform to Standard
flyingsalsa Sep 1, 2024
505d361
Change name of Duke class to Notgpt
flyingsalsa Sep 1, 2024
20e2908
Reorder Text output from Notgpt startup
flyingsalsa Sep 1, 2024
3f59d94
Modify Storage to update data.txt
flyingsalsa Sep 1, 2024
c50b933
Add ability to save and load data for Level-7
flyingsalsa Sep 1, 2024
64539b3
Update .gitignore to ignore data
flyingsalsa Sep 1, 2024
e57bd03
Refactor package organization
flyingsalsa Sep 1, 2024
c063cf6
Modify Tasks to parse for LocalDates
flyingsalsa Sep 1, 2024
9696f5f
Refactor packages
flyingsalsa Sep 1, 2024
0364fd0
Merge branch 'add-gradle-support'
flyingsalsa Sep 1, 2024
7edfbf4
Update build.gradle
flyingsalsa Sep 1, 2024
485a933
Add test class to test directory
flyingsalsa Sep 1, 2024
ac1c626
Modify Parser for .jar
flyingsalsa Sep 1, 2024
8a83ced
Add find command to Parser
flyingsalsa Sep 1, 2024
058338e
Update .gitignore
flyingsalsa Sep 2, 2024
640d685
Update .gitignore
flyingsalsa Sep 2, 2024
20b43f8
Merge branch 'branch-Level-8'
flyingsalsa Sep 2, 2024
af883e4
Delete Data folder from commits
flyingsalsa Sep 2, 2024
03e0248
Update coding standards
flyingsalsa Sep 2, 2024
b2ce864
Merge branch 'branch-A-CodingStandard'
flyingsalsa Sep 2, 2024
c067d2b
Remove error.log
flyingsalsa Sep 2, 2024
9dfea4b
Merge branch 'branch-A-JavaDoc'
flyingsalsa Sep 2, 2024
5f9b5fe
Modify parser for Level-9
flyingsalsa Sep 2, 2024
7dd9c08
Merge branch 'branch-Level-9'
flyingsalsa Sep 2, 2024
67637c9
Rename done is Task to isDone
flyingsalsa Sep 3, 2024
ef214f8
Update README.md
flyingsalsa Sep 3, 2024
ff33a9a
Update README.md
flyingsalsa Sep 3, 2024
1bf6d62
Add whitespaces to conform to coding standard
flyingsalsa Sep 3, 2024
d045b60
Merge branch 'master' of https://github.com/flyingsalsa/ip
flyingsalsa Sep 3, 2024
418af20
Add Checkstyle files
flyingsalsa Sep 4, 2024
8379ae7
Modify build.gradle to run Checkstyle
flyingsalsa Sep 4, 2024
ba1cc9f
Add javadoc comments
flyingsalsa Sep 4, 2024
c58a324
Update Storage.java
flyingsalsa Sep 4, 2024
72c2d78
Update Task.java
flyingsalsa Sep 4, 2024
81fbb46
Add more Javadocs
flyingsalsa Sep 4, 2024
d10e930
Correct coding standards based on checkstyle
flyingsalsa Sep 4, 2024
9ddd44a
Update build.gradle
flyingsalsa Sep 5, 2024
d0c2079
Create TextBotApp class to handle JavaFX UI
flyingsalsa Sep 5, 2024
f254ee3
Update Notgpt.java
flyingsalsa Sep 6, 2024
47f81e3
Merge branch 'branch-Level-10'
flyingsalsa Sep 6, 2024
263dfbb
Update TextBotApp to run properly
flyingsalsa Sep 6, 2024
ef5d749
Integrate Parser with TextbotApp
flyingsalsa Sep 6, 2024
41ef794
Update Class names
flyingsalsa Sep 6, 2024
1d147f6
Fix shadowjar
flyingsalsa Sep 7, 2024
68b806c
Rename variables
flyingsalsa Sep 8, 2024
355750b
Update Notgpt
flyingsalsa Sep 8, 2024
1e1c57b
Update README.md
flyingsalsa Sep 11, 2024
befeba5
Add Assertions to Parser
flyingsalsa Sep 11, 2024
67dca96
Merge branch 'branch-A-Assertions'
flyingsalsa Sep 11, 2024
ae156c4
Bye command: make bye actually terminate the programe
flyingsalsa Sep 11, 2024
687ecd0
Merge Commit from master
flyingsalsa Sep 11, 2024
67b740f
Update code to conform to coding standards
flyingsalsa Sep 11, 2024
9111a1d
Merge branch 'branch-A-CodeQuality'
flyingsalsa Sep 11, 2024
aabea7c
Move gradle.yml into appropriate folder
flyingsalsa Sep 11, 2024
4812093
Test CI
flyingsalsa Sep 11, 2024
9bcf330
Update gradle.yml
flyingsalsa Sep 11, 2024
038cf87
Update gradle.yml
flyingsalsa Sep 11, 2024
1ba4a0e
Update NotgptJavaFX.java
flyingsalsa Sep 11, 2024
c0de161
Update NotgptJavaFX.java
flyingsalsa Sep 11, 2024
63c175f
Create DayToDate parser
flyingsalsa Sep 11, 2024
8459837
Update DayToDateParser
flyingsalsa Sep 11, 2024
9e9a69b
Add JavaDoc for DayToDateParser
flyingsalsa Sep 11, 2024
38e8184
Merge pull request #4 from flyingsalsa/branch-A-Streams
flyingsalsa Sep 12, 2024
bf47d63
Merge branch 'master' into branch-A-CodeQuality
flyingsalsa Sep 12, 2024
09702e4
Merge pull request #3 from flyingsalsa/branch-A-CodeQuality
flyingsalsa Sep 12, 2024
d32e65f
Update NotgptJavaFX.java to conform to checkstyle
flyingsalsa Sep 12, 2024
5cbf385
Update codingStandard
flyingsalsa Sep 12, 2024
c85e674
Refactor code for DayToDateParser
flyingsalsa Sep 12, 2024
479b7fc
Add Command Classes to comply with OOP standards
flyingsalsa Sep 12, 2024
048466f
Reformat Packages
flyingsalsa Sep 12, 2024
263ef8e
Update code to conform with checkstyle
flyingsalsa Sep 12, 2024
d67b412
Update gradle.yml
flyingsalsa Sep 14, 2024
db59b60
Update Notgpt.java
flyingsalsa Sep 14, 2024
3e543ca
Update README.md
flyingsalsa Sep 14, 2024
185b680
Rename DataParser
flyingsalsa Sep 18, 2024
cf99cf6
Update GUI
flyingsalsa Sep 20, 2024
8f86adb
Update GUI
flyingsalsa Sep 20, 2024
4a35d45
Merge remote-tracking branch 'origin/master'
flyingsalsa Sep 20, 2024
766c44f
Add Ui.png
flyingsalsa Sep 20, 2024
8dee162
Fix Coding Style
flyingsalsa Sep 20, 2024
211a79b
Update Gui
flyingsalsa Sep 20, 2024
d24aefc
Fix textbox truncation bug
flyingsalsa Sep 20, 2024
19d7452
update Ui.png
flyingsalsa Sep 20, 2024
c6a1b48
Update DateParser.java
flyingsalsa Sep 20, 2024
52959fa
Fix code checkstyle requirements
flyingsalsa Sep 20, 2024
3be7a70
Update README.md
flyingsalsa Sep 20, 2024
2099578
Create _config.yml
flyingsalsa Sep 20, 2024
294a798
Update _config.yml
flyingsalsa Sep 20, 2024
33e3d2c
Update README.md
flyingsalsa Sep 20, 2024
e5df87d
Update README.md
flyingsalsa Sep 20, 2024
33f2a33
Update _config.yml
flyingsalsa Sep 20, 2024
feef68a
Update README.md
flyingsalsa Sep 20, 2024
b46af49
Update _config.yml
flyingsalsa Sep 20, 2024
ad7d1b3
Update README.md
flyingsalsa Sep 20, 2024
b070c5f
Update README.md
flyingsalsa Sep 20, 2024
f51e8bc
Update _config.yml
flyingsalsa Sep 20, 2024
7a06719
Update README.md
flyingsalsa Sep 20, 2024
3f52b17
Update README.md
flyingsalsa Sep 20, 2024
55eb7f4
Update README.md
flyingsalsa Sep 20, 2024
162393d
Update README.md
flyingsalsa Sep 20, 2024
d6ed243
Update README.md
flyingsalsa Sep 20, 2024
93cab57
Update README.md
flyingsalsa Sep 20, 2024
69e6c5c
Update README.md
flyingsalsa Sep 20, 2024
f431848
Update README.md
flyingsalsa Sep 21, 2024
dd4f7fb
Adjust Chatbot Output
flyingsalsa Sep 21, 2024
20db3e3
Merge branch 'master' of https://github.com/flyingsalsa/ip
flyingsalsa Sep 21, 2024
4771efa
Update README.md
flyingsalsa Sep 21, 2024
ab0e16f
Update README.md
flyingsalsa Sep 21, 2024
b5e47a2
Update README.md
flyingsalsa Sep 21, 2024
e2b7caf
Update NumberCommandTest.java
flyingsalsa Sep 21, 2024
154c256
Merge branch 'master' of https://github.com/flyingsalsa/ip
flyingsalsa Sep 21, 2024
9a6cc1b
Update Ui.png
flyingsalsa Sep 21, 2024
39cd442
Update README.md
flyingsalsa Oct 4, 2024
8ec18fc
Update README.md
flyingsalsa Oct 4, 2024
14fee38
Update README.md
flyingsalsa Oct 4, 2024
0a27ac7
Update README.md
flyingsalsa Oct 5, 2024
53c7578
Update README.md
flyingsalsa Oct 5, 2024
749ed72
Update README.md
flyingsalsa Oct 15, 2024
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ src/main/resources/docs/
bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT
/text-ui-test/EXPECTED-UNIX.TXT
/data/
3 changes: 3 additions & 0 deletions META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: duke.ui.Notgpt

38 changes: 18 additions & 20 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,24 +1,22 @@
# Duke project template
# Not-gpt

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.
This is a project is a basic chatbot which can be used to keep track of your tasks at hand.
Head to [releases](https://github.com/flyingsalsa/ip/releases/tag/v0.1.1) on how to use it!

## Setting up in Intellij
## Commands
### Note that all commands are NOT case-sensitive and the very FIRST word before a whitespace will be read as the command. <br> Most commands must be of the form (command) xxx where xxx is follow up text. For example,
`todo new task`
### where "todo" is the (command) and "new task" is the follow up text xxx.

## Basic commands
1. **list** - gives a list of all current tasks, all text after list will not be read
1. **mark** - marks task given in the follow up text as completed by filling in the empty [ ] with a cross [X]. Follow up text must be a valid integer.
1. **unmark** - unmarks a task given in the follow up text as completed reverting the [X] to a [ ]. Follow up text must be a valid integer.
1. **delete** - deletes task given in the follow up text. Follow up text must be a valid integer.
2. **find** - searches through all tasks and returns a list of tasks that contain the followup text.
## duke.Tasks.Task addition commands
5. **todo** -
6. **event** -
7. **deadline** -

Prerequisites: JDK 17, update Intellij to the most recent version.

1. Open Intellij (if you are not in the welcome screen, click `File` > `Close Project` to close the existing project first)
1. Open the project into Intellij as follows:
1. Click `Open`.
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 17** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).<br>
In the same dialog, set the **Project language level** field to the `SDK default` option.
3. After that, locate the `src/main/java/Duke.java` file, right-click it, and choose `Run Duke.main()` (if the code editor is showing compile errors, try restarting the IDE). If the setup is correct, you should see something like the below as the output:
```
Hello from
____ _
| _ \ _ _| | _____
| | | | | | | |/ / _ \
| |_| | |_| | < __/
|____/ \__,_|_|\_\___|
```
71 changes: 71 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
plugins {
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '7.1.2'
id 'checkstyle'
id 'org.openjfx.javafxplugin' version '0.0.13'
}

repositories {
mavenCentral()
}

dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'

String javaFxVersion = '17.0.7'

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'
}

javafx {
version = "17"
modules = [ 'javafx.controls', 'javafx.fxml' ]
}

test {
useJUnitPlatform()

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

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

application {
mainClass.set("duke.ui.NotgptJavaFX")
}

shadowJar {
archiveBaseName = "notGPT"
archiveClassifier = null
}

run{
standardInput = System.in
}

processResources {
from("$rootDir/resources")
}

checkstyle {
toolVersion = '10.2'
}
Loading