From 7e9078a51d36fa297c498f0335bc4a80d33cf31e Mon Sep 17 00:00:00 2001
From: Mareh <marehaboghanem@gmail.com>
Date: Wed, 21 Jan 2026 20:09:57 +0100
Subject: [PATCH 1/2] Complete week 2 assignments

---
 task-1/leap-year.js | 12 ++++++++++++
 task-2/login.js     | 14 +++++++++++---
 task-3/converter.js | 10 +++++-----
 3 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/task-1/leap-year.js b/task-1/leap-year.js
index e05d215..133e4ab 100644
--- a/task-1/leap-year.js
+++ b/task-1/leap-year.js
@@ -7,3 +7,15 @@ const prompt = promptSync();
 // Step 1: prompt the user to enter a year
 // Step 2: convert the user input to a number so we can perform calculations
 // Step 3: Implement the logic
+
+//Task 1 Mareh 
+let userInput = prompt('Enter the year: ');
+let year = Number(userInput);
+
+if (isNaN(year) || year < 1 || year > 9999) {
+    console.log('Invalid year!');
+} else if ((year % 400 === 0) || (year % 4 === 0 && year % 100 !== 0)) {
+    console.log('Yes, ' + year + ' is a leap year');
+} else {
+    console.log('No, ' + year + ' is not a leap year');
+}
diff --git a/task-2/login.js b/task-2/login.js
index ca9ba92..da9bab1 100644
--- a/task-2/login.js
+++ b/task-2/login.js
@@ -4,9 +4,17 @@ import { errorMessage, successMessage } from './app.js';
 let incorrectAttempts = 0;
 
 function onLogin(username, password) {
-  // Write your code here.
-  // Use the variables 'username' and 'password' to access the input values
-  // Use incorrectAttempts to track the number of failed attempts
+  if(incorrectAttempts >= 4) {
+    errorMessage('Login blocked: Too many incorrect attempts.');
+    return;
+  }
+  else if((username === 'admin' && password === 'Hack1234') || (username === 'user' && password === '7654321')) {
+    successMessage('Logged in successfully.');
+  }
+    else {
+    incorrectAttempts+=1;
+    errorMessage('Incorrect credentials');
+  }
 }
 
 // Do not change the line below
diff --git a/task-3/converter.js b/task-3/converter.js
index 0f54a18..caae899 100644
--- a/task-3/converter.js
+++ b/task-3/converter.js
@@ -5,7 +5,7 @@ const prompt = promptSync();
 const EUR_USD_RATE = 1.1643;
 
 // Menu display
-conole.log("Hello and welcome to the currency converter. Please choose: ");
+console.log("Hello and welcome to the currency converter. Please choose: ");
 console.log("1: Convert EUR to USD");
 console.log("2: Convert USD to EUR");
 const menuSelection = prompt("Select your option [1 or 2]: ");
@@ -16,7 +16,7 @@ if (menuSelection === "1") {
   // EUR to USD
   const eurAmountInput = prompt("Enter amount in EUR: ");
   const eurAmountNum = Number(eurAmountInput);
-  if (Number.isNaN(eurAmountNum) || eurAmountNum > 0) {
+  if (Number.isNaN(eurAmountNum) && eurAmountNum > 0) {
     console.log("Please enter a valid positive number for the amount.");
   } else {
     const usdAmount = eurAmountNum * EUR_USD_RATE;
@@ -26,11 +26,11 @@ if (menuSelection === "1") {
   // USD to EUR
   const usdAmountInput = prompt("Enter amount in USD: ");
   const usdAmountNum = Number(usdAmountInput);
-  if (Number.isNaN(usdAmountNum) || usdAmountNum < 0) {
+  if (Number.isNaN(usdAmountNum) && usdAmountNum > 0) {
     console.log("Please enter a valid positive number for the amount.");
   } else {
-    const eurAmount = usdAmountNum / eur_usd_rate;
-    console.log(usdAmountNum.toFixed(2) + ' USD is equal to ' + usdAmountNum.toFixed(2) + ' EUR.');
+    const eurAmount = usdAmountNum / EUR_USD_RATE;
+    console.log(usdAmountNum.toFixed(2) + ' USD is equal to ' + eurAmount.toFixed(2) + ' EUR.');
   }
 } else {
   console.log("Invalid selection. Please choose either 1 or 2.");

From fbf34001f6d8b8a32874a517ce251be0ec87692c Mon Sep 17 00:00:00 2001
From: Mareh <marehaboghanem@gmail.com>
Date: Wed, 21 Jan 2026 20:29:16 +0100
Subject: [PATCH 2/2] week 2 assignment after modifing task3

---
 task-3/converter.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/task-3/converter.js b/task-3/converter.js
index caae899..5db241a 100644
--- a/task-3/converter.js
+++ b/task-3/converter.js
@@ -8,7 +8,8 @@ const EUR_USD_RATE = 1.1643;
 console.log("Hello and welcome to the currency converter. Please choose: ");
 console.log("1: Convert EUR to USD");
 console.log("2: Convert USD to EUR");
-const menuSelection = prompt("Select your option [1 or 2]: ");
+console.log("3: Display the current exchange rate");
+const menuSelection = prompt("Select your option [1,2,or 3]: ");
 
 console.log("\n");
 
@@ -32,6 +33,9 @@ if (menuSelection === "1") {
     const eurAmount = usdAmountNum / EUR_USD_RATE;
     console.log(usdAmountNum.toFixed(2) + ' USD is equal to ' + eurAmount.toFixed(2) + ' EUR.');
   }
-} else {
-  console.log("Invalid selection. Please choose either 1 or 2.");
+
+} else if(menuSelection === "3") {
+  console.log("The current exchange rate is 1 EUR = " + EUR_USD_RATE + " USD.");
+}else {
+  console.log("Invalid selection. Please choose either 1 or 2 ,or 3.");
 }