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

[CS2103-T09-2] iTrack Pro #37

Open
wants to merge 532 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
532 commits
Select commit Hold shift + click to select a range
d6755c8
fix checkstyle error and test case error
YingxuH Mar 29, 2020
1b36309
fix test checkstyle error
YingxuH Mar 29, 2020
7618338
Merge pull request #125 from YingxuH/plot-product-stats
syt23 Mar 29, 2020
0f490e6
Delete transactions with product when product is deleted
IBMr Mar 30, 2020
44d9713
Merge pull request #126 from aliciatxl/master
junhaotan Mar 30, 2020
431225c
Removed unsupported findc feature
junhaotan Mar 30, 2020
f46cd0b
Update condition for notification window to popup
junhaotan Mar 30, 2020
1049889
Updated Product such that it is sorted by remaining balance automatic…
junhaotan Mar 30, 2020
cc0bf57
Fix error in logic for display
junhaotan Mar 30, 2020
5188c93
Updated StatisticCard with correct fxml file
junhaotan Mar 30, 2020
ae6ff04
Fix failing tests
junhaotan Mar 30, 2020
8c64a53
Update UserGuide with updated images and features
junhaotan Mar 30, 2020
9a39dea
Merge pull request #127 from junhaotan/master
syt23 Mar 30, 2020
5a92fb1
Delete transactions with customer when customer is deleted, fix stats…
IBMr Mar 30, 2020
9eaea9f
Merge pull request #128 from aliciatxl/master
junhaotan Mar 30, 2020
5d1c29d
Added styling to StatisticsListPanel
junhaotan Mar 30, 2020
b19f48b
Updated styling and EOF at end of file
junhaotan Mar 30, 2020
6909302
Merge pull request #129 from junhaotan/master
syt23 Mar 31, 2020
102ba18
Update stats window ui, fix edit transaction
IBMr Mar 31, 2020
6218eb3
Merge pull request #130 from aliciatxl/master
junhaotan Mar 31, 2020
9466989
Fixed displaying bug in StatisticsWindow
junhaotan Mar 31, 2020
05aefe5
Changed the styling for tag in PersonCard
junhaotan Mar 31, 2020
ce08d21
Update display on Statistics window
junhaotan Mar 31, 2020
59a2270
Update exit command to close all other windows
junhaotan Mar 31, 2020
a1617b8
Sort ranking by profits instead of sales
junhaotan Mar 31, 2020
62f1123
Fix failing tests
junhaotan Mar 31, 2020
b538810
Update UG with up-to-date Ui
junhaotan Mar 31, 2020
dca6b45
Fix display for message usage
junhaotan Mar 31, 2020
1996ec6
Add styling for HelpWindow
junhaotan Mar 31, 2020
16222f4
Merge pull request #131 from junhaotan/master
syt23 Apr 1, 2020
c0a322c
Update UG, change profit calc for stats window
IBMr Apr 1, 2020
e35938b
Fix editt for data fields, fix lowlimit are prefixes present
IBMr Apr 1, 2020
41cfa01
Merge pull request #132 from aliciatxl/master
junhaotan Apr 1, 2020
844cec1
add product sales histogram
YingxuH Apr 1, 2020
c816daa
Refactor calculate quantity sold for products
junhaotan Apr 1, 2020
e392000
Added missing edit transaction description field
junhaotan Apr 1, 2020
024cde0
update layout
YingxuH Apr 1, 2020
14a0024
Add test cases for LowLimitCommand
junhaotan Apr 1, 2020
2cfa1d8
add sales histogram
YingxuH Apr 1, 2020
3855dad
update windows upon every action
YingxuH Apr 1, 2020
2660cb6
Merge pull request #133 from junhaotan/master
YingxuH Apr 1, 2020
17144e2
fix time range error for plotsales
YingxuH Apr 1, 2020
f120463
update plotsales title format
YingxuH Apr 1, 2020
df04094
fix checkstyle error
YingxuH Apr 1, 2020
c5587c2
Merge branch 'master' into update-stats
YingxuH Apr 1, 2020
3e66665
Merge pull request #134 from YingxuH/update-stats
junhaotan Apr 1, 2020
12d9d13
update UG
YingxuH Apr 1, 2020
96a06dd
update plotsales example
YingxuH Apr 1, 2020
0189884
fix checkstyle
YingxuH Apr 1, 2020
8148142
Merge pull request #135 from YingxuH/update-userguide
junhaotan Apr 1, 2020
15f309b
rename delete command
YingxuH Apr 2, 2020
f4f5e78
update undot user guide
YingxuH Apr 2, 2020
a2e94f1
update editt ug
YingxuH Apr 2, 2020
92b86bd
fix checksyle error
YingxuH Apr 2, 2020
e5b07eb
Merge pull request #137 from YingxuH/refactor
junhaotan Apr 2, 2020
8917275
Refactored comments and class
junhaotan Apr 2, 2020
8b623b9
Added more sample data for JAR file
junhaotan Apr 2, 2020
83b5cbd
Fix display of error message
junhaotan Apr 2, 2020
089d1ee
MainWindow to close all windows upon exit
junhaotan Apr 2, 2020
fbca8cc
Update UG
junhaotan Apr 2, 2020
bdb0d7b
Fix checkstyle
junhaotan Apr 2, 2020
8ccd083
Merge pull request #138 from junhaotan/master
YingxuH Apr 2, 2020
c4237d8
Modify UG, fix notification window size, fix plotsales message
IBMr Apr 2, 2020
6880d2b
Merge pull request #139 from aliciatxl/master
YingxuH Apr 2, 2020
d481e04
add date time test and fix parsing style
YingxuH Apr 2, 2020
d16ee9b
finish date time test and fix resolver error
YingxuH Apr 2, 2020
e4d9604
fix checkstyle error
YingxuH Apr 3, 2020
ee41f04
Merge branch 'master' into add-transaction-test
YingxuH Apr 3, 2020
9482975
Merge pull request #140 from YingxuH/add-transaction-test
syt23 Apr 3, 2020
83a5cb9
Update UG
IBMr Apr 3, 2020
2eb7cc0
Merge pull request #141 from aliciatxl/master
syt23 Apr 3, 2020
71030a4
Refactor commands code
IBMr Apr 3, 2020
0e568bc
Refactor command parser and jsonadapted code. Fix editt allowing dupl…
IBMr Apr 3, 2020
3ccab9c
Fix checkstyle errors
IBMr Apr 3, 2020
b0b1c15
Refactor plotproductsalescommandparser code
IBMr Apr 3, 2020
b9d56c2
Fix bugs
IBMr Apr 4, 2020
003ee33
Fix bugs according to mock PE, fix failing tests
IBMr Apr 4, 2020
2fe02ec
Merge pull request #142 from aliciatxl/master
junhaotan Apr 4, 2020
ba6890c
change plotsales parser directory
YingxuH Apr 4, 2020
fa37a80
Merge branch 'add-transaction-test' into refactor
YingxuH Apr 4, 2020
bceb019
fix relist all products bug
YingxuH Apr 4, 2020
067006a
change example dt in add transaction command
YingxuH Apr 4, 2020
e1b365e
fix checkstyle error
YingxuH Apr 4, 2020
c2a7410
fix test error
YingxuH Apr 4, 2020
954df06
Merge pull request #182 from YingxuH/refactor
syt23 Apr 4, 2020
c81ed64
Add PPP
IBMr Apr 4, 2020
dc8f144
add more date time test and stubs
YingxuH Apr 4, 2020
d05edf2
add transaction test
YingxuH Apr 4, 2020
24a3a57
add customercontainskeywordpredicate test
YingxuH Apr 4, 2020
268e0f5
update quantity test
YingxuH Apr 4, 2020
6ef2888
fix checkstyle error in test
YingxuH Apr 4, 2020
2fcbb33
Merge pull request #183 from YingxuH/add-transaction-test
syt23 Apr 5, 2020
afd1eef
Merge branch 'master' of https://github.com/AY1920S2-CS2103-T09-2/main
IBMr Apr 6, 2020
b30ac93
Update UG and DG, add and modify diagrams, rename tests.
IBMr Apr 6, 2020
098b076
Merge pull request #184 from aliciatxl/master
junhaotan Apr 6, 2020
21a0fab
change transaction to table format
YingxuH Apr 6, 2020
d2af337
change column header font size
YingxuH Apr 6, 2020
a93ff3a
fix table resize error
YingxuH Apr 6, 2020
44ac527
move stats window to tab panel
YingxuH Apr 7, 2020
ff7ddc2
remove the statistics medu item
YingxuH Apr 7, 2020
e15cd59
move inventory window to statistics window
YingxuH Apr 7, 2020
1286376
remove inventory menu item
YingxuH Apr 7, 2020
08cfb1e
Limit number of tags when editing customer details
junhaotan Apr 7, 2020
eb2e03b
Updated error message for find customer function to better reflect th…
junhaotan Apr 7, 2020
bfcc079
Update conditions for duplicate customers
junhaotan Apr 7, 2020
caac462
Updated product to remove leading zeroes for cost price and price
junhaotan Apr 7, 2020
f698423
Fix alignment of address label in PersonListCard when wraptext
junhaotan Apr 7, 2020
389e445
Fixed failing tests
junhaotan Apr 7, 2020
ad5e8f9
Updated UG
junhaotan Apr 7, 2020
ca0fa63
Update UG
junhaotan Apr 7, 2020
cca2dbf
fix statistic window not updated problem
YingxuH Apr 7, 2020
d51a0d6
remove menu bar
YingxuH Apr 7, 2020
8dea150
change tab header css
YingxuH Apr 7, 2020
ea2a05b
remove unused file
YingxuH Apr 7, 2020
1e7eb39
fix checkstyle error
YingxuH Apr 7, 2020
2bf304e
Merge branch 'master' into refactor
YingxuH Apr 7, 2020
46a2980
Merge pull request #185 from junhaotan/master
YingxuH Apr 7, 2020
d8f2953
Merge branch 'master' into refactor
YingxuH Apr 7, 2020
fc29521
Merge pull request #186 from YingxuH/refactor
junhaotan Apr 7, 2020
1ef1ff7
Merge branch 'master' into refactor
YingxuH Apr 7, 2020
17ea41e
rename plotsales command
YingxuH Apr 7, 2020
803fa01
refactor the notification window process
YingxuH Apr 7, 2020
d027ba9
Add legend to UG
IBMr Apr 8, 2020
72d340b
Update UI
IBMr Apr 8, 2020
4da1920
Update UI diagram and rename ui classes
IBMr Apr 8, 2020
a1d4580
Merge pull request #187 from aliciatxl/master
junhaotan Apr 8, 2020
06091c2
Add icons
IBMr Apr 8, 2020
bb7dbfb
Merge pull request #188 from aliciatxl/master
junhaotan Apr 8, 2020
2bb552c
Update styling of UI in MainWindow
junhaotan Apr 8, 2020
13f910d
Update UG with the new UI
junhaotan Apr 8, 2020
b679494
Add own PPP
junhaotan Apr 8, 2020
cd812b2
split quantity into two different class
YingxuH Apr 8, 2020
bc63959
Added links to PR for enhancements in PPP
junhaotan Apr 8, 2020
e8b3cb2
fix test error
YingxuH Apr 8, 2020
184e825
Merge branch 'master' into refactor
YingxuH Apr 8, 2020
262920f
Merge branch 'master' into refactor
YingxuH Apr 8, 2020
2d09dcb
Merge pull request #189 from junhaotan/master
syt23 Apr 8, 2020
2fce684
Edit UG
IBMr Apr 8, 2020
5cabdef
Renamed from AB3 to iTrack Pro
junhaotan Apr 8, 2020
f8d2fa6
Update README.adoc
junhaotan Apr 8, 2020
dd0a280
Refactor remnants of AB3 to InventorySystem
junhaotan Apr 8, 2020
94459d5
Update PPP
junhaotan Apr 8, 2020
0a15c7f
finish addtransaction command test
YingxuH Apr 8, 2020
2e22580
fix checkstyle error
YingxuH Apr 8, 2020
df2e7bb
Merge branch 'master' into refactor
YingxuH Apr 8, 2020
9b51cd1
Merge pull request #191 from junhaotan/master
YingxuH Apr 8, 2020
f7954d4
edit javadoc
YingxuH Apr 8, 2020
28834f3
init YingxuH ppp
YingxuH Apr 8, 2020
657fb24
Merge pull request #192 from YingxuH/refactor
junhaotan Apr 8, 2020
b7a311a
Merge branch 'master' of https://github.com/AY1920S2-CS2103-T09-2/main
IBMr Apr 9, 2020
819988c
Update DG design content and image sizes
IBMr Apr 9, 2020
8063b1f
Add logging
IBMr Apr 9, 2020
1223767
Fix docs error
IBMr Apr 9, 2020
9054e61
Merge pull request #194 from aliciatxl/master
junhaotan Apr 9, 2020
daef690
Added more tests
junhaotan Apr 9, 2020
02f3ed1
Renamed remaining remnants of AB3 to InventorySystem
junhaotan Apr 9, 2020
24f5910
Added more test for InventorySystemParserTest
junhaotan Apr 9, 2020
770a515
Merge branch 'master' of https://github.com/AY1920S2-CS2103-T09-2/main
junhaotan Apr 9, 2020
e950418
Fixed failing tests
junhaotan Apr 9, 2020
0c888cf
Added tests
junhaotan Apr 9, 2020
991b009
Fix broken link and formatting of DG
junhaotan Apr 10, 2020
8a1ebaf
Add new section and UML diagram to DG
junhaotan Apr 10, 2020
164a8d3
Update PPP
junhaotan Apr 10, 2020
ab27ade
Merge pull request #196 from junhaotan/master
syt23 Apr 10, 2020
ba30a14
transaction quantity test
YingxuH Apr 10, 2020
e72372f
fix future time error
YingxuH Apr 10, 2020
3c40327
add transactionfactory test
YingxuH Apr 10, 2020
b165f82
fix checkstyle error
YingxuH Apr 10, 2020
da92f83
Merge pull request #197 from YingxuH/add-transaction-test
junhaotan Apr 11, 2020
eea48a7
Link about us to team PPP, edit UG command summary, update activity d…
IBMr Apr 11, 2020
4b9bebc
Fix bug of allowing multiple number of same prefix fields for commands
junhaotan Apr 11, 2020
13a9a69
Add instructions for manual testing in dg for products and customers,…
IBMr Apr 11, 2020
fa15d3b
Fix failing tests
junhaotan Apr 11, 2020
8c3005f
Merge pull request #198 from junhaotan/master
syt23 Apr 11, 2020
ad0ba39
Add instructions for manual testing in dg for transaction, edit findc…
IBMr Apr 11, 2020
a0e7f14
Merge branch 'master' of https://github.com/AY1920S2-CS2103-T09-2/main
IBMr Apr 11, 2020
85879b3
Merge pull request #199 from aliciatxl/master
junhaotan Apr 11, 2020
c45f7b2
Add tests
junhaotan Apr 11, 2020
d1a3cf7
Merge branch 'master' of https://github.com/AY1920S2-CS2103-T09-2/main
junhaotan Apr 11, 2020
7e0e43f
Update DG
junhaotan Apr 11, 2020
e39d09c
Remove Product Survey portion from DG
junhaotan Apr 11, 2020
b0ac431
Update unknown command message prompt
junhaotan Apr 11, 2020
7a867ac
Added improved help window
junhaotan Apr 11, 2020
d1c9cae
Update styling of HelpWindow
junhaotan Apr 11, 2020
10d6cb6
Update User Guide
junhaotan Apr 11, 2020
1038c72
Fix checkstyle
junhaotan Apr 11, 2020
718b56b
Update PPP
junhaotan Apr 11, 2020
7c7d3e1
Fix no newline at EOF
junhaotan Apr 11, 2020
74be808
add find transaction test
YingxuH Apr 11, 2020
95b66c3
Merge pull request #200 from junhaotan/master
syt23 Apr 11, 2020
ae04259
modify ug image sizes
IBMr Apr 11, 2020
539f4e6
Merge branch 'master' of https://github.com/AY1920S2-CS2103-T09-2/main
IBMr Apr 11, 2020
d7ef645
Add instructions for manual testing in dg for plotsales, predict
IBMr Apr 11, 2020
65e7ce4
add list transaction test
YingxuH Apr 11, 2020
ea4b2a4
fix checkstyle error
YingxuH Apr 11, 2020
e18d8d3
Merge pull request #201 from YingxuH/add-transaction-test
junhaotan Apr 11, 2020
dfe96a3
Add effort section
IBMr Apr 11, 2020
8cebdb2
Merge branch 'master' of https://github.com/AY1920S2-CS2103-T09-2/main
IBMr Apr 11, 2020
d8d5de4
Add new line to dg
IBMr Apr 11, 2020
3b824fe
Merge pull request #202 from aliciatxl/master
junhaotan Apr 11, 2020
4dea340
Update UserGuide.adoc
junhaotan Apr 11, 2020
309d4a4
Update condition for notification window
junhaotan Apr 12, 2020
08481cd
Update DG
junhaotan Apr 12, 2020
aaed005
Merge pull request #203 from junhaotan/master
syt23 Apr 12, 2020
c6a97c6
Update DeveloperGuide.adoc
junhaotan Apr 12, 2020
5b018af
Prevent display of all products after commands to prevent user confus…
junhaotan Apr 12, 2020
d7a66df
Merge pull request #204 from junhaotan/master
YingxuH Apr 12, 2020
b3bedc8
Modify ug and dg
IBMr Apr 13, 2020
cb0420b
Make address and email not compulsory
IBMr Apr 13, 2020
a600d24
Merge pull request #205 from aliciatxl/master
junhaotan Apr 13, 2020
c072b3e
Update application help window html file
junhaotan Apr 13, 2020
3ac0bd8
Update DG
junhaotan Apr 13, 2020
96411c4
Update README.adoc
junhaotan Apr 13, 2020
bc04918
Update README.adoc
junhaotan Apr 13, 2020
e309413
Update README.adoc
junhaotan Apr 13, 2020
d301c8b
Merge pull request #206 from junhaotan/master
syt23 Apr 13, 2020
2bc1c6d
Update README.adoc
junhaotan Apr 13, 2020
09ad2d2
Update README.adoc
junhaotan Apr 13, 2020
f24295e
Edit PPP
IBMr Apr 13, 2020
eb089ce
Add newline to PPP
IBMr Apr 13, 2020
a0c62e5
Merge pull request #207 from aliciatxl/master
junhaotan Apr 13, 2020
dfab4fa
Update PPP
junhaotan Apr 13, 2020
c841de0
refactor checking duplicate prefix
YingxuH Apr 13, 2020
634e19f
addtransctioncommand parser test
YingxuH Apr 13, 2020
71f3f8b
Fix html file name
junhaotan Apr 13, 2020
6709631
Rename UserGuide.html to userGuide.html
junhaotan Apr 13, 2020
06babb5
Update sample data for jar file
junhaotan Apr 13, 2020
3c314bf
Update jar file name
junhaotan Apr 13, 2020
dd54f90
edit transaction command test
YingxuH Apr 13, 2020
1cd30f6
undo transaction parser test
YingxuH Apr 13, 2020
993c824
Merge pull request #208 from junhaotan/master
syt23 Apr 13, 2020
242d725
correct find transaction tests
YingxuH Apr 13, 2020
d1f108f
fix checkstyle error
YingxuH Apr 13, 2020
01ce45e
Merge branch 'master' into add-transaction-test
YingxuH Apr 13, 2020
b058c29
Merge pull request #209 from YingxuH/add-transaction-test
YingxuH Apr 13, 2020
a211c69
Add tests
junhaotan Apr 13, 2020
f01eb7b
Merge pull request #210 from junhaotan/master
junhaotan Apr 13, 2020
c891482
udpate YG
YingxuH Apr 13, 2020
13511d2
update UG
YingxuH Apr 13, 2020
f4e1288
Remove unused code
junhaotan Apr 13, 2020
c7b3401
Merge pull request #211 from junhaotan/master
junhaotan Apr 13, 2020
257cc5c
update UG and DG
YingxuH Apr 13, 2020
5b8fc86
Merge pull request #212 from YingxuH/update-devguide
junhaotan Apr 13, 2020
6891736
update PPP
YingxuH Apr 13, 2020
065cfc6
Merge pull request #213 from YingxuH/update-devguide
YingxuH Apr 13, 2020
ceb4455
update PPP
YingxuH Apr 13, 2020
48e069b
update ppp
YingxuH Apr 13, 2020
6dcb252
Merge pull request #214 from YingxuH/update-devguide
YingxuH Apr 13, 2020
3d774e1
Rename YingxuH.adoc to yingxuh.adoc
YingxuH Apr 15, 2020
fc4ea5d
Merge pull request #216 from YingxuH/master
YingxuH Apr 15, 2020
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
  •  
  •  
  •  
35 changes: 23 additions & 12 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,34 +1,45 @@
= Address Book (Level 3)
= iTrack Pro
ifdef::env-github,env-browser[:relfileprefix: docs/]

https://travis-ci.org/se-edu/addressbook-level3[image:https://travis-ci.org/se-edu/addressbook-level3.svg?branch=master[Build Status]]
https://ci.appveyor.com/project/damithc/addressbook-level3[image:https://ci.appveyor.com/api/projects/status/3boko2x2vr5cc3w2?svg=true[Build status]]
https://coveralls.io/github/se-edu/addressbook-level3?branch=master[image:https://coveralls.io/repos/github/se-edu/addressbook-level3/badge.svg?branch=master[Coverage Status]]
https://www.codacy.com/app/damith/addressbook-level3?utm_source=github.com&utm_medium=referral&utm_content=se-edu/addressbook-level3&utm_campaign=Badge_Grade[image:https://api.codacy.com/project/badge/Grade/fc0b7775cf7f4fdeaf08776f3d8e364a[Codacy Badge]]

https://travis-ci.org/AY1920S2-CS2103-T09-2/main[image:https://travis-ci.org/AY1920S2-CS2103-T09-2/main.svg?branch=master[Build Status]]
https://app.netlify.com/sites/eager-kirch-5d6bd2/deploys[image:https://api.netlify.com/api/v1/badges/8179f1a7-7a48-48a7-98ac-85784b47997d/deploy-status[Netlify Status]]
https://coveralls.io/github/AY1920S2-CS2103-T09-2/main?branch=master[image:https://coveralls.io/repos/github/AY1920S2-CS2103-T09-2/main/badge.svg?branch=master[Coverage Status]]

ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
image::docs/images/Ui.png[width="600" align="center"]
endif::[]

ifndef::env-github[]
image::images/Ui.png[width="600"]
image::images/Ui.png[width="600" align="center"]
endif::[]

* This is a desktop Address Book application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).
* It is a Java sample application intended for students learning Software Engineering while using Java as the main programming language.
* It is *written in OOP fashion*. It provides a *reasonably well-written* code example that is *significantly bigger* (around 6 KLoC)than what students usually write in beginner-level SE modules.
* iTrack Pro is for the shop owners to keep track of the products, customers, and transactions of the shop and have a better understanding of the business by viewing the performance of products and behaviors of customers.
* It is also able to provide an analysis of the entire business to help the owner manage the shop.
* This is a desktop Java Application. It has a GUI (Graphic User interface).

== Target Users
Shop owners who

* Are selling products
** Cannot afford expensive management systems
** Are relying on manual work to record products
** Want to optimise sales based analysis of previous sales
** Have many products and a large inventory
* Prefer desktop apps over other types
* Can type fast
* Prefer typing over mouse input
* Are reasonably comfortable using CLI apps

== Site Map

* <<UserGuide#, User Guide>>
* <<DeveloperGuide#, Developer Guide>>
* <<LearningOutcomes#, Learning Outcomes>>
* <<AboutUs#, About Us>>
* <<ContactUs#, Contact Us>>

== Acknowledgements

* The application is based on the https://github.com/nus-cs2103-AY1920S2/addressbook-level3[AddressBook-Level3] project created by https://se-education.org[SE-EDU initiative].
* Some parts of this sample application were inspired by the excellent http://code.makery.ch/library/javafx-8-tutorial/[Java FX tutorial] by
_Marco Jakob_.
* Libraries used: https://openjfx.io/[JavaFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/junit-team/junit5[JUnit5]
Expand Down
16 changes: 12 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,14 @@ dependencies {
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-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: '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: '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 @@ -67,7 +75,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = '[CS2103-T09-2][iTrack Pro].jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -133,9 +141,9 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level3',
'site-githuburl': 'https://github.com/se-edu/addressbook-level3',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
'site-name': 'iTrack Pro',
'site-githuburl': 'https://github.com/AY1920S2-CS2103-T09-2/main.git',
//'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

options['template_dirs'].each {
Expand Down
46 changes: 14 additions & 32 deletions docs/AboutUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,53 +4,35 @@
:imagesDir: images
:stylesDir: stylesheets

AddressBook - Level 3 was developed by the https://se-edu.github.io/docs/Team.html[se-edu] team. +
_{The dummy content given below serves as a placeholder to be used by future forks of the project.}_ +
iTrack Pro was developed by the AY1920S2-CS2103-T09-2 team.
{empty} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].

== Project Team

=== John Doe
image::damithc.jpg[width="150", align="left"]
{empty}[http://www.comp.nus.edu.sg/~damithch[homepage]] [https://github.com/damithc[github]] [<<johndoe#, portfolio>>]
=== Tan Su Yee
image::aliciatxl.png[width="150", align="left"]
{empty}[https://github.com/aliciatxl[github]][<<aliciatxl#, portfolio>>]

Role: Project Advisor
Role: Project Advisor +
Responsibilities: Product features

'''

=== John Roe
image::lejolly.jpg[width="150", align="left"]
{empty}[http://github.com/lejolly[github]] [<<johndoe#, portfolio>>]
=== Tan Jun Hao
image::junhaotan.png[width="150", align="left"]
{empty}[http://github.com/junhaotan[github]][<<junhaotan#, portfolio>>]

Role: Team Lead +
Responsibilities: UI
Responsibilities: Customer features

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== He Yingxu
image::YingxuH.png[width="150", align="left"]
{empty}[http://github.com/YingxuH[github]][<<YingxuH#, portfolio>>]

Role: Developer +
Responsibilities: Data

'''

=== Johnny Roe
image::m133225.jpg[width="150", align="left"]
{empty}[http://github.com/m133225[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: Dev Ops + Threading

'''

=== Benson Meier
image::yl_coder.jpg[width="150", align="left"]
{empty}[http://github.com/yl-coder[github]] [<<johndoe#, portfolio>>]

Role: Developer +
Responsibilities: UI
Responsibilities: Transaction features

'''
4 changes: 2 additions & 2 deletions docs/ContactUs.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@
:site-section: ContactUs
:stylesDir: stylesheets

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level3/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Bug reports, Suggestions* : Post in our https://github.com/AY1920S2-CS2103-T09-2/main/issues[issue tracker] if you noticed bugs or have suggestions on how to improve.
* *Contributing* : We welcome pull requests. Follow the process described https://github.com/oss-generic/process[here]
* *Email us* : You can also reach us at `damith [at] comp.nus.edu.sg`
* *Email us* : You can also reach us at `e0037186@u.nus.edu`
2 changes: 1 addition & 1 deletion docs/DevOps.adoc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= AddressBook Level 3 - Dev Ops
= iTrack Pro - Dev Ops
:site-section: DeveloperGuide
:toc:
:toc-title:
Expand Down
Loading