diff --git a/.nfs0000000002e4ae7d00006849 b/.nfs0000000002e4ae7d00006849 new file mode 100644 index 0000000000000000000000000000000000000000..89db5d3926f6edcc02cc99c9429c3f89aa226f07 Binary files /dev/null and b/.nfs0000000002e4ae7d00006849 differ diff --git a/Products.java b/Products.java index 495f5d1544b58e9f1440e041067f296955bb0d76..43128759cd91d5f743467fd3124fcded92bec34c 100644 --- a/Products.java +++ b/Products.java @@ -71,6 +71,16 @@ public class Products { /* a good class, but not as good as cse391 */ ); } + public Product akshitasProduct() { + return new Product( + "Lake", + "Pretty lake by the mountains", + "Lake.jpg", + "Image of a snowy lake with moutains in the background", + 5.99 + ); + } + public Product kevluoyrsProduct() { return new Product( "Blindr", @@ -380,6 +390,16 @@ public class Products { /* a good class, but not as good as cse391 */ ); } + public Product siyeeProduct() { + return new Product( + "Tulips", + "Some pretty flowers to make you happier!", + "tulips.jpg", + "Pink, yellow, purple, and orange tulip flowers in a garden.", + 49.99 + ); + } + public Product lq22Product() { return new Product( "Large Fries", @@ -651,6 +671,16 @@ public class Products { /* a good class, but not as good as cse391 */ "Picture of Intel Processor", 589.00 ); + } + + public Product sjeyteProduct() { + return new Product( + "AMD Ryzen 7 7800X3D", + "Best gaming chip currently!", + "7800x3d.jpeg", + "Picture of the AMD processor.", + 449.00 + ); } @@ -706,6 +736,15 @@ public class Products { /* a good class, but not as good as cse391 */ ); } + public Product jsun16() { + return new Product( + "Massager Heating Pad for Neck and Shoulder", + "Suitable for people to release muscle tension and promote blood flow.", + "Neck_Shoulder_Heating_Pad.jpeg", + "Electric Heating Pad for Neck and Shoulder", + 68.00 + ); + } public Product azitabProduct() { return new Product( "Cinnamon Roll Plushie", @@ -714,6 +753,17 @@ public class Products { /* a good class, but not as good as cse391 */ "Picture of Cinnamon Roll Plushie", 500.00 ); + + } + public Product tonywuProduct() { + return new Product( + "Giant Tree", + "Giant Tree, kind of looks weird. Price won't cause floating point error.", + "Tree.webp", + "Big Tree", + 15000000000000000000000000000000000000000000001.00 + ); + } public Product cuteplushie() { diff --git a/Staff.java b/Staff.java index 07653ff10232a2b4076d99890f87016df59bcb63..daeaba942a43c01c9220659084f3b2a24e427c8b 100644 --- a/Staff.java +++ b/Staff.java @@ -213,7 +213,16 @@ public class Staff { "Alpaca with dandelion hair" ); } - + + public Employee akshiam() { + return new Employee( + "Akshita", + "Student", + "Learning", + "MountainSunset.jpg", + "Husky Winter Sports members watching the sunset on a mountain" + ); + } public Employee pbui27() { return new Employee( "Peter", @@ -397,6 +406,16 @@ public class Staff { ); } + public Employee siyee() { + return new Employee( + "Sierra", + "Student", + "I love plushies", + "Bear.jpg", + "Brown bear with hearts" + ); + } + public Employee lq22() { return new Employee( "Audrey", @@ -683,6 +702,16 @@ public class Staff { ); } + public Employee sjeyte() { + return new Employee( + "Sulyman", + "Student", + "Academic comeback season!", + "lebron.jpeg", + "Picture of LeBron down 3-1 in the Finals." + ); + } + public Employee ggsmadhu(){ return new Employee( "Madhumitha", @@ -732,6 +761,15 @@ public class Staff { ); } + public Employee jsun16() { + return new Employee( + "Jessie", + "Student", + "Want to minor in Spanish", + "Solana_Beach_bluffs.jpeg", + "Picture of Solana Beach, San Diego" + ); + } public Employee azitab() { return new Employee( "Azita", diff --git a/images/products/7800x3d.jpeg b/images/products/7800x3d.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..e50beb98abe1aa991cdb9f2f1f5ff1426679e89c Binary files /dev/null and b/images/products/7800x3d.jpeg differ diff --git a/images/products/Lake.jpg b/images/products/Lake.jpg new file mode 100644 index 0000000000000000000000000000000000000000..2227fcf5daa56633f2cdbb68168d99ec06ad3468 Binary files /dev/null and b/images/products/Lake.jpg differ diff --git a/images/products/Neck_Shoulder_Heating_Pad.jpeg b/images/products/Neck_Shoulder_Heating_Pad.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..d801dd5df7ae9e6c9bba56b023d471fbfcaa8d8c Binary files /dev/null and b/images/products/Neck_Shoulder_Heating_Pad.jpeg differ diff --git a/images/products/Tree.webp b/images/products/Tree.webp new file mode 100644 index 0000000000000000000000000000000000000000..e209a1d67994423ec54ee1f48944518f4437811f Binary files /dev/null and b/images/products/Tree.webp differ diff --git a/images/products/meowchi.jpeg b/images/products/meowchi.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..30740e2ce513b0d33660d8addfedb7026aefc2cc Binary files /dev/null and b/images/products/meowchi.jpeg differ diff --git a/images/products/tulips.jpg b/images/products/tulips.jpg new file mode 100644 index 0000000000000000000000000000000000000000..0d668f2e59a5c5f73bbc5a205d9e522972d7fb78 Binary files /dev/null and b/images/products/tulips.jpg differ diff --git a/images/staff/Bear.jpg b/images/staff/Bear.jpg new file mode 100644 index 0000000000000000000000000000000000000000..5d0f405c1bff5a0aff5f252aa10a34755f5689ab Binary files /dev/null and b/images/staff/Bear.jpg differ diff --git a/images/staff/MountainSunset.jpg b/images/staff/MountainSunset.jpg new file mode 100644 index 0000000000000000000000000000000000000000..764b8cf3831f7c79c7c4c8cee087bca9e8559f6c Binary files /dev/null and b/images/staff/MountainSunset.jpg differ diff --git a/images/staff/NormanRockwell.jpg b/images/staff/NormanRockwell.jpg new file mode 100644 index 0000000000000000000000000000000000000000..e55c408e0d25c729e941a52c35dc2dec7d6d7ff0 Binary files /dev/null and b/images/staff/NormanRockwell.jpg differ diff --git a/images/staff/Solana_Beach_bluffs.jpeg b/images/staff/Solana_Beach_bluffs.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..a6b53a831ec02c9a57d03d58af3cc1f4be715da4 Binary files /dev/null and b/images/staff/Solana_Beach_bluffs.jpeg differ diff --git a/images/staff/animegeek.jpeg b/images/staff/animegeek.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..4e32c8eb67849327603bf124014108e7cc241ab6 Binary files /dev/null and b/images/staff/animegeek.jpeg differ diff --git a/images/staff/gudetama.jpg b/images/staff/gudetama.jpg new file mode 100644 index 0000000000000000000000000000000000000000..1bde2dc77c41a171a9b25223e52acd05fa844e38 Binary files /dev/null and b/images/staff/gudetama.jpg differ diff --git a/images/staff/lebron.jpeg b/images/staff/lebron.jpeg new file mode 100644 index 0000000000000000000000000000000000000000..1348c9e9cab1996599f5626f3ac35b95498ae9a4 Binary files /dev/null and b/images/staff/lebron.jpeg differ