Skip to content
Snippets Groups Projects
Commit 4edc52b6 authored by Tony Wu's avatar Tony Wu
Browse files

Merge branch 'tonywu_staff_page' into 'main'

Tonywu staff page merge

See merge request !137
parents 460544e3 5d9c7cee
No related branches found
No related tags found
2 merge requests!149Main into my branch,!137Tonywu staff page merge
Pipeline #577126 passed with stages
in 1 minute and 59 seconds
......@@ -745,4 +745,14 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product tonywuProduct() {
return new Product(
"Giant Tree",
"Giant Tree, kind of looks weird. Price won't cause floating point error.",
"Tree.webp",
"Big Tree",
15000000000000000000000000000000000000000000001.00
);
}
}
......@@ -770,5 +770,14 @@ public class Staff {
"Hello Kitty"
);
}
public Employee tonywu() {
return new Employee(
"Tony",
"Student",
"Student in CSE",
"NormanRockwell.jpg",
"Norman Rockwell Self-Portrait"
);
}
}
images/products/Tree.webp

197 KiB

images/staff/NormanRockwell.jpg

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