From d799a05c78c0c947689e17a2a6a585d3f0b73eac Mon Sep 17 00:00:00 2001
From: Oleg Lavrovsky <oleg@utou.ch>
Date: Sat, 16 May 2020 18:44:51 +0200
Subject: [PATCH] Added django-contrib-comments

---
 Makefile                                  | 10 +++---
 Pipfile                                   |  1 +
 ansible/roles/wagtail/tasks/frontend.yaml | 41 ++++++++++++++++++++---
 ansible/roles/wagtail/tasks/install.yaml  |  5 ++-
 ansible/roles/wagtail/tasks/main.yaml     |  4 ---
 ansible/roles/wagtail/tasks/release.yaml  |  7 ++--
 requirements.txt                          |  1 +
 7 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index 3b66355..7d16c26 100644
--- a/Makefile
+++ b/Makefile
@@ -38,18 +38,20 @@ apply-migrations: migrations migrate
 setup:
 	docker-compose exec web ./manage.py migrate
 	docker-compose exec web ./manage.py createsuperuser --username admin --email $(EMAIL) --noinput
-	docker-compose exec web ./manage.py compress
-	docker-compose exec web ./manage.py collectstatic --noinput
 
-release:
+rebuild:
 	docker-compose pull
-	sudo docker-compose build web
+	docker-compose build web --no-cache
 	docker-compose stop web
 	docker-compose kill web
 	docker-compose up -d web
+
+compress:
 	docker-compose exec web ./manage.py collectstatic --noinput -i media
 	docker-compose exec web ./manage.py compress
 
+release: rebuild compress
+
 reindex:
 	docker-compose exec web ./manage.py update_index
 
diff --git a/Pipfile b/Pipfile
index 84bc4c5..33c0ace 100644
--- a/Pipfile
+++ b/Pipfile
@@ -21,6 +21,7 @@ django-el-pagination = "*"
 django-libsass = "*"
 django-redis = "*"
 django-social-share = "*"
+django-contrib-comments = "*"
 elasticsearch = ">=5.0.0,<6.0.0"
 guess_language-spirit = "*"
 gunicorn = "*"
diff --git a/ansible/roles/wagtail/tasks/frontend.yaml b/ansible/roles/wagtail/tasks/frontend.yaml
index a27d5d4..771180c 100644
--- a/ansible/roles/wagtail/tasks/frontend.yaml
+++ b/ansible/roles/wagtail/tasks/frontend.yaml
@@ -1,9 +1,42 @@
 ---
 
-- name: Install packages based on package.json.
+- name: Install JavaScript Yarn
+  become: true
   npm:
+    name: yarn
+    global: true
+
+- name: Link the Yarn executable
+  become: true
+  file:
+    src: "/usr/local/lib/npm/bin/yarn"
+    dest: "/usr/local/bin/yarn"
+    state: link
+
+- name: Install JavaScript Grunt
+  become: true
+  yarn:
+    name: grunt-cli
+    global: true
+
+- name: Link the Grunt executable
+  become: true
+  file:
+    src: "/usr/local/lib/npm/bin/grunt"
+    dest: "/usr/local/bin/grunt"
+    state: link
+
+- name: Install JavaScript packages with Yarn
+  yarn:
     path: "{{ release_dir }}"
 
-- name: Install packages based on bower.json.
-  bower:
-    path: "{{ release_dir }}"
+- name: Link the old bower component to libs
+  file:
+    src: "{{ release_dir }}/node_modules/@bower_components"
+    dest: "{{ release_dir }}/publichealth/static/libs"
+    state: link
+
+- name: Compile JavaScript sources with Grunt
+  shell: grunt
+  args:
+    chdir: "{{ release_dir }}"
diff --git a/ansible/roles/wagtail/tasks/install.yaml b/ansible/roles/wagtail/tasks/install.yaml
index 3281f0e..ff4a37f 100644
--- a/ansible/roles/wagtail/tasks/install.yaml
+++ b/ansible/roles/wagtail/tasks/install.yaml
@@ -31,9 +31,8 @@
   args:
     chdir: "{{ release_dir }}"
 
-
-- name: Finish setup of Wagtail site
-  shell: make setup
+- name: Prepare compress frontend
+  shell: make compress
   args:
     chdir: "{{ release_dir }}"
 
diff --git a/ansible/roles/wagtail/tasks/main.yaml b/ansible/roles/wagtail/tasks/main.yaml
index a6dc7f5..60712f2 100644
--- a/ansible/roles/wagtail/tasks/main.yaml
+++ b/ansible/roles/wagtail/tasks/main.yaml
@@ -3,14 +3,10 @@
 - include: install.yaml
   tags:
     - install
-    - docker
-    - setup
 
 - include: frontend.yaml
   tags:
     - frontend
-    - nodejs
-    - setup
 
 - include: release.yaml
   tags:
diff --git a/ansible/roles/wagtail/tasks/release.yaml b/ansible/roles/wagtail/tasks/release.yaml
index 8aac1d3..f29d1de 100644
--- a/ansible/roles/wagtail/tasks/release.yaml
+++ b/ansible/roles/wagtail/tasks/release.yaml
@@ -12,6 +12,7 @@
     src: docker-compose.j2
     dest: "{{ release_dir }}/docker-compose.yml"
 
-- name: Update Docker site
-  debug:
-    msg: "Please run 'make release' in {{ release_dir }} to finish updating the site"
+- name: Rebuild and release Wagtail site
+  shell: make release
+  args:
+    chdir: "{{ release_dir }}"
diff --git a/requirements.txt b/requirements.txt
index fddb837..cf68a88 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,6 +22,7 @@ django-crispy-forms==1.9.0
 django-el-pagination==3.3.0
 django-libsass==0.8
 django-social-share==1.4.0
+django-contrib-comments==1.9.2
 libsass==0.20.0
 Pillow==7.1.2