Merge branch 'main' into 'hmantha_staff_page'

# Conflicts:
#   Products.java
#   Staff.java

.gitlab-ci.yml

@@ -8,7 +8,7 @@ test:
     - java GenerateSite
     # heuristic to see if any lines were removed!
     - git fetch origin main
-    - '(exit $(git diff origin/main HEAD | grep "^-[^-]" | wc -l)) || { echo "Malformed merge request: at least one line is removed in diff." && (exit 1) }'
+    - '(exit $(git diff origin/main HEAD | grep "^-[^-]" | wc -l)) || { echo "Malformed merge request: at least one line is removed in diff, or feature branch is not up-to-date with the main branch." && (exit 1) }'
 
 pages:
   tags:

Products.java

 /* 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",
+	    "Biggest Piece of Dorito Ever!!!",
+	    "dorito_piece.jpg",
+	    "Image of the Dorito Piece",
+	    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",
+            "Just the good part (spicy)",
+            "cheetos.png",
+            "News about cheeto dust taking over",
+            42.024
+        );
+    }
+    public Product lwang42sProduct() {
+	    return new Product(
+			    "Big Burger",
+			    "Biggest and best burger",
+			    "bigburger.jpg",
+			    "Picture of a big burger",
+			    1.50
+			    );
+    }
+    public Product mehulcsProduct() {
+    	return new Product(
+	    "Giant Gummy Bear",
+	    "Big fatty tasty gummy bear",
+	    "gummybear.jpg",
+	    "Picture of a beautiful gummy bear",
+	    10000.10	    
+	);
+    }
+    public Product kevinsProduct(){
+	return new Product(
+	    "Basketball",
+	    "Bouncy bouncy orange ball",
+	    "basketball.jpg",
+	    "Picture of a basketball",
+	    42.0
+	);
+    }
+
     public Product joshsProduct() {
         return new Product(
             "Dirt",
@@ -20,6 +103,16 @@ public class Products { /* a good class, but not as good as cse391 */
 	);
     }
 
+    public Product ataberksProduct() {
+        return new Product(
+            "Turkish Dumplings",
+            "Dough often filled with beef",
+            "turkishDumplings.jpg",
+            "The dumplings themselves",
+            7.25
+        );
+    }
+
     public Product iansProduct() {
         return new Product(
             "Pasta",
@@ -39,6 +132,16 @@ public class Products { /* a good class, but not as good as cse391 */
 	    4.29
 	);
     }
+  
+    public Product evansProduct() {
+	return new Product(
+	    "Dented Trombone",
+	    "Super wrecked trombone but still plays wel",
+	    "trom.png",
+	    "very higih quality tromBONE",
+	    99.10
+	);
+    }
 
     public Product petersProduct() {
         return new Product(
@@ -68,5 +171,350 @@ public class Products { /* a good class, but not as good as cse391 */
 		"Rainbow flower rug",
 		699.99
 		);
+
+    public Product raosProduct() {
+	return new Product(
+	    "Keychain",
+	    "A cool keychain",
+	    "keychain.jpg",
+	    "image of a cool keychain",
+	    5.95
+	);
+    }
+
+    public Product isaacsProduct() {
+	return new Product(
+	    "Bucolic Green Hills",
+	    "Take a deep breath and relax",
+	    "windows_xp_bliss.jpeg",
+	    "rolling grass fields, blue skies, white clouds",
+	    100000
+        );
+    }
+
+    public Product aamangusProduct() {
+    	return new Product(
+		"Broody Chicken",
+		"It screams!",
+		"Discord Chicken.PNG",
+		"image of a broody chicken",
+		1.01
+	);
+    }
+
+    public Product noahhucksProduct() {
+        return new Product(
+            "CSE2 Building (Real)",
+            "no refunds",
+            "Gates-Center_0001.jpg",
+            "UW Gates Center Building",
+            20.00
+		);
+	}
+
+    public Product tanjalsProduct() {
+	return new Product(
+		"Creatine",
+		"Big muscle",
+		"creatine.jpg",
+		"Number 1 lifting supplement",
+		39.95
+	);
+    }
+
+    public Product keshavsProduct() {
+	return new Product(
+		"Dirt",
+		"Great for plants!",
+		"dirt.jpg",
+		"image of the product",
+		4.67
+		);
+	}
+
+    public Product dhvbnlProduct() {
+        return new Product (
+                "proteen",
+                "gets you jacked",
+                "proteen.jpg",
+                "image of proteen powder",
+                9.99
+        );
+    }
+
+    public Product yixuan19Product(){
+    	return new Product (
+		"Goomba",
+		"The No.1 VTB from Hololive",
+		"Avatar.png",
+		"Picture of Gawr Gura",
+		114514.0
+   	);
+    }
+
+    public Product swangsamProduct(){
+   	return new Product(
+		"Pullup Bar",
+		"It builds back",
+		"pullup.png",
+		"pullup bar image",
+		1.2
+	);
+    }
+
+    public Product ank05Product(){
+    	return new Product(
+		"Water",
+		"Yum",
+		"water.jpg",
+		"bottled water",
+		100
+	);	
+	
+    }
+	
+    public Product akhils22Product(){
+	return new Product(
+		"Avocado",
+		"Specially made in a Pineapple Under the Sea",
+		"avocado.jpg",
+		"Mmm...Tasty Avocado!",
+		22.22
+	);
+    }
+
+    public Product ikshitasProduct(){
+        return new Product(
+                "Ice Cream",
+                "Sweet treat!",
+                "icecream.jpg",
+                "ice cream",
+                10.0
+        );
+
+    }
+
+    public Product skuttyProduct() {
+	return new Product(
+	    "Rake",
+	    "A rake to gather leaves",
+	    "rake.jpg",
+	    "image of a rake",
+	    5959.59
+	);
+    }
+
+    public Product erinsongProduct() {
+	return new Product(
+		"Ramen",
+		"Perfect meal on a cold day",
+		"ramen.jpg",
+		"Bowl of soup with noodles and sliced boiled egg",
+		15.50
+	);
+    }
+
+    public Product lq22Product() {
+        return new Product(
+                "Large Fries",
+                "Delicious McDonald's Fries!",
+                "largeFries.jpg",
+                "A pack of large size McDonald's Fries",
+                4.99
+        );
+    }
+    
+    public Product uwzhuohuProduct() {
+        return new Product(
+                "Visual Studio Code",
+                "Surprise surprise there is a text editor with even GUI!",
+                "vscode.png",
+                "The best editor, except IDEA:)",
+                0
+        );
+    }
+    public Product tyzhou05Product() {
+       return new Product(
+            "Sushi Bake!",
+            "Delicious sushi pizza made in my dorm (real)",
+            "sushibake.jpg",
+            "Stack image of seaweed, rice, and deliciousness",
+            15 
+       );
+    }
+    
+    public Product kirupasProduct() {
+    	return new Product(
+			"Park",
+			"A nice walk in the park",
+			"park.jpg",
+			"A beautiful park",
+			10
+	);
+    }
+
+	public Product JadenProduct() {
+    	return new Product(
+			"Jaden",
+			"A student who is working out",
+			"JungPT.jpg",
+			"Jaden Working out",
+			100
+	);
+    }
+
+    public Product zhanczycProduct() {
+	return new Product(
+		"Soccer Ball",
+		"A ball for soccer",
+		"soccer_ball.jpg",
+		"a soccer ball",
+		12.99
+	);
+    }
+    public Product sluong05Product() {
+        return new Product(
+                "Fluffy cow",
+                "A fluffy cow to hug and feel warm and cozy",
+                "fluffyCow.jpg",
+                "Highland cow",
+                129.99
+        );
+    }
+    public Product shen824Product() {
+	return new Product(
+		"Magic Keyboard",
+		"Wireless, Convenience",
+		"keyboard.jpg",
+		"keyboard",
+		99.00
+	);
+    }
+    public Product robertdlProduct(){
+	return new Product(
+		"Sunshower Sam",
+		"Ayo; it's your new best friend! Say hello to Sunshower Sam! (He is alive)",
+		"sunshower.png",
+		"Sunshower Sam",
+		86.79
+	);
+    }
+
+    public Product cleahwProduct() {
+	return new Product (
+		"White chocolate blueberry cheesecake",
+		"A slice of homemade blueberry cheesecake I made!",
+		"cheesecake.jpg",
+		"A slice of blueberry cheesecake with blueberry sauce ontop",
+		10.99
+	);
+    }
+
+    public Product ryrozProduct() {
+	return new Product(
+		"A broken computer",
+		"A computer that has a static screen.",
+		"static.jpg",
+		"A picture of static",
+		4.99
+	);
+    }
+
+    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 ccsekhar20Product() {
+	    return new Product(
+		"Coffee",
+		"Good coffee",
+		"coffee.jpeg",
+		"Picture of coffee",
+		4.99
+	);
+
     }
 }

Staff.java

@@ -539,6 +539,7 @@ public class Staff {
 	);
     }
 
+
     public Employee hmantha(){
         return new Employee(
             "Hitesh",
@@ -548,4 +549,5 @@ public class Staff {
             "Porsche 911"
         );
     }
+
 }	

assets/style.css

@@ -12,6 +12,8 @@ body {
   width: 50%;
   margin: auto;
   padding: 0;
+  background-image: url('../image/bkg.gif');
+  background-size: cover;
 }
 
 h1 {