Skip to content

Commit

Permalink
Merge pull request #203 from bennchong/master
Browse files Browse the repository at this point in the history
Raised Issues
  • Loading branch information
nianfei97 committed Nov 12, 2018
2 parents e597821 + 635490c commit 35e7890
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 18 deletions.
6 changes: 3 additions & 3 deletions docs/DeveloperGuide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -551,7 +551,7 @@ thrown with the relevant message to the user.
.Interactions between the UI Component and Security Component for the login Command
image::SecurityLoginSequenceDiagram.png[width="800"]

The figure above shows the steps when login is called after Figure 19 has completed (since login is a command too).
The figure above shows the steps when login is called after parsing the command (since login is a command too).

AppUsers contains an array of
AccountCredentials, which has the attribute of Username and Password, and methods such isPasswordValid(). Here it also
Expand Down Expand Up @@ -1052,7 +1052,7 @@ These instructions only provide a starting point for testers to work on; testers

. Logging in with a test account

.. Test case: `login u\test pw\test` +
.. Test case: `login u/test pw/test` +
Expected: The login is successful and the main GUI appears. The `Me` panel should show a person card panel with `test` in the name field.

. Registering a new account
Expand All @@ -1076,7 +1076,7 @@ All following sections assume that the user is currently logged into FreeTime.

. Editing your details

.. Test case: `edit p/91234567 e/johndoe@example.com t/CS2101` +
.. Test case: `edit p/91234567 e/johndoe@example.com g/CS2101` +
Expected: The details of the user in the `Me` panel is updated to specified details.

. Showing command history
Expand Down
2 changes: 1 addition & 1 deletion docs/UserGuide.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ CAUTION: You are required to to enter a password that contains more or equal to
To ensure that your account is well-protected, do use a password that is not common.

=== Registering: `register` (`re`)
Command: `register u/[Username] pw/[Password] e/[Email] p/[MobilePhone] a/[Address]`
Command: `register u/USERNAME pw/PASSWORD e/[EMAIL] p/[MOBILEPHONE] a/[ADDRESS]`

Examples:

Expand Down
Binary file modified docs/images/LoginUI.png
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/RegisterUI.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 0 additions & 3 deletions docs/team/bennchong.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ Thus you are freed from the pains of finding a common free slot in huge groups.
== Summary of contributions
In this section, I would be briefly telling you about my contributions to this project, and any interesting points that you could find useful.


GIVE THE REASON WHY. USE LONGER SENTENCE BELOW

* *Major enhancement*: Added *the ability to authenticate users* within _FreeTime_
** What it does: Allows the users to have unique access and control to his own timetable
** Justification: To be able to prevent others from editing your own timetable, and to facilitate different privacy levels.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import seedu.address.security.SecurityAuthenticationException;

/**
* Lists all persons in the address book to the user.
* Logout the user
*/
public class LogoutCommand extends Command {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,15 +31,15 @@ public class RegisterCommand extends Command {
+ PREFIX_ADDRESS + "ADDRESS "
+ "[" + PREFIX_TAG + "TAG]...\n"
+ "Example: " + COMMAND_WORD + " "
+ PREFIX_USERNAME + "John Doe "
+ PREFIX_USERNAME + "John Goe "
+ PREFIX_PASSWORD + "testpassword "
+ PREFIX_PHONE + "98765432 "
+ PREFIX_EMAIL + "johnd@example.com "
+ PREFIX_ADDRESS + "311, Clementi Ave 2, #02-25 "
+ PREFIX_TAG + "CS2113T ";

public static final String MESSAGE_SUCCESS = "New person registered: %1$s";
public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in the address book";
public static final String MESSAGE_DUPLICATE_PERSON = "This person already exists in FreeTime";

private final Person toAdd;
private final String password;
Expand Down
10 changes: 4 additions & 6 deletions src/main/java/seedu/address/logic/parser/AddressBookParser.java
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import seedu.address.logic.commands.UndoCommand;
import seedu.address.logic.commands.UnfriendCommand;
import seedu.address.logic.parser.exceptions.ParseException;
import seedu.address.security.SecurityAuthenticationException;

/**
* Parses user input.
Expand Down Expand Up @@ -70,12 +69,11 @@ public CommandsEnum parseCommand(String userInput) throws ParseException {
}

/**
* //TODO
* @return
* @throws ParseException
* @throws SecurityAuthenticationException
* Parses the arguments
* @return the command to be executed
* @throws ParseException when arguments are not valid
*/
public Command parseCommandArguments() throws ParseException, SecurityAuthenticationException {
public Command parseCommandArguments() throws ParseException {

switch (commandWord) {
case RegisterCommand.COMMAND_WORD:
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/seedu/address/model/ModelManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ public TimeTable getTimeTable() {

/** Raises an event to indicate the model has changed */
private void indicateAddressBookChanged() {
//TODO Check whether this actually works when modifying your own data.
if (user != null) {
matchUserToPerson(user.getName().toString());
}
Expand Down Expand Up @@ -268,7 +267,6 @@ public void clearUser() {

@Override
public User getUser() {
//TODO Can you do this? Must you create a new object to be returned instead?
return this.user;
}

Expand Down

0 comments on commit 35e7890

Please sign in to comment.