👭💕 Checkpoint

./public/styles.css:1954897/236
./views/index.html:1954897/83
./server.js:1954897/8
./public/script.js:1954897/3977
./palabras.js:1954897/229
This commit is contained in:
Glitch (tabu) committed 2019-07-01 13:12:04 +00:00
1 parent 2c33b104ad
commit f3eb863cfc
5 files changed
+17 -6

No files matched your search

+5 -2
View File
@@ -14,7 +14,7 @@ const words = [
"adj:Feliz", "adj:Feliz",
"adj:Frío/a", "adj:Frío/a",
"adj:Grande", "adj:Grande",
"adj:Guapo", "adj:Guapo/a",
"adj:Igual", "adj:Igual",
"adj:Ligero/a", "adj:Ligero/a",
"adj:Nuevo/a", "adj:Nuevo/a",
@@ -138,23 +138,26 @@ const words = [
"noun:Zombi", "noun:Zombi",
// Verbos // Verbos
"verb:Amar", "verb:Amar",
"verb:Amar",
"verb:Andar", "verb:Andar",
"verb:Burlar", "verb:Burlar",
"verb:Comer", "verb:Comer",
"verb:Decir", "verb:Decir",
"verb:Doler",
"verb:Echar", "verb:Echar",
"verb:Enseñar", "verb:Enseñar",
"verb:Escribir", "verb:Escribir",
"verb:Escuchar", "verb:Escuchar",
"verb:Fiar",
"verb:Girar", "verb:Girar",
"verb:Guardar", "verb:Guardar",
"verb:Gustar", "verb:Gustar",
"verb:Herir",
"verb:Llamar", "verb:Llamar",
"verb:Manejar", "verb:Manejar",
"verb:Morir", "verb:Morir",
"verb:Nadar", "verb:Nadar",
"verb:Oír", "verb:Oír",
"verb:Oler",
"verb:Pelear", "verb:Pelear",
"verb:Tomar", "verb:Tomar",
"verb:Ver", "verb:Ver",
+1
View File
@@ -41,6 +41,7 @@
let b = document.createElement('button') let b = document.createElement('button')
b.classList.add('chip') b.classList.add('chip')
b.innerText = word.p b.innerText = word.p
b.onclick = function () { input.value = this.innerText }
wordBank.appendChild(b) wordBank.appendChild(b)
} }
}) })
+7
View File
@@ -115,6 +115,12 @@ input:focus {
padding: 6px 12px; padding: 6px 12px;
margin: 2px; margin: 2px;
} }
.chip:hover:not([disabled]) {
background: rgba(255,255,255, .54);
}
.chip:active:not([disabled]) {
background: rgba(255,255,255, .72);
}
.graphic { .graphic {
width: 100%; width: 100%;
@@ -123,6 +129,7 @@ input:focus {
padding: 2rem; padding: 2rem;
} }
.right {float: right;} .right {float: right;}
.bump { margin-bottom: 1rem; }
.flex { .flex {
display: flex; display: flex;
flex-direction: row; flex-direction: row;
+1 -1
View File
@@ -9,7 +9,7 @@ app.get('/', function (req, res) {
}); });
app.get('/palabras.json', function (req, res) { app.get('/palabras.json', function (req, res) {
res.json({ res.json({
words: getRandom(palabras, 10) words: getRandom(palabras, 16)
}) })
}); });
+3 -3
View File
@@ -32,7 +32,7 @@
<p class="warn">Este juego requiere que JavaScript esté habilitado. Por favor préndalo y actualiza la página.</p> <p class="warn">Este juego requiere que JavaScript esté habilitado. Por favor préndalo y actualiza la página.</p>
</noscript> </noscript>
<div class="flex no-js-hide"> <div class="flex no-js-hide">
<button class="btn" data-open="view1">Jugar</button> <button class="btn" data-open="view1" data-fire="word">Jugar</button>
<button class="btn" data-open="rules">Repasar las reglas</button> <button class="btn" data-open="rules">Repasar las reglas</button>
</div> </div>
</div> </div>
@@ -57,7 +57,7 @@
<h1 class="h4 center">Dale el celular a la persona a&nbsp;tu&nbsp;izquierda.</h1> <h1 class="h4 center">Dale el celular a la persona a&nbsp;tu&nbsp;izquierda.</h1>
<img src="unboxing.svg" class="graphic" alt=""> <img src="unboxing.svg" class="graphic" alt="">
<div class="btn-row"> <div class="btn-row">
<button class="btn" data-open="view2" data-fire="word">¡Listo!</button> <button class="btn" data-open="view2">¡Listo!</button>
</div> </div>
</div> </div>
<div class="container" id="view2" hidden> <div class="container" id="view2" hidden>
@@ -68,7 +68,7 @@
No se permiten artículos, pronombres, conjunciones ni exclamaciones. No se permiten artículos, pronombres, conjunciones ni exclamaciones.
</p> </p>
<input type="text" placeholder="p. ej., " id="input"> <input type="text" placeholder="p. ej., " id="input">
<div id="wordBank">&hellip;</div> <div id="wordBank" class="bump">&hellip;</div>
<div class="btn-row"> <div class="btn-row">
<button class="btn" data-fire="word">Más palabras</button> <button class="btn" data-fire="word">Más palabras</button>
<button class="btn" data-open="view3" data-fire="fs" disabled>¡Listo!</button> <button class="btn" data-open="view3" data-fire="fs" disabled>¡Listo!</button>