Skip to content
Snippets Groups Projects
Commit 51ef418c authored by Pranav Teegavarapu's avatar Pranav Teegavarapu
Browse files

Merge branch 'main' into 'pranavnt_staff_page'

# Conflicts:
#   Staff.java
parents da260263 f770e600
No related branches found
No related tags found
2 merge requests!150Main,!143update page pranavnt
Pipeline #577143 failed with stage
in 3 seconds
File added
......@@ -71,6 +71,16 @@ public class Products { /* a good class, but not as good as cse391 */
);
}
public Product akshitasProduct() {
return new Product(
"Lake",
"Pretty lake by the mountains",
"Lake.jpg",
"Image of a snowy lake with moutains in the background",
5.99
);
}
public Product kevluoyrsProduct() {
return new Product(
"Blindr",
......@@ -745,4 +755,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
);
}
}
......@@ -213,7 +213,16 @@ public class Staff {
"Alpaca with dandelion hair"
);
}
public Employee akshiam() {
return new Employee(
"Akshita",
"Student",
"Learning",
"MountainSunset.jpg",
"Husky Winter Sports members watching the sunset on a mountain"
);
}
public Employee pbui27() {
return new Employee(
"Peter",
......
images/products/Lake.jpg

540 KiB

images/products/Tree.webp

197 KiB

images/staff/MountainSunset.jpg

371 KiB

images/staff/NormanRockwell.jpg

20.5 KiB

images/staff/gudetama.jpg

67.1 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