From bc4621464cc2d92164d5d88a37e0ca42fef76b4d Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 00:41:19 +0100 Subject: [PATCH 01/10] alarmclock --- Sprint-3/alarmclock/alarmclock.js | 25 ++++++++++++++++++++++++- Sprint-3/alarmclock/index.html | 4 ++-- Sprint-3/alarmclock/style.css | 5 +++++ Sprint-3/package.json | 2 +- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/Sprint-3/alarmclock/alarmclock.js b/Sprint-3/alarmclock/alarmclock.js index 6ca81cd3b..b03faef4e 100644 --- a/Sprint-3/alarmclock/alarmclock.js +++ b/Sprint-3/alarmclock/alarmclock.js @@ -1,4 +1,26 @@ -function setAlarm() {} +function setAlarm() { + let seconds = parseInt(document.getElementById("alarmSet").value); + + function updateDisplay() { + const minutes = Math.floor(seconds / 60); + const remainingSeconds = seconds % 60; + document.getElementById("timeRemaining").textContent = + `Time Remaining: ${String(minutes).padStart(2, "0")}:${String(remainingSeconds).padStart(2, "0")}`; + } + + updateDisplay(); // update immediately on click + + const countdown = setInterval(() => { + seconds--; + updateDisplay(); + + if (seconds <= 0) { + clearInterval(countdown); + playAlarm(); + document.body.style.backgroundColor = "darkorange"; + } + }, 1000); +} // DO NOT EDIT BELOW HERE @@ -20,6 +42,7 @@ function playAlarm() { function pauseAlarm() { audio.pause(); + document.body.style.backgroundColor = "cornflowerblue"; } window.onload = setup; diff --git a/Sprint-3/alarmclock/index.html b/Sprint-3/alarmclock/index.html index 48e2e80d9..d45c92496 100644 --- a/Sprint-3/alarmclock/index.html +++ b/Sprint-3/alarmclock/index.html @@ -4,11 +4,11 @@ - Title here + Alarm clock app
-

Time Remaining: 00:00

+

Time remaining: 00:00

diff --git a/Sprint-3/alarmclock/style.css b/Sprint-3/alarmclock/style.css index 0c72de38b..4fd96b87c 100644 --- a/Sprint-3/alarmclock/style.css +++ b/Sprint-3/alarmclock/style.css @@ -13,3 +13,8 @@ h1 { text-align: center; } + +body { + background-color: cornflowerblue; + font-family: "Trebuchet MS", Tahoma, Verdana, Helvetica, sans-serif; +} diff --git a/Sprint-3/package.json b/Sprint-3/package.json index 711a5390f..2a009bcd4 100644 --- a/Sprint-3/package.json +++ b/Sprint-3/package.json @@ -26,7 +26,7 @@ "@testing-library/dom": "^10.4.0", "@testing-library/jest-dom": "^6.6.3", "@testing-library/user-event": "^14.6.1", - "jest": "^30.0.4", + "jest": "^30.3.0", "jest-environment-jsdom": "^30.0.4" } } From 724f78ed9e3d0f5961bfe2e27771c59beca92401 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 00:51:32 +0100 Subject: [PATCH 02/10] added Pause button --- Sprint-3/alarmclock/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sprint-3/alarmclock/index.html b/Sprint-3/alarmclock/index.html index d45c92496..2dbf5407e 100644 --- a/Sprint-3/alarmclock/index.html +++ b/Sprint-3/alarmclock/index.html @@ -8,11 +8,12 @@
-

Time remaining: 00:00

+

Time Remaining: 00:00

+
From b5531bb302c47b2301ffab91201f6d417368e82a Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 01:00:13 +0100 Subject: [PATCH 03/10] adjustments to let the input be positive integers --- Sprint-3/alarmclock/alarmclock.js | 4 ++++ Sprint-3/alarmclock/index.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Sprint-3/alarmclock/alarmclock.js b/Sprint-3/alarmclock/alarmclock.js index b03faef4e..3a8a9cf07 100644 --- a/Sprint-3/alarmclock/alarmclock.js +++ b/Sprint-3/alarmclock/alarmclock.js @@ -1,6 +1,10 @@ function setAlarm() { let seconds = parseInt(document.getElementById("alarmSet").value); + if (seconds <= 0) { + alert("The number of seconds must be more than 0 please"); + return; +} function updateDisplay() { const minutes = Math.floor(seconds / 60); const remainingSeconds = seconds % 60; diff --git a/Sprint-3/alarmclock/index.html b/Sprint-3/alarmclock/index.html index 2dbf5407e..1c4ecbea3 100644 --- a/Sprint-3/alarmclock/index.html +++ b/Sprint-3/alarmclock/index.html @@ -10,7 +10,7 @@

Time Remaining: 00:00

- + From fa5b4401bf69e3a39d4104c32e5dd477a01db66f Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 10:03:53 +0100 Subject: [PATCH 04/10] Remove package.json from tracking --- Sprint-3/alarmclock/package.json | 17 ----------------- 1 file changed, 17 deletions(-) delete mode 100644 Sprint-3/alarmclock/package.json diff --git a/Sprint-3/alarmclock/package.json b/Sprint-3/alarmclock/package.json deleted file mode 100644 index e1331e071..000000000 --- a/Sprint-3/alarmclock/package.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "name": "alarmclock", - "version": "1.0.0", - "license": "CC-BY-SA-4.0", - "description": "You must update this package", - "scripts": { - "test": "jest --config=../jest.config.js alarmclock" - }, - "repository": { - "type": "git", - "url": "git+https://github.com/CodeYourFuture/CYF-Coursework-Template.git" - }, - "bugs": { - "url": "https://github.com/CodeYourFuture/CYF-Coursework-Template/issues" - }, - "homepage": "https://github.com/CodeYourFuture/CYF-Coursework-Template#readme" -} From 3fb860f51631e7ef0149fd28dc654ac35a3aa74b Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 10:21:15 +0100 Subject: [PATCH 05/10] Remove package.json --- Sprint-3/package.json | 32 -------------------------------- 1 file changed, 32 deletions(-) delete mode 100644 Sprint-3/package.json diff --git a/Sprint-3/package.json b/Sprint-3/package.json deleted file mode 100644 index 2a009bcd4..000000000 --- a/Sprint-3/package.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "name": "module-data-groups", - "version": "1.0.0", - "license": "CC-BY-SA-4.0", - "description": "", - "scripts": { - "test": "jest", - "format": "prettier --write ." - }, - "workspaces": [ - "alarmclock", - "quote-generator", - "reading-list", - "slideshow", - "todo-list" - ], - "repository": { - "type": "git", - "url": "git+https://github.com/CodeYourFuture/Module-Data-Groups.git" - }, - "bugs": { - "url": "https://github.com/CodeYourFuture/Module-Data-Groups/issues" - }, - "homepage": "https://github.com/CodeYourFuture/Module-Data-Groups#readme", - "devDependencies": { - "@testing-library/dom": "^10.4.0", - "@testing-library/jest-dom": "^6.6.3", - "@testing-library/user-event": "^14.6.1", - "jest": "^30.3.0", - "jest-environment-jsdom": "^30.0.4" - } -} From 055596bb802ce17895e4ecbc36f00d047250f880 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 10:28:51 +0100 Subject: [PATCH 06/10] removing package.json as it's blocking the PR to be approved --- Sprint-3/alarmclock/package.json | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 Sprint-3/alarmclock/package.json diff --git a/Sprint-3/alarmclock/package.json b/Sprint-3/alarmclock/package.json new file mode 100644 index 000000000..e1331e071 --- /dev/null +++ b/Sprint-3/alarmclock/package.json @@ -0,0 +1,17 @@ +{ + "name": "alarmclock", + "version": "1.0.0", + "license": "CC-BY-SA-4.0", + "description": "You must update this package", + "scripts": { + "test": "jest --config=../jest.config.js alarmclock" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/CodeYourFuture/CYF-Coursework-Template.git" + }, + "bugs": { + "url": "https://github.com/CodeYourFuture/CYF-Coursework-Template/issues" + }, + "homepage": "https://github.com/CodeYourFuture/CYF-Coursework-Template#readme" +} From 57ab5caf3b6f019f24e9a4298c251daef46c7b5a Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 13:52:27 +0100 Subject: [PATCH 07/10] putting package.json back... --- Sprint-3/alarmclock/package.json | 5 ++++- Sprint-3/package.json | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 Sprint-3/package.json diff --git a/Sprint-3/alarmclock/package.json b/Sprint-3/alarmclock/package.json index e1331e071..77c5b84b2 100644 --- a/Sprint-3/alarmclock/package.json +++ b/Sprint-3/alarmclock/package.json @@ -13,5 +13,8 @@ "bugs": { "url": "https://github.com/CodeYourFuture/CYF-Coursework-Template/issues" }, - "homepage": "https://github.com/CodeYourFuture/CYF-Coursework-Template#readme" + "homepage": "https://github.com/CodeYourFuture/CYF-Coursework-Template#readme", + "devDependencies": { + "jest": "^30.3.0" + } } diff --git a/Sprint-3/package.json b/Sprint-3/package.json new file mode 100644 index 000000000..c1a1bfb40 --- /dev/null +++ b/Sprint-3/package.json @@ -0,0 +1,5 @@ +{ + "devDependencies": { + "jest": "^30.3.0" + } +} From 3453a0c68bcad74e6d660ca7be53794bf3c2921c Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 14:28:59 +0100 Subject: [PATCH 08/10] removed redundant pause button and added package.json anew --- Sprint-3/alarmclock/index.html | 1 - 1 file changed, 1 deletion(-) diff --git a/Sprint-3/alarmclock/index.html b/Sprint-3/alarmclock/index.html index 1c4ecbea3..f307a7190 100644 --- a/Sprint-3/alarmclock/index.html +++ b/Sprint-3/alarmclock/index.html @@ -13,7 +13,6 @@

Time Remaining: 00:00

-
From 459b2655b2a16e8197e77e82f0aca132ec805929 Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Sat, 11 Apr 2026 15:22:46 +0100 Subject: [PATCH 09/10] renewed directory due to data corruption --- Sprint-3/alarmclock/package.json | 5 +---- Sprint-3/package.json | 29 ++++++++++++++++++++++++++++- 2 files changed, 29 insertions(+), 5 deletions(-) diff --git a/Sprint-3/alarmclock/package.json b/Sprint-3/alarmclock/package.json index 77c5b84b2..e1331e071 100644 --- a/Sprint-3/alarmclock/package.json +++ b/Sprint-3/alarmclock/package.json @@ -13,8 +13,5 @@ "bugs": { "url": "https://github.com/CodeYourFuture/CYF-Coursework-Template/issues" }, - "homepage": "https://github.com/CodeYourFuture/CYF-Coursework-Template#readme", - "devDependencies": { - "jest": "^30.3.0" - } + "homepage": "https://github.com/CodeYourFuture/CYF-Coursework-Template#readme" } diff --git a/Sprint-3/package.json b/Sprint-3/package.json index c1a1bfb40..711a5390f 100644 --- a/Sprint-3/package.json +++ b/Sprint-3/package.json @@ -1,5 +1,32 @@ { + "name": "module-data-groups", + "version": "1.0.0", + "license": "CC-BY-SA-4.0", + "description": "", + "scripts": { + "test": "jest", + "format": "prettier --write ." + }, + "workspaces": [ + "alarmclock", + "quote-generator", + "reading-list", + "slideshow", + "todo-list" + ], + "repository": { + "type": "git", + "url": "git+https://github.com/CodeYourFuture/Module-Data-Groups.git" + }, + "bugs": { + "url": "https://github.com/CodeYourFuture/Module-Data-Groups/issues" + }, + "homepage": "https://github.com/CodeYourFuture/Module-Data-Groups#readme", "devDependencies": { - "jest": "^30.3.0" + "@testing-library/dom": "^10.4.0", + "@testing-library/jest-dom": "^6.6.3", + "@testing-library/user-event": "^14.6.1", + "jest": "^30.0.4", + "jest-environment-jsdom": "^30.0.4" } } From 0a1c10e7f3f1efea9634a415792c7f90bee28e9b Mon Sep 17 00:00:00 2001 From: miriamjorna Date: Wed, 15 Apr 2026 00:32:44 +0100 Subject: [PATCH 10/10] corrections and improvements after review --- Sprint-3/alarmclock/alarmclock.js | 39 ++++++++++++++++++++----------- Sprint-3/alarmclock/style.css | 2 ++ 2 files changed, 27 insertions(+), 14 deletions(-) diff --git a/Sprint-3/alarmclock/alarmclock.js b/Sprint-3/alarmclock/alarmclock.js index 3a8a9cf07..dd457f841 100644 --- a/Sprint-3/alarmclock/alarmclock.js +++ b/Sprint-3/alarmclock/alarmclock.js @@ -1,11 +1,21 @@ +let countdown; + +// reset before starting new countdown +function resetAlarm() { + clearInterval(countdown); + audio.pause(); + document.getElementById("timeRemaining").textContent = "Time Remaining: 00:00"; + document.body.classList.toggle("alarm-activated", false); +} + function setAlarm() { let seconds = parseInt(document.getElementById("alarmSet").value); - - if (seconds <= 0) { - alert("The number of seconds must be more than 0 please"); - return; -} - function updateDisplay() { + + if (!seconds || seconds < 1) { + alert("The number of seconds must be more than 0 please"); + return; + } + function updateDisplay() { const minutes = Math.floor(seconds / 60); const remainingSeconds = seconds % 60; document.getElementById("timeRemaining").textContent = @@ -14,14 +24,20 @@ function setAlarm() { updateDisplay(); // update immediately on click - const countdown = setInterval(() => { + // code to reset background + function pauseAlarm() { + audio.pause(); + document.body.classList.toggle("alarm-activated", false); + } + + countdown = setInterval(() => { seconds--; updateDisplay(); - + if (seconds <= 0) { clearInterval(countdown); playAlarm(); - document.body.style.backgroundColor = "darkorange"; + document.body.classList.toggle("alarm-activated", true); } }, 1000); } @@ -44,9 +60,4 @@ function playAlarm() { audio.play(); } -function pauseAlarm() { - audio.pause(); - document.body.style.backgroundColor = "cornflowerblue"; -} - window.onload = setup; diff --git a/Sprint-3/alarmclock/style.css b/Sprint-3/alarmclock/style.css index 4fd96b87c..a5acef770 100644 --- a/Sprint-3/alarmclock/style.css +++ b/Sprint-3/alarmclock/style.css @@ -4,6 +4,8 @@ left: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%); + .alarm-activated { + background-color: darkorange; } #alarmSet {