Skip to content
Snippets Groups Projects
Commit 7b22a636 authored by Bryan Zhao's avatar Bryan Zhao
Browse files

Merge branch 'main' of gitlab.cs.washington.edu:cse391/24wi/faang into bohanz04_staff_page

parents 48aaa5cf 8dd8b62c
Branches bohanz04_staff_page
No related tags found
2 merge requests!162Bohanz04 staff page,!156Main
Pipeline #577213 passed
......@@ -13,6 +13,16 @@ public class Products { /* a good class, but not as good as cse391 */
public Product smayanProduct() {
return new Product(
"Dollar Bill",
"one dollar in cash",
"dollar_bill.jpg",
"Image of a one-dollar bill",
1.00
);
}
public Product benoreProduct() {
return new Product(
"Taylor Swift - Folklore Vinyl",
......@@ -23,6 +33,16 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product ekimji1Product() {
return new Product(
"Gudetama",
"perfect",
"gudetama.jpg",
"Lazy egg",
1000.0
);
}
public Product bohanz04Product() {
return new Product(
......@@ -808,4 +828,13 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product shangy24Product() {
return new Product(
"Windows 10 Pro",
"An operating system made by Microsoft",
"win10.jpg",
"Windows 10 Default Wallpaper",
199.99
);
}
}
public class Staff {
public Employee smayan(){
return new Employee(
"Smayan Nirantare",
"CS Student",
"I'm hungry",
"travis_scott.jpg",
"Travis Scott"
);
}
public Employee boschen() {
return new Employee(
"Boshan Chen",
......@@ -9,7 +21,15 @@ public class Staff {
"umm.."
);
}
public Employee ekimji() {
return new Employee(
"Esther",
"student",
"local point demon",
"gudetama.jpg",
"gudetama with balloon"
);
}
public Employee benore() {
return new Employee("Ben",
......@@ -29,6 +49,7 @@ public class Staff {
"hope to get internship"
);
}
public Employee cuperido() {
return new Employee(
"Young You",
......
images/products/chocolate_ice_cream.jpg

11.6 KiB

images/products/dollar_bill.jpg

213 KiB

images/products/gudetama.jpg

67.1 KiB

images/products/win10.jpg

221 KiB

images/staff/travis_scott.jpg

9.26 KiB

images/staff/your-name.jpg

672 KiB

0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment