Skip to content
Snippets Groups Projects
Commit f770e600 authored by Akshita Amarnath's avatar Akshita Amarnath
Browse files

Merge branch 'akshiam_staff_page' into 'main'

Akshiam staff page

See merge request !136
parents 4161b3ee f13b91cd
No related branches found
No related tags found
2 merge requests!149Main into my branch,!136Akshiam staff page
Pipeline #577135 passed with stages
in 2 minutes and 12 seconds
File added
......@@ -71,6 +71,16 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product akshitasProduct() {
return new Product(
"Lake",
"Pretty lake by the mountains",
"Lake.jpg",
"Image of a snowy lake with moutains in the background",
5.99
);
}
public Product kevluoyrsProduct() {
return new Product(
"Blindr",
......
......@@ -213,7 +213,16 @@ public class Staff {
"Alpaca with dandelion hair"
);
}
public Employee akshiam() {
return new Employee(
"Akshita",
"Student",
"Learning",
"MountainSunset.jpg",
"Husky Winter Sports members watching the sunset on a mountain"
);
}
public Employee pbui27() {
return new Employee(
"Peter",
......
images/products/Lake.jpg

540 KiB

images/staff/MountainSunset.jpg

371 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