diff --git a/Products.java b/Products.java index 25ff01e42aaeb76963cbc2843dc99101d39c9bef..9451b1d80cfc699f7136552075471a2a6f28d9e9 100644 --- a/Products.java +++ b/Products.java @@ -413,13 +413,23 @@ public class Products { /* a good class, but not as good as cse391 */ ); } - public Product kevyin30Product() { + public Product cvanleerProduct() { + return new Product( + "Milky Way", + "Contains chocolate, caramel, nougat and you", + "galaxy.jpg", + "A yellowish galaxy in space", + 27000.00 + ); + } + + public Product kevyin30Product() { return new Product( "iPhone 30 Pro Max", "another new phone with nothing new", "iphone15promax.jpg", "iPhone 15 Pro Max", 1999 - ); - } + ); + } } diff --git a/Staff.java b/Staff.java index 7492fdb4f3f0da3b7f8d13881d653d576720314e..4aca573de8db10e660b9c4a02aa00b1e326d9397 100644 --- a/Staff.java +++ b/Staff.java @@ -443,6 +443,16 @@ public class Staff { "Person skiing" ); } + + public Employee cvanleer() { + return new Employee( + "Cole", + "Security Officer", + "Likes to eat everything", + "kirby_sword.png", + "Kirby with a sword" + ); + } public Employee kevyin30() { return new Employee( @@ -451,6 +461,6 @@ public class Staff { "I am a person", "kevyin30.jpg", "neutral emoji" - ); + ); } } diff --git a/images/products/galaxy.jpg b/images/products/galaxy.jpg new file mode 100644 index 0000000000000000000000000000000000000000..6cde4ae417015ba639e0e7a9176333d64aed4f7c Binary files /dev/null and b/images/products/galaxy.jpg differ diff --git a/images/staff/kirby_sword.png b/images/staff/kirby_sword.png new file mode 100644 index 0000000000000000000000000000000000000000..7e66ae7897d2defaaed7dbeaeebbaad9874ce8ee Binary files /dev/null and b/images/staff/kirby_sword.png differ