Skip to content
Snippets Groups Projects
Commit 3581d02d authored by Keshav Acharya's avatar Keshav Acharya
Browse files

Merge branch 'main' into 'kesach_staff_page'

# Conflicts:
#   Products.java
#   Staff.java
parents a18ea4a0 5be67acd
No related branches found
No related tags found
1 merge request!21keshav staff page and product
Pipeline #576116 passed
......@@ -120,6 +120,17 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product dhvbnlProduct() {
return new Product (
"proteen",
"gets you jacked",
"proteen.jpg",
"image of proteen powder",
9.99
);
}
public Product yixuan19Product(){
return new Product (
"Goomba",
......
......@@ -128,6 +128,7 @@ public class Staff {
);
}
public Employee kesach() {
return new Employee(
"Keshav",
......@@ -139,6 +140,17 @@ public class Staff {
}
public Employee dhvbnl() {
return new Employee (
"Dhruv",
"tech student",
"breaking things that work, making things that break",
"dhvbnl.jpg",
"pillow representing dhruv"
);
}
public Employee yixuan19() {
return new Employee (
"Yixuan",
......
images/products/proteen.jpg

62 KiB

images/staff/dhvbnl.jpg

1.35 MiB

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