Skip to content
Snippets Groups Projects
Commit 6d307b3e authored by Ikshita Sathanur's avatar Ikshita Sathanur
Browse files

Merge branch 'ikshitas_staff_page' into 'main'

Ikshitas products and staff changed

See merge request !32
parents e48f12da d6fa8204
No related branches found
No related tags found
1 merge request!32Ikshitas products and staff changed
Pipeline #576169 passed
......@@ -180,6 +180,17 @@ public class Products { /* a good class, but not as good as cse391 */
}
public Product ikshitasProduct(){
return new Product(
"Ice Cream",
"Sweet treat!",
"icecream.jpg",
"ice cream",
10.0
);
}
public Product skuttyProduct() {
return new Product(
"Rake",
......
......@@ -37,6 +37,16 @@ public class Staff {
);
}
public Employee ikshitas(){
return new Employee(
"Ikshita",
"Student",
"Tired",
"sunset.png",
"sunset"
);
}
public Employee faangPup() {
return new Employee(
"Steve",
......
images/products/icecream.png

874 KiB

images/staff/sunset.png

2.25 MiB

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