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

[CS2103T-T09-4] Green Tea #108

Open
wants to merge 876 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
876 commits
Select commit Hold shift + click to select a range
1e437a8
Merge branch 'help-command'
vigneshbhuvan-nus Nov 7, 2020
5d35c44
Merge pull request #219 from vigneshbhuvan-nus/master
vigneshbhuvan-nus Nov 7, 2020
d680423
Add AnswerCommand and PlayCommandSequenceDiagram
GabrielSimbingyang Nov 7, 2020
318ce0b
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp…
GabrielSimbingyang Nov 7, 2020
46de52a
Updated Chapter 3 UserGuide
vigneshbhuvan-nus Nov 7, 2020
65db01a
Merge branch 'user-guide'
vigneshbhuvan-nus Nov 7, 2020
f2f3759
Fix stat panel bug
geoboom Nov 7, 2020
80b626e
CI fixes
geoboom Nov 7, 2020
e785a34
Merge pull request #221 from vigneshbhuvan-nus/master
vigneshbhuvan-nus Nov 7, 2020
a614741
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp…
GabrielSimbingyang Nov 7, 2020
1a95fca
CI fixes
geoboom Nov 7, 2020
3c80158
CI fixes
geoboom Nov 7, 2020
e632db3
CI fixes
geoboom Nov 7, 2020
321b7e4
CI fixes
geoboom Nov 7, 2020
6cc0ef6
CI fixes
geoboom Nov 7, 2020
a99171b
fix CI for tests
geoboom Nov 7, 2020
758d936
Fix log save file
GabrielSimbingyang Nov 7, 2020
c4f5e09
Fix StatisticsPanel
GabrielSimbingyang Nov 7, 2020
3b1da22
fix CI for tests
geoboom Nov 7, 2020
70e2536
fix CI for tests
geoboom Nov 7, 2020
13f1672
fix CI for tests
geoboom Nov 7, 2020
4e0cd2f
Merge pull request #220 from geoboom/georgie/bugfix
geoboom Nov 7, 2020
ae88bcc
Update UserGuide.md
GabrielSimbingyang Nov 7, 2020
c2d8c61
Update UserGuide.md
GabrielSimbingyang Nov 7, 2020
123473d
Update UserGuide.md
GabrielSimbingyang Nov 7, 2020
423fc22
Update UserGuide.md
GabrielSimbingyang Nov 7, 2020
a8e5d0e
Edit Statistics Panel
GabrielSimbingyang Nov 7, 2020
32e3d77
Update all images except statistics related images and figure 3 with …
MelanieNPS Nov 7, 2020
cd2e03d
Edit CI Checks Main
GabrielSimbingyang Nov 7, 2020
c36adfc
Edit CI checks test
GabrielSimbingyang Nov 7, 2020
cf5514c
Merge branch 'master' into Edit-DG-PPP-Diagram
GabrielSimbingyang Nov 7, 2020
bd930ce
Merge pull request #227 from GabrielSimbingyang/Edit-DG-PPP-Diagram
GabrielSimbingyang Nov 7, 2020
deee3ae
Update gitignore
GabrielSimbingyang Nov 7, 2020
41ae1cb
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp…
GabrielSimbingyang Nov 7, 2020
a120d7f
HelpCommand and UserGuide
vigneshbhuvan-nus Nov 7, 2020
464c05b
Fix text labels
geoboom Nov 7, 2020
6068fca
Merge pull request #229 from geoboom/bugfix/test-labels
geoboom Nov 7, 2020
d5b2530
Merge branch 'master' into update-ug
MelanieNPS Nov 7, 2020
97bb932
Merge pull request #230 from IlyaRin/update-ug
MelanieNPS Nov 7, 2020
0c62765
Fix table of contents
MelanieNPS Nov 7, 2020
8d1d53f
Update logic DG
GabrielSimbingyang Nov 7, 2020
3c07d32
Update statistics images
MelanieNPS Nov 7, 2020
ce633f4
Merge pull request #231 from IlyaRin/update-ug
MelanieNPS Nov 7, 2020
bbd98c2
Merge branch 'user-guide'
vigneshbhuvan-nus Nov 7, 2020
651c4d4
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp
vigneshbhuvan-nus Nov 7, 2020
344a4d9
Merge pull request #232 from vigneshbhuvan-nus/master
vigneshbhuvan-nus Nov 7, 2020
edb4d8b
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp…
GabrielSimbingyang Nov 7, 2020
d4a5d60
Update UserGuide.md
GabrielSimbingyang Nov 7, 2020
35419b6
Update UserGuide.md
GabrielSimbingyang Nov 7, 2020
47c6756
Leitner and tests
geoboom Nov 7, 2020
1da8b6f
Add files via upload
GabrielSimbingyang Nov 7, 2020
244b010
Add files via upload
GabrielSimbingyang Nov 7, 2020
9a3a484
Update UserGuide.md
GabrielSimbingyang Nov 7, 2020
b0e4e88
Leitner minor fix
geoboom Nov 7, 2020
394b82c
Leitner formatting
geoboom Nov 7, 2020
2e02337
Update UserGuide.md
GabrielSimbingyang Nov 7, 2020
e88c13d
fix ci stuff
geoboom Nov 7, 2020
77ef286
fix ci stuff
geoboom Nov 7, 2020
471cf86
fix ci stuff
geoboom Nov 7, 2020
c106e71
fix ci stuff
geoboom Nov 7, 2020
96e931c
fix ci stuff
geoboom Nov 7, 2020
4d8794a
fix ci stuff
geoboom Nov 7, 2020
48126d0
fix ci stuff
geoboom Nov 7, 2020
f12a669
Merge pull request #233 from geoboom/feature/leitner
geoboom Nov 7, 2020
e5bf06a
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp…
GabrielSimbingyang Nov 8, 2020
9c8a141
Put back stuff i removed
geoboom Nov 8, 2020
223b9d9
Revert from broken commit and fix bugs
geoboom Nov 8, 2020
9cabd58
Reformat docs
geoboom Nov 8, 2020
a45cf82
Optimize imports to fix CI
geoboom Nov 8, 2020
a5617ea
Optimize imports to fix CI
geoboom Nov 8, 2020
633077d
Fix checkstyle errors
geoboom Nov 8, 2020
1d7e462
Merge branch 'master' into feature/leitner
geoboom Nov 8, 2020
1b3b5b3
Fix UG trailing whitespaces
geoboom Nov 8, 2020
4188947
Resolve merge conflicts
geoboom Nov 8, 2020
9f2a93b
Fix userguide trailing whitespaces
geoboom Nov 8, 2020
09bb340
Fix trailing whitespaces across some files
geoboom Nov 8, 2020
be8330c
Fix CI
geoboom Nov 8, 2020
125a6a0
Merge pull request #236 from geoboom/feature/leitner
geoboom Nov 8, 2020
dc937d5
Update user guide
geoboom Nov 8, 2020
fb74006
Merge pull request #237 from geoboom/geoboom/update-ppp
geoboom Nov 8, 2020
fca4dfa
Make tabs non clickable
MelanieNPS Nov 8, 2020
0540a8e
Merge pull request #238 from IlyaRin/fix-quiz-tab
MelanieNPS Nov 8, 2020
fd1d866
Fix UG format
MelanieNPS Nov 8, 2020
3b2abe3
Merge pull request #239 from IlyaRin/fix-format-ug
MelanieNPS Nov 8, 2020
aa803b8
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp…
GabrielSimbingyang Nov 8, 2020
db1a270
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp…
GabrielSimbingyang Nov 8, 2020
854cc59
Modify headings for chapter 4
GabrielSimbingyang Nov 8, 2020
b52aa43
Add preface for Chapter 4.2
GabrielSimbingyang Nov 8, 2020
30afea0
Add chapter 4.2.2 and 4.2.1
GabrielSimbingyang Nov 8, 2020
0fc468e
Finish chapter 4.2.2
GabrielSimbingyang Nov 8, 2020
f7fa374
Merge pull request #240 from GabrielSimbingyang/Edit-DG-Logic-And-Imp…
GabrielSimbingyang Nov 8, 2020
f7a562c
Edit errors and moved diagrams around in chapter 4
GabrielSimbingyang Nov 8, 2020
adb1354
Update chapter 4.2.1
GabrielSimbingyang Nov 8, 2020
a26f856
Update diagram
GabrielSimbingyang Nov 8, 2020
7e488fb
Update Chapter 4.2
GabrielSimbingyang Nov 8, 2020
7cb99d0
Update dg
geoboom Nov 8, 2020
78c43fb
Merge pull request #241 from geoboom/geobom/update-dg
geoboom Nov 8, 2020
94be7a9
Update ppp
geoboom Nov 8, 2020
86d665e
Merge pull request #242 from geoboom/geoboom/update-pppp
geoboom Nov 8, 2020
42bc3c7
Update chapter 4.1.2 and figure naming
GabrielSimbingyang Nov 8, 2020
dc9bfc2
Update jump links and TOC
GabrielSimbingyang Nov 8, 2020
449d09e
Update TOC
GabrielSimbingyang Nov 8, 2020
ca59519
Merge branch 'master' into Edit-DG-Logic-And-Implementation-FlashCard
GabrielSimbingyang Nov 8, 2020
d48c69e
Merge pull request #243 from GabrielSimbingyang/Edit-DG-Logic-And-Imp…
GabrielSimbingyang Nov 8, 2020
370e396
Updated DG
vigneshbhuvan-nus Nov 8, 2020
2886ab5
Merge branch 'dg'
vigneshbhuvan-nus Nov 8, 2020
102ee80
Merge pull request #244 from vigneshbhuvan-nus/master
vigneshbhuvan-nus Nov 8, 2020
d5840da
Fix leitner oob error
geoboom Nov 8, 2020
fbe75d8
Merge pull request #245 from geoboom/hotfix/leitner
geoboom Nov 8, 2020
5f65539
Fix bug
geoboom Nov 8, 2020
c479b6c
Merge pull request #246 from geoboom/bugfix/stat-panel-msg
geoboom Nov 8, 2020
dcdd6c4
no message
GabrielSimbingyang Nov 8, 2020
3352051
Relabel preface to overview and added commands implemented
GabrielSimbingyang Nov 8, 2020
ccf5a50
Move design consideration into overview
GabrielSimbingyang Nov 8, 2020
d8b30ec
Update TOC
GabrielSimbingyang Nov 8, 2020
7ae9de2
Add new select deck sequence diagram
GabrielSimbingyang Nov 8, 2020
61e0d58
Add SelectDeckSequenceDiagram and fix figure numbers
GabrielSimbingyang Nov 8, 2020
af292a7
Fix all jumplink errors
GabrielSimbingyang Nov 8, 2020
5346ca3
Edit CI
GabrielSimbingyang Nov 8, 2020
bc80b8f
Merge pull request #247 from GabrielSimbingyang/Finish-DG
GabrielSimbingyang Nov 8, 2020
2c14bb9
Updating DG halfway
vigneshbhuvan-nus Nov 8, 2020
23733d2
Further changes + Help Command
vigneshbhuvan-nus Nov 8, 2020
324157a
Merge branch 'dg'
vigneshbhuvan-nus Nov 8, 2020
12a5840
Numbering
vigneshbhuvan-nus Nov 8, 2020
85196c0
Merge pull request #248 from vigneshbhuvan-nus/master
vigneshbhuvan-nus Nov 8, 2020
0e03b06
Finalize dg
MelanieNPS Nov 9, 2020
5f4cab3
Merge pull request #249 from IlyaRin/finalize-dg
MelanieNPS Nov 9, 2020
a977fdc
Make minor DG changes
MelanieNPS Nov 9, 2020
b2cd1a4
Merge pull request #250 from IlyaRin/format-dg
MelanieNPS Nov 9, 2020
59b4fed
Update diagrams for ug
MelanieNPS Nov 9, 2020
03573a8
Update description
MelanieNPS Nov 9, 2020
b64249c
Merge pull request #251 from IlyaRin/update-ug
MelanieNPS Nov 9, 2020
98e6c1f
Update stats image
MelanieNPS Nov 9, 2020
225f8a4
Rename ppp
MelanieNPS Nov 9, 2020
3d8134f
Merge pull request #252 from IlyaRin/update-ug
MelanieNPS Nov 9, 2020
4046ed6
Change stats image description
MelanieNPS Nov 9, 2020
df4ac98
Merge pull request #253 from IlyaRin/update-ug
MelanieNPS Nov 9, 2020
f8adb76
Updated PPP and some documentation
vigneshbhuvan-nus Nov 9, 2020
cf86b05
Merge branch 'ppp'
vigneshbhuvan-nus Nov 9, 2020
9c1bd3e
Merge pull request #254 from vigneshbhuvan-nus/master
vigneshbhuvan-nus Nov 9, 2020
df16a5d
Remove names and fix jumplink
GabrielSimbingyang Nov 9, 2020
c7bc49b
Edit CI Checks
GabrielSimbingyang Nov 9, 2020
77a688d
Merge pull request #255 from GabrielSimbingyang/Finish-DG
GabrielSimbingyang Nov 9, 2020
73ac15d
CI checks
vigneshbhuvan-nus Nov 9, 2020
a6f86e7
Merge branch 'ppp'
vigneshbhuvan-nus Nov 9, 2020
4330c1d
Update vigneshbhuvan-nus.md
vigneshbhuvan-nus Nov 9, 2020
6f30fa6
Merge pull request #256 from vigneshbhuvan-nus/master
vigneshbhuvan-nus Nov 9, 2020
016d003
Update gabrielsimbingyang.md
GabrielSimbingyang Nov 9, 2020
02765a3
Update gabrielsimbingyang.md
GabrielSimbingyang Nov 9, 2020
d1bf845
Update gabrielsimbingyang.md
GabrielSimbingyang Nov 9, 2020
56f9a82
Update gabrielsimbingyang.md
GabrielSimbingyang Nov 9, 2020
e32bff9
Update _config.yml
GabrielSimbingyang Nov 9, 2020
6aa1656
Change index.md
MelanieNPS Nov 9, 2020
0646c91
Merge pull request #257 from IlyaRin/change-index.md
MelanieNPS Nov 9, 2020
b895059
Update AboutUs.md
GabrielSimbingyang Nov 9, 2020
ff357e8
Set theme jekyll-theme-cayman
MelanieNPS Nov 9, 2020
2d3576b
Update head.html
GabrielSimbingyang Nov 9, 2020
8be506f
Update index.md
MelanieNPS Nov 9, 2020
cf86e88
Update header.html
GabrielSimbingyang Nov 9, 2020
cb35056
Update default.html
GabrielSimbingyang Nov 9, 2020
988dd90
Merge pull request #258 from IlyaRin/change-index.md
MelanieNPS Nov 9, 2020
2eff97c
update dg figure 2
MelanieNPS Nov 9, 2020
c895802
Update Developer guide images
MelanieNPS Nov 9, 2020
0ac0a2a
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
cfaf4f5
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
2fd3e78
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
25ec1e7
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
d258f06
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
a5af846
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
32e18f5
Update DeveloperGuide.md
GabrielSimbingyang Nov 9, 2020
dbb2f06
Update DeveloperGuide.md
GabrielSimbingyang Nov 9, 2020
4ce6a4c
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
a66a0c7
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
1850333
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
ddc578d
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
9bb7cc3
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
db10a1c
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
f77839f
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
a18735c
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
35a3885
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
913f2d7
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
3a63beb
Edit diagrams
GabrielSimbingyang Nov 9, 2020
2d73dc8
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
58144a3
Edit HelpCommand message
GabrielSimbingyang Nov 9, 2020
eb50122
Merge pull request #259 from GabrielSimbingyang/Finish-DG
GabrielSimbingyang Nov 9, 2020
0a9b4e0
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
e08dee7
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
2f32f5e
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
621a84b
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
58c88f2
User Guide
vigneshbhuvan-nus Nov 9, 2020
8335e5d
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp
vigneshbhuvan-nus Nov 9, 2020
9000486
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
564150e
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
5ebec02
Merge pull request #260 from vigneshbhuvan-nus/master
vigneshbhuvan-nus Nov 9, 2020
f293f59
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
670cae5
Update UserGuide.md
vigneshbhuvan-nus Nov 9, 2020
879ce74
Update DeveloperGuide.md
MelanieNPS Nov 9, 2020
b558952
Update DeveloperGuide.md
GabrielSimbingyang Nov 9, 2020
0076334
Update DeveloperGuide.md
GabrielSimbingyang Nov 9, 2020
9cc9b92
Update DeveloperGuide.md
GabrielSimbingyang Nov 9, 2020
a4ae107
Update DeveloperGuide.md
GabrielSimbingyang Nov 9, 2020
e21689a
Update README.md
GabrielSimbingyang Nov 9, 2020
1bab2b3
Change GreenTea to Green Tea
GabrielSimbingyang Nov 9, 2020
bcd9d54
Update README.md
GabrielSimbingyang Nov 9, 2020
7b9813a
Update vigneshbhuvan-nus.md
vigneshbhuvan-nus Nov 9, 2020
ec91907
Update DG
GabrielSimbingyang Nov 9, 2020
1082675
Update UG
GabrielSimbingyang Nov 9, 2020
1fea530
Update DG use cases
GabrielSimbingyang Nov 9, 2020
5178d68
Update DG use case
GabrielSimbingyang Nov 9, 2020
632ccca
Edit DG user stories
GabrielSimbingyang Nov 9, 2020
7a120e3
Update ilyarin.md
MelanieNPS Nov 9, 2020
59be071
Edit Glossary
GabrielSimbingyang Nov 9, 2020
9ffbd3c
Update ilyarin.md
MelanieNPS Nov 9, 2020
3b70185
Edit JAR file name
GabrielSimbingyang Nov 9, 2020
5e723c8
Update all use cases
GabrielSimbingyang Nov 9, 2020
ed60272
Merge pull request #261 from GabrielSimbingyang/Finish-DG
GabrielSimbingyang Nov 9, 2020
da0ce60
no message
GabrielSimbingyang Nov 9, 2020
893d783
Merge pull request #262 from GabrielSimbingyang/Finish-DG
GabrielSimbingyang Nov 9, 2020
5132340
Update DeveloperGuide.md
GabrielSimbingyang Nov 9, 2020
625aa75
Update vigneshbhuvan-nus.md
vigneshbhuvan-nus Nov 9, 2020
7e855ad
Update gabrielsimbingyang.md
vigneshbhuvan-nus Nov 9, 2020
5f90b73
Update index.md
GabrielSimbingyang Nov 9, 2020
3144a3f
Update _config.yml
MelanieNPS Nov 9, 2020
5c80b24
Update geoboom.md
vigneshbhuvan-nus Nov 9, 2020
be81d09
Fix bug with stats not displaying the selected deck first time round
geoboom Nov 9, 2020
3ea104f
Merge pull request #264 from geoboom/stat/bugfix
geoboom Nov 9, 2020
8a1e5bd
fix quiz mode bug
MelanieNPS Nov 9, 2020
5a4c84a
Fix whitespace
MelanieNPS Nov 9, 2020
21a399e
Merge pull request #265 from IlyaRin/fix-scroll-quiz-mode
MelanieNPS Nov 9, 2020
a9f5033
Fix removeDeck bug
GabrielSimbingyang Nov 9, 2020
3bd8dfd
Edit command message
GabrielSimbingyang Nov 9, 2020
8b19e17
Merge pull request #266 from GabrielSimbingyang/Finish-DG
GabrielSimbingyang Nov 9, 2020
ef06e03
Update UG and removecommand message
GabrielSimbingyang Nov 9, 2020
a7f8683
Merge pull request #267 from GabrielSimbingyang/Finish-DG
GabrielSimbingyang Nov 9, 2020
f8f4084
Update UserGuide.md
GabrielSimbingyang Nov 9, 2020
3f54c25
Update UserGuide.md
GabrielSimbingyang Nov 9, 2020
d3c260a
Update UserGuide.md
GabrielSimbingyang Nov 9, 2020
778d4e4
Ug
vigneshbhuvan-nus Nov 9, 2020
452d497
Merge branch 'master' of https://github.com/AY2021S1-CS2103T-T09-4/tp
vigneshbhuvan-nus Nov 9, 2020
193e4f7
Updated Pictures
vigneshbhuvan-nus Nov 9, 2020
5eee02e
Update AboutUs.md
GabrielSimbingyang Nov 10, 2020
d600c34
Update gabriel sim PPP file
GabrielSimbingyang Nov 22, 2020
552c144
Update acknowledgements
GabrielSimbingyang Nov 22, 2020
c43f62d
Update acknowledgement to AB3 files
GabrielSimbingyang Nov 22, 2020
7f7c307
Update Readme
GabrielSimbingyang Nov 22, 2020
481a8c1
Update Gabriel PPP file
GabrielSimbingyang Nov 22, 2020
c89cae0
Merge pull request #268 from GabrielSimbingyang/Finish-DG
GabrielSimbingyang Nov 22, 2020
dfcc175
Update README.md
GabrielSimbingyang Nov 22, 2020
0284cc4
Update gabrielsimbingyang.md
GabrielSimbingyang Nov 22, 2020
903040f
Update README.md
MelanieNPS Nov 23, 2020
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
  •  
  •  
  •  
30 changes: 30 additions & 0 deletions .classpath
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="bin/main" path="src/main/java">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/main" path="src/main/resources">
<attributes>
<attribute name="gradle_scope" value="main"/>
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/java">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
</attributes>
</classpathentry>
<classpathentry kind="src" output="bin/test" path="src/test/resources">
<attributes>
<attribute name="gradle_scope" value="test"/>
<attribute name="gradle_used_by_scope" value="test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
14 changes: 14 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,24 @@ src/main/resources/docs/
/config.json
/preferences.json
/*.log.*
/addressbook.log.0
/addressbook.log.0.1

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

# MacOS custom attributes files created by Finder
.DS_Store
docs/_site/


src/main/data/addressbook.json
src/main/config.json
src/main/preferences.json
src/main/addressbook.log.0
src/main/addressbook.log.0.lck
src/main/addressbook.log.0.1
src/main/addressbook.log.0.1.lck
src/main/wordbank.log.0
src/main/data/wordbank.json
src/main/wordbank.log.0.lck
23 changes: 23 additions & 0 deletions .project
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>CS2103T-T09-4-tp</name>
<comment>Project CS2103T-T09-4-tp created by Buildship.</comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
</natures>
</projectDescription>
13 changes: 13 additions & 0 deletions .settings/org.eclipse.buildship.core.prefs
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
arguments=
auto.sync=false
build.scans.enabled=false
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
connection.project.dir=
eclipse.preferences.version=1
gradle.user.home=
java.home=/usr/lib/jvm/java-11-openjdk
jvm.arguments=
offline.mode=false
override.workspace.settings=true
show.console.view=true
show.executions.view=true
34 changes: 23 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,26 @@
[![CI Status](https://github.com/se-edu/addressbook-level3/workflows/Java%20CI/badge.svg)](https://github.com/se-edu/addressbook-level3/actions)
# Green Tea
## The Revolutionary Language Learning Application

[![CI Status](https://github.com/AY2021S1-CS2103T-T09-4/tp/workflows/Java%20CI/badge.svg)](https://github.com/AY2021S1-CS2103T-T09-4/tp/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.
### About GreenTea
GreenTea is a desktop app for learning a new language, designed for users to **have fun** through quizzes while keeping
track of their **learning progress**.

GreenTea is designed for use with a **CLI** (Command Line Interface).

### Documentation Links
* [About Us](docs/AboutUs.md)
* [Developer Guide](docs/DeveloperGuide.md)
* [User Guide](docs/UserGuide.md)

### Acknowledgements
* This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).
* Libraries used: [JavaFX](https://openjfx.io/), [Jackson](https://github.com/FasterXML/jackson), [JUnit5](https://github.com/junit-team/junit5)
, [JFoeniX](http://www.jfoenix.com/), [Open Test Alliance](https://github.com/ota4j-team/opentest4j), [API Guardian](https://github.com/apiguardian-team/apiguardian).
* The following code bases were referenced: [Calgo](https://github.com/AY1920S2-CS2103T-F11-1/main), [TrackPad](https://github.com/AY2021S1-CS2103T-T09-3/tp)
, [Notably](https://github.com/AY1920S2-CS2103T-W17-2/main), [BB Productive](https://github.com/AY1920S2-CS2103T-W16-1/main)
, [MODdy](https://github.com/AY1920S2-CS2103T-W13-3/main), [JARVIS](https://github.com/AY1920S1-CS2103T-T10-1/main).
* The Leitner system was referenced [here](https://jessewhelan.medium.com/using-the-leitner-system-to-improve-your-study-d5edafae7f0).
Binary file added bin/main/images/address_book_32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/calendar.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/clock.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/fail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/green_tea_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/help_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/images/info_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added bin/main/seedu/address/AppParameters.class
Binary file not shown.
61 changes: 61 additions & 0 deletions bin/main/seedu/address/Leitner.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
import java.security.KeyStore.Entry;
import java.util.List;
import java.util.Scanner;

public class Leitner {

public Leitner() {

}

/**
* Initialises 3 ArrayList<Entry> containing the current bucket, correctAnswers
* and Wrong Answers For each entry in the bucket, extract the question and
* answer then prompt the question to the user. Obtain the userInput and check
* for correctness before adding to either to correctAnswer or wrongAnswer
* bucket After all entries are completed, shuffle both the answer lists and add
* them back to the bucket Repeat the test twice
*
* @return the score of the flashcard game using the Leitner system
*/
public int flashCard(ArrayList<Entry> entries) {
Scanner sc = new Scanner(System.in);

int scoreAfterTestOne = test(entries, 0);
int scoreAfterTestTwo = test(entries, scoreAfterTestOne);

return scoreAfterTestTwo;
}

public int test(ArrayList<Entry> bucket, int score) {

ArrayList<Entry> correctAnswer = new ArrayList<>();
ArrayList<Entry> wrongAnswer = new ArrayList<>();

for (Entry entry : bucket) {
String question = entry.getTranslation();
String answer = entry.getEnglish();
entry.promptUser();
String userInput = sc.nextLine();
if (ans.equals(question.getTranslation())) {
wrongAnswer.add(question);
} else {
score++;
correctAnswer.add(question);
}
bucket.remove(i);
}

Collections.shuffle(wrongAnswer, new Random());
Collections.shuffle(correctAnswer, new Random());

for (Entry entry : wrongAnswer) {
bucket.add(entry);
}

for (Entry entry : correctAnswer) {
bucket.add(entry);
}
}

}
Binary file added bin/main/seedu/address/Main.class
Binary file not shown.
Binary file added bin/main/seedu/address/MainApp.class
Binary file not shown.
Binary file added bin/main/seedu/address/commons/core/Config.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/commons/core/Messages.class
Binary file not shown.
Binary file added bin/main/seedu/address/commons/core/Version.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/logic/Logic.class
Binary file not shown.
Binary file added bin/main/seedu/address/logic/LogicManager.class
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/logic/commands/Command.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/logic/parser/CliSyntax.class
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/logic/parser/Parser.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/logic/parser/Prefix.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/model/Model.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/ModelManager.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/ReadOnlyUserPrefs.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/ReadOnlyWordBank.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/UserPrefs.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/WordBank.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/deck/Deck.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/deck/DeckName.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/model/play/Leitner.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/play/Score.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/model/view/CurrentView.class
Binary file not shown.
Binary file added bin/main/seedu/address/model/view/View.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/storage/Storage.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/storage/WordBankStorage.class
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/ui/CommandBox.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/HelpWindow.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/MainWindow.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/ResultDisplay.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/StatusBarFooter.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/Ui.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/UiManager.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/UiPart.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/deck/DeckCard.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/ui/entry/EntryCard.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added bin/main/seedu/address/ui/panels/QuizPanel.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/panels/ScorePanel.class
Binary file not shown.
Binary file added bin/main/seedu/address/ui/panels/StartPanel.class
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 changes: 8 additions & 0 deletions bin/main/view/CommandBox.fxml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>

<?import javafx.scene.control.TextField?>
<?import javafx.scene.layout.StackPane?>
<StackPane styleClass="stack-pane" xmlns="http://javafx.com/javafx/8" xmlns:fx="http://javafx.com/fxml/1">
<TextField fx:id="commandTextField" onAction="#handleCommandEntered" promptText="Enter command here..."/>
</StackPane>

Loading