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

[CS2103T-T17-4] Fish Ahoy! #102

Open
wants to merge 554 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
554 commits
Select commit Hold shift + click to select a range
68d8293
Merge pull request #121 from bokuanT/branch-helpPage
ryanchua00 Mar 30, 2023
ec14a22
Merge pull request #123 from bokuanT/branch-UserGuide
ryanchua00 Mar 30, 2023
531cf0e
Fixed FishEditCommand
TimothyLawSongEn Mar 30, 2023
495ffb7
Cleanup
TimothyLawSongEn Mar 30, 2023
4988d08
Merge branch 'AY2223S2-CS2103T-T17-4:master' into master
TimothyLawSongEn Mar 30, 2023
3485354
Merge branch 'master' into branch-EditCommands
TimothyLawSongEn Mar 30, 2023
181500a
Implement task edit
usuxnsnc Mar 30, 2023
b4573b5
Fix checkstyle
usuxnsnc Mar 30, 2023
77a6192
Delete feeding reminder for tank in tank feed
usuxnsnc Mar 30, 2023
19adb46
Merge pull request #128 from bokuanT/branch-taskEdit
ryanchua00 Mar 30, 2023
4e8d96f
Merge pull request #117 from bokuanT/branch-readings
ryanchua00 Mar 30, 2023
ec664c6
Merge branch 'AY2223S2-CS2103T-T17-4:master' into master
TimothyLawSongEn Mar 30, 2023
ea20b47
Finalise FishEditCommand and TankEditCommand
TimothyLawSongEn Mar 30, 2023
3b6bdaf
Merge branch 'master' into branch-EditCommands
TimothyLawSongEn Mar 30, 2023
a028dab
Change App Icon
ryanchua00 Mar 30, 2023
ea9e18e
create taskAddCommand Doc w/ Seq Diagram for DG
bryanongjx Mar 30, 2023
6e5e2c1
Merge pull request #132 from ryanchua00/branch-Help
bryanongjx Mar 30, 2023
49589bf
Merge pull request #131 from TimothyLawSongEn/branch-EditCommands
bryanongjx Mar 30, 2023
47ed961
Show readings summary on tank card
Mar 30, 2023
2200abb
Merge pull request #134 from Diamondroxxx/branch-DisplayResources
bokuanT Mar 30, 2023
10f0ae1
Merge branch 'master' into branch-UserGuide
usuxnsnc Mar 30, 2023
0f86f82
Update DeveloperGuide.md
bokuanT Mar 30, 2023
7b5665f
Merge pull request #133 from bryanongjx/branch-DGTaskAddCommand
bokuanT Mar 30, 2023
745dfcd
Update user guide and local help html
usuxnsnc Mar 30, 2023
cdfe20c
Fix summary table borders
usuxnsnc Mar 30, 2023
5757aea
Make UI look better
Mar 31, 2023
48e4389
Fix Style
Mar 31, 2023
858daf9
Merge pull request #137 from Diamondroxxx/branch-UIOverhaul
EepyKitty Mar 31, 2023
57cee25
Merge pull request #129 from bokuanT/branch-autoRemoveFeedingReminders
ryanchua00 Mar 31, 2023
0547ab2
Merge pull request #135 from bokuanT/branch-UserGuide
ryanchua00 Mar 31, 2023
fd3760c
Change data and rename jar file
ryanchua00 Mar 31, 2023
470b94c
Fix error messages
usuxnsnc Mar 31, 2023
9d9b797
Merge pull request #139 from bokuanT/branch-v13
ryanchua00 Mar 31, 2023
33d2e6d
Merge pull request #138 from ryanchua00/branch-1.3.1
ryanchua00 Mar 31, 2023
40be44c
Merge branch 'master' into branch-UserGuide
usuxnsnc Mar 31, 2023
cfbc99d
Fix minor bugs at the end of the UG
usuxnsnc Mar 31, 2023
242d088
Added new Ui pictures and add Ui introduction
ryanchua00 Mar 31, 2023
b52767c
Merge pull request #140 from ryanchua00/branch-UserGuide
bokuanT Mar 31, 2023
3103eaf
Fix minor bugs
ryanchua00 Mar 31, 2023
7839ccb
Merge pull request #141 from ryanchua00/branch-UserGuide
bokuanT Mar 31, 2023
8db06e9
Fix #172 add spacing
ryanchua00 Apr 2, 2023
a148add
Fix #169, fix add fish in UG
ryanchua00 Apr 2, 2023
b9f1793
Fix #156, add additional info for delete commands
ryanchua00 Apr 2, 2023
c65860b
Fix #147, change UG sample command
ryanchua00 Apr 2, 2023
ae39b5f
Fix #199, fix typo in UG list task command
ryanchua00 Apr 2, 2023
ec7a0a7
Fix #173, fish operations now work on sorted fish list
ryanchua00 Apr 3, 2023
dad241a
Fix #126, task sorting no longer places ghost priority at the end
ryanchua00 Apr 3, 2023
9480910
Fix #184, add UG tip.
ryanchua00 Apr 3, 2023
5561f0e
Merge branch 'master' into branch-UserGuide
usuxnsnc Apr 3, 2023
c8af1d9
Add using this guide section and legend
usuxnsnc Apr 3, 2023
6acb7b1
Update font definitions and add glossary to UG
usuxnsnc Apr 3, 2023
5129ee6
Add glossary to UG contents page
usuxnsnc Apr 3, 2023
f5585d9
Merge pull request #206 from bokuanT/branch-UserGuide
ryanchua00 Apr 3, 2023
432fd05
Merge branch 'master' of https://github.com/AY2223S2-CS2103T-T17-4/tp…
ryanchua00 Apr 3, 2023
da6e5d1
undo changes from fix #156, commit b9f1793
ryanchua00 Apr 3, 2023
3290a8f
Merge pull request #203 from ryanchua00/branch-BugFix
bokuanT Apr 3, 2023
8e3783a
Stash commit
usuxnsnc Apr 3, 2023
b969f23
Merge branch 'master' of https://github.com/AY2223S2-CS2103T-T17-4/tp…
usuxnsnc Apr 3, 2023
ec51477
Update quick start of UG
usuxnsnc Apr 3, 2023
67e7b22
Add blockquotes to symbols in some parts of UG
usuxnsnc Apr 3, 2023
2c8c8d9
Merge pull request #208 from bokuanT/branch-UserGuide
ryanchua00 Apr 3, 2023
1104d32
Add writeup for parameters and prefixes
usuxnsnc Apr 3, 2023
b06ffbf
Update contents page and tank add section
usuxnsnc Apr 3, 2023
2d42ffd
Update UG
usuxnsnc Apr 3, 2023
b898dd2
Update tank add, tank delete and tank feed commands
usuxnsnc Apr 3, 2023
5db696b
Update all tank features of user guide
usuxnsnc Apr 4, 2023
530718e
Minor change in UG about command actions and types
usuxnsnc Apr 4, 2023
311f6f0
Add fullstops
usuxnsnc Apr 4, 2023
ac077a7
Update UserGuide.md
ryanchua00 Apr 4, 2023
8bbf210
Merge pull request #209 from bokuanT/branch-UserGuide
ryanchua00 Apr 4, 2023
cfee3cb
Fix #182 and #200, fix taskes and add tip in fish view
ryanchua00 Apr 4, 2023
c7340b1
Add priority of tasks to command prefix summary in UG
usuxnsnc Apr 4, 2023
c82fde0
Merge branch 'master' of https://github.com/AY2223S2-CS2103T-T17-4/tp…
usuxnsnc Apr 4, 2023
78b6def
Add Ui picture for index
ryanchua00 Apr 4, 2023
ec1b630
Add Acknowledgements for Help implementation
ryanchua00 Apr 4, 2023
2f83d51
Safe Delete for main files
TimothyLawSongEn Apr 4, 2023
75f1392
Refactor tests to test current commands
TimothyLawSongEn Apr 4, 2023
6854dde
Update FishSortCommand in DG
ryanchua00 Apr 4, 2023
f4a7554
Remove unnecessary method call in FishSortCommand
ryanchua00 Apr 4, 2023
beb26e5
Add appendix: planned enhancements
ryanchua00 Apr 4, 2023
08edaa6
Fix #217, fix feeding interval comparator
ryanchua00 Apr 4, 2023
40033d3
Fix Style
ryanchua00 Apr 4, 2023
0362c3b
Add NumberFormatException for feeding interval parsing
ryanchua00 Apr 4, 2023
2183a17
Merge branch 'branch-BugFix' of https://github.com/ryanchua00/tp into…
ryanchua00 Apr 4, 2023
a8c9ce8
stash commit
usuxnsnc Apr 4, 2023
58c561a
Update UG
usuxnsnc Apr 4, 2023
66edaa3
finsih ug draft 1
usuxnsnc Apr 4, 2023
e15430c
Minor changes
usuxnsnc Apr 4, 2023
9e9514f
Merge pull request #218 from ryanchua00/branch-BugFix
bokuanT Apr 4, 2023
8e32b93
Merge branch 'master' of https://github.com/AY2223S2-CS2103T-T17-4/tp…
usuxnsnc Apr 4, 2023
50986df
Update sort by/fi
usuxnsnc Apr 4, 2023
bbb22d9
Merge pull request #216 from ryanchua00/branch-DeveloperGuide
bokuanT Apr 4, 2023
5ed8ce8
Merge pull request #214 from ryanchua00/branch-UserGuide
bokuanT Apr 4, 2023
f20cd3c
Merge branch 'master' of https://github.com/AY2223S2-CS2103T-T17-4/tp…
usuxnsnc Apr 4, 2023
e73314b
Update index hyperlinks
usuxnsnc Apr 4, 2023
16d2bc1
Add missing fish edit hyperlink
usuxnsnc Apr 4, 2023
1342734
Include issue #212
usuxnsnc Apr 4, 2023
1f2db2d
Update tank view changing after adding fish/task / edit
usuxnsnc Apr 4, 2023
9199072
Parameter too long not showing
usuxnsnc Apr 4, 2023
a0559e0
For #164
usuxnsnc Apr 4, 2023
b32c9ec
Merge branch 'master' into branch-taskEdit
usuxnsnc Apr 5, 2023
7df345a
Fix edit task
usuxnsnc Apr 5, 2023
2174b97
Fix edit task in UG
usuxnsnc Apr 5, 2023
9af10da
Update task edit
usuxnsnc Apr 5, 2023
fdc1f35
Fix listing all fishes after add or edit fish
usuxnsnc Apr 5, 2023
b5f0118
Remove equipment package and improve readings error message
usuxnsnc Apr 5, 2023
b51c84a
Merge branch 'master' into branch-SafeDelete
TimothyLawSongEn Apr 5, 2023
752086b
Remove ability to edit reminders
usuxnsnc Apr 5, 2023
b1864ba
Update UG feeding reminders warning
usuxnsnc Apr 5, 2023
276403d
Abstract out model.getTankFromIndex()
TimothyLawSongEn Apr 5, 2023
8d4ccf7
Update planned enhancements and manual testing
usuxnsnc Apr 5, 2023
061a4cb
Add truncated fields issue to future enhancements
usuxnsnc Apr 5, 2023
c8f383b
Minor changes
usuxnsnc Apr 5, 2023
9bf3332
Fix data files other tank addressbook corruption not working
usuxnsnc Apr 5, 2023
77a58ff
Fix checkstyle
usuxnsnc Apr 5, 2023
37eed8f
Merge pull request #219 from bokuanT/branch-UserGuide
ryanchua00 Apr 5, 2023
1c7f87e
Merge pull request #221 from bokuanT/branch-taskEdit
ryanchua00 Apr 5, 2023
e32a908
Update FishEditCommand.java
ryanchua00 Apr 5, 2023
e3c7212
Merge pull request #224 from bokuanT/branch-fixBadReadingErrorMsg
ryanchua00 Apr 5, 2023
d3a209e
Merge pull request #222 from bokuanT/branch-fishEditChanges
ryanchua00 Apr 5, 2023
77ba97f
Merge pull request #225 from bokuanT/branch-plannedEnhancements
ryanchua00 Apr 5, 2023
9f4cfdc
Merge pull request #226 from bokuanT/branch-fixDataConversionErrorNot…
ryanchua00 Apr 5, 2023
696b4c5
Add planned enhancements
ryanchua00 Apr 6, 2023
fa1d807
Update DeveloperGuide.md
bokuanT Apr 6, 2023
1575353
Merge pull request #229 from ryanchua00/branch-DeveloperGuide
bokuanT Apr 6, 2023
bc33049
Add Ui explanations on Fish and Tank
ryanchua00 Apr 6, 2023
b8de05b
Fix empty desc for tasks
usuxnsnc Apr 6, 2023
5a5dd27
Minor changes
usuxnsnc Apr 6, 2023
81f2ad7
Merge pull request #231 from ryanchua00/branch-UserGuide
bokuanT Apr 6, 2023
550e055
Fix task no duplicate check and update UG
usuxnsnc Apr 6, 2023
9fac228
Remove list tanks
usuxnsnc Apr 6, 2023
6d86892
Fix test case and checkstyle
usuxnsnc Apr 6, 2023
696754b
Merge branch 'master' into branch-PPP
usuxnsnc Apr 6, 2023
c63cae8
Add screenshots
ryanchua00 Apr 6, 2023
17f378f
Test screenshot sizing
ryanchua00 Apr 6, 2023
8c8d055
Update my PPP
usuxnsnc Apr 6, 2023
e5eba41
Add PPP
usuxnsnc Apr 6, 2023
ae27c11
Added demo screenshots for 5 commands to UG
ryanchua00 Apr 6, 2023
3bfabbd
Added examples for pictures
ryanchua00 Apr 6, 2023
cbae855
Update UserGuide.md
bokuanT Apr 6, 2023
156a2cc
Merge pull request #236 from ryanchua00/branch-UserGuide
bokuanT Apr 6, 2023
ae27aed
Merge pull request #235 from bokuanT/branch-PPP
bokuanT Apr 7, 2023
cb256dd
update ppp
bryanongjx Apr 7, 2023
65d1420
Merge pull request #238 from bryanongjx/master
bryanongjx Apr 7, 2023
8dd287f
Accreditations
ryanchua00 Apr 7, 2023
2c1d9a8
PPP updates
ryanchua00 Apr 7, 2023
670ee52
Merge pull request #239 from ryanchua00/branch-BugFix
bokuanT Apr 7, 2023
4035794
Merge pull request #234 from bokuanT/branch-178
ryanchua00 Apr 7, 2023
a1a7d7f
Update PPP
ryanchua00 Apr 7, 2023
aa802d5
Remove print statement
ryanchua00 Apr 7, 2023
86d5b7c
Merge pull request #233 from bokuanT/branch-179
ryanchua00 Apr 7, 2023
87321d0
Refactor tests for FishCommands
TimothyLawSongEn Apr 7, 2023
2550aee
Fix checkstyle
TimothyLawSongEn Apr 7, 2023
650b9f8
Merge branch 'master' into branch-SafeDelete
TimothyLawSongEn Apr 7, 2023
7d465ee
Merge pull request #240 from ryanchua00/branch-PPP
bokuanT Apr 7, 2023
f1aeab7
Add fish sort tests
ryanchua00 Apr 7, 2023
0529a9b
Increase test coverage
usuxnsnc Apr 7, 2023
a53d815
Merge pull request #242 from ryanchua00/branch-FishSortCommand
bokuanT Apr 7, 2023
98fce45
create sanity check for readings. readings are now max 1d.p within th…
bryanongjx Apr 8, 2023
2e0a007
Debug FishEditCommandTest
TimothyLawSongEn Apr 8, 2023
0715895
Merge branch 'master' into branch-SafeDelete
TimothyLawSongEn Apr 8, 2023
3ad9d6d
Refactor error message from invalid to out-of-bounds.
TimothyLawSongEn Apr 8, 2023
48a4297
Comment out failing test case
TimothyLawSongEn Apr 8, 2023
f404f2e
Change LFD display value
usuxnsnc Apr 8, 2023
4a6fd78
Remove commented out test
bokuanT Apr 8, 2023
0226e65
Removed commented out test
bokuanT Apr 8, 2023
cb12776
Merge pull request #241 from TimothyLawSongEn/branch-SafeDelete
bokuanT Apr 8, 2023
96b9409
Change DG part
usuxnsnc Apr 8, 2023
a5302c2
Fix ToC
ryanchua00 Apr 8, 2023
70dbca0
Improve Developer Guide
TimothyLawSongEn Apr 9, 2023
94dd8dc
Cleanup
TimothyLawSongEn Apr 9, 2023
771fd1d
Merge pull request #247 from ryanchua00/branch-DeveloperGuide
bokuanT Apr 9, 2023
3501fd3
Merge pull request #243 from bokuanT/branch-TaskTest
EepyKitty Apr 9, 2023
1c18b4f
Made diagram smaller
TimothyLawSongEn Apr 9, 2023
338c7d4
Merge pull request #246 from bokuanT/branch-lfdFix
EepyKitty Apr 9, 2023
59366a7
remove newlines
usuxnsnc Apr 9, 2023
ccac937
Fix brackets not appearing
ryanchua00 Apr 9, 2023
0cfe80c
Merge pull request #232 from bokuanT/branch-emptyTaskDesc
EepyKitty Apr 9, 2023
9add9aa
Fix style
ryanchua00 Apr 9, 2023
0bd642b
Fix CheckStyle
TimothyLawSongEn Apr 9, 2023
9fb6ede
Fix style
ryanchua00 Apr 9, 2023
3563771
Merge branch 'master' into branch-TankFeedCommandPuml
TimothyLawSongEn Apr 9, 2023
ad394a5
Fix Checkstyle
TimothyLawSongEn Apr 9, 2023
b96597c
Minor fish add example change
ryanchua00 Apr 9, 2023
58319b2
remove restriction of readings to 1.d.p
bryanongjx Apr 9, 2023
e004773
Merge pull request #249 from ryanchua00/branch-DeveloperGuide
bokuanT Apr 9, 2023
d304c58
Fix command in fish sort
ryanchua00 Apr 9, 2023
91e5070
Minor change to fish sort
ryanchua00 Apr 9, 2023
b230511
Merge branch 'master' into branch-TankFeedCommandPuml
bokuanT Apr 9, 2023
299d032
Merge pull request #248 from TimothyLawSongEn/branch-TankFeedCommandPuml
bokuanT Apr 9, 2023
5c51d48
Merge pull request #250 from ryanchua00/branch-UserGuide
bokuanT Apr 9, 2023
eb0cc2c
Merge pull request #244 from bryanongjx/branch-ReadingsSanityCheck
EepyKitty Apr 9, 2023
cad3271
Update offline html
usuxnsnc Apr 9, 2023
1ac4c4b
remove pics
usuxnsnc Apr 9, 2023
21315e3
Start PPP
TimothyLawSongEn Apr 9, 2023
c658318
make chrome hyperlinks work
usuxnsnc Apr 9, 2023
5c3d129
Merge branch 'master' into branch-ErrorMessageRefactor
TimothyLawSongEn Apr 9, 2023
df59ce7
Do changes requested
usuxnsnc Apr 9, 2023
8dc6668
Fix test compile failure
TimothyLawSongEn Apr 9, 2023
4c0f06b
Merge pull request #251 from bokuanT/branch-updateHtml
EepyKitty Apr 9, 2023
4991bf8
Merge pull request #245 from TimothyLawSongEn/branch-ErrorMessageRefa…
bokuanT Apr 9, 2023
9a1848e
Do Finishing Touches
Apr 9, 2023
e75fd85
Merge branch 'master' into branch-FinishingTouches
EepyKitty Apr 9, 2023
81674a7
Fix checkstyle
bokuanT Apr 10, 2023
c6ecd90
Merge pull request #254 from Diamondroxxx/branch-FinishingTouches
bokuanT Apr 10, 2023
506fb5b
Add planned enhancements for #166
ryanchua00 Apr 10, 2023
8b8ebbf
Merge pull request #255 from ryanchua00/branch-DeveloperGuide
bokuanT Apr 10, 2023
162b465
Try fix line breaks
usuxnsnc Apr 10, 2023
5bb299c
Try changes
usuxnsnc Apr 10, 2023
687c7ef
Fix DG and Trial UG changes
usuxnsnc Apr 10, 2023
cf0cf46
Change DG further
usuxnsnc Apr 10, 2023
2946add
fix checkstyle
bryanongjx Apr 10, 2023
43ca072
Merge pull request #256 from bryanongjx/branch-PPPBryan
bryanongjx Apr 10, 2023
de26ac9
try changes
usuxnsnc Apr 10, 2023
3d1a7a9
test dg changes
usuxnsnc Apr 10, 2023
8793552
Change UG
usuxnsnc Apr 10, 2023
a810b22
Small change to adding a tank
usuxnsnc Apr 10, 2023
f11b1b5
trial changes
usuxnsnc Apr 10, 2023
e125a50
move editing a task
usuxnsnc Apr 10, 2023
d77d14b
minor changes to adding a set of readings
usuxnsnc Apr 10, 2023
0a85014
changes
usuxnsnc Apr 10, 2023
2b3dce7
Finish PPP
TimothyLawSongEn Apr 10, 2023
511ad59
Fix Feeding Reminders not updating
Apr 10, 2023
4474296
Merge pull request #258 from TimothyLawSongEn/branch-PPP
ryanchua00 Apr 10, 2023
662d41c
Merge pull request #257 from bokuanT/branch-UGpagebreak
ryanchua00 Apr 10, 2023
4f0d1a3
Add page breaks to DG
ryanchua00 Apr 10, 2023
b2a07d3
Stop overwriting result message
Apr 10, 2023
9db06cf
Change line break
ryanchua00 Apr 10, 2023
36b65f2
Add line
ryanchua00 Apr 10, 2023
5a08244
Fix line
ryanchua00 Apr 10, 2023
4d30181
Fix breaks
ryanchua00 Apr 10, 2023
1753352
Add more breaks
ryanchua00 Apr 10, 2023
7a75ccf
Fix lines
ryanchua00 Apr 10, 2023
ffc95e9
Remove line change
ryanchua00 Apr 10, 2023
55eeb6b
Test downsize
ryanchua00 Apr 10, 2023
904d9cb
Downsize photo
ryanchua00 Apr 10, 2023
3c2325b
Fix lines
ryanchua00 Apr 10, 2023
69b8016
Minor changes to fit page
ryanchua00 Apr 10, 2023
8a5956e
Downsize image
ryanchua00 Apr 10, 2023
7be2319
revert changes
ryanchua00 Apr 10, 2023
1f06bc7
Personal ppp updates
ryanchua00 Apr 10, 2023
4b7d08b
Update UG to reflect new behaviour
Apr 10, 2023
ff33190
Update DeveloperGuide.md
bokuanT Apr 10, 2023
a6febeb
Merge pull request #260 from ryanchua00/branch-DeveloperGuide
bokuanT Apr 10, 2023
34f1c6c
Merge pull request #259 from Diamondroxxx/feedingReminderBug
bokuanT Apr 10, 2023
5d12c7d
Update PPP
Apr 10, 2023
9f6687e
Update PPP
Apr 10, 2023
4fdf7be
Fix checkstyle
EepyKitty Apr 10, 2023
7ed3a1c
Merge pull request #261 from Diamondroxxx/ppp
TimothyLawSongEn Apr 10, 2023
682630c
Fix Project Name
EepyKitty Apr 10, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ MIT License

Copyright (c) 2016 Software Engineering Education - FOSS Resources

Permission is hereby granted, free of charge, to any person obtaining a copy
Permission is hereby granted, free of charge, to any fish obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
copies of the Software, and to permit fish to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
Expand Down
25 changes: 14 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
[![CI Status](https://github.com/se-edu/addressbook-level3/workflows/Java%20CI/badge.svg)](https://github.com/se-edu/addressbook-level3/actions)
[![CI Status](https://github.com/AY2223S2-CS2103T-T17-4/tp/workflows/Java%20CI/badge.svg)](https://github.com/AY2223S2-CS2103T-T17-4/tp/actions)

![Ui](docs/images/Ui.png)

* This is **a sample project for Software Engineering (SE) students**.<br>
Example usages:
* as a starting point of a course project (as opposed to writing everything from scratch)
* as a case study
* The project simulates an ongoing software project for a desktop application (called _AddressBook_) used for managing contact details.
* It is **written in OOP fashion**. It provides a **reasonably well-written** code base **bigger** (around 6 KLoC) than what students usually write in beginner-level SE modules, without being overwhelmingly big.
* It comes with a **reasonable level of user and developer documentation**.
* It is named `AddressBook Level 3` (`AB3` for short) because it was initially created as a part of a series of `AddressBook` projects (`Level 1`, `Level 2`, `Level 3` ...).
* For the detailed documentation of this project, see the **[Address Book Product Website](https://se-education.org/addressbook-level3)**.
* This project is a **part of the se-education.org** initiative. If you would like to contribute code to this project, see [se-education.org](https://se-education.org#https://se-education.org/#contributing) for more info.
# Fish Ahoy!
* Fish Ahoy! is a CLI (Command Line interface)-friendly product with a GUI to easily view your information
* The project aims to help fish enthusiasts manage their aquariums, fish and tasks.

With Fish Ahoy!, users can:
* Keep track of individual fishes
* Keep track of their fish tanks
* Keep track of fish maintenance tasks

See our documentation: **[Fish Ahoy! Product Website](https://ay2223s2-cs2103t-t17-4.github.io/tp/)**.

## Acknowledgements
This project is based on the AddressBook-Level3 project created by the [SE-EDU initiative](https://se-education.org).
12 changes: 11 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ dependencies {
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-graphics', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-media', version: javaFxVersion, classifier: 'linux'
implementation group: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'win'
implementation group: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'mac'
implementation group: 'org.openjfx', name: 'javafx-web', version: javaFxVersion, classifier: 'linux'

implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.7.0'
implementation group: 'com.fasterxml.jackson.datatype', name: 'jackson-datatype-jsr310', version: '2.7.4'
Expand All @@ -66,7 +72,11 @@ dependencies {
}

shadowJar {
archiveFileName = 'addressbook.jar'
archiveFileName = 'FishAhoy.jar'
}

defaultTasks 'clean', 'test'

run {
enableAssertions = true
}
Binary file added docs/2103UG.pptx
Binary file not shown.
41 changes: 20 additions & 21 deletions docs/AboutUs.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,54 @@ title: About Us

We are a team based in the [School of Computing, National University of Singapore](http://www.comp.nus.edu.sg).

You can reach us at the email `seer[at]comp.nus.edu.sg`
You can reach us at the emails `e0725564@u.nus.edu`, `e0725569@u.nus.edu`, `e0860597@u.nus.edu`,` e0908339@u.nus.edu` or `e0701815@u.nus.edu`

## Project team

### John Doe
### Timothy

<img src="images/johndoe.png" width="200px">
<img src="images/timothylawsongen.png" width="200px">

[[homepage](http://www.comp.nus.edu.sg/~damithch)]
[[github](https://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github](https://github.com/TimothyLawSongEn)]
[[portfolio](team/timothylawsongen.md)]

* Role: Project Advisor

### Jane Doe
### Bryan

<img src="images/johndoe.png" width="200px">
<img src="images/bryanongjx.png" width="200px">

[[github](http://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github](http://github.com/bryanongjx)]
[[portfolio](team/bryanongjx.md)]

* Role: Team Lead
* Responsibilities: UI

### Johnny Doe
### Ryan

<img src="images/johndoe.png" width="200px">
<img src="images/ryanchua00.png" width="200px">

[[github](http://github.com/johndoe)] [[portfolio](team/johndoe.md)]
[[github](http://github.com/ryanchua00)] [[portfolio](team/ryanchua00.md)]

* Role: Developer
* Responsibilities: Data

### Jean Doe
### Bo Kuan

<img src="images/johndoe.png" width="200px">
<img src="images/bokuant.png" width="200px">

[[github](http://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github](http://github.com/bokuanT)]
[[portfolio](team/bokuant.md)]

* Role: Developer
* Responsibilities: Dev Ops + Threading

### James Doe
### Avery

<img src="images/johndoe.png" width="200px">
<img src="images/diamondroxxx.png" width="200px">

[[github](http://github.com/johndoe)]
[[portfolio](team/johndoe.md)]
[[github](http://github.com/Diamondroxxx)]
[[portfolio](team/diamondroxxx.md)]

* Role: Developer
* Responsibilities: UI
Loading