Skip to content
Snippets Groups Projects
Commit cfc64454 authored by Calvin Tsai's avatar Calvin Tsai
Browse files

Merge remote-tracking branch 'origin' into ctsai7_staff_page

parents 898a5258 d6afa969
No related branches found
No related tags found
1 merge request!102Ctsai7 staff page
Pipeline #576851 passed
File added
......@@ -36,5 +36,4 @@ public class Product {
public String toString() {
return "Product";
}
}
......@@ -410,6 +410,17 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product zliu44Product(){
return new Product (
"Coffee mug",
"Made by pure clay and human made not by machine",
"mug.jpg",
"a good looking mug is on the table",
25.99
);
}
public Product ryrozProduct() {
return new Product(
"A broken computer",
......@@ -545,4 +556,23 @@ public class Products { /* a good class, but not as good as cse391 */
5.99
);
}
public Product cscs24Product() {
return new Product(
"Coffee",
"Good coffee",
"coffee.jpeg",
"Picture of coffee",
4.99
);
}
public Product tly6() {
return new Product(
"Intel Core i9 14900K",
"Great Performance in Creative Apps",
"Intel-CoreI9.jpeg",
"Picture of Intel Processor",
589.00
);
}
}
......@@ -441,6 +441,16 @@ public class Staff {
"Sun setting behind ocean"
);
}
public Employee zliu44(){
return new Employee(
"Leo Liu",
"Student",
"I am a music producer",
"yoyo.jpg",
"favorite rapper"
);
}
public Employee ryroz() {
return new Employee(
......@@ -550,6 +560,16 @@ public class Staff {
);
}
public Employee tly6() {
return new Employee(
"Truong",
"SOC Architect",
"Hardware All the way!!!",
"ECE.jpeg",
"Picture of a System-On-Chip Hardware"
);
}
public Employee ccsekhar20() {
return new Employee(
"Chaitanya",
......@@ -569,4 +589,14 @@ public class Staff {
"Picture of women playing volleyball"
);
}
public Employee cscs24() {
return new Employee(
"Chaitanya",
"Student",
"On the grind",
"ocean.jpg",
"Picture of the ocean"
);
}
}
images/products/Intel-CoreI9.jpeg

425 KiB

images/staff/ECE.jpeg

100 KiB

images/staff/mug.jpg

126 KiB

images/staff/yoyo.jpg

38.8 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