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

[Shenyi] iP #520

Open
wants to merge 79 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
79 commits
Select commit Hold shift + click to select a range
556af3f
Add Gradle support
May 24, 2020
abb503a
chore: update gitignore to include .class
ShenyiCui Aug 17, 2022
80c7139
feature: complete level-1 criteria
ShenyiCui Aug 17, 2022
4eb21b7
feature: create Task class to store items added by user
ShenyiCui Aug 17, 2022
1657ee9
feature: add function for main to add tasks
ShenyiCui Aug 17, 2022
35408e0
feature: add task marking methods
ShenyiCui Aug 17, 2022
d338c7f
refactor: change mark and unmark output msg
ShenyiCui Aug 17, 2022
1cd9afa
feature: add control flow to mark and unmark command
ShenyiCui Aug 17, 2022
4d74029
feature: add new classes for subtypes of Task
ShenyiCui Aug 17, 2022
3b9e5dd
fix: fix infinite toString recursion error
ShenyiCui Aug 17, 2022
2339fe9
refactor: change user output logic for the creation of tasks
ShenyiCui Aug 17, 2022
75af629
feature: add-text-ui-testing
ShenyiCui Aug 17, 2022
87b7c20
feature: add exception handling
ShenyiCui Aug 17, 2022
f055b47
refactor: remove taskCount
ShenyiCui Aug 17, 2022
46f2a8e
feature: add Delete Feature
ShenyiCui Aug 17, 2022
3b31edc
feature: add enums
ShenyiCui Aug 17, 2022
078d67f
refactor: fix code with google-styleguide
ShenyiCui Aug 18, 2022
0be5907
refactor: refactor out logo into static constant
ShenyiCui Aug 18, 2022
a777310
feature: add new test cases
ShenyiCui Aug 18, 2022
8bec142
chore: update .gitignore to ignore vscode files
ShenyiCui Aug 18, 2022
41835b5
refactor: refactor java styles
ShenyiCui Aug 18, 2022
ed2f926
refactor: move logic for commands from Duke to Command
ShenyiCui Aug 19, 2022
6edd53d
chore: remove unused Commands file
ShenyiCui Aug 19, 2022
2920356
feature: add new AllTaskList to track all Tasks
ShenyiCui Aug 19, 2022
ec232d2
refactor: finish moving logic of commands from Duke to Command
ShenyiCui Aug 19, 2022
2ba32d6
refactor: refactor method to throw DukeException
ShenyiCui Aug 19, 2022
5e3fb89
refactor: refactor logic for error handling
ShenyiCui Aug 19, 2022
aecbfb5
refactor: refactor logic for Task Creation
ShenyiCui Aug 19, 2022
1200027
refactor: refactor output to user for add and delete
ShenyiCui Aug 19, 2022
3178152
refactor: create uniform execption handling with DukeException
ShenyiCui Aug 19, 2022
c273e2d
fix: fix user output bugs
ShenyiCui Aug 19, 2022
2c9fe9d
fix: styling indentation
ShenyiCui Sep 1, 2022
c16beda
feat: make classes serializable
ShenyiCui Sep 1, 2022
4e2ec5d
feat: create storage utility functions
ShenyiCui Sep 1, 2022
a5ad215
feat: init load and store from storage
ShenyiCui Sep 1, 2022
a444cda
feat: add storage initilizer
ShenyiCui Sep 1, 2022
5d3ff54
feat: add date-time support to Deadlines
ShenyiCui Sep 1, 2022
914a3a3
Merge branch 'branch-Level-7'
ShenyiCui Sep 1, 2022
a6f1fc3
Merge branch 'branch-Level-8'
ShenyiCui Sep 1, 2022
8c8c815
refactor: refactor duke into a package
ShenyiCui Sep 1, 2022
ebbe069
Merge branch 'add-gradle-support'
ShenyiCui Sep 1, 2022
6641d67
feat: add jUnit Tests
ShenyiCui Sep 1, 2022
b755a38
feat: add jar build
ShenyiCui Sep 1, 2022
5a6d455
fix: coding style for switch case
ShenyiCui Sep 1, 2022
b134563
feat: add javadocs
ShenyiCui Sep 1, 2022
fbd4c79
feat: fix coding standards of javadocs
ShenyiCui Sep 1, 2022
1e446bf
feat: add find function
ShenyiCui Sep 1, 2022
182d1d5
Merge branch 'branch-A-JavaDoc'
ShenyiCui Sep 1, 2022
63a519d
Merge branch 'branch-A-CodingStandard'
ShenyiCui Sep 1, 2022
4a911eb
Merge branch 'branch-Level-9'
ShenyiCui Sep 1, 2022
40626f0
feat: add checkstyle to project
ShenyiCui Sep 3, 2022
5ce1b67
refactor: refactor code to match checkstyle standards
ShenyiCui Sep 3, 2022
275daa1
feat: add GUI
ShenyiCui Sep 3, 2022
58e4c52
feat: use java fxml
ShenyiCui Sep 11, 2022
fb91479
feat: update gradle to build new jar
ShenyiCui Sep 11, 2022
56fc5d4
feat: add assertion for user input
ShenyiCui Sep 11, 2022
fa01737
refactor: refactor to adhere to SLAP
ShenyiCui Sep 11, 2022
2328a3c
refactor: apply SLAP to commands
ShenyiCui Sep 11, 2022
3a85c8d
refactor: refactor to remove complicated expression
ShenyiCui Sep 11, 2022
9daf9c7
refactor: adjust spacing for array
ShenyiCui Sep 11, 2022
734b316
feat: add view schedule
ShenyiCui Sep 11, 2022
423cea3
Merge pull request #2 from ShenyiCui/branch-A-Assertions
ShenyiCui Sep 11, 2022
bb6673a
Merge branch 'branch-A-CodeQuality'
ShenyiCui Sep 11, 2022
ebebfc8
Merge branch 'master' into branch-B-ViewSchedule
ShenyiCui Sep 11, 2022
0e16031
refactor: refactor to adhere to SLAP
ShenyiCui Sep 11, 2022
d6f85f4
refactor: apply SLAP to commands
ShenyiCui Sep 11, 2022
c49fc3e
refactor: refactor to remove complicated expression
ShenyiCui Sep 11, 2022
41b8af0
refactor: adjust spacing for array
ShenyiCui Sep 11, 2022
8fcf17c
Merge pull request #3 from ShenyiCui/branch-A-CodeQuality
ShenyiCui Sep 11, 2022
be3b017
Merge pull request #4 from ShenyiCui/branch-B-ViewSchedule
ShenyiCui Sep 11, 2022
f3512fc
feat: add ci/cd
ShenyiCui Sep 15, 2022
41e4a9e
fix: fix bad indents in ci/cd
ShenyiCui Sep 15, 2022
7510730
fix: change ci/cd from javac to ./gradlew
ShenyiCui Sep 15, 2022
ce239aa
style: fix checkstyle errors
ShenyiCui Sep 15, 2022
299c1f6
feat: change user and bot image
ShenyiCui Sep 15, 2022
1bbc349
docs: add Ui.png image
ShenyiCui Sep 15, 2022
4c9cdd1
docs: add user guide
ShenyiCui Sep 15, 2022
99acdac
fix: fix find function bug
ShenyiCui Sep 24, 2022
73c29be
docs: add more commands to the readme
ShenyiCui Sep 24, 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
11 changes: 11 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
name: CI

on: [pull_request, push]

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Check Compilation and Style
run: ./gradlew check
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
/out/
/*.iml

# VS Code files
/.vscode/

# Gradle build files
/.gradle/
/build/
src/main/resources/docs/
.class

# MacOS custom attributes files created by Finder
.DS_Store
Expand Down
19 changes: 12 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
# 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.
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.

## Setting up in Intellij

Prerequisites: JDK 11, 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 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 11** (not other versions) as explained in [here](https://www.jetbrains.com/help/idea/sdk.html#set-up-jdk).<br>
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 11** (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:
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
____ _
Expand Down
61 changes: 61 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
plugins {
id 'java'
id 'application'
id 'com.github.johnrengelman.shadow' version '5.1.0'
id 'checkstyle'
}

checkstyle {
toolVersion = '10.2'
}

repositories {
mavenCentral()
}

dependencies {
implementation 'org.junit.jupiter:junit-jupiter-api:5.5.1'
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
}

run {
standardInput = System.in
}
Loading