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

Merge branch 'main' into xckevin_staff_page

parents 54bf3699 50a39bda
No related branches found
No related tags found
1 merge request!14Kevin's Merge
Pipeline #576077 passed
......@@ -80,6 +80,26 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product raosProduct() {
return new Product(
"Keychain",
"A cool keychain",
"keychain.jpg",
"image of a cool keychain",
5.95
);
}
public Product isaacsProduct() {
return new Product(
"Bucolic Green Hills",
"Take a deep breath and relax",
"windows_xp_bliss.jpeg",
"rolling grass fields, blue skies, white clouds",
100000
);
}
public Product aamangusProduct() {
return new Product(
"Broody Chicken",
......
......@@ -98,6 +98,26 @@ public class Staff {
);
}
public Employee kgrao() {
return new Employee(
"Rao",
"Student",
"studies",
"rao.jpg",
"A dog!"
);
}
public Employee isaacwu() {
return new Employee(
"Isaac",
"Programmer",
"Can I go to sleep now?",
"icon.jpeg",
"angrily studying"
);
}
public Employee aamangus() {
return new Employee(
"Anthony",
......
images/products/keychain.jpg

39.7 KiB

images/products/windows_xp_bliss.jpeg

927 KiB

images/staff/icon.jpeg

49.9 KiB

images/staff/rao.jpg

4.29 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