Skip to content
Snippets Groups Projects
Commit dfb4af3c authored by Leo Liu's avatar Leo Liu
Browse files

Merge branch 'zliu44_staff_page' into 'main'

Merge feature to the main

See merge request cse391/24wi/faang!101
parents c167a7e8 a5fccf88
No related branches found
No related tags found
1 merge request!101Merge feature to the main
Pipeline #576827 passed
File added
......@@ -401,6 +401,17 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product zliu44Product(){
return new Product (
"Coffee mug",
"Made by pure clay and human made not by machine",
"mug.jpg",
"a good looking mug is on the table",
25.99
);
}
public Product ryrozProduct() {
return new Product(
"A broken computer",
......
......@@ -430,6 +430,16 @@ public class Staff {
"Sun setting behind ocean"
);
}
public Employee zliu44(){
return new Employee(
"Leo Liu",
"Student",
"I am a music producer",
"yoyo.jpg",
"favorite rapper"
);
}
public Employee ryroz() {
return new Employee(
......
images/staff/mug.jpg

126 KiB

images/staff/yoyo.jpg

38.8 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