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 2f1cd9999e684baa18ec028f115855adddbab195..b28fd03e3b5dffd6021c0aff4a791e0bf2281e11 100644
--- a/Products.java
+++ b/Products.java
@@ -1,6 +1,15 @@
/* check out these products! */
public class Products { /* a good class, but not as good as cse391 */
+ public Product ctsai7Product() {
+ return new Product(
+ "G. Loomis GLX Casting Rod",
+ "Fishing rod",
+ "g_loomis_glx.jpg",
+ "A g.loomis casting rod",
+ 460.00
+ );
+ }
public Product yverma23sProduct() {
return new Product(
"Lebron 2's",
@@ -162,7 +171,7 @@ public class Products { /* a good class, but not as good as cse391 */
10000
);
}
-
+
public Product raosProduct() {
return new Product(
"Keychain",
@@ -401,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",
@@ -497,14 +517,62 @@ public class Products { /* a good class, but not as good as cse391 */
3.99
);
}
+
+ public Product mbalakProduct() {
+ return new Product(
+ "Big Mac",
+ "McDonald's Big Mac",
+ "BigMac.jpeg",
+ "image of Big Mac",
+ 5
+ );
+ }
- public Product jabrah04Product() {
- return new Product(
- "Starbucks Chilled Frappuccino",
- "Best way to wake you up and keep you going",
- "coffee.jpg",
- "Different flavors of frappuccino",
- 5.99
+ public Product ccsekhar20Product() {
+ return new Product(
+ "Coffee",
+ "Good coffee",
+ "coffee.jpeg",
+ "Picture of coffee",
+ 4.99
);
}
+
+ public Product samsharProduct() {
+ return new Product(
+ "Spray Ketchup",
+ "Ketchup that you can spray on",
+ "ketchup.jpg",
+ "Example image of spray on ketchup",
+ 4.99
+ );
+ }
+ public Product SprayKetchup() {
+ return new Product(
+ "SprayKetchup",
+ "Spray on Ketchup",
+ "ketchup.jpg",
+ "An image of what a spray on ketchup bottle would look like",
+ 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 407b737ca489f47bc7d35091815bfce6a2ee891c..ccce541a5294384379b0486a244a9952bba4a59e 100644
--- a/Staff.java
+++ b/Staff.java
@@ -1,4 +1,15 @@
public class Staff {
+
+ public Employee ctsai7() {
+ return new Employee(
+ "Calvin Tsai",
+ "Student",
+ "excited",
+ "smallmouth_bass.jpg",
+ "a fish I like to catch"
+ );
+ }
+
public Employee yverma23() {
return new Employee(
"Yash Verma",
@@ -200,6 +211,16 @@ public class Staff {
"panda icon"
);
}
+
+ public Employee mbalak() {
+ return new Employee(
+ "Manav",
+ "Student",
+ "Studies",
+ "LongLiveASAP.jpeg",
+ "Long.Live.A$AP by A$AP Rocky"
+ );
+ }
public Employee kgrao() {
return new Employee(
@@ -420,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(
@@ -538,4 +569,45 @@ public class Staff {
"A hike in washington"
);
}
-}
+
+ 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",
+ "Student",
+ "On the grind",
+ "ocean.jpg",
+ "Picture of the ocean"
+ );
+ }
+
+ public Employee samshar() {
+ return new Employee(
+ "Sami",
+ "Student",
+ "Working hard",
+ "picture.jpg",
+ "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/BigMac.jpeg b/images/products/BigMac.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..69fb5ff0f36b796d5b26a27bf0e96b7683715282
Binary files /dev/null and b/images/products/BigMac.jpeg differ
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/products/coffee.jpeg b/images/products/coffee.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..9af5b1ecf875e0c8a0431ad54b5463bdbd27304f
Binary files /dev/null and b/images/products/coffee.jpeg differ
diff --git a/images/products/ketchup.jpg b/images/products/ketchup.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f727096dcaaedb13e31d75f909018564a69bc9cf
Binary files /dev/null and b/images/products/ketchup.jpg differ
diff --git a/images/products/picture.jpg b/images/products/picture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..55786d94bb6545820ab8b61b038eae37ee5a8d9c
Binary files /dev/null and b/images/products/picture.jpg 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/LongLiveASAP.jpeg b/images/staff/LongLiveASAP.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..66f564aea35256b8ac2f2418088b9a5deaa5b03b
Binary files /dev/null and b/images/staff/LongLiveASAP.jpeg differ
diff --git a/images/staff/ketchup.jpg b/images/staff/ketchup.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..f727096dcaaedb13e31d75f909018564a69bc9cf
Binary files /dev/null and b/images/staff/ketchup.jpg 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/ocean.jpg b/images/staff/ocean.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c11542308c6614b415c33600304c56664e4d158c
Binary files /dev/null and b/images/staff/ocean.jpg differ
diff --git a/images/staff/picture.jpg b/images/staff/picture.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..55786d94bb6545820ab8b61b038eae37ee5a8d9c
Binary files /dev/null and b/images/staff/picture.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