diff --git a/agenda.html b/agenda.html index 79a6075..f006fcc 100644 --- a/agenda.html +++ b/agenda.html @@ -10,8 +10,12 @@ Agenda + + + +
diff --git a/estilo/estilo.css b/estilo/estilo.css index 4fc6d2f..6ebe170 100644 --- a/estilo/estilo.css +++ b/estilo/estilo.css @@ -1,13 +1,20 @@ /*Silvia SUárez Prendes, UO277412*/ +/* paleta https://colorhunt.co/palette/f3c5c5c1a3a3886f6f694e4e */ + +/* + header #886767; + body #f1e7e7; +*/ + /* Especificidad: 001 */ header { display: flex; justify-content: space-between; align-items: center; color: #ffffff; - background-color: #84B6F4; - box-shadow: 0 0.7ex 1.2ex 0.25ex #042034; + background-color: #886767; + box-shadow: 0 0.7ex 1.2ex 0.25ex #694E4E; margin: 0; padding: 0; } @@ -16,18 +23,18 @@ header { body { font-family: Vegur, 'PT Sans', Verdana, sans-serif; color: #000000; - background-color: rgb(229, 246, 250); + background-color: #f1e7e7; margin-left: 2em; font-size: 1em; text-align: justify; padding: 2em; } + /* Especificidad: 001*/ h1 { font-family: Vegur, 'PT Sans', Verdana, sans-serif; - color: #042034; - background-color: #84B6F4; + color: #021a2a; padding: 1em; text-transform: uppercase; text-align: center; diff --git a/estilo/layout.css b/estilo/layout.css index 1ed0618..aff6941 100644 --- a/estilo/layout.css +++ b/estilo/layout.css @@ -15,22 +15,23 @@ nav { nav { display: block; position: relative; - gap: 0 25em; + gap: 0 3em; } /* Especificidad: 002*/ nav a { - color: #042034; + color: #021a2a; } /* Especificidad: 011*/ a:hover { - background: #5699cc; + background: #E7BCDE; + border-radius: 10px; } /*Especificidad: 011*/ a:visited { - color: #042034; + color: #3f2f2f; } /*Especificidad: 002*/ @@ -60,21 +61,21 @@ nav a { header a:link, header a:visited { text-decoration: none; - color: #0a3c5f; + color: #021a2a; font-weight: bold; font-size: 1.1em; } /* Especificidad: 011*/ a:hover { - background: #5699cc; + background: #F3C5C5; } /*Especificidad: 012*/ header a:hover, /*Especificidad: 012*/ header a:active { - background-color: #5699ccbd; + background-color: #F3C5C5; } diff --git a/estilo/meteorologia.css b/estilo/meteorologia.css new file mode 100644 index 0000000..8f6bb33 --- /dev/null +++ b/estilo/meteorologia.css @@ -0,0 +1,67 @@ +/*Silvia Suárez Prendes, UO277412*/ + + +/*Especificidad: 001*/ +section { + display: flex; + flex-direction: row; + flex-wrap: wrap; + gap: 1em; + justify-content: space-around; +} + +/*Especificidad: 002*/ +section article { + width: 20%; + color: #000000; + border-radius: 0.85em; + box-shadow: 0 .75ex .75ex #BB9CC0; + background-color: #C1A3A3; + margin: 2em 1em .5em 2em; + text-align: left; +} + +/*Especificidad: 012*/ +article h3:last-of-type { + text-align: center; + margin: auto; +} + +/*Especificidad: 012*/ +article h3:first-of-type { + margin: 1em auto 0.5em 1.5em; +} + +/*Especificidad: 002*/ +article h3 { + font-variant: small-caps; + font-style: normal; + font-size: 1.5em; + margin: 0.75em auto 0 1.5em; +} + +/*Especificidad: 002*/ +section p { + margin: 1em auto 0.5em 1.5em; +} + +/*Especificidad: 002*/ +article img { + align-self: center; + margin: .25em 2em .25em 2em; + margin-left: 2em; +} + +/*Especificidad: 002*/ +article ul { + list-style: circle; + margin: .25em 0.25em .25em 2em; +} + +/*margin: + - entre los elementos + - */ +/*Especificidad: 003*/ +article ul li { + margin: 0.75em auto; +} \ No newline at end of file diff --git a/estilo/sobremi.css b/estilo/sobremi.css index d685329..78e6d06 100644 --- a/estilo/sobremi.css +++ b/estilo/sobremi.css @@ -31,7 +31,7 @@ caption { display: block; width: 100%; float: none; - background-color: rgb(229, 246, 250); + background-color: #f1e7e7; margin: 0; padding: 0; box-shadow: none; @@ -44,11 +44,4 @@ caption { section h2 { margin: 1em; } - - - /** - grid-template-areas: - "main main main" - "p article article" - */ } \ No newline at end of file diff --git a/js/agenda.js b/js/agenda.js new file mode 100644 index 0000000..d60d36f --- /dev/null +++ b/js/agenda.js @@ -0,0 +1,14 @@ +class Agenda { + + + constructor () { + this.url = "https://ergast.com/api/f1/current"; + this.last_api_call = null; + this.last_api_result = null; + } + + + + + +} \ No newline at end of file diff --git a/js/localhost/SEW-EV/estilo/estilo.css b/js/localhost/SEW-EV/estilo/estilo.css new file mode 100644 index 0000000..de4ff39 --- /dev/null +++ b/js/localhost/SEW-EV/estilo/estilo.css @@ -0,0 +1,71 @@ +/*Silvia SUárez Prendes, UO277412*/ + +/* Especificidad: 001 */ +header { + display: flex; + justify-content: space-between; + align-items: center; + color: #ffffff; + background-color: #886F6F; + box-shadow: 0 0.7ex 1.2ex 0.25ex #694E4E; + margin: 0; + padding: 0; +} + +/* Especificidad: 001 */ +/* Especificidad: 001 */ +body, section { + font-family: Vegur, 'PT Sans', Verdana, sans-serif; + color: #000000; + background-color: #d1b7b79a; + margin-left: 2em; + font-size: 1em; + text-align: justify; + padding: 2em; +} + +/* Especificidad: 001*/ +h1 { + font-family: Vegur, 'PT Sans', Verdana, sans-serif; + color: #021a2a; + padding: 1em; + text-transform: uppercase; + text-align: center; +} + +/* Especificidad: 001*/ +/* Especificidad: 001*/ +h2, +h3 { + color: #042034; +} + +/* Especificidad: 001*/ +li { + list-style-position: inside; + display: list-item; + text-align: left; +} + +/* Especificidad: 001*/ +ul { + display: block; + list-style-type: circle; + margin-block-start: 0.5em; + margin-block-end: 1.2em; + margin-inline-start: 0.5em; + margin-inline-end: 0.5em; + padding-inline-start: 0.5em; +} + +/*Especificidad: 001*/ +dt { + font-weight: bold; + margin: 0 1.75em; +} + +/*Especificidad: 001*/ +dd { + font-size: 1em; + margin: 0 3em; +} \ No newline at end of file diff --git a/js/localhost/SEW-EV/estilo/meteorologia.css b/js/localhost/SEW-EV/estilo/meteorologia.css new file mode 100644 index 0000000..fd7a8e3 --- /dev/null +++ b/js/localhost/SEW-EV/estilo/meteorologia.css @@ -0,0 +1,63 @@ +/*Silvia Suárez Prendes, UO277412*/ +/*Especificidad: 002*/ +section>article { + display: grid; + /* grid-template-columns: 1fr 1fr; */ + grid-template-areas: + "h3 img" + "p h3" + "ul ul"; + grid-gap: 20px; + width: 40%; + color: #000000; + border-radius: 0.85em; + box-shadow: 0 .75ex .75ex #BB9CC0; + background: #C1A3A3; + margin: 0.75em 1em .5em 2em; + text-align: left; +} + +/*Especificidad: 012*/ +article h3:last-of-type { + text-align: center; + margin: auto; +} + +/*Especificidad: 012*/ +article h3:first-of-type { + margin: 1em auto 0.5em 1.5em; +} + +/*Especificidad: 002*/ +article h3 { + font-variant: small-caps; + font-style: normal; + font-size: 1.5em; + margin: 0.75em auto 0 1.5em; +} + +/*Especificidad: 002*/ +article p { + margin: 0em 0.25em .5em 2em; + text-align: left; +} + +/*Especificidad: 002*/ +article img { + align-self: center; + margin: .25em 0.25em .25em 2em; +} + +/*Especificidad: 002*/ +article ul { + list-style: circle; + margin: .25em 0.25em .25em 2em; +} + +/*margin: + - entre los elementos + - */ +/*Especificidad: 003*/ +article ul li { + margin: 0.75em auto; +} \ No newline at end of file diff --git a/js/localhost/SEW-EV/estilo/sobremi.css b/js/localhost/SEW-EV/estilo/sobremi.css new file mode 100644 index 0000000..ab6ca45 --- /dev/null +++ b/js/localhost/SEW-EV/estilo/sobremi.css @@ -0,0 +1,54 @@ +/*Especificidad: 001*/ +table { + table-layout: auto; + width: auto; + border-collapse: separate; + margin: 1em auto 3em; +} + +table, /*Especificidad: 001*/ +th, /*Especificidad: 001*/ +td, /*Especificidad: 001*/ +caption /*Especificidad: 001*/ { + border: black 0.15em solid; + text-align: center; +} + +table { + border-collapse: collapse; +} + +/*Especificidad: 001*/ +caption { + font-weight: bold; + padding: 0.7em 0em; + background-color: #F3C5C5; +} + +@media only screen and (max-width: 1280px) { + /*Especificidad: 001*/ + section { + display: block; + width: 100%; + float: none; + background-color: rgb(229, 246, 250); + margin: 0; + padding: 0; + box-shadow: none; + } + /*Especificidad: 002*/ + section picture { + margin-left: 20%; + } + /*Especificidad: 002*/ + section h2 { + margin: 1em; + } + + + /** + grid-template-areas: + "main main main" + "p article article" + */ +} \ No newline at end of file diff --git a/js/pais.js b/js/pais.js index 0bcf1f3..9678bd7 100644 --- a/js/pais.js +++ b/js/pais.js @@ -78,13 +78,13 @@ class Pais { // api_key = 18c76dd091c5ca9d98c472bf619dbeb4 getWeather() { - let url = `https://api.openweathermap.org/data/2.5/forecast?lat=${this.latitude}&lon=${this.longitude}&appid=18c76dd091c5ca9d98c472bf619dbeb4`; + var p = this; + let url = `https://api.openweathermap.org/data/2.5/forecast?lat=${p.latitude}&lon=${p.longitude}&appid=18c76dd091c5ca9d98c472bf619dbeb4`; $.ajax({ dataType: "json", url: url, method: 'GET', success: function (data) { - console.log("success"); let l = data.list.filter((e) => e.dt_txt.split(' ')[1] == '12:00:00'); l.forEach((item) => { @@ -104,8 +104,7 @@ class Pais { let iconUrl = `https://openweathermap.org/img/wn/${item.weather[0].icon}@2x.png`; let iconImg = $("", { src: iconUrl, alt: item.weather[0].description }); - let article = $("
").append(iconImg, h3day, pDate, temp, weatherList); - console.log(article); + let article = $("
").append(h3day, pDate, iconImg, temp, weatherList); $("section").append(article); }); diff --git a/meteorologia.html b/meteorologia.html index 57952d5..ede6f75 100644 --- a/meteorologia.html +++ b/meteorologia.html @@ -11,8 +11,12 @@ Meteorología + + + @@ -46,6 +50,10 @@

Previsión meteorológica para los próximos 5 días

+ +
diff --git a/sobremi.html b/sobremi.html index 73bc103..474aba6 100644 --- a/sobremi.html +++ b/sobremi.html @@ -10,8 +10,9 @@ Sobre mí - + +