Skip to content
Snippets Groups Projects
Commit 984e59e8 authored by Kris Tong's avatar Kris Tong
Browse files

Merge branch 'kristong_staff_page' into 'main'

Kris staff and product

See merge request !161
parents 4e5a41b1 aa384dcd
Branches smayan_staff_page
No related tags found
2 merge requests!161Kris staff and product,!156Main
Pipeline #577217 passed with stages
in 2 minutes and 19 seconds
......@@ -828,6 +828,16 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product acuraIntegra() {
return new Product (
"Acura Integra",
"Acura Integra",
"acura.jpg",
"Acura Integra",
52400
);
}
public Product shangy24Product() {
return new Product(
"Windows 10 Pro",
......
......@@ -848,5 +848,14 @@ public class Staff {
);
}
public Employee kristong() {
return new Employee (
"Kris",
"Student",
"Hello",
"boy.jp",
"🙏"
);
}
}
images/products/acura.jpg

174 KiB

images/staff/boy.jpg

24.9 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