Skip to content
Snippets Groups Projects
Commit 399a3791 authored by Smayan Nirantare's avatar Smayan Nirantare
Browse files

Merge remote-tracking branch 'origin/main' into smayan_staff_page

parents abaf006b 311cbc24
No related branches found
No related tags found
2 merge requests!158added to Staff.java and Products.java and pics added,!156Main
Pipeline #577202 failed
Showing with 121 additions and 1 deletion
File added
/* check out these products! */
public class Products { /* a good class, but not as good as cse391 */
public Product boschenProduct() {
return new Product(
"sleepCoke",
"It will help you a nice sleep",
"sleepCoke.jpg",
"really good, has sleepy coffine",
9.98
);
}
public Product smayanProduct() {
return new Product(
"Dollar Bill",
......@@ -9,6 +21,27 @@ public class Products { /* a good class, but not as good as cse391 */
"Image of a one-dollar bill",
1.00
);
public Product benoreProduct() {
return new Product(
"Taylor Swift - Folklore Vinyl",
"A vinyl containing the deluxe edition of Taylor Swift's Grammy-winning FFolklore album.",
"folkloreac.png",
"The album cover for Taylor Swift's folklore album.",
29.99
);
}
public Product ekimji1Product() {
return new Product(
"Gudetama",
"perfect",
"gudetama.jpg",
"Lazy egg",
1000.0
);
}
public Product kevinh33Product() {
......@@ -81,6 +114,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",
......@@ -755,4 +798,23 @@ 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
);
}
public Product pranavntProduct() {
return new Product(
"Celsius Essentials 1000 pack",
"1000 pack of celsius essentials. will keep you awake.",
"celsius-picture.png",
"Celsius Essentials",
1000.0
);
}
}
public class Staff {
public Employee smayan(){
return new Employee(
"Smayan Nirantare",
......@@ -10,6 +11,36 @@ public class Staff {
);
}
public Employee boschen() {
return new Employee(
"Boshan Chen",
"Sleeper",
"Sleep and stare blankly",
"White.jpg",
"umm.."
);
}
public Employee ekimji() {
return new Employee(
"Esther",
"student",
"local point demon",
"gudetama.jpg",
"gudetama with balloon"
);
}
public Employee benore() {
return new Employee("Ben",
"Student",
"Computer Science student",
"benore.jpg",
"Picture of Ben Oreizy");
}
public Employee cuperido() {
return new Employee(
"Young You",
......@@ -223,7 +254,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",
......@@ -780,5 +820,23 @@ public class Staff {
"Hello Kitty"
);
}
public Employee tonywu() {
return new Employee(
"Tony",
"Student",
"Student in CSE",
"NormanRockwell.jpg",
"Norman Rockwell Self-Portrait"
);
}
public Employee pranavnt() {
return new Employee(
"Pranav",
"Student",
"i like celsius",
"celsius-picture.png",
"celsius picture"
);
}
}
images/products/Lake.jpg

540 KiB

images/products/Tree.webp

197 KiB

images/products/chocolate_ice_cream.jpg

11.6 KiB

images/products/folkloreac.png

79.4 KiB

images/products/gudetama.jpg

67.1 KiB

images/products/sleepCoke.jpg

126 KiB

images/staff/MountainSunset.jpg

371 KiB

images/staff/NormanRockwell.jpg

20.5 KiB

images/staff/White.jpg

961 B

images/staff/benore.jpg

175 KiB

images/staff/celsius-picture.png

375 KiB

images/staff/gudetama.jpg

67.1 KiB

images/staff/tired_dog.jpg

80 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