Skip to content
Snippets Groups Projects
Commit 0aed0969 authored by Azita Katherine Balsara's avatar Azita Katherine Balsara
Browse files

Merge branch 'azitab_staff_page' into 'main'

Added Employee and Product for azitab

See merge request !123
parents bf4df897 02ae502a
No related branches found
No related tags found
1 merge request!123Added Employee and Product for azitab
Pipeline #577037 passed with stages
in 1 minute and 59 seconds
......@@ -705,4 +705,14 @@ public class Products { /* a good class, but not as good as cse391 */
01
);
}
public Product azitabProduct() {
return new Product(
"Cinnamon Roll Plushie",
"Giant Cinnamon Roll Plushie",
"cinnamonroll.jpg",
"Picture of Cinnamon Roll Plushie",
500.00
);
}
}
......@@ -731,5 +731,15 @@ public class Staff {
"Nathan Li, but widened 19x thanks to one of his closest friends"
);
}
public Employee azitab() {
return new Employee(
"Azita",
"Student",
"I'm Eating Chocolate Chips",
"hellokitty.jpg",
"Hello Kitty"
);
}
}
images/products/cinnamonroll.jpg

23.9 KiB

images/staff/hellokitty.jpg

25.6 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