Merge branch 'develop'

AnikaLegal · Dec 9, 2024 · 8e6349c · 8e6349c
2 parents 19d09a3 + 675da99
commit 8e6349c
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 18 deletions.
diff --git a/app/web/static/web/img/footer-banner.png b/app/web/static/web/img/footer-banner.png
diff --git a/app/web/templates/web/_base.html b/app/web/templates/web/_base.html
@@ -166,24 +166,26 @@ <h3>Reach Us</h3>
                 </p>
             </div>
         </div>
-        {% get_cookie "dismiss_footer_banner_giving_day" as dismiss_footer_banner %}
-        {% if false and not dismiss_footer_banner %}
+        {% get_cookie "dismiss_footer_banner_energy_report" as dismiss_footer_banner %}
+        {% slugurl 'report-too-hot-too-cold-too-costly' as report_url %}
+        {% if request.path != report_url and not dismiss_footer_banner %}
         <div id="footer-banner">
             <div class="footer-banner-contents">
                 <div class="footer-banner-image">
                     <img src="{% static 'web/img/footer-banner.png' %}">
                 </div>
                 <div class="footer-banner-text">
                     <div class="footer-banner-header">
-                        Stand up for housing justice.
-                        Donate to Anika Legal's Giving Day. 
+                        Report: Too Hot, Too Cold, Too Costly
                     </div>
                     <div class="footer-banner-subheading">
-                        All donations will be matched by our sponsors.
+                        We've delved deep into the data surrounding energy
+                        inefficiency and its impact on Victorian renters. Read
+                        the full report today.
                     </div>
                 </div>
                 <div class="footer-banner-action">
-                    <a href="https://anikagivingday2024.raiselysite.com/"><button>Donate</button></a>
+                    <a href="{{ report_url }}"><button>Read the report here</button></a>
                 </div>
             </div>
             <div class="footer-banner-close">
@@ -203,7 +205,7 @@ <h3>Reach Us</h3>
     </script>
     <script>
         function dismissFooterBanner() {
-            document.cookie = "dismiss_footer_banner_giving_day=true; max-age=604800; Path=/";
+            document.cookie = "dismiss_footer_banner_energy_report=true; max-age=604800; Path=/";
             document.getElementById("footer-banner").style.display = "none";
         }
     </script>

diff --git a/app/web/templates/web/about/reports.html b/app/web/templates/web/about/reports.html
@@ -19,8 +19,10 @@ <h1>Reports</h1>
                     charity & social enterprise.  Our Annual, Financial and
                     Impact Reports outline the work we do.
                 </p>
-                <a href="{% slugurl 'broken-bonds' %}">
-                    <button>Read our Broken Bonds report</button>
+                <a href="{% slugurl 'report-too-hot-too-cold-too-costly' %}">
+                    <button>
+                        Read our Too Hot, Too Cold, Too Costly report
+                    </button>
                 </a>
             </div>
             <img class="round not-responsive top-left top-right bottom-left"
@@ -36,6 +38,19 @@ <h2 style="z-index: 1">
         </h2>
         <div class="divider"></div>
         <div class="link-list two">
+            <div class="card">
+                <img class="icon" src="{% static 'web/img/icons/document.svg' %}">
+                <h2>
+                    Too Hot, Too Cold, Too Costly
+                </h2>
+                <p>
+                    We've delved deep into the data surrounding energy
+                    inefficiency and its impact on Victorian renters.
+                </p>
+                <a href="{% slugurl 'report-too-hot-too-cold-too-costly' %}">
+                    <button>View</button>
+                </a>
+            </div>
             <div class="card">
                 <img class="icon" src="{% static 'web/img/icons/document.svg' %}">
                 <h2>

diff --git a/docs/bookstack.md b/docs/bookstack.md
@@ -3,8 +3,8 @@
 This wiki is used for Anika Legal course documenation. Hosted in AWS EC2.
 
 - Domain: wiki.anikalegal.com
-- IP: 3.24.123.148
-- Private key: clerk.pem
+- IP: 13.211.81.43
+- Private key: wiki.pem (see Bitwarden)
 
 [Bookstack Documentation](https://www.bookstackapp.com/docs/)
 
@@ -34,7 +34,7 @@ MAIL_PASSWORD=SG.**********
 # Ensure app stores uploaded files in S3, not locally
 # https://www.bookstackapp.com/docs/admin/upload-config/
 STORAGE_TYPE=s3
-STORAGE_S3_KEY=AKIA**********
+STORAGE_S3_KEY=AKIAUZ6OTSVMX2RTJOXB
 STORAGE_S3_SECRET=**********
 STORAGE_S3_BUCKET=anika-bookstack
 STORAGE_S3_REGION=ap-southeast-2

diff --git a/infra/bookstack/setup.sh b/infra/bookstack/setup.sh
@@ -3,12 +3,6 @@
 # https://www.bookstackapp.com/docs/admin/installation/#ubuntu-1804
 set -e
 
-# Add SSH keys
-MS_DESKTOP_KEY="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCfXP53x8aMWUjml94SKFZTGP6IlRPakuYve0QPPWhR4e+UzWhBefNS5hl1eDLkfv4QhIx1ELelZgpHeqnOBNl2P79+p5Z/TFu5U66BbrRayVy2g7/mc5USfZw3D4jxRy+r7FVzUcdGs+S2yW1TW0PxMdzRrTvHXYAIq5ILgr4MBuzkhL4DTBXb4zD5Dlkeypeivi2gbrEA4LRnhas2xZULDVXPN7m/U4eVofHPERMTl23wX9iteYaIknoThS8pwyi2vGRj63bePV2l2GMw9KaG3IxoKLBqQkRori1u4WcZuuiMlgrEUfpqoZUBIon6LhsXAB4IzzaQwt7t+DLrFTckSLw6SNCkuXNuJmAPjeh4rsONies9NNZ72g++1ec4Yrh7SQK1GH/5EHU7g2qzR2Ygb0JkUmgwuvpc2L3mLg8daNV5mFaALcu03WiccnFkYu3qEcnIB+4YTNgHIClTJOaHENix3QJvyuFsESNE2nZUNDctKMNlVs/PD1Bq6sEeIqucZ4ONVzw1hXa2BLfym21nxRsccBLmQilVXsJfAnkd5+LkggfN8Mn0eYFM3M8w29HBcoZn2Gu6fdKD2hPjz+zDhzIik3HRidldZizUU0wj4uSEsBgZmd2vbI6+1ADJgAIAWZSqb093l7Qj1wtHUE3gaOhT8Nr8KkjxokMBKh2I7w== mattdsegal@gmail.com"
-MS_LAPTOP_KEY="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQCh+qrs9Z6nWX8kGnCWrOWHShjjPD3zPg5D78kn9jTBPz0yGBKoDvtkw390n1+opJjlRl8t9yCus1iHIw3IplGkRca5A6l5oCI+kXCH3iAgThleHbPcM+0tskT9ASmZTNVomfuipTlAap940kdUYYueJzRbNqUWFoN6hHf7AxLiIkAmTw8uFWw9ywJNydk81ETXN5xbPgtZW3rpdG/krH8HeV69bzygLN/SYDoQETBMW1AzGqpQI7TzJGfOwqDtLoTDQ6odYUvRQGcACg3DCDS/ZMNU2RgLPPvQSSLlMYV2QGI0e/YS82IkOqk79rByqCYVBQu9m7aPc206316WaWo/CTFFxF+0KTPuMF8uAtUOT3Iv6uOTtxQ6pcTgxC+jphKPDuJxebYui0dMgdJZa8ZIDduEzKcRChkfKRVGRDnyFCWFFeB3pj78teAwjyDRb3Y+o7nHxMQiNoCnRY31vdIYk/4DeBhiEtLmh7Ed8tzfo0chKqM1GXpffUy4G6RS+SYPYHVzgIKQsfzO4pKbROo669thiZ5MBMp1xKmupgZzM4nMy4Z8q3EyG22hwuAbUa9PnNcvoO8BKr2rupcot0ZhEWlHa6As5DrdUwdr3l1lKoy9f8+l9LojOxguEXddfTTUB5N022Pm6iyLdt9PByMyZvZrMlG2Q4UEhZqSDVe25w== mattdsegal@gmail.com"
-echo $MS_DESKTOP_KEY >> /home/ubuntu/.ssh/authorized_keys
-echo $MS_LAPTOP_KEY >> /home/ubuntu/.ssh/authorized_keys
-
 echo "Installed SSH keys:"
 cat /home/ubuntu/.ssh/authorized_keys