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

[CS2103-W14-3]: ConText #63

Open
wants to merge 684 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
684 commits
Select commit Hold shift + click to select a range
94ff00b
Put dependency arrows back
mamayuan Nov 1, 2023
95a6e13
Remove termination red cross from the sequence diagrams
mamayuan Nov 1, 2023
540e045
Missed out something for Messages.java
mamayuan Nov 1, 2023
4e63c77
docs(UG): Detailed add/edit. Order, add section
Cloud7050 Nov 1, 2023
6cca527
feat(UI): Card without empty spaces
Cloud7050 Nov 1, 2023
803be1c
Amend UG for Alternate Command format in Editing a Contact and
rayshawntan Nov 1, 2023
83d6dcb
docs(UG): Detailed find
Cloud7050 Nov 1, 2023
7a428d0
docs(UG): Detailed delete/clear. Reuse alerts
Cloud7050 Nov 1, 2023
cc4ecd4
docs(): Finish up features section for now
Cloud7050 Nov 1, 2023
f49cfb1
docs(DG): Add planned enhancements appendix stub
Cloud7050 Nov 1, 2023
ba76dd6
docs(UG): Add some known limitations
Cloud7050 Nov 1, 2023
6edc03d
docs(UG): American spelling for consistency
Cloud7050 Nov 1, 2023
a635c64
docs(UG): Add linebreaks
Cloud7050 Nov 1, 2023
28aa905
Update docs for filter command
bwangpj Nov 2, 2023
0a86f77
Merge pull request #139 from rayshawntan/add-alternate-contact
bwangpj Nov 2, 2023
bad925d
Merge pull request #134 from mamayuan/DG-diagrams
bwangpj Nov 2, 2023
36776fb
Merge branch 'master' into ug
Cloud7050 Nov 2, 2023
78bb1b4
feat(GuiSettings): Larger default window
Cloud7050 Nov 2, 2023
5c86042
feat(MainWindow): Increase output height
Cloud7050 Nov 2, 2023
5230bff
Update UserGuide.md
bwangpj Nov 2, 2023
32a4213
dev(src): Make failing test
Cloud7050 Nov 2, 2023
b9722f9
feat(src): Pass parent folder test
Cloud7050 Nov 2, 2023
0500113
Specify duplicate contact handling
bwangpj Nov 2, 2023
751089f
Merge pull request #141 from bwangpj/filter-docs
rayshawntan Nov 2, 2023
f1604e9
Merge pull request #140 from Cloud7050/card
rayshawntan Nov 2, 2023
4c3700a
Merge branch 'master' into Update-DG
rayshawntan Nov 2, 2023
342d5ad
Merge branch 'master' into ug
Cloud7050 Nov 2, 2023
8970cc4
Update DG to remove AB3 references
rayshawntan Nov 2, 2023
3796399
Merge pull request #142 from Cloud7050/size
bwangpj Nov 2, 2023
e777dbc
Merge pull request #144 from Cloud7050/file
bwangpj Nov 2, 2023
5fb1b5f
Merge pull request #137 from Cloud7050/ug
bwangpj Nov 2, 2023
2d1d6b4
Update UserGuide.md
bwangpj Nov 2, 2023
ef06abd
docs(): Fix indent becoming code in block div
Cloud7050 Nov 2, 2023
d3be53a
Merge pull request #145 from rayshawntan/Update-DG
Cloud7050 Nov 2, 2023
c5006ff
docs(): Fix line breaks in div
Cloud7050 Nov 2, 2023
613b140
docs(): Use no-break space char to force code
Cloud7050 Nov 2, 2023
248c451
docs(): Change to info alerts
Cloud7050 Nov 2, 2023
f673557
Merge branch 'master' of https://github.com/AY2324S1-CS2103-W14-3/tp
Cloud7050 Nov 2, 2023
39386f2
docs(UG): Edit repeated wording
Cloud7050 Nov 2, 2023
0575bdc
Merge branch 'master' into duplicate-contacts
Cloud7050 Nov 2, 2023
a56b847
Merge pull request #143 from bwangpj/duplicate-contacts
Cloud7050 Nov 2, 2023
d63ce52
docs(UG): Reorder clear caution
Cloud7050 Nov 2, 2023
1e65614
docs(index): Fix merge adding back dupe section
Cloud7050 Nov 2, 2023
a3cd58d
Allow switching between command history
bwangpj Nov 2, 2023
e11528e
Tests for switching between command history
bwangpj Nov 2, 2023
1b63090
Update CommandBoxHistoryTest.java
bwangpj Nov 2, 2023
4f1e3a9
Update CommandBoxHistoryTest.java
bwangpj Nov 2, 2023
2230f71
Update CommandBoxHistoryTest.java
bwangpj Nov 2, 2023
eea8204
Update UserGuide.md
bwangpj Nov 2, 2023
7275a62
Fix/Add some details
mamayuan Nov 2, 2023
4452c55
Fix/Add details for DG
mamayuan Nov 2, 2023
fa840db
Merge pull request #147 from bwangpj/command-history
rayshawntan Nov 2, 2023
8e60194
feat(main): More realistic/varied sample contacts
Cloud7050 Nov 2, 2023
caf1d93
docs(): Tweaks for new samples
Cloud7050 Nov 2, 2023
e6e111f
feat(): Merge add command usage
Cloud7050 Nov 2, 2023
21a48e3
feat(Contact): Format sets with string glue
Cloud7050 Nov 2, 2023
8e3c63a
feat(main): Merge edit command usage
Cloud7050 Nov 2, 2023
89df947
feat(main): Merge delete command usage
Cloud7050 Nov 2, 2023
014272a
dev(gradle): Clean app data/log files
Cloud7050 Nov 2, 2023
6d99674
dev(gradle): Don't delete config
Cloud7050 Nov 2, 2023
b704a02
feat(src): Message edits
Cloud7050 Nov 2, 2023
fe46d62
fix(src): Fix tests with message reuse
Cloud7050 Nov 2, 2023
a908c70
feat(main): Merge find command usage
Cloud7050 Nov 2, 2023
ea3cb9a
feat(): Tweak names, formatting
Cloud7050 Nov 2, 2023
98f8afb
docs(UG): Fix filter keywords being optional
Cloud7050 Nov 2, 2023
4070deb
feat(): Merge filter command usage with UG
Cloud7050 Nov 2, 2023
7044213
fix(src): Fix CS2103 typos
Cloud7050 Nov 2, 2023
05adbd8
feat(src): Improve help command's uses
Cloud7050 Nov 2, 2023
cb4122a
docs(): Update from mockup to v1.3 UI
Cloud7050 Nov 2, 2023
7c76f8a
style(Messages): Fix checkstyle
Cloud7050 Nov 2, 2023
27dc1eb
style(main): Fix checkstyle
Cloud7050 Nov 2, 2023
52e92d4
style(Messages): Fix checkstyle
Cloud7050 Nov 2, 2023
cdfb456
style(test): Fix checkstyle
Cloud7050 Nov 2, 2023
3ec8d2a
feat(Messages): Make alternate match docs
Cloud7050 Nov 2, 2023
5c04f67
Merge pull request #149 from Cloud7050/msg
bwangpj Nov 3, 2023
a1af8e1
Merge branch 'master' of https://github.com/AY2324S1-CS2103-W14-3/tp …
mamayuan Nov 3, 2023
1fe0858
Fix issues
mamayuan Nov 3, 2023
b660be2
Merge pull request #148 from mamayuan/UG-Fix
Cloud7050 Nov 3, 2023
3f8ad21
fix(ContactCard): Fix note comparison
Cloud7050 Nov 4, 2023
efabab6
Merge branch 'master' into bug-fix
rayshawntan Nov 7, 2023
2124182
Adds command summary table
mamayuan Nov 8, 2023
5fbe71b
Merge pull request #182 from Cloud7050/note-empty
Cloud7050 Nov 8, 2023
9d303f6
Merge branch 'master' into bug-fix
rayshawntan Nov 8, 2023
ffc1fa3
Some changes
mamayuan Nov 8, 2023
c745e9e
Update DG and UG, Phone.java, AlternateContact.java,
rayshawntan Nov 8, 2023
51dac8c
Update UG to mention what users can see when clicking label
rayshawntan Nov 8, 2023
f505258
Update UserGuide.md
bwangpj Nov 8, 2023
fe0e5fc
Update UserGuide.md
bwangpj Nov 8, 2023
8874672
Update UserGuide.md
bwangpj Nov 9, 2023
0a5ca0c
Update UserGuide.md
bwangpj Nov 9, 2023
77035a0
Merge pull request #195 from bwangpj/filter-docs-2
bwangpj Nov 9, 2023
973fc76
Merge pull request #194 from bwangpj/duplicate
bwangpj Nov 9, 2023
e3612f9
Labelling of contact info in UI
bwangpj Nov 9, 2023
2b6a01f
Amend Messages.java and Phone.java
rayshawntan Nov 9, 2023
d10242b
Update naming of ContactCard
bwangpj Nov 9, 2023
1a59e0e
Delete unwanted user stories
mamayuan Nov 9, 2023
a8aa348
Add example for delete in UG
mamayuan Nov 9, 2023
8fadf0e
Merge pull request #191 from mamayuan/UG/DG-1.4
rayshawntan Nov 9, 2023
cf55c8c
Add a few more user stories
mamayuan Nov 9, 2023
f8ca7f5
Factoring on the long execute method.
mamayuan Nov 9, 2023
7575f07
Merge pull request #196 from bwangpj/indexing
Cloud7050 Nov 9, 2023
24d7691
Some changes for better readability
mamayuan Nov 9, 2023
417cae3
Remove unused import
mamayuan Nov 9, 2023
7254c62
Test null for AddCommand
mamayuan Nov 9, 2023
95bdc66
docs(DG): Move acknowledgements to bottom
Cloud7050 Nov 9, 2023
da1e3c2
Changes based on discussion
mamayuan Nov 9, 2023
036e804
docs(DG): Scrap extra pages
Cloud7050 Nov 9, 2023
03a3dc7
docs(DG): Add appendix, edit TODOs
Cloud7050 Nov 9, 2023
2f62410
Amend DG, UG, Phone.java, PhoneTest.java
rayshawntan Nov 9, 2023
d5b6717
Merge branch 'master' into bug-fix
rayshawntan Nov 9, 2023
00e1bae
docs(PPP): Lay out sections to do
Cloud7050 Nov 9, 2023
0e3f729
docs(UG): Add comment about non-breaking space
Cloud7050 Nov 9, 2023
ad39006
docs(PPP): Add overview desc from index
Cloud7050 Nov 9, 2023
04569d5
docs(UG): Mark comment as note
Cloud7050 Nov 9, 2023
c983db7
docs(PPP): Add UG/DG contrib, add note
Cloud7050 Nov 9, 2023
8e137c1
docs(PPP): Add initial team-based tasks
Cloud7050 Nov 9, 2023
54a5c98
docs(PPP): Fill more sections, enhance previous
Cloud7050 Nov 10, 2023
85c666b
Merge pull request #202 from Cloud7050/scrap-extra
rayshawntan Nov 10, 2023
c854533
Resolve merge conflicts, refactor regex in AlternateContact.java
rayshawntan Nov 10, 2023
eb95d43
Merge branch 'master' into project-portfolio-page
rayshawntan Nov 10, 2023
0657410
Update bwangpj.md
bwangpj Nov 10, 2023
168ca83
Merge pull request #203 from Cloud7050/ppp-real
bwangpj Nov 10, 2023
097f961
Merge pull request #204 from bwangpj/ppp
rayshawntan Nov 10, 2023
08809fd
Update PPP draft
rayshawntan Nov 10, 2023
830d71a
Update DeveloperGuide.md
bwangpj Nov 10, 2023
5771d53
Update DeveloperGuide.md
bwangpj Nov 10, 2023
9c74885
Update DeveloperGuide.md
bwangpj Nov 10, 2023
1812344
Update DeveloperGuide.md
bwangpj Nov 10, 2023
b317f9e
Explain that 'empty' fields are not allowed
bwangpj Nov 10, 2023
0d55019
Update DeveloperGuide.md
bwangpj Nov 10, 2023
00c88b0
Update DeveloperGuide.md
bwangpj Nov 10, 2023
c920dea
EditCommandTest
mamayuan Nov 9, 2023
f6070bd
EditCommandTest
mamayuan Nov 9, 2023
769291d
FilterCommandTest
mamayuan Nov 9, 2023
37d9218
Fix bugs
mamayuan Nov 10, 2023
c0e3a36
A quick draft
mamayuan Nov 10, 2023
b2657eb
Update UserGuide.md
bwangpj Nov 10, 2023
1e01dcb
Merge pull request #208 from mamayuan/PPP-draft
Cloud7050 Nov 10, 2023
6b8b01d
Update ContactCard.png
bwangpj Nov 10, 2023
5462b86
Merge pull request #197 from bwangpj/ui-screenshot
mamayuan Nov 10, 2023
18fa509
Update PPP
rayshawntan Nov 10, 2023
c2c3678
Merge pull request #205 from rayshawntan/project-portfolio-page
rayshawntan Nov 10, 2023
05f8d74
Update DG and UG for phrasing of certain terms
rayshawntan Nov 10, 2023
b112789
AddCommandTest
mamayuan Nov 10, 2023
a4a3e69
FindCommandTest
mamayuan Nov 10, 2023
1064c58
ListCommandTest
mamayuan Nov 10, 2023
0562783
Parsers
mamayuan Nov 10, 2023
4b3398d
ModelManager
mamayuan Nov 10, 2023
be97140
StringUtilTest
mamayuan Nov 10, 2023
4f12529
AlternateContact
mamayuan Nov 10, 2023
ed1d427
Checkstyle
mamayuan Nov 10, 2023
54534c3
Fix issues
mamayuan Nov 10, 2023
e1a62cf
Merge branch 'master' into Update-DG
rayshawntan Nov 11, 2023
6dbc6cd
Update UG to show support for manual editing of data and FAQ on
rayshawntan Nov 11, 2023
28d3295
Update use cases in DG
rayshawntan Nov 11, 2023
cc5836f
Update extensions in use cases in DG
rayshawntan Nov 11, 2023
a00cafe
Checkstyle
mamayuan Nov 11, 2023
ad29221
Add back icon user story
mamayuan Nov 11, 2023
1f4afe7
Add more
mamayuan Nov 11, 2023
f6ed66e
Add manual testing section
mamayuan Nov 11, 2023
c665803
Add more test to improve codecov
rayshawntan Nov 12, 2023
43b7503
Test JsonContacts
mamayuan Nov 12, 2023
ef4a6a9
Test JsonAlternateContact
mamayuan Nov 12, 2023
4589cb7
Checkstyle
mamayuan Nov 12, 2023
d397408
Test JsonContact
mamayuan Nov 12, 2023
fc44abe
imports
mamayuan Nov 12, 2023
6f0b8ae
docs(DG): Fix missing whitespace
Cloud7050 Nov 12, 2023
4a7c697
Merge pull request #210 from rayshawntan/update-UG
Cloud7050 Nov 12, 2023
ce6aeaf
Merge pull request #213 from rayshawntan/add-tests
Cloud7050 Nov 12, 2023
8626977
docs(PPP): Shorten headers' margin-top
Cloud7050 Nov 13, 2023
d72bf8d
docs(PPP): Add lines
Cloud7050 Nov 12, 2023
c4a9e50
docs(PPP): Greatly shorten for page limit
Cloud7050 Nov 13, 2023
c4f9e40
docs(PPP): Enhancements, finish up
Cloud7050 Nov 13, 2023
dde8283
Merge pull request #214 from Cloud7050/ppp-final
rayshawntan Nov 13, 2023
dd8f321
Update UserGuide.md
bwangpj Nov 13, 2023
e5f9068
Update UserGuide.md
bwangpj Nov 13, 2023
0b3320d
Update DeveloperGuide.md
bwangpj Nov 13, 2023
9907b24
Merge branch 'master' into project-portfolio-page
rayshawntan Nov 13, 2023
af7c737
Implementation of command history navigation in DG
bwangpj Nov 13, 2023
5c0595c
Update UserGuide.md
bwangpj Nov 13, 2023
6bdd74a
Update CommandBoxHistoryTest.java
bwangpj Nov 13, 2023
b88b12a
Merge branch 'master' into planned-enhancements
bwangpj Nov 13, 2023
9901a96
Update DeveloperGuide.md
bwangpj Nov 13, 2023
60601c1
Merge branch 'planned-enhancements' of https://github.com/bwangpj/tp …
bwangpj Nov 13, 2023
5000360
Merge pull request #206 from bwangpj/planned-enhancements
bwangpj Nov 13, 2023
d239600
Merge branch 'master' into More-Tests
bwangpj Nov 13, 2023
a52b32c
Merge pull request #201 from mamayuan/Update-User-StorIES
bwangpj Nov 13, 2023
45a2d5d
Merge pull request #209 from mamayuan/More-Tests
bwangpj Nov 13, 2023
cfa9721
Update UserGuide.md
bwangpj Nov 13, 2023
0cd598f
Update DeveloperGuide.md
bwangpj Nov 13, 2023
7c87351
Update my PPP
rayshawntan Nov 13, 2023
8235fa1
Merge branch 'master' into Update-DG
rayshawntan Nov 13, 2023
0ba1ab3
Update use cases in DG
rayshawntan Nov 13, 2023
86b10ef
Merge pull request #216 from bwangpj/ug-filter-formatting
rayshawntan Nov 13, 2023
09c3daa
Merge pull request #215 from bwangpj/dg-commandboxhistory
rayshawntan Nov 13, 2023
b147b7a
Merge pull request #207 from bwangpj/ug-empty-input
rayshawntan Nov 13, 2023
7dcd097
Update bwangpj.md
bwangpj Nov 13, 2023
4d82446
Add full stops for consistency
rayshawntan Nov 13, 2023
da7b0ef
Merge pull request #211 from rayshawntan/Update-DG
Cloud7050 Nov 13, 2023
a5cbf48
docs(DG): Consistency tweaks
Cloud7050 Nov 13, 2023
c117e37
Resolve merge conflicts
rayshawntan Nov 13, 2023
9f04525
docs(DG): Split enhancements into lines
Cloud7050 Nov 13, 2023
c912f39
docs(DG): Also warn for duplicate tags
Cloud7050 Nov 13, 2023
06c9c50
docs(DG): Edit explicitly empty note warning
Cloud7050 Nov 13, 2023
e948dcd
docs(DG): Also warn for dupe alternates
Cloud7050 Nov 13, 2023
f90a2cd
docs(DG): Elaborate for phone number warning
Cloud7050 Nov 13, 2023
8a3a211
docs(DG): Merge + into alternates, elaborate
Cloud7050 Nov 13, 2023
2d9b722
docs(PPP): Update for enhancements
Cloud7050 Nov 13, 2023
e76cd2c
Simplify code to improve code quality
bwangpj Nov 13, 2023
dbf3187
Update CommandBoxHistory.java
bwangpj Nov 13, 2023
ed1f1f3
Revert "Update CommandBoxHistory.java"
bwangpj Nov 13, 2023
6ee12af
Merge pull request #219 from bwangpj/simplify-code
rayshawntan Nov 13, 2023
880ae8a
Merge pull request #218 from Cloud7050/enhancements
bwangpj Nov 13, 2023
fc5598f
Merge branch 'master' of https://github.com/AY2324S1-CS2103-W14-3/tp …
mamayuan Nov 13, 2023
b75aa64
Remove stuff that repeats AB3
mamayuan Nov 13, 2023
745f670
Merge branch 'master' of https://github.com/AY2324S1-CS2103-W14-3/tp …
mamayuan Nov 13, 2023
d6a1fa4
Merge pull request #217 from rayshawntan/project-portfolio-page
rayshawntan Nov 13, 2023
89cc9ad
Wrap up
mamayuan Nov 13, 2023
24410b8
Resolve merge conflicts
rayshawntan Nov 13, 2023
7221b74
Trimming
mamayuan Nov 13, 2023
7580407
Update bwangpj.md
bwangpj Nov 13, 2023
a4f9432
Merge pull request #212 from mamayuan/DG-Manual-Testing
Cloud7050 Nov 13, 2023
e309ce1
Update bwangpj.md
bwangpj Nov 13, 2023
5458443
Merge pull request #220 from mamayuan/MY-PPP
mamayuan Nov 13, 2023
614f587
Merge pull request #221 from bwangpj/ppp-finalise
rayshawntan Nov 13, 2023
f1ff8ce
Merge pull request #193 from rayshawntan/bug-fix
rayshawntan Nov 13, 2023
b7f2277
Update UserGuide.md
bwangpj Nov 13, 2023
1e35ff8
Merge pull request #223 from bwangpj/review
Cloud7050 Nov 13, 2023
61b1514
Update UserGuide.md
bwangpj Nov 13, 2023
4176dad
Update DeveloperGuide.md
bwangpj Nov 13, 2023
577a713
Update DeveloperGuide.md
bwangpj Nov 13, 2023
8a79ecc
Documentation review
bwangpj Nov 13, 2023
ca79741
Update DeveloperGuide.md
bwangpj Nov 13, 2023
9c706cf
Update DeveloperGuide.md
bwangpj Nov 13, 2023
e8d6158
Update DeveloperGuide.md
bwangpj Nov 13, 2023
067dbf9
Review
bwangpj Nov 13, 2023
11aa0b1
Update DeveloperGuide.md
bwangpj Nov 13, 2023
770f36e
UML
bwangpj Nov 13, 2023
dc8afb9
Update DeveloperGuide.md
bwangpj Nov 13, 2023
13542c7
Update DeveloperGuide.md
bwangpj Nov 13, 2023
608f3d9
Update DeveloperGuide.md
bwangpj Nov 13, 2023
0f4fe4e
Update DeveloperGuide.md
bwangpj Nov 13, 2023
fddc33f
Update DeveloperGuide.md
bwangpj Nov 13, 2023
34629c8
Update DeveloperGuide.md
bwangpj Nov 13, 2023
32af21a
Update DeveloperGuide.md
bwangpj Nov 13, 2023
90dfa03
Model
bwangpj Nov 13, 2023
e4f9fab
Merge pull request #224 from bwangpj/review
Cloud7050 Nov 13, 2023
514cbd7
chore(deliverables): Check in for submission
Cloud7050 Nov 13, 2023
3ceb5f4
Include reuse
bwangpj Nov 26, 2023
7432b8d
Merge pull request #225 from bwangpj/reuse
Cloud7050 Nov 26, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
37 changes: 37 additions & 0 deletions .github/auto_assign.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# https://probot.github.io/apps/auto-assign/



# Set to true to add reviewers to PRs
addReviewers: true

# List of reviewers to add to PRs (GitHub username)
reviewers:
- bwangpj
- Cloud7050
- mamayuan
- rayshawntan

# Number of reviewers to randomly add to PRs.
# Set 0 to add all reviewers.
# Defaults to 0
# numberOfReviewers: 0

# Set to true to add assignees to PRs
# addAssignees: true

# List of assignees to add to PRs (GitHub username).
# Presumably takes priority over reviewers, for usernames set in both
# assignees:
# - assigneeA
# - assigneeB
# - assigneeC

# Number of assignees to randomly add to PRs.
# Set to 0 to add all assignees.
# Defaults to numberOfReviewers
# numberOfAssignees: 0

# Keywords used to decide whether to skip all adding for a PR
skipKeywords:
- no-assign
5 changes: 5 additions & 0 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[Enter your description here...]

[Closes #0.]

(Please remember to assign the appropriate milestone, via the sidebar at the bottom right. This will allow your PR to be counted by the grading scripts (https://nus-cs2103-ay2324s1.github.io/dashboards/contents/tp-progress.html). Feel free to delete this message when done.)
29 changes: 15 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,23 +1,24 @@
# Gradle build files
/.gradle/
/build/
src/main/resources/docs/
# macOS Finder files
.DS_Store

# IDEA files
/.idea/
/out/
/*.iml

# Storage/log files
# VSCode extension build files
/bin/

# JVM crash logs
/hs_err_pid[0-9]*.log

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

# App data/log files
/data/
/config.json
/preferences.json
/settings.json
/*.log.*
hs_err_pid[0-9]*.log

# Test sandbox files
src/test/data/sandbox/

# MacOS custom attributes files created by Finder
.DS_Store
docs/_site/
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,
"editor.insertSpaces": true
}
24 changes: 10 additions & 14 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
[![CI Status](https://github.com/se-edu/addressbook-level3/workflows/Java%20CI/badge.svg)](https://github.com/se-edu/addressbook-level3/actions)

![Ui](docs/images/Ui.png)

* This is **a sample project for Software Engineering (SE) students**.<br>
Example usages:
* as a starting point of a course project (as opposed to writing everything from scratch)
* as a case study
* The project simulates an ongoing software project for a desktop application (called _AddressBook_) used for managing contact details.
* It is **written in OOP fashion**. It provides a **reasonably well-written** code base **bigger** (around 6 KLoC) than what students usually write in beginner-level SE modules, without being overwhelmingly big.
* It comes with a **reasonable level of user and developer documentation**.
* It is named `AddressBook Level 3` (`AB3` for short) because it was initially created as a part of a series of `AddressBook` projects (`Level 1`, `Level 2`, `Level 3` ...).
* For the detailed documentation of this project, see the **[Address Book Product Website](https://se-education.org/addressbook-level3)**.
* This project is a **part of the se-education.org** initiative. If you would like to contribute code to this project, see [se-education.org](https://se-education.org#https://se-education.org/#contributing) for more info.
# ConText

[![Java CI](https://github.com/AY2324S1-CS2103-W14-3/tp/actions/workflows/gradle.yml/badge.svg)](https://github.com/AY2324S1-CS2103-W14-3/tp/actions/workflows/gradle.yml)
[![codecov](https://codecov.io/gh/AY2324S1-CS2103-W14-3/tp/graph/badge.svg?token=KT7MNHKALX)](https://codecov.io/gh/AY2324S1-CS2103-W14-3/tp)

For information as well as detailed user/developer documentation, check out the [product website](https://ay2324s1-cs2103-w14-3.github.io/tp/).

![UI](./docs/images/Ui.png)

This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).
109 changes: 72 additions & 37 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,23 +1,76 @@
plugins {
id 'java'
id 'checkstyle'
id 'com.github.johnrengelman.shadow' version '7.1.2'
// application includes java
id 'application'
id 'checkstyle'

id 'jacoco'
id 'com.github.johnrengelman.shadow' version '7.1.2'
}

mainClassName = 'seedu.address.Main'

sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11

repositories {
mavenCentral()
maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
}

checkstyle {
toolVersion = '10.2'
dependencies {
String versionJUnit = '5.10.0'
/* NOTE
* Upgrading Jackson to 2.15.2 causes some tests to fail, as saving Config's
* Path results in a full path instead of the original relative one.
*/
String versionJackson = '2.7.0'
/* NOTE
* We stay on JavaFX 17 instead of 21, for better Java 11 compatibility in
* general.
*
* The documentation states that Java 17 is required for either, but Gluon's
* download page states otherwise:
* • https://openjfx.io/openjfx-docs/
* • https://gluonhq.com/products/javafx/
*/
String versionJavaFx = '17.0.9'

implementation group: 'org.openjfx', name: 'javafx-base', version: versionJavaFx, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-base', version: versionJavaFx, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-base', version: versionJavaFx, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-controls', version: versionJavaFx, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-controls', version: versionJavaFx, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-controls', version: versionJavaFx, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: versionJavaFx, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: versionJavaFx, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-fxml', version: versionJavaFx, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: versionJavaFx, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: versionJavaFx, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: versionJavaFx, classifier: 'linux'

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: versionJackson
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: versionJackson

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: versionJUnit
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: versionJUnit
}



// https://docs.gradle.org/current/userguide/img/javaPluginTasks.png
defaultTasks 'clean', 'test'

java {
// targetCompatibility also defaults to sourceCompatibility
sourceCompatibility JavaVersion.VERSION_11
}

application {
mainClass = 'swe.context.Main'
}

clean {
delete './data/'
delete './settings.json'
delete fileTree('./') { include '*.log.*' }
}

run {
enableAssertions true
}

test {
Expand All @@ -26,6 +79,11 @@ test {
}

task coverage(type: JacocoReport) {
// "Task ':coverage' uses this output of task ':test' without declaring an
// explicit or implicit dependency. This can lead to incorrect results being
// produced, depending on what order the tasks are executed."
dependsOn test

sourceDirectories.from files(sourceSets.main.allSource.srcDirs)
classDirectories.from files(sourceSets.main.output)
executionData.from files(jacocoTestReport.executionData)
Expand All @@ -40,33 +98,10 @@ task coverage(type: JacocoReport) {
}
}

dependencies {
String jUnitVersion = '5.4.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'

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'

testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: jUnitVersion

testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: jUnitVersion
checkstyle {
toolVersion = '10.2'
}

shadowJar {
archiveFileName = 'addressbook.jar'
archiveFileName = 'context.jar'
}

defaultTasks 'clean', 'test'
Loading
Loading