Skip to content
Snippets Groups Projects
Commit adf88019 authored by Samuel Wang's avatar Samuel Wang
Browse files

Merge branch 'swangsam_staff_page'

parents bc7a26ca f4420358
No related branches found
No related tags found
1 merge request!19Swangsam staff page
Pipeline #576099 failed
......@@ -117,6 +117,14 @@ public class Products { /* a good class, but not as good as cse391 */
"Avatar.png",
"Picture of Gawr Gura",
114514.0
public Product swangsamProduct(){
return new Product(
"Pullup Bar",
"It builds back",
"pullup.png",
"pullup bar image",
1.2
);
}
}
......@@ -137,5 +137,13 @@ public class Staff {
"Goomba.jpg",
"Shaaaaaaaaark"
);
public Employee swangsam(){
return new Employee(
"Samuel",
"Student",
"runs",
"sephiroth.png",
"sephiroth"
);
}
}
images/products/pullup.png

12.5 KiB

images/staff/sephiroth.png

20.9 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