Merge branch 'main' into 'rlyons8_staff_page'

# Conflicts:
#   Staff.java

Products.java

@@ -13,6 +13,16 @@ public class Products { /* a good class, but not as good as cse391 */
 
     
 
+    public Product smayanProduct() {
+        return new Product(
+                "Dollar Bill",
+                "one dollar in cash",
+                "dollar_bill.jpg",
+                "Image of a one-dollar bill",
+                1.00
+                );
+    }
+
     public Product benoreProduct() {
 	    return new Product(
 			    "Taylor Swift - Folklore Vinyl",
@@ -23,7 +33,27 @@ public class Products { /* a good class, but not as good as cse391 */
 			    );
     }
 
+    public Product ekimji1Product() {
+	return new Product(
+		    "Gudetama",
+	    	"perfect",
+		    "gudetama.jpg",
+		    "Lazy egg",
+		    1000.0
+		    );
+
+    }
 
+       public Product bohanz04Product() {
+            return new Product(
+                            "CSE351 hw problem",
+                            "A confusing problem faced",
+                            "test2.jpg",
+                            "image of that problem",
+                            1.00
+                            );
+    }
+ 
     public Product kevinh33Product() {
 	    return new Product(
 			    "Duolingo owl",
@@ -797,4 +827,33 @@ public class Products { /* a good class, but not as good as cse391 */
 		1000.0
 	);
     }
+    public Product aagateProduct() {
+    	return new Product(
+		"Meta quest",
+		"a virtual reality headset",
+		"metaquest.jpg",
+		"A meta quest 3 on Amazon",
+		9.00
+	);
+    }
+
+	public Product acuraIntegra() {
+        return new Product (
+            "Acura Integra",
+            "Acura Integra",
+            "acura.jpg",
+            "Acura Integra",
+			52400
+		);
+	}
+	
+    public Product shangy24Product() {
+        return new Product(
+            "Windows 10 Pro",
+            "An operating system made by Microsoft",
+            "win10.jpg",
+            "Windows 10 Default Wallpaper",
+            199.99
+        );
+    }
 }

Staff.java

 public class Staff {
 
+
+    public Employee smayan(){
+           return new Employee(
+                           "Smayan Nirantare",
+                           "CS Student",
+                           "I'm hungry",
+                           "travis_scott.jpg",
+                           "Travis Scott"
+                           );
+   }
+
+
    public Employee boschen() {
    	return new Employee(
 		"Boshan Chen",
@@ -9,7 +21,15 @@ public class Staff {
 		"umm.."
 	);
    }
-
+   public Employee ekimji() {
+	   return new Employee(
+		"Esther",
+		"student",
+		"local point demon",
+		"gudetama.jpg",
+		"gudetama with balloon"
+	);
+   }
 	
    public Employee benore() {
 	   return new Employee("Ben",
@@ -20,6 +40,16 @@ public class Staff {
    }
 	
 
+   public Employee bohanz04() {
+        return new Employee(
+	    "Bryan Zhao",
+	    "Student",
+	    "abcdefg stuff",
+	    "test1.jpg",
+	    "hope to get internship"
+	);
+   }	   
+
    public Employee cuperido() {
        return new Employee(
            "Young You",
@@ -817,17 +847,34 @@ public class Staff {
                 "celsius picture"
         );    
     }
-
-    public Employee rlyons8() {
-	    return new Employee(
-			    "Rayana",
-			    "Student",
-			    "Cat mom"
-			    "animegeek.jpeg",
-			    "Black anime girl"
-			    )
+    public Employee aagate() {
+    	return new Employee(
+	    "Arohan",
+	    "Student",
+	    "doing homework",
+	    "sloth.jpg",
+	    "picture of a sloth"
+	);
     }
-}
 
+    public Employee kristong() {
+        return new Employee (
+            "Kris",
+            "Student",
+            "Hello",
+            "boy.jp",
+            "🙏"
+        );
+    }
 
+    public Employee shangy24() {
+        return new Employee(
+            "Shangzhen Yang",
+            "Student",
+            "Hello, World!",
+            "your-name.jpg",
+            "Wallpaper of Movie Your Name"
+        );
+    }
+}