Merge pull request #7 from mauricerenck/develop

Develop
mauricerenck · Dec 4, 2020 · b9a3427 · b9a3427
2 parents aa92453 + 21e2841
commit b9a3427
Show file tree

Hide file tree

Showing 19 changed files with 420 additions and 221 deletions.
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v12.16.3
diff --git a/assets/komments.js b/assets/komments.js
@@ -1,112 +1,110 @@
-window.onload = function () {
-    const komment = document.querySelector('#kommentform #komment')
-    const kommentForm = document.querySelector('#kommentform')
-    const kommentEmail = document.querySelector('#kommentform #email')
-    const kommentAuthor = document.querySelector('#kommentform #author')
-    const kommentUrl = document.querySelector('#kommentform #author_url')
-    const timeField = document.querySelector('#kommentform .cts')
-    const submitField = document.querySelector('#kommentform input[type=submit]')
-    const spamIndicatorProgress = document.querySelector('#kommentform .spam-indicator .progress')
-    const sendingIndicator = document.querySelector('#kommentform .loader')
-    const formFeedback = document.querySelector('#kommentform .form-feedback')
-
-    let duration = {
-        indicator: 0,
-        timer: null,
-        current: 0
+const komment = document.querySelector('#kommentform #komment')
+const kommentForm = document.querySelector('#kommentform')
+const kommentEmail = document.querySelector('#kommentform #email')
+const kommentAuthor = document.querySelector('#kommentform #author')
+const kommentUrl = document.querySelector('#kommentform #author_url')
+const timeField = document.querySelector('#kommentform .cts')
+const submitField = document.querySelector('#kommentform input[type=submit]')
+const spamIndicatorProgress = document.querySelector('#kommentform .spam-indicator .progress')
+const sendingIndicator = document.querySelector('#kommentform .loader')
+const formFeedback = document.querySelector('#kommentform .form-feedback')
+
+let duration = {
+    indicator: 0,
+    timer: null,
+    current: 0
+}
+
+const setIndicator = () => {
+
+    if (duration.current > 0) {
+        return
     }
 
-    const setIndicator = () => {
+    timeField.value = 0;
+    submitField.disabled = true;
 
-        if (duration.current > 0) {
-            return
-        }
+    duration.timer = window.setInterval(() => {
+        duration.indicator += 10;
+        spamIndicatorProgress.style.width = `${duration.indicator}%`
 
-        timeField.value = 0;
-        submitField.disabled = true;
+        if (duration.indicator > 25) {
+            spamIndicatorProgress.classList.add('orange')
+        }
 
-        duration.timer = window.setInterval(() => {
-            duration.indicator += 10;
-            spamIndicatorProgress.style.width = `${duration.indicator}%`
+        if (duration.indicator > 50) {
+            spamIndicatorProgress.classList.add('yellow')
+        }
 
-            if (duration.indicator > 25) {
-                spamIndicatorProgress.classList.add('orange')
-            }
+        if (duration.indicator > 75) {
+            spamIndicatorProgress.classList.add('green')
+        }
 
-            if (duration.indicator > 50) {
-                spamIndicatorProgress.classList.add('yellow')
-            }
+        if (duration.indicator >= 100) {
+            spamIndicatorProgress.classList.add('done')
+            submitField.disabled = false;
 
-            if (duration.indicator > 75) {
-                spamIndicatorProgress.classList.add('green')
-            }
+            window.clearInterval(duration.timer)
+        }
 
-            if (duration.indicator >= 100) {
-                spamIndicatorProgress.classList.add('done')
-                submitField.disabled = false;
+        duration.current++;
+        timeField.value = duration.current
+    }, 1000)
+}
 
-                window.clearInterval(duration.timer)
-            }
 
-            duration.current++;
-            timeField.value = duration.current
-        }, 1000)
+const sendKomment = (event) => {
+    if (!kommentForm) {
+        return true
     }
+    event.preventDefault();
+
+    const kommentFormAction = kommentForm.action;
+    sendingIndicator.classList.remove('loading-invisible');
+
+    window.fetch(kommentFormAction, {
+        method: 'post',
+        headers: { 'Content-Type': 'application/json', 'X-Return-Type': 'json' },
+        body: JSON.stringify(Object.fromEntries(new FormData(event.target))),
+    })
+        .then(function (response) {
+            sendingIndicator.classList.add('loading-invisible');
+            if (!response.ok) {
+                throw response;
+            }
 
-
-    const sendKomment = (event) => {
-        if (!kommentForm) {
-            return true
-        }
-        event.preventDefault();
-
-        const kommentFormAction = kommentForm.action;
-        sendingIndicator.classList.remove('loading-invisible');
-
-        window.fetch(kommentFormAction, {
-            method: 'post',
-            headers: { 'Content-Type': 'application/json', 'X-Return-Type': 'json' },
-            body: JSON.stringify(Object.fromEntries(new FormData(event.target))),
+            return response;
         })
-            .then(function (response) {
-                sendingIndicator.classList.add('loading-invisible');
-                if (!response.ok) {
-                    throw response;
-                }
-
-                return response;
+        .then((response) => {
+            response.json().then(message => {
+                formFeedback.classList.remove('error')
+                formFeedback.classList.add('moderation-note')
+                formFeedback.innerHTML = message.message
+                kommentForm.reset();
             })
-            .then((response) => {
-                response.json().then(message => {
-                    formFeedback.classList.remove('error')
-                    formFeedback.classList.add('moderation-note')
-                    formFeedback.innerHTML = message.message
-                    kommentForm.reset();
-                })
-            })
-            .catch((error) => {
-                error.json().then(error => {
-                    formFeedback.classList.add('error')
-                    formFeedback.classList.remove('moderation-note')
-                    formFeedback.innerHTML = error.message
+        })
+        .catch((error) => {
+            error.json().then(error => {
+                formFeedback.classList.add('error')
+                formFeedback.classList.remove('moderation-note')
+                formFeedback.innerHTML = error.message
 
-                })
             })
-    }
+        })
+}
 
-    kommentEmail.style.display = 'none';
-    kommentAuthor.style.display = 'none';
-    kommentUrl.style.display = 'none';
+kommentEmail.style.display = 'none';
+kommentAuthor.style.display = 'none';
+kommentUrl.style.display = 'none';
 
-    komment.addEventListener('focus', () => {
-        setIndicator();
-        kommentEmail.style.display = 'block';
-        kommentAuthor.style.display = 'block';
-        kommentUrl.style.display = 'block';
-    });
+komment.addEventListener('focus', () => {
+    setIndicator();
+    kommentEmail.style.display = 'block';
+    kommentAuthor.style.display = 'block';
+    kommentUrl.style.display = 'block';
+});
 
-    kommentForm.addEventListener('submit', (event) => {
-        sendKomment(event);
-    });
+kommentForm.addEventListener('submit', (event) => {
+    sendKomment(event);
+});
 
-};
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "mauricerenck/komments",
-  "version": "0.9.14",
+  "version": "0.9.15",
   "description": "A comment and webmention plugin for Kirby 3",
   "type": "kirby-plugin",
   "license": "MIT",

diff --git a/composer.lock b/composer.lock
diff --git a/config/api.php b/config/api.php
@@ -4,10 +4,18 @@
 
 use Xml;
 use File;
+use f;
 use Structure;
 
 return [
     'routes' => [
+        [
+            'pattern' => 'komments/version',
+            'action' => function () {
+                $string = f::read(kirby()->roots()->index() . '/composer.json');
+                return $string;
+            }
+        ],
         [
             'pattern' => 'komments/queued',
             'action' => function () {

diff --git a/config/options.php b/config/options.php
@@ -15,7 +15,7 @@
     'mastodon-instance-url' => 'https://mastodon.social/api/v1/statuses',
     'mastodon-text-field' => 'mastodonTeaser',
     'ping-archiveorg' => false,
-    'auto-delete-spam' => true,
+    'auto-delete-spam' => false,
     'auto-disable-komments' => 0,
     'auto-disable-komments-datefield' => 'date',
     'komment-icon-like' => '❤️',

diff --git a/index.css b/index.css
diff --git a/index.js b/index.js