Skip to content
Snippets Groups Projects
Commit 8bb5dc33 authored by Ryan Rozsnyai's avatar Ryan Rozsnyai
Browse files

Merge branch 'ryroz_staff_page' into 'main'

Added Product and Employee for ryroz

See merge request !65
parents 27f3dbf3 c7814356
No related branches found
No related tags found
2 merge requests!65Added Product and Employee for ryroz,!64Main back to branch
Pipeline #576509 passed
......@@ -364,4 +364,13 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product ryrozProduct() {
return new Product(
"A broken computer",
"A computer that has a static screen.",
"static.jpg",
"A picture of static",
4.99
);
}
}
......@@ -385,4 +385,14 @@ public class Staff {
);
}
public Employee ryroz() {
return new Employee(
"Ryan",
"Student",
"tired",
"blackscreen.jpg",
"a black screen"
);
}
}
images/products/static.jpg

16.9 KiB

images/staff/blackscreen.jpg

23.5 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