Skip to content
Snippets Groups Projects
Commit ac28dcf2 authored by Kevin Xiao's avatar Kevin Xiao
Browse files

Merge branch 'main' into 'xckevin_staff_page'

# Conflicts:
#   Products.java
#   Staff.java
parents 84583841 76822c00
No related branches found
No related tags found
1 merge request!14Kevin's Merge
Pipeline #576058 failed
......@@ -70,4 +70,14 @@ public class Products { /* a good class, but not as good as cse391 */
10000
);
}
public Product aamangusProduct() {
return new Product(
"Broody Chicken",
"It screams!",
"Discord Chicken.PNG",
"image of a broody chicken",
1.01
);
}
}
......@@ -30,6 +30,16 @@ public class Staff {
);
}
public Employee mxw() {
return new Employee(
"Matt",
"candy thrower",
"tired",
"matt.png",
"matt smiling in front of a polka-dotted wall."
);
}
public Employee antonio6() {
return new Employee(
"Antonio",
......@@ -79,4 +89,14 @@ public class Staff {
"panda icon"
);
}
public Employee aamangus() {
return new Employee(
"Anthony",
"Student",
"studies",
"Discord Chicken.PNG",
"funny chicken"
);
}
}
images/products/cheeto.png

313 KiB

images/staff/Discord Chicken.PNG

448 KiB

images/staff/matt.png

1.48 MiB

images/staff/snorlax.png

107 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