Skip to content

Commit

Permalink
Merge upstream/master into pr_239
Browse files Browse the repository at this point in the history
  • Loading branch information
dillontkh committed Apr 4, 2024
2 parents 41d0cb5 + 76a63fd commit 77244e9
Show file tree
Hide file tree
Showing 9 changed files with 9 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[![CI Status](https://github.com/se-edu/addressbook-level3/workflows/Java%20CI/badge.svg)](https://github.com/AY2324S2-CS2103T-T17-3/tp/actions)

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

# FitBook
FitBook is an easy-to-use address book that is geared towards personal trainers.
Expand Down
13 changes: 6 additions & 7 deletions docs/UserGuide.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ With FitBook, you can:

* **Seamlessly save clients as contacts on your phone using QR codes**
* **Store personalized notes for each client**
* **Keep track of your clients' fitness journey** (_Work in progress_)
* **Keep track of your clients' weight**

_All in one app!_

Expand Down Expand Up @@ -83,7 +83,7 @@ Java is a versatile programming language used for developing various application

1. A GUI similar to the one depicted below should appear in a few seconds. The app contains some sample data for you to familiarize yourself with the UI.<br>

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

1. Read through `help`, type any command listed into the input box and press `enter` <br>
These are some example commands you can try!
Expand Down Expand Up @@ -137,7 +137,7 @@ Format: `help`

<hr>

### Adding a client: `add`
### Adding a client : `add`

Adds a client to the FitBook.

Expand All @@ -150,6 +150,7 @@ A client can have 0 or more tags.
Examples:
* `add n/John Doe p/98765432 e/[email protected] a/John street, block 123, #01-01 nt/john from school`
* `add n/Betsy Crowe t/friend e/[email protected] a/Newgate Prison p/1234567 nt/likes donuts t/criminal`

<hr>

### Listing all clients : `list`
Expand Down Expand Up @@ -259,7 +260,7 @@ Examples:
* `weight 1 90` - Adds a new weight value of 90 to the client at index 1.
* `weight 2` - Deletes the latest weight value of the client at index 2.

### Searching clients: `find`
### Searching clients : `find`

Finds all clients that match the specified attributes.

Expand All @@ -282,9 +283,7 @@ Format: `find [n/NAME] [p/PHONE] [e/EMAIL] [a/ADDRESS] [w/RANGE] [h/RANGE] [nt/N

Examples:
* `find n/Wendy` returns `Wendy Son` and `Wendy Kim`
![result for 'find n/Wendy'](images/FindNameMultiple.png)
* `find n/Wendy t/Lover` returns `Wendy` (`Name` contains `Wendy` and is tagged with `Lover`)
![result for 'find n/Wendy t/Lover'](images/FindNameTag.png)

<hr>

Expand Down Expand Up @@ -327,7 +326,7 @@ Format: `exit`

### Saving the data

FitBook data is saved in the hard disk automatically after any command that changes the data.
FitBook data is saved to your hard disk automatically after any command that changes the data.
There is no need to save manually.

<hr>
Expand Down
Binary file modified docs/images/QRContact.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/QrCodeContactCard.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/UGUI.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/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 modified docs/images/helpMessage.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/main/resources/view/MainWindow.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
</padding>
</StackPane>

<StackPane fx:id="resultDisplayPlaceholder" maxHeight="120" minHeight="120" prefHeight="120" styleClass="pane-with-border" VBox.vgrow="NEVER">
<StackPane fx:id="resultDisplayPlaceholder" maxHeight="130" minHeight="130" prefHeight="130" styleClass="pane-with-border" VBox.vgrow="NEVER">
<padding>
<Insets bottom="5" left="10" right="10" top="5" />
</padding>
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/view/PersonDetailsPanel.fxml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@

<ScrollPane fx:id="detailsScrollPane" fitToHeight="true" fitToWidth="true" style="-fx-background:transparent; -fx-background-color: transparent;" xmlns="http://javafx.com/javafx/21" xmlns:fx="http://javafx.com/fxml/1">
<VBox fx:id="detailsPane" visible="false">
<GridPane alignment="TOP_CENTER" maxHeight="150.0" VBox.vgrow="ALWAYS">
<GridPane alignment="TOP_CENTER" maxHeight="180.0" VBox.vgrow="ALWAYS">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" minWidth="200.0" prefWidth="150" />
<ColumnConstraints hgrow="NEVER" />
Expand Down

0 comments on commit 77244e9

Please sign in to comment.