From 45c49f1e1a2028dd21994ae4be943f66d8e1f245 Mon Sep 17 00:00:00 2001
From: doanguyen <dungnv2410@gmail.com>
Date: Sat, 28 Dec 2019 21:59:47 +0100
Subject: [PATCH 1/2] minor comments on domain-detail branch

---
 app/config.py                                 | 12 +++++++-----
 .../templates/dashboard/custom_domain.html    |  8 ++++++--
 .../templates/dashboard/domain_detail.html    | 19 ++++++++++++++++---
 app/dashboard/templates/dashboard/index.html  |  4 ++--
 app/dashboard/views/domain_detail.py          | 11 +----------
 static/style.css                              |  4 ++++
 6 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/app/config.py b/app/config.py
index e2906ee3..b4dc1184 100644
--- a/app/config.py
+++ b/app/config.py
@@ -66,11 +66,13 @@ with open(DKIM_PRIVATE_KEY_PATH) as f:
 
 
 with open(DKIM_PUBLIC_KEY_PATH) as f:
-    DKIM_DNS_VALUE = f.read()
-    DKIM_DNS_VALUE = DKIM_DNS_VALUE.replace("-----BEGIN PUBLIC KEY-----", "")
-    DKIM_DNS_VALUE = DKIM_DNS_VALUE.replace("-----END PUBLIC KEY-----", "")
-    DKIM_DNS_VALUE = DKIM_DNS_VALUE.replace("\r", "")
-    DKIM_DNS_VALUE = DKIM_DNS_VALUE.replace("\n", "")
+    DKIM_DNS_VALUE = (
+        f.read()
+        .replace("-----BEGIN PUBLIC KEY-----", "")
+        .replace("-----END PUBLIC KEY-----", "")
+        .replace("\r", "")
+        .replace("\n", "")
+    )
 
 
 DKIM_HEADERS = [b"from", b"to", b"subject"]
diff --git a/app/dashboard/templates/dashboard/custom_domain.html b/app/dashboard/templates/dashboard/custom_domain.html
index c5e700c3..23fdc769 100644
--- a/app/dashboard/templates/dashboard/custom_domain.html
+++ b/app/dashboard/templates/dashboard/custom_domain.html
@@ -16,8 +16,12 @@
         <div class="card" style="max-width: 50rem">
           <div class="card-body">
             <h5 class="card-title">
-              {{ custom_domain.domain }}
-              {% if custom_domain.verified %} ✅ {% else %} 🚫{% endif %}
+              <a href="{{ url_for('dashboard.domain_detail', custom_domain_id=custom_domain.id) }}">{{ custom_domain.domain }}</a>
+              {% if custom_domain.verified %}
+                <span class="cursor" data-toggle="tooltip" data-original-title="Domain Verified">✅</span>
+              {% else %}
+                <span class="cursor" data-toggle="tooltip" data-original-title="Domain Not Verified">🚫 </span>
+              {% endif %}
             </h5>
             <h6 class="card-subtitle mb-2 text-muted">
               Created {{ custom_domain.created_at | dt }} <br>
diff --git a/app/dashboard/templates/dashboard/domain_detail.html b/app/dashboard/templates/dashboard/domain_detail.html
index 3f0f2909..08864fa7 100644
--- a/app/dashboard/templates/dashboard/domain_detail.html
+++ b/app/dashboard/templates/dashboard/domain_detail.html
@@ -19,7 +19,12 @@
 
     <div>
       <div class="font-weight-bold">1. MX record
-        {% if custom_domain.verified %} ✅ {% else %} 🚫{% endif %}
+
+        {% if custom_domain.verified %}
+            <span class="cursor" data-toggle="tooltip" data-original-title="MX Record Verified">✅</span>
+        {% else %}
+            <span class="cursor" data-toggle="tooltip" data-original-title="MX Record Not Verified">🚫 </span>
+        {% endif %}
       </div>
 
       <div class="mb-2">Add the following MX DNS record to your domain</div>
@@ -64,7 +69,11 @@
 
     <div>
       <div class="font-weight-bold">2. SPF (Optional)
-        {% if custom_domain.spf_verified %} ✅ {% else %} 🚫{% endif %}
+        {% if custom_domain.spf_verified %}
+            <span class="cursor" data-toggle="tooltip" data-original-title="SPF Verified">✅</span>
+        {% else %}
+            <span class="cursor" data-toggle="tooltip" data-original-title="SPF Not Verified">🚫 </span>
+        {% endif %}
       </div>
 
       <div>
@@ -116,7 +125,11 @@
 
     <div>
       <div class="font-weight-bold">3. DKIM (Optional)
-        {% if custom_domain.dkim_verified %} ✅ {% else %} 🚫{% endif %}
+        {% if custom_domain.dkim_verified %}
+            <span class="cursor" data-toggle="tooltip" data-original-title="SPF Verified">✅</span>
+        {% else %}
+            <span class="cursor" data-toggle="tooltip" data-original-title="DKIM Not Verified">🚫 </span>
+        {% endif %}
       </div>
 
       <div>
diff --git a/app/dashboard/templates/dashboard/index.html b/app/dashboard/templates/dashboard/index.html
index 9b4e659d..a3a2841c 100644
--- a/app/dashboard/templates/dashboard/index.html
+++ b/app/dashboard/templates/dashboard/index.html
@@ -80,7 +80,7 @@
       >
         <div class="card p-3 {% if alias_info.highlight %} highlight-row {% endif %}">
           <div>
-            <span class="clipboard mb-0"
+            <span class="clipboard cursor mb-0"
                 {% if gen_email.enabled %}
                   data-toggle="tooltip"
                   title="Copy to clipboard"
@@ -118,7 +118,7 @@
             <form method="post">
               <input type="hidden" name="form-name" value="switch-email-forwarding">
               <input type="hidden" name="gen-email-id" value="{{ gen_email.id }}">
-              <label class="custom-switch mt-2"
+              <label class="custom-switch cursor mt-2"
                      data-toggle="tooltip"
                   {% if gen_email.enabled %}
                      title="Block Alias"
diff --git a/app/dashboard/views/domain_detail.py b/app/dashboard/views/domain_detail.py
index cd2cd8f3..aa66bf43 100644
--- a/app/dashboard/views/domain_detail.py
+++ b/app/dashboard/views/domain_detail.py
@@ -105,14 +105,5 @@ def domain_detail(custom_domain_id):
 
     return render_template(
         "dashboard/domain_detail.html",
-        custom_domain=custom_domain,
-        EMAIL_SERVERS_WITH_PRIORITY=EMAIL_SERVERS_WITH_PRIORITY,
-        spf_record=spf_record,
-        dkim_record=dkim_record,
-        mx_errors=mx_errors,
-        mx_ok=mx_ok,
-        spf_errors=spf_errors,
-        spf_ok=spf_ok,
-        dkim_errors=dkim_errors,
-        dkim_ok=dkim_ok,
+        **locals()
     )
diff --git a/static/style.css b/static/style.css
index 285df487..707a7867 100644
--- a/static/style.css
+++ b/static/style.css
@@ -66,4 +66,8 @@ em {
 .copy-btn {
     font-size: 0.6rem;
     line-height: 0.75;
+}
+
+.cursor {
+    cursor: pointer;
 }
\ No newline at end of file

From 6f256bcd3fdb8234dc0b8618dfbf37c230ec4556 Mon Sep 17 00:00:00 2001
From: doanguyen <dungnv2410@gmail.com>
Date: Sat, 28 Dec 2019 22:11:40 +0100
Subject: [PATCH 2/2] minor comments on domain-detail branch

---
 app/dashboard/views/domain_detail.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/dashboard/views/domain_detail.py b/app/dashboard/views/domain_detail.py
index aa66bf43..69a7ffa0 100644
--- a/app/dashboard/views/domain_detail.py
+++ b/app/dashboard/views/domain_detail.py
@@ -103,7 +103,4 @@ def domain_detail(custom_domain_id):
 
     dkim_record = f"v=DKIM1; k=rsa; p={DKIM_DNS_VALUE}"
 
-    return render_template(
-        "dashboard/domain_detail.html",
-        **locals()
-    )
+    return render_template("dashboard/domain_detail.html", **locals())