Skip to content
Snippets Groups Projects
Commit d5f49c1e authored by Akhil Srinivasan's avatar Akhil Srinivasan
Browse files

Merge branch 'main' into 'akhils22_staff_page'

Main merge

See merge request !35
parents ab6237d9 e2b1462d
No related branches found
No related tags found
2 merge requests!35Main merge,!34Merged my new product and staff page with main
Pipeline #576177 passed
......@@ -210,4 +210,14 @@ public class Products { /* a good class, but not as good as cse391 */
5959.59
);
}
public Product erinsongProduct() {
return new Product(
"Ramen",
"Perfect meal on a cold day",
"ramen.jpg",
"Bowl of soup with noodles and sliced boiled egg",
15.50
);
}
}
......@@ -230,4 +230,14 @@ public class Staff {
"sephiroth"
);
}
public Employee erinsong() {
return new Employee(
"Erin",
"Student",
"Sleeps",
"sleep.jpg",
"Brown-haired girl slumped over a desk"
);
}
}
images/products/ramen.jpg

110 KiB

images/staff/sleep.jpg

79.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