Skip to content
Snippets Groups Projects
Commit c6989d85 authored by Anya Vaish's avatar Anya Vaish
Browse files

Merge branch 'avaish_staff_page' into 'main'

Added sock product to Products.java and avaish bio to Staff.java

See merge request !76
parents a9661255 12ad73de
No related branches found
No related tags found
1 merge request!76Added sock product to Products.java and avaish bio to Staff.java
Pipeline #576561 passed
......@@ -393,4 +393,14 @@ public class Products { /* a good class, but not as good as cse391 */
18.88
);
}
public Product avaishProduct(){
return new Product(
"a sock",
"it'll make dobby very happy",
"sock.jpg",
"a grey and orange sock (very fashionable!)",
183.41
);
}
}
......@@ -424,4 +424,14 @@ public class Staff {
"Sleepy dog"
);
}
public Employee avaish(){
return new Employee(
"Anya",
"Student",
"drinks a lot of chai",
"monkey.jpg",
"a sleeping monkey"
);
}
}
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