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

[CS2113-W10-2] MojoHR #9

Open
wants to merge 440 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
440 commits
Select commit Hold shift + click to select a range
69ba96c
add utilities diagram
yanli1215 Mar 30, 2021
867ca18
Add FindCommand test
yanli1215 Mar 30, 2021
ea136e7
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Mar 30, 2021
9c5a317
Updated the Login Component of the Developer Guide
Chihui8199 Mar 30, 2021
d3df310
add Utility component and manual testing instructions
yanli1215 Mar 30, 2021
675db8f
Insert diagram into Login Component developer guide
Chihui8199 Mar 30, 2021
35d4d7a
fix style errors
yanli1215 Mar 30, 2021
4a2c251
Added Junit Tests and fixed minor bugs and code violations
FarmZH98 Mar 30, 2021
0d2d0d3
fixed bug in edit and send command
FarmZH98 Mar 30, 2021
ec7b69c
Add how list command works
Chihui8199 Mar 30, 2021
c46dfbb
Added JunitTest to EditCommand
FarmZH98 Mar 30, 2021
5f80915
Update Sequence Diagram for ListCommand
Chihui8199 Mar 30, 2021
c7da086
Merge pull request #69 from Chihui8199/Developer-Guide
jalvinchan Mar 30, 2021
60ecc65
Merge branch 'master' into master
jalvinchan Mar 30, 2021
a9c7370
Merge pull request #70 from yanli1215/master
jalvinchan Mar 30, 2021
6aa526c
FIx code style errors
jalvinchan Mar 30, 2021
37e0bbc
Merge pull request #71 from FarmZH98/DeveloperGuide&Testing
jalvinchan Mar 30, 2021
9ce02e9
draft email class diagram
FarmZH98 Mar 30, 2021
1c3221f
Merge branch 'master' into DeveloperGuide&Testing
FarmZH98 Mar 30, 2021
8ba6071
Update storage after tag
jalvinchan Mar 30, 2021
2ef0791
Merge pull request #72 from jalvinchan/master
jalvinchan Mar 30, 2021
5a07448
Fix checkstyle errors
jalvinchan Mar 30, 2021
903a106
Merge pull request #73 from jalvinchan/master
jalvinchan Mar 30, 2021
6a2c7f5
Update developer guide with architect explanation, tag implementation.
jalvinchan Mar 30, 2021
244a7ac
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
jalvinchan Mar 30, 2021
d67a43e
Updated EmailClassDiagram and NFR in DG
FarmZH98 Mar 30, 2021
ead9922
added Implementation for ComposeCommand
FarmZH98 Mar 30, 2021
e8e2b0c
Merge pull request #75 from FarmZH98/DeveloperGuide&Testing
jalvinchan Mar 31, 2021
7244dfe
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
jalvinchan Mar 31, 2021
147ff95
Merge pull request #74 from jalvinchan/master
FarmZH98 Mar 31, 2021
4a22bff
Updated User Guide
FarmZH98 Apr 2, 2021
f444aeb
Merge pull request #77 from FarmZH98/DeveloperGuide&Testing
FarmZH98 Apr 2, 2021
22dadea
Clean some parts
Chihui8199 Apr 2, 2021
8ca4a6a
no message
Chihui8199 Apr 2, 2021
c637660
Edits such that when user enters the wrong information it returns to …
Chihui8199 Apr 2, 2021
401597f
Update error message
Chihui8199 Apr 2, 2021
fcfcfc9
Added Log off message to ExitCommand
Chihui8199 Apr 2, 2021
48e44e7
Add some assertion
Chihui8199 Apr 2, 2021
c790a4b
Update mistakes in sequence Diagrams
Chihui8199 Apr 2, 2021
c23c3d5
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp …
Chihui8199 Apr 2, 2021
0754f27
Update Implementation Section of developer guide
Chihui8199 Apr 2, 2021
b3cb701
Merge branch 'Bugs' into Developer-Guide
Chihui8199 Apr 2, 2021
1a48ef5
Update loginUi menu
Chihui8199 Apr 2, 2021
25fa1d1
Merge branch 'Bugs'
Chihui8199 Apr 2, 2021
6225240
Further updates to implementation portion (login) of developer guide
Chihui8199 Apr 2, 2021
edc8d26
Update loginUi user interface
Chihui8199 Apr 2, 2021
60f46e8
Update user guide
Chihui8199 Apr 2, 2021
f665918
Merge branch 'Developer-Guide'
Chihui8199 Apr 2, 2021
6e97d57
Merge branch 'Bugs'
Chihui8199 Apr 2, 2021
56f1184
Merge pull request #79 from Chihui8199/master
FarmZH98 Apr 3, 2021
0550b0f
update introduction and quick start
yanli1215 Apr 3, 2021
48facf1
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Apr 3, 2021
0d044cb
Merge pull request #80 from yanli1215/master
yanli1215 Apr 3, 2021
d308568
Update portfolio page
Chihui8199 Apr 3, 2021
5432713
this commit fixes issue #107 on Navigalibility
Chihui8199 Apr 3, 2021
e9de32e
This commit resolves issue #98
Chihui8199 Apr 3, 2021
595d8cc
Allow user to enter email types in list command as capital letters
Chihui8199 Apr 3, 2021
d693141
solve json data format issue
yanli1215 Apr 4, 2021
a10bbc8
add get to start in UG
yanli1215 Apr 4, 2021
764b450
Merge pull request #113 from Chihui8199/Bugs
yanli1215 Apr 4, 2021
37f52d2
Merge pull request #114 from yanli1215/master
jalvinchan Apr 4, 2021
4c63e4a
Enable assertions, fix checkstyle
jalvinchan Apr 4, 2021
fbc220a
Add read to storage.
jalvinchan Apr 4, 2021
7d30f30
Update data file to include read
jalvinchan Apr 4, 2021
b429723
Update storage to include read
jalvinchan Apr 4, 2021
ff301c9
Change tag command to single step
jalvinchan Apr 4, 2021
bff4bbd
Merge pull request #115 from jalvinchan/master
yanli1215 Apr 5, 2021
a5eb889
update command summary and FAQ
yanli1215 Apr 5, 2021
bcb04f7
Clean up and update the PPP
Chihui8199 Apr 5, 2021
cb4bc53
This commit fixed issue #76
Chihui8199 Apr 5, 2021
9d2b37a
This commit fixes issue #76
Chihui8199 Apr 5, 2021
35feb1d
This commit fixes issue #76
Chihui8199 Apr 5, 2021
3c0431a
Some formatting errors
Chihui8199 Apr 5, 2021
3f58a77
Fix CheckStyle errors
Chihui8199 Apr 5, 2021
902d5dc
Change list emails to list allemails as suggested during the practic…
Chihui8199 Apr 5, 2021
5ccce1f
Fix the developer guide and userguide from emails to allemails
Chihui8199 Apr 5, 2021
7e6c95a
Created and updated use command summary table
Chihui8199 Apr 5, 2021
60c7992
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp …
Chihui8199 Apr 5, 2021
5a9b09d
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp …
Chihui8199 Apr 5, 2021
c4b1b71
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp …
Chihui8199 Apr 5, 2021
a4babb0
Merge pull request #116 from Chihui8199/PPP---portfolio
jalvinchan Apr 5, 2021
17c72c0
Merge pull request #117 from Chihui8199/Developer-Guide
jalvinchan Apr 5, 2021
159ccbf
Merge pull request #118 from Chihui8199/Bugs
jalvinchan Apr 5, 2021
ce028d8
add V2 user stories
yanli1215 Apr 5, 2021
a7ac570
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Apr 5, 2021
d02c908
solve issue #108
FarmZH98 Apr 5, 2021
18c67b6
implemented check email validity based on 4 email ID (gmail, yahoo, o…
FarmZH98 Apr 6, 2021
591146c
fix merge confict
yanli1215 Apr 6, 2021
63f5712
fix ./runtest.sh bugs
yanli1215 Apr 6, 2021
c44fada
Enter product name in user guide
Chihui8199 Apr 6, 2021
38cb18b
no message
Chihui8199 Apr 6, 2021
bd8c428
Merge branch 'Developer-Guide'
Chihui8199 Apr 6, 2021
0fe99f3
Merge pull request #119 from yanli1215/master
jalvinchan Apr 6, 2021
4082a46
Merge pull request #120 from FarmZH98/DeveloperGuide&Testing
jalvinchan Apr 6, 2021
e739cc0
Add content page, simplify diagrams
jalvinchan Apr 6, 2021
c5ef4bd
Merge branch 'master' into guides
jalvinchan Apr 6, 2021
6d6ca01
createEmailObject lack a "tag" field
yanli1215 Apr 6, 2021
fc1b5b7
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Apr 6, 2021
32f61c8
fix checkStyle bugs
yanli1215 Apr 6, 2021
cb92d67
Check recipient emails are in the storage before sending
jalvinchan Apr 6, 2021
3bff0c0
Merge pull request #122 from yanli1215/master
jalvinchan Apr 6, 2021
45a9216
tags are saved in storage now
jalvinchan Apr 6, 2021
a98a89c
Merge branch 'bugs' into send_check
jalvinchan Apr 6, 2021
c71010e
Fix bugs with sending multiple emails containing duplicate index
jalvinchan Apr 6, 2021
d09ff64
updated user guide, add ppp
jalvinchan Apr 6, 2021
66aae1c
Merge pull request #121 from jalvinchan/guides
yanli1215 Apr 6, 2021
240c6aa
Fix login bug, fix checkstyle
jalvinchan Apr 6, 2021
087fd1b
checks for validity in email address, subject and content when compos…
FarmZH98 Apr 6, 2021
6779684
similar to compose, show warning message for edit command
FarmZH98 Apr 7, 2021
fc7fcde
Fixed bugs for SendCommand and made Send and EditCommand more error p…
FarmZH98 Apr 7, 2021
7a16752
Merge pull request #123 from jalvinchan/send_check
FarmZH98 Apr 7, 2021
b091322
fixed code style violations
FarmZH98 Apr 7, 2021
f5a5386
Merge branch 'master' into DeveloperGuide&Testing
FarmZH98 Apr 7, 2021
781cf99
will not send if email address is not valid.
FarmZH98 Apr 7, 2021
b7549d3
fixed minor code violation
FarmZH98 Apr 7, 2021
64ffcc6
Merge pull request #125 from FarmZH98/DeveloperGuide&Testing
yanli1215 Apr 7, 2021
582be59
1. Remove test file for outlook - no longer using domain @outlook.com
Chihui8199 Apr 8, 2021
008f6bc
Update recipient inbox in storage after send
jalvinchan Apr 8, 2021
af3a957
Merge pull request #127 from Chihui8199/Bugs
jalvinchan Apr 8, 2021
3118159
Merge branch 'master' into send_inbox
jalvinchan Apr 8, 2021
b9f6827
Fix read bug, fix codestyle
jalvinchan Apr 8, 2021
b750b46
PPP
FarmZH98 Apr 8, 2021
80b4cef
Merge branch 'master' into DeveloperGuide&Testing
FarmZH98 Apr 8, 2021
e8fd96d
Merge pull request #128 from jalvinchan/send_inbox
FarmZH98 Apr 8, 2021
4a8df70
added user stories and fixed minor formatting issues
FarmZH98 Apr 8, 2021
84b7692
Merge branch 'master' into DeveloperGuide&Testing
FarmZH98 Apr 8, 2021
dd7c064
added documentation and fixed bug in sort time comparator
FarmZH98 Apr 8, 2021
1504a06
Added sort and sendCommand tests
FarmZH98 Apr 8, 2021
7ded571
fixed documentation violations
FarmZH98 Apr 8, 2021
6af6624
fixed minor documentation violation
FarmZH98 Apr 8, 2021
2f15e37
fixed coding violations
FarmZH98 Apr 8, 2021
91efbbf
fixed coding violations
FarmZH98 Apr 8, 2021
041bae8
Remove static keyword
jalvinchan Apr 8, 2021
c6348e5
Fix issue #129 part 2
jalvinchan Apr 8, 2021
0166bdc
linked AboutUs to PPP
FarmZH98 Apr 9, 2021
23ce78e
updated PPP
FarmZH98 Apr 9, 2021
48e8531
Merge pull request #130 from FarmZH98/DeveloperGuide&Testing
jalvinchan Apr 9, 2021
dbb7a96
refactored methods to improve readability
FarmZH98 Apr 9, 2021
1c63c6f
Merge branch 'master' into send_inbox
jalvinchan Apr 9, 2021
4a8d221
Merge pull request #131 from FarmZH98/DeveloperGuide&Testing
jalvinchan Apr 9, 2021
4e3eaf6
Merge branch 'master' into send_inbox
jalvinchan Apr 9, 2021
b67f691
Merge pull request #132 from jalvinchan/send_inbox
FarmZH98 Apr 9, 2021
df4329a
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
Chihui8199 Apr 9, 2021
3090adb
fix #133
FarmZH98 Apr 9, 2021
df7b182
fix #134, and added edit and sort commands.
FarmZH98 Apr 9, 2021
cd5ecee
modified help menu for multiple indices in sendCommand (fixed #137 in…
FarmZH98 Apr 9, 2021
212e2dd
fixed code violation
FarmZH98 Apr 9, 2021
2dedc28
fixed minor bug in numberCommand
FarmZH98 Apr 9, 2021
5116726
minor change in help menu for sendComand
FarmZH98 Apr 9, 2021
b326956
Merge pull request #138 from FarmZH98/DeveloperGuide&Testing
jalvinchan Apr 9, 2021
9a22aab
Fix issue #135, #139. Add tag command test. Add assertions
jalvinchan Apr 9, 2021
95c6e0f
Merge branch 'master' into send_inbox
jalvinchan Apr 9, 2021
edafe37
Fix checkstyle error
jalvinchan Apr 9, 2021
cad7c39
updated user guide and fix bugs in compose
FarmZH98 Apr 10, 2021
c64e696
fix code violation
FarmZH98 Apr 10, 2021
5e3937e
fix code violation
FarmZH98 Apr 10, 2021
16c270b
Merge pull request #143 from jalvinchan/send_inbox
yanli1215 Apr 10, 2021
660eb00
Check the validation of the password
yanli1215 Apr 10, 2021
d5b1865
Add comment
yanli1215 Apr 10, 2021
59f737c
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Apr 10, 2021
3fde825
fix style errors
yanli1215 Apr 10, 2021
1a50cb4
fix further code violations and user guide
FarmZH98 Apr 10, 2021
d3957d2
Merge branch 'master' into DeveloperGuide&Testing
FarmZH98 Apr 10, 2021
498b170
fix readCommandTest
FarmZH98 Apr 10, 2021
7fb6299
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
Chihui8199 Apr 10, 2021
42075e0
Added new line at end of file
Chihui8199 Apr 10, 2021
200726d
Merge pull request #144 from FarmZH98/DeveloperGuide&Testing
yanli1215 Apr 10, 2021
722c07d
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Apr 10, 2021
79904cf
Merge pull request #145 from yanli1215/master
FarmZH98 Apr 10, 2021
e315560
Merge pull request #151 from Chihui8199/master
FarmZH98 Apr 10, 2021
cf7df23
update DG and fixed PPP name
FarmZH98 Apr 10, 2021
952fec2
Merge pull request #152 from FarmZH98/DeveloperGuide&Testing
FarmZH98 Apr 10, 2021
e4672be
updated page break for PPP
FarmZH98 Apr 10, 2021
fb972e4
updated UG
FarmZH98 Apr 11, 2021
cd423bb
This commit fixes #146
Chihui8199 Apr 11, 2021
e6ec3a5
Merge pull request #153 from Chihui8199/master
yanli1215 Apr 11, 2021
f70df7c
update link
jalvinchan Apr 11, 2021
52c1dac
update DG and UG
yanli1215 Apr 11, 2021
0effda7
Merge pull request #155 from jalvinchan/master
jalvinchan Apr 11, 2021
d44a45a
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Apr 11, 2021
6bd0319
update menu in DG
yanli1215 Apr 11, 2021
25f60a1
fix #126
FarmZH98 Apr 11, 2021
3ae7932
Merge pull request #156 from yanli1215/master
FarmZH98 Apr 11, 2021
58c00f9
fix ppp link
jalvinchan Apr 11, 2021
b0624c2
Include code to load data files from jar
jalvinchan Apr 11, 2021
2a01e67
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
jalvinchan Apr 11, 2021
f85b9ec
Fix checkstyle, update DG
jalvinchan Apr 11, 2021
ed7b0c3
Updated DG for manual testing, UG for FAQ, and composeCommand sequenc…
FarmZH98 Apr 11, 2021
08913f9
reformat code
FarmZH98 Apr 11, 2021
08eb232
Merge branch 'master' into DeveloperGuide&Testing
FarmZH98 Apr 11, 2021
4044d05
added glossary
FarmZH98 Apr 11, 2021
bf7be12
UG FAQ supported email domains
FarmZH98 Apr 11, 2021
6295f6c
Merge pull request #158 from FarmZH98/DeveloperGuide&Testing
yanli1215 Apr 12, 2021
e284bec
add yanli.md
yanli1215 Apr 12, 2021
e168b3f
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Apr 12, 2021
dae7724
update dg and ug
yanli1215 Apr 12, 2021
39e5226
modified sequence diagram for compose command
FarmZH98 Apr 12, 2021
0b10721
Merge pull request #159 from yanli1215/master
FarmZH98 Apr 12, 2021
77619e3
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp …
FarmZH98 Apr 12, 2021
4c0ee8e
update aboutUs
FarmZH98 Apr 12, 2021
a39323a
updated UG examples and DG
FarmZH98 Apr 12, 2021
78acdc0
Updated Javadocs for Login features
Chihui8199 Apr 12, 2021
5c375ad
Merge pull request #160 from FarmZH98/DeveloperGuide&Testing
yanli1215 Apr 12, 2021
e153ab9
Added javadoc for the helpCommand, ListCommand and fixed checkstyle e…
Chihui8199 Apr 12, 2021
d942492
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
Chihui8199 Apr 12, 2021
44adf84
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
jalvinchan Apr 12, 2021
c31b720
Fix storage exception for windows
jalvinchan Apr 12, 2021
b5bd5aa
Update userguide with the constrains of creating new account
Chihui8199 Apr 12, 2021
d7c8d1c
Updated password constrains
Chihui8199 Apr 12, 2021
d3792b6
update UG
yanli1215 Apr 12, 2021
ff1cd07
Update UG read and tag examples
jalvinchan Apr 12, 2021
7e83db3
Try to fix the styling issues
Chihui8199 Apr 12, 2021
c6f939c
Fix read command test
jalvinchan Apr 12, 2021
bddd0e0
Merge pull request #157 from jalvinchan/master
Chihui8199 Apr 12, 2021
9a1ac45
Merge pull request #162 from yanli1215/master
Chihui8199 Apr 12, 2021
5222c68
Merge pull request #161 from Chihui8199/master
Chihui8199 Apr 12, 2021
ba64153
update UG
yanli1215 Apr 12, 2021
1ce31de
Merge pull request #163 from yanli1215/master
yanli1215 Apr 12, 2021
70d1109
update ppp
yanli1215 Apr 12, 2021
0640df3
Merge pull request #164 from yanli1215/master
yanli1215 Apr 12, 2021
b357acd
add photos
FarmZH98 Apr 12, 2021
06c4fdc
update aboutme
yanli1215 Apr 12, 2021
1b24f39
update ppp
jalvinchan Apr 12, 2021
257bf51
update about us
jalvinchan Apr 12, 2021
11f8d95
Merge pull request #167 from jalvinchan/master
jalvinchan Apr 12, 2021
9d8ede7
Merge branch 'master' into master
yanli1215 Apr 12, 2021
5398714
Merge pull request #166 from yanli1215/master
yanli1215 Apr 12, 2021
83e271f
Try to fix windows fail test
jalvinchan Apr 12, 2021
35da05b
Merge branch 'master' into DeveloperGuide&Testing
FarmZH98 Apr 12, 2021
259ec78
update AboutUs.md
FarmZH98 Apr 12, 2021
4935b38
update ppp
yanli1215 Apr 12, 2021
e5b303f
updated AboutUs.md
FarmZH98 Apr 12, 2021
79b3df8
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
yanli1215 Apr 12, 2021
0afa0c2
Merge pull request #169 from yanli1215/master
yanli1215 Apr 12, 2021
65d7c48
try fix windows error again. move data files into resources files
jalvinchan Apr 12, 2021
f1b2223
Merge pull request #165 from FarmZH98/DeveloperGuide&Testing
FarmZH98 Apr 12, 2021
0497f5b
Try to fix windows error 3
jalvinchan Apr 12, 2021
5cf60c3
Fix error 4
jalvinchan Apr 12, 2021
e066173
update DG
FarmZH98 Apr 12, 2021
6df3f36
Merge pull request #168 from jalvinchan/master
FarmZH98 Apr 12, 2021
1b84cb3
Merge branch 'master' into DeveloperGuide&Testing
FarmZH98 Apr 12, 2021
01ff441
updated UG and sequence diagram
FarmZH98 Apr 12, 2021
294eaf5
Merge pull request #171 from FarmZH98/DeveloperGuide&Testing
Chihui8199 Apr 12, 2021
cc6806d
markdown errors
FarmZH98 Apr 12, 2021
5df1391
Merge pull request #172 from FarmZH98/DeveloperGuide&Testing
FarmZH98 Apr 12, 2021
2e00f59
fix developer guide
jalvinchan Apr 12, 2021
596039d
Merge branch 'master' of https://github.com/AY2021S2-CS2113-W10-2/tp
jalvinchan Apr 12, 2021
95df9df
Merge pull request #175 from jalvinchan/master
jalvinchan Apr 12, 2021
649a2f9
fix spaces
jalvinchan Apr 12, 2021
cc0d0c0
Merge pull request #176 from jalvinchan/master
jalvinchan Apr 12, 2021
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,4 @@ bin/

/text-ui-test/ACTUAL.txt
text-ui-test/EXPECTED-UNIX.TXT
SwitchJava.bat
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ repositories {
dependencies {
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'
implementation group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
}

test {
Expand All @@ -29,7 +30,7 @@ test {
}

application {
mainClassName = "seedu.duke.Duke"
mainClassName = "seedu.duke.Mojo"
}

shadowJar {
Expand All @@ -43,4 +44,5 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = true
}
1 change: 1 addition & 0 deletions data/12312@gmail.com.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"password":"5678","deleted":[{"read":"x","subject":"This is subject 3","from":"21312@gmail.com","to":["12312@gmail.com"],"time":"2021-02-20T08:30:00","content":"This is content for s3.","tags":["CS2113"]},{"read":"x","subject":"This is subject 4","from":"21312@gmail.com","to":["12312@gmail.com"],"time":"2021-02-20T09:30:00","content":"This is content for s4.","tags":["School"]},{"read":"x","subject":"This is subject 8","from":"12312@gmail.com","to":["11111@gmail.com"],"time":"2021-02-20T13:30:00","content":"This is content for s8.","tags":["IMPT"]},{"read":"x","subject":"This is subject 11","from":"21312@gmail.com","to":["12312@gmail.com","12313@gmail.com","12314@gmail.com"],"time":"2021-02-20T16:30:00","content":"This is content for s1. ","tags":[]},{"read":"x","subject":"This is subject 1","from":"21312@gmail.com","to":["12312@gmail.com"],"time":"2021-02-20T06:30:00","content":"This is content for s1.","tags":[]}],"junk":[],"drafts":[{"read":"x","subject":"This is subject 3","from":"12312@gmail.com","to":["test@yahoo.com"],"time":"2021-02-20T08:30:00","content":"This is content for s3.","tags":[]},{"read":"x","subject":"LilySubject","from":"12312@gmail.com","to":["lily@gmail.com"],"time":"2021-03-30T15:30:09","content":"hehe\nhehe\nhaha\n","tags":[]}],"archive":[{"read":"x","subject":"This is subject 5","from":"21312@gmail.com","to":["12312@gmail.com"],"time":"2021-02-20T10:30:00","content":"This is content for s5.","tags":[]},{"read":"x","subject":"This is subject 6","from":"11312@gmail.com","to":["12312@gmail.com"],"time":"2021-02-20T11:30:00","content":"This is content for s6.","tags":[]},{"read":"x","subject":"This is subject 4","from":"21312@gmail.com","to":["12312@gmail.com"],"time":"2021-02-20T09:30:00","content":"This is content for s4.","tags":[]}],"inbox":[{"read":"x","subject":"S1","from":"testC@gmail.com","to":["12312@gmail.com"],"time":"2021-04-09T13:08:33","content":"C1","tags":[]},{"read":"x","subject":"S2","from":"testA@gmail.com","to":["12312@gmail.com"],"time":"2021-04-09T13:08:33","content":"C2","tags":[]},{"read":"x","subject":"S1","from":"testC@gmail.com","to":["12312@gmail.com"],"time":"2021-04-09T13:08:33","content":"C1","tags":[]}],"sent":[{"read":"x","subject":"This is subject 7","from":"12312@gmail.com","to":["12332@gmail.com"],"time":"2021-02-20T12:30:00","content":"This is content for s7.","tags":["CS2113","IMPT"]}],"account":"12312@gmail.com"}
3 changes: 3 additions & 0 deletions data/LoginInfo.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
12312@gmail.com|5678
test@gmail.com|1000
test@yahoo.com | 0000
106 changes: 106 additions & 0 deletions data/test@gmail.com.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
{
"account": "test@gmail.com",
"password": "12312",
"inbox":[
{"from": "test@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 1",
"time": "2020-4-23+01:00",
"read": "x",
"tags":["CS2113"],
"content": "This is content for s1."
},
{"from": "test@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 2",
"time": "2020-4-23+02:00",
"read": "x",
"tags":["SCHOOL"],
"content": "This is content for s2."
}
],
"drafts":[
{"from": "test@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 3",
"time": "2020-4-23+03:00",
"read": "x",
"tags":["IMPT"],
"content": "This is content for s3."
},
{"from": "test@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 4",
"time": "2020-4-23+04:00",
"read": "x",
"tags":[],
"content": "This is content for s4."
}
],
"archive": [
{"from": "21312@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 5",
"time": "2020-4-23+05:00",
"read": "x",
"tags":[],
"content": "This is content for s5."
},
{"from": "test@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 6",
"time": "2020-4-23+06:00",
"read": "x",
"tags":[],
"content": "This is content for s6."
}
],
"sent": [
{"from": "12312@gmail.com",
"to": ["12332@gmail.com"],
"subject": "This is subject 7",
"time": "2020-4-23+07:00",
"read": "x",
"tags":[],
"content": "This is content for s7."
},
{"from": "test@gmail.com",
"to": ["11111@gmail.com"],
"subject": "This is subject 8",
"time": "2020-4-23+08:00",
"read": "x",
"tags":[],
"content": "This is content for s8."
}
],
"deleted": [
{"from": "21312@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 9",
"time": "2020-4-23+09:00",
"read": "x",
"tags":[],
"content": "This is content for s9."
},
{"from": "21312@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 10",
"time": "2020-4-23+10:00",
"read": "x",
"tags":[],
"content": "This is content for s1. "
}
],
"junk":[
{"from": "test@gmail.com",
"to": ["12312@gmail.com"],
"subject": "This is subject 11",
"time": "2020-4-23+11:00",
"read": "x",
"tags":["Important","CS2113"],
"content": "This is content for s1. "
}
]
}


1 change: 1 addition & 0 deletions data/test@yahoo.com.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"password":"0000","deleted":[],"junk":[],"archive":[],"drafts":[],"inbox":[],"sent":[],"account":"test@yahoo.com"}
9 changes: 4 additions & 5 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@

Display | Name | Github Profile | Portfolio
--------|:----:|:--------------:|:---------:
![](https://via.placeholder.com/100.png?text=Photo) | John Doe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Joe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Ron John | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | John Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Don Roe | [Github](https://github.com/) | [Portfolio](docs/team/johndoe.md)
![](https://via.placeholder.com/100.png?text=Photo) | Chi Hui | [Github](https://github.com/chihui8199) | [Portfolio](team/chihui8199.md)
![](https://via.placeholder.com/100.png?text=Photo) | Liu Yanli | [Github](https://github.com/yanli1215) | [Portfolio](team/yanli1215.md)
![](https://via.placeholder.com/100.png?text=Photo) | Farm Zheng Hao | [Github](https://github.com/FarmZH98) | [Portfolio](team/farmzh98.md)
![](https://via.placeholder.com/100.png?text=Photo) | Jalvin Chan Jia Xiang | [Github](https://github.com/jalvinchan) | [Portfolio](team/jalvinchan.md)
Loading