diff --git a/Products.java b/Products.java index 3f3b74b2bcff85d4a5c66962c0aa4073d1a7fea5..7710c140ce5881783c4b9dd47deaee50d4998f78 100644 --- a/Products.java +++ b/Products.java @@ -653,6 +653,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", @@ -673,6 +683,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() { @@ -703,5 +714,15 @@ public class Products { /* a good class, but not as good as cse391 */ "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 + ); + } } diff --git a/Staff.java b/Staff.java index d1445dd92766c11959793fb02c39b45959d036b1..536663b050a8f64d023bb87388edc5b90eb7101f 100644 --- a/Staff.java +++ b/Staff.java @@ -683,6 +683,15 @@ public class Staff { ); } + public Employee ggsmadhu(){ + return new Employee( + "Madhumitha", + "Student", + "Working", + "mountsi.jpeg", + "Mount Si" + ); + } public Employee chetan7() { return new Employee( "Chetan", @@ -731,6 +740,15 @@ public class Staff { "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" + ); } } 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