From 32f71d9ec989829b46a08b5a08d4dd92292a3c8b Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 4 Aug 2019 23:28:55 +0200 Subject: [PATCH 01/21] exercici1 commit --- exercici1/css/styles.css | 9 ++++++++ exercici1/functions.js | 14 +++++++++++++ exercici1/img/click.png | Bin 0 -> 4974 bytes exercici1/index.html | 42 ++++++++++++++++++++++++++++++++++++++ exercici1/js/functions.js | 1 + 5 files changed, 66 insertions(+) create mode 100644 exercici1/css/styles.css create mode 100644 exercici1/functions.js create mode 100644 exercici1/img/click.png create mode 100644 exercici1/index.html create mode 100644 exercici1/js/functions.js diff --git a/exercici1/css/styles.css b/exercici1/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici1/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici1/functions.js b/exercici1/functions.js new file mode 100644 index 0000000..701d98e --- /dev/null +++ b/exercici1/functions.js @@ -0,0 +1,14 @@ + +let x = "My favorite dessert is Jello"; +let y = x.indexOf('J'); +console.log(y); +document.getElementById('boton1').onClick = function(){ + myFunction() +}; +function myFunction() { + + + document.getElementById('pintar').innerHTML = y; + } + + diff --git a/exercici1/img/click.png b/exercici1/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici1/index.html b/exercici1/index.html new file mode 100644 index 0000000..4ce19a1 --- /dev/null +++ b/exercici1/index.html @@ -0,0 +1,42 @@ + + + + + + + + + Basic jS1 + + +
+
+
+ +
+
+
+ TheClick36 +
+
IndexOf()
+

Click the to see the index of j in:

+

"My favorite dessert is Jelly"

+

+ + Go somewhere +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici1/js/functions.js b/exercici1/js/functions.js new file mode 100644 index 0000000..4ebc962 --- /dev/null +++ b/exercici1/js/functions.js @@ -0,0 +1 @@ +let x = "My favorite dessert is Jello"; From 2395ff09b055aac5a7354c8c361f26b3fafbaa0c Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 4 Aug 2019 23:47:15 +0200 Subject: [PATCH 02/21] exercici2 commit --- exercici2/css/styles.css | 9 +++++++++ exercici2/img/click.png | Bin 0 -> 4974 bytes exercici2/index.html | 37 +++++++++++++++++++++++++++++++++++++ exercici2/js/functions.js | 0 4 files changed, 46 insertions(+) create mode 100644 exercici2/css/styles.css create mode 100644 exercici2/img/click.png create mode 100644 exercici2/index.html create mode 100644 exercici2/js/functions.js diff --git a/exercici2/css/styles.css b/exercici2/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici2/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici2/img/click.png b/exercici2/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici2/index.html b/exercici2/index.html new file mode 100644 index 0000000..28105f4 --- /dev/null +++ b/exercici2/index.html @@ -0,0 +1,37 @@ + + + + + + + + + Basic jS2 + + +
+
+
+ +
+
+
+ TheClick36 +
+
Prompt
+

Click the to see the index of j in:

+

"My favorite dessert is Jelly"

+

+ Go somewhere +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici2/js/functions.js b/exercici2/js/functions.js new file mode 100644 index 0000000..e69de29 From aa11fd1892d9e1bb043d4dc23974fcc6a9af2347 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Aug 2019 00:01:35 +0200 Subject: [PATCH 03/21] exercici2 commit --- exercici1/functions.js | 14 -------------- exercici1/index.html | 2 +- exercici1/js/functions.js | 13 +++++++++++++ exercici2/index.html | 5 ++--- exercici2/js/functions.js | 9 +++++++++ 5 files changed, 25 insertions(+), 18 deletions(-) delete mode 100644 exercici1/functions.js diff --git a/exercici1/functions.js b/exercici1/functions.js deleted file mode 100644 index 701d98e..0000000 --- a/exercici1/functions.js +++ /dev/null @@ -1,14 +0,0 @@ - -let x = "My favorite dessert is Jello"; -let y = x.indexOf('J'); -console.log(y); -document.getElementById('boton1').onClick = function(){ - myFunction() -}; -function myFunction() { - - - document.getElementById('pintar').innerHTML = y; - } - - diff --git a/exercici1/index.html b/exercici1/index.html index 4ce19a1..02fb72c 100644 --- a/exercici1/index.html +++ b/exercici1/index.html @@ -36,7 +36,7 @@
IndexOf()
- + \ No newline at end of file diff --git a/exercici1/js/functions.js b/exercici1/js/functions.js index 4ebc962..701d98e 100644 --- a/exercici1/js/functions.js +++ b/exercici1/js/functions.js @@ -1 +1,14 @@ + let x = "My favorite dessert is Jello"; +let y = x.indexOf('J'); +console.log(y); +document.getElementById('boton1').onClick = function(){ + myFunction() +}; +function myFunction() { + + + document.getElementById('pintar').innerHTML = y; + } + + diff --git a/exercici2/index.html b/exercici2/index.html index 28105f4..1268946 100644 --- a/exercici2/index.html +++ b/exercici2/index.html @@ -19,8 +19,7 @@ TheClick36
Prompt
-

Click the to see the index of j in:

-

"My favorite dessert is Jelly"

+

Click the to see the answer to the prompts!

Go somewhere
@@ -31,7 +30,7 @@
Prompt
- + \ No newline at end of file diff --git a/exercici2/js/functions.js b/exercici2/js/functions.js index e69de29..fbaa9b3 100644 --- a/exercici2/js/functions.js +++ b/exercici2/js/functions.js @@ -0,0 +1,9 @@ +let nombre = prompt('¿ Cual es su nombre por favor?'); +let apellidos = prompt(' ¿y su primer apellido?'); +let juntos = nombre + " " + apellidos; + console.log(nombre + " " + apellidos); + + function myFunction() { + + document.getElementById('pintar').innerHTML = "Hola" + " " + juntos; + } \ No newline at end of file From 7b33537077ba5e47cdb7085188ea2a81320b3f34 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Aug 2019 00:05:39 +0200 Subject: [PATCH 04/21] exercici2.1 commit --- exercici2/js/functions.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/exercici2/js/functions.js b/exercici2/js/functions.js index fbaa9b3..04cff65 100644 --- a/exercici2/js/functions.js +++ b/exercici2/js/functions.js @@ -6,4 +6,7 @@ let juntos = nombre + " " + apellidos; function myFunction() { document.getElementById('pintar').innerHTML = "Hola" + " " + juntos; + if(juntos === 'null' | juntos === 'null', 'null'){ + document.getElementById('pintar').innerHTML = "Hola desconocido!"; + } } \ No newline at end of file From 08db1eef9e497b0d306a6525ea7a4ce47164b27c Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 5 Aug 2019 01:01:59 +0200 Subject: [PATCH 05/21] exercici3inici commit --- exercici3/css/styles.css | 9 +++++++++ exercici3/img/click.png | Bin 0 -> 4974 bytes exercici3/index.html | 36 ++++++++++++++++++++++++++++++++++++ exercici3/js/functions.js | 17 +++++++++++++++++ 4 files changed, 62 insertions(+) create mode 100644 exercici3/css/styles.css create mode 100644 exercici3/img/click.png create mode 100644 exercici3/index.html create mode 100644 exercici3/js/functions.js diff --git a/exercici3/css/styles.css b/exercici3/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici3/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici3/img/click.png b/exercici3/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici3/index.html b/exercici3/index.html new file mode 100644 index 0000000..bef1730 --- /dev/null +++ b/exercici3/index.html @@ -0,0 +1,36 @@ + + + + + + + + + Basic jS3 + + +
+
+
+ +
+
+
+ TheClick36 +
+
Randomly!
+

Click the to see the answer to the prompts!

+

+ Go somewhere +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici3/js/functions.js b/exercici3/js/functions.js new file mode 100644 index 0000000..668ff02 --- /dev/null +++ b/exercici3/js/functions.js @@ -0,0 +1,17 @@ +let texto = prompt('Introduce (broma geak) un "string", para el resto de los ciudadanos cuerdos, una cadena de texto, por favor'); + + + console.log(texto); + +let azar = Math.random(String).toString(36); +console.log(azar); +// not quite lo que busco + + + /* function myFunction() { + + document.getElementById('pintar').innerHTML = "Hola" + " " + juntos; + if(juntos === 'null' | juntos === 'null', 'null'){ + document.getElementById('pintar').innerHTML = "Hola desconocido!"; + } + } */ \ No newline at end of file From dcfb7e5bac2b2bf8b20daa64705595aba690ac91 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Aug 2019 11:30:59 +0200 Subject: [PATCH 06/21] exercici3 commit --- exercici3/js/functions.js | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/exercici3/js/functions.js b/exercici3/js/functions.js index 668ff02..48e5f6e 100644 --- a/exercici3/js/functions.js +++ b/exercici3/js/functions.js @@ -3,15 +3,35 @@ let texto = prompt('Introduce (broma geak) un "string", para el resto de los ciu console.log(texto); -let azar = Math.random(String).toString(36); -console.log(azar); +/* let azar = Math.random(String).toString(36); +console.log(azar); */ // not quite lo que busco +// Debo generar YO el random y no cogerlo del string escrito en prompt +//declaración de DONDE coge el string para generar el random - /* function myFunction() { +let palabras = texto; +// cuantos elementos quiero random +let palabrasLength = " "; +// donde coloco el valor de ese random + + +let azarPalabra = Math.floor(Math.random()* palabras.length); + +let randomPalabra = palabras.substring(azarPalabra, azarPalabra+1); +alert ( 'La siguiente palabra,'+" "+ randomPalabra.toUpperCase() + " " + 'aparece en el texto introducido'); + + function azar(){ +// recorrido palabras pa generar el random +for (i=0; i < palabrasLength; i++){ + document.getElementById('pintar').innerHTML = azar(); + +} + +} + function myFunction() { - document.getElementById('pintar').innerHTML = "Hola" + " " + juntos; - if(juntos === 'null' | juntos === 'null', 'null'){ - document.getElementById('pintar').innerHTML = "Hola desconocido!"; - } - } */ \ No newline at end of file + document.getElementById('pintar').innerHTML = randomPalabra; + +} + \ No newline at end of file From 144434dd611485519df0347d663fa5cffd7afedb Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Aug 2019 11:33:09 +0200 Subject: [PATCH 07/21] exercici3 commit --- exercici3/js/functions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exercici3/js/functions.js b/exercici3/js/functions.js index 48e5f6e..8869263 100644 --- a/exercici3/js/functions.js +++ b/exercici3/js/functions.js @@ -31,7 +31,7 @@ for (i=0; i < palabrasLength; i++){ } function myFunction() { - document.getElementById('pintar').innerHTML = randomPalabra; + document.getElementById('pintar').innerHTML = randomPalabra.toUpperCase(); } \ No newline at end of file From 7563b84059b18fe23a745ea923b9ef07ce342376 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Aug 2019 12:04:52 +0200 Subject: [PATCH 08/21] exercici3 match_math commit --- exercici3 - copia/css/styles.css | 9 +++++++ exercici3 - copia/img/click.png | Bin 0 -> 4974 bytes exercici3 - copia/index.html | 36 +++++++++++++++++++++++++++ exercici3 - copia/js/functions.js | 40 ++++++++++++++++++++++++++++++ exercici3/js/functions.js | 1 + 5 files changed, 86 insertions(+) create mode 100644 exercici3 - copia/css/styles.css create mode 100644 exercici3 - copia/img/click.png create mode 100644 exercici3 - copia/index.html create mode 100644 exercici3 - copia/js/functions.js diff --git a/exercici3 - copia/css/styles.css b/exercici3 - copia/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici3 - copia/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici3 - copia/img/click.png b/exercici3 - copia/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici3 - copia/index.html b/exercici3 - copia/index.html new file mode 100644 index 0000000..1d4ece2 --- /dev/null +++ b/exercici3 - copia/index.html @@ -0,0 +1,36 @@ + + + + + + + + + Basic jS3/Copia + + +
+
+
+ +
+
+
+ TheClick36 +
+
Match!
+

Click the to see if it is true or false.

+

+ Go somewhere +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici3 - copia/js/functions.js b/exercici3 - copia/js/functions.js new file mode 100644 index 0000000..79e3ac3 --- /dev/null +++ b/exercici3 - copia/js/functions.js @@ -0,0 +1,40 @@ +let texto = prompt('Introduce (broma geak) un "string", para el resto de los ciudadanos cuerdos, una cadena de texto, por favor'); + + + console.log(texto); + + +// Debo generar YO el random y no cogerlo del string escrito en prompt + +//declaración de DONDE coge el string para generar el random + +let palabras = "ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz"; +// cuantos elementos quiero random +let palabrasLength = " "; +// donde coloco el valor de ese random + + +let azarPalabra = Math.floor(Math.random()* palabras.length); + +let randomPalabra = palabras.substring(azarPalabra, azarPalabra+1); +//comparamos los dos valores + +let compara = texto.includes(randomPalabra); + +alert ( 'La siguiente palabra,'+" "+ compara + " " + 'aparece en el texto introducido'); + +/* function azar(){ +// recorrido palabras pa generar el random +for (i=0; i < palabrasLength; i++){ + document.getElementById('pintar').innerHTML = azar(); + +} + +} */ + function myFunction() { + + document.getElementById('pintar').innerHTML = compara; + +} +/* Finalmente he tenido que buscar el random en el prompt. pequeño descanso y quiero hacerlo con un random */ + \ No newline at end of file diff --git a/exercici3/js/functions.js b/exercici3/js/functions.js index 8869263..3f28d7d 100644 --- a/exercici3/js/functions.js +++ b/exercici3/js/functions.js @@ -34,4 +34,5 @@ for (i=0; i < palabrasLength; i++){ document.getElementById('pintar').innerHTML = randomPalabra.toUpperCase(); } +/* Finalmente he tenido que buscar el random en el prompt. pequeño descanso y quiero hacerlo con un random */ \ No newline at end of file From 80f131a4c513d164900330f162f757612bd4e385 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Aug 2019 17:49:07 +0200 Subject: [PATCH 09/21] exercici4 commit --- exercici4/css/styles.css | 9 ++++++++ exercici4/img/click.png | Bin 0 -> 4974 bytes exercici4/index.html | 42 ++++++++++++++++++++++++++++++++++++++ exercici4/js/functions.js | 25 +++++++++++++++++++++++ 4 files changed, 76 insertions(+) create mode 100644 exercici4/css/styles.css create mode 100644 exercici4/img/click.png create mode 100644 exercici4/index.html create mode 100644 exercici4/js/functions.js diff --git a/exercici4/css/styles.css b/exercici4/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici4/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici4/img/click.png b/exercici4/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici4/index.html b/exercici4/index.html new file mode 100644 index 0000000..1f19896 --- /dev/null +++ b/exercici4/index.html @@ -0,0 +1,42 @@ + + + + + + + + + Basic jS4 + + +
+
+
+ +
+
+
+ TheClick36 +
+
Jubilación
+

Click the to see how long til...

+

You stop working!

+

+ + Go somewhere +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici4/js/functions.js b/exercici4/js/functions.js new file mode 100644 index 0000000..bfb8dca --- /dev/null +++ b/exercici4/js/functions.js @@ -0,0 +1,25 @@ + +let edad = prompt("How old are you?"); +let edadJubilacion = 67; +let jubiladoYa = (edadJubilacion - edad); +console.log(edad); + +function jubilado(){ + if(edad < edadJubilacion){ + alert("You need still" +" "+ jubiladoYa +" " +" to become a goverment employ!") + }else{ + alert("You are rather lucky,"+" "+ -jubiladoYa +" "+ "years enjoying your well earned peace of mind.") + } +} +document.getElementById('boton1').onClick = function(){ + myFunction(); +} + +function myFunction() { + + + document.getElementById('pintar').innerHTML = jubilado(); + } + + + From 9402029844936ef274f0ea8ec0e8f06efa7f67ad Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Aug 2019 17:55:08 +0200 Subject: [PATCH 10/21] exercici4.1 commit --- exercici4/js/functions.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/exercici4/js/functions.js b/exercici4/js/functions.js index bfb8dca..da4f004 100644 --- a/exercici4/js/functions.js +++ b/exercici4/js/functions.js @@ -15,9 +15,7 @@ document.getElementById('boton1').onClick = function(){ myFunction(); } -function myFunction() { - - +function myFunction() { document.getElementById('pintar').innerHTML = jubilado(); } From 846089d507b1ff8e02a38d95832d2aa5735c3675 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Aug 2019 17:55:58 +0200 Subject: [PATCH 11/21] exercici4.1 commit --- exercici4/js/functions.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/exercici4/js/functions.js b/exercici4/js/functions.js index da4f004..b569565 100644 --- a/exercici4/js/functions.js +++ b/exercici4/js/functions.js @@ -18,6 +18,8 @@ document.getElementById('boton1').onClick = function(){ function myFunction() { document.getElementById('pintar').innerHTML = jubilado(); } + //por qué undefined? + // From 22bd45c3707c39b2691856646e33d259bbc72097 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 6 Aug 2019 18:07:32 +0200 Subject: [PATCH 12/21] exercici4.2 commit --- exercici4/js/functions.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/exercici4/js/functions.js b/exercici4/js/functions.js index b569565..9c47226 100644 --- a/exercici4/js/functions.js +++ b/exercici4/js/functions.js @@ -4,6 +4,7 @@ let edadJubilacion = 67; let jubiladoYa = (edadJubilacion - edad); console.log(edad); + function jubilado(){ if(edad < edadJubilacion){ alert("You need still" +" "+ jubiladoYa +" " +" to become a goverment employ!") @@ -14,10 +15,10 @@ function jubilado(){ document.getElementById('boton1').onClick = function(){ myFunction(); } - function myFunction() { - document.getElementById('pintar').innerHTML = jubilado(); - } + document.getElementById('pintar').innerHTML = jubilado(); + } + //por qué undefined? // From 50c20c12f922adc98789b435ac2bfde35b050977 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 11 Aug 2019 17:22:51 +0200 Subject: [PATCH 13/21] checklist commit --- basicos.code-workspace | 13 ++++++++ exercici1/js/functions.js | 5 +-- exercici3/index.html | 2 +- exercici4/index.html | 2 +- exercici5/css/styles.css | 9 ++++++ exercici5/img/click.png | Bin 0 -> 4974 bytes exercici5/index.html | 63 ++++++++++++++++++++++++++++++++++++++ exercici5/js/functions.js | 28 +++++++++++++++++ 8 files changed, 118 insertions(+), 4 deletions(-) create mode 100644 basicos.code-workspace create mode 100644 exercici5/css/styles.css create mode 100644 exercici5/img/click.png create mode 100644 exercici5/index.html create mode 100644 exercici5/js/functions.js diff --git a/basicos.code-workspace b/basicos.code-workspace new file mode 100644 index 0000000..76533e5 --- /dev/null +++ b/basicos.code-workspace @@ -0,0 +1,13 @@ +{ + "folders": [ + { + "path": "." + }, + { + "path": "C:\\Users\\usuario\\Desktop\\Ejercicios\\xabier\\botones compra" + } + ], + "settings": { + "workbench.colorCustomizations": {} + } +} \ No newline at end of file diff --git a/exercici1/js/functions.js b/exercici1/js/functions.js index 701d98e..394e863 100644 --- a/exercici1/js/functions.js +++ b/exercici1/js/functions.js @@ -2,9 +2,10 @@ let x = "My favorite dessert is Jello"; let y = x.indexOf('J'); console.log(y); -document.getElementById('boton1').onClick = function(){ +/* document.getElementById('boton1').onClick = function(){ myFunction() -}; +}; */ + function myFunction() { diff --git a/exercici3/index.html b/exercici3/index.html index bef1730..6701bb1 100644 --- a/exercici3/index.html +++ b/exercici3/index.html @@ -21,7 +21,7 @@
Randomly!

Click the to see the answer to the prompts!

- Go somewhere + Go somewhere diff --git a/exercici4/index.html b/exercici4/index.html index 1f19896..5ec0de1 100644 --- a/exercici4/index.html +++ b/exercici4/index.html @@ -27,7 +27,7 @@
Jubilación

--> - Go somewhere + Go somewhere diff --git a/exercici5/css/styles.css b/exercici5/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici5/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici5/img/click.png b/exercici5/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici5/index.html b/exercici5/index.html new file mode 100644 index 0000000..e741718 --- /dev/null +++ b/exercici5/index.html @@ -0,0 +1,63 @@ + + + + + + + + + Basic jS5 + + +
+
+
+ + + +
+
+
+ TheClick36 +
+
Beverages
+
+ + +
+
+ + +
+
+ + +
+
+

Click the to see what kind of beverages

+

you are allow to take

+

+ + Go somewhere +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici5/js/functions.js b/exercici5/js/functions.js new file mode 100644 index 0000000..0b43ba2 --- /dev/null +++ b/exercici5/js/functions.js @@ -0,0 +1,28 @@ +let bebidas = [ + 'cerveza', + 'coca-cola', + 'leche' +]; +let edad = prompt('How old are you?'); + +document.getElementById('boton1').onClick = function(){ + myFunction(); +} +function myFunction() { + + + document.getElementById('pintar').innerHTML = edad; + } +function addClassCheck(e){ + if(e.checked){ + e.classList.add("marked"); + }else{ + e.classList.remove("marked"); + } + if(document.getElementsByClassName("marked").length > 1){ + alert("Marca sólo una opción por favor."); + e.checked = false; + e.classList.remove("marked"); + } +} + From 153d6c98934957833fdb6cc0b49847c2a6af3b95 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 11 Aug 2019 17:39:32 +0200 Subject: [PATCH 14/21] funcionesque faltan commit --- exercici5/js/functions.js | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/exercici5/js/functions.js b/exercici5/js/functions.js index 0b43ba2..5060eee 100644 --- a/exercici5/js/functions.js +++ b/exercici5/js/functions.js @@ -25,4 +25,10 @@ function addClassCheck(e){ e.classList.remove("marked"); } } +function dataCheckBox(){ + +} +function mayorEdad(){ + //necesito recoger la data del checkbox primero +} From 6fac20cd45927ac26ef39ffcc83d1b017004ce64 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Aug 2019 00:45:37 +0200 Subject: [PATCH 15/21] exercici5 casilisto commit --- exercici5/index.html | 12 +++++++---- exercici5/js/functions.js | 43 ++++++++++++++++++++++++++++++++++++++- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/exercici5/index.html b/exercici5/index.html index e741718..352bf70 100644 --- a/exercici5/index.html +++ b/exercici5/index.html @@ -22,19 +22,19 @@
Beverages
- +
- +
- + @@ -48,7 +48,7 @@
Beverages

--> - Go somewhere + Go somewhere
@@ -57,6 +57,10 @@
Beverages
+ diff --git a/exercici5/js/functions.js b/exercici5/js/functions.js index 5060eee..0738e54 100644 --- a/exercici5/js/functions.js +++ b/exercici5/js/functions.js @@ -3,7 +3,11 @@ let bebidas = [ 'coca-cola', 'leche' ]; -let edad = prompt('How old are you?'); +/* let edad = prompt('How old are you?'); */ + +/* let cervezaCheck = document.getElementById('check1').checked; +console.log(cervezaCheck); */ +/*Con esta formula no me deja ni elegir del checklist */ document.getElementById('boton1').onClick = function(){ myFunction(); @@ -25,6 +29,34 @@ function addClassCheck(e){ e.classList.remove("marked"); } } +function getValue(value){ + let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); + if( edadBebidas == ('')){ + alert('no age, no drink!'); + }else if( edadBebidas < ('18')){ + alert('There is no way you can drink that here. Truly sorry.'); + }else{ + alert('You are big enough, do enjoy it!'); + } +} +function getValue1(value){ + let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); + if( edadBebidas == ('')){ + alert('no age, no drink!'); + }else if( edadBebidas < ('16')){ + alert('Your teeth are not ready yet!'); + }else{ + alert('Have fun and enjoy it!'); + } +} +function getValue2(value){ + let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); + if( edadBebidas == ('')){ + alert('no age, no drink!'); + }else{ + alert('Best thing to look after yourself!'); + } +} function dataCheckBox(){ } @@ -32,3 +64,12 @@ function mayorEdad(){ //necesito recoger la data del checkbox primero } + +/*BIBLIOGRAFIA +Checklist + +Recogida datos check list y aparición prompt + +https://stackoverflow.com/questions/11599666/get-the-value-of-checked-checkbox +respuesta: ZOE +*/ From d38fa2e387c7006007fc4ac87e4d59d51a1c18f5 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Aug 2019 12:05:23 +0200 Subject: [PATCH 16/21] finito5 commit --- exercici5/js/functions.js | 38 ++++++++++++++++++++++++++++++-------- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/exercici5/js/functions.js b/exercici5/js/functions.js index 0738e54..5121f57 100644 --- a/exercici5/js/functions.js +++ b/exercici5/js/functions.js @@ -13,10 +13,18 @@ document.getElementById('boton1').onClick = function(){ myFunction(); } function myFunction() { - + let edadBebidas = prompt( " "+'How old you said you are?'); + if( edadBebidas == ('')){ + document.getElementById('pintar').innerHTML = ('no age, no drink!'); + }else if( edadBebidas < ('18')){ + document.getElementById('pintar').innerHTML = ('You could have Coca-cola or Milk.'); + }else{ + document.getElementById('pintar').innerHTML =('You are big enough to have' + " "+ bebidas + " "+' do enjoy it!'); + } - document.getElementById('pintar').innerHTML = edad; + /* document.getElementById('pintar').innerHTML = bebidas; */ } + function addClassCheck(e){ if(e.checked){ e.classList.add("marked"); @@ -29,7 +37,14 @@ function addClassCheck(e){ e.classList.remove("marked"); } } + function getValue(value){ + //variable para evitar que salte el prompt al desmarcar casilla + // No es mia, let(var) realizada por Xabier Ayape + let marcados = document.getElementsByClassName("marked"); + if(marcados.length == 0){ + return; +} let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); if( edadBebidas == ('')){ alert('no age, no drink!'); @@ -40,6 +55,12 @@ function getValue(value){ } } function getValue1(value){ + //variable para evitar que salte el prompt al desmarcar casilla + // No es mia, let(var) realizada por Xabier Ayape + let marcados = document.getElementsByClassName("marked"); + if(marcados.length == 0){ + return; +} let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); if( edadBebidas == ('')){ alert('no age, no drink!'); @@ -50,6 +71,12 @@ function getValue1(value){ } } function getValue2(value){ + //variable para evitar que salte el prompt al desmarcar casilla + // No es mia, let(var) realizada por Xabier Ayape + let marcados = document.getElementsByClassName("marked"); + if(marcados.length == 0){ + return; +} let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); if( edadBebidas == ('')){ alert('no age, no drink!'); @@ -57,12 +84,7 @@ function getValue2(value){ alert('Best thing to look after yourself!'); } } -function dataCheckBox(){ - -} -function mayorEdad(){ - //necesito recoger la data del checkbox primero -} + /*BIBLIOGRAFIA From 72399324269f10d1faa8404ba8765927d9e7e80a Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Aug 2019 12:35:34 +0200 Subject: [PATCH 17/21] exercici6 done commit --- exercici6/css/styles.css | 9 +++++++++ exercici6/img/click.png | Bin 0 -> 4974 bytes exercici6/index.html | 41 ++++++++++++++++++++++++++++++++++++++ exercici6/js/functions.js | 19 ++++++++++++++++++ 4 files changed, 69 insertions(+) create mode 100644 exercici6/css/styles.css create mode 100644 exercici6/img/click.png create mode 100644 exercici6/index.html create mode 100644 exercici6/js/functions.js diff --git a/exercici6/css/styles.css b/exercici6/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici6/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici6/img/click.png b/exercici6/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici6/index.html b/exercici6/index.html new file mode 100644 index 0000000..b18e2f9 --- /dev/null +++ b/exercici6/index.html @@ -0,0 +1,41 @@ + + + + + + + + + Basic jS6 + + +
+
+
+ +
+
+
+ TheClick36 +
+
toUpperCase
+

Click the to see wonders with your name.

+

+ + Go toUpperCase! +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici6/js/functions.js b/exercici6/js/functions.js new file mode 100644 index 0000000..b9531b0 --- /dev/null +++ b/exercici6/js/functions.js @@ -0,0 +1,19 @@ + + +let x = prompt('Write your name dear friend.'); + + +function myFunction() { + + if(x == ('')){ + document.getElementById('pintar').innerHTML = ('No name, no gain!'); + }else{ + + document.getElementById('pintar').innerHTML = (x.toUpperCase() + " " +" press F12"); + + } + +} +console.log(x.toUpperCase() + " "+ " is a great name!"); + + From 5e7e869013229c3d3cdb0258a089f15baeb05978 Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 12 Aug 2019 12:46:20 +0200 Subject: [PATCH 18/21] bibliografia commit --- exercici5/js/functions.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/exercici5/js/functions.js b/exercici5/js/functions.js index 5121f57..ecb967e 100644 --- a/exercici5/js/functions.js +++ b/exercici5/js/functions.js @@ -14,6 +14,7 @@ document.getElementById('boton1').onClick = function(){ } function myFunction() { let edadBebidas = prompt( " "+'How old you said you are?'); + edadBebidas = parseInt(edadBebidas); if( edadBebidas == ('')){ document.getElementById('pintar').innerHTML = ('no age, no drink!'); }else if( edadBebidas < ('18')){ @@ -46,6 +47,7 @@ function getValue(value){ return; } let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); + edadBebidas = parseInt(edadBebidas); if( edadBebidas == ('')){ alert('no age, no drink!'); }else if( edadBebidas < ('18')){ @@ -62,6 +64,7 @@ function getValue1(value){ return; } let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); + edadBebidas = parseInt(edadBebidas); if( edadBebidas == ('')){ alert('no age, no drink!'); }else if( edadBebidas < ('16')){ @@ -78,6 +81,7 @@ function getValue2(value){ return; } let edadBebidas = prompt(value +" "+ "...um, ...let me see:"+ " "+'How old are you?'); + edadBebidas = parseInt(edadBebidas); if( edadBebidas == ('')){ alert('no age, no drink!'); }else{ @@ -94,4 +98,10 @@ Recogida datos check list y aparición prompt https://stackoverflow.com/questions/11599666/get-the-value-of-checked-checkbox respuesta: ZOE + +******************* +parseInt + Transformación string a numero + + https://github.com/bcncodes-training/basics-JS/blob/master/jubilacion.js */ From c3c0cfeb5c9d3564c9c3c82388faf114a8a7ff37 Mon Sep 17 00:00:00 2001 From: unknown Date: Sat, 28 Sep 2019 20:51:49 +0200 Subject: [PATCH 19/21] check commit --- kata_grow/css/styles.css | 9 ++++++++ kata_grow/img/click.png | Bin 0 -> 4974 bytes kata_grow/index.html | 42 ++++++++++++++++++++++++++++++++++++++ kata_grow/js/functions.js | 15 ++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 kata_grow/css/styles.css create mode 100644 kata_grow/img/click.png create mode 100644 kata_grow/index.html create mode 100644 kata_grow/js/functions.js diff --git a/kata_grow/css/styles.css b/kata_grow/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/kata_grow/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/kata_grow/img/click.png b/kata_grow/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/kata_grow/index.html b/kata_grow/index.html new file mode 100644 index 0000000..02fb72c --- /dev/null +++ b/kata_grow/index.html @@ -0,0 +1,42 @@ + + + + + + + + + Basic jS1 + + +
+
+
+ +
+
+
+ TheClick36 +
+
IndexOf()
+

Click the to see the index of j in:

+

"My favorite dessert is Jelly"

+

+ + Go somewhere +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/kata_grow/js/functions.js b/kata_grow/js/functions.js new file mode 100644 index 0000000..394e863 --- /dev/null +++ b/kata_grow/js/functions.js @@ -0,0 +1,15 @@ + +let x = "My favorite dessert is Jello"; +let y = x.indexOf('J'); +console.log(y); +/* document.getElementById('boton1').onClick = function(){ + myFunction() +}; */ + +function myFunction() { + + + document.getElementById('pintar').innerHTML = y; + } + + From 8f7486e2c44e4cd55a5a8ae6bb12dccb233e972f Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 28 Nov 2019 00:21:16 +0100 Subject: [PATCH 20/21] revision commit --- exercici2/js/functions.js | 14 +++++----- exercici3 - copia/index.html | 4 ++- exercici3 - copia/js/functions.js | 44 ++++++++++++++---------------- exercici3/index.html | 3 ++ exercici3/js/functions.js | 12 ++++---- exercici4/js/functions.js | 25 +++++++++-------- exercici6/js/functions.js | 11 ++++++-- exercici7/css/styles.css | 9 ++++++ exercici7/img/click.png | Bin 0 -> 4974 bytes exercici7/index.html | 41 ++++++++++++++++++++++++++++ exercici7/js/functions.js | 27 ++++++++++++++++++ exercici8/css/styles.css | 9 ++++++ exercici8/img/click.png | Bin 0 -> 4974 bytes exercici8/index.html | 41 ++++++++++++++++++++++++++++ exercici8/js/functions.js | 31 +++++++++++++++++++++ 15 files changed, 219 insertions(+), 52 deletions(-) create mode 100644 exercici7/css/styles.css create mode 100644 exercici7/img/click.png create mode 100644 exercici7/index.html create mode 100644 exercici7/js/functions.js create mode 100644 exercici8/css/styles.css create mode 100644 exercici8/img/click.png create mode 100644 exercici8/index.html create mode 100644 exercici8/js/functions.js diff --git a/exercici2/js/functions.js b/exercici2/js/functions.js index 04cff65..6387e6a 100644 --- a/exercici2/js/functions.js +++ b/exercici2/js/functions.js @@ -1,12 +1,12 @@ let nombre = prompt('¿ Cual es su nombre por favor?'); let apellidos = prompt(' ¿y su primer apellido?'); -let juntos = nombre + " " + apellidos; +let juntos = (`${nombre} ${apellidos}`); console.log(nombre + " " + apellidos); function myFunction() { - - document.getElementById('pintar').innerHTML = "Hola" + " " + juntos; - if(juntos === 'null' | juntos === 'null', 'null'){ - document.getElementById('pintar').innerHTML = "Hola desconocido!"; - } - } \ No newline at end of file + juntos == (`${nombre = ' '}`)|| juntos == (`${nombre = ' '} ${apellidos = ' '}`)? + document.getElementById('pintar').innerHTML = "Hola desconocido!": + + document.getElementById('pintar').innerHTML = (`Hola ${juntos}`); + + } ; \ No newline at end of file diff --git a/exercici3 - copia/index.html b/exercici3 - copia/index.html index 1d4ece2..4832715 100644 --- a/exercici3 - copia/index.html +++ b/exercici3 - copia/index.html @@ -19,8 +19,10 @@ TheClick36
Match!
-

Click the to see if it is true or false.

+

Click the to see if the words match!.

+

+

Go somewhere
diff --git a/exercici3 - copia/js/functions.js b/exercici3 - copia/js/functions.js index 79e3ac3..1bbdf93 100644 --- a/exercici3 - copia/js/functions.js +++ b/exercici3 - copia/js/functions.js @@ -1,28 +1,5 @@ -let texto = prompt('Introduce (broma geak) un "string", para el resto de los ciudadanos cuerdos, una cadena de texto, por favor'); - console.log(texto); - - -// Debo generar YO el random y no cogerlo del string escrito en prompt - -//declaración de DONDE coge el string para generar el random - -let palabras = "ABCDEFGHIJKLMNOPQRSTUVWXTZabcdefghiklmnopqrstuvwxyz"; -// cuantos elementos quiero random -let palabrasLength = " "; -// donde coloco el valor de ese random - - -let azarPalabra = Math.floor(Math.random()* palabras.length); - -let randomPalabra = palabras.substring(azarPalabra, azarPalabra+1); -//comparamos los dos valores - -let compara = texto.includes(randomPalabra); - -alert ( 'La siguiente palabra,'+" "+ compara + " " + 'aparece en el texto introducido'); - /* function azar(){ // recorrido palabras pa generar el random for (i=0; i < palabrasLength; i++){ @@ -32,7 +9,26 @@ for (i=0; i < palabrasLength; i++){ } */ function myFunction() { - + let texto = prompt('Introduce una palabra de la A a la Z').toLowerCase(); + + document.getElementById('pintar1').innerHTML = (`La letra inscrita es la ${texto}`); + + // Debo generar YO el random y no cogerlo del string escrito en prompt + + //declaración de DONDE coge el string para generar el random + + let palabras = "ABCÇDEFGHIJKLMNOPQRSTUVWXTZabcçdefghiklmnopqrstuvwxyz"; + // cuantos elementos quiero random + // let palabrasLength = " "; + // donde coloco el valor de ese random + + let azarPalabra = Math.floor(Math.random()* palabras.toLowerCase().length); + + let randomPalabra = palabras.toLowerCase().substring(azarPalabra, azarPalabra+1); + document.getElementById('pintar2').innerHTML = (`La letra generada es la ${randomPalabra}`); + //comparamos los dos valores + + let compara = texto.includes(randomPalabra); document.getElementById('pintar').innerHTML = compara; } diff --git a/exercici3/index.html b/exercici3/index.html index 6701bb1..28e76b5 100644 --- a/exercici3/index.html +++ b/exercici3/index.html @@ -21,6 +21,9 @@
Randomly!

Click the to see the answer to the prompts!

+

+

+

Go somewhere diff --git a/exercici3/js/functions.js b/exercici3/js/functions.js index 3f28d7d..0d811a3 100644 --- a/exercici3/js/functions.js +++ b/exercici3/js/functions.js @@ -1,4 +1,4 @@ -let texto = prompt('Introduce (broma geak) un "string", para el resto de los ciudadanos cuerdos, una cadena de texto, por favor'); +let texto = prompt('Introduce letras de la A a la Z'); console.log(texto); @@ -18,20 +18,18 @@ let palabrasLength = " "; let azarPalabra = Math.floor(Math.random()* palabras.length); -let randomPalabra = palabras.substring(azarPalabra, azarPalabra+1); -alert ( 'La siguiente palabra,'+" "+ randomPalabra.toUpperCase() + " " + 'aparece en el texto introducido'); - function azar(){ // recorrido palabras pa generar el random for (i=0; i < palabrasLength; i++){ document.getElementById('pintar').innerHTML = azar(); - + console.log(azar); } } function myFunction() { - - document.getElementById('pintar').innerHTML = randomPalabra.toUpperCase(); + let randomPalabra = palabras.substring(azarPalabra, azarPalabra+1); + document.getElementById('pintar2').innerHTML = ( 'La letra introducida,'+" "+ randomPalabra.toUpperCase() + " " + 'aparece en el texto generado al azar'); + document.getElementById('pintar1').innerHTML = randomPalabra.toUpperCase(); } /* Finalmente he tenido que buscar el random en el prompt. pequeño descanso y quiero hacerlo con un random */ diff --git a/exercici4/js/functions.js b/exercici4/js/functions.js index 9c47226..c03afe3 100644 --- a/exercici4/js/functions.js +++ b/exercici4/js/functions.js @@ -5,22 +5,25 @@ let jubiladoYa = (edadJubilacion - edad); console.log(edad); -function jubilado(){ +/* function jubilado(){ if(edad < edadJubilacion){ - alert("You need still" +" "+ jubiladoYa +" " +" to become a goverment employ!") + return ("You need still" +" "+ jubiladoYa +" " +" to become a goverment employ!") }else{ - alert("You are rather lucky,"+" "+ -jubiladoYa +" "+ "years enjoying your well earned peace of mind.") + return ("You are rather lucky,"+" "+ -jubiladoYa +" "+ "years enjoying your well earned peace of mind.") } -} -document.getElementById('boton1').onClick = function(){ - myFunction(); -} +}; + function myFunction() { document.getElementById('pintar').innerHTML = jubilado(); - } - - //por qué undefined? - // + } ; + document.getElementById('boton1').onClick = function(){ + myFunction(); +}; */ + const myFunction = () =>{ + edad < edadJubilacion ? + document.getElementById('pintar').innerHTML = (`You need still ${jubiladoYa} to become a goverment employ!`): + document.getElementById('pintar').innerHTML = (`You are rather lucky ${-jubiladoYa} years enjoying your well earned peace of mind.`); + } diff --git a/exercici6/js/functions.js b/exercici6/js/functions.js index b9531b0..215a1dd 100644 --- a/exercici6/js/functions.js +++ b/exercici6/js/functions.js @@ -3,7 +3,7 @@ let x = prompt('Write your name dear friend.'); -function myFunction() { +/* function myFunction() { if(x == ('')){ document.getElementById('pintar').innerHTML = ('No name, no gain!'); @@ -14,6 +14,13 @@ function myFunction() { } } -console.log(x.toUpperCase() + " "+ " is a great name!"); +console.log(x.toUpperCase() + " "+ " is a great name!"); */ + +const myFunction = () =>{ + x == ('') ? + document.getElementById('pintar').innerHTML = ('No name, no gain!'): + document.getElementById('pintar').innerHTML = (x.toUpperCase() + " " +" press F12"); +}; + diff --git a/exercici7/css/styles.css b/exercici7/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici7/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici7/img/click.png b/exercici7/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici7/index.html b/exercici7/index.html new file mode 100644 index 0000000..4f3dc62 --- /dev/null +++ b/exercici7/index.html @@ -0,0 +1,41 @@ + + + + + + + + + Basic jS7 + + +
+
+
+ +
+
+
+ TheClick36 +
+
Intro Data
+

Click the to see the driver's name.

+

+ + Intro Data! +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici7/js/functions.js b/exercici7/js/functions.js new file mode 100644 index 0000000..33c6ec3 --- /dev/null +++ b/exercici7/js/functions.js @@ -0,0 +1,27 @@ + + +let x = prompt('Write a name for the Driver.'); +let nameDriver = 'Mister D'; +/* function myFunction() { + let namePrompt = ()=>{ + if(x == ('')){ + document.getElementById('pintar').innerHTML = ('No name, no gain!'); + }else{ + + document.getElementById('pintar').innerHTML = (x.toUpperCase() + " " +" is your driving name"+ ('
') + `${nameDriver} is the browser's name`); + + + } + } + return namePrompt(); + +}; +console.log(x.toUpperCase() + " "+ " is a great name!"); */ + +const myFunction = () =>{ + (x == (''))? + document.getElementById('pintar').innerHTML = ('No name, no gain!'): + document.getElementById('pintar').innerHTML = (x.toUpperCase() + " " +" is your driving name"+ ('
') + `${nameDriver} is the browser's name`); +}; + + diff --git a/exercici8/css/styles.css b/exercici8/css/styles.css new file mode 100644 index 0000000..9d6ad0c --- /dev/null +++ b/exercici8/css/styles.css @@ -0,0 +1,9 @@ +@import url('https://fonts.googleapis.com/css?family=Raleway:400,500,600,700,800&display=swap'); +body{ + font-family: 'Raleway', Verdana, Geneva, Tahoma, sans-serif; + font-size: 125%; + +} +.container{ + margin-top:9vh; +} \ No newline at end of file diff --git a/exercici8/img/click.png b/exercici8/img/click.png new file mode 100644 index 0000000000000000000000000000000000000000..1d239a5ff86873d82479533c9f7db35b851e81f2 GIT binary patch literal 4974 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 W%r}r7b?^V{$I!r3zeewI{Qm)FqFd7d literal 0 HcmV?d00001 diff --git a/exercici8/index.html b/exercici8/index.html new file mode 100644 index 0000000..edb762b --- /dev/null +++ b/exercici8/index.html @@ -0,0 +1,41 @@ + + + + + + + + + Basic jS8 + + +
+
+
+ +
+
+
+ TheClick36 +
+
Name's length
+

Click the to see the larger's name.

+

+ + length! +
+
+
+
+ +
+
+
+ + + + \ No newline at end of file diff --git a/exercici8/js/functions.js b/exercici8/js/functions.js new file mode 100644 index 0000000..578fd86 --- /dev/null +++ b/exercici8/js/functions.js @@ -0,0 +1,31 @@ + + +let x = prompt('Write a name for the Driver.'); +let nameDriver = 'Mister D'; +/* let larger = x.length > nameDriver.length; +let shorter = x.length < nameDriver.length; +let same = x.length == nameDriver.length; */ +// aprender a utilizarlos como parametros + +const myFunction = ()=> { + larger = x.length > nameDriver.length? + document.getElementById('pintar').innerHTML = (`You ${x} got a larger name, it has ${x.length} characters`): + document.getElementById('pintar').innerHTML = (`I, ${nameDriver} got the larger name, I've got ${nameDriver.length} characters`); + same = x.length == nameDriver.length? + document.getElementById('pintar').innerHTML = (`You ${x} and I ${nameDriver} gort the same number of characters`): + false; + none = x.length == ""? + document.getElementById('pintar').innerHTML = (`No name, no game`): + false; +}; + + + +/* const myFunction = ()=> { + larger? + document.getElementById('pintar').innerHTML = (`You ${x} got a larger name, it has ${x.length} characters`): + document.getElementById('pintar').innerHTML = (`I, ${nameDriver} got the larger name, I've got ${nameDriver.length} characters`); + same? + document.getElementById('pintar').innerHTML = (`You ${x} and I ${nameDriver} gort the same number of characters`): + false; +}; */ \ No newline at end of file From 473f453fbc8f1f970a234ee430f7a2294ab96d29 Mon Sep 17 00:00:00 2001 From: unknown Date: Fri, 29 Nov 2019 11:40:33 +0100 Subject: [PATCH 21/21] =?UTF-8?q?refactorizaci=C3=B3n=20commit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- exercici3 - copia/js/functions.js | 36 ------------- exercici3/index.html | 9 ++-- exercici3/js/functions.js | 48 +++++++++--------- exercici8/js/functions.js | 5 +- .../css/styles.css | 0 .../img/click.png | Bin {exercici3 - copia => exercici9}/index.html | 15 +++--- exercici9/js/functions.js | 36 +++++++++++++ 8 files changed, 77 insertions(+), 72 deletions(-) delete mode 100644 exercici3 - copia/js/functions.js rename {exercici3 - copia => exercici9}/css/styles.css (100%) rename {exercici3 - copia => exercici9}/img/click.png (100%) rename {exercici3 - copia => exercici9}/index.html (68%) create mode 100644 exercici9/js/functions.js diff --git a/exercici3 - copia/js/functions.js b/exercici3 - copia/js/functions.js deleted file mode 100644 index 1bbdf93..0000000 --- a/exercici3 - copia/js/functions.js +++ /dev/null @@ -1,36 +0,0 @@ - - -/* function azar(){ -// recorrido palabras pa generar el random -for (i=0; i < palabrasLength; i++){ - document.getElementById('pintar').innerHTML = azar(); - -} - -} */ - function myFunction() { - let texto = prompt('Introduce una palabra de la A a la Z').toLowerCase(); - - document.getElementById('pintar1').innerHTML = (`La letra inscrita es la ${texto}`); - - // Debo generar YO el random y no cogerlo del string escrito en prompt - - //declaración de DONDE coge el string para generar el random - - let palabras = "ABCÇDEFGHIJKLMNOPQRSTUVWXTZabcçdefghiklmnopqrstuvwxyz"; - // cuantos elementos quiero random - // let palabrasLength = " "; - // donde coloco el valor de ese random - - let azarPalabra = Math.floor(Math.random()* palabras.toLowerCase().length); - - let randomPalabra = palabras.toLowerCase().substring(azarPalabra, azarPalabra+1); - document.getElementById('pintar2').innerHTML = (`La letra generada es la ${randomPalabra}`); - //comparamos los dos valores - - let compara = texto.includes(randomPalabra); - document.getElementById('pintar').innerHTML = compara; - -} -/* Finalmente he tenido que buscar el random en el prompt. pequeño descanso y quiero hacerlo con un random */ - \ No newline at end of file diff --git a/exercici3/index.html b/exercici3/index.html index 28e76b5..4832715 100644 --- a/exercici3/index.html +++ b/exercici3/index.html @@ -6,7 +6,7 @@ - Basic jS3 + Basic jS3/Copia
@@ -18,13 +18,12 @@
TheClick36
-
Randomly!
-

Click the to see the answer to the prompts!

+
Match!
+

Click the to see if the words match!.

-

- Go somewhere + Go somewhere
diff --git a/exercici3/js/functions.js b/exercici3/js/functions.js index 0d811a3..1bbdf93 100644 --- a/exercici3/js/functions.js +++ b/exercici3/js/functions.js @@ -1,35 +1,35 @@ -let texto = prompt('Introduce letras de la A a la Z'); - console.log(texto); - -/* let azar = Math.random(String).toString(36); -console.log(azar); */ -// not quite lo que busco -// Debo generar YO el random y no cogerlo del string escrito en prompt - -//declaración de DONDE coge el string para generar el random - -let palabras = texto; -// cuantos elementos quiero random -let palabrasLength = " "; -// donde coloco el valor de ese random - - -let azarPalabra = Math.floor(Math.random()* palabras.length); - - function azar(){ +/* function azar(){ // recorrido palabras pa generar el random for (i=0; i < palabrasLength; i++){ document.getElementById('pintar').innerHTML = azar(); - console.log(azar); + } -} +} */ function myFunction() { - let randomPalabra = palabras.substring(azarPalabra, azarPalabra+1); - document.getElementById('pintar2').innerHTML = ( 'La letra introducida,'+" "+ randomPalabra.toUpperCase() + " " + 'aparece en el texto generado al azar'); - document.getElementById('pintar1').innerHTML = randomPalabra.toUpperCase(); + let texto = prompt('Introduce una palabra de la A a la Z').toLowerCase(); + + document.getElementById('pintar1').innerHTML = (`La letra inscrita es la ${texto}`); + + // Debo generar YO el random y no cogerlo del string escrito en prompt + + //declaración de DONDE coge el string para generar el random + + let palabras = "ABCÇDEFGHIJKLMNOPQRSTUVWXTZabcçdefghiklmnopqrstuvwxyz"; + // cuantos elementos quiero random + // let palabrasLength = " "; + // donde coloco el valor de ese random + + let azarPalabra = Math.floor(Math.random()* palabras.toLowerCase().length); + + let randomPalabra = palabras.toLowerCase().substring(azarPalabra, azarPalabra+1); + document.getElementById('pintar2').innerHTML = (`La letra generada es la ${randomPalabra}`); + //comparamos los dos valores + + let compara = texto.includes(randomPalabra); + document.getElementById('pintar').innerHTML = compara; } /* Finalmente he tenido que buscar el random en el prompt. pequeño descanso y quiero hacerlo con un random */ diff --git a/exercici8/js/functions.js b/exercici8/js/functions.js index 578fd86..725cf87 100644 --- a/exercici8/js/functions.js +++ b/exercici8/js/functions.js @@ -9,12 +9,15 @@ let same = x.length == nameDriver.length; */ const myFunction = ()=> { larger = x.length > nameDriver.length? + document.getElementById('pintar').innerHTML = (`You ${x} got a larger name, it has ${x.length} characters`): document.getElementById('pintar').innerHTML = (`I, ${nameDriver} got the larger name, I've got ${nameDriver.length} characters`); same = x.length == nameDriver.length? - document.getElementById('pintar').innerHTML = (`You ${x} and I ${nameDriver} gort the same number of characters`): + + document.getElementById('pintar').innerHTML = (`You ${x} and I ${nameDriver} got the same number of characters`): false; none = x.length == ""? + document.getElementById('pintar').innerHTML = (`No name, no game`): false; }; diff --git a/exercici3 - copia/css/styles.css b/exercici9/css/styles.css similarity index 100% rename from exercici3 - copia/css/styles.css rename to exercici9/css/styles.css diff --git a/exercici3 - copia/img/click.png b/exercici9/img/click.png similarity index 100% rename from exercici3 - copia/img/click.png rename to exercici9/img/click.png diff --git a/exercici3 - copia/index.html b/exercici9/index.html similarity index 68% rename from exercici3 - copia/index.html rename to exercici9/index.html index 4832715..f1f3fa5 100644 --- a/exercici3 - copia/index.html +++ b/exercici9/index.html @@ -6,7 +6,7 @@ - Basic jS3/Copia + Basic jS9
@@ -18,12 +18,15 @@
TheClick36
-
Match!
-

Click the to see if the words match!.

+
Palindromes
+

Click the to check if it is a palindrome.

-

-

- Go somewhere + + .match()
diff --git a/exercici9/js/functions.js b/exercici9/js/functions.js new file mode 100644 index 0000000..4a33845 --- /dev/null +++ b/exercici9/js/functions.js @@ -0,0 +1,36 @@ +// Solución visualizada en +// https://www.freecodecamp.org +// utilizaremos la iteración for () para que se trabaje mejor en strings largos + +// constante regex para limpiar el string + +let phrase = prompt(`Escribe un palíndrome!`); + +const myFunction = ()=> { + + + let clearString = phrase.match(/[^A-Za-z0-9]/g); +// esta es la misma let clearString = /\W_]/g; +//llevamos al str a minusculas y quitamos los espacios vacios + let str = phrase.toLowerCase().replace(clearString, ''); +//medimos cuan largo es el string + let lengthString = str.length; + + //loop for + for(let i = 0; i < lengthString/2; i++){ + //iterción continua hasta que NO sean iguales las comparaciones + if(str[i] !== str[lengthString -1 -i]){ + + return (document.getElementById('pintar').innerHTML = (`${phrase} is not a palindrome`)); + } +} + //else devuelve verdadero + + + return (document.getElementById('pintar').innerHTML = (`${phrase} it is a palindrome`)); +}; + + + + +