From 558dbef7127331b2b31b0d87ddf921e1d34a2447 Mon Sep 17 00:00:00 2001
From: realaravinth <realaravinth@batsense.net>
Date: Tue, 13 Jul 2021 21:23:08 +0530
Subject: [PATCH] dupe email check and notifications table

---
 src/api/v1/auth.rs                            |  2 +-
 src/api/v1/tests/auth.rs                      | 14 ++++-
 templates/panel/notifications/index.html      | 58 +++++++++++--------
 .../panel/sitekey/add/existing-level.html     |  1 -
 templates/panel/sitekey/list/index.html       | 10 +---
 5 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/src/api/v1/auth.rs b/src/api/v1/auth.rs
index 42648989..8794d963 100644
--- a/src/api/v1/auth.rs
+++ b/src/api/v1/auth.rs
@@ -182,7 +182,7 @@ pub mod runners {
                     if msg.contains("mcaptcha_users_name_key") {
                         return Err(ServiceError::UsernameTaken);
                     } else if msg.contains("mcaptcha_users_email_key") {
-                        return Err(ServiceError::UsernameTaken);
+                        return Err(ServiceError::EmailTaken);
                     } else if msg.contains("mcaptcha_users_secret_key") {
                         continue;
                     } else {
diff --git a/src/api/v1/tests/auth.rs b/src/api/v1/tests/auth.rs
index e4df6475..edd66ee1 100644
--- a/src/api/v1/tests/auth.rs
+++ b/src/api/v1/tests/auth.rs
@@ -59,7 +59,7 @@ async fn auth_works() {
     signin(EMAIL, PASSWORD).await;
 
     // 2. check if duplicate username is allowed
-    let msg = Register {
+    let mut msg = Register {
         username: NAME.into(),
         password: PASSWORD.into(),
         confirm_password: PASSWORD.into(),
@@ -75,6 +75,18 @@ async fn auth_works() {
     )
     .await;
 
+    let name = format!("{}dupemail", NAME);
+    msg.username = name;
+    bad_post_req_test(
+        NAME,
+        PASSWORD,
+        ROUTES.auth.register,
+        &msg,
+        ServiceError::EmailTaken,
+        StatusCode::BAD_REQUEST,
+    )
+    .await;
+
     // 3. sigining in with non-existent user
     let mut creds = Login {
         login: "nonexistantuser".into(),
diff --git a/templates/panel/notifications/index.html b/templates/panel/notifications/index.html
index 147d7958..c832150f 100644
--- a/templates/panel/notifications/index.html
+++ b/templates/panel/notifications/index.html
@@ -1,24 +1,36 @@
-<. include!("../../components/headers/index.html"); .> 
-<. include!("../navbar/index.html"); .>
+<. include!("../../components/headers/index.html"); .> <.
+include!("../navbar/index.html"); .>
 <div class="tmp-layout">
-<. include!("../header/index.html"); .>
-
-<main class="panel-main">
-  <!-- Main content container -->
-  <div class="inner-container">
-    <!-- Main menu/ important actions roaster -->
-
-    <ul class="sitekey-list__box">
-      <h1 class="sitekey-list__title">Your Notifications</h1>
-      <. for notification in n.iter() { .>
-        <li class="sitekey-list__item">
-            <h3><.= notification.heading .> </h3>
-            <p>From: <.= notification.name .> </p>
-            <p>Received: <.= notification.received .> </p>
-            <p>Message: <.= notification.message .> </p>
-      <. } .>
-    </ul>
-
-  </div>
-  <!-- end of container -->
-<. include!("../../components/footers.html"); .>
+  <. include!("../header/index.html"); .>
+  <main class="panel-main">
+    <!-- Main content container -->
+      <div class="inner-container">
+        <!-- Main menu/ important actions roaster -->
+        <table class="notification__table">
+          <thead class="notification__heading">
+            <th class="notification__title-text">Your Notifications</th>
+          </thead>
+          <tbody class="notification__body">
+            <. for notification in n.iter() { .>
+            <tr class="notification__item">
+              <td class="notification__mark-reak">
+                <button class="notification__mark-read-btn">tick</button>
+              </td>
+              <td>
+                <h3 class="notification__item-heading">
+                  <.= notification.heading .>
+                </h3>
+                <p class="notification__item-text"><.= notification.message .></p>
+              </td>
+              <td class="notification__sender"><.= notification.name .></td>
+              <td class="notification__received"><.= notification.received .></td>
+            </tr>
+            <. } .>
+          </tbody>
+        </table>
+      </div>
+      <!-- end of container -->
+      <. include!("../../components/footers.html"); .>
+    </div>
+  </main>
+</div>
diff --git a/templates/panel/sitekey/add/existing-level.html b/templates/panel/sitekey/add/existing-level.html
index 62f0e5f3..fc7677f3 100644
--- a/templates/panel/sitekey/add/existing-level.html
+++ b/templates/panel/sitekey/add/existing-level.html
@@ -12,7 +12,6 @@
       id="visitor<.= level .>"
     />
   </label>
-
   <label class="sitekey-form__level-label" for="difficulty<.= level .>">
     Difficulty
     <input
diff --git a/templates/panel/sitekey/list/index.html b/templates/panel/sitekey/list/index.html
index 3a4e3827..2b881414 100644
--- a/templates/panel/sitekey/list/index.html
+++ b/templates/panel/sitekey/list/index.html
@@ -12,16 +12,10 @@
       <. for sitekey in sitekeys.iter() { .>
       <a href="/sitekey/<.= sitekey.key .>/view" class="sitekey-list__item-container">
         <li class="sitekey-list__item">
-
-          <span class="sitekey-list__name">
-            <.= sitekey.name .>
-          </span>
-          <span class="sitekey-list__key">
-            <.= sitekey.key .>
-          </span>
+          <span class="sitekey-list__name"><.= sitekey.name .></span>
+          <span class="sitekey-list__key"><.= sitekey.key .></span>
         </li>
       </a>
-
       <. } .>
     </ul>
   </div>