From feea3d17fd498cf6836574e29dfb633e9cd54ffa Mon Sep 17 00:00:00 2001
From: Alexandra Domareski <aleexandra.junges@gmail.com>
Date: Wed, 19 Nov 2025 14:48:04 +0100
Subject: [PATCH 1/3] Lab - JS data types

---
 index.js | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

diff --git a/index.js b/index.js
index 294f6b2..cb1f096 100644
--- a/index.js
+++ b/index.js
@@ -8,11 +8,10 @@ const s4 = "bread";
 const s5 = "and";
 
 // Concatenate the string variables into one new string
-
+const tongueTwister = `${s1} ${s2} ${s3} ${s4} ${s5} ${s3} ${s2} ${s1} ${s4}`
 
 // Print out the concatenated string
-
-
+console.log(tongueTwister);
 
 
 /*******************************************
@@ -22,10 +21,10 @@ const part1 = "java";
 const part2 = "script";
 
 // Convert the last letter of part1 and part2 to uppercase and concatenate the strings
-
+const result = part1.slice(0, part1.length -1) + part1[part1.length -1].toUpperCase() + part2.slice(0, part2.length-1) + part2[part2.length - 1].toUpperCase();
 
 // Print the cameLtaiL-formatted string
-
+console.log(result);
 
 
 
@@ -35,10 +34,10 @@ const part2 = "script";
 const billTotal = 84;
 
 // Calculate the tip (15% of the bill total)
-
+let tipAmount = billTotal * (15/100);
 
 // Print out the tipAmount
-
+console.log(tipAmount);
 
 
 
@@ -47,10 +46,10 @@ const billTotal = 84;
 *******************************************/
 
 // Generate a random integer between 1 and 10 (inclusive)
-
+const randomNumber = Math.round(Math.random() * (10 - 0) + 0);
 
 // Print the generated random number
-
+console.log(randomNumber);
 
 
 /*******************************************
@@ -61,16 +60,23 @@ const a = true;
 const b = false;
 
 // Try and guess the output of the below expressions first and write your answers down:
-const expression1 = a && b;
+const expression1 = a && b; //false
+console.log(expression1);
 
-const expression2 = a || b;
+const expression2 = a || b; // true
+console.log(expression2);
 
-const expression3 = !a && b;
+const expression3 = !a && b; //false
+console.log(expression3);
 
-const expression4 = !(a && b);
+const expression4 = !(a && b); //true
+console.log(expression4);
 
-const expression5 = !a || !b;
+const expression5 = !a || !b; // true
+console.log(expression5);
 
-const expression6 = !(a || b);
+const expression6 = !(a || b); //false
+console.log(expression6);
 
-const expression7 = a && a;
\ No newline at end of file
+const expression7 = a && a; //true
+console.log(expression7);
\ No newline at end of file

From 2f6472cadd7678adca7c5419449496e9930a0bf9 Mon Sep 17 00:00:00 2001
From: Alexandra Domareski <aleexandra.junges@gmail.com>
Date: Thu, 20 Nov 2025 08:48:15 +0100
Subject: [PATCH 2/3] fixed the random number to start from 1

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index cb1f096..8fbb26e 100644
--- a/index.js
+++ b/index.js
@@ -46,7 +46,7 @@ console.log(tipAmount);
 *******************************************/
 
 // Generate a random integer between 1 and 10 (inclusive)
-const randomNumber = Math.round(Math.random() * (10 - 0) + 0);
+const randomNumber = Math.round(Math.random() * 10) + 1;
 
 // Print the generated random number
 console.log(randomNumber);

From 020941fc58174ef6175cb2cc72d63700291484e8 Mon Sep 17 00:00:00 2001
From: Alexandra Domareski <aleexandra.junges@gmail.com>
Date: Thu, 20 Nov 2025 08:50:01 +0100
Subject: [PATCH 3/3] typo error

---
 index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.js b/index.js
index 8fbb26e..8d4ae0e 100644
--- a/index.js
+++ b/index.js
@@ -46,7 +46,7 @@ console.log(tipAmount);
 *******************************************/
 
 // Generate a random integer between 1 and 10 (inclusive)
-const randomNumber = Math.round(Math.random() * 10) + 1;
+const randomNumber = Math.floor(Math.random() * 10) + 1;
 
 // Print the generated random number
 console.log(randomNumber);