From 7f0ae5a59bebb0bf7a450f97e23945460bc43d98 Mon Sep 17 00:00:00 2001 From: dquangucsd Date: Sun, 30 Oct 2022 13:26:34 -0700 Subject: [PATCH 01/10] added nathans name and explore pseudocode test --- README.md | 2 ++ assets/scripts/explore.js | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index f211f6f26..f01d3957f 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ # Lab 5 - Starter + +Danny Quang, Nathan Karter diff --git a/assets/scripts/explore.js b/assets/scripts/explore.js index 777f5ee3a..ce051293d 100644 --- a/assets/scripts/explore.js +++ b/assets/scripts/explore.js @@ -3,5 +3,7 @@ window.addEventListener('DOMContentLoaded', init); function init() { - // TODO -} \ No newline at end of file + if (button is pressed) { + blow; + } +} From 0cf1cd1374c806cb1e2fe796592ab5a8aa32358b Mon Sep 17 00:00:00 2001 From: dquangucsd Date: Sun, 30 Oct 2022 13:28:13 -0700 Subject: [PATCH 02/10] added nathan's name --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index f211f6f26..5f8a813a4 100644 --- a/README.md +++ b/README.md @@ -1 +1,3 @@ # Lab 5 - Starter + +Danny Quang, Nathan Karter \ No newline at end of file From edc9fb50e35b218490ca812a71eee5438349e325 Mon Sep 17 00:00:00 2001 From: dquangucsd Date: Sun, 30 Oct 2022 15:25:31 -0700 Subject: [PATCH 03/10] finished logic to connect images and sound -dannyq --- assets/scripts/expose.js | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/assets/scripts/expose.js b/assets/scripts/expose.js index 962d7a33c..d355da957 100644 --- a/assets/scripts/expose.js +++ b/assets/scripts/expose.js @@ -4,4 +4,39 @@ window.addEventListener('DOMContentLoaded', init); function init() { // TODO + const selector = document.getElementById('horn-select'); + selector.addEventListener('change', function() { + let option = selector.value; + //alert(option); + if (option == 'air-horn') { + document.querySelector('img').src = 'assets/images/air-horn.svg'; + document.querySelector('audio').src = 'assets/audio/air-horn.mp3'; + } else if (option == 'party-horn') { + document.querySelector('img').src = 'assets/images/party-horn.svg'; + document.querySelector('audio').src = 'assets/audio/party-horn.mp3'; + } else if (option == 'car-horn') { + document.querySelector('img').src = 'assets/images/car-horn.svg'; + document.querySelector('audio').src = 'assets/audio/car-horn.mp3'; + } + + const sound = document.querySelector('button'); + sound.addEventListener('click', function() { + let option = selector.value; + if (option == 'air-horn') { + new Audio('assets/audio/air-horn.mp3').play(); + } else if (option == 'party-horn') { + new Audio('assets/audio/party-horn.mp3').play(); + } else if (option == 'car-horn') { + new Audio('assets/audio/car-horn.mp3').play(); + } + }) + }) + + + // const sound = document.querySelector('button'); + // sound.addEventListener('click', function() { + // let option = selector.value; + // alert(option) + // }) + } \ No newline at end of file From 407ac0fe6a4b93548319994c06fccbbf96929750 Mon Sep 17 00:00:00 2001 From: dquangucsd Date: Sun, 30 Oct 2022 16:26:30 -0700 Subject: [PATCH 04/10] added volume functionality. volume icon WIP --- assets/scripts/expose.js | 37 ++++++++++++++++++++++++++----------- 1 file changed, 26 insertions(+), 11 deletions(-) diff --git a/assets/scripts/expose.js b/assets/scripts/expose.js index d355da957..288e66651 100644 --- a/assets/scripts/expose.js +++ b/assets/scripts/expose.js @@ -18,21 +18,36 @@ function init() { document.querySelector('img').src = 'assets/images/car-horn.svg'; document.querySelector('audio').src = 'assets/audio/car-horn.mp3'; } + }) - const sound = document.querySelector('button'); - sound.addEventListener('click', function() { - let option = selector.value; - if (option == 'air-horn') { - new Audio('assets/audio/air-horn.mp3').play(); - } else if (option == 'party-horn') { - new Audio('assets/audio/party-horn.mp3').play(); - } else if (option == 'car-horn') { - new Audio('assets/audio/car-horn.mp3').play(); - } - }) + const volume_slider = document.getElementById('volume'); + + const sound = document.querySelector('button'); + sound.addEventListener('click', function() { + let option = selector.value; + let music = null; + if (option == 'air-horn') { + music = new Audio('assets/audio/air-horn.mp3'); + } else if (option == 'party-horn') { + music = new Audio('assets/audio/party-horn.mp3'); + } else if (option == 'car-horn') { + music = new Audio('assets/audio/car-horn.mp3'); + } + // const volume_controls = document.getElementsByClassName("img")[1]; + // volume_controls.addEventListener('input', function() { + // alert(volume_controls.src); + // }) + let volval = volume_slider.value; + if (volval == 0) { + + } + music.volume = volval/100; + + music.play(); }) + // const sound = document.querySelector('button'); // sound.addEventListener('click', function() { // let option = selector.value; From 304a4fba8492647d585ed31002ba6fa8804f3e1e Mon Sep 17 00:00:00 2001 From: Nathan Karter Date: Sun, 30 Oct 2022 16:27:33 -0700 Subject: [PATCH 05/10] sc --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f01d3957f..5f8a813a4 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ # Lab 5 - Starter -Danny Quang, Nathan Karter +Danny Quang, Nathan Karter \ No newline at end of file From 5f2406c3f9031b08153f6ebef67c234141f31275 Mon Sep 17 00:00:00 2001 From: Nathan Karter Date: Sun, 30 Oct 2022 16:56:20 -0700 Subject: [PATCH 06/10] finished expose --- assets/scripts/expose.js | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/assets/scripts/expose.js b/assets/scripts/expose.js index 288e66651..d0b2950ce 100644 --- a/assets/scripts/expose.js +++ b/assets/scripts/expose.js @@ -20,8 +20,6 @@ function init() { } }) - const volume_slider = document.getElementById('volume'); - const sound = document.querySelector('button'); sound.addEventListener('click', function() { let option = selector.value; @@ -37,16 +35,33 @@ function init() { // volume_controls.addEventListener('input', function() { // alert(volume_controls.src); // }) - let volval = volume_slider.value; - if (volval == 0) { + + const volume_slider = document.getElementById('volume'); + let volval = volume_slider.value; + const volIcon = document.getElementsByTagName("img")[1]; + volume_slider.addEventListener('change', function(e) { + volval = e.currentTarget.value; + if (volval == 0) { + volIcon.src = 'assets/icons/volume-level-0.svg'; + } + if (volval >=1 && volval < 33) { + volIcon.src = 'assets/icons/volume-level-1.svg'; } + if (volval >=33 && volval < 67) { + volIcon.src = 'assets/icons/volume-level-2.svg'; + } + if (volval >=67) { + volIcon.src = 'assets/icons/volume-level-3.svg'; + } + }) + music.volume = volval/100; music.play(); }) - + // const sound = document.querySelector('button'); // sound.addEventListener('click', function() { From 220d3d4c91086af43fd7cca858bc9f0e31b3883f Mon Sep 17 00:00:00 2001 From: dquangucsd Date: Sun, 30 Oct 2022 17:56:26 -0700 Subject: [PATCH 07/10] just a small indent --- assets/scripts/explore.js | 4 +--- assets/scripts/expose.js | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/assets/scripts/explore.js b/assets/scripts/explore.js index ce051293d..09e84256d 100644 --- a/assets/scripts/explore.js +++ b/assets/scripts/explore.js @@ -3,7 +3,5 @@ window.addEventListener('DOMContentLoaded', init); function init() { - if (button is pressed) { - blow; - } + } diff --git a/assets/scripts/expose.js b/assets/scripts/expose.js index d0b2950ce..128427d57 100644 --- a/assets/scripts/expose.js +++ b/assets/scripts/expose.js @@ -36,7 +36,7 @@ function init() { // alert(volume_controls.src); // }) - const volume_slider = document.getElementById('volume'); + const volume_slider = document.getElementById('volume'); let volval = volume_slider.value; const volIcon = document.getElementsByTagName("img")[1]; From 6689317400129e18288d5b0c281315caa30e649b Mon Sep 17 00:00:00 2001 From: dquangucsd Date: Sun, 30 Oct 2022 18:02:05 -0700 Subject: [PATCH 08/10] indent edits --- assets/scripts/expose.js | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/assets/scripts/expose.js b/assets/scripts/expose.js index 128427d57..353c401de 100644 --- a/assets/scripts/expose.js +++ b/assets/scripts/expose.js @@ -36,25 +36,25 @@ function init() { // alert(volume_controls.src); // }) - const volume_slider = document.getElementById('volume'); - let volval = volume_slider.value; + const volume_slider = document.getElementById('volume'); + let volval = volume_slider.value; - const volIcon = document.getElementsByTagName("img")[1]; - volume_slider.addEventListener('change', function(e) { - volval = e.currentTarget.value; - if (volval == 0) { - volIcon.src = 'assets/icons/volume-level-0.svg'; - } - if (volval >=1 && volval < 33) { - volIcon.src = 'assets/icons/volume-level-1.svg'; - } - if (volval >=33 && volval < 67) { - volIcon.src = 'assets/icons/volume-level-2.svg'; - } - if (volval >=67) { - volIcon.src = 'assets/icons/volume-level-3.svg'; - } - }) + const volIcon = document.getElementsByTagName("img")[1]; + volume_slider.addEventListener('change', function(e) { + volval = e.currentTarget.value; + if (volval == 0) { + volIcon.src = 'assets/icons/volume-level-0.svg'; + } + if (volval >=1 && volval < 33) { + volIcon.src = 'assets/icons/volume-level-1.svg'; + } + if (volval >=33 && volval < 67) { + volIcon.src = 'assets/icons/volume-level-2.svg'; + } + if (volval >=67) { + volIcon.src = 'assets/icons/volume-level-3.svg'; + } + }) music.volume = volval/100; From 52fe2267e8add336ec73eab0e23d1bbe2c22f2e5 Mon Sep 17 00:00:00 2001 From: Nathan Karter Date: Sun, 30 Oct 2022 18:04:42 -0700 Subject: [PATCH 09/10] party horn confetti --- assets/scripts/expose.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/scripts/expose.js b/assets/scripts/expose.js index d0b2950ce..f59272396 100644 --- a/assets/scripts/expose.js +++ b/assets/scripts/expose.js @@ -4,6 +4,7 @@ window.addEventListener('DOMContentLoaded', init); function init() { // TODO + const jsConfetti = new JSConfetti() const selector = document.getElementById('horn-select'); selector.addEventListener('change', function() { let option = selector.value; @@ -28,6 +29,8 @@ function init() { music = new Audio('assets/audio/air-horn.mp3'); } else if (option == 'party-horn') { music = new Audio('assets/audio/party-horn.mp3'); + + jsConfetti.addConfetti() } else if (option == 'car-horn') { music = new Audio('assets/audio/car-horn.mp3'); } From 6c796d280f21457244f3b05d871dbc65bccf5a95 Mon Sep 17 00:00:00 2001 From: Nathan Karter Date: Sun, 30 Oct 2022 22:48:11 -0700 Subject: [PATCH 10/10] d --- assets/scripts/explore.js | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/assets/scripts/explore.js b/assets/scripts/explore.js index 09e84256d..dd4b86ecf 100644 --- a/assets/scripts/explore.js +++ b/assets/scripts/explore.js @@ -4,4 +4,30 @@ window.addEventListener('DOMContentLoaded', init); function init() { + const synth = window.speechSynthesis; + let voices = []; + + const voiceSelect = document.querySelector('select'); + const inputTxt = document.querySelector('textarea'); + + function populateVoiceList() { + + voices = synth.getVoices(); + + for (let i = 0; i < voices.length ; i++) { + const option = document.createElement('option'); + option.textContent = `${voices[i].name} (${voices[i].lang})`; + + if (voices[i].default) { + option.textContent += ' — DEFAULT'; + } + + option.setAttribute('data-lang', voices[i].lang); + option.setAttribute('data-name', voices[i].name); + voiceSelect.appendChild(option); + } + } + + populateVoiceList(); + alert(voices.length); }