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-W12-4] Fit Track #13

Open
wants to merge 701 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
701 commits
Select commit Hold shift + click to select a range
3b9d3f1
Refactor UG
ICubE- Nov 4, 2023
2289407
Resolve few warnings
ICubE- Nov 4, 2023
b769182
Modify FindXXXCommand not to use extra Ui instance
ICubE- Nov 4, 2023
ff410cd
Fix typo
ICubE- Nov 4, 2023
e963178
Fix test and maintain style
ICubE- Nov 4, 2023
09dfee7
Maintain style
ICubE- Nov 4, 2023
d21204d
Merge remote-tracking branch 'upstream/master'
ICubE- Nov 4, 2023
3245729
Update UG
ICubE- Nov 4, 2023
c61aecd
Fix test
ICubE- Nov 4, 2023
59cbea2
Merge pull request #220 from ICubE-/master
ICubE- Nov 6, 2023
da48e35
Fix profile loading bug
ICubE- Nov 6, 2023
4c2be5d
Merge pull request #225 from ICubE-/fix-bug-and-maintain-style
ICubE- Nov 6, 2023
053956f
Create new class to hold the list of steps
farissirraj Nov 6, 2023
47cd9c4
Create new class for command to add steps to the list
farissirraj Nov 6, 2023
50fdcda
Create new class for command to calculate the total number of steps t…
farissirraj Nov 6, 2023
b52c159
Create a new class for command to view the steps entered and stored i…
farissirraj Nov 6, 2023
8ce97bb
Create a new class to hold data for a single step entry
farissirraj Nov 6, 2023
fd95365
Create a new class to manage the decoding of steps in the txt file
farissirraj Nov 6, 2023
3bc961d
Modify method parameters to include stepList functionalities
farissirraj Nov 6, 2023
e69ef14
Create a new method to fetch the Calories Burnt and manually set the …
farissirraj Nov 6, 2023
0ade10b
Create a new method to fetch the Calories Consummed and manually set …
farissirraj Nov 6, 2023
1018cdc
Update switch branch to include check for the new commands
farissirraj Nov 6, 2023
888c20c
Update exit command functionalities to include caching of the step li…
farissirraj Nov 6, 2023
4fe9e67
Update save command functionalities to include caching of the step li…
farissirraj Nov 6, 2023
38fe527
Update switch branch to include check for the new commands
farissirraj Nov 6, 2023
51928d9
Update storage class to include the caching functionalities of the st…
farissirraj Nov 6, 2023
da897c0
Update format for checkstyle
farissirraj Nov 6, 2023
332667a
Storage test
Joshymama Nov 7, 2023
0919468
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp
Joshymama Nov 7, 2023
fe023f7
Resolves #215
Joshymama Nov 7, 2023
b4e0c0b
Remove save command
Joshymama Nov 7, 2023
f57c867
Merge pull request #230 from J0shuaLeong/master
J0shuaLeong Nov 7, 2023
17b1b3e
author tag
Joshymama Nov 7, 2023
c34ae4c
Maintain style
Joshymama Nov 7, 2023
5924696
Added Help for first time users
Joshymama Nov 7, 2023
09bec2b
Resolves #194
Joshymama Nov 7, 2023
f211abb
Resolves #194
Joshymama Nov 7, 2023
ddc07ac
Text ui test
Joshymama Nov 7, 2023
42f1e2c
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp
Joshymama Nov 7, 2023
8fad9d1
Fix UG bug due to removing save command
ICubE- Nov 7, 2023
29eb9d9
Merge pull request #231 from J0shuaLeong/master
J0shuaLeong Nov 7, 2023
7df80bf
Resolves #227
ICubE- Nov 7, 2023
3f091ca
Merge remote-tracking branch 'upstream/master' into fix-bug-and-maint…
ICubE- Nov 7, 2023
bc14a1f
PPP
Joshymama Nov 7, 2023
9d44d61
Tag author properly
ICubE- Nov 7, 2023
56af955
Fix UG bug due to changing profile print
ICubE- Nov 7, 2023
7c2758c
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp
Joshymama Nov 7, 2023
6ca1f5a
Resolves #171
ICubE- Nov 7, 2023
18fb752
Resolves #182
ICubE- Nov 7, 2023
6828e90
Fixed profile file loading
Joshymama Nov 7, 2023
5700a3e
Merge pull request #232 from J0shuaLeong/master
J0shuaLeong Nov 7, 2023
2b70d0e
Modify invalid command handling
ICubE- Nov 7, 2023
5da0fdd
Merge pull request #234 from ICubE-/fix-bug-and-maintain-style
ICubE- Nov 7, 2023
a18028d
Move IllegalValueException
ICubE- Nov 7, 2023
3da8c68
Mark SaveCommand as unused
ICubE- Nov 7, 2023
5bbf02a
Refactor index parsing
ICubE- Nov 7, 2023
4b402ab
Refactor keyword parsing
ICubE- Nov 7, 2023
f9f4cb3
Fix test
ICubE- Nov 7, 2023
c71fb15
Tag authors
ICubE- Nov 7, 2023
8c90297
Refactor date parsing
ICubE- Nov 7, 2023
6d5e85a
Fix index parsing
ICubE- Nov 7, 2023
398efb5
Make methods safer
ICubE- Nov 7, 2023
e7215b4
Make CommandParser methods static
ICubE- Nov 7, 2023
75da23a
Refactor date parsing
ICubE- Nov 7, 2023
ab3ae0d
Refactor workout parsing
ICubE- Nov 7, 2023
ba3411a
Refactor meal parsing
ICubE- Nov 7, 2023
83a6abd
Refactor user profile parsing
ICubE- Nov 7, 2023
83270aa
Refactor data parsing
ICubE- Nov 7, 2023
34a1d84
Update UG
Joshymama Nov 7, 2023
77ec5a4
Merge pull request #235 from J0shuaLeong/master
J0shuaLeong Nov 7, 2023
749cfe4
Fix test
ICubE- Nov 7, 2023
b1faa26
Remove redundant exception
ICubE- Nov 7, 2023
338bb7a
Merge pull request #236 from ICubE-/refactor-command-parser
ICubE- Nov 7, 2023
c7f0b5f
Resolves #180
Joshymama Nov 7, 2023
ea0fa1e
Merge pull request #237 from J0shuaLeong/master
J0shuaLeong Nov 7, 2023
e7393d4
Update test with step functionality
farissirraj Nov 7, 2023
3bc5566
Update test with step functionality
farissirraj Nov 7, 2023
a2e6ad8
Update test with step functionality
farissirraj Nov 7, 2023
17eb1fd
Update test with step functionality
farissirraj Nov 7, 2023
12dec96
Update test with step functionality
farissirraj Nov 7, 2023
12542db
Empty-Commit
farissirraj Nov 7, 2023
deb3dc3
Empty-Commit
farissirraj Nov 7, 2023
543b16b
Fix storage exception
Joshymama Nov 7, 2023
4cadc94
Merge pull request #238 from J0shuaLeong/master
J0shuaLeong Nov 7, 2023
958e929
Empty-Commit
farissirraj Nov 7, 2023
74a8dd7
Fix merge conflicts for tests
farissirraj Nov 7, 2023
58b1d24
Remove unused imports
farissirraj Nov 7, 2023
42dd6c9
Remove unused imports
farissirraj Nov 7, 2023
135157e
Remove unused import
farissirraj Nov 7, 2023
8825495
Merge pull request #240 from farissirraj/master
farissirraj Nov 7, 2023
9cad9df
Fix minor bugs
ICubE- Nov 7, 2023
d14e6d6
Update EXPECTED.TXT
ICubE- Nov 7, 2023
7722301
Merge pull request #241 from ICubE-/fix-bug-and-maintain-style
ICubE- Nov 7, 2023
e97557b
Update parsing of steps
farissirraj Nov 7, 2023
adc1d0b
Add date as a parametre to calculate total steps
farissirraj Nov 7, 2023
4fd1da1
Move parser to Step class
farissirraj Nov 7, 2023
e987efd
Remove step parser
farissirraj Nov 7, 2023
5b4c490
Update the pattern matcher
farissirraj Nov 7, 2023
05f824c
Create new class for Date Format Exceptions
farissirraj Nov 7, 2023
cec5194
Fix Checkstyle
farissirraj Nov 7, 2023
1b4e745
Fix Checkstyle
farissirraj Nov 7, 2023
ad9d989
Fix Checkstyle
farissirraj Nov 7, 2023
c3b2900
Fix Checkstyle
farissirraj Nov 7, 2023
a6d4cae
Merge pull request #249 from farissirraj/master
farissirraj Nov 7, 2023
78a3c1b
Resolves #196
Joshymama Nov 8, 2023
028a31e
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp
Joshymama Nov 8, 2023
0ff1736
Update EXPECTED.TXT
Joshymama Nov 8, 2023
ed8d0ba
Merge pull request #250 from J0shuaLeong/master
J0shuaLeong Nov 8, 2023
b2fa4ec
Update User Guide with steps feature
farissirraj Nov 8, 2023
046e561
Add method to check if list is empty
farissirraj Nov 8, 2023
b912bca
Add switch branch for delete steps command
farissirraj Nov 8, 2023
7d3f170
Create new Command class to delete steps entry
farissirraj Nov 8, 2023
d823ecd
Fix Checkstyle issues
farissirraj Nov 8, 2023
90e89dc
Merge branch 'master' into master
farissirraj Nov 8, 2023
ec5b854
Fix test Merge Conflict
farissirraj Nov 8, 2023
09523a4
Fix Test
farissirraj Nov 8, 2023
b414733
Fix texts
farissirraj Nov 8, 2023
7ada9fa
Merge pull request #251 from farissirraj/master
farissirraj Nov 8, 2023
af69658
Update ug
Joshymama Nov 8, 2023
6d59c0e
Add theme
Joshymama Nov 8, 2023
a83a039
Update README
Joshymama Nov 8, 2023
6366a58
Merge pull request #252 from J0shuaLeong/master
J0shuaLeong Nov 8, 2023
ce7579e
Fix images not showing on github pages
Joshymama Nov 8, 2023
cd1e2df
Merge pull request #253 from J0shuaLeong/master
J0shuaLeong Nov 8, 2023
20d7e88
Update UG
Joshymama Nov 8, 2023
da7c256
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp
Joshymama Nov 8, 2023
410722c
Merge pull request #254 from J0shuaLeong/master
J0shuaLeong Nov 8, 2023
48aed6d
PPP Update
Joshymama Nov 9, 2023
1d4874d
Merge pull request #255 from J0shuaLeong/master
J0shuaLeong Nov 9, 2023
b845634
Move profile settings method into userprofile class
Joshymama Nov 9, 2023
d8eae17
Fix ui scan line error
Joshymama Nov 9, 2023
ebc54c3
Create scanning and printing of message in Ui class
Joshymama Nov 9, 2023
27cb047
Organise methods and code
Joshymama Nov 9, 2023
9c8d562
Use local variable instead
Joshymama Nov 9, 2023
c00bc27
Code organisation
Joshymama Nov 9, 2023
4757b1e
Merge pull request #256 from J0shuaLeong/branch-Profile
J0shuaLeong Nov 9, 2023
d721519
Added text ui test for steps
Joshymama Nov 9, 2023
49ea7fd
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp …
Joshymama Nov 9, 2023
f43fa63
Merge pull request #257 from J0shuaLeong/branch-Profile
J0shuaLeong Nov 9, 2023
fe1e212
Rename method
ICubE- Nov 9, 2023
b37af18
Handle IOException from Storage#save
ICubE- Nov 9, 2023
50b7328
Initialize Storage in the constructor of FitTrack
ICubE- Nov 9, 2023
0abc74f
Fix initializeStorage
ICubE- Nov 9, 2023
45c50e6
Fix command description
ICubE- Nov 9, 2023
b87cbe6
Fix Step and related commands
ICubE- Nov 9, 2023
4b06d5c
Simplify loading from storage
ICubE- Nov 9, 2023
c54541a
Fix test
ICubE- Nov 9, 2023
43b20af
Merge pull request #258 from ICubE-/fix-bug-and-maintain-style
J0shuaLeong Nov 9, 2023
84b1cd6
Write PPP draft
ICubE- Nov 9, 2023
d74ddab
Merge remote-tracking branch 'upstream/master'
ICubE- Nov 9, 2023
2b43512
Merge pull request #259 from ICubE-/master
ICubE- Nov 9, 2023
b4e4e92
Update Developer Guide
Joshymama Nov 10, 2023
c3a43b4
Merge pull request #260 from J0shuaLeong/master
J0shuaLeong Nov 10, 2023
a8e7723
Resolves #136 #138
ICubE- Nov 10, 2023
d012af0
Handle loading of corrupted file
Joshymama Nov 10, 2023
ddfa499
Changed some messages
Joshymama Nov 10, 2023
e2bec29
Text ui test
Joshymama Nov 10, 2023
71e0e36
Merge pull request #261 from J0shuaLeong/branch-StorageRestructure
J0shuaLeong Nov 10, 2023
5ec0ca3
Merge remote-tracking branch 'upstream/master'
ICubE- Nov 10, 2023
4684042
Create initial PPP
farissirraj Nov 10, 2023
ca4188f
Update PPP
farissirraj Nov 10, 2023
3029f3e
Update PPP
farissirraj Nov 10, 2023
97a530f
Merge pull request #262 from farissirraj/master
farissirraj Nov 10, 2023
106643f
Fix Date to use DateFormatException
ICubE- Nov 10, 2023
de15132
Fix Step to throw NumberFormatException with valid message
ICubE- Nov 10, 2023
1acfd17
Fix bugs in XXXDecoder
ICubE- Nov 10, 2023
dd78cda
Merge pull request #263 from ICubE-/master
ICubE- Nov 10, 2023
7e8c2e4
Update PPP
Joshymama Nov 10, 2023
89b8541
Merge pull request #264 from J0shuaLeong/master
J0shuaLeong Nov 10, 2023
8e84d79
Content page and Instructions for manual testing in DG
Joshymama Nov 10, 2023
eb6e241
Merge pull request #265 from J0shuaLeong/master
J0shuaLeong Nov 10, 2023
29b2162
Handle force exit exception
ICubE- Nov 11, 2023
e9d854e
Handle nullable parameters
ICubE- Nov 11, 2023
98ea010
Make methods name verb
ICubE- Nov 11, 2023
25bcc4f
Merge pull request #266 from ICubE-/fix-bug-and-maintain-style
ICubE- Nov 11, 2023
d622294
Fix #211 #213
ICubE- Nov 11, 2023
f4c1dfe
Merge pull request #267 from ICubE-/fix-bug-and-maintain-style
ICubE- Nov 11, 2023
063499d
Update DG
ICubE- Nov 11, 2023
8b09406
Merge pull request #268 from ICubE-/fix-bug-and-maintain-style
ICubE- Nov 11, 2023
90574b1
Fix test Merge Conflict
farissirraj Nov 12, 2023
1be0d01
Create new command class file for the getstepssuggestion command
farissirraj Nov 12, 2023
c44646e
Fix merge conflict
farissirraj Nov 12, 2023
3d6ce1e
Add getstepssuggestion command details to the user guide
farissirraj Nov 12, 2023
7c6d60f
Fix checkstyle issue
farissirraj Nov 12, 2023
0b74739
Fix checkstyle issue
farissirraj Nov 12, 2023
25422f4
Merge pull request #269 from farissirraj/master
farissirraj Nov 12, 2023
d134f0e
Allow user to choose if they want to create new file if existing is c…
Joshymama Nov 12, 2023
cd19c9b
Addsteps command allows no date entry. If so, will add today's date.
Joshymama Nov 12, 2023
90f4664
Maintain check style
Joshymama Nov 12, 2023
2a4a18b
Merge pull request #270 from J0shuaLeong/master
J0shuaLeong Nov 12, 2023
7387691
Update UG
Joshymama Nov 12, 2023
bbb2983
Fix Help for total steps
Joshymama Nov 12, 2023
fb51e13
Merge pull request #271 from J0shuaLeong/master
J0shuaLeong Nov 12, 2023
554e72b
Update DG for step functionality
farissirraj Nov 13, 2023
9375004
Update UG for step functionality
farissirraj Nov 13, 2023
e1255f7
Add class diagram for addsteps command
farissirraj Nov 13, 2023
50dbef3
Merge pull request #272 from farissirraj/master
farissirraj Nov 13, 2023
cdd8299
Update UG with checkrecommendedweight command
farissirraj Nov 13, 2023
d04ae90
Update PPP with all contributions to the project
farissirraj Nov 13, 2023
b223164
Revert back to previous version where date was required
farissirraj Nov 13, 2023
d66ff4d
Update UG to reverted changes for addsteps
farissirraj Nov 13, 2023
4a41498
Update expected test result
farissirraj Nov 13, 2023
4372723
Merge pull request #273 from farissirraj/master
farissirraj Nov 13, 2023
d62f1d8
Update DG and PPP
farissirraj Nov 13, 2023
65debd7
Write PUML for addsteps command
farissirraj Nov 13, 2023
33d833a
Write PUML for deletesteps command
farissirraj Nov 13, 2023
677580c
Convert puml to png
farissirraj Nov 13, 2023
936ddeb
Update UG to for caloriebalance command
Joshymama Nov 13, 2023
07cb1b9
Add calorie balance command feature
Joshymama Nov 13, 2023
dbe6e09
Author tagging
Joshymama Nov 13, 2023
e3e832d
Fix pattern matcher for meal list and workout list storage to allow m…
Joshymama Nov 13, 2023
e76888b
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp
Joshymama Nov 13, 2023
d330ba0
Maintain Check style
Joshymama Nov 13, 2023
6c830c3
Merge pull request #275 from J0shuaLeong/master
J0shuaLeong Nov 13, 2023
ad58290
Update DG
Joshymama Nov 13, 2023
37cadf4
Update UG
Joshymama Nov 13, 2023
50948e6
Add getstepssuggestion command to command parser
Joshymama Nov 13, 2023
313ae84
Text ui test
Joshymama Nov 13, 2023
8750ae2
Merge pull request #277 from J0shuaLeong/master
J0shuaLeong Nov 13, 2023
a8c9c33
Merge remote-tracking branch 'upstream/master'
farissirraj Nov 13, 2023
4dab12a
UG Update
farissirraj Nov 13, 2023
dcbb555
Merge pull request #274 from farissirraj/master
farissirraj Nov 13, 2023
474668b
Update DG
Joshymama Nov 13, 2023
e0f8189
Remove Unused Storage test
Joshymama Nov 13, 2023
2a11ea1
All possible inputs
Joshymama Nov 13, 2023
23622a3
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp
Joshymama Nov 13, 2023
894363a
Update UG
Joshymama Nov 13, 2023
7206485
Merge pull request #278 from J0shuaLeong/master
J0shuaLeong Nov 13, 2023
93564a7
Write DG Help Function
ICubE- Nov 13, 2023
cb5f347
Fix diagrams
ICubE- Nov 13, 2023
614709f
Merge pull request #279 from ICubE-/master
ICubE- Nov 13, 2023
84c5ead
Update DG
ICubE- Nov 13, 2023
14c5480
Update DG
ICubE- Nov 13, 2023
6a79d13
Update PPP
ICubE- Nov 13, 2023
1811a7e
Merge remote-tracking branch 'upstream/master'
ICubE- Nov 13, 2023
bc625db
Merge pull request #280 from ICubE-/master
ICubE- Nov 13, 2023
22908dd
Update AboutUs.md
ICubE- Nov 14, 2023
5f08248
Merge pull request #281 from ICubE-/master
ICubE- Nov 14, 2023
d019322
Update DG
Joshymama Nov 14, 2023
ad270e9
Update UG
Joshymama Nov 14, 2023
9742fe7
Edit caloriebalance sequence diagram
Joshymama Nov 14, 2023
041fce6
Merge branch 'master' of https://github.com/AY2324S1-CS2113-W12-4/tp
Joshymama Nov 14, 2023
2912b47
Update DG and add sequence diagrams
Joshymama Nov 14, 2023
c4d0043
Update DG
Joshymama Nov 14, 2023
07f78cf
Merge pull request #282 from J0shuaLeong/master
J0shuaLeong Nov 14, 2023
5edbc38
Update PPP
Joshymama Nov 14, 2023
cc40917
Merge pull request #283 from J0shuaLeong/master
J0shuaLeong Nov 14, 2023
74bb39a
Update PPP for Nixon
Joshymama Nov 14, 2023
ab958d0
Merge pull request #284 from J0shuaLeong/master
J0shuaLeong Nov 14, 2023
ccac196
added ppp (#285)
marklin2234 Nov 14, 2023
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
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,8 @@ bin/

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

*.class
MANIFEST.MF
/data/
/text-ui-test/data/
9 changes: 5 additions & 4 deletions CONTRIBUTORS.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Contributors

Display | Name | Github Profile | Homepage
---|:---:|:---:|:---:
![](https://avatars0.githubusercontent.com/u/22460123?s=100) | Jeffry Lum | [Github](https://github.com/j-lum/) | [Homepage](https://se.kasugano.moe)
![](https://avatars0.githubusercontent.com/u/1673303?s=100) | Damith C. Rajapakse | [Github](https://github.com/damithc/) | [Homepage](https://www.comp.nus.edu.sg/~damithch/)
| Display | Name | Github Profile | Homepage |
|--------------------------------------------------------------|:-------------------:|:-------------------------------------:|:--------------------------------------------------:|
| ![](https://avatars0.githubusercontent.com/u/22460123?s=100) | Jeffry Lum | [Github](https://github.com/j-lum/) | [Homepage](https://se.kasugano.moe) |
| ![](https://avatars0.githubusercontent.com/u/1673303?s=100) | Damith C. Rajapakse | [Github](https://github.com/damithc/) | [Homepage](https://www.comp.nus.edu.sg/~damithch/) |

# I would like to join this list. How can I help the project

For more information, please refer to our [contributor's guide](https://oss-generic.github.io/process/).
5 changes: 3 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("fittrack.FitTrack")
}

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

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

run{
standardInput = System.in
enableAssertions = true
}
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 |
|-----------------------------------------------------|:---------------:|:------------------------------------------:|:----------------------------------:|
| ![](https://via.placeholder.com/100.png?text=Photo) | Faris Sirraj | [Github](https://github.com/farissirraj) | [Portfolio](team/farissirraj.md) |
| ![](https://via.placeholder.com/100.png?text=Photo) | Yeon Jeho | [Github](https://github.com/ICubE-) | [Portfolio](team/icube-.md) |
| <img src="images/joshua.jpg" width=100 height=100> | Joshua Leong | [Github](https://github.com/J0shuaLeong) | [Portfolio](team/j0shualeong.md) |
| ![](https://via.placeholder.com/100.png?text=Photo) | Ng Lixuan Nixon | [Github](https://github.com/NgLixuanNixon) | [Portfolio](team/nglixuannixon.md) |
| ![](https://via.placeholder.com/100.png?text=Photo) | Mark Lin | [Github](https://github.com/marklin2234) | [Portfolio](team/marklin2234.md) |
Loading
Loading