Merge main into workflow_beta

README.md

@@ -36,7 +36,7 @@
 | ![Oscar May](https://avatars.githubusercontent.com/u/67429870?v=4) | ![Sabio Tang](https://avatars.githubusercontent.com/u/124608899?v=4)
 | --- | --- |
 | [Oscar May](https://github.com/oscarmayreal) | [Sabio Tang](https://github.com/sabioofficial)
-| Founder | Developer |
+| Founder | Co-Founder |
 
 ### FaQ
 ## Are there any reused code?

app/authui/createworkspace.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-        <title>Create A New Workspace</title>
+        <title>Clatter • New Workspace</title>
         <link rel="icon" type="image/svg+xml" href="data:image/svg+xml, %3Csvg width='21' height='21' viewBox='0 0 21 21' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 5.25C10.5 2.35051 12.8505 0 15.75 0V0C18.6495 0 21 2.35051 21 5.25V10.5H15.75C12.8505 10.5 10.5 8.14949 10.5 5.25V5.25Z' fill='%23666666'/%3E%3Cpath d='M0 5.25C0 2.35051 2.35051 0 5.25 0V0C8.14949 0 10.5 2.35051 10.5 5.25V5.25C10.5 8.14949 8.14949 10.5 5.25 10.5H0V5.25Z' fill='%23666666'/%3E%3Cpath d='M10.5 15.75C10.5 12.8505 12.8505 10.5 15.75 10.5H21V15.75C21 18.6495 18.6495 21 15.75 21V21C12.8505 21 10.5 18.6495 10.5 15.75V15.75Z' fill='%23666666'/%3E%3Cpath d='M0 10.5H5.25C8.14949 10.5 10.5 12.8505 10.5 15.75V15.75C10.5 18.6495 8.14949 21 5.25 21V21C2.35051 21 0 18.6495 0 15.75V10.5Z' fill='%23666666'/%3E%3C/svg%3E%0A">
 
         <!-- CSS -->

app/authui/index.html

@@ -7,7 +7,7 @@
         <meta name="description" content="Clatter Client">
         <meta name="keywords" content="Quntem, Clatter, Quntem Clatter, Clatter Client, Quntem Clatter Client, Workplace, Slack, Cliq">
 
-        <title>Clatter | Authentication</title>
+        <title>Clatter • Authentication</title>
         <link rel="icon" type="image/svg+xml" href="data:image/svg+xml, %3Csvg width='21' height='21' viewBox='0 0 21 21' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 5.25C10.5 2.35051 12.8505 0 15.75 0V0C18.6495 0 21 2.35051 21 5.25V10.5H15.75C12.8505 10.5 10.5 8.14949 10.5 5.25V5.25Z' fill='%23666666'/%3E%3Cpath d='M0 5.25C0 2.35051 2.35051 0 5.25 0V0C8.14949 0 10.5 2.35051 10.5 5.25V5.25C10.5 8.14949 8.14949 10.5 5.25 10.5H0V5.25Z' fill='%23666666'/%3E%3Cpath d='M10.5 15.75C10.5 12.8505 12.8505 10.5 15.75 10.5H21V15.75C21 18.6495 18.6495 21 15.75 21V21C12.8505 21 10.5 18.6495 10.5 15.75V15.75Z' fill='%23666666'/%3E%3Cpath d='M0 10.5H5.25C8.14949 10.5 10.5 12.8505 10.5 15.75V15.75C10.5 18.6495 8.14949 21 5.25 21V21C2.35051 21 0 18.6495 0 15.75V10.5Z' fill='%23666666'/%3E%3C/svg%3E%0A">
 
         <link rel="stylesheet" href="styles.css"/> 
@@ -57,10 +57,10 @@ <h2 class="auth-subheader" id="auth-subheader">Clatter Authentication</h2>
         };
 
         if (window.location.origin == "https://clatterpreview.quntem.co.uk" || window.location.origin == "https://beta.clatter.work") {
-            document.title = "Clatter Authentication Beta";
+            document.title = "Clatter • Authentication (Beta)";
             elements.subheader.innerHTML = "Clatter Authentication Beta";
         } else if (window.location.origin === "http://localhost:3000") {
-            document.title = "Clatter Authentication Dev";
+            document.title = "Clatter • Authentication (Local)";
             elements.subheader.innerHTML = "Clatter Authentication Dev";
         }
     </script>

app/authui/reset-password.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-        <title>Clatter | Reset Password</title>
+        <title>Clatter • Reset Password</title>
         <link rel="icon" type="image/svg+xml" href="data:image/svg+xml, %3Csvg width='21' height='21' viewBox='0 0 21 21' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 5.25C10.5 2.35051 12.8505 0 15.75 0V0C18.6495 0 21 2.35051 21 5.25V10.5H15.75C12.8505 10.5 10.5 8.14949 10.5 5.25V5.25Z' fill='%23666666'/%3E%3Cpath d='M0 5.25C0 2.35051 2.35051 0 5.25 0V0C8.14949 0 10.5 2.35051 10.5 5.25V5.25C10.5 8.14949 8.14949 10.5 5.25 10.5H0V5.25Z' fill='%23666666'/%3E%3Cpath d='M10.5 15.75C10.5 12.8505 12.8505 10.5 15.75 10.5H21V15.75C21 18.6495 18.6495 21 15.75 21V21C12.8505 21 10.5 18.6495 10.5 15.75V15.75Z' fill='%23666666'/%3E%3Cpath d='M0 10.5H5.25C8.14949 10.5 10.5 12.8505 10.5 15.75V15.75C10.5 18.6495 8.14949 21 5.25 21V21C2.35051 21 0 18.6495 0 15.75V10.5Z' fill='%23666666'/%3E%3C/svg%3E%0A">
 
         <!-- CSS and JS -->

app/authui/resetpassword.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-        <title>Clatter | Reset Password</title>
+        <title>Clatter • Reset Password</title>
         <link rel="icon" type="image/svg+xml" href="data:image/svg+xml, %3Csvg width='21' height='21' viewBox='0 0 21 21' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 5.25C10.5 2.35051 12.8505 0 15.75 0V0C18.6495 0 21 2.35051 21 5.25V10.5H15.75C12.8505 10.5 10.5 8.14949 10.5 5.25V5.25Z' fill='%23666666'/%3E%3Cpath d='M0 5.25C0 2.35051 2.35051 0 5.25 0V0C8.14949 0 10.5 2.35051 10.5 5.25V5.25C10.5 8.14949 8.14949 10.5 5.25 10.5H0V5.25Z' fill='%23666666'/%3E%3Cpath d='M10.5 15.75C10.5 12.8505 12.8505 10.5 15.75 10.5H21V15.75C21 18.6495 18.6495 21 15.75 21V21C12.8505 21 10.5 18.6495 10.5 15.75V15.75Z' fill='%23666666'/%3E%3Cpath d='M0 10.5H5.25C8.14949 10.5 10.5 12.8505 10.5 15.75V15.75C10.5 18.6495 8.14949 21 5.25 21V21C2.35051 21 0 18.6495 0 15.75V10.5Z' fill='%23666666'/%3E%3C/svg%3E%0A">
 
         <!-- CSS and JS -->

app/authui/signin.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-        <title>Clatter | Sign In</title>
+        <title>Clatter • Sign In</title>
         <link rel="icon" type="image/svg+xml" href="data:image/svg+xml, %3Csvg width='21' height='21' viewBox='0 0 21 21' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 5.25C10.5 2.35051 12.8505 0 15.75 0V0C18.6495 0 21 2.35051 21 5.25V10.5H15.75C12.8505 10.5 10.5 8.14949 10.5 5.25V5.25Z' fill='%23666666'/%3E%3Cpath d='M0 5.25C0 2.35051 2.35051 0 5.25 0V0C8.14949 0 10.5 2.35051 10.5 5.25V5.25C10.5 8.14949 8.14949 10.5 5.25 10.5H0V5.25Z' fill='%23666666'/%3E%3Cpath d='M10.5 15.75C10.5 12.8505 12.8505 10.5 15.75 10.5H21V15.75C21 18.6495 18.6495 21 15.75 21V21C12.8505 21 10.5 18.6495 10.5 15.75V15.75Z' fill='%23666666'/%3E%3Cpath d='M0 10.5H5.25C8.14949 10.5 10.5 12.8505 10.5 15.75V15.75C10.5 18.6495 8.14949 21 5.25 21V21C2.35051 21 0 18.6495 0 15.75V10.5Z' fill='%23666666'/%3E%3C/svg%3E%0A">
 
         <!-- CSS and JS -->

app/authui/signup.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-        <title>Clatter | Sign Up</title>
+        <title>Clatter • Sign Up</title>
         <link rel="icon" type="image/svg+xml" href="data:image/svg+xml, %3Csvg width='21' height='21' viewBox='0 0 21 21' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 5.25C10.5 2.35051 12.8505 0 15.75 0V0C18.6495 0 21 2.35051 21 5.25V10.5H15.75C12.8505 10.5 10.5 8.14949 10.5 5.25V5.25Z' fill='%23666666'/%3E%3Cpath d='M0 5.25C0 2.35051 2.35051 0 5.25 0V0C8.14949 0 10.5 2.35051 10.5 5.25V5.25C10.5 8.14949 8.14949 10.5 5.25 10.5H0V5.25Z' fill='%23666666'/%3E%3Cpath d='M10.5 15.75C10.5 12.8505 12.8505 10.5 15.75 10.5H21V15.75C21 18.6495 18.6495 21 15.75 21V21C12.8505 21 10.5 18.6495 10.5 15.75V15.75Z' fill='%23666666'/%3E%3Cpath d='M0 10.5H5.25C8.14949 10.5 10.5 12.8505 10.5 15.75V15.75C10.5 18.6495 8.14949 21 5.25 21V21C2.35051 21 0 18.6495 0 15.75V10.5Z' fill='%23666666'/%3E%3C/svg%3E%0A">
 
         <!-- CSS -->

app/authui/success.html

@@ -4,7 +4,7 @@
         <meta charset="UTF-8">
         <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
-        <title>Clatter | Success!</title>
+        <title>Clatter • Success</title>
         <link rel="icon" type="image/svg+xml" href="data:image/svg+xml, %3Csvg width='21' height='21' viewBox='0 0 21 21' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 5.25C10.5 2.35051 12.8505 0 15.75 0V0C18.6495 0 21 2.35051 21 5.25V10.5H15.75C12.8505 10.5 10.5 8.14949 10.5 5.25V5.25Z' fill='%23666666'/%3E%3Cpath d='M0 5.25C0 2.35051 2.35051 0 5.25 0V0C8.14949 0 10.5 2.35051 10.5 5.25V5.25C10.5 8.14949 8.14949 10.5 5.25 10.5H0V5.25Z' fill='%23666666'/%3E%3Cpath d='M10.5 15.75C10.5 12.8505 12.8505 10.5 15.75 10.5H21V15.75C21 18.6495 18.6495 21 15.75 21V21C12.8505 21 10.5 18.6495 10.5 15.75V15.75Z' fill='%23666666'/%3E%3Cpath d='M0 10.5H5.25C8.14949 10.5 10.5 12.8505 10.5 15.75V15.75C10.5 18.6495 8.14949 21 5.25 21V21C2.35051 21 0 18.6495 0 15.75V10.5Z' fill='%23666666'/%3E%3C/svg%3E%0A">
 
         <!-- CSS and JS -->

app/client/index.html

@@ -358,9 +358,9 @@
             };
 
             if (window.location.origin == "https://beta.clatter.work" || window.location.origin == "https://clatterpreview.quntem.co.uk") {
-                document.title = "Clatter | Beta Client";
+                document.title = "Clatter • Client (Beta)";
             } else if (window.location.origin === "http://localhost:3000") {
-                document.title = "Clatter | Dev Client"
+                document.title = "Clatter • Client (Local)"
             }
 
             document.addEventListener('DOMContentLoaded', () => {

app/client/pages/channelpage.html

@@ -243,7 +243,7 @@
                 .then((channel) => {
                     $("#mainarea-header-title").html(channel.name);
                     document.title =
-                        "Clatter | " + fullorg.data.name + " - " + channel.name;
+                        "Clatter • " + fullorg.data.name + " - " + channel.name;
                     socket.emit(
                         "clatter.channel.join",
                         JSON.stringify({

app/client/pages/channelthreadpage.html

@@ -235,7 +235,7 @@
                 .then(res => res.json())
                 .then(channel => {
                     $("#mainarea-header-sub").html(channel.name);
-                    document.title = "Clatter | " + fullorg.data.name + " - " + channel.name + " - Thread";
+                    document.title = "Clatter • " + fullorg.data.name + " - " + channel.name + " - Thread";
                     socket.emit("clatter.channel.join", JSON.stringify({ room: currentchannelid }));
                 });
 

app/client/pages/composepage.html

@@ -10,7 +10,7 @@
     </div>
 </div>
 <script>
-    document.title = "Compose Message | Clatter"
+    document.title = "Clatter • Compose Message"
     setTimeout(async () => {
         var inputbox = document.createElement("input")
         inputbox.id = "compose-recipient-input"

app/client/pages/directpage.html

@@ -270,7 +270,7 @@
                         var member = fullorg.data.members.filter(member => member.userId == channel.members[0])[0]
                         $("#mainarea-header-title").html(member.user.name);
                         document.title =
-                            "Clatter | " +
+                            "Clatter • " +
                             fullorg.data.name +
                             " - " +
                             member.user.name;

app/index.html

@@ -13,7 +13,7 @@
         <meta property="og:url" content="https://clatter.work">
         <meta name="twitter:card" content="/client-preview.png">
 
-        <title>Clatter | Home</title>
+        <title>Clatter • Home</title>
         <link rel="icon" type="image/png" href="/favicon.png">
 
         <link rel="stylesheet" href="/styles.css"/>
@@ -126,7 +126,7 @@ <h2 class="wavy_text built_for_work-h1">
         </div>
 
         <footer>
-            <p>Made by Quntem OpenSource with care. ❤️</p>
+            <p>Made by Quntem OpenSource with care. ❤️ • Build <a class="build-ver" id="build_ver_anchor" target="_blank"><span id="build_ver"></span></href></p>
             <div class="footer-links">
                 <a href="/legal/" class="footer-link">Legal</a>
                 <a href="https://clatter.work/" class="footer-link">Main Website</a>
@@ -137,7 +137,9 @@ <h2 class="wavy_text built_for_work-h1">
     <script>
         const elements = {
             slug_change: document.getElementById("slug_change"),
-            header_logo: document.getElementById("header_logo")
+            header_logo: document.getElementById("header_logo"),
+            build_ver: document.getElementById("build_ver"),
+            build_ver_anchor: document.getElementById("build_ver_anchor")
         };
 
         const slug_change_texts = [
@@ -160,6 +162,8 @@ <h2 class="wavy_text built_for_work-h1">
             } else {
                 handleImageLoad();
             }
+
+            updateBuildVer()
 
             setInterval(() => {
                 // elements.slug_change.classList.remove("morph-in");
@@ -173,11 +177,45 @@ <h2 class="wavy_text built_for_work-h1">
             }, 2000);
         });
 
+        async function updateBuildVer() {
+            if (window.location.origin === "https://clatter.work") {
+                const url = "https://api.github.com/repos/Quntem/Clatter/commits/main";
+                try {
+                    const response = await fetch(url);
+                    if (!response.ok) {
+                        throw new Error(`Response status: ${response.status}`);
+                    }
+
+                    const result = await response.json();
+                    elements.build_ver.textContent = result.sha.slice(0, 7);
+                    elements.build_ver_anchor.href = result.html_url;
+                } catch (error) {
+                    console.error(error.message);
+                }
+            } else if (window.location.origin === "https://clatterpreview.quntem.co.uk" || window.location.origin === "https://beta.clatter.work") {
+                const url = "https://api.github.com/repos/Quntem/Clatter/commits/workflow_beta";
+                try {
+                    const response = await fetch(url);
+                    if (!response.ok) {
+                        throw new Error(`Response status: ${response.status}`);
+                    }
+
+                    const result = await response.json();
+                    elements.build_ver.textContent = result.sha.slice(0, 7);
+                    elements.build_ver_anchor.href = result.html_url;
+                } catch (error) {
+                    console.error(error.message);
+                }
+            } else {
+                elements.build_ver.textContent = "d3vv3r" // dev ver!
+            }
+        }
+
         const checkBeta = () => {
             if (window.location.origin === "https://clatterpreview.quntem.co.uk" || window.location.origin === "https://beta.clatter.work") {
-                document.title = "Clatter Beta | Home";
+                document.title = "Clatter Beta • Home";
             } else if (window.location.origin === "http://localhost:3000") {
-                document.title = "Clatter Dev | Home"
+                document.title = "Clatter (Local) • Home"
             }
         }
 

app/legal/index.html

@@ -7,7 +7,7 @@
         <meta name="description" content="Clatter's legal page.'">
         <meta name="keywords" content="Quntem, Clatter, Quntem Clatter, Clatter Client, Quntem Clatter Client, Workplace, Slack, Cliq">
 
-        <title>Clatter Legal</title>
+        <title>Clatter • Legal</title>
         <link rel="icon" type="image/png" href="/favicon.png">
 
         <link rel="stylesheet" href="/app/client/global/lucide-font/lucide.css"/>

app/legal/terms-of-service/index.html

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Clatter Legal | ToS</title>
+    <title>Clatter • Terms of Service</title>
     <link rel="stylesheet" href="/app/styles.css">
     <link rel="icon" type="image/svg+xml" href="data:image/svg+xml, %3Csvg width='21' height='21' viewBox='0 0 21 21' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M10.5 5.25C10.5 2.35051 12.8505 0 15.75 0V0C18.6495 0 21 2.35051 21 5.25V10.5H15.75C12.8505 10.5 10.5 8.14949 10.5 5.25V5.25Z' fill='%23666666'/%3E%3Cpath d='M0 5.25C0 2.35051 2.35051 0 5.25 0V0C8.14949 0 10.5 2.35051 10.5 5.25V5.25C10.5 8.14949 8.14949 10.5 5.25 10.5H0V5.25Z' fill='%23666666'/%3E%3Cpath d='M10.5 15.75C10.5 12.8505 12.8505 10.5 15.75 10.5H21V15.75C21 18.6495 18.6495 21 15.75 21V21C12.8505 21 10.5 18.6495 10.5 15.75V15.75Z' fill='%23666666'/%3E%3Cpath d='M0 10.5H5.25C8.14949 10.5 10.5 12.8505 10.5 15.75V15.75C10.5 18.6495 8.14949 21 5.25 21V21C2.35051 21 0 18.6495 0 15.75V10.5Z' fill='%23666666'/%3E%3C/svg%3E%0A">
 
@@ -111,12 +111,7 @@ <h2 id="section4">4. USER REGISTRATION</h2>
     <p>You may be required to register to use the Services. You agree to keep your password confidential and will be responsible for all use of your account and password. We reserve the right to remove, reclaim, or change a username you select if we determine, in our sole discretion, that such username is inappropriate, obscene, or otherwise objectionable.</p>
 
     <h2 id="section5">5. PURCHASES AND PAYMENT</h2>
-    <p>All purchases are non-refundable.</p>
-    <p>We accept the following forms of payment:</p>
-    <p>[Payment methods will be listed here]</p>
-    <p>You agree to provide current, complete, and accurate purchase and account information for all purchases made via the Services. You further agree to promptly update account and payment information, including email address, payment method, and payment card expiration date, so that we can complete your transactions and contact you as needed. Sales tax will be added to the price of purchases as deemed required by us. We may change prices at any time.</p>
-    <p>You agree to pay all charges at the prices then in effect for your purchases and any applicable shipping fees, and you authorize us to charge your chosen payment provider for any such amounts upon placing your order. We reserve the right to correct any errors or mistakes in pricing, even if we have already requested or received payment.</p>
-    <p>We reserve the right to refuse any order placed through the Services. We may, in our sole discretion, limit or cancel quantities purchased per person, per household, or per order. These restrictions may include orders placed by or under the same customer account, the same payment method, and/or orders that use the same billing or shipping address. We reserve the right to limit or prohibit orders that, in our sole judgment, appear to be placed by dealers, resellers, or distributors.</p>
+    <p></p>
 
     <h2 id="section6">6. SOFTWARE</h2>
     <p>We may include software for use in connection with our Services. If such software is accompanied by an end user license agreement ("EULA"), the terms of the EULA will govern your use of the software. If such software is not accompanied by a EULA, then we grant to you a non-exclusive, revocable, personal, and non-transferable license to use such software solely in connection with our services and in accordance with these Legal Terms. Any software and any related documentation is provided "AS IS" without warranty of any kind, either express or implied, including, without limitation, the implied warranties of merchantability, fitness for a particular purpose, or non-infringement. You accept any and all risk arising out of use or performance of any software. You may not reproduce or redistribute any software except in accordance with the EULA or these Legal Terms.</p>