Merge 5f19eaa into 5eda37a

weni-ai · Jun 19, 2019 · 6ed6896 · 6ed6896
2 parents 5eda37a + 5f19eaa
commit 6ed6896
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 6 deletions.
diff --git a/bothub/authentication/models.py b/bothub/authentication/models.py
@@ -107,6 +107,7 @@ def send_welcome_email(self):
             return False
         context = {
             'name': self.name,
+            'base_url': settings.BASE_URL,
         }
         send_mail(
             _('Welcome to Bothub'),
@@ -131,6 +132,7 @@ def send_reset_password_email(self):
             self.nickname,
             token)
         context = {
+            'base_url': settings.BASE_URL,
             'reset_url': reset_url,
         }
         send_mail(

diff --git a/bothub/authentication/templates/authentication/emails/welcome.html b/bothub/authentication/templates/authentication/emails/welcome.html
@@ -4,7 +4,7 @@
 
 {% block before-content %}
 <div style="text-align: center; padding-top: 20px;">
-    <img src="{% static 'authentication/emails/welcome.png' %}" alt="{% trans 'Welcome to Bothub' %}" style="margin: auto; width: 100%; max-width: 388px; display: block;" />
+    <img src="{{ base_url }}{% static 'authentication/emails/welcome.png' %}" alt="{% trans 'Welcome to Bothub' %}" style="margin: auto; width: 100%; max-width: 388px; display: block;" />
     <h1 style="font-size: 24px;">{% trans 'Welcome to Bothub' %}</h1>
 </div>
 {% endblock %}

diff --git a/bothub/common/models.py b/bothub/common/models.py
@@ -1109,6 +1109,7 @@ def send_new_role_email(self, responsible=None):
         responsible_name = responsible and responsible.name \
             or self.repository.owner.name
         context = {
+            'base_url': settings.BASE_URL,
             'responsible_name': responsible_name,
             'user_name': self.user.name,
             'repository_name': self.repository.name,
@@ -1187,6 +1188,7 @@ def send_new_request_email_to_admins(self):
         if not settings.SEND_EMAILS:
             return False
         context = {
+            'base_url': settings.BASE_URL,
             'user_name': self.user.name,
             'repository_name': self.repository.name,
             'text': self.text,
@@ -1209,6 +1211,7 @@ def send_request_rejected_email(self):
         if not settings.SEND_EMAILS:
             return False
         context = {
+            'base_url': settings.BASE_URL,
             'repository_name': self.repository.name,
         }
         send_mail(
@@ -1227,6 +1230,7 @@ def send_request_approved_email(self):
         if not settings.SEND_EMAILS:
             return False
         context = {
+            'base_url': settings.BASE_URL,
             'admin_name': self.approved_by.name,
             'repository_name': self.repository.name,
         }

diff --git a/bothub/common/templates/bothub/emails/base.html b/bothub/common/templates/bothub/emails/base.html
@@ -13,7 +13,7 @@
             <div style="background-color: #f9f9f9; font-size: 1.25rem; color: #222222;">
                 {% block content %}
                 <a style="display: block; padding: 16px;" rel="nofollow" href="https://bothub.it/" target="_blank">
-                    <img src="{% static 'bothub/emails/logo.png' %}" alt="Bothub" width="124" height="26" style="display: block; margin: auto;" />
+                    <img src="{{ base_url }}{% static 'bothub/emails/logo.png' %}" alt="Bothub" width="124" height="26" style="display: block; margin: auto;" />
                 </a>
                 {% endblock %}
                 <div>{% block before-content %}{% endblock %}</div>
@@ -34,10 +34,10 @@
                 <div style="padding: 32px 24px;">
                     <div style="display: flex;">
                         <a style="padding: 0 8px;" rel="nofollow" href="https://www.facebook.com/bothub.it/" target="_blank">
-                            <img src="{% static 'bothub/emails/facebook.png' %}" alt="Facebook" width="38" height="38" style="display: block;" border="0" />
+                            <img src="{{ base_url }}{% static 'bothub/emails/facebook.png' %}" alt="Facebook" width="38" height="38" style="display: block;" border="0" />
                         </a>
                         <a style="padding: 0 8px;" rel="nofollow" href="https://www.linkedin.com/company/bothubit/" target="_blank">
-                            <img src="{% static 'bothub/emails/linkedin.png' %}" alt="LinkedIn" width="38" height="38" style="display: block;" border="0" />
+                            <img src="{{ base_url }}{% static 'bothub/emails/linkedin.png' %}" alt="LinkedIn" width="38" height="38" style="display: block;" border="0" />
                         </a>
                     </div>
                 </div>

diff --git a/bothub/common/templates/common/emails/new_request.html b/bothub/common/templates/common/emails/new_request.html
@@ -4,7 +4,7 @@
 
 {% block before-content %}
     <div style="text-align: center; padding-top: 20px;">
-        <img src="{% static 'common/emails/request.gif' %}" alt="{% trans 'New Authorization Request' %}" style="margin: auto; width: 100%; max-width: 456px; display: block;" />
+        <img src="{{ base_url }}{% static 'common/emails/request.gif' %}" alt="{% trans 'New Authorization Request' %}" style="margin: auto; width: 100%; max-width: 456px; display: block;" />
         <h1 style="font-size: 1.5rem;">{% trans 'New Authorization Request' %}</h1>
     </div>
 {% endblock %}

diff --git a/bothub/common/templates/common/emails/request_approved.html b/bothub/common/templates/common/emails/request_approved.html
@@ -4,7 +4,7 @@
 
 {% block before-content %}
     <div style="text-align: center; padding-top: 20px;">
-        <img src="{% static 'common/emails/request.gif' %}" alt="{% trans 'Authorization Request Approved' %}" style="margin: auto; width: 100%; max-width: 456px; display: block;" />
+        <img src="{{ base_url }}{% static 'common/emails/request.gif' %}" alt="{% trans 'Authorization Request Approved' %}" style="margin: auto; width: 100%; max-width: 456px; display: block;" />
         <h1 style="font-size: 24px;">{% trans 'Authorization Request Approved' %}</h1>
     </div>
 {% endblock %}

diff --git a/bothub/settings.py b/bothub/settings.py
@@ -23,6 +23,7 @@
     default='*',
     cast=lambda v: [s.strip() for s in v.split(',')])
 
+BASE_URL = config('BASE_URL', default='')
 
 # Application definition
 

diff --git a/bothub/urls.py b/bothub/urls.py
@@ -29,6 +29,7 @@
     def render_template(template_name, **kwargs):
         def wrapper(request):
             from django.shortcuts import render
+            print(request)
             return render(request, template_name, kwargs)
         return wrapper
 
@@ -38,11 +39,13 @@ def wrapper(request):
                 'welcome/',
                 render_template(
                     'authentication/emails/welcome.html',
+                    base_url=settings.BASE_URL,
                     name='Douglas')),
             path(
                 'new-role/',
                 render_template(
                     'common/emails/new_role.html',
+                    base_url=settings.BASE_URL,
                     responsible_name='Douglas',
                     user_name='Michael',
                     repository_name='Repository 1',
@@ -52,6 +55,7 @@ def wrapper(request):
                 'new-request/',
                 render_template(
                     'common/emails/new_request.html',
+                    base_url=settings.BASE_URL,
                     user_name='Michael',
                     repository_name='Repository 1',
                     text='Lorem ipsum dolor sit amet, consectetur ' +
@@ -64,11 +68,13 @@ def wrapper(request):
                 'request-rejected/',
                 render_template(
                     'common/emails/request_rejected.html',
+                    base_url=settings.BASE_URL,
                     repository_name='Repository 1')),
             path(
                 'request-approved/',
                 render_template(
                     'common/emails/request_approved.html',
+                    base_url=settings.BASE_URL,
                     admin_name='Douglas',
                     repository_name='Repository 1',
                     repository_url='http://localhost:8080/douglas/repo1/')),

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -50,6 +50,7 @@ services:
       - CHECK_ACCESSIBLE_API_URL=${CHECK_ACCESSIBLE_API_URL}
       - SEND_EMAILS=${SEND_EMAILS:-true}
       - SUPPORTED_LANGUAGES=${SUPPORTED_LANGUAGES:-en|pt}
+      - BASE_URL=${BOTHUB_BACKEND_BASE_URL:-https://api.bothub.ti/}
 
 
 networks: