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-T11-2] Flirt & Fork #42

Open
wants to merge 468 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
468 commits
Select commit Hold shift + click to select a range
684983d
Refactor generateItinerary. Now verifies price/location
RyanTDL Apr 9, 2024
c16da00
Refactor favouriting function. Now updates database
RyanTDL Apr 9, 2024
14142d1
Merge pull request #152 from RyanTDL/master
soongensayo Apr 9, 2024
7e346ba
Populate food/activity database with more entries
RyanTDL Apr 9, 2024
efa5b5a
Merge branch 'AY2324S2-CS2113-T11-2:master' into master
RyanTDL Apr 9, 2024
4cabe81
Edit smart command portion in User Guide
soongensayo Apr 9, 2024
bb41d9a
Add ability to scan and load txt files
RyanTDL Apr 9, 2024
13f9971
Merge pull request #154 from soongensayo/soongEn-UserGuide2
soongensayo Apr 9, 2024
739397f
Fix bug: History function now working
RyanTDL Apr 9, 2024
d6ad635
Merge branch 'AY2324S2-CS2113-T11-2:master' into master
RyanTDL Apr 9, 2024
1983a65
Merge branch 'master' of https://github.com/RyanTDL/tp
RyanTDL Apr 9, 2024
956accf
Merge pull request #153 from RyanTDL/master
RyanTDL Apr 9, 2024
9b295ea
Refactor loadUserDetails command
soongensayo Apr 10, 2024
3fe2540
Change output for smart itinerary
soongensayo Apr 10, 2024
d15c4bb
Merge pull request #155 from soongensayo/soongEn-refactor
soongensayo Apr 10, 2024
be35a45
Add Q&A section and legend for cuisine in User Guide
soongensayo Apr 10, 2024
d3d876a
Merge pull request #156 from soongensayo/soongEn-refactor
soongensayo Apr 10, 2024
3ac795f
Add lines to FAQ section
soongensayo Apr 10, 2024
f0434b1
Merge pull request #157 from soongensayo/master
soongensayo Apr 10, 2024
e661e6a
Fix minor bugs with error logging and input handling
RyanTDL Apr 10, 2024
0b18790
Refactor 'food' to verify cuisine type, and minor Ui fixes
RyanTDL Apr 10, 2024
03c603a
Merge pull request #158 from RyanTDL/master
RyanTDL Apr 10, 2024
d95fd9b
Replace instances of "Duke" with "FlirtFork"
Apr 10, 2024
ea8cba8
Reset entries marked as "U" in Food and Activity lists
Apr 10, 2024
374980f
Merge pull request #160 from seandooa/SeanDooa-ChangeDuketoFlirtFork
seandooa Apr 10, 2024
1b25474
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 10, 2024
3c71a36
Edit GenerateIdeaCommand sequence diagram based on DG review
Apr 10, 2024
878b8e0
Merge pull request #164 from seandooa/SeanDooa-SequenceDiagramUpdate
seandooa Apr 10, 2024
36150dd
fix findFavourites bug
tiffanyliu0220 Apr 10, 2024
430b939
Merge pull request #165 from tiffanyliu0220/master
tiffanyliu0220 Apr 10, 2024
ec64b21
Add restriction on date format input for anniversary
Apr 10, 2024
8834b08
update UG to standardise format of input
tiffanyliu0220 Apr 10, 2024
c054f1f
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 10, 2024
286e43f
fix grammatical/spelling errors in UG
tiffanyliu0220 Apr 10, 2024
efb5cb0
Merge pull request #167 from tiffanyliu0220/master
tiffanyliu0220 Apr 10, 2024
aae0f6c
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 10, 2024
d2585de
Add me command documentation into User Guide
Apr 10, 2024
d60448a
Update PPP and Developer Guide
RyanTDL Apr 10, 2024
7052357
Merge branch 'AY2324S2-CS2113-T11-2:master' into master
RyanTDL Apr 10, 2024
d6e1184
Merge pull request #168 from RyanTDL/master
RyanTDL Apr 10, 2024
1c727ed
Add J-Unit test for readAnniversaryDate
Apr 10, 2024
655a28c
Merge pull request #169 from seandooa/SeanDooa-ErrorHandlingforAnnive…
seandooa Apr 10, 2024
06e73c7
Address formatting issues in GitHub pages deployment
Apr 10, 2024
8ae73da
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 11, 2024
f867f76
ppp
tiffanyliu0220 Apr 11, 2024
bc02e25
update AboutUs
tiffanyliu0220 Apr 11, 2024
a50186a
Merge pull request #170 from tiffanyliu0220/master
tiffanyliu0220 Apr 11, 2024
bb59fef
First draft for PPP
liuy1103 Apr 11, 2024
13bed83
Merge pull request #171 from liuy1103/yiting-updatePPP
liuy1103 Apr 11, 2024
b3b8a94
Update Soong En PPP
soongensayo Apr 11, 2024
4d109ba
Merge pull request #172 from soongensayo/soongEn-PPP
soongensayo Apr 11, 2024
6710ef8
Preliminary implementation of gender specific gift command
liuy1103 Apr 11, 2024
a6d606e
Merge branch 'master' into fixFavourites
tiffanyliu0220 Apr 11, 2024
fc0d86f
Fix bugs in gender specific gift generation
liuy1103 Apr 11, 2024
10149a6
Update giftList database for more gendered options
liuy1103 Apr 11, 2024
0adcb95
Merge pull request #173 from liuy1103/yiting-genderSpecificGift
liuy1103 Apr 11, 2024
2412766
attempt to implement findFood
tiffanyliu0220 Apr 11, 2024
e16bbbf
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 11, 2024
2d2e71c
Merge branch 'master' into fixFavourites
tiffanyliu0220 Apr 11, 2024
7c3e25a
created FindFoodsCommand class, still needa test/check again
tiffanyliu0220 Apr 11, 2024
fd0515a
Merge pull request #175 from tiffanyliu0220/master
tiffanyliu0220 Apr 11, 2024
b8013dc
Create PPP draft
Apr 11, 2024
49f5474
Update PPP under portfolio section in About Us
Apr 11, 2024
26b0023
Merge pull request #176 from seandooa/SeanDooa-PPPDraft
seandooa Apr 11, 2024
035db9d
Update Soong En PPP
soongensayo Apr 11, 2024
9df483c
Merge pull request #177 from soongensayo/soongEn-PPP-2
soongensayo Apr 11, 2024
d45512a
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 12, 2024
c5d86d4
PPP tiff
tiffanyliu0220 Apr 12, 2024
ee655b4
added FindOptionsCommand where it can find food, activity, gift from …
tiffanyliu0220 Apr 12, 2024
0b9ec24
adhere to checkstyle
tiffanyliu0220 Apr 12, 2024
3ba5414
update test case for FindOptionsCommand
tiffanyliu0220 Apr 12, 2024
cce9424
adhere to checkstyle
tiffanyliu0220 Apr 12, 2024
185a6b0
adjust test case adherring to checkstyle
tiffanyliu0220 Apr 12, 2024
aa3dabb
haven't implemented the test case for FindOptionsCommand in ParserTest
tiffanyliu0220 Apr 12, 2024
364dee1
Merge pull request #181 from tiffanyliu0220/master
tiffanyliu0220 Apr 12, 2024
87fa5bc
edit Soong En PPP
soongensayo Apr 12, 2024
050854e
Merge pull request #182 from soongensayo/soongEn-PPP-3
soongensayo Apr 12, 2024
bc1e4d5
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 12, 2024
d873ded
delete unnecessary commands
tiffanyliu0220 Apr 12, 2024
f8ecfc0
Update PPP draft 2
liuy1103 Apr 12, 2024
373a8ff
Merge pull request #183 from liuy1103/yiting-PPP-UG
liuy1103 Apr 12, 2024
1378b98
delete unnecessary method
tiffanyliu0220 Apr 12, 2024
4bf11a8
Merge branch 'AY2324S2-CS2113-T11-2:master' into master
tiffanyliu0220 Apr 12, 2024
127d108
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 12, 2024
6ec6312
Merge branch 'master' into JUnitTests
tiffanyliu0220 Apr 12, 2024
689f2ed
Merge pull request #184 from tiffanyliu0220/master
tiffanyliu0220 Apr 12, 2024
7e66f30
added handle errors in ListFavouritesCommand
tiffanyliu0220 Apr 12, 2024
545358a
added error handling for DeleteFavouritesCommand
tiffanyliu0220 Apr 12, 2024
bc7c5cc
added error handling for FindOptionsCommand
tiffanyliu0220 Apr 12, 2024
dc3bed2
added error handling for Favourites and FavouritesList
tiffanyliu0220 Apr 12, 2024
4f4610b
adhere to checkstyle
tiffanyliu0220 Apr 12, 2024
86d631c
Merge branch 'AY2324S2-CS2113-T11-2:master' into master
tiffanyliu0220 Apr 12, 2024
644546d
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 12, 2024
f96232f
Merge pull request #185 from tiffanyliu0220/master
tiffanyliu0220 Apr 12, 2024
ec8d805
Update user guide for gift feature
liuy1103 Apr 13, 2024
8eba567
Merge pull request #187 from liuy1103/yiting-updateUG
liuy1103 Apr 13, 2024
d093d81
Refactor ListOptionCommand to enable continuous listing until cancel
liuy1103 Apr 13, 2024
ee6fc9a
Update user guide for List function
liuy1103 Apr 13, 2024
dee01fc
Merge pull request #188 from liuy1103/yiting-updateUG
liuy1103 Apr 13, 2024
718d566
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 13, 2024
5cf7d73
Update Sequence Diagrams
soongensayo Apr 13, 2024
38d0094
Merge pull request #189 from soongensayo/soongEn-UserGuide3
soongensayo Apr 13, 2024
dcf4f85
Add Object Diagram for UserDetails
soongensayo Apr 13, 2024
fb2bc48
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 13, 2024
951a81c
Merge pull request #190 from soongensayo/master
soongensayo Apr 13, 2024
fb471a8
fix favourites and find favourites
tiffanyliu0220 Apr 13, 2024
d5b88b4
Merge branch 'check_find'
tiffanyliu0220 Apr 13, 2024
a686cf5
Merge branch 'master' into master
tiffanyliu0220 Apr 13, 2024
e55794a
Merge pull request #191 from tiffanyliu0220/master
tiffanyliu0220 Apr 13, 2024
970be3b
Modify gift generation to prevent repeated randomisation
liuy1103 Apr 13, 2024
e0c74db
Merge pull request #193 from liuy1103/yiting-giftRandomisationEnhance…
liuy1103 Apr 13, 2024
cfebcd3
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 13, 2024
903ca57
Update GenerateIdeaCommand sequence diagram based on peer feedback
Apr 13, 2024
d0e4529
update UG on find feature
tiffanyliu0220 Apr 13, 2024
e7cf371
Fix errors in activation bars
Apr 13, 2024
e45ad87
in the process of fixing find into a continuous process
tiffanyliu0220 Apr 13, 2024
e7e1f71
adhere to checkstyle
tiffanyliu0220 Apr 13, 2024
8001800
Add JavaDoc for gift related classes
liuy1103 Apr 13, 2024
efc8cd4
update FindOptionsCommand into a continuous finding feature
tiffanyliu0220 Apr 13, 2024
f2828bb
adhere to checkstyle
tiffanyliu0220 Apr 13, 2024
93716f7
Merge branch 'fixFind'
tiffanyliu0220 Apr 13, 2024
0d5f05f
Merge pull request #196 from tiffanyliu0220/master
tiffanyliu0220 Apr 13, 2024
f897877
Add JavaDoc for methods related to list and gift
liuy1103 Apr 13, 2024
05ddae8
Add more JavaDocs for relevant classes and methods
liuy1103 Apr 13, 2024
4425ce0
Merge branch 'master' into yiting-JavaDoc
liuy1103 Apr 13, 2024
3756128
Update Parser to resolve merge conflict
liuy1103 Apr 13, 2024
9c07c04
Merge pull request #197 from liuy1103/yiting-JavaDoc
liuy1103 Apr 13, 2024
a86d3d7
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 13, 2024
c706e03
add on to PPP tiff and added java doc to FavouritesList
tiffanyliu0220 Apr 13, 2024
7dec071
added javadoc to ListFavouritesCommand
tiffanyliu0220 Apr 13, 2024
823a46d
added javadoc for FindOptionsCommand
tiffanyliu0220 Apr 13, 2024
f8d1781
added java doc to DeleteFavouritesCommand
tiffanyliu0220 Apr 13, 2024
6cb9944
added javadoc for AddFoodCommand
tiffanyliu0220 Apr 13, 2024
ffafa60
added javadoc for AddActivityCommand
tiffanyliu0220 Apr 13, 2024
a05f735
added javadoc to ExitCommand
tiffanyliu0220 Apr 13, 2024
2dd59ba
added JavaDoc
tiffanyliu0220 Apr 13, 2024
0b6dc90
Merge branch 'master' into master
tiffanyliu0220 Apr 13, 2024
6e2b2fb
Create object diagram for GenerateIdeaCommand
Apr 13, 2024
6a5a6dc
Update Javadoc Ui.java
tiffanyliu0220 Apr 13, 2024
8fd95cb
Update JavaDoc Storage.java
tiffanyliu0220 Apr 13, 2024
30334a1
Add object diagram for Generate Idea into Developer Guide
Apr 13, 2024
9f379b2
Merge pull request #198 from tiffanyliu0220/master
tiffanyliu0220 Apr 13, 2024
8e3b0d7
Update PPP
Apr 13, 2024
5672390
Merge pull request #199 from seandooa/master
seandooa Apr 13, 2024
9852ac4
Add more JUnit tests for Parser class
liuy1103 Apr 14, 2024
952ad35
Merge pull request #201 from liuy1103/yiting-parserJUnit
liuy1103 Apr 14, 2024
dd4d899
Add JUnit test for UI class and list option command test for parser c…
liuy1103 Apr 14, 2024
e8167f4
Merge pull request #202 from liuy1103/yiting-UI-JUnit
liuy1103 Apr 14, 2024
ca15ea9
Update UserGuide, DeveloperGuide, PPP
RyanTDL Apr 14, 2024
4ebef05
Merge branch 'master' of https://github.com/RyanTDL/tp
RyanTDL Apr 14, 2024
082dfa5
Modify giftClassDiagram to reflect new changes
liuy1103 Apr 14, 2024
6bdb5a0
Revert user doc deletion due to merge conflict
RyanTDL Apr 14, 2024
00d1b9c
Modify giftSequenceDiagram to reflect new implementations
liuy1103 Apr 14, 2024
29db0bc
Update DG to reflect changes and enhancements in gift feature
liuy1103 Apr 14, 2024
5814f03
Merge pull request #204 from liuy1103/yiting-UG-DG-update
liuy1103 Apr 14, 2024
dc0c355
Update JavaDoc comments
RyanTDL Apr 14, 2024
a5afd45
Throw FlirtForkExcep
RyanTDL Apr 14, 2024
473ae79
Throw FlirtForkException if error encountered
RyanTDL Apr 14, 2024
d577fc6
Merge pull request #203 from RyanTDL/master
RyanTDL Apr 14, 2024
aab9dfd
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 14, 2024
5d0acd8
update tiff PPP
tiffanyliu0220 Apr 14, 2024
3917210
Update PPP draft 3
liuy1103 Apr 14, 2024
c3e9ad8
Merge pull request #205 from tiffanyliu0220/master
tiffanyliu0220 Apr 14, 2024
7950f16
Merge branch 'master' into yiting-PPP-draft3
liuy1103 Apr 14, 2024
0e0a410
Merge pull request #206 from liuy1103/yiting-PPP-draft3
liuy1103 Apr 14, 2024
b595141
Add unit tests for food/activity features
RyanTDL Apr 14, 2024
e73aa87
Merge branch 'AY2324S2-CS2113-T11-2:master' into master
RyanTDL Apr 14, 2024
c977411
Merge pull request #207 from RyanTDL/master
RyanTDL Apr 14, 2024
f76d78a
Revert user guide back to previous version
RyanTDL Apr 14, 2024
a76fb50
Merge branch 'master' of https://github.com/RyanTDL/tp
RyanTDL Apr 14, 2024
0f7fcfb
Merge pull request #208 from RyanTDL/master
RyanTDL Apr 14, 2024
b79a080
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 14, 2024
9dcb579
Update PPP to include new community involvements
liuy1103 Apr 14, 2024
d37bf7b
Merge pull request #209 from liuy1103/yiting-PPP-Draft4
liuy1103 Apr 14, 2024
2f42490
Ensure date entered cannot be later than the current date
Apr 14, 2024
0fe0464
Further improve robustness of date input
Apr 14, 2024
7915882
Update User Guide with input constraints for me
Apr 14, 2024
757a085
Add J-Unit testing and peer testing into PPP
Apr 14, 2024
fe06236
Merge pull request #211 from seandooa/SeanDooa-FixAnniversaryDateBug
seandooa Apr 14, 2024
8def8a7
Fix punctuation mistake in User Guide
Apr 14, 2024
dd31244
Merge pull request #212 from seandooa/master
seandooa Apr 14, 2024
0dfe25a
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 14, 2024
5e48301
update tiff PPP
tiffanyliu0220 Apr 14, 2024
274e999
Merge pull request #218 from tiffanyliu0220/master
tiffanyliu0220 Apr 14, 2024
51a87ed
Update PPP to include more details
RyanTDL Apr 14, 2024
387956d
Merge pull request #222 from RyanTDL/master
RyanTDL Apr 14, 2024
c2034bc
Fix photo and portfolio link for 'AboutUs' section
RyanTDL Apr 14, 2024
1fe2b55
Merge branch 'AY2324S2-CS2113-T11-2:master' into master
RyanTDL Apr 14, 2024
e44ab90
Merge pull request #227 from RyanTDL/master
RyanTDL Apr 14, 2024
e89401d
fix 'find' explanation in 'help' message
soongensayo Apr 14, 2024
a86bff7
Fix UG bugs
soongensayo Apr 14, 2024
e2cb012
Merge pull request #231 from soongensayo/soongEn-fixPeerTestBugs
soongensayo Apr 14, 2024
aea08eb
Deleted extra entries
soongensayo Apr 14, 2024
fc5e394
Merge pull request #234 from soongensayo/master
soongensayo Apr 14, 2024
ad728ca
Edit User Guide
soongensayo Apr 14, 2024
de181ab
Merge pull request #242 from soongensayo/soongEn-editUserGuide
soongensayo Apr 14, 2024
3ec2f9b
Warn users about manual data editing
soongensayo Apr 14, 2024
9f71147
Merge pull request #243 from soongensayo/soongEn-editUserGuide
soongensayo Apr 14, 2024
620c3bb
Edit user warning
soongensayo Apr 14, 2024
789c7e8
Merge pull request #244 from soongensayo/soongEn-editUserGuide
soongensayo Apr 14, 2024
15b965b
Edit smart sequence diagram
soongensayo Apr 14, 2024
87f7f24
Merge pull request #246 from soongensayo/soongEn-editUserGuide
soongensayo Apr 14, 2024
e119073
Edit smart sequence diagram for user details collection
soongensayo Apr 14, 2024
cb92d54
Merge pull request #247 from soongensayo/soongEn-editUserGuide
soongensayo Apr 14, 2024
7b9de3b
Edit Soong En PPP
soongensayo Apr 14, 2024
ab8038a
Merge pull request #248 from soongensayo/soongEn-PPP-4
soongensayo Apr 14, 2024
4056bf0
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 15, 2024
a307877
specified the user input more clearly for add restaurants to favourit…
tiffanyliu0220 Apr 15, 2024
ef66f03
specify language in UG
tiffanyliu0220 Apr 15, 2024
640db69
update tiff PPP
tiffanyliu0220 Apr 15, 2024
6f18526
Merge pull request #249 from tiffanyliu0220/master
tiffanyliu0220 Apr 15, 2024
76cdb45
Fix UG bugs
soongensayo Apr 15, 2024
d7be121
Merge pull request #250 from soongensayo/soongEn-addFinalChanges
soongensayo Apr 15, 2024
a519c5b
Edit Command Summary
soongensayo Apr 15, 2024
6debd2d
Merge pull request #251 from soongensayo/master
soongensayo Apr 15, 2024
ced3b5d
Fix typo in legend
soongensayo Apr 15, 2024
eae4651
Merge pull request #252 from soongensayo/master
soongensayo Apr 15, 2024
7760494
Modify UG for idea command
liuy1103 Apr 15, 2024
feb7595
Merge pull request #254 from liuy1103/yiting-fixIdea-UG
liuy1103 Apr 15, 2024
77cdb37
Add clearer error handlings to parser class
liuy1103 Apr 15, 2024
23df15f
Merge pull request #255 from liuy1103/yiting-fixIdea-UG
liuy1103 Apr 15, 2024
dc08adc
Update PPP
liuy1103 Apr 15, 2024
f56c7b2
Merge pull request #256 from liuy1103/yiting-fixIdea-UG
liuy1103 Apr 15, 2024
5d4b48c
Add additional line for UG command summary
liuy1103 Apr 15, 2024
bad71d8
Merge pull request #257 from liuy1103/yiting-fixIdea-UG
liuy1103 Apr 15, 2024
3e7126a
Improve integer parsing for entering anniversary date
Apr 15, 2024
694111b
Improve integer parsing for entering age
Apr 15, 2024
c2787de
Merge pull request #259 from seandooa/SeanDooa-StricterIntegerInputsf…
seandooa Apr 15, 2024
2f0e4af
Fix minor cosmestics on display messages
RyanTDL Apr 15, 2024
1b84606
Merge branch 'AY2324S2-CS2113-T11-2:master' into master
RyanTDL Apr 15, 2024
808e8d3
Merge pull request #260 from RyanTDL/master
RyanTDL Apr 15, 2024
0c1c9fa
Test fix for User Guide hyperlinks
Apr 15, 2024
9a33ec1
Merge branch 'master' of https://github.com/tiffanyliu0220/tp
tiffanyliu0220 Apr 15, 2024
d70fb3b
PPP final update
Apr 15, 2024
44c3fa3
Update download link to release page
Apr 15, 2024
749c002
Merge branch 'master' into SeanDooa-FixBrokenHyperlinks
seandooa Apr 15, 2024
0f4546c
Merge pull request #261 from seandooa/SeanDooa-FixBrokenHyperlinks
seandooa Apr 15, 2024
34894e0
update UG to have the same input format as what's written in help
tiffanyliu0220 Apr 15, 2024
40a04aa
Merge branch 'master' into master
tiffanyliu0220 Apr 15, 2024
fe994dc
Fix hyperlink for usage
Apr 15, 2024
3f45913
Update UserGuide.md
tiffanyliu0220 Apr 15, 2024
9d879b2
Merge pull request #262 from tiffanyliu0220/master
tiffanyliu0220 Apr 15, 2024
8490031
Fix hyperlink for features
Apr 15, 2024
6403f31
Merge remote-tracking branch 'upstream/master'
Apr 15, 2024
da792dd
Merge pull request #263 from seandooa/master
seandooa Apr 15, 2024
914ff4c
Redeploy pages
Apr 15, 2024
42c5af8
Fix database for correct history
liuy1103 Apr 15, 2024
75bf5e8
Redeploy pages
Apr 15, 2024
658a8e0
Merge pull request #264 from liuy1103/yiting-fix-history
liuy1103 Apr 15, 2024
1d4f7df
Fix legend hyperlink
Apr 15, 2024
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
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.configuration.updateBuildConfiguration": "interactive"
}
3 changes: 3 additions & 0 deletions META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Main-Class: seedu.duke.FlirtFork.Duke

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Duke project template
# Flirt & Fork

This is a project template for a greenfield Java project. It's named after the Java mascot _Duke_. Given below are instructions on how to use it.

Expand Down
17 changes: 15 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ test {
}

application {
mainClass.set("seedu.duke.Duke")
mainClass.set("seedu.flirtfork.FlirtFork")
}

shadowJar {
archiveBaseName.set("duke")
archiveBaseName.set("Flirt_and_Fork")
archiveClassifier.set("")
}

Expand All @@ -43,4 +43,17 @@ checkstyle {

run{
standardInput = System.in
enableAssertions = true
}

apply plugin: 'jacoco'
jacoco {
toolVersion = "0.8.5"
}
jacocoTestReport {
reports {
xml.enabled = true
csv.enabled = false
html.enabled = true
}
}
322 changes: 322 additions & 0 deletions data/ActivityList.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,322 @@
Botanic Garden Tours | C | C | U
Gardens by the Bay | C | C | U
Kampong Glam Cultural Exploration | C | C | U
Little India Heritage Walk | C | C | U
Bugis Street Market | C | C | U
Esplanade Free Concerts | C | C | U
National Library Visits | C | C | U
St Andrew's Cathedral Tour | C | C | U
Singapore River Walk | C | C | U
Clarke Quay Nightlife | C | B | U
Bras Basah Complex Art Galleries | C | B | U
National Museum of Singapore Visit | C | B | U
Fort Canning Hill Hike | C | B | U
Stamford Arts Centre Performances | C | B | U
Raffles Hotel Historical Tour | C | B | U
Chinatown Food Adventure | C | B | U
Marina Bay Sands Light and Water Show | C | B | U
Singapore River Cruise | C | B | U
Haw Par Villa | C | B | U
Mount Faber Cable Car Ride | C | B | U
Orchard Road Shopping Experience | C | A | U
Merlion Park Visit | C | A | U
Chinatown Heritage Centre | C | A | U
Duck Tours at Marina Bay | C | A | U
Suntec City Shopping | C | A | U
Peranakan Museum Discovery | C | A | U
Haji Lane Shopping | C | A | U
Fort Canning Park Archaeological Dig and Historical Tour | C | A | U
Museum of Ice Cream | C | A | U
Katong Antique House Visit | C | A | U
Katong Food Walk | C | A | U
Singapore Cable Car Dining | C | P | U
National Gallery Singapore Exclusive Tour | C | P | U
Victoria Theatre Concert Night | C | P | U
Singapore River Fine Dining Cruise | C | P | U
Helix Bridge Evening Walk | C | P | U
MBS Casino Experience | C | P | U
Singapore Flyer | C | P | U
Universal Studios Singapore | C | P | U
Singapore Zoo Night Safari | C | P | U
Marina Bay Sands SkyPark | C | P | U
Private Luxury Boat Charter at Marina Bay | C | S | U
VIP Shopping Experience on Orchard Road | C | S | U
Esplanade Theatres VIP Show Tickets | C | S | U
Private Helicopter Tour over Singapore | C | S | U
Exclusive Ritz-Carlton Spa Day | C | S | U
MBS Skypark Infinity Pool Access | C | S | U
Marina Bay Sands Skypark Observation Deck | C | S | U
Marina Bay Sands Infinity Pool | C | S | U
ArtScience Museum | C | S | U
Marina Bay Sands Shopping | C | S | U
Gardens by the Bay | C | S | U
East Coast Lagoon Food Village | E | C | U
Pasir Ris Park Mangrove Walk | E | C | U
Bedok Reservoir Park | E | C | U
Tampines Eco Green Tour | E | C | U
Siglap Canal Graffiti Art Walk | E | C | U
Changi Point Coastal Boardwalk | E | C | U
Jewel Changi Airport Exploration | E | C | U
Peranakan Culture Exploration in Joo Chiat | E | C | U
Pulau Ubin Adventure | E | C | U
Marina Barrage Kite Flying | E | C | U
Punggol Waterway Park | E | C | U
Simei Street Art Trail | E | B | U
Paya Lebar Square Shopping | E | B | U
Changi Village Hawker Centre Food Trip | E | B | U
Tanah Merah Country Club Golf | E | B | U
Bedok Jetty Fishing Experience | E | B | U
Pasir Ris Beach Park BBQ | E | B | U
Haw Par Villa | E | B | U
Katong Laksa Tasting | E | B | U
East Coast Park Cycling | E | B | U
Coney Island Park Exploration | E | B | U
Katong Antique House Visit | E | A | U
Changi Airport Jewel Exploration | E | A | U
East Coast Park BBQ Party | E | A | U
Laguna National Golf & Country Club | E | A | U
Tampines Hub Sports Facilities | E | A | U
Singapore Wake Park | E | A | U
Chek Jawa Wetlands Tour | E | A | U
Katong Food Walk | E | A | U
Changi Museum Visit | E | A | U
Punggol Promenade Nature Walk | E | A | U
Cycling at Punggol Waterway | E | A | U
Jewel Changi Airport Canopy Park | E | P | U
Wild Wild Wet VIP Package | E | P | U
Aloha Sea Sports Centre Windsurfing | E | P | U
D'Resort Rainforest Suite Stay | E | P | U
Tanjong Beach Club Day Pass | E | P | U
Changi Cove Conference Centre Retreat | E | P | U
Ferry Ride to Pulau Ubin with Private Guide | E | P | U
Changi Experience Studio | E | P | U
Marina Bay Sands Skypark Observation Deck | E | P | U
Marina Bay Sands Casino | E | P | U
Jewel Changi Airport Canopy Park | E | P | U
Marina Bay Sands Infinity Pool | E | S | U
Marina Bay Sands Shopping | E | S | U
Marina Bay Sands Helicopter Tour | E | S | U
Pulau Ubin Adventure | E | S | U
Punggol Waterway Park | E | S | U
Exclusive Jewel Changi Airport Tour | E | S | U
Private Yacht Charter from Changi | E | S | U
VIP Sky Dining on Singapore Cable Car | E | S | U
Premium Seafood Dinner at East Coast | E | S | U
Ultimate Pulau Ubin Cycling Adventure | E | S | U
Luxurious Spa Day at Capri by Fraser | E | S | U
Clementi Woods Park Nature Walk | W | C | U
Bukit Batok Nature Park Hiking | W | C | U
Jurong Lake Gardens Picnic | W | C | U
West Coast Park Playground Adventure | W | C | U
Chinese Garden Leisure Visit | W | C | U
Science Centre Observatory Stargazing | W | C | U
Singapore Botanic Gardens | W | C | U
Jurong Bird Park | W | C | U
Singapore Science Centre | W | C | U
Henderson Waves Bridge Walk | W | C | U
Singapore Botanic Gardens | W | C | U
West Coast Park Picnic | W | B | U
IMM Outlet Mall Shopping | W | B | U
Jurong Bird Park Basic Tour | W | B | U
Sungei Buloh Wetland Reserve Visit | W | B | U
Westgate Shopping Spree | W | B | U
Snow City Singapore Fun Visit | W | B | U
Army Museum of Singapore Exploration | W | B | U
Hawker Centre Hopping in Jurong | W | B | U
JCube Ice Skating | W | B | U
Haw Par Villa | W | B | U
Mount Faber Cable Car Ride | W | B | U
Jurong East Swimming Complex Day Out | W | A | U
JCube Ice Skating Session | W | A | U
Chinese and Japanese Gardens Guided Tour | W | A | U
Adventure Cove Waterpark Standard Access | W | A | U
Lee Kong Chian Natural History Museum Visit | W | A | U
The Rink Ice Skating | W | A | U
Jurong Lake Gardens Cycling | W | A | U
Haw Par Villa | W | A | U
Jurong East Swimming Complex | W | A | U
Jurong Hill Lookout Tower | W | A | U
Jurong Eco-Garden | W | A | U
Singapore Discovery Centre Premium Experience | W | P | U
River Safari Exclusive Tour | W | P | U
Jurong Bird Park Private Encounter | W | P | U
Omni-Theatre Immersive Experience | W | P | U
The Live Turtle and Tortoise Museum Private Visit | W | P | U
Jem Shopping and Dining Experience | W | P | U
Jurong Hill Lookout Tower | W | P | U
Jem Shopping Mall | W | P | U
West Coast Park Sunset Viewing | W | P | U
Orchard Road Shopping | W | P | U
VivoCity Shopping | W | P | U
Night Safari VIP Tour | W | S | U
Jurong Bird Park Behind-the-Scenes Experience | W | S | U
River Safari Amazon River Quest Private Boat | W | S | U
Science Centre Singapore VIP Tour | W | S | U
The Rink Exclusive Ice Skating Party | W | S | U
Luxury Spa Retreat at Genting Hotel Jurong | W | S | U
Jurong Eco-Garden | W | S | U
Marina Bay Sands Infinity Pool | W | S | U
Marina Bay Sands Skypark Observation Deck | W | S | U
West Coast Park Sunset Viewing | W | S | U
Henderson Waves Bridge Walk | W | S | U
Henderson Waves Bridge Walk | S | C | U
Labrador Park Nature Walk | S | C | U
Sentosa Beach Leisure Day | S | C | U
Mount Faber Park Hiking | S | C | U
VivoCity Waterfront Promenade | S | C | U
Sentosa Nature Discovery Trail | S | C | U
Fort Siloso Skywalk Visit | S | C | U
Southern Ridges Walk | S | C | U
Sentosa Merlion | S | C | U
Marina Barrage Picnic | S | C | U
Gardens by the Bay | S | C | U
Madame Tussauds Singapore Basic Tour | S | B | U
Sentosa Boardwalk Experience | S | B | U
Mega Adventure Park Basic Package | S | B | U
Sentosa 4D AdventureLand Standard Ticket | S | B | U
Trick Eye Museum Visit | S | B | U
Sentosa Merlion Basic Visit | S | B | U
Haw Par Villa | S | B | U
Mount Faber Cable Car Ride | S | B | U
Resorts World Sentosa Adventure Cove Waterpark | S | B | U
Sentosa Skyline Luge | S | B | U
Underwater World | S | B | U
Resorts World Sentosa Adventure Cove Waterpark | S | A | U
Sentosa Cable Car Standard Ride | S | A | U
Adventure Cove Waterpark Full Access | S | A | U
Wings of Time Show Standard Seating | S | A | U
Sentosa Island Tour | S | A | U
Siloso Beach Bars Evening Out | S | A | U
S.E.A. Aquarium Standard Entry | S | A | U
Siloso Beach Party | S | A | U
Sentosa Island Beach Clubs | S | A | U
Marina Bay Sands Fine Dining | S | A | U
Siloso Beach Party | S | A | U
Marina Bay Sands Skating Rink | S | P | U
Universal Studios Singapore Express Pass | S | P | U
Sentosa Luxury Yacht Charter | S | P | U
Capella Singapore Spa Day | S | P | U
Sentosa Golf Club Green Fees | S | P | U
Quayside Isle Fine Dining Experience | S | P | U
Dolphin Island Exclusive Encounter | S | P | U
S.E.A. Aquarium | S | P | U
Underwater World | S | P | U
Marina Bay Sands Casino | S | P | U
Singapore Flyer Dining | S | P | U
iFly Singapore Indoor Skydiving | S | S | U
Skyline Luge Sentosa | S | S | U
AJ Hackett Sentosa Bungee Jump | S | S | U
Marina Bay Sands Infinity Pool | S | S | U
Sentosa Private Beach Villa Stay | S | S | U
Universal Studios Singapore VIP Tour | S | S | U
S.E.A. Aquarium VIP Tour with Marine Biologist | S | S | U
Sentosa Sunset Dinner Cruise | S | S | U
Capella Singapore Exclusive Dining | S | S | U
Ola Beach Club Private Party | S | S | U
Skydiving | S | S | U
Punggol Waterfront Park Picnic | NE | C | U
Lorong Halus Wetland Bird Watching | NE | C | U
Coney Island Nature Walk | NE | C | U
Punggol Jetty Fishing | NE | C | U
Sengkang Riverside Park Visit | NE | C | U
Punggol Promenade Riverside Walk | NE | C | U
Punggol Waterway Park | NE | C | U
Punggol Settlement Seafood Dining | NE | C | U
Coney Island Park Exploration | NE | C | U
Lorong Halus Wetland Park Bird Watching | NE | C | U
Punggol Waterway Park | NE | C | U
Seletar Aerospace Park Viewing | NE | B | U
Punggol Container Park Shopping | NE | B | U
Waterway Point Shopping Spree | NE | B | U
Compass One Mall Experience | NE | B | U
Punggol Point Horse Riding | NE | B | U
Oasis Terraces Community Plaza | NE | B | U
Punggol Waterway Park Kayaking | NE | B | U
Windsurfing in Punggol | NE | B | U
Lorong Halus Wetland Park Bird Watching | NE | B | U
Punggol Jetty Sunset Viewing | NE | B | U
Lorong Halus Bridge Cycling | NE | B | U
Punggol Promenade Nature Walk | NE | A | U
Punggol Safra Adventure Sports | NE | A | U
North Eastern Riverine Loop Cycling | NE | A | U
The Animal Resort Visit | NE | A | U
Seletar Country Club Golfing | NE | A | U
Coney Island Guided Exploration | NE | A | U
Punggol Waterway Park Kayaking | NE | A | U
Punggol Container Park Shopping | NE | A | U
Cycling at Punggol Waterway | NE | A | U
Pulau Ubin Adventure | NE | A | U
Coney Island Park Glamping | NE | A | U
Jewel Changi Airport Canopy Park | NE | P | U
Orchid Country Club Golf and Dine | NE | P | U
Seletar Aerospace Park Private Tour | NE | P | U
The Seletar Mall Exclusive Shopping | NE | P | U
Punggol Marina Country Club Yacht Charter | NE | P | U
Coney Island Luxury Glamping | NE | P | U
Sengkang Sports Complex Private Pool Booking | NE | P | U
Hai Bin Prawning | NE | P | U
Changi Experience Studio | NE | P | U
Marina Bay Sands SkyPark | NE | P | U
Jewel Changi Airport Canopy Park | NE | P | U
Marina Bay Sands Skypark Observation Deck | NE | S | U
Yacht Party at Punggol Marina | NE | S | U
Seletar Airbase Helicopter Tour | NE | S | U
Exclusive Dining at The Summerhouse | NE | S | U
Private Guided Tour of Coney Island | NE | S | U
Punggol Point Sunset Yacht Dinner | NE | S | U
Seletar Country Club VIP Golf Experience | NE | S | U
Marina Bay Sands Shopping | NE | S | U
Marina Bay Sands Helicopter Tour | NE | S | U
Pulau Ubin Adventure | NE | S | U
Punggol Waterway Park | NE | S | U
Cultural Shows | ACC | C | U
Interactive Workshops | ACC | C | U
Local Community Centre Workshops | ACC | C | U
Public Library Storytelling Sessions | ACC | C | U
Heartland Mall Bargain Hunting | ACC | C | U
Public Park Yoga Sessions | ACC | C | U
HDB Estate Heritage Walks | ACC | C | U
Community Farm Visits | ACC | C | U
Park Visits | ACC | C | U
Street Food Sampling | ACC | C | U
Cultural Shows | ACC | B | U
Interactive Workshops | ACC | B | U
Neighbourhood Food Trail | ACC | B | U
Urban Farming Workshops | ACC | B | U
Local Art Galleries Visit | ACC | B | U
Community Sports Hub Activities | ACC | B | U
Heartland Shopping Complexes | ACC | B | U
Street Performance Watching | ACC | B | U
Park Visits | ACC | B | U
Street Food Sampling | ACC | B | U
Beach Outings | ACC | A | U
Historical Landmark Visits | ACC | A | U
Guided City Tours | ACC | A | U
Public Swimming Complex Access | ACC | A | U
Artisan Market Shopping | ACC | A | U
Local Theatre Performances | ACC | A | U
Urban Sketching Sessions | ACC | A | U
Community Garden Tours | ACC | A | U
Local Cooking Class Experience | ACC | A | U
Museum Trips | ACC | A | U
Private Guided Tours | ACC | P | U
Private Art Workshop | ACC | P | U
Exclusive Culinary Tours | ACC | P | U
Personal Fitness Training Session | ACC | P | U
Private Music Concerts | ACC | P | U
Luxury Spa Treatment in Heartland | ACC | P | U
High-End Shopping Experience in Local Boutiques | ACC | P | U
Local Theatre Performances | ACC | P | U
River Cruise | ACC | P | U
Spa Treatment | ACC | P | U
Helicopter Tour | ACC | S | U
Adventure Sports | ACC | S | U
Yacht Charter | ACC | S | U
VIP Event | ACC | S | U
Helicopter City Tour | ACC | S | U
Exclusive Private Chef Dining Experience | ACC | S | U
Luxury Yacht Charter from Local Marina | ACC | S | U
VIP Access to Local Festivals | ACC | S | U
Bespoke Tailoring Experience | ACC | S | U
Private Gallery Viewing and Art Auction | ACC | S | U
Paragliding | C | C | U
Empty file added data/Favourites.txt
Empty file.
Loading
Loading