From d42253166b525c3e9534e5145d74ccd8cf465eb1 Mon Sep 17 00:00:00 2001 From: Nulo Date: Sat, 29 Jul 2023 00:01:48 -0300 Subject: [PATCH] muchos cambios --- .gitattributes | 3 + eleventy.config.js | 5 + package.json | 1 + pnpm-lock.yaml | 52 +++++++- src/assets/caritas felices.svg | 1 + src/assets/estrellita.svg | 1 + src/assets/iconos landing.svg | 1 + src/assets/img/imagen_celeste.webp | 3 + src/assets/img/imagen_naranja.webp | 3 + src/assets/img/imagen_violeta.webp | 3 + src/assets/logo grande.svg | 1 + src/assets/logo inline.svg | 1 + src/assets/wave.svg | 1 + src/assets/wobble violeta.svg | 1 + .../pp-fraktion/PPFraktionSans-Bold.woff | 3 + .../pp-fraktion/PPFraktionSans-Bold.woff2 | 3 + .../pp-fraktion/PPFraktionSans-Light.woff | 3 + .../pp-fraktion/PPFraktionSans-Light.woff2 | 3 + .../PPFraktionSans-LightItalic.woff | 3 + .../PPFraktionSans-LightItalic.woff2 | 3 + src/fonts/pp-fraktion/stylesheet.css | 27 ++++ src/index.11ty.jsx | 123 +++++++++++++----- src/tailwind.css | 2 + src/tmp_imagen_azul.png | 3 - src/tmp_imagen_roja.png | 3 - src/tmp_imagen_violeta.png | 3 - tailwind.config.js | 19 +++ 27 files changed, 235 insertions(+), 40 deletions(-) create mode 100644 src/assets/caritas felices.svg create mode 100644 src/assets/estrellita.svg create mode 100644 src/assets/iconos landing.svg create mode 100644 src/assets/img/imagen_celeste.webp create mode 100644 src/assets/img/imagen_naranja.webp create mode 100644 src/assets/img/imagen_violeta.webp create mode 100644 src/assets/logo grande.svg create mode 100644 src/assets/logo inline.svg create mode 100644 src/assets/wave.svg create mode 100644 src/assets/wobble violeta.svg create mode 100644 src/fonts/pp-fraktion/PPFraktionSans-Bold.woff create mode 100644 src/fonts/pp-fraktion/PPFraktionSans-Bold.woff2 create mode 100644 src/fonts/pp-fraktion/PPFraktionSans-Light.woff create mode 100644 src/fonts/pp-fraktion/PPFraktionSans-Light.woff2 create mode 100644 src/fonts/pp-fraktion/PPFraktionSans-LightItalic.woff create mode 100644 src/fonts/pp-fraktion/PPFraktionSans-LightItalic.woff2 create mode 100644 src/fonts/pp-fraktion/stylesheet.css delete mode 100644 src/tmp_imagen_azul.png delete mode 100644 src/tmp_imagen_roja.png delete mode 100644 src/tmp_imagen_violeta.png diff --git a/.gitattributes b/.gitattributes index 7e232c2..a07c4a4 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,2 +1,5 @@ src/*.png filter=lfs diff=lfs merge=lfs -text src/*.jpg filter=lfs diff=lfs merge=lfs -text +*.woff filter=lfs diff=lfs merge=lfs -text +*.woff2 filter=lfs diff=lfs merge=lfs -text +*.webp filter=lfs diff=lfs merge=lfs -text diff --git a/eleventy.config.js b/eleventy.config.js index bbd67c0..259f350 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -5,12 +5,17 @@ module.exports = function (eleventyConfig) { eleventyConfig.setServerOptions({ watch: ["src/**/*.css"], }); + eleventyConfig.addWatchTarget("src/"); + eleventyConfig.addWatchTarget("tailwind.config.js"); eleventyConfig.addShortcode("tailwind", async () => { const from = "src/tailwind.css"; return await postcss.process(await readFile(from, "utf-8"), { from }); }); eleventyConfig.addPassthroughCopy("src/**.png"); + eleventyConfig.addPassthroughCopy("src/**/*.webp"); + eleventyConfig.addPassthroughCopy("src/**/*.woff"); + eleventyConfig.addPassthroughCopy("src/**/*.woff2"); eleventyConfig.addExtension(["11ty.jsx", "11ty.ts", "11ty.tsx"], { key: "11ty.js", diff --git a/package.json b/package.json index 5fa4d85..e9510e8 100644 --- a/package.json +++ b/package.json @@ -12,6 +12,7 @@ "esbuild-register": "^3.4.2", "postcss": "^8.4.24", "postcss-import": "^15.1.0", + "postcss-url": "^10.1.3", "prettier-plugin-tailwindcss": "^0.3.0", "tailwindcss": "^3.3.2", "vhtml": "^2.2.0" diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index e067d94..3304ee0 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -1,4 +1,4 @@ -lockfileVersion: '6.1' +lockfileVersion: '6.0' settings: autoInstallPeers: true @@ -23,6 +23,9 @@ devDependencies: postcss-import: specifier: ^15.1.0 version: 15.1.0(postcss@8.4.24) + postcss-url: + specifier: ^10.1.3 + version: 10.1.3(postcss@8.4.24) prettier-plugin-tailwindcss: specifier: ^0.3.0 version: 0.3.0(prettier@2.8.8) @@ -826,6 +829,10 @@ packages: css-tree: 2.2.1 dev: true + /cuint@0.2.2: + resolution: {integrity: sha512-d4ZVpCW31eWwCMe1YT3ur7mUDnTXbgwyzaL320DrcRT45rfjYxkt5QWLrmOJ+/UEAI2+fQgKe/fCjR8l4TpRgw==} + dev: true + /debug@2.6.9: resolution: {integrity: sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==} peerDependencies: @@ -1411,6 +1418,13 @@ packages: engines: {node: '>=12'} dev: true + /make-dir@3.1.0: + resolution: {integrity: sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==} + engines: {node: '>=8'} + dependencies: + semver: 6.3.1 + dev: true + /markdown-it@13.0.1: resolution: {integrity: sha512-lTlxriVoy2criHP0JKRhO2VDG9c2ypWCsT237eDiLqi09rmbKoUetyGHq2uOIRoRS//kfoJckS0eUzzkDR+k2Q==} hasBin: true @@ -1457,12 +1471,24 @@ packages: picomatch: 2.3.1 dev: true + /mime@2.5.2: + resolution: {integrity: sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==} + engines: {node: '>=4.0.0'} + hasBin: true + dev: true + /mime@3.0.0: resolution: {integrity: sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==} engines: {node: '>=10.0.0'} hasBin: true dev: true + /minimatch@3.0.8: + resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==} + dependencies: + brace-expansion: 1.1.11 + dev: true + /minimatch@3.1.2: resolution: {integrity: sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==} dependencies: @@ -1989,6 +2015,19 @@ packages: postcss-selector-parser: 6.0.13 dev: true + /postcss-url@10.1.3(postcss@8.4.24): + resolution: {integrity: sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==} + engines: {node: '>=10'} + peerDependencies: + postcss: ^8.0.0 + dependencies: + make-dir: 3.1.0 + mime: 2.5.2 + minimatch: 3.0.8 + postcss: 8.4.24 + xxhashjs: 0.2.2 + dev: true + /postcss-value-parser@4.2.0: resolution: {integrity: sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==} dev: true @@ -2272,6 +2311,11 @@ packages: resolution: {integrity: sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==} dev: true + /semver@6.3.1: + resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==} + hasBin: true + dev: true + /semver@7.5.3: resolution: {integrity: sha512-QBlUtyVk/5EeHbi7X0fw6liDZc7BBmEaSYn01fMU1OUYbf6GPsbTtd8WmnqbI20SeycoHSeiybkE/q1Q+qlThQ==} engines: {node: '>=10'} @@ -2528,6 +2572,12 @@ packages: optional: true dev: true + /xxhashjs@0.2.2: + resolution: {integrity: sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==} + dependencies: + cuint: 0.2.2 + dev: true + /yallist@4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} dev: true diff --git a/src/assets/caritas felices.svg b/src/assets/caritas felices.svg new file mode 100644 index 0000000..e664746 --- /dev/null +++ b/src/assets/caritas felices.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/estrellita.svg b/src/assets/estrellita.svg new file mode 100644 index 0000000..88a8348 --- /dev/null +++ b/src/assets/estrellita.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/iconos landing.svg b/src/assets/iconos landing.svg new file mode 100644 index 0000000..68df3c8 --- /dev/null +++ b/src/assets/iconos landing.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/img/imagen_celeste.webp b/src/assets/img/imagen_celeste.webp new file mode 100644 index 0000000..d2bf7aa --- /dev/null +++ b/src/assets/img/imagen_celeste.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:76c3aa4ba2208c41eb9be77d1121c7a513c333d0b2ed2a782c86fe83c482eb08 +size 35074 diff --git a/src/assets/img/imagen_naranja.webp b/src/assets/img/imagen_naranja.webp new file mode 100644 index 0000000..d490213 --- /dev/null +++ b/src/assets/img/imagen_naranja.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ff516c1424dea03f36649dc5c3af8e6de03be9cc07f3fb977fae96df59c23f1e +size 57026 diff --git a/src/assets/img/imagen_violeta.webp b/src/assets/img/imagen_violeta.webp new file mode 100644 index 0000000..a81f56e --- /dev/null +++ b/src/assets/img/imagen_violeta.webp @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fc3a1635e692eec1119d8600136c85135575c9d911bf6508f1c1ccbcb9d9d8d +size 21486 diff --git a/src/assets/logo grande.svg b/src/assets/logo grande.svg new file mode 100644 index 0000000..9a9b9a9 --- /dev/null +++ b/src/assets/logo grande.svg @@ -0,0 +1 @@ +ALFADATIZAR \ No newline at end of file diff --git a/src/assets/logo inline.svg b/src/assets/logo inline.svg new file mode 100644 index 0000000..b4de2f2 --- /dev/null +++ b/src/assets/logo inline.svg @@ -0,0 +1 @@ +ALFADATIZAR \ No newline at end of file diff --git a/src/assets/wave.svg b/src/assets/wave.svg new file mode 100644 index 0000000..7af3090 --- /dev/null +++ b/src/assets/wave.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/assets/wobble violeta.svg b/src/assets/wobble violeta.svg new file mode 100644 index 0000000..b9fe73c --- /dev/null +++ b/src/assets/wobble violeta.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/fonts/pp-fraktion/PPFraktionSans-Bold.woff b/src/fonts/pp-fraktion/PPFraktionSans-Bold.woff new file mode 100644 index 0000000..890c8c1 --- /dev/null +++ b/src/fonts/pp-fraktion/PPFraktionSans-Bold.woff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c35f801a328c7a521aba099a7e9c12c5e188d1d404a13723cb91f8b558588ff6 +size 41212 diff --git a/src/fonts/pp-fraktion/PPFraktionSans-Bold.woff2 b/src/fonts/pp-fraktion/PPFraktionSans-Bold.woff2 new file mode 100644 index 0000000..266dfda --- /dev/null +++ b/src/fonts/pp-fraktion/PPFraktionSans-Bold.woff2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31bd7977aeeed03851402863e68c5eb43f8f3d3fc90f15a99fab69c86aed2f6a +size 29284 diff --git a/src/fonts/pp-fraktion/PPFraktionSans-Light.woff b/src/fonts/pp-fraktion/PPFraktionSans-Light.woff new file mode 100644 index 0000000..43ff777 --- /dev/null +++ b/src/fonts/pp-fraktion/PPFraktionSans-Light.woff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c8f90bf1344b34b0ecf38dcfce56b0918c4e3c0a05ed1fe3d8eb1f81bf3cb6e +size 41720 diff --git a/src/fonts/pp-fraktion/PPFraktionSans-Light.woff2 b/src/fonts/pp-fraktion/PPFraktionSans-Light.woff2 new file mode 100644 index 0000000..ca5c28b --- /dev/null +++ b/src/fonts/pp-fraktion/PPFraktionSans-Light.woff2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f59e0b765589de4bc5f1df49459587051cffb2dd422bdc953ae02523da0be6ee +size 29684 diff --git a/src/fonts/pp-fraktion/PPFraktionSans-LightItalic.woff b/src/fonts/pp-fraktion/PPFraktionSans-LightItalic.woff new file mode 100644 index 0000000..cbdef6e --- /dev/null +++ b/src/fonts/pp-fraktion/PPFraktionSans-LightItalic.woff @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f1f6b4f4f30873b64f20e5091cbeca07f89fe1ede378e70182e59acd73d3ba8 +size 49380 diff --git a/src/fonts/pp-fraktion/PPFraktionSans-LightItalic.woff2 b/src/fonts/pp-fraktion/PPFraktionSans-LightItalic.woff2 new file mode 100644 index 0000000..3bd9e72 --- /dev/null +++ b/src/fonts/pp-fraktion/PPFraktionSans-LightItalic.woff2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:227130c66d09d0213386a5a85ff7a65e09de477d2109cd06461e6dde8b3d8899 +size 35004 diff --git a/src/fonts/pp-fraktion/stylesheet.css b/src/fonts/pp-fraktion/stylesheet.css new file mode 100644 index 0000000..8ca8075 --- /dev/null +++ b/src/fonts/pp-fraktion/stylesheet.css @@ -0,0 +1,27 @@ +@font-face { + font-family: 'PP Fraktion Sans'; + src: url('PPFraktionSans-Bold.woff2') format('woff2'), + url('PPFraktionSans-Bold.woff') format('woff'); + font-weight: bold; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'PP Fraktion Sans'; + src: url('PPFraktionSans-Light.woff2') format('woff2'), + url('PPFraktionSans-Light.woff') format('woff'); + font-weight: 300; + font-style: normal; + font-display: swap; +} + +@font-face { + font-family: 'PP Fraktion Sans'; + src: url('PPFraktionSans-LightItalic.woff2') format('woff2'), + url('PPFraktionSans-LightItalic.woff') format('woff'); + font-weight: 300; + font-style: italic; + font-display: swap; +} + diff --git a/src/index.11ty.jsx b/src/index.11ty.jsx index f64b359..482dcdf 100644 --- a/src/index.11ty.jsx +++ b/src/index.11ty.jsx @@ -1,17 +1,43 @@ import h from "vhtml"; +import { readFile } from "node:fs/promises"; + +/** + * @param {import("node:fs").PathLike} path + */ +async function loadSvg(path) { + let f = await readFile(path, "utf-8"); + return (props) => { + let s = f; + if (props.class) s = f.replace(" + ); + }; +} const postcssImport = require("postcss-import"); const cssnano = require("cssnano"); -const { readFile } = require("fs/promises"); const tailwindPlugin = require("tailwindcss")(require("../tailwind.config")); const postcss = require("postcss")([ postcssImport(), + require("postcss-url")({ url: "rebase" }), tailwindPlugin, ...(process.env.ELEVENTY_ENV === "production" ? [cssnano()] : []), ]); export async function render(data) { - console.debug(data); + const Estrellita = await loadSvg("src/assets/estrellita.svg"); + const Wave = await loadSvg("src/assets/wave.svg"); + // console.debug(data); + const WobbleVioleta = await loadSvg("src/assets/wobble violeta.svg"); + const CaritasFelices = await loadSvg("src/assets/caritas felices.svg"); + const LogoInline = await loadSvg("src/assets/logo inline.svg"); + const LogoGrande = await loadSvg("src/assets/logo grande.svg"); + const IconosLanding = await loadSvg("src/assets/iconos landing.svg"); + const css = await tailwind(); //TODO: doctype return ( @@ -22,36 +48,72 @@ export async function render(data) { content="width=device-width, initial-scale=1, shrink-to-fit=no, viewport-fit=cover" /> Alfadatizando - + - - -
-
-
asdf
-
asd
+ + +
+
+
+ +
+
+ +

+ Hackeamos +
+ la educación +
+ digital +
+ equitativa +

+ +
-
-
- - +
+ +
+ +
+
+

+ {" "} + Nuevos saberes{" "} + +

+
+ {data.frontpageNuevosSaberes.map( + ({ número, título, content }) => ( +
+

{número}

+

{título}

+

{content}

+
+ ) + )} +
-
-
-

Nuevos saberes

-
- {data.frontpageNuevosSaberes.map(({ número, título, content }) => ( -
-

{número}

-

{título}

-

{content}

-
- ))} +
+
+
+ + +
+
@@ -68,9 +130,9 @@ export async function render(data) { return (
-
+

{título}

{content}

@@ -167,5 +229,6 @@ function fillerUdesa(n) { async function tailwind() { const from = "src/tailwind.css"; - return await postcss.process(await readFile(from, "utf-8"), { from }); + const css = await postcss.process(await readFile(from, "utf-8"), { from }); + return css; } diff --git a/src/tailwind.css b/src/tailwind.css index b5c61c9..c1a03c4 100644 --- a/src/tailwind.css +++ b/src/tailwind.css @@ -1,3 +1,5 @@ +@import "./fonts/pp-fraktion/stylesheet.css"; + @tailwind base; @tailwind components; @tailwind utilities; diff --git a/src/tmp_imagen_azul.png b/src/tmp_imagen_azul.png deleted file mode 100644 index 1b49b5a..0000000 --- a/src/tmp_imagen_azul.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9fe50aa416d02e37bea595a27ab64c308a5ffbf4bf7145cdf25b4d3f438a511c -size 969668 diff --git a/src/tmp_imagen_roja.png b/src/tmp_imagen_roja.png deleted file mode 100644 index 3cd163e..0000000 --- a/src/tmp_imagen_roja.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9dd8c66665bbf59debc986ad7e3206366af45894494bc6279615bbf304a0ba0d -size 1598162 diff --git a/src/tmp_imagen_violeta.png b/src/tmp_imagen_violeta.png deleted file mode 100644 index f7bcdbd..0000000 --- a/src/tmp_imagen_violeta.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:14ebb2ae39dbafda393f0d7fc29ca2b311aaf0baf6b29b61c4c8e4da54225c66 -size 924139 diff --git a/tailwind.config.js b/tailwind.config.js index 13c6dd0..aa833a7 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -10,6 +10,25 @@ module.exports = { amarillo: "#f9af39", violeta: "#dda7dd", }, + fontFamily: { + sans: [ + "PP Fraktion Sans", + "ui-sans-serif", + "system-ui", + "-apple-system", + "BlinkMacSystemFont", + '"Segoe UI"', + "Roboto", + '"Helvetica Neue"', + "Arial", + '"Noto Sans"', + "sans-serif", + '"Apple Color Emoji"', + '"Segoe UI Emoji"', + '"Segoe UI Symbol"', + '"Noto Color Emoji"', + ], + }, }, }, plugins: [],