Merge sjeyte into main

Products.java

 /* check out these products! */
 public class Products { /* a good class, but not as good as cse391 */
     
+    public Product kevinh33Product() {
+	    return new Product(
+			    "Duolingo owl",
+			    "He's super angry",
+			    "duo_angry.jpg",
+			    "His anger levels rising",
+			    150.00
+			    );
+    }
+	
+    public Product acsparksProduct() {
+    	return new Product(
+		"Free Beans",
+		"A bunch of free, loose beans",
+		"beans.jpg",
+		"Image of free beans",
+		1.99
+		);
+    }
+
+    public Product cuperidoProduct() {
+	return new Product( 	
+	    "Pillow",
+	    "Pillow to make you sleep better",
+            "pillow.jpg",
+            "Image of the pillow",
+            19.99	    
+	);
+    }	    
+
     public Product ctsai7Product() {
 	return new Product(
 		"G. Loomis GLX Casting Rod",
@@ -30,6 +60,7 @@ public class Products { /* a good class, but not as good as cse391 */
 	    105.97
 	);
     }	    
+
     public Product joshjyinProduct() {
         return new Product(
             "Dub Hub",
@@ -39,6 +70,7 @@ public class Products { /* a good class, but not as good as cse391 */
             99999999999.99
         );
     }
+
     public Product kevluoyrsProduct() {
         return new Product(
             "Blindr",
@@ -48,6 +80,7 @@ public class Products { /* a good class, but not as good as cse391 */
             99999999999.99
         );
     }
+
     public Product evanlousProduct() {
     	return new Product(
 	    "Dorito Piece",
@@ -193,6 +226,17 @@ public class Products { /* a good class, but not as good as cse391 */
             10000
         );
     }
+
+    public Product hmanthaProduct() {
+	return new Product(
+		"Murakami Rug",
+		"Rainbow flower rug",
+		"murakami.jpeg",
+		"Rainbow flower rug",
+		699.99
+		);
+    }
+
 	
     public Product raosProduct() {
 	return new Product(
@@ -558,6 +602,7 @@ public class Products { /* a good class, but not as good as cse391 */
 		"Picture of coffee",
 		4.99
 	);
+
     }
 
 	public Product samsharProduct() {
@@ -617,4 +662,77 @@ public class Products { /* a good class, but not as good as cse391 */
                 449.00
 	);
     }
+
+
+    public Product ggsmadhuProduct() {
+        return new Product(
+            "Coca Cola",
+            "Best soft drink",
+            "coke.jpeg",
+            "Coca Cola can",
+            1.50
+        );
+    }
+    public Product chetan7() {
+            return new Product(
+                "Porche 911",
+                "Best car ever made",
+                "911.jpg",
+                "A porche 911",
+                114000.00
+            );
+    
+    }
+
+    public Product sgodse() {
+
+	    return new Product(
+		"Lindt Chocolate", 
+		"Rich, tasty chocolate",
+		"lindt.jpg",
+		"Picture of a lindt milk chocolate package",
+		2.00
+	);
+
+	        }
+
+    public Product sprofit() {
+	return new Product(
+	    "Baseball Glove",
+	    "Premium leather baseball glove",
+	    "BaseballGlove.jpeg",
+	    "Picture of a Rawlings baseball glove",
+	    399.99
+	);
+    }
+
+    public Product Infinite() {
+    	return new Product(
+		"INFINITY******************************************************************************************************",
+		"Pay for the whole infinity, use the whole infinity! $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+		"winfinite.png",
+		"Depicted is the strongest UW CSE Sorcerer when presented with the King of Merge Conflicts. The strongest Sorcerer humbly assures the world by stating \"Nah, I'd win\"",
+		01
+	);
+    }
+
+    public Product jsun16() {
+            return new Product(
+                            "Massager Heating Pad for Neck and Shoulder",
+                            "Suitable for people to release muscle tension and promote blood flow.",
+                            "Neck_Shoulder_Heating_Pad.jpeg",
+                            "Electric Heating Pad for Neck and Shoulder",
+			    68.00
+                            );
+    }
+    public Product azitabProduct() {
+	return new Product(
+		"Cinnamon Roll Plushie", 
+		"Giant Cinnamon Roll Plushie", 
+		"cinnamonroll.jpg", 
+		"Picture of Cinnamon Roll Plushie",
+	        500.00
+	);
+
+    }
 }

Staff.java

 public class Staff {
 	
+   public Employee cuperido() {
+       return new Employee(
+           "Young You",
+           "Dreamer",
+           "Sleep required",
+           "dreamer.jpg",
+           "zzz.. zzz.."
+       );
+   }
+
+   public Employee acsparks() {
+	   return new Employee(
+		"Aiden Sparks",
+		"Student",
+		"Stuck in the Allen basement",
+		"beans.jpg",
+		"bean texture"
+		);
+   }
+
    public Employee ctsai7() {
 	   return new Employee(
 	   	"Calvin Tsai",
@@ -49,6 +69,16 @@ public class Staff {
        );
     }
 
+    public Employee kevinh33() {
+	return new Employee(
+	    "Kevin Hernandez",
+	    "Student",
+	    "Loves pets",
+	    "silly_dino.png",
+	    "My silly cat"
+	);
+    } 
+
     public Employee evanlou() {
     	return new Employee(
 	    "Evan Lou",
@@ -611,6 +641,18 @@ public class Staff {
 	);
     }
 
+
+    public Employee hmantha(){
+        return new Employee(
+            "Hitesh",
+            "Student",
+            "I want a Porsche 911",
+            "porsche.png",
+            "Porsche 911"
+        );
+    }
+
+
     public Employee samshar() {
             return new Employee(
                 "Sami",
@@ -641,6 +683,7 @@ public class Staff {
         );
     }
 
+<<<<<<< HEAD
     public Employee sjeyte() {
 	    return new Employee(
 		"Sulyman",
@@ -651,5 +694,74 @@ public class Staff {
 	);
     }
     
+=======
+     public Employee ggsmadhu(){
+    	    return new Employee(
+		"Madhumitha",
+	       	"Student",
+	       	"Working",
+	       	"mountsi.jpeg",
+	       	"Mount Si"
+	);
+     }
+    public Employee chetan7() {
+            return new Employee(
+                "Chetan",
+                "Student",
+                "Switching to Info",
+                "gojo.jpg",
+                "nah id win"
+        );
+    }
+
+    public Employee sgodse() {
+	    return new Employee(
+	        "Shivani",
+		"Student",
+		"CS Student", 
+		"coffee.jpg",
+		"picture of a coffee"
+		); 
+    }
+
+    public Employee sprofit() {
+	return new Employee(
+	    "Sam",
+	    "Student",
+	    "EE Student",
+	    "TimLIncecum.jpeg",
+	    "Picture of my favorite pitcher"
+        );
+    }
+
+    public Employee nwli() {
+    	return new Employee(
+		"Nathan Li",
+		"LIMIT_BREAKERwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwwww",
+		"rise with the sun, dream with the moon, shine with the stars~",
+		"wide.jpg",
+		"Nathan Li, but widened 19x thanks to one of his closest friends"
+	);
+    }
+
+    public Employee jsun16() {
+        return new Employee(
+            "Jessie",
+            "Student",
+            "Want to minor in Spanish",
+            "Solana_Beach_bluffs.jpeg",
+            "Picture of Solana Beach, San Diego"
+        );
+    }
+    public Employee azitab() {
+	return new Employee(
+		"Azita", 
+		"Student", 
+		"I'm Eating Chocolate Chips", 
+		"hellokitty.jpg",
+		"Hello Kitty"
+	);
+    }
+>>>>>>> origin/main
 }