Upgrade django-tailwind to v3

Pipfile

@@ -11,7 +11,7 @@ gunicorn = "==20.1.0"
 sentry-sdk = "==1.3.1"
 whitenoise = "==5.3.0"
 python-dotenv = "==0.19"
-django-tailwind = "==2.2.0"
+django-tailwind = "==3.1.1"
 django-taggit = "==1.5.1"
 django-fsm = "==2.7.1"
 

config/settings/base.py

@@ -138,7 +138,6 @@
 
 STATIC_URL = "/static/"
 STATIC_ROOT = BASE_DIR / "assets"
-print(f"{STATIC_ROOT=}")
 
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 

docker-compose.yml

@@ -41,6 +41,7 @@ services:
     <<: *app-config
     command: dev_tailwind_start
     entrypoint: /src/docker-entrypoint.sh
+    tty: true
     env_file:
       - .env
     environment:

docker-entrypoint.sh

@@ -37,10 +37,6 @@ case "$1" in
     echo "==> Installing frontend dependencies..."
     pipenv run python manage.py tailwind install
 
-    echo "==> Preparing frontend assets..."
-    pipenv run python manage.py tailwind build
-    pipenv run python manage.py collectstatic --no-input
-
     echo "==> Running frontend..."
     pipenv run python manage.py tailwind start
     ;;

docs/en/README-devs.md

@@ -39,7 +39,7 @@ The docker-compose.yml file contains all the configuration needed to have a runn
 
 Now you can point your browser to [http://0.0.0.0:8000/](http://0.0.0.0:8000/). To access the admin panel go to [http://0.0.0.0:8000/admin/](http://0.0.0.0:8000/admin/), and use the following credentials:
 
-* username: **admin**
+* email: **admin@example.com**
 * password: **abc123**
 
 #### Option 2: Local
@@ -48,16 +48,13 @@ Now you can point your browser to [http://0.0.0.0:8000/](http://0.0.0.0:8000/).
 
 - [Python 3.9](https://www.python.org/)
 - [Pipenv](https://docs.pipenv.org/en/latest/)
-- [pre-commit](https://pre-commit.com/#install)
 - [Node.js 14 or newer](https://nodejs.org) (includes npm)
+- [Postgres 13](https://www.postgresql.org/)
 
 ```bash
 # Clone the rep
 $ git clone https://github.com/Code4PuertoRico/una-hora.git
 
-# Install pre-commit hooks
-$ pre-commit install
-
 # Make a copy of the .env.example file
 $ cp .env.example .env
 
@@ -67,11 +64,8 @@ $ pipenv install --dev
 # Install frontend dependencies
 $ pipenv run python manage.py tailwind install
 
-# Build frontend dependencies
-$ pipenv run python manage.py tailwind build
-
-# Prepare frontend and admin site static files
-$ pipenv run python manage.py collectstatic --no-input
+# Watch for changes and rebuild CSS
+$ pipenv run python manage.py tailwind install
 
 # Django migrate and initial data load
 $ pipenv run python manage.py migrate
@@ -83,7 +77,7 @@ $ pipenv run python manage.py runserver
 
 Now you can point your browser to [http://localhost:8000/](http://localhost:8000/). To access the admin panel go to [http://localhost:8000/admin/](http://localhost:8000/admin/), and use the following credentials:
 
-* username: **admin**
+* email: **admin@example.com**
 * password: **abc123**
 
 #### Running the Tests

docs/es/README-devs.md

@@ -37,16 +37,19 @@ $ docker-compose run web pre_commit
 
 El archivo docker-compose.yml contiene toda la configuración de los servicios de Docker necesarios tener una instancia de Una Hora corriendo.
 
-Abre tu browser en [http://0.0.0.0:8000/](http://0.0.0.0:8000/). Para accesar la sección de administración ve a [http://0.0.0.0:8000/admin/](http://0.0.0.0:8000/admin/), y usa el username **admin** y el password **abc123**.
+Abre tu browser en [http://0.0.0.0:8000/](http://0.0.0.0:8000/). Para accesar la sección de administración ve a [http://0.0.0.0:8000/admin/](http://0.0.0.0:8000/admin/), y usa:
+
+* email: **admin@example.com**
+* password: **abc123**
 
 #### Opción 2: Local
 
 **Requisitos**
 
 - [Python 3.9](https://www.python.org/)
 - [Pipenv](https://docs.pipenv.org/en/latest/)
-- [pre-commit](https://pre-commit.com/#install)
 - [Node.js 14 o más reciente](https://nodejs.org) (incluye npm)
+- [Postgres 13](https://www.postgresql.org/)
 
 ```bash
 # Clonear repositorio
@@ -55,20 +58,17 @@ $ git clone https://github.com/Code4PuertoRico/una-hora.git
 # Copiar archivo de variables de ambiente
 $ cp .env.example .env
 
-# Instalar pre-commit en repositorio
-$ pre-commit install
-
 # Instalar dependencias Python
 $ pipenv install --dev
 
+# Instalar pre-commit en repositorio
+$ pipenv run pre-commit install
+
 # Instalar dependencias para el frontend
 $ pipenv run python manage.py tailwind install
 
-# Construir las dependencias para el frontend
-$ pipenv run python manage.py tailwind build
-
-# Preparar los archivos estáticos del frontend y el admin
-$ pipenv run python manage.py collectstatic --no-input
+# Velar cambios y regenerar css
+$ pipenv run python manage.py tailwind start
 
 # Migración y data inicial
 $ pipenv run python manage.py migrate
@@ -78,8 +78,10 @@ $ pipenv run python manage.py loaddata una_hora/users/fixtures/initial.json
 $ pipenv run python manage.py runserver
 ```
 
-Abre tu browser en [http://localhost:8000/](http://localhost:8000/). Para accesar la sección de administración ve a [http://localhost:8000/admin/](http://localhost:8000/admin/), y usa el username **admin** y el password **abc123**.
+Abre tu browser en [http://localhost:8000/](http://localhost:8000/). Para accesar la sección de administración ve a [http://localhost:8000/admin/](http://localhost:8000/admin/), y usa:
 
+* email: **admin@example.com**
+* password: **abc123**
 
 #### Para correr tests
 ```

una_hora/theme/static_src/.gitignore

@@ -1,2 +1 @@
 node_modules
-package-lock.json