Skip to content
Snippets Groups Projects
Commit 54b2f427 authored by Cole Vanleer's avatar Cole Vanleer
Browse files

Merge branch 'cvanleer_staff_page' into 'main'

added Cole's staff profile and Milky Way product

See merge request !79
parents 721cf0f4 61575a01
No related branches found
No related tags found
1 merge request!79added Cole's staff profile and Milky Way product
Pipeline #576578 passed
......@@ -412,4 +412,14 @@ public class Products { /* a good class, but not as good as cse391 */
5.55
);
}
public Product cvanleerProduct() {
return new Product(
"Milky Way",
"Contains chocolate, caramel, nougat and you",
"galaxy.jpg",
"A yellowish galaxy in space",
27000.00
);
}
}
......@@ -443,4 +443,14 @@ public class Staff {
"Person skiing"
);
}
public Employee cvanleer() {
return new Employee(
"Cole",
"Security Officer",
"Likes to eat everything",
"kirby_sword.png",
"Kirby with a sword"
);
}
}
images/products/galaxy.jpg

106 KiB

images/staff/kirby_sword.png

170 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