Skip to content
Snippets Groups Projects
Commit 5076f71b authored by Emily Nixon's avatar Emily Nixon
Browse files

Merge branch 'main' into ejnixon_staff_page

parents e033417c 446ad4bd
No related branches found
No related tags found
1 merge request!205Added product, employee name, and images
Pipeline #577344 passed with stage
in 2 seconds
...@@ -975,4 +975,15 @@ public class Products { /* a good class, but not as good as cse391 */ ...@@ -975,4 +975,15 @@ public class Products { /* a good class, but not as good as cse391 */
5.00 5.00
); );
} }
public Product ivt3Product() {
return new Product(
"caramel latte",
"delicous caffinated beverage",
"caramel-latte.jpg",
"yummy latte in a glass cup with caramel drizzle",
8.00
);
}
} }
...@@ -1004,5 +1004,15 @@ public class Staff { ...@@ -1004,5 +1004,15 @@ public class Staff {
"boba,jpg", "boba,jpg",
"some boba"); "some boba");
} }
public Employee ivt3() {
return new Employee(
"Isabelle Tinsley",
"Student",
"I like to row",
"uw-rowing.png",
"girls in the boat");
}
} }
images/products/caramel-latte.jpg

108 KiB

image diff could not be displayed: it is too large. Options to address this: view the blob.
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