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/Product.java b/Product.java index 0916d6feb26ee5467f8222924154131d0a98a0fd..44a5ca94056cb55601a62c832a710201b30e1aca 100644 --- a/Product.java +++ b/Product.java @@ -36,5 +36,4 @@ public class Product { public String toString() { return "Product"; } - } diff --git a/Products.java b/Products.java index 4b7faec19acf219152ff6e174e0712ffc532c6d8..b28fd03e3b5dffd6021c0aff4a791e0bf2281e11 100644 --- a/Products.java +++ b/Products.java @@ -410,6 +410,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", @@ -545,4 +556,23 @@ 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 + ); + } + public Product tly6() { + return new Product( + "Intel Core i9 14900K", + "Great Performance in Creative Apps", + "Intel-CoreI9.jpeg", + "Picture of Intel Processor", + 589.00 + ); + } } diff --git a/Staff.java b/Staff.java index 7c029d34da5939e5099bd0ae1ae7c8c69b8c6e03..d65f1c25bb25930f6deb934402b9e87479ee0775 100644 --- a/Staff.java +++ b/Staff.java @@ -441,6 +441,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( @@ -550,6 +560,16 @@ public class Staff { ); } + public Employee tly6() { + return new Employee( + "Truong", + "SOC Architect", + "Hardware All the way!!!", + "ECE.jpeg", + "Picture of a System-On-Chip Hardware" + ); + } + public Employee ccsekhar20() { return new Employee( "Chaitanya", @@ -569,4 +589,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/products/Intel-CoreI9.jpeg b/images/products/Intel-CoreI9.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..815fd3ee5d403eaeba47b29df04532e2dc407771 Binary files /dev/null and b/images/products/Intel-CoreI9.jpeg differ diff --git a/images/staff/ECE.jpeg b/images/staff/ECE.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..e547da2bdb36e897f7909d2e0ac6e893da7f27a2 Binary files /dev/null and b/images/staff/ECE.jpeg differ 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