Skip to content
Snippets Groups Projects
Commit 4ce90f21 authored by Rayana Lyons's avatar Rayana Lyons
Browse files

Merge branch 'main' into 'rlyons8_staff_page'

# Conflicts:
#   Products.java
parents fd8de669 754bb1a1
No related branches found
No related tags found
1 merge request!190Added Product
Pipeline #577284 failed
......@@ -869,6 +869,7 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product mshumaProduct() {
return new Product(
"Violin Mutes 100 pack",
......
......@@ -888,6 +888,7 @@ public class Staff {
"celsius picture"
);
}
public Employee mshuma() {
return new Employee(
"Mariana",
......@@ -925,8 +926,14 @@ public class Staff {
"your-name.jpg",
"Wallpaper of Movie Your Name"
);
}
public Employee sirjan1() {
return new Employee("Sirjan", "Student", "Lost", "cars.jpg", "carring");
}
public Employee rlyons8(){
return new Employee(
......@@ -937,5 +944,6 @@ public class Staff {
"Black anime girl"
);
}
}
images/products/soccerball.jpg

13.7 KiB

images/staff/cars.jpg

4.39 MiB

images/staff/soccerball.jpg

13.7 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