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-F10-1] HdBuy #146

Open
wants to merge 420 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
420 commits
Select commit Hold shift + click to select a range
1d6c068
Merge pull request #68 from CabbageTime/master
Apr 1, 2021
348245b
enable jar
jadenwjh Apr 1, 2021
beaabd4
Merge pull request #69 from jadenwjh/Logger-final
jadenwjh Apr 1, 2021
0630f73
Merge branch 'master' into EditDGUG
jadenwjh Apr 1, 2021
0e39f42
Merge pull request #65 from AY2021S2-CS2113-F10-1/EditDGUG
jadenwjh Apr 1, 2021
f029dab
Add changes to error messages for the CLEAR command and CLOSE command.
gorbodoh Apr 1, 2021
94d9652
Merge branch 'master' into UGFIlterCommands
jadenwjh Apr 1, 2021
2b15c60
Merge pull request #67 from heyjinwei/UGFIlterCommands
jadenwjh Apr 1, 2021
3f1a0de
Merge pull request #70 from CabbageTime/master
Apr 1, 2021
2296470
edit sortCommand_Sequence_Diagram.jpg
angelhfy Apr 1, 2021
0b76dd2
More edits in DG
jadenwjh Apr 1, 2021
1396c81
Merge pull request #71 from jadenwjh/Command-UML
jadenwjh Apr 1, 2021
c142a34
added Architecture.jpg.jpg
angelhfy Apr 1, 2021
77f66c1
Merge branch 'EditDGUG' of https://github.com/AY2021S2-CS2113-F10-1/t…
angelhfy Apr 1, 2021
ba3b053
no message
jadenwjh Apr 1, 2021
0ed6e53
no message
jadenwjh Apr 1, 2021
1dd258f
Update DeveloperGuide.md
jadenwjh Apr 1, 2021
db92ad8
First commit with edited DG and CommandClass PUML to remove icons
Apr 1, 2021
07dcc22
Update DeveloperGuide.md
jadenwjh Apr 1, 2021
735f64a
Merge pull request #73 from heyjinwei/DGParserAndCommand
jadenwjh Apr 1, 2021
b84855c
Update DeveloperGuide.md
jadenwjh Apr 1, 2021
7c7d871
Update DeveloperGuide.md
jadenwjh Apr 1, 2021
1ecc417
Update UserGuide.md
jadenwjh Apr 1, 2021
cd8c054
Update README.md
jadenwjh Apr 1, 2021
95326b4
Update README.md
jadenwjh Apr 1, 2021
971158a
Update README.md
jadenwjh Apr 1, 2021
9f4e37e
Update readme
jadenwjh Apr 1, 2021
eb90ccc
Merge pull request #74 from jadenwjh/final-2.0
jadenwjh Apr 1, 2021
0ae3495
Edit diagrams
jadenwjh Apr 2, 2021
a886a82
Edit DG
jadenwjh Apr 2, 2021
94030a7
Edit ParserSequence
jadenwjh Apr 2, 2021
823c449
Update DG
jadenwjh Apr 2, 2021
0f5eb74
Merge pull request #75 from jadenwjh/Edit-ParserSequence
jadenwjh Apr 2, 2021
4aa1c8b
Update DeveloperGuide.md
jadenwjh Apr 2, 2021
ef27489
Hide footbox in diagrams
jadenwjh Apr 2, 2021
08a2add
Merge pull request #76 from jadenwjh/Edit-ParserSequence
jadenwjh Apr 2, 2021
981f815
no message
jadenwjh Apr 2, 2021
376006f
Merge pull request #77 from jadenwjh/master
jadenwjh Apr 2, 2021
e16f02f
Fix Junit
jadenwjh Apr 2, 2021
daa9f54
Merge pull request #78 from jadenwjh/master
jadenwjh Apr 2, 2021
c1fae9f
edited sequence diagram for sortCommand
angelhfy Apr 2, 2021
7a687c6
edited sequence diagram for sortCommand
angelhfy Apr 2, 2021
7c8d755
Added 'how to use' in UG
jadenwjh Apr 2, 2021
b011bec
Merge pull request #80 from jadenwjh/UG-edit
jadenwjh Apr 2, 2021
0ff5592
Update UserGuide.md
jadenwjh Apr 2, 2021
92c1db6
Update UserGuide.md
jadenwjh Apr 2, 2021
6a1a5f8
Update UserGuide.md
jadenwjh Apr 2, 2021
eb4bb7f
Update UserGuide.md
jadenwjh Apr 2, 2021
e2f773c
Update UserGuide.md
jadenwjh Apr 2, 2021
4444ed8
Update UserGuide.md
jadenwjh Apr 2, 2021
469287f
Update UserGuide.md
jadenwjh Apr 2, 2021
a0d5f92
Update UserGuide.md
jadenwjh Apr 2, 2021
220cea1
Update UserGuide.md
jadenwjh Apr 2, 2021
e6ad363
Update UserGuide.md
jadenwjh Apr 4, 2021
e2cb51a
Update UserGuide.md
jadenwjh Apr 4, 2021
9a6bfbf
Update UserGuide.md
jadenwjh Apr 4, 2021
98f2714
Update UserGuide.md
jadenwjh Apr 4, 2021
a2f5e32
Update UserGuide.md
jadenwjh Apr 4, 2021
a5de41e
Update UserGuide.md
jadenwjh Apr 4, 2021
9499f73
Update UserGuide.md
jadenwjh Apr 4, 2021
6be058d
Update UserGuide.md
jadenwjh Apr 4, 2021
9444b38
Update TextUi.java
jadenwjh Apr 4, 2021
d14b559
Trim values for sort remove and save
Apr 5, 2021
cb63c14
Fix trim bug in CommandEvaluator
Apr 5, 2021
9b951c4
no message
Apr 5, 2021
b6774b2
Check for 'save' out of range
Apr 5, 2021
167da36
checkstyle fix
Apr 5, 2021
02c6710
Merge pull request #118 from jadenwjh/trim-bug
jadenwjh Apr 5, 2021
a21c888
Fix duplicates in shortlist bug
Apr 5, 2021
17a3f83
Add Junit test
Apr 5, 2021
bf03a3a
Checkstyle fix
Apr 5, 2021
b1ea9a4
Merge pull request #119 from jadenwjh/shortlist-fix
jadenwjh Apr 5, 2021
85a59ce
Add exception for filter by type and lease_remaining
Apr 5, 2021
6d40f12
Update logic of CommandEvaluator
Apr 5, 2021
e3c3739
Add Junit test for CommandEvaluator
Apr 5, 2021
e82d849
Checkstyle fix
Apr 5, 2021
6fe33ce
Checkstyle fix
Apr 5, 2021
a1b5b2e
Edit Junit test
Apr 5, 2021
d9cf21a
Merge pull request #120 from jadenwjh/filter-param-fix
jadenwjh Apr 5, 2021
ef2f964
Test for illegal characters
Apr 5, 2021
fae06b5
Merge pull request #121 from jadenwjh/filter-param-fix
jadenwjh Apr 5, 2021
6fa2613
Optimised imports
Apr 5, 2021
df04307
Merge pull request #122 from jadenwjh/filter-param-fix
jadenwjh Apr 5, 2021
824127a
Add bulk of Junit test across source code
Apr 5, 2021
4a4be9c
Handle testMain
jadenwjh Apr 5, 2021
d720152
no message
jadenwjh Apr 5, 2021
cf29b2e
no message
jadenwjh Apr 5, 2021
7094284
no message
jadenwjh Apr 5, 2021
d72d5c7
Edit Text-Ui
jadenwjh Apr 5, 2021
0abdf1b
Merge pull request #123 from jadenwjh/junit-final
jadenwjh Apr 5, 2021
9fbcc61
Add all Junit test
jadenwjh Apr 5, 2021
7bd13b0
Checkstyle and optimise imports
jadenwjh Apr 5, 2021
28e94df
Minor bug fix
jadenwjh Apr 5, 2021
4f930e9
Attempt to fix Junit for Main
jadenwjh Apr 5, 2021
fde8a75
no message
jadenwjh Apr 5, 2021
bf043a8
Merge pull request #124 from jadenwjh/junit-final
jadenwjh Apr 5, 2021
9ecd944
Remove duplicate methods
jadenwjh Apr 5, 2021
cda368f
edit
angelhfy Apr 5, 2021
5df945a
no message
jadenwjh Apr 5, 2021
59c1788
Merge pull request #125 from jadenwjh/refactor-final
jadenwjh Apr 5, 2021
734d0a9
First commit with refactored TextUi. Less repeated strings and consta…
Apr 6, 2021
deb86fc
Not sure why test is still failing
Apr 6, 2021
a30cd62
updated architecture
angelhfy Apr 7, 2021
ea83426
updated architecture
angelhfy Apr 7, 2021
6980f72
updated architecture
angelhfy Apr 7, 2021
4e43529
updated sortcommand sequence diagram
angelhfy Apr 7, 2021
5c3d04a
broken class diagram up
angelhfy Apr 7, 2021
7486877
updated user stories
angelhfy Apr 7, 2021
1ffb751
edit sortcommand to destory sortcommand
angelhfy Apr 8, 2021
8ab9ba5
Testing commit pass
Apr 8, 2021
b470984
Merge pull request #128 from AY2021S2-CS2113-F10-1/EditDGUG
jadenwjh Apr 8, 2021
d6bf0e5
Save temporarily
jadenwjh Apr 8, 2021
075e567
Update jadenwjh.md
jadenwjh Apr 8, 2021
12a9b5a
Update README.md
jadenwjh Apr 8, 2021
85d0a03
Set up term definitions, examples and reformatting the code.
gorbodoh Apr 8, 2021
eea4c9b
Corrected a grammar error in the Expected.txt
gorbodoh Apr 8, 2021
52b0aa2
Abstract definition/help message.
gorbodoh Apr 8, 2021
809650b
Merge pull request #127 from heyjinwei/TextUiRefactor
jadenwjh Apr 8, 2021
ef67df2
Revert "First commit with refactored TextUi. Less repeated strings an…
jadenwjh Apr 8, 2021
6f9afa2
Merge pull request #130 from AY2021S2-CS2113-F10-1/revert-127-TextUiR…
jadenwjh Apr 8, 2021
8337129
Update jadenwjh.md
jadenwjh Apr 8, 2021
cc5c68c
Update jadenwjh.md
jadenwjh Apr 8, 2021
353f70d
Update jadenwjh.md
jadenwjh Apr 8, 2021
8a24c1f
Update jadenwjh.md
jadenwjh Apr 8, 2021
ad0a5bc
Update jadenwjh.md
jadenwjh Apr 8, 2021
ed8f5b3
Add PPP draft
jadenwjh Apr 8, 2021
bd9b1c2
Merge pull request #131 from jadenwjh/PPP-Draft
jadenwjh Apr 8, 2021
7807234
Merge branch 'master' of https://github.com/jadenwjh/tp
jadenwjh Apr 8, 2021
fed68ee
Update README.md
jadenwjh Apr 8, 2021
77d0f12
Update README.md
jadenwjh Apr 8, 2021
5a8d651
Refactor the showHelp message.
gorbodoh Apr 8, 2021
3cc80c1
Remove redundant initialization and change some errors inside the mes…
gorbodoh Apr 8, 2021
f5eae54
Add javadocs to files under the data, parser, storage, and ui package…
gorbodoh Apr 9, 2021
f30e6e1
Corrected Javadocs errors.
gorbodoh Apr 9, 2021
b5116d3
Add javadocs for all the packages (excluding logger and exception).
gorbodoh Apr 9, 2021
4b93425
Update Unit.java
jadenwjh Apr 9, 2021
e692ee6
Merge pull request #129 from CabbageTime/branch-TPHRefactorTextUI
jadenwjh Apr 9, 2021
6a6b5f9
Add sequence diagram for new class in TextUi package.
gorbodoh Apr 9, 2021
4fb89a2
Merge pull request #132 from CabbageTime/master
jadenwjh Apr 10, 2021
e62c570
Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-1/tp
jadenwjh Apr 10, 2021
c9b536a
Add UG contributions to PPP
jadenwjh Apr 10, 2021
353641f
Merge pull request #133 from jadenwjh/PPP-final
jadenwjh Apr 10, 2021
a2bac26
Add UG contributions
jadenwjh Apr 10, 2021
5d1fff9
Merge pull request #134 from jadenwjh/PPP-final
jadenwjh Apr 10, 2021
1a4dde2
Resize images on PPP
jadenwjh Apr 10, 2021
7682004
Merge pull request #135 from jadenwjh/PPP-final
jadenwjh Apr 10, 2021
8480c82
Resize diagrams
jadenwjh Apr 10, 2021
cef00e8
Merge pull request #136 from jadenwjh/PPP-final
jadenwjh Apr 10, 2021
b9b58ae
Finalise UG part of PPP
jadenwjh Apr 10, 2021
0ed1ac8
Merge pull request #137 from jadenwjh/PPP-final
jadenwjh Apr 10, 2021
332f5da
changed size for architecture.jpg
angelhfy Apr 10, 2021
855b914
Merge pull request #138 from AY2021S2-CS2113-F10-1/EditDGUG
jadenwjh Apr 10, 2021
5602252
Edit sortcommand sequence diagram too
jadenwjh Apr 10, 2021
e574277
Merge pull request #139 from jadenwjh/sortcommand-sequence-fix
jadenwjh Apr 10, 2021
2e98156
Resize diagrams
jadenwjh Apr 10, 2021
3c2d164
Merge pull request #140 from jadenwjh/sortcommand-sequence-fix
jadenwjh Apr 10, 2021
02a26b5
Resize diagrams
jadenwjh Apr 10, 2021
38a20a2
Merge pull request #141 from jadenwjh/sortcommand-sequence-fix
jadenwjh Apr 10, 2021
9b63d8a
Update DG (final)
jadenwjh Apr 10, 2021
132e0e2
Merge pull request #142 from jadenwjh/sortcommand-sequence-fix
jadenwjh Apr 10, 2021
5d0724d
Edit UG
jadenwjh Apr 10, 2021
d9abd41
Merge pull request #143 from jadenwjh/sortcommand-sequence-fix
jadenwjh Apr 10, 2021
0d9561d
Refactor TextUi
jadenwjh Apr 11, 2021
6063128
Merge pull request #144 from jadenwjh/master
jadenwjh Apr 11, 2021
f293c2d
First commit
Apr 11, 2021
859e32c
Merge branch 'master' into EditUG
heyjinwei Apr 11, 2021
9f35e03
Secoond commit
Apr 11, 2021
1710cda
Merge branch 'EditUG' of https://github.com/heyjinwei/tp into EditUG
Apr 11, 2021
47a86c0
First Commit
Apr 11, 2021
0cd8708
Merge pull request #145 from heyjinwei/EditUG
jadenwjh Apr 11, 2021
a946b0e
Merge pull request #146 from heyjinwei/jinweiPPP
jadenwjh Apr 11, 2021
4147af8
Resize images in UG
jadenwjh Apr 11, 2021
965d565
Merge pull request #147 from jadenwjh/master
jadenwjh Apr 11, 2021
0ff812b
Standardize black background for images
jadenwjh Apr 11, 2021
20d075d
Merge pull request #148 from jadenwjh/master
jadenwjh Apr 11, 2021
ae84472
Portfolio document started for Pang How.
gorbodoh Apr 11, 2021
1d24a74
edited minor detail
Apr 11, 2021
87839e2
Merge pull request #149 from heyjinwei/changeJWName
heyjinwei Apr 11, 2021
c29d698
Edit Website readme
jadenwjh Apr 11, 2021
95f355d
Merge pull request #150 from jadenwjh/master
jadenwjh Apr 11, 2021
bae6c4e
Resize website images
jadenwjh Apr 11, 2021
beaf656
Merge pull request #151 from jadenwjh/master
jadenwjh Apr 11, 2021
369fcd6
Edit PPP
jadenwjh Apr 11, 2021
655b0ad
Merge pull request #152 from jadenwjh/master
jadenwjh Apr 11, 2021
ab2bef6
Fix display bug PPP
jadenwjh Apr 11, 2021
edb779e
Merge pull request #153 from jadenwjh/master
jadenwjh Apr 11, 2021
a69c331
Resize PPP images
jadenwjh Apr 11, 2021
f8dda65
Merge pull request #154 from jadenwjh/master
jadenwjh Apr 11, 2021
d5a00d2
Resize images in PPP
jadenwjh Apr 11, 2021
d2bae36
Merge pull request #155 from jadenwjh/master
jadenwjh Apr 11, 2021
41f45f4
Finalise PPP
jadenwjh Apr 11, 2021
ae4aee8
Merge pull request #156 from jadenwjh/master
jadenwjh Apr 11, 2021
e6491cd
Finalise PPP
jadenwjh Apr 11, 2021
fbe1e4b
Merge pull request #157 from jadenwjh/master
jadenwjh Apr 11, 2021
7cfb760
Edit PPP final
jadenwjh Apr 11, 2021
c376f98
angel's PPP
angelhfy Apr 11, 2021
a4547a2
angel's PPP
angelhfy Apr 11, 2021
277bebf
Complete the PPP for Pang How.
gorbodoh Apr 11, 2021
df87866
Merge branch 'branch-PPP'
gorbodoh Apr 11, 2021
58a0f56
Merge pull request #159 from CabbageTime/master
Apr 11, 2021
514a8c7
Remove unnecessary page breaks.
gorbodoh Apr 11, 2021
b120427
Merge pull request #160 from CabbageTime/master
Apr 11, 2021
29073a5
Edit minor bugs in Docs
jadenwjh Apr 11, 2021
77e7840
Merge pull request #161 from jadenwjh/master
jadenwjh Apr 11, 2021
db6f574
Merge pull request #158 from AY2021S2-CS2113-F10-1/angel'sPPP
jadenwjh Apr 11, 2021
4a3b6e6
Update screenshots
jadenwjh Apr 11, 2021
1430f21
Edit Error handling in UG
jadenwjh Apr 11, 2021
f9405a9
Merge branch 'master' of https://github.com/AY2021S2-CS2113-F10-1/tp
jadenwjh Apr 11, 2021
7651a4a
Merge pull request #162 from jadenwjh/master
jadenwjh Apr 11, 2021
b314786
Edit indentation in PPP
jadenwjh Apr 11, 2021
6ff79eb
Merge pull request #163 from jadenwjh/master
jadenwjh Apr 11, 2021
2607779
FIx indentation PPP
jadenwjh Apr 11, 2021
4a80348
Merge pull request #164 from jadenwjh/master
jadenwjh Apr 11, 2021
117890c
no message
jadenwjh Apr 11, 2021
3da161a
Merge pull request #165 from jadenwjh/master
jadenwjh Apr 11, 2021
a25175b
Fix spacing in UG
jadenwjh Apr 11, 2021
92e4b6e
Merge pull request #166 from jadenwjh/master
jadenwjh Apr 11, 2021
561b0b9
Added line about demo video
Apr 11, 2021
88adbbb
Merge pull request #167 from heyjinwei/jwPPPupdate
heyjinwei Apr 11, 2021
a516f3a
Fix DG spacing
jadenwjh Apr 11, 2021
ec45813
Merge pull request #168 from jadenwjh/master
jadenwjh Apr 11, 2021
9a3d158
Edit DG spacing
jadenwjh Apr 11, 2021
60e4cb8
Merge pull request #169 from jadenwjh/master
jadenwjh Apr 11, 2021
4474226
Update UG to reflect new links
jadenwjh Apr 11, 2021
fd43591
Merge pull request #170 from jadenwjh/master
jadenwjh Apr 11, 2021
ea96762
Clean up source code
jadenwjh Apr 11, 2021
6c58594
Merge pull request #171 from jadenwjh/master
jadenwjh Apr 11, 2021
499ecb3
Update UserGuide.md
jadenwjh Apr 11, 2021
f3a00f1
Minor edits to docs
Apr 12, 2021
584a1b4
Merge pull request #172 from jadenwjh/master
jadenwjh Apr 12, 2021
16395c6
Edit docs and messages.
Apr 12, 2021
2fb18b5
Edit UG
Apr 12, 2021
47defa4
Edit textUi test
Apr 12, 2021
166267c
Merge pull request #173 from jadenwjh/master
jadenwjh Apr 12, 2021
9b4aef7
Edit text
Apr 12, 2021
75b2a42
Merge pull request #174 from jadenwjh/master
jadenwjh Apr 12, 2021
66186e8
Edit Ui
Apr 12, 2021
e831c2f
Merge pull request #175 from jadenwjh/master
jadenwjh Apr 12, 2021
b984a6a
Edit UG
Apr 12, 2021
51372ae
Merge pull request #176 from jadenwjh/master
jadenwjh Apr 12, 2021
885de44
Edit DG
Apr 12, 2021
ecec0cc
Merge pull request #177 from jadenwjh/master
jadenwjh Apr 12, 2021
85d70f4
Edit DG spacing
Apr 12, 2021
0974593
Merge pull request #178 from jadenwjh/master
jadenwjh Apr 12, 2021
db02ef8
Edit PPP
Apr 12, 2021
8858c39
Merge pull request #179 from jadenwjh/master
jadenwjh Apr 12, 2021
6e600cc
Resize PPP images
Apr 12, 2021
b045da1
Merge pull request #180 from jadenwjh/master
jadenwjh Apr 12, 2021
bcf494e
Edit line breaks
Apr 12, 2021
5442910
Merge pull request #181 from jadenwjh/master
jadenwjh 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
64 changes: 0 additions & 64 deletions README.md

This file was deleted.

23 changes: 21 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ repositories {
}

dependencies {
implementation 'junit:junit:4.12'
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'
}
Expand All @@ -29,18 +30,36 @@ test {
}

application {
mainClassName = "seedu.duke.Duke"
mainClassName = "seedu.hdbuy.HdBuy"
}

shadowJar {
archiveBaseName = "duke"
archiveBaseName = "hdbuy"
archiveClassifier = null
}

checkstyle {
toolVersion = '8.23'
}

task deleteJar(type: Delete) {
delete 'libs/jars/hdbuy.jar'
}

task createJar(type: Copy) {
from('build/intermediates/bundles/release/')
into('libs/jars/')
include('classes.jar')
rename('classes.jar', 'hdbuy.jar')
}

createJar.dependsOn(deleteJar, build)

run{
standardInput = System.in
enableAssertions = true
}

wrapper {
gradleVersion = '6.3'
}
13 changes: 6 additions & 7 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# About us

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)
Name | Github Profile | Portfolio
----:|:--------------:|:---------:
Chuah Jin Wei | [Github](https://github.com/heyjinwei/) | [Portfolio](team/heyjinwei.md)
Wong Jun Hong | [Github](https://github.com/jadenwjh) | [Portfolio](team/jadenwjh.md)
Tan Pang How | [Github](https://github.com/CabbageTime) | [Portfolio](team/cabbagetime.md)
Angel Han | [Github](https://github.com/warmwhalefy) | [Portfolio](team/warmwhalefy.md)
Loading