Skip to content
Snippets Groups Projects
Commit cc479087 authored by Yixiang Shen's avatar Yixiang Shen
Browse files

Merge branch 'shen824_staff_page' into 'main'

Merge branch 'shen824_staff_page' into 'main'

See merge request !60
parents e3ce2717 4fb800a2
No related branches found
No related tags found
1 merge request!60Merge branch 'shen824_staff_page' into 'main'
Pipeline #576484 passed
......@@ -335,7 +335,15 @@ public class Products { /* a good class, but not as good as cse391 */
129.99
);
}
public Product shen824Product() {
return new Product(
"Magic Keyboard",
"Wireless, Convenience",
"keyboard.jpg",
"keyboard",
99.00
);
}
public Product robertdlProduct(){
return new Product(
"Sunshower Sam",
......
......@@ -356,7 +356,15 @@ public class Staff {
"Tennis racket and balls"
);
}
public Employee shen824() {
return new Employee(
"Yixiang",
"Student",
"tired",
"sea.jpg",
"sea"
);
}
public Employee robertdl(){
return new Employee(
"Robert Luiten",
......
images/products/keyboard.jpg

8.55 KiB

images/staff/sea.jpg

8.43 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