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

[Gernene Tan] iP #290

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
beb8f9a
Complete Level 1
Gernene Jan 21, 2022
9ded4e3
Complete level 2
Gernene Jan 21, 2022
e67c0af
Finish level 3
Gernene Jan 21, 2022
034bc63
Complete level 4
Gernene Jan 22, 2022
0ba0124
Complete level 5
Gernene Jan 22, 2022
07c0ff2
Complete level 6
Gernene Jan 22, 2022
c210aea
Finish level 7
Gernene Jan 28, 2022
fd0d7fe
Finish level 8
Gernene Jan 28, 2022
2d7bf73
Merge branch-Level-8
Gernene Jan 28, 2022
1ebfdd4
Add more OOP
Gernene Jan 30, 2022
d7fb640
Reorganize code
Gernene Jan 30, 2022
7c14c12
Set up gradle and JUnit
Gernene Jan 31, 2022
9b70cc4
Resolve errors
Gernene Jan 31, 2022
9592aef
Fix gradle problems
Gernene Feb 1, 2022
f3f959a
Enable junit tests
Gernene Feb 2, 2022
1083b65
Add comments
Gernene Feb 2, 2022
57fb550
Tweak formatting
Gernene Feb 2, 2022
3d3ccda
Find tasks that match keyword
Gernene Feb 2, 2022
e49809d
Merge branch 'branch-A-CodingStandard'
Gernene Feb 2, 2022
413e3d5
Resolve merge conflicts
Gernene Feb 2, 2022
e420544
Add asserts
Gernene Feb 3, 2022
73ba75e
Refactor Parser.java
Gernene Feb 3, 2022
a6652d2
Merge pull request #1 from Gernene/branch-A-Assertions
Gernene Feb 3, 2022
e3c6824
Merge pull request #2 from Gernene/branch-A-CodeQuality
Gernene Feb 3, 2022
80768c0
Fix code standard violations
Gernene Feb 3, 2022
8058a73
Configure checkstyle
Gernene Feb 3, 2022
ba2ef08
Add UI support
Gernene Feb 3, 2022
0a6cfde
Add GUI
Gernene Feb 3, 2022
fbf9dba
Fix coding standard violations
Gernene Feb 5, 2022
8638af5
Fix test coding standard violations
Gernene Feb 5, 2022
3e03b92
Display UI
Gernene Feb 9, 2022
bd95e01
Merge pull request #3 from Gernene/branch-wk5
Gernene Feb 9, 2022
33819f5
Add contacts
Gernene Feb 10, 2022
1f2f28b
Fix bugs
Gernene Feb 18, 2022
40cb69d
Save list to harddisk
Gernene Feb 20, 2022
be87d3e
Style GUI
Gernene Feb 20, 2022
cd16506
Refine unit tests for Parser and Storage
Gernene Feb 21, 2022
8d23565
Create user guide
Gernene Feb 21, 2022
3fb5bae
Merge pull request #5 from Gernene/polish
Gernene Feb 21, 2022
3b68386
Polish minor details
Gernene Feb 26, 2022
94a58b4
Fix text wrap on dialog box
Gernene Feb 26, 2022
287e0df
Merge pull request #6 from Gernene/polish
Gernene Feb 26, 2022
6f7bcde
Fix text-wrapping issue
Gernene Mar 2, 2022
df43ef4
Exit UI on command
Gernene Mar 2, 2022
af39b16
Merge pull request #7 from Gernene/polish
Gernene Mar 2, 2022
a114595
Update build.gradle for win compatibility
Gernene Mar 18, 2022
73378ef
Improve contacts functionality
Gernene Mar 18, 2022
5e6721e
Improve error handling
Gernene Mar 19, 2022
c6b1b2e
Update GUI
Gernene Mar 19, 2022
d6fc622
Change button color
Gernene Mar 19, 2022
e24a712
Update UG
Gernene Mar 19, 2022
c1d909a
Merge pull request #9 from Gernene/polish
Gernene Mar 19, 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
6 changes: 6 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#
# https://help.github.com/articles/dealing-with-line-endings/
#
# These are explicitly windows files and should use crlf
*.bat text eol=crlf

11 changes: 10 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
*.class
/duke/
/duketest/

# IDEA files
/.idea/
/out/
Expand All @@ -14,4 +18,9 @@ src/main/resources/docs/
bin/

/text-ui-test/ACTUAL.txt
text-ui-test/EXPECTED-UNIX.TXT
text-ui-test/EXPECTED-UNIX.txt
# Ignore Gradle project-specific cache directory
.gradle

# Ignore Gradle build output directory
build
4 changes: 4 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"editor.detectIndentation": false,
"java.configuration.updateBuildConfiguration": "interactive"
}
48 changes: 48 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
/*
* This file was generated by the Gradle 'init' task.
*
* This is a general purpose Gradle build.
* Learn more about Gradle by exploring our samples at https://docs.gradle.org/7.3.3/samples
*/

plugins {
id 'java'
id 'application'
id 'checkstyle'
id 'com.github.johnrengelman.shadow' version '5.1.0'
}

application {
mainClassName "duke.Launcher"
}

checkstyle {
toolVersion = '8.29'
}

test {
useJUnitPlatform()
}

repositories {
mavenCentral()
}

dependencies {
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'
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'
}
Loading