diff --git a/Products.java b/Products.java index c98d65387ec5c6e889a5a48fb88ecd38e331b72f..5a4dabc8c1252d8f022724d05953da8de65739df 100644 --- a/Products.java +++ b/Products.java @@ -663,6 +663,16 @@ public class Products { /* a good class, but not as good as cse391 */ ); } + + 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", @@ -683,6 +693,7 @@ public class Products { /* a good class, but not as good as cse391 */ "Picture of a lindt milk chocolate package", 2.00 ); + } public Product sprofit() { @@ -704,4 +715,14 @@ public class Products { /* a good class, but not as good as cse391 */ 01 ); } + + public Product azitabProduct() { + return new Product( + "Cinnamon Roll Plushie", + "Giant Cinnamon Roll Plushie", + "cinnamonroll.jpg", + "Picture of Cinnamon Roll Plushie", + 500.00 + ); + } } diff --git a/Staff.java b/Staff.java index cc012bb6c01f69a090ec5f9446a58054b0d00eed..0413a7eb7e375cab99675830b620d0aedf650239 100644 --- a/Staff.java +++ b/Staff.java @@ -693,6 +693,15 @@ public class Staff { ); } + public Employee ggsmadhu(){ + return new Employee( + "Madhumitha", + "Student", + "Working", + "mountsi.jpeg", + "Mount Si" + ); + } public Employee chetan7() { return new Employee( "Chetan", @@ -732,5 +741,15 @@ public class Staff { "Nathan Li, but widened 19x thanks to one of his closest friends" ); } + + public Employee azitab() { + return new Employee( + "Azita", + "Student", + "I'm Eating Chocolate Chips", + "hellokitty.jpg", + "Hello Kitty" + ); + } } diff --git a/images/products/cinnamonroll.jpg b/images/products/cinnamonroll.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c779256b106ee16b73a5aea863897a43add7a3e6 Binary files /dev/null and b/images/products/cinnamonroll.jpg differ diff --git a/images/products/coke.jpeg b/images/products/coke.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..dabe9e11a6157081403f38beb52deafbfc280833 Binary files /dev/null and b/images/products/coke.jpeg differ diff --git a/images/staff/hellokitty.jpg b/images/staff/hellokitty.jpg new file mode 100644 index 0000000000000000000000000000000000000000..82ddf9a4c670cbbde5764a62d8221cf57a4b3e03 Binary files /dev/null and b/images/staff/hellokitty.jpg differ diff --git a/images/staff/mountsi.jpeg b/images/staff/mountsi.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..053991ec3ec8c31f572ab19b7d4e5832018de7ec Binary files /dev/null and b/images/staff/mountsi.jpeg differ diff --git a/images/staff/sunset.png b/images/staff/sunset.png index 6458aa080cb9558db9ad9ea463c00e2d5fed7848..f5fd4c00648cd17d5792b19e3029a2c6a8fd7f80 100644 Binary files a/images/staff/sunset.png and b/images/staff/sunset.png differ diff --git a/products.java b/products.java new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391