Skip to content
Snippets Groups Projects
Commit 2d0c330b authored by Kevin Hernandez's avatar Kevin Hernandez
Browse files

Merge branch 'main' into kevinh33_staff_page

parents 581c6bdd d6afa969
No related branches found
No related tags found
1 merge request!78Made kevinh33 changes
Pipeline #576848 failed
......@@ -36,5 +36,4 @@ public class Product {
public String toString() {
return "Product";
}
}
......@@ -570,4 +570,13 @@ public class Products { /* a good class, but not as good as cse391 */
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
);
}
}
......@@ -559,6 +559,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",
......
images/products/Intel-CoreI9.jpeg

425 KiB

images/staff/ECE.jpeg

100 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment