Skip to content
Snippets Groups Projects
Commit 08a6b14a authored by Lirong Que's avatar Lirong Que
Browse files

Merge branch 'lq22_staff_page' into 'main'

Merge branch "lq22_staff_page" into "main"

See merge request !36
parents 37ef3eb4 83e3e381
No related branches found
No related tags found
1 merge request!36Merge branch "lq22_staff_page" into "main"
Pipeline #576180 passed
......@@ -220,4 +220,14 @@ public class Products { /* a good class, but not as good as cse391 */
15.50
);
}
public Product lq22Product() {
return new Product(
"Large Fries",
"Delicious McDonald's Fries!",
"largeFries.jpg",
"A pack of large size McDonald's Fries",
4.99
);
}
}
......@@ -240,4 +240,15 @@ public class Staff {
"Brown-haired girl slumped over a desk"
);
}
public Employee lq22() {
return new Employee(
"Audrey",
"Student",
"Want to sleep",
"sleeping.jpg",
"A grey cat tring to sleep on the bed"
);
}
}
images/products/largeFries.jpg

479 KiB

images/staff/sleeping.jpg

13.1 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