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-W14-4] Voyagers #14

Open
wants to merge 385 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
385 commits
Select commit Hold shift + click to select a range
e109e2d
Create Status.java
Luo-Z-Y Mar 24, 2024
3410b3e
Update DeveloperGuide.md
Luo-Z-Y Mar 24, 2024
8a43fc4
Merge pull request #37 from Luo-Z-Y/Week-10
Luo-Z-Y Mar 24, 2024
571e08b
Update Voyagers.java
Luo-Z-Y Mar 24, 2024
52daf67
Merge pull request #39 from jthibault03/master
jthibault03 Mar 26, 2024
80d0e3f
Merge pull request #40 from jthibault03/master
jthibault03 Mar 26, 2024
88622a3
Merge pull request #41 from jthibault03/master
jthibault03 Mar 26, 2024
ee5216f
assert false
jthibault03 Mar 27, 2024
c8bd7fb
fixing merge
jthibault03 Mar 27, 2024
7cf6176
bill and payable
jthibault03 Mar 27, 2024
94612d4
build and payable fixing gradle errors
jthibault03 Mar 27, 2024
dcc4af9
Merge branch 'NewParser'
azamanis Mar 27, 2024
29d2b63
Merge branch 'master' of https://github.com/AY2324S2-CS2113-W14-4/tp
azamanis Mar 27, 2024
5ae1c3b
Merge remote-tracking branch 'upstream/master' into Week-10
Luo-Z-Y Mar 27, 2024
e425e5b
update status
Luo-Z-Y Mar 27, 2024
2ef947b
Fix setdate, fix setname
CerealMiller Mar 27, 2024
4cb99a4
Edit import statements to comply with gradle checks
CerealMiller Mar 27, 2024
cfbb0aa
Merge pull request #42 from CerealMiller/master
CerealMiller Mar 27, 2024
8cc569f
update DG
jthibault03 Mar 27, 2024
bb52e1e
Fix ParserTest
CerealMiller Mar 27, 2024
14bc0ac
Removed unused import java.io.ByteArrayInputStream
CerealMiller Mar 27, 2024
a65ba94
update status
Luo-Z-Y Mar 27, 2024
45cc2ed
Merge remote-tracking branch 'upstream/master' into Week-10
Luo-Z-Y Mar 27, 2024
b36cbe9
Merge pull request #44 from CerealMiller/master
CerealMiller Mar 27, 2024
e1ac40d
Fix bill class.
azamanis Mar 27, 2024
2c23c20
Comple Developer Guide.
azamanis Mar 27, 2024
acc5f20
add status of trip
Luo-Z-Y Mar 27, 2024
0e1fdae
Merge remote-tracking branch 'upstream/master' into Week-10
Luo-Z-Y Mar 27, 2024
eabecb0
Merge pull request #46 from Luo-Z-Y/Week-10
Luo-Z-Y Mar 27, 2024
661efe4
Include sequence diagram for basic flow.
azamanis Mar 28, 2024
dff5d98
Merge pull request #45 from azamanis/DG_alvaro
azamanis Mar 28, 2024
2d463d4
Enable assertions in gradle.
azamanis Mar 28, 2024
52f35a0
Merge pull request #47 from azamanis/DG_alvaro
azamanis Mar 28, 2024
4a953b2
Update DeveloperGuide.md
azamanis Mar 28, 2024
fbb0bfa
Remove reviewScore attribute of Trip class and its implementation
CerealMiller Mar 29, 2024
03c1b44
Rename Storage and StorageTest classes to TripStorage and TripStorage…
CerealMiller Mar 29, 2024
8111196
Rename Storage and StorageTest classes to TripStorage and TripStorage…
CerealMiller Mar 29, 2024
5e19cc8
Create and implement Review, ReviewCommand, ReadReviewCommand classes
CerealMiller Mar 29, 2024
0bd1f51
Remove ununsed imports, indent code
CerealMiller Mar 29, 2024
547bff4
Merge pull request #48 from CerealMiller/master
CerealMiller Mar 29, 2024
b96bcdf
Update DG and UG with Review class
CerealMiller Mar 29, 2024
9590d3e
Merge pull request #49 from CerealMiller/master
CerealMiller Mar 29, 2024
6156dd1
Implement ReviewStorage class to save trip reviews in "local-reviews.…
CerealMiller Mar 30, 2024
deeecd4
Indent ReviewStorage
CerealMiller Mar 30, 2024
571accb
Update TripStorageTest assert statement to expect Trip2 COMPLETED
CerealMiller Mar 30, 2024
84fa8d5
Add catch java.io.IOException in ReviewStorage
CerealMiller Mar 30, 2024
c8e74bf
Remove unused import java.text.ParseException in ReviewStorage
CerealMiller Mar 30, 2024
403fd10
Update Storage classes' error messages to specify which file faces error
CerealMiller Mar 30, 2024
4af096b
Merge pull request #51 from CerealMiller/master
CerealMiller Mar 30, 2024
9888ced
Add catch NullPointerException to ReviewStorage
CerealMiller Mar 30, 2024
8a89a7a
Merge pull request #52 from CerealMiller/master
CerealMiller Mar 30, 2024
dd35f62
Start developping BillSettler.
azamanis Mar 31, 2024
cd1f07c
Implement BillSetler algorithm.
azamanis Mar 31, 2024
c2097cc
Organize files.
azamanis Mar 31, 2024
efe61ef
Fix gradle.
azamanis Mar 31, 2024
23d703d
Fix more gradle errors.
azamanis Mar 31, 2024
5b7d94b
Eliminate redundant lines.
azamanis Mar 31, 2024
fb81522
Clean code.
azamanis Mar 31, 2024
ddd7084
Change order of definition of variables.
azamanis Mar 31, 2024
dbff711
Merge pull request #53 from azamanis/BillSetler
azamanis Mar 31, 2024
a75ce9d
Fix bug where ReviewStorage class's writeReviewFile would crash by ac…
CerealMiller Apr 2, 2024
c6b0648
Merge pull request #58 from CerealMiller/master
CerealMiller Apr 2, 2024
90fd19b
Fix bug where Trip constructor used in main loop doesn't declare stat…
CerealMiller Apr 2, 2024
0c8744a
Merge pull request #59 from CerealMiller/master
CerealMiller Apr 2, 2024
ebaba55
update DG
Luo-Z-Y Apr 2, 2024
8941226
Merge remote-tracking branch 'upstream/master' into week-11
Luo-Z-Y Apr 2, 2024
d1e6b35
Merge pull request #60 from Luo-Z-Y/week-11
Luo-Z-Y Apr 2, 2024
2947518
dg
jthibault03 Apr 3, 2024
cea7c96
dg
jthibault03 Apr 3, 2024
f733993
g
jthibault03 Apr 3, 2024
a1e5506
Update UserGuide.md
Luo-Z-Y Apr 3, 2024
ea113c8
Update Currency.java
Luo-Z-Y Apr 4, 2024
e4375a0
Merge remote-tracking branch 'upstream/master' into week-11
Luo-Z-Y Apr 4, 2024
31ed41e
correct the basic functions syntax on UG
Luo-Z-Y Apr 7, 2024
8a5483a
Merge pull request #91 from Luo-Z-Y/week-11
Luo-Z-Y Apr 7, 2024
90e30e5
Complete Status
Luo-Z-Y Apr 7, 2024
9e8731b
Merge pull request #93 from Luo-Z-Y/week-11
Luo-Z-Y Apr 7, 2024
53a2b28
Merge remote-tracking branch 'upstream/master' into Week-12
Luo-Z-Y Apr 7, 2024
3df3f71
add autosave function
Luo-Z-Y Apr 7, 2024
43718f0
improve subtrip
Luo-Z-Y Apr 7, 2024
ecb216c
Complete user guide
azamanis Apr 7, 2024
1d5562a
Add more information to developers guide.
azamanis Apr 7, 2024
69d7f51
Add new sequence diagram.
azamanis Apr 7, 2024
02c706c
Merge pull request #94 from azamanis/Guide
azamanis Apr 7, 2024
e5a97da
Add files via upload
azamanis Apr 7, 2024
bf44da8
Delete docs/diagrams/diag_simplify_bills.png
azamanis Apr 7, 2024
0ad73fb
Add files via upload
azamanis Apr 7, 2024
93b64de
Add files via upload
azamanis Apr 7, 2024
c314be6
Update DeveloperGuide.md
azamanis Apr 7, 2024
989cfea
bills stuff
jthibault03 Apr 8, 2024
7acc1f6
bills execute
jthibault03 Apr 8, 2024
6e23779
ListBill and AddBill command
jthibault03 Apr 8, 2024
fbb14be
AddBill command
jthibault03 Apr 8, 2024
da5ca12
billcurrency command
jthibault03 Apr 8, 2024
c1fa231
bills ug update
jthibault03 Apr 8, 2024
f85dca2
Merge pull request #95 from jthibault03/master
jthibault03 Apr 8, 2024
2694270
local text
Luo-Z-Y Apr 9, 2024
af15d27
Merge remote-tracking branch 'upstream/master' into Week-12
Luo-Z-Y Apr 9, 2024
672b067
fix subtrip function, add profile and bill storage file
Luo-Z-Y Apr 9, 2024
5db9986
Merge pull request #96 from Luo-Z-Y/Week-12
Luo-Z-Y Apr 9, 2024
83f3a3b
Merge remote-tracking branch 'upstream/master' into Week-12
Luo-Z-Y Apr 10, 2024
a45bb12
Add date checks for AddSubTripCommand
CerealMiller Apr 11, 2024
16502ef
Fix checkstyle errors
CerealMiller Apr 11, 2024
ba87dea
Merge pull request #97 from CerealMiller/master
CerealMiller Apr 11, 2024
a50be80
update simplybill and billstorage
Luo-Z-Y Apr 11, 2024
e4e019c
Merge branch 'AY2324S2-CS2113-W14-4:master' into Week-12
Luo-Z-Y Apr 11, 2024
3c59d11
Merge pull request #98 from Luo-Z-Y/Week-12
Luo-Z-Y Apr 11, 2024
63aae07
update simplifybill command
Luo-Z-Y Apr 11, 2024
866bb5e
Merge branch 'AY2324S2-CS2113-W14-4:master' into Week-12
Luo-Z-Y Apr 11, 2024
1cc0c18
Merge pull request #99 from Luo-Z-Y/Week-12
Luo-Z-Y Apr 11, 2024
6a679b0
Replace 'listall' command with 'list', able to specify specific trip …
CerealMiller Apr 11, 2024
4d7fb61
Fix check for zero trips of specfied status
CerealMiller Apr 11, 2024
afc4b63
Merge pull request #101 from CerealMiller/master
CerealMiller Apr 11, 2024
07daaff
Fix ListCommand not to double print subtrips
CerealMiller Apr 11, 2024
dc0c303
Merge pull request #102 from CerealMiller/master
CerealMiller Apr 11, 2024
7abf25c
Fix bug where printing any trip prints line "Sub-trips:" Only main tr…
CerealMiller Apr 11, 2024
4a88670
Merge pull request #103 from CerealMiller/master
CerealMiller Apr 11, 2024
17f404f
Fix TripStorage to write subtrips to file
CerealMiller Apr 11, 2024
31fbd3a
Fix TripStorage double writing subtrips to file
CerealMiller Apr 11, 2024
4eca81f
Set ReviewStorage to store reviews of only main trips
CerealMiller Apr 11, 2024
1de195b
Add 'list cancelled' as a command to list all cancelled trips
CerealMiller Apr 11, 2024
571f90d
Merge pull request #104 from CerealMiller/master
CerealMiller Apr 11, 2024
2f1000e
Update UG with new 'list' command
CerealMiller Apr 11, 2024
2eb403a
Update UserGuide.md
Luo-Z-Y Apr 11, 2024
dea05b5
Merge pull request #105 from CerealMiller/master
CerealMiller Apr 11, 2024
19f9046
Merge branch 'AY2324S2-CS2113-W14-4:master' into Week-12
Luo-Z-Y Apr 11, 2024
857d453
Merge pull request #106 from Luo-Z-Y/Week-12
Luo-Z-Y Apr 11, 2024
2cfd7db
Update LUO-Z-Y's PPP
Luo-Z-Y Apr 11, 2024
f948249
Merge branch 'AY2324S2-CS2113-W14-4:master' into Week-12
Luo-Z-Y Apr 11, 2024
9bf9b61
Merge pull request #107 from Luo-Z-Y/Week-12
Luo-Z-Y Apr 11, 2024
6a7e9d3
Implement command 'deletesubtrip', eg 'deletesubtrip /n China /i 1' d…
CerealMiller Apr 12, 2024
6c45b46
Add 'addsubtrip' and 'deletesubtrip' to UG
CerealMiller Apr 12, 2024
51d7d9f
Merge pull request #108 from CerealMiller/master
CerealMiller Apr 12, 2024
c1ee6fd
Update CereaMiller's PPP
CerealMiller Apr 12, 2024
efe41e0
Merge pull request #109 from CerealMiller/master
CerealMiller Apr 12, 2024
f8f42cd
Write PPP azamanis.
azamanis Apr 12, 2024
f38673b
Merge pull request #110 from azamanis/PPP
azamanis Apr 12, 2024
efdc537
Delete old, unused Parser class
CerealMiller Apr 12, 2024
fd45d60
Merge pull request #111 from CerealMiller/master
CerealMiller Apr 12, 2024
01889a7
Rename cerealmiller's ppp
CerealMiller Apr 13, 2024
e3e71fb
Merge pull request #112 from CerealMiller/master
CerealMiller Apr 13, 2024
a35981c
Update UserGuide.md
azamanis Apr 13, 2024
d840460
Fix CerealMiller broken picture url
CerealMiller Apr 13, 2024
b7a00ed
Merge pull request #114 from CerealMiller/master
CerealMiller Apr 13, 2024
6a0ca27
Fix checkstyle errors
CerealMiller Apr 13, 2024
4dbce03
Merge pull request #115 from CerealMiller/master
CerealMiller Apr 13, 2024
de37d1d
Fix TripStorageTest
CerealMiller Apr 13, 2024
52b09c3
Update text-ui-test/EXPECTED.TXT
Apr 13, 2024
8b97378
Merge pull request #116 from CerealMiller/master
CerealMiller Apr 13, 2024
39684a0
Implement 'find' command
Apr 13, 2024
82ca0eb
Update HelpCommand with 'addmaintrip', 'modifying main trip', 'list' …
Apr 13, 2024
c5a5d7d
Merge pull request #117 from CerealMiller/master
CerealMiller Apr 13, 2024
206f3d3
update ug
jthibault03 Apr 13, 2024
93a378d
Add 'review' and 'readreview' to HelpCommand
Apr 13, 2024
ebd8ee1
Merge pull request #118 from CerealMiller/master
CerealMiller Apr 13, 2024
a4de085
Implement ability to change trip details for sub trips
Apr 13, 2024
94396ec
Merge pull request #119 from CerealMiller/master
CerealMiller Apr 13, 2024
e56c9d8
Change CerealMiller PPP reposense link
Apr 13, 2024
0ee8eaa
Merge pull request #120 from CerealMiller/master
CerealMiller Apr 13, 2024
0392937
Update 'delete' guide in HelpCommand
Apr 13, 2024
950c0f6
Merge pull request #121 from CerealMiller/master
CerealMiller Apr 13, 2024
bdd70e0
Fix bug where deleted main trips are still counted due to TripsList t…
Apr 13, 2024
2bb950d
Fix 'readreview' command to print review correctly
Apr 13, 2024
1f34127
Merge pull request #122 from CerealMiller/master
CerealMiller Apr 13, 2024
5566bbc
Add examples and example outputs to UG
Apr 13, 2024
eeb294f
Merge pull request #123 from CerealMiller/master
CerealMiller Apr 13, 2024
7aec8df
Add guide to 'setlocation', 'setdescription' to UG.
Apr 13, 2024
d53abdc
Merge pull request #124 from CerealMiller/master
CerealMiller Apr 13, 2024
f784d18
Fix bug where large positive or negative integer review score input d…
Apr 14, 2024
ae1547d
Merge pull request #125 from CerealMiller/master
CerealMiller Apr 14, 2024
063f7b4
Change to lowercase NewParser's command words related to bills
Apr 14, 2024
f252f6e
Merge pull request #126 from CerealMiller/master
CerealMiller Apr 14, 2024
5fce58b
remove redundant print
Luo-Z-Y Apr 14, 2024
9f84dd6
fix minor bugs
Luo-Z-Y Apr 14, 2024
8ba538a
Merge branch 'AY2324S2-CS2113-W14-4:master' into Week-12
Luo-Z-Y Apr 14, 2024
ebdf1ee
Merge pull request #127 from Luo-Z-Y/Week-12
Luo-Z-Y Apr 14, 2024
120b2a0
Fix bug about not updating trip status.
azamanis Apr 14, 2024
6b3061f
Add more to PPP.
azamanis Apr 14, 2024
14308b3
Fix adding Bill to a Trip when an existing Bill with the same billNam…
Apr 14, 2024
45e3ece
Merge pull request #128 from CerealMiller/master
CerealMiller Apr 14, 2024
3444acd
Merge pull request #129 from azamanis/FIX_PDE
azamanis Apr 14, 2024
c4fc9a8
Fix ListBillCommand
Apr 14, 2024
7b95ad1
Merge pull request #130 from CerealMiller/master
CerealMiller Apr 14, 2024
9e17880
billList functions update with tripname
jthibault03 Apr 14, 2024
c4baf94
update payBill
jthibault03 Apr 14, 2024
cc468f7
update help command
jthibault03 Apr 14, 2024
2c7e494
update ug
jthibault03 Apr 14, 2024
c4380ac
updating more ug
jthibault03 Apr 14, 2024
bbbb5e2
currency support for bills, fixing paybill command
jthibault03 Apr 14, 2024
151da32
update ug with setbillcurrency and addbill having trip requirement
jthibault03 Apr 15, 2024
97fb111
Complete PPP.
azamanis Apr 15, 2024
e7543c5
Merge pull request #131 from azamanis/FIX_PDE
azamanis Apr 15, 2024
469de70
reworded exception and ug for addbill
jthibault03 Apr 15, 2024
6abc952
merging
jthibault03 Apr 15, 2024
2ca3efc
fixing style errors
jthibault03 Apr 15, 2024
e4c9a6a
style check
jthibault03 Apr 15, 2024
9857206
update help command
jthibault03 Apr 15, 2024
7f42486
Add instructions to run jar file to UG
Apr 15, 2024
6d24ff5
Merge pull request #132 from CerealMiller/master
CerealMiller Apr 15, 2024
a8bba83
Update expected.txt for runtest
Apr 15, 2024
e9064c2
test
jthibault03 Apr 15, 2024
934db8e
Merge pull request #133 from CerealMiller/master
CerealMiller Apr 15, 2024
736dd4e
merging
jthibault03 Apr 15, 2024
9d56de5
close most issues, simplifybill wip
Luo-Z-Y Apr 15, 2024
d9d98ae
Merge branch 'AY2324S2-CS2113-W14-4:master' into week-13
Luo-Z-Y Apr 15, 2024
7fe89b0
Merge pull request #134 from Luo-Z-Y/week-13
Luo-Z-Y Apr 15, 2024
93dd37d
Update UserGuide.md
azamanis Apr 15, 2024
636e102
Update UserGuide.md
azamanis Apr 15, 2024
1b80cac
Update azamanis.md
azamanis Apr 15, 2024
960ec13
prohibit incorrect date format for adding a trip
Luo-Z-Y Apr 15, 2024
c757856
Merge branch 'AY2324S2-CS2113-W14-4:master' into week-13
Luo-Z-Y Apr 15, 2024
58414ca
Merge pull request #135 from Luo-Z-Y/week-13
Luo-Z-Y Apr 15, 2024
1d9224c
Fix readBillFile, fix voyagers not saving bills on exit, fix readBill…
Apr 15, 2024
ca80649
Merge remote-tracking branch 'organisation/master'
Apr 15, 2024
13729df
Fix checkstyle errors
Apr 15, 2024
2a46485
Update runtest.bat expected.txt
Apr 15, 2024
54089ad
Merge pull request #137 from CerealMiller/master
CerealMiller Apr 15, 2024
116c2e0
merging
jthibault03 Apr 15, 2024
247dcc6
update ug
jthibault03 Apr 15, 2024
4aece61
Fix bug where review score of 10 was wrongly rejected
Apr 15, 2024
355b662
Merge pull request #138 from CerealMiller/master
CerealMiller Apr 15, 2024
7795c20
user stories and non-fucntional requirements dg
jthibault03 Apr 15, 2024
67f8751
merging
jthibault03 Apr 15, 2024
e0bdea8
Fix addmaintrip allow start date later than end date
Apr 15, 2024
10c2848
Merge pull request #139 from CerealMiller/master
CerealMiller Apr 15, 2024
3b0f94e
update ppp and dg
jthibault03 Apr 15, 2024
8f7d94f
Recommitting
jthibault03 Apr 15, 2024
f5f2b38
Merge remote-tracking branch 'upstream/master' into week-13
Luo-Z-Y Apr 15, 2024
08e54fa
Update status in DG
Luo-Z-Y Apr 15, 2024
74db3be
Merge branch 'AY2324S2-CS2113-W14-4:master' into week-13
Luo-Z-Y Apr 15, 2024
2f1228c
Merge pull request #140 from Luo-Z-Y/week-13
Luo-Z-Y Apr 15, 2024
e4fd26c
Add manual testing instructions
Apr 15, 2024
c773e95
Merge remote-tracking branch 'organisation/master'
Apr 15, 2024
fdbefb0
Merge pull request #141 from CerealMiller/master
CerealMiller Apr 15, 2024
6614b33
added pic finally
jthibault03 Apr 15, 2024
6abc448
fixed pic
jthibault03 Apr 15, 2024
e919316
merge
jthibault03 Apr 15, 2024
86615e8
Update LUO-Z-Y DG
Luo-Z-Y Apr 15, 2024
81abcd0
Merge branch 'AY2324S2-CS2113-W14-4:master' into week-13
Luo-Z-Y Apr 15, 2024
cfe2fb6
Fix CerealMiller pic
Apr 15, 2024
3ae78ee
Merge pull request #143 from CerealMiller/master
CerealMiller Apr 15, 2024
f7d27ad
Merge pull request #142 from Luo-Z-Y/week-13
Luo-Z-Y Apr 15, 2024
e53328a
Update README.md
Luo-Z-Y Apr 15, 2024
3892cb9
Revert "Update LUO-Z-Y DG"
Luo-Z-Y Apr 15, 2024
7e18f91
fix bug in simplifybill and status
Luo-Z-Y Apr 16, 2024
5ed12ab
modify addbill and simplifybill
Luo-Z-Y Apr 16, 2024
35b5e5e
Merge branch 'AY2324S2-CS2113-W14-4:master' into week-13
Luo-Z-Y Apr 16, 2024
7f58168
Merge remote-tracking branch 'upstream/master' into week-13
Luo-Z-Y Apr 16, 2024
ec2d020
Merge branch 'week-13' of https://github.com/Luo-Z-Y/tp into week-13
Luo-Z-Y Apr 16, 2024
efa1a6e
Merge pull request #144 from Luo-Z-Y/week-13
Luo-Z-Y Apr 16, 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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ bin/

/text-ui-test/ACTUAL.TXT
text-ui-test/EXPECTED-UNIX.TXT

local-voyagers.txt
local-reviews.txt
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.voyagers.Voyagers

64 changes: 0 additions & 64 deletions README.md

This file was deleted.

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

dependencies {
implementation 'junit:junit:4.13.1'
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.0'
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.0'
}

test {

jvmArgs '-ea'

useJUnitPlatform()

testLogging {
Expand All @@ -29,11 +33,11 @@ test {
}

application {
mainClass.set("seedu.duke.Duke")
mainClass.set("seedu.voyagers.Voyagers")
}

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

Expand Down
14 changes: 7 additions & 7 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# 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)
Display | Name | Github Profile | Portfolio
--------|:---------------:|:--------------:|:---------:
![](others/CerealMillerPic.jpeg) | Chong Zhen Kang | [Github](https://github.com/CerealMiller) | [Portfolio](https://www.linkedin.com/in/czk2026/)
![](https://media.licdn.com/dms/image/D4D03AQE7Hws2__bbVA/profile-displayphoto-shrink_400_400/0/1703085849663?e=1715212800&v=beta&t=NJt0jGQHRCBDY9zcQJqVwb0lYffdQB7goHouBf3u7ls) | Álvaro Zamanillo | [Github](https://github.com/azamanis) | [Portfolio](https://www.linkedin.com/in/%C3%A1lvaro-zamanillo-s%C3%A1ez-652771153/)
![](https://media.licdn.com/dms/image/D5603AQGb2DQ9U83alw/profile-displayphoto-shrink_100_100/0/1709732858635?e=1715212800&v=beta&t=6UMyu9yLQ9TBnebAIqyJEJ1Y6jTRu8ZuQSIvEJ1N9Mc) | Luo Zhiyang | [Github](https:github.com/Luo-Z-Y) | [Portfolio](https://www.linkedin.com/in/luo-zhiyang-559683274/)
![](others/jackiepicforAboutUs.jpg) | Jacqueline Thibault | [Github](https://github.com/jthibault03) | [Portfolio](https://www.linkedin.com/in/jacqueline-thibault/)

Loading
Loading