Skip to content
Snippets Groups Projects
Commit adbabfe8 authored by Leo Liu's avatar Leo Liu
Browse files

Merge branch 'main' into zliu44_staff_page

Conflicts:
	Products.java
	Staff.java
parents b16f087b c167a7e8
No related branches found
No related tags found
1 merge request!101Merge feature to the main
Pipeline #576825 failed
Showing
with 335 additions and 1 deletion
File deleted
/* check out these products! */
public class Products { /* a good class, but not as good as cse391 */
public Product yverma23sProduct() {
return new Product(
"Lebron 2's",
"Nike basketball shoes",
"Lebron2.png",
"Image of black and white nikes",
105.97
);
}
public Product joshjyinProduct() {
return new Product(
"Dub Hub",
"Craigslist for UW students",
"dubhub.jpg",
"Image of the best college campus",
99999999999.99
);
}
public Product kevluoyrsProduct() {
return new Product(
"Blindr",
"ML AI Blockchain Crypto eco Window Blinds",
"blindr.jpg",
"Snazzy blindr portrait",
99999999999.99
);
}
public Product evanlousProduct() {
return new Product(
"Dorito Piece",
......@@ -9,6 +37,15 @@ public class Products { /* a good class, but not as good as cse391 */
99999.99
);
}
public Product ahmincsProduct() {
return new Product(
"moorb",
"broom but better because broom",
"broom.PNG",
"image of legendary broom that might also be my profile",
0.92
);
}
public Product rairai77sProudct() {
return new Product(
"Cheeto Dust",
......@@ -125,7 +162,7 @@ public class Products { /* a good class, but not as good as cse391 */
10000
);
}
public Product raosProduct() {
return new Product(
"Keychain",
......@@ -375,6 +412,139 @@ public class Products { /* a good class, but not as good as cse391 */
}
public Product yangsamProduct() {
return new Product(
"Chocolate chip cookies",
"Fresh baked cookies with milk chocolate",
"cookie.jpg",
"A golden cookie with chocolate chips",
3.99
);
}
public Product ronnyeProduct(){
return new Product(
"Comfortable slippers",
"Cute slippers to wear",
"comfy_slippers.jpg",
"A picture of cow slippers",
18.88
);
}
public Product avaishProduct(){
return new Product(
"a sock",
"it'll make dobby very happy",
"sock.jpg",
"a grey and orange sock (very fashionable!)",
183.41
);
}
public Product janelleProduct() {
return new Product(
"Keyboard cover",
"Protects keyboard",
"keyboard_protecc.png",
"A keyboard cover, slick design",
5.55
);
}
public Product spzappaProduct() {
return new Product(
"Elkay LZS8WSLK EZH2O Bottle Filling Station",
"greatest water fountain of all time",
"waterfountain.png",
"Water fountain w/ water bottle filler",
1312.99
);
}
public Product cvanleerProduct() {
return new Product(
"Milky Way",
"Contains chocolate, caramel, nougat and you",
"galaxy.jpg",
"A yellowish galaxy in space",
27000.00
);
}
public Product kevyin30Product() {
return new Product(
"iPhone 30 Pro Max",
"another new phone with nothing new",
"iphone15promax.jpg",
"iPhone 15 Pro Max",
1999
);
}
public Product nvhoangProduct() {
return new Product(
"Logitech G PRO X SUPERLIGHT 2",
"Logitech wireless gaming mouse in magenta",
"superlight.jpg",
"Side view of the logitech gaming mouse",
159.99
);
}
public Product drose4Product() {
return new Product(
"Trader Joes Chicken Fried Rice",
"The best frozen fried rice on earth",
"friedrice.jpg",
"Image of trader joes chicken fried rice package",
3.99
);
}
public Product mbalakProduct() {
return new Product(
"Big Mac",
"McDonald's Big Mac",
"BigMac.jpeg",
"image of Big Mac",
5
);
}
public Product ccsekhar20Product() {
return new Product(
"Coffee",
"Good coffee",
"coffee.jpeg",
"Picture of coffee",
4.99
);
}
public Product samsharProduct() {
return new Product(
"Spray Ketchup",
"Ketchup that you can spray on",
"ketchup.jpg",
"Example image of spray on ketchup",
4.99
);
}
public Product SprayKetchup() {
return new Product(
"SprayKetchup",
"Spray on Ketchup",
"ketchup.jpg",
"An image of what a spray on ketchup bottle would look like",
5.99
);
}
public Product cscs24Product() {
return new Product(
"Coffee",
"Good coffee",
"coffee.jpeg",
"Picture of coffee",
4.99
);
}
}
public class Staff {
public Employee yverma23() {
return new Employee(
"Yash Verma",
"Baller",
"Sleep deprived",
"LebronJamesMeme.jpg",
"Lebron Meme"
);
}
public Employee joshjyin() {
return new Employee(
"Joshua Yin",
"Student",
"sleep deprived",
"this_is_fine.png",
"A typical day in my life"
);
}
public Employee kevluoyr() {
return new Employee(
"Kevin Luo",
"Supreme Leader",
"hyped",
"energy.jpg",
"me"
);
}
public Employee evanlou() {
return new Employee(
......@@ -18,6 +45,15 @@ public class Staff {
"A snorlax sitting"
);
}
public Employee ahminc() {
return new Employee(
"Ahmin Chang",
"Professional Broom Inspector",
"roasting",
"broom.PNG",
"a beautiful broom in all it's glory"
);
}
public Employee lwang42() {
return new Employee(
"Lawrence Wang",
......@@ -164,6 +200,16 @@ public class Staff {
"panda icon"
);
}
public Employee mbalak() {
return new Employee(
"Manav",
"Student",
"Studies",
"LongLiveASAP.jpeg",
"Long.Live.A$AP by A$AP Rocky"
);
}
public Employee kgrao() {
return new Employee(
......@@ -394,4 +440,122 @@ public class Staff {
"favorite rapper"
);
}
public Employee yangsam() {
return new Employee(
"Samantha",
"Student",
"I'm tired",
"flower.jpg",
"Pink roses under the blue sky"
);
}
public Employee ronnye(){
return new Employee(
"Ronny",
"Student",
"Ready for break",
"sleepy_dog.jpg",
"Sleepy dog"
);
}
public Employee avaish(){
return new Employee(
"Anya",
"Student",
"drinks a lot of chai",
"monkey.jpg",
"a sleeping monkey"
);
}
public Employee jc383() {
return new Employee(
"Janelle",
"Student",
"Loves pets",
"ski.png",
"Person skiing"
);
}
public Employee spzappa() {
return new Employee(
"Sam",
"Student",
"just failed a midterm",
"stickman.png",
"stick man"
);
}
public Employee cvanleer() {
return new Employee(
"Cole",
"Security Officer",
"Likes to eat everything",
"kirby_sword.png",
"Kirby with a sword"
);
}
public Employee kevyin30() {
return new Employee(
"Kevin",
"Student",
"I am a person",
"kevyin30.jpg",
"neutral emoji"
);
}
public Employee nvhoang() {
return new Employee(
"Noah",
"Student",
"Twice Enjoyer",
"lebron_james.jpeg",
"international student lebron james from tiktok"
);
}
public Employee drose4() {
return new Employee(
"Dylan",
"Student",
"Semi pro Uno player",
"dog.jpg",
"Picture of a dog"
);
}
public Employee ccsekhar20() {
return new Employee(
"Chaitanya",
"Student",
"On the grind",
"ocean.jpg",
"Picture of the ocean"
);
}
public Employee samshar() {
return new Employee(
"Sami",
"Student",
"Working hard",
"picture.jpg",
"Picture of women playing volleyball"
);
}
public Employee cscs24() {
return new Employee(
"Chaitanya",
"Student",
"On the grind",
"ocean.jpg",
"Picture of the ocean"
);
}
}
images/products/BigMac.jpeg

32.6 KiB

images/products/Lebron2.png

129 KiB

images/products/blindr.jpg

24.4 KiB

images/products/broom.PNG

246 KiB

images/products/coffee.jpeg

1.05 MiB

images/products/comfy_slippers.jpg

141 KiB

images/products/cookie.jpg

64.1 KiB

images/products/dubhub.jpg

222 KiB

images/products/friedrice.jpg

14 KiB

images/products/galaxy.jpg

106 KiB

images/products/iphone15promax.jpg

202 KiB

images/products/ketchup.jpg

21 KiB

images/products/picture.jpg

77.2 KiB

images/products/sock.jpg

21.9 KiB

images/products/superlight.jpg

310 KiB

images/products/waterfountain.png

27.2 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