Skip to content
Snippets Groups Projects
Commit 48100850 authored by Sierra Yee's avatar Sierra Yee
Browse files

Merge branch 'main' into siyee_staff_page to get new changes

parents ad644318 6740314b
Branches boschen_staff_page
No related tags found
1 merge request!128Adding Sierra's employee and product
Pipeline #577085 passed with stage
in 2 seconds
......@@ -716,6 +716,15 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product jsun16() {
return new Product(
"Massager Heating Pad for Neck and Shoulder",
"Suitable for people to release muscle tension and promote blood flow.",
"Neck_Shoulder_Heating_Pad.jpeg",
"Electric Heating Pad for Neck and Shoulder",
68.00
);
}
public Product azitabProduct() {
return new Product(
"Cinnamon Roll Plushie",
......@@ -724,5 +733,6 @@ public class Products { /* a good class, but not as good as cse391 */
"Picture of Cinnamon Roll Plushie",
500.00
);
}
}
......@@ -742,6 +742,15 @@ public class Staff {
);
}
public Employee jsun16() {
return new Employee(
"Jessie",
"Student",
"Want to minor in Spanish",
"Solana_Beach_bluffs.jpeg",
"Picture of Solana Beach, San Diego"
);
}
public Employee azitab() {
return new Employee(
"Azita",
......
images/products/Neck_Shoulder_Heating_Pad.jpeg

39.6 KiB

images/staff/Solana_Beach_bluffs.jpeg

10 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