Skip to content

Commit

Permalink
Merge pull request #108 from AY2324S1-CS2103T-T10-2/docs/v1.3-ug
Browse files Browse the repository at this point in the history
docs: Update v1.3 User Guide
  • Loading branch information
pra-navi authored Nov 2, 2023
2 parents a7b9721 + be86229 commit d493c54
Show file tree
Hide file tree
Showing 96 changed files with 843 additions and 285 deletions.
1,075 changes: 816 additions & 259 deletions docs/UserGuide.md

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/_sass/admonition.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ $primary-color: #eab308; // yellow-500
$primary-bgcolor: #fef9c3; // yellow-100
$admonitions:
//class (type), icon filename, icon/border color, title bg color
('note', 'pen-solid.svg', '#2563eb', '#dbeafe') // blue-600; blue-100
('note', 'pen-solid.svg', '#0ea5e9', '#e0f2fe') // sky-500; sky-100
('abstract', 'align-left-solid.svg', '#65a30d', '#ecfccb') // lime-600; lime-100
('info', 'info-circle-solid.svg', '#0ea5e9', '#e0f2fe') // sky-500; sky-100
// ('info', 'info-circle-solid.svg', '#0ea5e9', '#e0f2fe') // sky-500; sky-100
('tip', 'fire-solid.svg', '#14b8a6', '#cafdf8') // teal-500; turquoise-100?
('success', 'check-circle-solid.svg', '#059669', '#d1fae5') // emerald-600; emerald-100
('question', 'question-circle-solid.svg', '#4f46e5', '#e0e7ff') // indigo-600; indigo-100
Expand Down
Binary file modified docs/images/Ui.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/images/addPerson_success.png
Binary file not shown.
Binary file removed docs/images/deleteAllPerson_success.png
Binary file not shown.
Binary file removed docs/images/editPerson_success.png
Binary file not shown.
Binary file modified docs/images/error/addPerson_error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/addTagPerson_error_noInput.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/addTagPerson_error_prefix.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/addTagTask_error_noInput.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/addTagTask_error_noParam.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/addTagTask_error_prefix.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/addTagTask_error_validIndex.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/error/addTask_error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/deleteAllDone_error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/images/error/deletePerson_error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/deletePerson_wrongIndex.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/images/error/deleteTask_error.png
Binary file removed docs/images/error/deleteTask_error1.png
Diff not rendered.
Binary file added docs/images/error/deleteTask_wrongIndex.png
Binary file modified docs/images/error/editPerson_error.png
Binary file added docs/images/error/editPerson_missingFields.png
Binary file modified docs/images/error/editPerson_wrongIndex.png
Binary file modified docs/images/error/editTask_error.png
Binary file added docs/images/error/findAllTag_error.png
Binary file modified docs/images/error/findPerson_error.png
Binary file added docs/images/error/findTag_error.png
Binary file modified docs/images/error/findTask_error.png
Binary file modified docs/images/error/markTask_error.png
Binary file added docs/images/error/markTask_wrongIndex.png
Binary file modified docs/images/error/unmarkTask_error.png
Binary file added docs/images/error/unmarkTask_wrongIndex.png
Binary file removed docs/images/findPerson_success.png
Diff not rendered.
Binary file removed docs/images/findPerson_success_zeroResults.png
Diff not rendered.
Binary file removed docs/images/listPerson_success.png
Diff not rendered.
Binary file added docs/images/output/addPerson_success.png
Binary file added docs/images/output/addTagPerson_success.png
Binary file added docs/images/output/addTagTask_success.png
Binary file removed docs/images/output/addTask_success.png
Diff not rendered.
Binary file added docs/images/output/addTask_success1.png
Binary file added docs/images/output/addTask_success2.png
Binary file added docs/images/output/deleteAllDone_success.png
Binary file added docs/images/output/deleteAllPerson_success.png
Binary file modified docs/images/output/deleteAllTask_success.png
Binary file modified docs/images/output/deletePerson_success.png
Binary file added docs/images/output/deleteTagPerson_success.png
Binary file added docs/images/output/deleteTagTask_success.png
Binary file added docs/images/output/deleteTask_success.png
Binary file removed docs/images/output/deleteTask_success1.png
Diff not rendered.
Binary file modified docs/images/output/editPerson_success.png
Binary file modified docs/images/output/editTask_success1.png
Binary file modified docs/images/output/editTask_success2.png
Binary file added docs/images/output/findAllTag_success1.png
Binary file added docs/images/output/findAllTag_success2.png
Binary file added docs/images/output/findDone_noResults.png
Binary file added docs/images/output/findDone_success.png
Binary file added docs/images/output/findNotDone_noResults.png
Binary file added docs/images/output/findNotDone_success.png
Binary file modified docs/images/output/findPerson_noResults.png
Binary file modified docs/images/output/findPerson_success.png
Binary file added docs/images/output/findTag_success1.png
Binary file added docs/images/output/findTag_success2.png
Binary file modified docs/images/output/findTask_noResults.png
Binary file modified docs/images/output/findTask_success.png
Binary file modified docs/images/output/help_success.png
Binary file added docs/images/output/listAll_success.png
Binary file added docs/images/output/listPerson_success.png
Binary file added docs/images/output/listTag_success.png
Binary file modified docs/images/output/listTask_success.png
Binary file modified docs/images/output/markTask_success.png
Binary file modified docs/images/output/unmarkTask_success.png
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ public class AddPersonCommand extends Command {
+ PREFIX_PHONE + "98765432 "
+ PREFIX_EMAIL + "[email protected] "
+ PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
+ PREFIX_TAG + "friends "
+ PREFIX_TAG + "owesMoney";
+ PREFIX_TAG + "Microsoft "
+ PREFIX_TAG + "guestSpeaker";

public static final String MESSAGE_SUCCESS = "New person added: %1$s";
public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ public class AddTaskCommand extends Command {
+ PREFIX_TASK_NOTE + "NOTE "
+ "[" + PREFIX_TAG + "TAG]...\n"
+ "Example: " + COMMAND_WORD + " "
+ PREFIX_TASK_TITLE + "Get flowers "
+ PREFIX_TASK_NOTE + "Wedding Anniversary "
+ PREFIX_TAG + "finance "
+ PREFIX_TAG + "class ";
+ PREFIX_TASK_TITLE + "Meeting with team "
+ PREFIX_TASK_NOTE + "Need to finalize event schedule "
+ PREFIX_TAG + "orientation "
+ PREFIX_TAG + "activities ";

public static final String MESSAGE_SUCCESS = "New task added: %1$s";
public static final String MESSAGE_DUPLICATE_TASK = "This task already exists in the address book";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@ public class EditTaskCommand extends Command {
+ "[" + PREFIX_TASK_TITLE + "TITLE] "
+ "[" + PREFIX_TASK_NOTE + "NOTE] "
+ "[" + PREFIX_TAG + "TAG]...\n"
+ "Example: " + COMMAND_WORD + " 1 "
+ PREFIX_TASK_TITLE + "Prepare Agenda "
+ "Example: " + COMMAND_WORD + " 2 "
+ PREFIX_TASK_TITLE + "Discuss Agenda and Budget "
+ PREFIX_TASK_NOTE + "To book venue";

public static final String MESSAGE_EDIT_TASK_SUCCESS = "Edited Task: %1$s";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class FindPersonCommand extends Command {
+ ": Finds all persons whose names contain any of "
+ "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+ "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
+ "Example: " + COMMAND_WORD + " alice bob charlie";
+ "Example: " + COMMAND_WORD + " alex bernice charlotte";

private final NameContainsKeywordsPredicate predicate;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class FindTaskCommand extends Command {
+ ": Finds all tasks whose title or note contain any of "
+ "the specified keywords (case-insensitive) and displays them as a list with index numbers.\n"
+ "Parameters: KEYWORD [MORE_KEYWORDS]...\n"
+ "Example: " + COMMAND_WORD + " agenda budget";
+ "Example: " + COMMAND_WORD + " budget";

private final TaskContainsKeywordsPredicate predicate;

Expand Down
29 changes: 15 additions & 14 deletions src/main/java/seedu/address/model/util/SampleDataUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,29 +24,30 @@ public static Person[] getSamplePersons() {
return new Person[] {
new Person(new Name("Alex Yeoh"), new Phone("87438807"), new Email("[email protected]"),
new Address("Blk 30 Geylang Street 29, #06-40"),
getTagSet("friends")),
getTagSet("catering", "RilassisCatering")),
new Person(new Name("Bernice Yu"), new Phone("99272758"), new Email("[email protected]"),
new Address("Blk 30 Lorong 3 Serangoon Gardens, #07-18"),
getTagSet("colleagues", "friends")),
getTagSet("soundSystems", "EragonSounds")),
new Person(new Name("Charlotte Oliveiro"), new Phone("93210283"), new Email("[email protected]"),
new Address("Blk 11 Ang Mo Kio Street 74, #11-04"),
getTagSet("neighbours")),
new Person(new Name("David Li"), new Phone("91031282"), new Email("lidavid@example.com"),
new Address("Blk 436 Serangoon Gardens Street 26, #16-43"),
getTagSet("family")),
new Person(new Name("Irfan Ibrahim"), new Phone("92492021"), new Email("irfan@example.com"),
new Address("Blk 47 Tampines Street 20, #17-35"),
getTagSet("classmates")),
new Person(new Name("Roy Balakrishnan"), new Phone("92624417"), new Email("[email protected]"),
new Address("Blk 45 Aljunied Street 85, #11-31"),
getTagSet("colleagues"))
getTagSet("flowers", "CharlottesBoutique")),
new Person(new Name("Xiangs Catering"), new Phone("62840300"), new Email("sales@xiangscatering.com.sg"),
new Address("171 Kampong Ampat 02-02 KA Foodlink, 368330"),
getTagSet("378perMeal", "catering")),
new Person(new Name("EATZ"), new Phone("67890328"), new Email("sales@eatzcatering.com"),
new Address("1550 Bedok North Ave 4, #04-17, 489950"),
getTagSet("1000perMeal", "catering")),
new Person(new Name("Angels Restaurant"), new Phone("62431802"), new Email("[email protected]"),
new Address("3017 Bedok North Street 5, Singapore 486121"),
getTagSet("540perMeal", "catering"))
};
}

public static Task[] getSampleTasks() {
return new Task[] {
new Task(new Title("Find caterer"), new Note("for 221 students"), getTagSet("caterer")),
new Task(new Title("Create budget"), new Note("for CS2102"), getTagSet("finance", "class"))
new Task(new Title("Find caterer"), new Note("for 221 students in day 1 of orientation"), getTagSet(
"caterer", "orientation")),
new Task(new Title("Create budget"), new Note("for finale night"), getTagSet("finance", "orientation"))
};
}

Expand Down

0 comments on commit d493c54

Please sign in to comment.