diff --git a/.Products.java.swp b/.Products.java.swp new file mode 100644 index 0000000000000000000000000000000000000000..856f697b53a099f4ba27fe6464a3414c35874c61 Binary files /dev/null and b/.Products.java.swp differ diff --git a/Products.java b/Products.java index 072aebb483654c006f3431d81dde7b5cadbdd196..d1fd437d29028a0856b1f849482ef4cc2dc57d39 100644 --- a/Products.java +++ b/Products.java @@ -401,6 +401,17 @@ public class Products { /* a good class, but not as good as cse391 */ ); } + public Product zliu44Product(){ + return new Product ( + "Coffee mug", + "Made by pure clay and human made not by machine", + "mug.jpg", + "a good looking mug is on the table", + 25.99 + ); + } + + public Product ryrozProduct() { return new Product( "A broken computer", @@ -536,4 +547,14 @@ public class Products { /* a good class, but not as good as cse391 */ 5.99 ); } + + public Product cscs24Product() { + return new Product( + "Coffee", + "Good coffee", + "coffee.jpeg", + "Picture of coffee", + 4.99 + ); + } } diff --git a/Staff.java b/Staff.java index 442d194e26041144c87d783d34aac57030f259cf..78830ba9e2a490a257ffe76534b4878e4a779231 100644 --- a/Staff.java +++ b/Staff.java @@ -430,6 +430,16 @@ public class Staff { "Sun setting behind ocean" ); } + + public Employee zliu44(){ + return new Employee( + "Leo Liu", + "Student", + "I am a music producer", + "yoyo.jpg", + "favorite rapper" + ); + } public Employee ryroz() { return new Employee( @@ -568,4 +578,14 @@ public class Staff { "Picture of women playing volleyball" ); } + + public Employee cscs24() { + return new Employee( + "Chaitanya", + "Student", + "On the grind", + "ocean.jpg", + "Picture of the ocean" + ); + } } diff --git a/images/staff/mug.jpg b/images/staff/mug.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6ceaf8855db337cac6ef489c7f5223851fd8c714 Binary files /dev/null and b/images/staff/mug.jpg differ diff --git a/images/staff/yoyo.jpg b/images/staff/yoyo.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c0006a7282914c321181ca188f9fbf697023ae62 Binary files /dev/null and b/images/staff/yoyo.jpg differ