Merge 09df58c into 286e1ab

eventoL · Mar 22, 2021 · cc96bb4 · cc96bb4
2 parents 286e1ab + 09df58c
commit cc96bb4
Show file tree

Hide file tree

Showing 81 changed files with 5,076 additions and 999 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -0,0 +1,110 @@
+{
+  "projectName": "eventoL",
+  "projectOwner": "eventoL",
+  "repoType": "github",
+  "repoHost": "https://github.com",
+  "files": [
+    "README.md",
+    "README-es.md"
+  ],
+  "imageSize": 100,
+  "commit": true,
+  "commitConvention": "eslint",
+  "contributors": [
+    {
+      "login": "FedeG",
+      "name": "Federico Gonzalez",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/4097554?v=4",
+      "profile": "https://github.com/FedeG",
+      "contributions": [
+        "a11y",
+        "bug",
+        "blog",
+        "code",
+        "design",
+        "doc",
+        "ideas",
+        "maintenance",
+        "projectManagement",
+        "review",
+        "security",
+        "translation",
+        "test",
+        "infra"
+      ]
+    },
+    {
+      "login": "reyiyo",
+      "name": "Sergio Orbe",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/761204?v=4",
+      "profile": "https://github.com/reyiyo",
+      "contributions": [
+        "code",
+        "design",
+        "ideas"
+      ]
+    },
+    {
+      "login": "ChmlGr",
+      "name": "Ximena Garcia",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5685527?v=4",
+      "profile": "https://github.com/ChmlGr",
+      "contributions": [
+        "code",
+        "design",
+        "ideas"
+      ]
+    },
+    {
+      "login": "HacKanCuBa",
+      "name": "HacKan",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/7178420?v=4",
+      "profile": "https://hackan.net",
+      "contributions": [
+        "code",
+        "design",
+        "ideas",
+        "test"
+      ]
+    },
+    {
+      "login": "gilgamezh",
+      "name": "Nicolás Demarchi",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/1496486?v=4",
+      "profile": "http://gilgamezh.me",
+      "contributions": [
+        "code",
+        "ideas",
+        "infra"
+      ]
+    },
+    {
+      "login": "comradekingu",
+      "name": "Allan Nordhøy",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/13802408?v=4",
+      "profile": "http://portfolio.anotheragency.no",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "Vistaus",
+      "name": "Heimen Stoffels",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/1716229?v=4",
+      "profile": "https://github.com/Vistaus",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "lizzyd710",
+      "name": "Elizabeth Sherrock",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/12602768?v=4",
+      "profile": "https://github.com/lizzyd710",
+      "contributions": [
+        "translation"
+      ]
+    }
+  ],
+  "contributorsPerLine": 5
+}
diff --git a/.codeclimate.yml b/.codeclimate.yml
@@ -20,6 +20,11 @@ plugins:
     enabled: true
   markdownlint:
     enabled: true
+    checks:
+      MD013:
+        enabled: false
+      MD033:
+        enabled: false
   nodesecurity:
     enabled: true
   pylint:

diff --git a/Dockerfile b/Dockerfile
@@ -32,7 +32,7 @@ CMD ["tail", "-f", "/dev/null"]
 #########################################
 # build image
 #########################################
-FROM python:3.7.4-alpine as development
+FROM python:3.9.2-alpine as development
 
 # Set environment variables
 ENV APP_ROOT /usr/src/app/
@@ -41,11 +41,12 @@ ENV DJANGO_CONFIGURATION=Prod
 
 # Install system dependencies
 RUN apk --update add --no-cache \
-  bash git gcc cairo-dev postgresql-dev libxslt-dev \
-  gettext musl-dev py3-setuptools jpeg-dev make \
+  bash git gcc cairo-dev postgresql-dev libxslt-dev postgresql-dev gcc cargo \
+  gettext musl-dev py3-setuptools jpeg-dev make python3-dev libffi-dev openssl-dev \
   && rm -rf /var/cache/apk/* /var/lib/apt/lists/* /tmp/* /var/tmp/*
 
 ## Install python dependencies
+RUN pip3 install --upgrade pip
 RUN pip3 install --no-cache-dir cffi cairocffi psycopg2
 RUN apk --update add --no-cache cairo-dev \
   && rm -rf /var/cache/apk/* /var/lib/apt/lists/* /tmp/* /var/tmp/*

diff --git a/Makefile b/Makefile
@@ -65,8 +65,8 @@ backend-lint-with-report: ## Run backend linter and generate report
 	pylint --output-format=colorized --reports yes eventol/eventol eventol/manager
 
 backend-make-translations: ## Update translations files (update .po files)
-	cd eventol && python manage.py makemessages -a -d djangojs --no-location -i node_modules -i venv -i coverage -e js,jsx
-	cd eventol && python manage.py makemessages -a -d django --no-location -i node_modules -i venv -i coverage
+	cd eventol && python manage.py makemessages -a -d djangojs --no-location -i *.spec.jsx -i *.spec.js -i *.config.js -i bower_components -i node_modules -i venv -i coverage -e js,jsx
+	cd eventol && python manage.py makemessages -a -d django --no-location -i bower_components -i node_modules -i venv -i coverage
 
 backend-compile-translations: ## Compile translations files (update .mo files)
 	cd eventol && python manage.py compilemessages

diff --git a/README-es.md b/README-es.md
@@ -6,6 +6,9 @@ EventoL es un software de administración de eventos, desarrollador inicialmente
 Estado
 ------
 
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Translation status](https://hosted.weblate.org/widgets/eventol/-/svg-badge.svg)](https://hosted.weblate.org/engage/eventol/?utm_source=widget)
 [![Build Status](https://travis-ci.org/eventoL/eventoL.svg?branch=master)](https://travis-ci.org/eventoL/eventoL)
 [![pipeline status](https://gitlab.com/eventol/eventoL/badges/master/pipeline.svg)](https://gitlab.com/eventol/eventoL/commits/master)
@@ -36,3 +39,32 @@ Configuración de server propio
 
 - Ver [Instrucciones de Instalación](http://eventol.github.io/eventoL/#/es/installation)
 - Ver [Instrucciones de puesta en marcha](http://eventol.github.io/eventoL/#/es/deploy)
+
+Contribuyentes ✨
+-----------------
+
+Gracias a estas personas maravillosas ([emojis](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/FedeG"><img src="https://avatars3.githubusercontent.com/u/4097554?v=4" width="100px;" alt=""/><br /><sub><b>Federico Gonzalez</b></sub></a><br /><a href="#a11y-FedeG" title="Accessibility">️️️️♿️</a> <a href="https://github.com/eventoL/eventoL/issues?q=author%3AFedeG" title="Bug reports">🐛</a> <a href="#blog-FedeG" title="Blogposts">📝</a> <a href="https://github.com/eventoL/eventoL/commits?author=FedeG" title="Code">💻</a> <a href="#design-FedeG" title="Design">🎨</a> <a href="https://github.com/eventoL/eventoL/commits?author=FedeG" title="Documentation">📖</a> <a href="#ideas-FedeG" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-FedeG" title="Maintenance">🚧</a> <a href="#projectManagement-FedeG" title="Project Management">📆</a> <a href="https://github.com/eventoL/eventoL/pulls?q=is%3Apr+reviewed-by%3AFedeG" title="Reviewed Pull Requests">👀</a> <a href="#security-FedeG" title="Security">🛡️</a> <a href="#translation-FedeG" title="Translation">🌍</a> <a href="https://github.com/eventoL/eventoL/commits?author=FedeG" title="Tests">⚠️</a> <a href="#infra-FedeG" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/reyiyo"><img src="https://avatars3.githubusercontent.com/u/761204?v=4" width="100px;" alt=""/><br /><sub><b>Sergio Orbe</b></sub></a><br /><a href="https://github.com/eventoL/eventoL/commits?author=reyiyo" title="Code">💻</a> <a href="#design-reyiyo" title="Design">🎨</a> <a href="#ideas-reyiyo" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/ChmlGr"><img src="https://avatars2.githubusercontent.com/u/5685527?v=4" width="100px;" alt=""/><br /><sub><b>Ximena Garcia</b></sub></a><br /><a href="https://github.com/eventoL/eventoL/commits?author=ChmlGr" title="Code">💻</a> <a href="#design-ChmlGr" title="Design">🎨</a> <a href="#ideas-ChmlGr" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://hackan.net"><img src="https://avatars2.githubusercontent.com/u/7178420?v=4" width="100px;" alt=""/><br /><sub><b>HacKan</b></sub></a><br /><a href="https://github.com/eventoL/eventoL/commits?author=HacKanCuBa" title="Code">💻</a> <a href="#design-HacKanCuBa" title="Design">🎨</a> <a href="#ideas-HacKanCuBa" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/eventoL/eventoL/commits?author=HacKanCuBa" title="Tests">⚠️</a></td>
+    <td align="center"><a href="http://gilgamezh.me"><img src="https://avatars3.githubusercontent.com/u/1496486?v=4" width="100px;" alt=""/><br /><sub><b>Nicolás Demarchi</b></sub></a><br /><a href="https://github.com/eventoL/eventoL/commits?author=gilgamezh" title="Code">💻</a> <a href="#ideas-gilgamezh" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-gilgamezh" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://portfolio.anotheragency.no"><img src="https://avatars1.githubusercontent.com/u/13802408?v=4" width="100px;" alt=""/><br /><sub><b>Allan Nordhøy</b></sub></a><br /><a href="#translation-comradekingu" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Vistaus"><img src="https://avatars1.githubusercontent.com/u/1716229?v=4" width="100px;" alt=""/><br /><sub><b>Heimen Stoffels</b></sub></a><br /><a href="#translation-Vistaus" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/lizzyd710"><img src="https://avatars2.githubusercontent.com/u/12602768?v=4" width="100px;" alt=""/><br /><sub><b>Elizabeth Sherrock</b></sub></a><br /><a href="#translation-lizzyd710" title="Translation">🌍</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+Este proyecto sigue la especificación [all-contributors](https://github.com/all-contributors/all-contributors). ¡Contribuciones de cualquier tipo bienvenidas!
diff --git a/README.md b/README.md
@@ -6,6 +6,9 @@ EventoL is a event management software initially developed to manage [FLISoL](ht
 Status
 ------
 
+<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
+[![All Contributors](https://img.shields.io/badge/all_contributors-8-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
 [![Translation status](https://hosted.weblate.org/widgets/eventol/-/svg-badge.svg)](https://hosted.weblate.org/engage/eventol/?utm_source=widget)
 [![Build Status](https://travis-ci.org/eventoL/eventoL.svg?branch=master)](https://travis-ci.org/eventoL/eventoL)
 [![pipeline status](https://gitlab.com/eventol/eventoL/badges/master/pipeline.svg)](https://gitlab.com/eventol/eventoL/commits/master)
@@ -36,3 +39,32 @@ Configure Own server
 
 - See [Installation Instructions](http://eventol.github.io/eventoL/#/en/installation)
 - See [Deploy Instructions](http://eventol.github.io/eventoL/#/en/deploy)
+
+Contributors ✨
+---------------
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tr>
+    <td align="center"><a href="https://github.com/FedeG"><img src="https://avatars3.githubusercontent.com/u/4097554?v=4" width="100px;" alt=""/><br /><sub><b>Federico Gonzalez</b></sub></a><br /><a href="#a11y-FedeG" title="Accessibility">️️️️♿️</a> <a href="https://github.com/eventoL/eventoL/issues?q=author%3AFedeG" title="Bug reports">🐛</a> <a href="#blog-FedeG" title="Blogposts">📝</a> <a href="https://github.com/eventoL/eventoL/commits?author=FedeG" title="Code">💻</a> <a href="#design-FedeG" title="Design">🎨</a> <a href="https://github.com/eventoL/eventoL/commits?author=FedeG" title="Documentation">📖</a> <a href="#ideas-FedeG" title="Ideas, Planning, & Feedback">🤔</a> <a href="#maintenance-FedeG" title="Maintenance">🚧</a> <a href="#projectManagement-FedeG" title="Project Management">📆</a> <a href="https://github.com/eventoL/eventoL/pulls?q=is%3Apr+reviewed-by%3AFedeG" title="Reviewed Pull Requests">👀</a> <a href="#security-FedeG" title="Security">🛡️</a> <a href="#translation-FedeG" title="Translation">🌍</a> <a href="https://github.com/eventoL/eventoL/commits?author=FedeG" title="Tests">⚠️</a> <a href="#infra-FedeG" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+    <td align="center"><a href="https://github.com/reyiyo"><img src="https://avatars3.githubusercontent.com/u/761204?v=4" width="100px;" alt=""/><br /><sub><b>Sergio Orbe</b></sub></a><br /><a href="https://github.com/eventoL/eventoL/commits?author=reyiyo" title="Code">💻</a> <a href="#design-reyiyo" title="Design">🎨</a> <a href="#ideas-reyiyo" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://github.com/ChmlGr"><img src="https://avatars2.githubusercontent.com/u/5685527?v=4" width="100px;" alt=""/><br /><sub><b>Ximena Garcia</b></sub></a><br /><a href="https://github.com/eventoL/eventoL/commits?author=ChmlGr" title="Code">💻</a> <a href="#design-ChmlGr" title="Design">🎨</a> <a href="#ideas-ChmlGr" title="Ideas, Planning, & Feedback">🤔</a></td>
+    <td align="center"><a href="https://hackan.net"><img src="https://avatars2.githubusercontent.com/u/7178420?v=4" width="100px;" alt=""/><br /><sub><b>HacKan</b></sub></a><br /><a href="https://github.com/eventoL/eventoL/commits?author=HacKanCuBa" title="Code">💻</a> <a href="#design-HacKanCuBa" title="Design">🎨</a> <a href="#ideas-HacKanCuBa" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/eventoL/eventoL/commits?author=HacKanCuBa" title="Tests">⚠️</a></td>
+    <td align="center"><a href="http://gilgamezh.me"><img src="https://avatars3.githubusercontent.com/u/1496486?v=4" width="100px;" alt=""/><br /><sub><b>Nicolás Demarchi</b></sub></a><br /><a href="https://github.com/eventoL/eventoL/commits?author=gilgamezh" title="Code">💻</a> <a href="#ideas-gilgamezh" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-gilgamezh" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a></td>
+  </tr>
+  <tr>
+    <td align="center"><a href="http://portfolio.anotheragency.no"><img src="https://avatars1.githubusercontent.com/u/13802408?v=4" width="100px;" alt=""/><br /><sub><b>Allan Nordhøy</b></sub></a><br /><a href="#translation-comradekingu" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/Vistaus"><img src="https://avatars1.githubusercontent.com/u/1716229?v=4" width="100px;" alt=""/><br /><sub><b>Heimen Stoffels</b></sub></a><br /><a href="#translation-Vistaus" title="Translation">🌍</a></td>
+    <td align="center"><a href="https://github.com/lizzyd710"><img src="https://avatars2.githubusercontent.com/u/12602768?v=4" width="100px;" alt=""/><br /><sub><b>Elizabeth Sherrock</b></sub></a><br /><a href="#translation-lizzyd710" title="Translation">🌍</a></td>
+  </tr>
+</table>
+
+<!-- markdownlint-enable -->
+<!-- prettier-ignore-end -->
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!
diff --git a/docs/en/deploy.md b/docs/en/deploy.md
@@ -98,7 +98,15 @@ docker_redis_1         docker-entrypoint.sh redis ...   Up      6379/tcp
 docker_worker_1        ./wait-for-it.sh -p 5432 - ...   Up      8000/tcp
 ```
 
-### Server run in: **http://localhost/** (if you didn't change the HOST variable in your environment)
+#### Server run in: **http://localhost/** (if you didn't change the HOST variable in your environment)
+
+## Update server
+
+```bash
+make update
+```
+
+## Undeploy
 
 ### Stop containers
 

diff --git a/docs/es/deploy.md b/docs/es/deploy.md
@@ -99,7 +99,15 @@ docker_redis_1         docker-entrypoint.sh redis ...   Up      6379/tcp
 docker_worker_1        ./wait-for-it.sh -p 5432 - ...   Up      8000/tcp
 ```
 
-### Servidor andando en: **http://localhost/** (si no cambiaste el HOST en las varibles de entorno)
+#### Servidor andando en: **http://localhost/** (si no cambiaste el HOST en las varibles de entorno)
+
+## Actualizar el servidor
+
+```bash
+make update
+```
+
+## Undeploy
 
 ### Parar los containers