added support for 0 thread extensions in main.ts. centered new messag…

…e/createthread link. Tweaked thread.php and createthread.php's redirect to go back to index if multiple extension exist on user account (redirects to threadlist.php if user only has one extension).
AccelerateNetworks · Mar 5, 2024 · 07ceeba · 07ceeba
1 parent 87db080
commit 07ceeba
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 22 deletions.
diff --git a/createthread.php b/createthread.php
@@ -14,3 +14,7 @@
 if(sizeof($_SESSION['user']['extension']) == 1) {
 	echo "<script type='text/javascript'>window.location.href = 'threadlist.php?extension_uuid=".$_SESSION['user']['extension'][0]['extension_uuid']."'; </script>";
 }
+else{
+	echo "<script type='text/javascript'>window.location.href = 'index.php'; </script>";
+
+}
diff --git a/frontend/components/ThreadList/ThreadList.vue b/frontend/components/ThreadList/ThreadList.vue
@@ -241,6 +241,11 @@ export default {
      color:#BB6025;
  }
 
+ .link-container-container{
+    justify-content: center;
+    display:flex;
+}
+
 
 
     @media screen and (width <=700px) {    
@@ -256,9 +261,6 @@ export default {
     .hide-if-small{
         display:none;
     }
-    .link-container-container{
-        justify-content: center;
-        display:flex;
-    }
+    
 }
 </style>
diff --git a/frontend/main.ts b/frontend/main.ts
@@ -66,26 +66,30 @@ type WebTextingContainerOptions = {
 */
 export const initializeWebTextingContainer = function initializeWebTextingContainerJS(opts: WebTextingContainerOptions){
 
+
     let threadPreviewMap = new Map<String,ThreadPreviewInterface>();
-            for(let x = 0; x < opts.$thread_preview_opts.length; x++){
-                //console.log(opts.$thread_preview_opts[x])
-                if(opts.$thread_preview_opts[x].groupUUID){
-                    // if(opts.$thread_preview_opts[x].groupMembers){
-                    //     //php delviers us a string of comma separated values instead of an array the rest of the app expects an array of strings
-                    //     console.log(opts.$thread_preview_opts[x].groupMembers);
-                    //     opts.$thread_preview_opts[x].groupMembers = opts.$thread_preview_opts[x].groupMembers.split(", ")
-                    //     console.log(opts.$thread_preview_opts[x].groupMembers);
-                    // }
-                    console.log(opts.$thread_preview_opts[x].groupMembers);
-                    threadPreviewMap.set(opts.$thread_preview_opts[x].groupUUID, opts.$thread_preview_opts[x])
-                }
-                else if(opts.$thread_preview_opts[x].remoteNumber){
-                    threadPreviewMap.set(opts.$thread_preview_opts[x].remoteNumber, opts.$thread_preview_opts[x])
-                }
-                else{
-                    alert("Contact has no identifier. Missing Group UUID and Phone Number")
-                }
+    if(opts.$thread_preview_opts && opts.$thread_preview_opts.length){
+        for(let x = 0; x < opts.$thread_preview_opts.length; x++){
+            //console.log(opts.$thread_preview_opts[x])
+            if(opts.$thread_preview_opts[x].groupUUID){
+                // if(opts.$thread_preview_opts[x].groupMembers){
+                //     //php delviers us a string of comma separated values instead of an array the rest of the app expects an array of strings
+                //     console.log(opts.$thread_preview_opts[x].groupMembers);
+                //     opts.$thread_preview_opts[x].groupMembers = opts.$thread_preview_opts[x].groupMembers.split(", ")
+                //     console.log(opts.$thread_preview_opts[x].groupMembers);
+                // }
+                console.log(opts.$thread_preview_opts[x].groupMembers);
+                threadPreviewMap.set(opts.$thread_preview_opts[x].groupUUID, opts.$thread_preview_opts[x])
+            }
+            else if(opts.$thread_preview_opts[x].remoteNumber){
+                threadPreviewMap.set(opts.$thread_preview_opts[x].remoteNumber, opts.$thread_preview_opts[x])
+            }
+            else{
+                alert("Contact has no identifier. Missing Group UUID and Phone Number")
             }
+        }
+    }
+
     //how do we want to pass props into threadlist.
     //in theory threads has to be parsed and sent to each conversation component but is that state or props
     const containerProps={

diff --git a/thread.php b/thread.php
@@ -2,6 +2,8 @@
 require_once "root.php";
 require_once "resources/require.php";
 require_once "resources/check_auth.php";
+require_once "resources/header.php";
+require_once "resources/paging.php";
 
 if(!$_SESSION['user']['extension']) {
 	echo "no extensions assigned to user";
@@ -12,3 +14,7 @@
 if(sizeof($_SESSION['user']['extension']) == 1) {
 	echo "<script type='text/javascript'>window.location.href = 'threadlist.php?extension_uuid=".$_SESSION['user']['extension'][0]['extension_uuid']."'; </script>";
 }
+else{
+	echo "<script type='text/javascript'>window.location.href = 'index.php'; </script>";
+
+}