From a8c9a322574500ab99fedd40c9ec0895dd34cc41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Camilo=20Gonz=C3=A1lez?= Date: Tue, 5 Dec 2023 12:44:27 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=A7=20Bocetos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 + ...\303\261os dpto antropolog\303\255a .xlsx" | Bin 62438 -> 62439 bytes src/componentes/LineaTiempo.astro | 80 ++++++++++++++++++ src/componentes/ListaNodos.astro | 2 +- src/pages/index.astro | 37 ++++++-- src/scss/estilos.scss | 10 ++- yarn.lock | 5 ++ 7 files changed, 124 insertions(+), 11 deletions(-) create mode 100644 src/componentes/LineaTiempo.astro diff --git a/package.json b/package.json index 6ed110b..16c13d6 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ }, "dependencies": { "@astrojs/check": "^0.3.1", + "@enflujo/alquimia": "^2.0.0", "astro": "^3.6.0", "mapbox-gl": "^2.15.0", "nanostores": "^0.9.5", diff --git "a/procesador/Listado de proyectos - 60 a\303\261os dpto antropolog\303\255a .xlsx" "b/procesador/Listado de proyectos - 60 a\303\261os dpto antropolog\303\255a .xlsx" index 3eebc9bbc0730c966aa7eb55b3c7b02779f67620..e7498ac76a1c3ce104bf97ff5aa275f5cc02a53a 100644 GIT binary patch delta 2023 zcmYk-dpOgJ8vyWa%xx}<*&HU97P-{OB{agw{nCXUtRhkFoTlQWF-1f!Un=*@L_{sC zTuzh@nMk6xwsI`DX>(Z?I_2_{=l49F_pi_UKJWYf^*+x#%@gDC#AvCK&@-^MP6}{U z5=|bBrdl96PlS!7ICk6)eC|al&dP_I78W0R7s_GZWk7W=z-~SAC(XvBpWuuB<=Hsy0;cmmKo^y@lV~#JpS(m#VDJH(T z57zB3uZJxPu&CEr2W*U%@1&&IXDuClxz~v7v8@i%J6>8?lUyb@VR^%7D&R;#Dc7Oq zG6QE4)xS7^9hB#|Eo#PYMZHVpa z7JGH)VtqE>f4k((50tpoT)X%CC&Ty4pHR5OpmarhQJVHSO_@%+)3R}rBcT&tOTOii zL$pZ+l+h39($GF*%Y^ENv@*iSAC-jTr~CJ-;F(?lcuP&d6;ZrWrM}OpzEUeA>4yNz-m7tg9eL-Ds%#Ih*Gec<+KNzZ?r)yG0W-P_#E*~8N zXp)H|rSY;O2`&($+9J%8XZZtuT3~YekJd}bvybKyUV=VxGASD_RPCEX5DSqSnOKTsj9rGADzaj-&H&i{Tb8hQ zbjLw9S|I;y;uTYIfunv3s_Y@pBeyJT;H^){&HbaGTtEI|ziW99I3T=XZayrJ#(NO0 zsaBm}S#HBBSuxGiOCDL2)Fcl#Ch3q$D7{izUh#@8g{Onp7*yJqU6h=vv>iDERc>DepY`QUVBzkZig@lNkvVZV4i?YoSdb{r)~ncF^tm}SXSur*XT3xVp8 z&oz<@E((dm-VL7b6Lvp&Z%^k=G7>6hJgcHdsb@-<@MKyRE@)VmiiF-oLc&p=BTB@~yrJ%nRCsO>cSLpH(~w5)PHGI&NdGB9W8cp2ZXB>9zMRTo# z%|+& z`o6A!t2R4yWt`6I$_zd=B=jqV+(+JBN+LA~NtUp>x_+;i=-Q|Ekz<@41Lu`E2x7LG z`zxdl7yxMUNVo`;IkX=W>jJNnFG4dbCZJo#^K3%G&4zEj&81q7dSXeb_J*D7HjdsQ8*$@^r&CNZ%`2O4+s=mT?Qz zvnoOUFbGx8u(W?m)oKXD4fAeyQX%zfzkMmcB?o?RFAGM!aeQu8*TPSoGeG767+oSkB&dF`fGJ0=F;1-x_p^Ai;?r!LyE3l^GWc} zptvib&r2-DUR4a5d)``6JQPbseslHHLI= zR&~!D7Q%7fB59KX*DbbhlI!)8`SVD%t-}!qf$$0-(00&&<1k=6?*`5UlI9&Djzl1k zhy*zE`d~c(x?l&Hi~u$wP{4@=eF!27z(y$pm74@ez&#QYcqf1ZHC1rgU)ye00h&}a zFjyrGBz}Pdc%do;O5H5!Y^8cNaM-V2G(Z#jf^`AOFWwMLEpVV#YqLpT&ZG_mx)6yy zOG=0gISafIAk==I^K~!?gcJjTw*8vlR3yOtVgoh?G#0HPzRf^fvmTJXs1Ffu*`zA) dYSA405)c<11#NmFQp-@u%r-KP zTOCPm$MS&+yJSjt_*-;k;seN%8%pO)LpxfHyIL6W$mh}wcFPoMp}&uR50%HFycF! zqQhfL8^|3SAL}Ae4ksp8cCg1tFNUwEFe2#VV8lX?uXT>K%o&ZoHrD7R{FDQO;CYqg zOvfo+8PK=Z*6|MbNOx&(l71+#Ir6Rz$-s{(0I`E%e6vl)ts zUBa10_nk!JE=`Uw`9!a{m>pr_$5-av%J@Ei5y@fftNXGaVd4_sg`1xfqf{J-ar*vM zA3|lEpjyGQyXHZ-2Ekf>&kXeh>r_Fob85(CQ<>^Y{iq9#*sNjA$3w=Z<9<8KV@`ix zYAJwhdUR{Sn7Q5D8dQtHlF)f~X>6Q3a|j!i9#UTCv-h_26{D=~gO zgE@amIiZexVVI}dRedViYO}F+6FI*cd+Hlr*E=xb&(i5oRDD_b7_UT53|I0=gwa-f zXKF5`Da~7^5U{S|KnR$k+PInc5&B#9DhS zd-h{k%8GMj=YwlQUFcT$jrQP<PeY5WhWax?cxrL-yc;$zFvw@Ld{V{ zmkvs&zs-H(HIioV=ZJI7i_2!lam=lZ-P?l!`H{%gHmP=dfkQB+l2v&2&iFMB!gg7$Ia!}XI(6ym_T7~g1JZQsHkFnX{!PRqvM>%c~El_ zc6kzk8uMg8AatjhlGBINN98Ntk0p0Z4^78%N|?QY zPlI6)RPt|3e3cHA(B?H|glMY%%K_6|K{_gXuFB%TC9BJOmlOi&*1GB>)@PgDjJh_1;DU)>h@F6l@v8c^aPh5%>VeDrS_2q#pJbs;VJc4wqs_mY)ZO)W3F79^c z!JoT(G`S7fp`L5TZ`ZRo*ey6@kU`EO)6a3fEC`UY@G+d@6dp_Zu`VK>k_KG&foeA7 zUKgVlygyDDWI^j3DYwfuURKK|#TrNi8ke`nUYyK}Z~FWs9% zf>UZDGWi-EO-}ZxhnSIiBVL8J*~FvvR848!BwKBVtq?yOl-0P<78>Qp(f zZp)~Qf{^@WM5cghr6{nEA_n5NikM{u09LvsX@l+y2oO#E?@&dsW;qC|4Z`_8fJQm! zSgy9!gNB-b<$P7ef3BJYg+SzlAdugF`EOAi$l>pU8iA?;dmxYjsy convertirEscala(valor, 0, 58, 0, 30); +const posY = (valor: number) => convertirEscala(valor, 0, 20, 100, 0); +const posX = (valor: number) => convertirEscala(valor, 1966, 2026, 0, 100); + +tiempo.forEach((marca, i) => { + const x = posX(+marca.nombre); + const y = posY(marca.conteo); + + if (i === 0) { + datosLinea += `M ${0}, ${100} L`; + } else { + } + + datosLinea += ` ${x}, ${y}`; + + if (i === tiempo.length - 1) { + datosLinea += 'L 100, 100 Z'; + } +}); +--- + +
+ + + { + decadas.map((decada, i) => ( + + )) + } + + + + + + + { + tiempo.map((marca) => ( + + {marca.nombre} + + )) + } + +
+ + diff --git a/src/componentes/ListaNodos.astro b/src/componentes/ListaNodos.astro index b3e5f93..009fa38 100644 --- a/src/componentes/ListaNodos.astro +++ b/src/componentes/ListaNodos.astro @@ -12,7 +12,7 @@ const { lista, titulo, id } = Astro.props;

{titulo}

-
    +
      { lista.map((elemento, i) => (
    • - + @@ -34,6 +34,8 @@ import LineaTiempo from '@/componentes/LineaTiempo.astro'; nodos.forEach((nodo) => { const nodosConectados: HTMLLIElement[] = []; const conexiones = nodo.dataset.con?.split(','); + const contenedor = nodo.parentElement; + console.log(contenedor); if (conexiones) { conexiones.forEach((id) => { @@ -42,18 +44,21 @@ import LineaTiempo from '@/componentes/LineaTiempo.astro'; if (elemento) nodosConectados.push(elemento); }); } + nodo.onmouseenter = () => { nodosConectados.forEach((nodo) => { - nodo.classList.add('visible'); + nodo.classList.add('visible', 'explotado'); }); + contenedor?.classList.add('mantener'); nodo.classList.add('visible'); contenedorListas.classList.remove('todoVisible'); }; nodo.onmouseleave = () => { nodosConectados.forEach((nodo) => { - nodo.classList.remove('visible'); + nodo.classList.remove('visible', 'explotado'); }); + contenedor?.classList.remove('mantener'); nodo.classList.remove('visible'); contenedorListas.classList.add('todoVisible'); }; @@ -68,27 +73,43 @@ import LineaTiempo from '@/componentes/LineaTiempo.astro'; position: relative; width: 50vw; - li { - opacity: 0.3; + ul { + li { + display: none; - &.visible { - opacity: 1; + &.visible { + display: block; + // font-size: 0.75em; + } + } + + &.mantener { + li { + opacity: 0.3; + display: block; + + &.visible { + opacity: 1; + } + } } } &.todoVisible { li { opacity: 1; + display: block; } } .lista { - height: 50vh; + height: calc((100vh - 150px) / 2); overflow-y: auto; overflow-x: hidden; position: relative; background-color: rgba(255, 255, 255, 0.6); flex-basis: 20%; + padding-bottom: 3em; h2 { position: sticky; diff --git a/src/scss/estilos.scss b/src/scss/estilos.scss index dbeabcc..7cd2ea5 100644 --- a/src/scss/estilos.scss +++ b/src/scss/estilos.scss @@ -3,7 +3,7 @@ :root { /// Fuentes tipográficas hemochas - ---fuenteTitulo: font-family: 'Tourney', 'Garamond', 'Georgia', 'Times', serif; + --fuenteTitulo: font-family: 'Tourney', 'Garamond', 'Georgia', 'Times', serif; --fuenteParrafo: 'Inter', 'Helvetica', 'Roboto', 'Arial', 'Tahoma', 'Verdana', sans-serif; //Colores * CSS HEX * @@ -30,12 +30,18 @@ body { 'calt' 1; /* fix for Chrome */ } +@supports (font-variation-settings: normal) { + :root { + --fuenteParrafo: InterVariable, 'Helvetica', 'Roboto', 'Arial', 'Tahoma', 'Verdana', sans-serif; + } +} + h1, h2, h3, h4, h5 { - font-family: var(---fuenteTitulo); + font-family: var(--fuenteTitulo); } ul { diff --git a/yarn.lock b/yarn.lock index 3297726..6d515a1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -330,6 +330,11 @@ resolved "https://registry.yarnpkg.com/@emmetio/scanner/-/scanner-1.0.4.tgz#e9cdc67194fd91f8b7eb141014be4f2d086c15f1" integrity sha512-IqRuJtQff7YHHBk4G8YZ45uB9BaAGcwQeVzgj/zj8/UdOhtQpEIupUhSk8dys6spFIWVZVeK20CzGEnqR5SbqA== +"@enflujo/alquimia@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@enflujo/alquimia/-/alquimia-2.0.0.tgz#d0cda3e14c6c0dcdee971e55f1cd515197d66dc8" + integrity sha512-4+j3jL9Kb929z6+nLIlDW+BBxXs81tgNxTiEYONNIEkA4QJDtjEZoyJss7E2QWLM3xpV0YA6j0kKV6tGahqARw== + "@esbuild/android-arm64@0.18.20": version "0.18.20" resolved "https://registry.yarnpkg.com/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz#984b4f9c8d0377443cc2dfcef266d02244593622"