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

[W15-1] Fashion Match #16

Open
wants to merge 687 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
687 commits
Select commit Hold shift + click to select a range
68095e1
Merge branch 'v1.4cleanUpAndBugFix'
stanleymok Apr 8, 2019
0ae7df1
Merge branch 'master' into master
stanleymok Apr 8, 2019
d3a26a0
Merge branch 'master' of https://github.com/stanleymok/main
stanleymok Apr 8, 2019
969ec1b
Merge pull request #138 from stanleymok/master
stanleymok Apr 8, 2019
43c8e3f
Update ContactUs
EugeneYiren Apr 8, 2019
beb1b5f
Refactor setDirty method
stanleymok Apr 8, 2019
737ee95
refactor Apparel's setDirty method to setWorn
stanleymok Apr 8, 2019
fc27a51
Update use method to increment usage count for wear method
stanleymok Apr 8, 2019
9375507
Harden available command
stanleymok Apr 8, 2019
f5046f1
Harden wash and wear command, clean up code
stanleymok Apr 8, 2019
1017e8c
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
EugeneYiren Apr 8, 2019
eb2cd8a
Create Statistics Command
EugeneYiren Apr 8, 2019
66f1baf
Update UG for stats command
EugeneYiren Apr 8, 2019
6f9616a
Fix checkstyle for stats command
EugeneYiren Apr 8, 2019
83b0c94
Fix compile error for stats command
EugeneYiren Apr 8, 2019
acf284b
Add info for v2.0
EugeneYiren Apr 8, 2019
13419c7
Fix grammar
EugeneYiren Apr 8, 2019
a890d4e
Refactor more stuff
EugeneYiren Apr 8, 2019
84fc491
Change addressbook.jar to fashionmatch.jar
EugeneYiren Apr 8, 2019
118441e
Merge pull request #139 from ReinSheer/master
EugeneYiren Apr 8, 2019
eba2afc
Fix grammar for Readme
EugeneYiren Apr 9, 2019
ecc8609
Update UI pic and jar file icon
EugeneYiren Apr 9, 2019
4715082
Update user guide, sort no longer has default behaviour.
rafflesandrison Apr 9, 2019
91cead0
Add more sample items for the demo
EugeneYiren Apr 9, 2019
e208307
Update Clear command. Make the output more relevant.
rafflesandrison Apr 9, 2019
5b2c45f
Add border around UI photo
EugeneYiren Apr 9, 2019
a83889b
Update User Guide, Sort command
rafflesandrison Apr 9, 2019
3143035
Merge pull request #141 from ReinSheer/master
EugeneYiren Apr 9, 2019
11b8f67
Clean up unavailable command
stanleymok Apr 9, 2019
7c367c8
Fix wash command not working
stanleymok Apr 9, 2019
486e564
Update feedback message for wear command
stanleymok Apr 9, 2019
e2b237a
Update wear feedback string
stanleymok Apr 9, 2019
7de8283
Clean up wash and wear command classes
stanleymok Apr 9, 2019
2a35700
Make feedback string more professional
stanleymok Apr 9, 2019
6ae9d22
Remove redundant code
stanleymok Apr 9, 2019
725fb9c
Add new user feedback string if wear apparel thats dirty
stanleymok Apr 9, 2019
753398f
Clean up redundant global var
stanleymok Apr 9, 2019
bbcea44
Allow List command to take in options.
rafflesandrison Apr 9, 2019
4cdc453
Add new timeWorn field to Apparel that resets upon wash
stanleymok Apr 9, 2019
1ea89a8
Clean up wash code
stanleymok Apr 9, 2019
7da60b1
Clean up wash command
stanleymok Apr 9, 2019
4a10beb
Add random message feedback if user wears dirty clothes
stanleymok Apr 9, 2019
81baaa2
Update checkstyle
stanleymok Apr 9, 2019
4f69e07
no message
PhilipPhil Apr 9, 2019
9f11f26
Enable List command to take in options. Working code.
rafflesandrison Apr 9, 2019
7d88d2f
Merge pull request #142 from PhilipPhil/master
PhilipPhil Apr 9, 2019
e37ce95
Enable the user to see valid options for List command.
rafflesandrison Apr 9, 2019
01f0a71
Update User Guide for List command taking in options
rafflesandrison Apr 9, 2019
70f8477
Fix checkstyle
rafflesandrison Apr 9, 2019
8584b45
Close #108 fix colors message
stanleymok Apr 9, 2019
0aa0bc2
Fix List Command test.
rafflesandrison Apr 9, 2019
0a911ae
Fix checkstyle
stanleymok Apr 9, 2019
fb9e737
Merge pull request #144 from stanleymok/master
stanleymok Apr 9, 2019
e22dcca
Fix test fail
rafflesandrison Apr 9, 2019
d9f8ffb
Fix test
rafflesandrison Apr 9, 2019
c61f1c3
Fix test
rafflesandrison Apr 9, 2019
86d181e
Add test
rafflesandrison Apr 9, 2019
525887d
Merge pull request #143 from rafflesandrison/master
rafflesandrison Apr 9, 2019
19ef66b
no message
PhilipPhil Apr 9, 2019
606b2a0
Rename philipgarabandic.adoc to [W15-1][philipgarabandic]portfolio.adoc
PhilipPhil Apr 9, 2019
32d40e6
Update [W15-1][philipgarabandic]portfolio.adoc
PhilipPhil Apr 9, 2019
6197336
Add color option for List Command
rafflesandrison Apr 9, 2019
1524db1
Update User Guide - List Command color option
rafflesandrison Apr 9, 2019
fefa9f5
Fix List Command test
rafflesandrison Apr 9, 2019
10f8ac0
Merge pull request #146 from rafflesandrison/master
rafflesandrison Apr 9, 2019
247992d
Merge pull request #145 from PhilipPhil/master
PhilipPhil Apr 10, 2019
a2d124b
the UI is too legit to quit
PhilipPhil Apr 10, 2019
b9b4552
Merge pull request #147 from PhilipPhil/master
PhilipPhil Apr 10, 2019
75b345a
ff
PhilipPhil Apr 10, 2019
9649aa3
Merge pull request #148 from PhilipPhil/master
PhilipPhil Apr 10, 2019
4a3eeeb
travis
PhilipPhil Apr 10, 2019
24e84eb
Merge pull request #149 from PhilipPhil/master
PhilipPhil Apr 10, 2019
5fdcab9
Merge branch 'master' into v1.4cleanUpAndBugFix
stanleymok Apr 10, 2019
9d69dde
Add new assertion test for wash command when return string for wash i…
stanleymok Apr 11, 2019
1c143a3
Fix wear command test failing after adding random feedback message
stanleymok Apr 11, 2019
b9f6773
Fix wash command failing after refactoring constructor
stanleymok Apr 11, 2019
20d5fa5
Fix checkstyle
stanleymok Apr 11, 2019
699d9b4
Fix checkstyle
stanleymok Apr 11, 2019
5cf43e6
Fix attempt at test case error showing on travis but not on intellij
stanleymok Apr 11, 2019
5339c7e
Merge pull request #152 from stanleymok/master
stanleymok Apr 11, 2019
d1821a3
Update Browser Planel UI
rafflesandrison Apr 11, 2019
f34dfa2
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
rafflesandrison Apr 11, 2019
4b042c6
Temporary mute for BroswerPanel test fail
rafflesandrison Apr 11, 2019
db391c5
Update names of PPP (sorry guys i got the wrong format last time)
EugeneYiren Apr 12, 2019
3f4a2c1
Update AboutUs to include PPP links
EugeneYiren Apr 12, 2019
34de350
Standardise UG and DG
EugeneYiren Apr 12, 2019
1f1a3c7
Update Readme
EugeneYiren Apr 12, 2019
0681a33
Update product website
EugeneYiren Apr 12, 2019
2777cea
Merge pull request #154 from ReinSheer/master
EugeneYiren Apr 12, 2019
28d2db2
Image added
PhilipPhil Apr 12, 2019
2faa160
no message
PhilipPhil Apr 12, 2019
2365273
no message
PhilipPhil Apr 12, 2019
06ed07b
Update Stats command
EugeneYiren Apr 12, 2019
c67c864
Fix bug showing available/un instead of clean/worn
stanleymok Apr 12, 2019
c603a4f
Resize anchorpane & shift positions of usage count and status to prov…
stanleymok Apr 12, 2019
317b75d
Swap to horizontal divisor; image would be portrait not landscape
stanleymok Apr 12, 2019
d9557b2
Update design
stanleymok Apr 12, 2019
cf9d35e
update init message on label field
stanleymok Apr 12, 2019
2e5f146
Merge pull request #155 from PhilipPhil/master
rafflesandrison Apr 12, 2019
930357e
update layout
stanleymok Apr 12, 2019
387b3f5
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/mai…
stanleymok Apr 12, 2019
b85f6c7
Update Stats command #2
EugeneYiren Apr 12, 2019
c435122
Fix checkstyle
EugeneYiren Apr 12, 2019
ae0a25a
Merge pull request #156 from ReinSheer/master
EugeneYiren Apr 12, 2019
4e06533
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
rafflesandrison Apr 12, 2019
399d748
Merge pull request #6 from stanleymok/mainWindowUpdate
rafflesandrison Apr 12, 2019
ca1ee59
Add images
rafflesandrison Apr 12, 2019
0271d17
Merge branch 'master' of https://github.com/rafflesandrison/main
rafflesandrison Apr 12, 2019
4ff6191
Enable select item to display on main ui. Create all possible combina…
rafflesandrison Apr 12, 2019
fc88591
Create GUI test for browserPanel - incomplete
rafflesandrison Apr 13, 2019
85a6951
Fix default image not shown when apparel list is cleared using Clear …
rafflesandrison Apr 13, 2019
43b8bf3
Merge branch 'master' of https://github.com/rafflesandrison/main into…
stanleymok Apr 13, 2019
1f0bf9d
Edit uguide for final build
stanleymok Apr 13, 2019
37f4997
Add placeholder for loading screen [UX]
stanleymok Apr 13, 2019
705f7e7
Remove background color from images [Photoshop]
stanleymok Apr 13, 2019
0f29a73
guitest fix attemp
rafflesandrison Apr 13, 2019
e99aa1f
Remove background of the rest of belt, bottom shoes [Photoshop]
stanleymok Apr 13, 2019
cbcab74
Readjust image alignment to stackpane
stanleymok Apr 13, 2019
68c69ed
Update size of 13 tops [Photoshop]
stanleymok Apr 13, 2019
5d542d2
Resize 39 shoes pants and belts [Photoshop]
stanleymok Apr 13, 2019
3f9a909
Fix checkstyle
stanleymok Apr 13, 2019
ac83fef
Attempt fix gui test fail
rafflesandrison Apr 13, 2019
2ceea0b
Fix gui system test
rafflesandrison Apr 13, 2019
0022c90
Fix travis
rafflesandrison Apr 13, 2019
b930aa0
Fix travis checkstyle
rafflesandrison Apr 13, 2019
3857830
Merge branch 'master' into mainWindowUpdate
rafflesandrison Apr 13, 2019
d753c41
Merge pull request #7 from stanleymok/mainWindowUpdate
rafflesandrison Apr 13, 2019
01fda9f
Merge pull request #153 from rafflesandrison/master
rafflesandrison Apr 13, 2019
3e59134
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
6d1f9fc
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
28ba248
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
8dfd3c8
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
c4e5db8
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
1a606ab
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
a509731
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
81233ed
Add Coverall for coverage badge
rafflesandrison Apr 13, 2019
c8bf901
no message
PhilipPhil Apr 13, 2019
4da240c
Merge branch 'master' of https://github.com/PhilipPhil/main
PhilipPhil Apr 13, 2019
ec12b96
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
f16c040
no message
PhilipPhil Apr 13, 2019
3f2c18f
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
05cf4d4
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
8c9c97b
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
a59abcb
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
ff5a6b4
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
stanleymok Apr 13, 2019
d143722
Update UserGuide.adoc
PhilipPhil Apr 13, 2019
f88fbd5
Merge pull request #157 from rafflesandrison/master
rafflesandrison Apr 13, 2019
8bd40a1
Fix Coverall badge url
rafflesandrison Apr 13, 2019
40c6154
Update philipphil.adoc
PhilipPhil Apr 13, 2019
988a089
Reduce size of command box
stanleymok Apr 13, 2019
0ee4c14
Update UG
EugeneYiren Apr 13, 2019
ec4db82
Update UI pic. Fix #150
EugeneYiren Apr 13, 2019
5f79436
Add artist: sophia's art for front page
stanleymok Apr 13, 2019
62aec53
Refactor DG
EugeneYiren Apr 13, 2019
dec450e
Update UG #2
EugeneYiren Apr 13, 2019
74e6d0e
Fix display error
stanleymok Apr 13, 2019
842fafc
Readjust image position
stanleymok Apr 13, 2019
c8abcc1
Revamp UI design!!!! [UX]
stanleymok Apr 13, 2019
f5f2703
Fix repetition of message
stanleymok Apr 13, 2019
41a7a39
Refactor comment
stanleymok Apr 13, 2019
f1aa924
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
stanleymok Apr 13, 2019
8ba31f4
Merge branch 'UXtouchup'
stanleymok Apr 13, 2019
4731de4
Fix checkstyle
stanleymok Apr 13, 2019
3bad1ec
Mute test failure inherent in ab4
stanleymok Apr 13, 2019
fdfdc78
Merge pull request #159 from stanleymok/master
stanleymok Apr 13, 2019
8b28248
Update ppp
rafflesandrison Apr 13, 2019
75154ce
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
rafflesandrison Apr 13, 2019
7ce50a5
Merge pull request #158 from PhilipPhil/master
rafflesandrison Apr 14, 2019
2865180
Update diagrams in Developer Guide
rafflesandrison Apr 14, 2019
79ae304
Merge pull request #160 from rafflesandrison/master
rafflesandrison Apr 14, 2019
d105e90
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
EugeneYiren Apr 14, 2019
283e318
Final update of UI
EugeneYiren Apr 14, 2019
9b333e6
Merge pull request #161 from ReinSheer/master
EugeneYiren Apr 14, 2019
0feafaa
Update model diagram
stanleymok Apr 14, 2019
dfd3a56
Rename available / unavailable class to more intuitive name
stanleymok Apr 14, 2019
6e7e3d1
Fix checkstyle
stanleymok Apr 14, 2019
eb2122d
Fix checkstyle
stanleymok Apr 14, 2019
35df597
Update milestone in FM
stanleymok Apr 14, 2019
daf025c
Update command names in DG
stanleymok Apr 14, 2019
947c17c
Update commands in UG
stanleymok Apr 14, 2019
23e6048
Refactor AddressBook to FM
stanleymok Apr 14, 2019
bc1e6b8
Fix compile warning and checkstyle
stanleymok Apr 14, 2019
ec12f2f
Merge pull request #162 from stanleymok/master
stanleymok Apr 14, 2019
ee9dc1c
Fix coverall failure with non-deterministic test case
stanleymok Apr 14, 2019
b0bf121
Fix checkstyle
stanleymok Apr 14, 2019
600ad98
Merge pull request #163 from stanleymok/master
stanleymok Apr 14, 2019
8ecd9c3
Update UG
stanleymok Apr 14, 2019
2e2c05c
Add images for UG
stanleymok Apr 14, 2019
764a206
Fix dead links in DG; Update DG
stanleymok Apr 14, 2019
5da0a0f
Add images & diagrams
stanleymok Apr 14, 2019
98b9573
Update ppp; last few commits for this project ::cryingface::
stanleymok Apr 14, 2019
6a1f46e
Merge pull request #164 from stanleymok/master
stanleymok Apr 15, 2019
7e64b7b
Update ppp
rafflesandrison Apr 15, 2019
e475caf
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
rafflesandrison Apr 15, 2019
3a955b2
Add border to UI pic
EugeneYiren Apr 15, 2019
e359a5b
Add screenshot in UG
EugeneYiren Apr 15, 2019
b8df637
Update screenshot in UG
EugeneYiren Apr 15, 2019
39ad103
Fix attempt on image not showing in adoc
stanleymok Apr 15, 2019
3b0f200
Fix attempt at image not showing in adoc
stanleymok Apr 15, 2019
b0baa53
Reset image from jpg to png, capitalise path
stanleymok Apr 15, 2019
f82e55d
Fix image not showing in adoc
stanleymok Apr 15, 2019
b79028b
Update DG for stats
EugeneYiren Apr 15, 2019
42ca574
Add swap command
rafflesandrison Apr 15, 2019
d5dd1e1
Update user guide - add Swap Command
rafflesandrison Apr 15, 2019
0b3ac1a
Add Swap Command TEst
rafflesandrison Apr 15, 2019
9fa6349
Update Raffles ppp
rafflesandrison Apr 15, 2019
3a6182e
Update Raffles PPP
rafflesandrison Apr 15, 2019
f11d659
Update PPP
EugeneYiren Apr 15, 2019
a35369e
Fix checkstyle
EugeneYiren Apr 15, 2019
fbf5698
Add tags for stats in UG
EugeneYiren Apr 15, 2019
aa6616d
Last update to PPP
EugeneYiren Apr 15, 2019
359ccb6
Merge pull request #165 from stanleymok/master
EugeneYiren Apr 15, 2019
c74809b
Merge branch 'master' of https://github.com/cs2103-ay1819s2-w15-1/main
EugeneYiren Apr 15, 2019
9e39519
Merge pull request #166 from ReinSheer/master
EugeneYiren Apr 15, 2019
928c365
Add test for sort command parser
rafflesandrison Apr 15, 2019
49d2beb
Add test for swap command parser
rafflesandrison Apr 15, 2019
dd41d58
Fix checkstyle
rafflesandrison Apr 15, 2019
19ab613
Merge pull request #167 from rafflesandrison/master
rafflesandrison Apr 15, 2019
ee10ef8
Update Raffles ppp
rafflesandrison Apr 15, 2019
6a26f5a
Update Developer Guide
rafflesandrison Apr 15, 2019
02e465a
Enable to sorting in descending order.
rafflesandrison Apr 15, 2019
190fe6b
Update sort command
rafflesandrison Apr 15, 2019
7922939
Improve parse sort command for desc parameter validation
rafflesandrison Apr 15, 2019
5667981
Update SortCommandParser test
rafflesandrison Apr 15, 2019
feb5cdb
Update parse sort command test
rafflesandrison Apr 15, 2019
785d1dc
Fix checkstyle
rafflesandrison Apr 15, 2019
c8d6263
Update parse test
rafflesandrison Apr 15, 2019
45f6e53
Merge pull request #168 from rafflesandrison/master
rafflesandrison Apr 15, 2019
e5e0978
Update Developer Guide
rafflesandrison Apr 15, 2019
43ff28a
Merge pull request #169 from rafflesandrison/master
rafflesandrison Apr 15, 2019
c98d537
Update ppp
rafflesandrison Apr 15, 2019
db8bb6a
Merge pull request #170 from rafflesandrison/master
rafflesandrison Apr 15, 2019
190318a
Update DG
rafflesandrison Apr 15, 2019
3e2e24a
Update DG
rafflesandrison Apr 15, 2019
977c199
Fix checkstyle
rafflesandrison Apr 15, 2019
fedb4a5
Merge pull request #171 from rafflesandrison/master
rafflesandrison Apr 15, 2019
3460e87
Fix format error on UG adoc
stanleymok Apr 15, 2019
4f0dcc3
Merge pull request #172 from stanleymok/master
EugeneYiren Apr 15, 2019
22f613d
UG formatting
EugeneYiren Apr 15, 2019
2a98eb0
Merge pull request #173 from ReinSheer/master
EugeneYiren Apr 15, 2019
a91cb55
Update DG
rafflesandrison Apr 15, 2019
25fcd62
Update PPP
rafflesandrison Apr 15, 2019
684b3dd
Update PPP
rafflesandrison Apr 15, 2019
0029d93
Update PPP
rafflesandrison Apr 15, 2019
8d66fb9
Merge pull request #174 from rafflesandrison/master
rafflesandrison Apr 15, 2019
8505fbb
Update PPP
rafflesandrison Apr 15, 2019
77329ae
Merge pull request #175 from rafflesandrison/master
rafflesandrison Apr 15, 2019
b40eba0
Fix ppp
stanleymok Apr 15, 2019
36c5342
Fix ppp
stanleymok Apr 15, 2019
ad44785
Merge pull request #176 from stanleymok/master
stanleymok Apr 17, 2019
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ lib/*
*.csv
config.json
src/test/data/sandbox/
fashionmatch.json
preferences.json
.DS_Store
./screenshot*.png
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ Permission is hereby granted, free of charge, to any person 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 apparels 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
31 changes: 17 additions & 14 deletions README.adoc
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
= Address Book (Level 4)
= Fashion Match
ifdef::env-github,env-browser[:relfileprefix: docs/]

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


ifdef::env-github[]
image::docs/images/Ui.png[width="600"]
Expand All @@ -14,26 +13,30 @@ ifndef::env-github[]
image::images/Ui.png[width="600"]
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.
* What's different from https://github.com/se-edu/addressbook-level3[level 3]:
** A more sophisticated GUI that includes a list panel and an in-built Browser.
** More test cases, including automated GUI testing.
** Support for _Build Automation_ using Gradle and for _Continuous Integration_ using Travis CI.
* This is a desktop Fashion Match application. It has a GUI but most of the user interactions happen using a CLI (Command Line Interface).

== Site Map

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

== Acknowledgements
== Target Users
* People who wants to have an easy solution for matching of everyday apparels.
* People who does not want to spend too much time thinking about whether his choice of outfit actually matches correctly.
* People who want to know the alternative matching combination to his current choice of base apparel.

== Why You Should Totally Use This
* Lower the risk of being **unfashionable**.
* Recommendation of matching apparels with just a few commands given.
* Use the time spent for planning of matching apparels on something more productive.
* When you look good, you feel good.

== Acknowledgements
* 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://github.com/TestFX/TestFX[TextFX], https://github.com/FasterXML/jackson[Jackson], https://github.com/google/guava[Guava], https://github.com/junit-team/junit5[JUnit5]
* This project is modification of https://github.com/se-edu/addressbook-level4[AddressBook-Level4 project] created by SE-EDU initiative at https://github.com/se-edu/

== Licence : link:LICENSE[MIT]
25 changes: 25 additions & 0 deletions _reposense/config.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
"authors":
[
{
"githubId": "PhilipPhil",
"displayName": "GAR...LIP",
"authorNames": ["PhilipPhil","Philip Garabandic"]
},
{
"githubId": "rafflesandrison",
"displayName": "RAF...SON",
"authorNames": ["rafflesandrison"]
},
{
"githubId": "stanleymok",
"displayName": "STA...UAN",
"authorNames": ["stanleymok"]
},
{
"githubId": "ReinSheer",
"displayName": "TAN...ENE",
"authorNames": ["ReinSheer"]
}
]
}
8 changes: 4 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ dependencies {
}

shadowJar {
archiveName = 'addressbook.jar'
archiveName = 'fashionmatch.jar'

destinationDir = file("${buildDir}/jar/")
}
Expand Down Expand Up @@ -202,9 +202,9 @@ asciidoctor {
idprefix: '', // for compatibility with GitHub preview
idseparator: '-',
'site-root': "${sourceDir}", // must be the same as sourceDir, do not modify
'site-name': 'AddressBook-Level4',
'site-githuburl': 'https://github.com/se-edu/addressbook-level4',
'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
'site-name': 'Fashion Match',
'site-githuburl': 'https://github.com/cs2103-ay1819s2-w15-1/main',
//'site-seedu': true, // delete this line if your project is not a fork (not a SE-EDU project)
]

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

AddressBook - Level 4 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.}_ +
{empty} +
We are a team based in the http://www.comp.nus.edu.sg[School of Computing, National University of Singapore].
Fashion Match was developed by the https://github.com/orgs/CS2103-AY1819S2-W15-1/teams/developers team.

== 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>>]
=== Raffles Andrison
image::rafflesandrison.png[width="150", align="left"]
{empty}[http://github.com/rafflesandrison[github]][<<rafflesandrison#,portfolio>>]

Role: Project Advisor
Role: Developer

'''

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

Role: Team Lead +
Responsibilities: UI
* Setting up of team environment
* Quality check on all pull request submitted.
* Fous on Storage Component
* Working on **Data Organisation Methods** which makes the `list` feature
more robust by allowing it to process multiple options.

'''

=== Johnny Doe
image::yijinl.jpg[width="150", align="left"]
{empty}[http://github.com/yijinl[github]] [<<johndoe#, portfolio>>]
=== Philip Garabandic
image::philipphil.png[width="150", align="left"]
{empty}[https://github.com/PhilipPhil[github]][<<philipphil#,portfolio>>]

Role: Developer

Responsibilities:

Role: Developer +
Responsibilities: Data
* Focus on Logic Component
* Working on **Recommendation Algorithms Methods**

'''

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

Role: Developer +
Responsibilities: Dev Ops + Threading
Role: Developer

Responsibilities:

* Focus on UI Component
* Working on **Infrastructure Management Methods**

'''

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

Role: Developer

Responsibilities:

Role: Developer +
Responsibilities: UI
* Focus on Model Component
* Working on **Profiling Statistical Methods**

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

* *Bug reports, Suggestions* : Post in our https://github.com/se-edu/addressbook-level4/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`
* *Bug reports, Suggestions* : Post in our https://github.com/cs2103-ay1819s2-w15-1/main/issues if you noticed bugs or have suggestions on how to improve.
Loading