Scheduled emails to time, Design, Stats, Api

Breaking - DB update.

Author: ThomasTJdev

assets/js/flows.js

@@ -1,5 +1,3 @@
-
-
 let
   globalFlowID,
   globalFlowStepsData = [];
@@ -27,7 +25,7 @@ function addFlow() {
             attrs: {
               class: 'forinput'
             },
-            children: ['List name']
+            children: ['Flow name']
           }),
           jsCreateElement('input', {
             attrs: {
@@ -240,6 +238,13 @@ async function buildFlowHTML(data) {
       },
       children: ['Click link in previous mail']
     }));
+    triggerOpts.push(jsCreateElement('option', {
+      attrs: {
+        value: 'time',
+        selected: (step.trigger_type == 'time') ? "selected" : false
+      },
+      children: ['Specific time']
+    }));
 
 
     //
@@ -348,7 +353,16 @@ async function buildFlowHTML(data) {
                         jsCreateElement('input', {
                           attrs: {
                             id: "flowStepDelay_" + step.id,
-                            value: step.delay_minutes
+                            value: step.delay_minutes,
+                            style: step.trigger_type == 'time' ? 'display: none;' : ''
+                          },
+                        }),
+                        jsCreateElement('input', {
+                          attrs: {
+                            id: "flowStepTime_" + step.id,
+                            type: 'time',
+                            value: step.scheduled_time || '',
+                            style: step.trigger_type == 'time' ? '' : 'display: none;'
                           },
                         })
                       ]
@@ -401,6 +415,20 @@ async function buildFlowHTML(data) {
   let inputs = document.querySelectorAll("input, select");
   for (let i = 0; i < inputs.length; i++) {
     inputs[i].addEventListener("change", function() {
+      // Check if this is a trigger type selection
+      if (this.id.startsWith("flowStepTrigger_")) {
+        const stepId = this.id.split("_")[1];
+        // Show/hide time or delay input based on trigger type
+        if (this.value === "time") {
+          document.getElementById("flowStepTime_" + stepId).style.display = "";
+          document.getElementById("flowStepDelay_" + stepId).style.display = "none";
+        } else {
+          document.getElementById("flowStepTime_" + stepId).style.display = "none";
+          document.getElementById("flowStepDelay_" + stepId).style.display = "";
+        }
+      }
+      
+      // Call updateFlowStep for all changes
       updateFlowStep(this.id.split("_")[1]);
     });
   }
@@ -535,6 +563,12 @@ async function addFlowStep() {
                   value: 'click'
                 },
                 children: ['Click link in previous mail']
+              }),
+              jsCreateElement('option', {
+                attrs: {
+                  value: 'time'
+                },
+                children: ['Specific time']
               })
             ]
           })
@@ -559,11 +593,19 @@ async function addFlowStep() {
               min: '10'
             }
           }),
+          jsCreateElement('input', {
+            attrs: {
+              type: 'time',
+              id: 'flowStepTime',
+              value: '',
+              style: 'display: none;'
+            }
+          }),
           jsCreateElement('div', {
             attrs: {
               style: "font-size: 12px;"
             },
-            children: ['Minimum time is 10 minutes. Emails will be scheduled as soon as the step is added.']
+            children: ['Minimum time is 2 minutes. Emails will be scheduled as soon as the step is added.']
           })
         ]
       }),
@@ -586,6 +628,17 @@ async function addFlowStep() {
   labelFloater();
   setTimeout(() => {
     dqs("#flowStepName").focus();
+
+    // Set the trigger type to delay by default
+    dqs("#flowStepTrigger").addEventListener("change", function() {
+      if (this.value === "time") {
+        dqs("#flowStepTime").style.display = "";
+        dqs("#flowStepDelay").style.display = "none";
+      } else {
+        dqs("#flowStepTime").style.display = "none";
+        dqs("#flowStepDelay").style.display = "";
+      }
+    });
   }, 100);
 }
 
@@ -596,7 +649,8 @@ function addFlowStepDo() {
     mailID = dqs("#flowStepMail").value,
     subject = dqs("#flowStepSubject").value,
     trigger = dqs("#flowStepTrigger").value,
-    delay = dqs("#flowStepDelay").value;
+    delay = dqs("#flowStepDelay").value,
+    time = dqs("#flowStepTime").value;
 
   fetch("/api/flow_steps/create", {
     method: "POST",
@@ -606,7 +660,8 @@ function addFlowStepDo() {
       mailID: mailID,
       subject: subject,
       trigger: trigger,
-      delay: delay
+      delay: delay,
+      scheduledTime: time
     })
   })
   .then(manageErrors)
@@ -623,7 +678,8 @@ function updateFlowStep(flowStepID) {
     mailID = dqs("#flowStepMail_" + flowStepID).value,
     delayMinutes = dqs("#flowStepDelay_" + flowStepID).value,
     subject = dqs("#flowStepSubject_" + flowStepID).value,
-    triggerType = dqs("#flowStepTrigger_" + flowStepID).value;
+    triggerType = dqs("#flowStepTrigger_" + flowStepID).value,
+    scheduledTime = dqs("#flowStepTime_" + flowStepID).value;
 
   fetch("/api/flow_steps/update", {
     method: "POST",
@@ -632,7 +688,8 @@ function updateFlowStep(flowStepID) {
       mailID: mailID,
       delayMinutes: delayMinutes,
       subject: subject,
-      trigger: triggerType
+      trigger: triggerType,
+      scheduledTime: scheduledTime
     })
   })
   .then(manageErrors);

nimletter.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version       = "0.4.8"
+version       = "0.5.0"
 author        = "ThomasTJdev"
 description   = "Newsletter"
 license       = "AGPL v3"

src/database/db_schema.sql

@@ -36,6 +36,7 @@ CREATE TABLE IF NOT EXISTS flow_steps (
   step_number         INT NOT NULL,  -- Sequence of steps in the flow
   trigger_type        TEXT DEFAULT 'delay', -- open, linkclick, delay, etc.
   delay_minutes       INT NOT NULL DEFAULT 0, -- Delay from the previous step
+  scheduled_time      TIME DEFAULT NULL, -- Specific time to schedule the email (in GMT0)
   name                TEXT NOT NULL, -- Name of the step
   subject             TEXT NOT NULL, -- Email subject for this step
   created_at          TIMESTAMP DEFAULT CURRENT_TIMESTAMP,

src/html/dash.nimf

@@ -252,9 +252,35 @@ curl -X POST \
     http://localhost:5555/api/event
   </pre>
 </div>
-          </div>
-
-        </div>
+<div>
+  <b>Add contact to list:</b>
+  <pre>
+  curl -X POST \
+    -H "Content-Type: application/json" \
+    -H "Authorization: Bearer YOUR_API_KEY" \
+    -d '{
+      "event": "contact-add-to-list",
+      "email": "mail@nimletter.com",
+      "list": "list-identifier",
+      "flowStep": 1
+    }' \
+    http://localhost:5555/api/event
+  </pre>
+</div>
+<div>
+  <b>Remove contact from list:</b>
+  <pre>
+  curl -X POST \
+    -H "Content-Type: application/json" \
+    -H "Authorization: Bearer YOUR_API_KEY" \
+    -d '{
+      "event": "contact-remove-from-list",
+      "email": "mail@nimletter.com",
+      "list": "list-identifier"
+    }' \
+    http://localhost:5555/api/event
+  </pre>
+</div>
       </div>
     </main>
   </body>

src/html/sidebar.nimf

@@ -90,6 +90,10 @@
         Logout
       </div>
     </a>
+    <div style=" width: 100%; height: 1px; border-top: 1px solid var(--colorN30); margin: 20px 0; "></div>
+    <div style="font-size: 12px; color: var(--colorN200);">
+      Server time: ${now()}
+    </div>
   </div>
 </div>
 #end proc

src/routes/routes_analytics.nim

@@ -26,6 +26,7 @@ proc(request: Request) =
   if not c.loggedIn: resp Http401
 
   var data: seq[seq[string]]
+  var dataPending: seq[seq[string]]
   var openData: seq[seq[string]]
   var clickData: seq[seq[string]]
   pg.withConnection conn:
@@ -46,6 +47,20 @@ proc(request: Request) =
         """
       ))
 
+    dataPending = getAllRows(conn, sqlSelect(
+        table = "pending_emails",
+        select = [
+          "to_char(date_trunc('day', scheduled_for), 'YYYY-MM-DD') AS day",
+          "COUNT(*) FILTER (WHERE status = 'pending') AS pending"
+        ],
+        customSQL = """
+          WHERE scheduled_for >= current_date - interval '20 days'
+          AND scheduled_for <= current_date + interval '7 days'
+          GROUP BY day
+          ORDER BY day
+        """
+      ))
+
     openData = getAllRows(conn, sqlSelect(
         table = "email_opens",
         select = [
@@ -101,11 +116,16 @@ proc(request: Request) =
   for row in data:
     let idx = days.find(row[0])
     if idx >= 0:
-      pending[idx] = row[1].parseInt
+      #pending[idx] = row[1].parseInt
       sent[idx] = row[2].parseInt
       bounced[idx] = row[3].parseInt
       complained[idx] = row[4].parseInt
 
+  for row in dataPending:
+    let idx = days.find(row[0])
+    if idx >= 0:
+      pending[idx] = row[1].parseInt
+
   for row in openData:
     let idx = days.find(row[0])
     if idx >= 0:

src/routes/routes_contacts.nim

@@ -276,61 +276,9 @@ proc(request: Request) =
     listID = @"listID"
     listType = @"listType"
 
-  if not userID.isValidInt():
-    resp Http400, "Invalid user ID"
-
-  if not listID.isValidInt():
-    resp Http400, "Invalid list ID"
-
-  if listType == "pending":
-    # Remove int from array pendinglists
-    pg.withConnection conn:
-      exec(conn, sqlUpdate(
-          table = "contacts",
-          data  = [
-            "pending_lists = array_remove(pending_lists, ?)",
-            "updated_at",
-          ],
-          where = ["id = ?"]
-        ),
-        listID,
-        $now().utc,
-        userID
-      )
-
-    resp Http200
-  #
-  # Get potential flow, so we can stop pending emails
-  #
-  pg.withConnection conn:
-    let flowIDs = getValue(conn, sqlSelect(
-        table = "lists",
-        select = ["array_to_string(lists.flow_ids, ',') as flows"],
-        where = ["id = ?"]
-      ), listID)
-
-    if flowIDs != "":
-      for flowID in flowIDs.split(","):
-        exec(conn, sqlUpdate(
-            table = "pending_emails",
-            data  = [
-              "status = 'cancelled'",
-              "scheduled_for = NULL",
-              "updated_at = ?"
-            ],
-            where = [
-              "user_id = ?",
-              "flow_id = ?",
-              "status = 'pending'"
-            ]
-          ),
-          $now().utc, userID, flowID)
-
-    exec(conn, sqlDelete(
-        table = "subscriptions",
-        where = ["user_id = ?", "list_id = ?"]),
-        userID, listID
-      )
+  let data = contactRemoveFromList(userID, listID, listType)
+  if not data.success:
+    resp Http400, data.msg
 
   resp Http200
 )

src/routes/routes_event.nim

@@ -16,6 +16,7 @@ import
   ../database/database_connection,
   ../utils/auth,
   ../utils/contacts_utils,
+  ../utils/list_utils,
   ../utils/validate_data
 
 
@@ -216,6 +217,47 @@ proc(request: Request) =
     resp Http200, data.data
 
 
+  of "contact-add-to-list":
+    let userID = getUserIDfromEmail(email)
+    if userID == "":
+      resp Http400, "User not found"
+    let listID = listIDfromIdentifier(if data.hasKey("list"): data["list"].getStr() else: "")
+    var flowStep = if data.hasKey("flowStep"): data["flowStep"].getInt() else: 1
+    if listID == "":
+      resp Http400, "List identifier required"
+    if flowStep == 0:
+      flowStep = 1
+
+    let data = addContactToList(userID, listID, flowStep)
+    if not data:
+      resp Http400, %* {
+        "success": false,
+        "message": "Failed to add contact to list"
+      }
+
+    resp Http200, %* {
+      "success": true,
+      "message": "Contact added to list"
+    }
+
+
+  of "contact-remove-from-list":
+    let userID = getUserIDfromEmail(email)
+    if userID == "":
+      resp Http400, "User not found"
+    let listID = listIDfromIdentifier(if data.hasKey("list"): data["list"].getStr() else: "")
+    if listID == "":
+      resp Http400, "List identifier required"
+
+    let data = contactRemoveFromList(userID, listID, "")
+    if not data.success:
+      resp Http400, %* {
+        "success": false,
+        "message": data.msg
+      }
+
+    resp Http200, data.data
+
   else:
     resp Http400, "Invalid event"