Merge pull request #176 from AY2324S2-CS2103T-W12-3/release-v1.3-ug

Update UG and Ui.png for release v1.3
AY2324S2-CS2103T-W12-3 · Apr 4, 2024 · 6c6d564 · 6c6d564
2 parents 86b2cb6 + 79aafd1
commit 6c6d564
Show file tree

Hide file tree

Showing 24 changed files with 448 additions and 110 deletions.
diff --git a/docs/UserGuide.md b/docs/UserGuide.md
diff --git a/docs/images/Ui.png b/docs/images/Ui.png
diff --git a/docs/images/example-add-after-fail.png b/docs/images/example-add-after-fail.png
diff --git a/docs/images/example-add-after.png b/docs/images/example-add-after.png
diff --git a/docs/images/example-add-before.png b/docs/images/example-add-before.png
diff --git a/docs/images/navigating-gui.PNG b/docs/images/navigating-gui.PNG
diff --git a/docs/images/setup-1.png b/docs/images/setup-1.png
diff --git a/docs/images/setup-2.png b/docs/images/setup-2.png
diff --git a/docs/images/setup-3.png b/docs/images/setup-3.png
diff --git a/docs/images/setup-4.png b/docs/images/setup-4.png
diff --git a/docs/images/tutorial-add-1.PNG b/docs/images/tutorial-add-1.PNG
diff --git a/docs/images/tutorial-add-2.PNG b/docs/images/tutorial-add-2.PNG
diff --git a/docs/images/tutorial-add-3.PNG b/docs/images/tutorial-add-3.PNG
diff --git a/docs/images/tutorial-edit-1.PNG b/docs/images/tutorial-edit-1.PNG
diff --git a/docs/images/tutorial-edit-2.PNG b/docs/images/tutorial-edit-2.PNG
diff --git a/docs/images/tutorial-edit-3.PNG b/docs/images/tutorial-edit-3.PNG
diff --git a/docs/images/tutorial-editA-1.PNG b/docs/images/tutorial-editA-1.PNG
diff --git a/docs/images/tutorial-editA-2.PNG b/docs/images/tutorial-editA-2.PNG
diff --git a/docs/images/tutorial-find-1.PNG b/docs/images/tutorial-find-1.PNG
diff --git a/docs/images/tutorial-find-2.PNG b/docs/images/tutorial-find-2.PNG
diff --git a/docs/stylesheets/main.css b/docs/stylesheets/main.css
@@ -156,9 +156,6 @@ mark {
   .btn {
       font-size: 0.65rem !important;
   }
-  img {
-      zoom: 0.8;  /* might not work on some browsers */
-  }
 }
 
 h1,

diff --git a/src/main/java/seedu/address/model/person/fields/Phone.java b/src/main/java/seedu/address/model/person/fields/Phone.java
@@ -12,9 +12,9 @@
 public class Phone implements Field {
 
     public static final Prefix PREFIX_PHONE = new Prefix("p\\");
-    private static final String MESSAGE_CONSTRAINTS =
-            "Phone numbers should only contain numbers, and it should be at least 3 digits long";
-    private static final String VALIDATION_REGEX = "\\d{3,}";
+    private static final String MESSAGE_CONSTRAINTS = "Phone numbers should only contain numbers,"
+            + "'+', '-', ',' and spaces, and it should be at least 3 characters long";
+    private static final String VALIDATION_REGEX = "[\\d\\-\\s+,]{3,}";
     private final String phone;
 
     /**

diff --git a/src/main/java/seedu/address/model/tag/Tag.java b/src/main/java/seedu/address/model/tag/Tag.java
@@ -11,7 +11,8 @@
  */
 public class Tag {
 
-    private static final String MESSAGE_CONSTRAINTS = "Tags cannot contain '\\', and should not be blank";
+    private static final String MESSAGE_CONSTRAINTS = "Tags cannot contain '\\', can only consist of"
+            + "alphabets and numbers, and should not be blank";
     private static final String VALIDATION_REGEX = "\\p{Alnum}+";
 
     private final String tagName;

diff --git a/src/test/java/seedu/address/model/person/fields/PhoneTest.java b/src/test/java/seedu/address/model/person/fields/PhoneTest.java
@@ -11,8 +11,8 @@
 public class PhoneTest {
 
     private static final String WHITESPACE = " \t\r\n";
-    private static final String INVALID_PHONE = "+651234";
-    private static final String VALID_PHONE = "123456";
+    private static final String INVALID_PHONE = "+6512345678 (home)";
+    private static final String VALID_PHONE = "+65 1234 5678, +98-4321-5432-42";
 
     @Test
     public void constructor_null_throwsNullPointerException() {
@@ -26,7 +26,8 @@ public void constructor_invalidPhone_throwsIllegalArgumentException() {
         assertThrows(IllegalArgumentException.class, () -> new Phone("91")); // less than 3 numbers
         assertThrows(IllegalArgumentException.class, () -> new Phone("phone")); // non-numeric
         assertThrows(IllegalArgumentException.class, () -> new Phone("9011p041")); // alphabets within digits
-        assertThrows(IllegalArgumentException.class, () -> new Phone("9312 1534")); // spaces within digits
+        assertThrows(IllegalArgumentException.class, () -> new Phone("9312_1534")); // underscore within digits
+        assertThrows(IllegalArgumentException.class, () -> new Phone("93121534(home), 94387573(office)")); // brackets
     }
 
     @Test