From 4fd168ea3ceae55e376a4756566cb9b90c423215 Mon Sep 17 00:00:00 2001 From: Chris Caron Date: Fri, 15 Mar 2024 17:58:08 -0400 Subject: [PATCH] clickable tags on review page --- apprise_api/api/templates/config.html | 49 +++++++++++++++++++-------- apprise_api/static/css/base.css | 1 + docker-compose.yml | 18 +++++----- 3 files changed, 46 insertions(+), 22 deletions(-) diff --git a/apprise_api/api/templates/config.html b/apprise_api/api/templates/config.html index efc6bbb..b84b2c0 100644 --- a/apprise_api/api/templates/config.html +++ b/apprise_api/api/templates/config.html @@ -107,18 +107,18 @@
{% trans "Using CURL" %}

{% blocktrans %}The following command would cause the apprise api to notify all of your services:{% endblocktrans %} 

curl -X POST \

-				    -F "body=Test Message" \

-				    -F "tags=all" \

-				    http{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/{{key}}
+     -F "body=Test Message" \
+     -F "tags=all" \
+     http{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/{{key}} {% blocktrans %}Send one or more attachments like this:{% endblocktrans %} 
curl -X POST \

-				    -F "tags=all" \

-				    -F "body=Test Message" \

-				    -F attach1=@Screenshot-1.png \

-				    -F attach2=@/my/path/to/Apprise.doc \

-				    http{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/{{key}}
+     -F "tags=all" \
+     -F "body=Test Message" \
+     -F attach1=@Screenshot-1.png \
+     -F attach2=@/my/path/to/Apprise.doc \
+     http{% if request.is_secure %}s{% endif %}://{{request.META.HTTP_HOST}}{{BASE_URL}}/notify/{{key}} {% blocktrans %}Sends a notification to our endpoints with an attachment{% endblocktrans %} - 

+         

         curl -X POST \

             -F "tag=all" \ 

             -F "attach=https://raw.githubusercontent.com/caronc/apprise/master/apprise/assets/themes/default/apprise-logo.png" \ 

@@ -220,7 +220,7 @@ 
{% trans "Persistent Store Endpoints" %}

     document.querySelector('#url-list').textContent = '{% trans "There are no URLs defined. Click on the ⚙️ Configuration tab and define some." %}'
     return;
 
-	} else if(jsonResponse.status != 200) {
+   } else if(jsonResponse.status != 200) {
     // Take an early exit
     document.querySelector('#url-list-progress').style.display = 'none';
     document.querySelector('#url-list').textContent = '{% trans "💣 An error occurred retrieving the list of loaded Apprise URL(s)" %}'
@@ -231,12 +231,13 @@ 
{% trans "Persistent Store Endpoints" %}

   // choose from. Tags are based off ones found in the saved
   // configuration.
   const data = await jsonResponse.json();
-  let external_data = tags.concat(data.tags).reduce(function(result, item) {
+  const external_data = tags.concat(data.tags).reduce(function(result, item) {
     result[item] = null;
     return result;
   }, {})
 
-  M.Chips.init(document.querySelectorAll('.chips'), {
+  const chipElement = document.querySelector('.chips');
+  M.Chips.init(chipElement, {
     placeholder: 'Optional Tag',
     secondaryPlaceholder: 'Another Tag',
     autocompleteOptions: {
@@ -252,6 +253,16 @@ 
{% trans "Persistent Store Endpoints" %}

     }
   });
 
+	// our GET parameters
+	var tagRe = new RegExp('[^[A-Za-z0-9_-]+');
+	const params = new Proxy(new URLSearchParams(window.location.search), {
+	  get: (searchParams, prop) => searchParams.get(prop),
+	});
+	if (params.tag) {
+	  params.tag.split(tagRe).forEach(function (tag, index) {
+  	   M.Chips.getInstance(chipElement).addChip({tag: tag, image: ''});
+		});
+  }
   // Now build our our loaded list of configuration for our welcome page
   let urlList = document.createElement('ul');
 
@@ -267,8 +278,19 @@ 
{% trans "Persistent Store Endpoints" %}

     entry.tags.forEach(function (tag) {
       let chip = document.createElement('div');
       chip.setAttribute('class', 'chip');
+      chip.setAttribute('name', tag);
+      chip.setAttribute('href', `?tag=${tag}#notify`);
       chip.textContent = `🏷️ ${tag}`;
       li.appendChild(chip);
+
+      chip.addEventListener('click', function(e) {
+      e.preventDefault();
+       window.history.pushState(null, null, this.getAttribute('href'));
+       document.querySelector('.config-overview li a[href="#notify"]').click()
+
+       const chipElement = document.querySelector('.chips');
+       M.Chips.getInstance(chipElement).addChip({tag: this.getAttribute('name'), image: ''});
+      }, false);
     });
 
     urlList.appendChild(li);
@@ -421,8 +443,6 @@ 
{% trans "Persistent Store Endpoints" %}

     event.preventDefault();
 
     const chipElement = document.querySelector('.chips');
-
-    chipElement.querySelector('.chips');
     const chipInput = document.querySelector('.chips > input');
     if(chipInput.value) {
       // This code just handles text typed in the tag section that was
@@ -515,6 +535,7 @@ 
{% trans "Persistent Store Endpoints" %}

 {% if not CONFIG_LOCK %}
 /* Initialze our configuration */
 config_init();
+
 {% endif %}
 notify_init();
 {% endif %}
diff --git a/apprise_api/static/css/base.css b/apprise_api/static/css/base.css
index c3a4c07..a779e02 100644
--- a/apprise_api/static/css/base.css
+++ b/apprise_api/static/css/base.css
@@ -129,6 +129,7 @@ textarea {
 	margin: 0.3rem;
 	background-color: inherit;
 	border: 1px solid #e4e4e4;
+	cursor: pointer;
 }
 
 #url-list code {
diff --git a/docker-compose.yml b/docker-compose.yml
index 153d183..c31fd5b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,6 +7,8 @@ services:
     ports:
       - 8000:8000
     user: "www-data:www-data"
+    environment:
+      - APPRISE_WORKER_COUNT=1
     volumes:
       - ./apprise_api:/opt/apprise/webapp:ro
       # if uncommenting the below, you will need to type the following
@@ -33,11 +35,11 @@ services:
   ##
   ## > Host service (visit http://localhost on host pc to access):
   ##   ./manage.py runserver 0.0.0.0:8000
-  #test.py310:
-  #  ports:
-  #    - 8000:8000
-  #  build:
-  #    context: .
-  #    dockerfile: Dockerfile.py310
-  #  volumes:
-  #    - ./:/apprise-api
+  test.py310:
+    ports:
+      - 8000:8000
+    build:
+      context: .
+      dockerfile: Dockerfile.py310
+    volumes:
+      - ./:/apprise-api