cleanup push

.obsidian/plugins/customjs/manifest.json

@@ -1,7 +1,7 @@
 {
   "id": "customjs",
   "name": "CustomJS",
-  "version": "1.0.10",
+  "version": "1.0.11",
   "minAppVersion": "0.9.12",
   "description": "This plugin allows for the loading and reuse of custom JS inside your vault.",
   "author": "Sam Lewis",

.obsidian/plugins/customjs/styles.css

@@ -1 +1,4 @@
-Not Found
+/* Sets all the text color to red! */
+/* body {
+    color: red;
+} */

.obsidian/workspace

@@ -4,12 +4,12 @@
     "type": "split",
     "children": [
       {
-        "id": "c1cbd199334b4022",
+        "id": "c252d60ecbda6bb3",
         "type": "leaf",
         "state": {
           "type": "markdown",
           "state": {
-            "file": "03.03 Food & Wine/!!Wine.md",
+            "file": "01.01 Life Orga/Finances.md",
             "mode": "preview"
           }
         }
@@ -68,7 +68,7 @@
         "state": {
           "type": "backlink",
           "state": {
-            "file": "03.03 Food & Wine/!!Wine.md",
+            "file": "01.01 Life Orga/Finances.md",
             "collapseAll": false,
             "extraContext": false,
             "sortOrder": "alphabetical",
@@ -105,17 +105,17 @@
       }
     ]
   },
-  "active": "c1cbd199334b4022",
+  "active": "c252d60ecbda6bb3",
   "lastOpenFiles": [
-    "03.03 Food & Wine/!!Wine.md",
+    "01.01 Life Orga/Finances.md",
-    "03.03 Food & Wine/Aromatic Beef Pilaf.md",
+    "06.02 Investments/Crypto Tasks.md",
-    "03.03 Food & Wine/@Desserts.md",
+    "01.01 Life Orga/IT & Computer.md",
-    "03.03 Food & Wine/@@Recipes.md",
+    "05.02 Networks/VPS Console Dialogue.md",
-    "01.02 Home/MRCK.md",
+    "05.02 Networks/Server Cloud.md",
-    "03.03 Food & Wine/Maison Olivier Chanzy Chassagne-Montrachet 1er Cru Morgeot Tête de Clos.md",
+    "05.01 Computer setup/Applications.md",
-    "03.03 Food & Wine/@Main dishes.md",
+    "05.02 Networks/mfxm Website Scope.md",
-    "Untitled.md",
+    "05.02 Networks/Server Tools.md",
-    "05.01 Computer setup/Untitled.md",
+    "01.01 Life Orga/Personal projects.md",
-    "05.01 Computer setup/Storage and Syncing.md"
+    "01.01 Life Orga/Lifestyle.md"
   ]
 }

00.01 Admin/dv-views/ShoppingFunc.js

@@ -58,25 +58,38 @@ class shoppingFunc {
 			theme,
 			listOfIt,
     } = args;
-    const { update } = app.plugins.plugins["metaedit"].api
+		
+//		const { update } = app.plugins.plugins["metaedit"].api
     const { createButton } = app.plugins.plugins["buttons"]
+	//	var myButton = document.createElement("button");
 		
 		const updateSct = listOfIt //this.getSctName(theme) //await dv.suggester(["groceries", "health", "household"], ["groceries", "health", "household"]); //"Groceries" //
 		const btnStr = this.getBtnName(theme, updateSct)
-		const itemAr = this.getPoint(dv.page("01.02 Home/@Shopping list.md"), updateSct);
+//		const itemAr = this.getPoint(dv.page("01.02 Home/@Shopping list.md"), updateSct);
-		const updateStr = this.processItems(itemAr, false);
+//		const updateStr = this.processItems(itemAr, false);
-   
+	//	myButton.innerHTML = "\"" + this.getBtnName(theme, updateSct) + "\""
-		return dv.el('p', 
+	//	myButton.addEventListener ("click", function() {this.updateList(updateSct, updateStr, dv.page("01.02 Home/@Shopping list.md").file.path)});
-			createButton({
+		
-				app,
+		//return (async () => {
-				el: that.container,
+			
-				args: { name: btnStr, color: 'blue' },
+			dv.el('div',
-				clickOverride: { click: update, params: [updateSct, updateStr, dv.page("01.02 Home/@Shopping list.md").file.path]}
+				createButton({
-			}),
+					app,
-		)
+					el: that.container,
+					args: { name: btnStr, color: 'blue' },
+					clickOverride: { click: this.getEditApi() /*await update*/, params: [updateSct, this.processItems(this.getPoint(dv.page("01.02 Home/@Shopping list.md"), updateSct), false), dv.page("01.02 Home/@Shopping list.md").file.path]}
+				}),
+			)
+			
+	//	})();
+//	dv.container.appendElement(myButton)
+
   }
 	
-	
+	async getEditApi() {
+		const { update } = app.plugins.plugins["metaedit"].api
+		return await update
+	}
 	
 	getBtnName(arg1, arg2) {
 		let tempresult = "Test";

00.01 Admin/dv-views/print_shoppingitems.js

@@ -20,4 +20,8 @@ for (let i = 0; i < items.length; i++) {
 	}
 }
 
+if (ing.length == 0) {
+	return dv.el('p', "✌️ No shopping item to display")
+}
+
 dv.el('p', globalFunc.BuildList(ing, "\n"))

00.01 Admin/dv-views/print_winesearch.js

@@ -0,0 +1,4 @@
+const {globalFunc} = customJS
+let {dateadded, winetype, vintage, producer, variety, designation, theme, country, vineyard, region, terroir, appellation} = input;
+
+dv.el('t', "<b>🔎 search terms:</b> \n• " + globalFunc.buildToPrint([dateadded, winetype, vintage, producer, variety, designation, theme, country, vineyard, region, terroir, appellation], ["note written", "type of wine", "vintage", "producer", "variety", "designation", "theme", "country", "vineyard", "region", "terroir", "appellation"], "\n• "));

01.02 Home/@Shopping Admin.md

@@ -53,24 +53,20 @@ style: number
 
  
 
-```dataview
+```button
-const {shoppingFunc} = customJS
+name Reset Shopping list
-shoppingFunc.resetList({app: app, dv: dv, that:this, theme: "to0", listOfIt: "Groceries"}) 
+type append template
+action ShoppingListto0
+color blue
+templater true
 ```
 
  
 
-```dataview
+
-const {shoppingFunc} = customJS
-shoppingFunc.resetList({app: app, dv: dv, that:this, theme: "to0", listOfIt: "Health"})
-```
 
  
 
-```dataview
-const {shoppingFunc} = customJS
-shoppingFunc.resetList({app: app, dv: dv, that:this, theme: "to0", listOfIt: "Household" }) 
-```
 
  
 

01.02 Home/@Shopping list.md

@@ -1,9 +1,9 @@
 ---
 
 CollapseMetaTable: yes
-Groceries: ["🍶  bottle(s) Coke 0","🍿  whole Snacks","🧈 1 packet(s) Beurre","🫒  bottle(s) Olive oil","🍺 1 bottle(s) Beers","🥯  packet(s) Bagels","🍯  jar(s) Bonne Maman","🍌  whole Bananas","🧀  packet(s) Fromage rape","🥩  packet(s) Cured meat","🍐  whole Fruit","🍝  packet(s) Pasta","🌶️ 1 bottle(s) Tabasco"]
+Groceries: ["🍶 6 bottle(s) Coke 0","🍿  whole Snacks","🧈 2 packet(s) Beurre","🫒  bottle(s) Olive oil","🍺  bottle(s) Beers","🥯  packet(s) Bagels","🍯  jar(s) Bonne Maman","🍌  whole Bananas","🧀  packet(s) Fromage rape","🥩  packet(s) Cured meat","🍐 4 whole Fruit","🍝  packet(s) Pasta","🌶️  bottle(s) Tabasco"]
-Health: ["🚿 1 whole shower gel","🧴  whole shampoo","🪥 1 whole toothbrush","🦷  whole toothpaste","👂 1 whole earbuds","🪒  whole razor blades (mach3)","🍦  whole shaving cream","🧻  whole loo rolls","🦨  whole deo"]
+Health: ["🚿 1 whole shower gel","🧴  whole shampoo","🪥  whole toothbrush","🦷  whole toothpaste","👂 1 whole earbuds","🪒  whole razor blades (mach3)","🍦  whole shaving cream","🧻 1 whole loo rolls","🦨  whole deo"]
-Household: ["👔 1 whole Washing gel","🧻  whole Kitchen towel","🧽  whole Sponge","👕  bottle(s) Softener","🍽️ 1 packet(s) Dishwasher tablets","🧂 1 bag(s) Dishwasher salt","🚰  bottle(s) Dishwasher rinsing aid"] 
+Household: ["👔  whole Washing gel","🧻  whole Kitchen towel","🧽 2 whole Sponge","👕  bottle(s) Softener","🍽️  packet(s) Dishwasher tablets", "🧂 1 bag(s) Dishwasher salt","🚰  bottle(s) Dishwasher rinsing aid"]
 
 ---
 
@@ -13,16 +13,6 @@ parent:: [[@Life Organisation|Life Orga]]
 
  
 
-```button
-name Reset Shopping list
-type append template
-action ShoppingListto0
-color blue
-templater true
-```
-
- 
-
 ```button
 name Save
 type command
@@ -60,7 +50,7 @@ style: number
  
 
 ```dataviewjs
-dv.view("00.01 Admin/dv-views/print_shoppingitems", { items: dv.current().Groceries })
+dv.view("00.01 Admin/dv-views/print_shoppingitems", { items: dv.current().Groceries})
 ```
 
  
@@ -88,7 +78,36 @@ dv.view("00.01 Admin/dv-views/print_shoppingitems", { items: dv.current().Health
  
 
 ```dataviewjs
-dv.view("00.01 Admin/dv-views/print_shoppingitems", { items: dv.current().Household })
+dv.view("00.01 Admin/dv-views/print_shoppingitems", { items: dv.current().Household})
+```
+
+ 
+
+### Buttons
+
+ 
+
+#### Reset
+
+ 
+
+```dataviewjs
+const {shoppingFunc} = customJS
+shoppingFunc.resetList({ app: app, dv: dv, that:this, theme: "to0", listOfIt: "Groceries" }) 
+```
+
+ 
+
+```dataviewjs
+const {shoppingFunc} = customJS
+shoppingFunc.resetList({ app: app, dv: dv, that:this, theme: "to0", listOfIt: "Health" })
+```
+
+ 
+
+```dataviewjs
+const {shoppingFunc} = customJS
+shoppingFunc.resetList({ app: app, dv: dv, that:this, theme: "to0", listOfIt: "Household" }) 
 ```
 
  

03.03 Food & Wine/!!Wine.md

@@ -1,5 +1,17 @@
 ---
 
+QPDate:
+QPwinetype: White
+QPvintage:
+QPproducer:
+QPvariety:
+QPdesignation:
+QPtheme:
+QPcountry:
+QPvineyard:
+QPregion:
+QPterroir:
+QPappellation:
 cssclass: recipeTable
 Alias: ["Wine"]
 Tag: ["Epicure"]
@@ -16,6 +28,8 @@ Parent:: [[Lifestyle]]
 
 ---
 
+ ^Top
+
  
 
 ```button
@@ -37,12 +51,13 @@ id Save
  
 
 # Folder map
+
  
 
 ```ad-abstract
 title: Summary
 collapse: open
-This note enables to navigate in the 01.01 Life Orga section and find any Note in this Vault by Note or Tag
+This note enables to navigate in the Wine section and find any Note in this Vault by Note or Tag
 ```
 
  
@@ -57,6 +72,35 @@ style: number
 
  
 
+### Search
+[[#^Top|TOP]]
+ 
+
+```button
+name Search Wines
+type command
+action MetaEdit: Run MetaEdit
+id EditMetaData
+```
+
+ 
+
+```dataviewjs
+dv.view("00.01 Admin/dv-views/print_winesearch", {dateadded: dv.current().QPDate, winetype: dv.current().QPwinetype, vintage: dv.current().QPvintage, producer: dv.current().QPproducer, variety: dv.current().QPvariety, designation: dv.current().QPdesignation, theme: dv.current().QPtheme, country: dv.current().QPcountry, vineyard: dv.current().QPvineyard, region: dv.current().QPregion, terroir: dv.current().QPterroir, appellation: dv.current().QPappellation})
+```
+
+ 
+
+```dataviewjs
+dv.view("00.01 Admin/dv-views/query_wine", {tableview: "extended", dateadded: dv.current().QPDate, winetype: dv.current().QPwinetype, vintage: dv.current().QPvintage, producer: dv.current().QPproducer, variety: dv.current().QPvariety, designation: dv.current().QPdesignation, theme: dv.current().QPtheme, country: dv.current().QPcountry, vineyard: dv.current().QPvineyard, region: dv.current().QPregion, terroir: dv.current().QPterroir, appellation: dv.current().QPappellation})
+```
+
+ 
+
+---
+
+ 
+
 ### Navigation
 
  
@@ -78,7 +122,7 @@ dv.view("00.01 Admin/dv-views/query_wine", {type: "White"})
  
 
 #### By Geography
-
+[[#^Top|TOP]]
 ##### France
 
  
@@ -94,7 +138,7 @@ dv.view("00.01 Admin/dv-views/query_wine", {country: "France"})
  
 
 ### Tag Navigation
-
+[[#^Top|TOP]]
  
 
 ```dataview
@@ -111,7 +155,7 @@ dv.view("00.01 Admin/dv-views/query_wine", {country: "France"})
  
 
 ### High Level tasks
-
+[[#^Top|TOP]]
  
 
 ```tasks

03.03 Food & Wine/Maison Olivier Chanzy Chassagne-Montrachet 1er Cru.md

@@ -37,7 +37,7 @@ id Save
 ```
 ^button-OlivierChanzyChassagneNSave
 
-# Maison Olivier Chanzy Chassagne-Montrachet 1er Cru Morgeot Tête de Clos
+# Maison Olivier Chanzy, Chassagne-Montrachet 1er Cru, Morgeot, Tête de Clos
 
  
 

05.01 Computer setup/Applications.md

@@ -59,16 +59,16 @@ _**System**_ | DropZone4, Launchpad, Mission Control, Siri, System Preferrence,
 _**Instant Messaging**_ | All-in-One Messenger, Caprine, Messages, Signal, [[Element]], Facetime, Zoom
 _**Wealth**_ | Stocks
 _**Crypto**_ | Anchor Wallet
-_**Staples**_ | Brave Browser, Safari
+_**Staples**_ | Brave Browser, Safari, Firefox
 _**Productivity**_ | Email: Spark, Titan Mail, [[Tutanota]]
 _**Productivity**_ | Calendar: Apple Calendar, Fantastical; Contacts: Cardhop & Contacts (native App)
 _**Productivity**_ | TextEdit, Highland2, LibreOffice, GSuite (Doc, Sheets, Slides), Preview, Skiff.org
 _**Productivity**_ | Note-taking: Bear, Obsidian, Standard Notes, Panda, Apple Notes; Reminders, Stickies (native Apps)
-_**Productivity**_ |Others: Dictionary, The Unarchiver, VoiceMemos
+_**Productivity**_ |Others: Dictionary, yEd, The Unarchiver, Adobe Acrobat Reader DC, VoiceMemos
-_**Cloud**_ | [[Nextcloud]], [[SecureSafe]], [[Sync]]
+_**Cloud**_ |  GitUp, [[Nextcloud]], [[SecureSafe]], [[Sync]]
-_**Computer & Network Security**_ | VirusTotalUploader, Intego, GPG Key Chain, Authy, BitWarden, [[NextDNS]], MyNextDNS, CyberGhost VPN
+_**Computer & Network Security**_ | VirusTotalUploader, Intego, GPG Key Chain, Authy, BitWarden, [[NextDNS]], Wireguard, Yubico Authenticator, MyNextDNS, CyberGhost VPN
-_**Website management**_ | Wordpress, Filezilla
+_**Website management**_ | Wordpress, Filezilla, DBeaver
-_**Media**_ | **Music**: Evermusic, Bandcamp, Apple Music, MusicBrainz Picard, Podcasts; **Video**: Piped, QuickTime Player, [[VLC]], Apple TV
+_**Media**_ | **Music**: Evermusic, Bandcamp, Background Music, Apple Music, MusicBrainz Picard, Podcasts; **Video**: Piped, QuickTime Player, [[VLC]], Apple TV
 _**Pictures**_ | Management: Picktorial, Pixea, Photos; Editing: GIMP, Image Capture, PhotoBooth
 _**Networks**_ | Avizio, Movemeon
 _**News**_ | NetNewsWire, Apple News, Pocket
@@ -77,7 +77,7 @@ _**Shopping**_ | App Store
 _**Home**_ | Home (native App)
 _**Utilities**_ | Parcel, Gramps, FontBook, AppCleaner, Automator, BitComet, Books, Calculator, Duplicate File Finder, File Juicer, Fluid, Find My
 _**Games**_ | Chess
-_**Programming**_ | JSON viewer
+_**Programming**_ |CotEditor, JSON viewer
 
  
 

06.01 Finances/Ledger.md

@@ -18,4 +18,20 @@
 
 2021/10/21 Current expenses
     expenses:Current Expenses:GBP    £300.00
+    assets:Cash:GBP
+
+2021/10/26 Current expenses
+    expenses:Current Expenses:GBP    £300.00
+    assets:Cash:GBP
+
+2021/10/28 Cleaning
+    expenses:Cleaning:GBP    £40.00
+    assets:Cash:GBP
+
+2021/10/29 Current expenses
+    expenses:Current Expenses:GBP    £300.00
+    assets:Cash:GBP
+
+2021/10/29 Cobbler
+    expenses:Cobbler:GBP    £50.00
     assets:Cash:GBP

06.02 Investments/Crypto Tasks.md

@@ -60,7 +60,9 @@ All tasks and to-dos Crypto-related.
 [[#^Top|TOP]]
  
 
-- [ ] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-10-29
+- [ ] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-11-12
+- [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-11-05 ✅ 2021-10-29
+- [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-10-29 ✅ 2021-10-29
 - [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-10-22 ✅ 2021-10-22
 - [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-10-15 ✅ 2021-10-15
 - [x] [[Crypto Tasks#internet alerts|monitor Crypto news and publications]] 🔁 every week on Friday 📅 2021-10-08 ✅ 2021-10-08

06.02 Investments/Equity Tasks.md

@@ -60,7 +60,8 @@ Note summarising all tasks and to-dos for Listed Equity investments.
 [[#^Top|TOP]]
  
 
-- [ ] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-10-29
+- [ ] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-11-05
+- [x] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-10-29 ✅ 2021-10-29
 - [x] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-10-22 ✅ 2021-10-22
 - [x] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-10-15 ✅ 2021-10-15
 - [x] [[Equity Tasks#internet alerts|monitor Equity news and publications]] 🔁 every week on Friday 📅 2021-10-08 ✅ 2021-10-08

06.02 Investments/VC Tasks.md

@@ -60,7 +60,8 @@ Tasks and to-dos for VC investments.
 [[#^Top|TOP]]
  
 
-- [ ] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-10-29
+- [ ] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-11-05
+- [x] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-10-29 ✅ 2021-10-29
 - [x] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-10-22 ✅ 2021-10-22
 - [x] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-10-15 ✅ 2021-10-15
 - [x] [[VC Tasks#internet alerts|monitor VC news and publications]] 🔁 every week on Friday 📅 2021-10-08 ✅ 2021-10-08