Nice

Author: ThomasTJdev

.gitignore

@@ -1,4 +1,5 @@
 dev.sh
 nimletter
 db
-tests/sns_click
+tests/sns_click
+api

assets/js/table_load.js

@@ -62,6 +62,7 @@ function tableContacts() {
     height:"70vh",
     layout:"fitColumns",
     ajaxURL:"/api/contacts/all",
+    paginationSize:2000,
     progressiveLoad:"load",
     initialSort:[
       {column:"status", dir:"desc"},

nimletter.nimble

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

src/routes/routes_contacts.nim

@@ -651,8 +651,8 @@ proc(request: Request) =
   if not c.loggedIn: resp Http401
 
   let
-    limit = (if @"limit" == "": 2000 else: @"limit".parseInt())
-    offset = (if @"offset" == "": 0 else: @"offset".parseInt())
+    limit = (if @"size" == "": 2000 else: @"size".parseInt())
+    offset = (if @"page" == "": 0 elif @"page".parseInt() == 1: 0 else: (@"page".parseInt() - 1) * limit)
 
   var
     contacts: seq[seq[string]]
@@ -725,8 +725,8 @@ proc(request: Request) =
     %* {
       "data": bodyJson,
       "count": contactsCount,
-      "limit": limit,
-      "offset": offset,
+      "size": limit,
+      "page": offset,
       "last_page": (if contactsCount == 0: 0 else: (contactsCount / limit).toInt()),
     }
   )

src/routes/routes_lists.nim

@@ -33,7 +33,7 @@ proc(request: Request) =
 
   let
     name    = @"name"
-    identifier = (if @"identifier" == "": name.toLowerAscii().replace(" ", "-").subStr(0, 20).strip(chars={'-', '_'}) else: @"identifier".replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}))
+    identifier = (if @"identifier" == "": name.toLowerAscii().replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}) else: @"identifier".replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}))
     description = @"description"
     flowIDRaw   = @"flowID"
     requireOptIn = @"requireOptIn" == "true"
@@ -159,7 +159,7 @@ proc(request: Request) =
   let
     listID   = @"listID"
     name     = @"name"
-    identifier  = (if @"identifier" == "": name.toLowerAscii().replace(" ", "-").subStr(0, 20).strip(chars={'-', '_'}) else: @"identifier".replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}))
+    identifier  = (if @"identifier" == "": name.toLowerAscii().replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}) else: @"identifier".replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}))
     description = @"description"
     requireOptIn = @"requireOptIn" == "true"
 

src/routes/routes_mail.nim

@@ -71,7 +71,7 @@ proc(request: Request) =
           "contentEditor",
         ]),
         name,
-        (name.toLowerAscii().replace(" ", "-").subStr(0, 20).strip(chars={'-', '_'})),
+        (name.toLowerAscii().replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'})),
         "{" & formatTags(tags).join(",") & "}",
         category,
         contentHTML,
@@ -135,7 +135,7 @@ proc(request: Request) =
           "subject"
         ]),
       mailData[1],  # name
-      mailData[1].toLowerAscii().replace(" ", "-").subStr(0, 20).strip(chars={'-', '_'}) & "-" & $rand(1000000),  # identifier
+      mailData[1].toLowerAscii().replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}) & "-" & $rand(1000000),  # identifier
       mailData[2],  # contentHTML
       mailData[3],  # contentEditor
       mailData[4],  # editorType
@@ -231,7 +231,7 @@ proc(request: Request) =
   let
     mailID  = @"mailID"
     name      = @"name".strip()
-    identifier = (if @"identifier" == "": name.toLowerAscii().replace(" ", "-").subStr(0, 20).strip(chars={'-', '_'}) else: @"identifier".replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}))
+    identifier = (if @"identifier" == "": name.toLowerAscii().replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}) else: @"identifier".replace(" ", "-").subStr(0, 100).strip(chars={'-', '_'}))
     tags      = @"tags"
     category  = @"category"
     sendOnce  = (if @"sendOnce" == "true": true else: false)
@@ -354,8 +354,8 @@ proc(request: Request) =
   if not c.loggedIn: resp Http401
 
   let
-    limit = (if @"limit" == "": 2000 else: @"limit".parseInt())
-    offset = (if @"offset" == "": 0 else: @"offset".parseInt())
+    limit = (if @"size" == "": 2000 else: @"size".parseInt())
+    offset = (if @"page" == "": 0 elif @"page".parseInt() == 1: 0 else: (@"page".parseInt() - 1) * limit)
 
   var
     mails: seq[seq[string]]
@@ -413,8 +413,8 @@ proc(request: Request) =
     %* {
       "data": bodyJson,
       "count": mailsCount,
-      "limit": limit,
-      "offset": offset,
+      "size": limit,
+      "page": offset,
       "last_page": (if mailsCount == 0: 0 else: (mailsCount / limit).toInt())
     }
   )
@@ -428,8 +428,8 @@ proc(request: Request) =
   if not c.loggedIn: resp Http401
 
   let
-    limit = (if @"limit" == "": 2000 else: @"limit".parseInt())
-    offset = (if @"offset" == "": 0 else: @"offset".parseInt())
+    limit = (if @"size" == "": 2000 else: @"size".parseInt())
+    offset = (if @"page" == "": 0 elif @"page".parseInt() == 1: 0 else: (@"page".parseInt() - 1) * limit)
 
 
   var
@@ -524,8 +524,8 @@ proc(request: Request) =
     %* {
       "data": bodyJson,
       "count": mailsCount,
-      "limit": limit,
-      "offset": offset,
+      "size": limit,
+      "page": offset,
       "last_page": (if mailsCount == 0: 0 else: (mailsCount / limit).toInt())
     }
   )

src/routes/routes_pending_emails.nim

@@ -227,8 +227,8 @@ proc(request: Request) =
   if not c.loggedIn: resp Http401
 
   let
-    limit = (if @"limit" == "": "0" else: @"limit")
-    offset = (if @"offset" == "": "0" else: @"offset")
+    limit = (if @"size" == "": 2000 else: @"size".parseInt())
+    offset = (if @"page" == "": 0 elif @"page".parseInt() == 1: 0 else: (@"page".parseInt() - 1) * limit)
 
   var data: seq[seq[string]]
   pg.withConnection conn:
@@ -270,8 +270,8 @@ proc(request: Request) =
   resp Http200, (
     %* {
       "count": data.len(),
-      "limit": limit,
-      "offset": offset,
+      "size": limit,
+      "page": offset,
       "data": respJson
     }
   )

src/utils/contacts_utils.nim

@@ -122,8 +122,20 @@ proc addContactToPendinglist*(userID, listID: string): bool =
   return true
 
 
+proc isContactOnList*(userID, listID: string): bool =
+  pg.withConnection conn:
+    result = getValue(conn, sqlSelect(
+        table = "subscriptions",
+        select = ["id"],
+        where = ["user_id = ?", "list_id = ?"]
+      ), userID, listID).len() > 0
+
+
 proc addContactToList*(userID, listID: string, flowStep = 1): bool =
   pg.withConnection conn:
+    if isContactOnList(userID, listID):
+      return true
+
     if execAffectedRows(conn, sqlInsert(
         table = "subscriptions",
         data  = [