diff --git a/.babelrc b/.babelrc deleted file mode 100644 index 1918387..0000000 --- a/.babelrc +++ /dev/null @@ -1,10 +0,0 @@ -{ - presets: [ - [ - '@babel/preset-env', - { - modules: false - } - ] - ] -} \ No newline at end of file diff --git a/.gitignore b/.gitignore index 45b8a1a..d38625d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ build/ dist/ node_modules/ -.cache/ \ No newline at end of file +.cache/ +.parcel-cache/ \ No newline at end of file diff --git a/.nunjucksrc b/.nunjucksrc new file mode 100644 index 0000000..57b9082 --- /dev/null +++ b/.nunjucksrc @@ -0,0 +1,4 @@ +{ + "root": "./public", + "data": {} +} \ No newline at end of file diff --git a/.parcelrc b/.parcelrc new file mode 100644 index 0000000..2756438 --- /dev/null +++ b/.parcelrc @@ -0,0 +1,11 @@ +{ + "extends": "@parcel/config-default", + "transformers": { + "*.njk": ["parcel-transformer-nunjucks"], + "*.css": ["@parcel/transformer-css-experimental"] + }, + "optimizers": { + "*.css": ["@parcel/optimizer-css"] + }, + "reporters": ["...", "@parcel/reporter-cli"] +} \ No newline at end of file diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 34e6b59..3090582 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -4,7 +4,7 @@ build: os: ubuntu-22.04 tools: python: "3.10" - nodejs: "16" + nodejs: "22" commands: - npm install -g yarn - yarn install diff --git a/cssnano.config.js b/cssnano.config.js deleted file mode 100644 index ea71d2b..0000000 --- a/cssnano.config.js +++ /dev/null @@ -1,8 +0,0 @@ -module.exports = { - preset: [ - "default", - { - convertValues: false, - }, - ], -}; diff --git a/nunjucks.config.js b/nunjucks.config.js deleted file mode 100644 index 20b65bb..0000000 --- a/nunjucks.config.js +++ /dev/null @@ -1,4 +0,0 @@ -module.exports = { - root: './public', - data: {}, -} diff --git a/package.json b/package.json index b8c3795..d7f3472 100644 --- a/package.json +++ b/package.json @@ -1,38 +1,47 @@ { - "name": "pycamp.es", - "version": "0.1.0", - "description": "Official website of pycamp spain", - "main": "index.js", - "license": "MIT", - "scripts": { - "clean": "rm -rf dist/* .cache/", - "start": "parcel serve --no-hmr public/index.njk", - "build-prod": "parcel build public/index.njk --public-url ./", - "create-cname": "echo 'pycamp.es' > dist/CNAME", - "gh-deploy": "gh-pages -d dist", - "deploy": "yarn clean && yarn build-prod && yarn create-cname && yarn gh-deploy" - }, - "devDependencies": { - "@babel/core": "^7.6.2", - "@babel/preset-env": "^7.6.2", - "eslint": "^6.4.0", - "eslint-config-prettier": "^6.3.0", - "eslint-plugin-prettier": "^3.1.1", - "gh-pages": "^2.1.1", - "parcel-bundler": "^1.12.4", - "prettier": "^1.18.2", - "sass": "^1.22.12" - }, - "dependencies": { - "@layflags/parcel-plugin-metaimage": "^1.2.5", - "bootstrap": "^4.3.1", - "g-sheets-api": "^2.1.2", - "nunjucks": "^3.2.0", - "parcel-plugin-nunjucks": "^2.2.0", - "parcel-plugin-static-files-copy": "^2.6.0", - "yarn": "^1.22.17" - }, - "staticFiles": { - "staticPath": ["public/pycampes-2023.ics"] - } + "name": "pycamp.es", + "version": "0.1.0", + "description": "Official website of pycamp spain", + "license": "MIT", + "packageManager": "yarn@1.22.17", + "engines": { + "node": ">=22.0.0" + }, + "scripts": { + "clean": "rm -rf dist/* .parcel-cache/", + "start": "parcel serve public/index.njk --dist-dir dist", + "build-prod": "parcel build public/*.njk --dist-dir dist --public-url .", + "create-cname": "echo 'pycamp.es' > dist/CNAME", + "gh-deploy": "gh-pages -d dist", + "deploy": "yarn clean && yarn build-prod && yarn create-cname && yarn gh-deploy" + }, + "devDependencies": { + "@babel/core": "^7.12.0", + "@babel/preset-env": "^7.12.0", + "@parcel/babel-preset-env": "^2.16.3", + "@parcel/packager-raw-url": "2.16.3", + "@parcel/transformer-css-experimental": "^2.3.2", + "@parcel/transformer-sass": "2.16.3", + "@parcel/transformer-webmanifest": "2.16.3", + "eslint": "^6.4.0", + "eslint-config-prettier": "^6.3.0", + "eslint-plugin-prettier": "^3.1.1", + "gh-pages": "^2.1.1", + "parcel": "^2.16.3", + "parcel-transformer-nunjucks": "^1.0.1", + "prettier": "^1.18.2", + "sass": "^1.22.12" + }, + "dependencies": { + "@layflags/parcel-plugin-metaimage": "^1.2.5", + "bootstrap": "^4.3.1", + "g-sheets-api": "^2.1.2", + "nunjucks": "^3.2.0", + "parcel-plugin-static-files-copy": "^2.6.0" + }, + "staticFiles": { + "staticPath": [ + "public/pycampes-2023.ics" + ] + } } diff --git a/public/current_event.njk b/public/current_event.njk index c303a24..39721a9 100644 --- a/public/current_event.njk +++ b/public/current_event.njk @@ -1,4 +1,4 @@ -{% extends 'layout.njk' %} +{% extends 'public/layout.njk' %} {% block content %}

Edición actual

@@ -66,4 +66,4 @@

{% endblock %} -{% block extra_footer %}{% endblock %} +{% block extra_footer %}{% endblock %} diff --git a/public/diversity.njk b/public/diversity.njk index 3940b6d..e46874f 100644 --- a/public/diversity.njk +++ b/public/diversity.njk @@ -1,4 +1,4 @@ -{% extends 'layout.njk' %} +{% extends 'public/layout.njk' %} {% block title %}PyCamp España: Diversidad{% endblock %} {% block content %}
@@ -105,4 +105,4 @@
{% endblock %} -{% block extra_footer %}{% endblock %} +{% block extra_footer %}{% endblock %} diff --git a/public/extra_footer.html b/public/extra_footer.html index 2d5e3c4..76fabac 100644 --- a/public/extra_footer.html +++ b/public/extra_footer.html @@ -1,10 +1,6 @@ - - + + \ No newline at end of file diff --git a/public/faq.njk b/public/faq.njk index 20c16f8..3d664f9 100644 --- a/public/faq.njk +++ b/public/faq.njk @@ -1,4 +1,4 @@ -{% extends 'layout.njk' %} +{% extends 'public/layout.njk' %} {% block content %}
@@ -46,24 +46,24 @@ class="collapse" aria-labelledby="headingTwo" data-parent="#faq"> -
{% include "what_to_bring_content.html" %}
+
{% include "public/what_to_bring_content.html" %}
-
+

-
Somos conscientes de la importancia de equidad y diversidad en tecnología. Gracias al apoyo de nuestros patrocinadores @@ -102,4 +102,4 @@
{% endblock %} - {% block extra_footer %}{% endblock %} + {% block extra_footer %}{% endblock %} diff --git a/public/index.njk b/public/index.njk index e07e227..ef5638c 100644 --- a/public/index.njk +++ b/public/index.njk @@ -1,4 +1,4 @@ -{% extends 'layout.njk' %} +{% extends 'public/layout.njk' %} {% block content %}
@@ -117,4 +117,4 @@
{% endblock %} -{% block extra_footer %}{% endblock %} +{% block extra_footer %}{% endblock %} diff --git a/public/layout.njk b/public/layout.njk index 86b4407..510c1b5 100644 --- a/public/layout.njk +++ b/public/layout.njk @@ -10,7 +10,7 @@ - + @@ -18,16 +18,16 @@ - - - + + + {% block extra_head %}{% endblock %} {% block title %}PyCamp España{% endblock %} - {% include "mailerlite.njk" %} + {% include "public/mailerlite.njk" %} @@ -61,10 +61,10 @@