Skip to content
Snippets Groups Projects
Commit 1b217844 authored by Ian Delong's avatar Ian Delong
Browse files

Merge branch 'main' into 'idelong_staff_page'

# Conflicts:
#   Products.java
#   Staff.java
parents 4c571d34 bd346d94
No related branches found
No related tags found
1 merge request!4feat: added new product and staff member
Pipeline #576027 failed
......@@ -28,5 +28,14 @@ public class Products { /* a good class, but not as good as cse391 */
"Bowl of pasta",
100.0
);
public Product aryasProduct() {
return new Product(
"Monkey",
"Just an animal",
"monkey.jpg",
"monkey image",
4.29
);
}
}
......@@ -39,4 +39,14 @@ public class Staff {
"Alpaca with dandelion hair"
);
}
public Employee agummadi() {
return new Employee(
"Arya",
"Student",
"studies",
"arya.png",
"just an image"
);
}
}
images/products/monkey.jpg

25 KiB

images/staff/arya.png

28.3 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