From 957c3f85dde07eb08f643e19e7c6cb269c711b08 Mon Sep 17 00:00:00 2001 From: Mel Date: Tue, 26 Oct 2021 11:08:19 +0100 Subject: [PATCH] wine init --- .obsidian/plugins/metaedit/data.json | 5 +- .obsidian/snippets/folder_4_icon.css | 4 +- .obsidian/workspace | 32 ++--- 00.01 Admin/Templates/NewFile1.md | 2 +- 00.01 Admin/Templates/ShoppingListto0.md | 21 ++++ 00.01 Admin/Test sheet.md | 32 ++++- 00.01 Admin/dv-views/ShoppingFunc.js | 101 +++++++++------ 00.01 Admin/dv-views/print_shoppingitems.js | 2 +- 00.01 Admin/dv-views/working_file.js | 2 + 01.01 Life Orga/Finances.md | 5 +- 01.01 Life Orga/IT & Computer.md | 3 +- 01.01 Life Orga/Lifestyle.md | 3 +- 01.01 Life Orga/Personal projects.md | 3 +- 01.02 Home/@Shopping Admin.md | 88 ++++++++++++++ 01.02 Home/@Shopping list.md | 69 +++-------- 03.03 Food & Wine/$$Wine.md | 115 ++++++++++++++++++ .../@@Recipes.md | 0 .../@Desserts.md | 0 .../@Main dishes.md | 0 .../@Side dishes.md | 0 .../@Snacks.md | 0 .../Aromatic Beef Pilaf.md | 0 .../Aspargus Pasta.md | 0 .../Bacon Parmesan Aspargus.md | 0 .../Beef Enchiladas.md | 0 .../Beef Noodles with Beans.md | 0 .../Beef n Potatoes Keema Naans.md | 0 .../Beet n Goat Cheese Salad.md | 0 .../Blueberry cheesecake.md | 0 .../Braised Fennel.md | 0 .../Carne Asada.md | 0 .../Chicken Curry w Limey Rice.md | 0 .../Chicken Fried Rice.md | 0 .../Chicken n Plum Noodles.md | 0 .../Chilli Lime n Cumin Cod.md | 0 .../Chilli con Carne.md | 0 .../Chinese Caramelised Pork Bowl.md | 0 .../Chocolate Chip Cookie.md | 0 .../Farro w Fennel, Lemon, Basil.md | 0 .../Indian Buttered Chicken.md | 0 .../Korean Beef Tacos.md | 0 .../Lamb n Lentil Curry.md | 0 .../Lemon tart.md | 0 .../Loup de Mer Citron.md | 0 .../Mexican Beef Wrap.md | 0 .../Mushroom FricassΓ©e.md | 0 .../Pancackes.md | 0 .../Pasta Puttanesca.md | 0 .../Pork n Black Bean Tacos.md | 0 .../Salade Nicoise.md | 0 .../Steak n Aspargus.md | 0 .../Teriyaki Sesame Chicken.md | 0 .../TexMex Beef Tacos.md | 0 .../Thai Pork Rice Bowl.md | 0 .../Thai Pork Salad.md | 0 .../Tomato Salad.md | 0 .../Yellow Beef Meetball Curry.md | 0 05.01 Computer setup/Element.md | 2 +- 58 files changed, 377 insertions(+), 112 deletions(-) create mode 100644 00.01 Admin/Templates/ShoppingListto0.md create mode 100644 01.02 Home/@Shopping Admin.md create mode 100644 03.03 Food & Wine/$$Wine.md rename {03.03 Recipes => 03.03 Food & Wine}/@@Recipes.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/@Desserts.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/@Main dishes.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/@Side dishes.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/@Snacks.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Aromatic Beef Pilaf.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Aspargus Pasta.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Bacon Parmesan Aspargus.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Beef Enchiladas.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Beef Noodles with Beans.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Beef n Potatoes Keema Naans.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Beet n Goat Cheese Salad.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Blueberry cheesecake.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Braised Fennel.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Carne Asada.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Chicken Curry w Limey Rice.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Chicken Fried Rice.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Chicken n Plum Noodles.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Chilli Lime n Cumin Cod.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Chilli con Carne.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Chinese Caramelised Pork Bowl.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Chocolate Chip Cookie.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Farro w Fennel, Lemon, Basil.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Indian Buttered Chicken.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Korean Beef Tacos.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Lamb n Lentil Curry.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Lemon tart.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Loup de Mer Citron.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Mexican Beef Wrap.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Mushroom FricassΓ©e.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Pancackes.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Pasta Puttanesca.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Pork n Black Bean Tacos.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Salade Nicoise.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Steak n Aspargus.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Teriyaki Sesame Chicken.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/TexMex Beef Tacos.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Thai Pork Rice Bowl.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Thai Pork Salad.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Tomato Salad.md (100%) rename {03.03 Recipes => 03.03 Food & Wine}/Yellow Beef Meetball Curry.md (100%) diff --git a/.obsidian/plugins/metaedit/data.json b/.obsidian/plugins/metaedit/data.json index 6afafa97..cb4a7254 100644 --- a/.obsidian/plugins/metaedit/data.json +++ b/.obsidian/plugins/metaedit/data.json @@ -16,7 +16,10 @@ "properties": [ "Tag", "Alias", - "Location" + "Location", + "Groceries", + "Health", + "Household" ] }, "KanbanHelper": { diff --git a/.obsidian/snippets/folder_4_icon.css b/.obsidian/snippets/folder_4_icon.css index 8af87b50..ec9dc30c 100644 --- a/.obsidian/snippets/folder_4_icon.css +++ b/.obsidian/snippets/folder_4_icon.css @@ -43,9 +43,9 @@ div[data-path="03.02 Travels"] .nav-folder-title-content::before content: "✈️ "; } -div[data-path="03.03 Recipes"] .nav-folder-title-content::before +div[data-path="03.03 Food & Wine"] .nav-folder-title-content::before { - content: "πŸ§‘β€πŸ³ "; + content: "πŸ§‘β€πŸ³πŸ· "; } div[data-path="04.01 lebv.org"] .nav-folder-title-content::before diff --git a/.obsidian/workspace b/.obsidian/workspace index e55f3a04..2220b4e5 100644 --- a/.obsidian/workspace +++ b/.obsidian/workspace @@ -7,8 +7,11 @@ "id": "c1cbd199334b4022", "type": "leaf", "state": { - "type": "empty", - "state": {} + "type": "markdown", + "state": { + "file": "01.01 Life Orga/IT & Computer.md", + "mode": "preview" + } } } ], @@ -65,13 +68,14 @@ "state": { "type": "backlink", "state": { + "file": "01.01 Life Orga/IT & Computer.md", "collapseAll": false, "extraContext": false, "sortOrder": "alphabetical", "showSearch": false, "searchQuery": "", - "backlinkCollapsed": false, - "unlinkedCollapsed": false + "backlinkCollapsed": true, + "unlinkedCollapsed": true } } }, @@ -103,15 +107,15 @@ }, "active": "c1cbd199334b4022", "lastOpenFiles": [ - "03.02 Travels/Turkey.md", - "05.02 Networks/VPS Console Dialogue.md", - "05.02 Networks/Server VPN.md", - "05.02 Networks/Server Tools.md", - "05.02 Networks/Server Cloud.md", - "05.02 Networks/Server Alias.md", - "05.02 Networks/Selfhosting.md", - "05.02 Networks/Configuring UFW.md", - "05.02 Networks/Configuring Postfix.md", - "05.02 Networks/Configuring Monit.md" + "01.01 Life Orga/IT & Computer.md", + "01.01 Life Orga/Untitled.md", + "01.01 Life Orga/@Life Organisation.md", + "06.01 Finances/hLedger.md", + "01.01 Life Orga/Family.md", + "01.01 Life Orga/Personal projects.md", + "01.01 Life Orga/Lifestyle.md", + "01.01 Life Orga/Finances.md", + "00.01 Admin/Button gallery.md", + "02.01 London/202.md" ] } \ No newline at end of file diff --git a/00.01 Admin/Templates/NewFile1.md b/00.01 Admin/Templates/NewFile1.md index 9efec6da..1b3fd9f6 100644 --- a/00.01 Admin/Templates/NewFile1.md +++ b/00.01 Admin/Templates/NewFile1.md @@ -1,5 +1,5 @@ <%* -const {templaterFunc} = this.app.plugins.plugins["CustomJS"].customJS +const {templaterFunc} = this.app.plugins.plugins["customjs"].api templaterFunc.createNewFile(tp, tp.frontmatter.ChildrenType) tp.file.content.replace(/[\w\W]+?\n+?/,"") %> \ No newline at end of file diff --git a/00.01 Admin/Templates/ShoppingListto0.md b/00.01 Admin/Templates/ShoppingListto0.md new file mode 100644 index 00000000..3ad1d725 --- /dev/null +++ b/00.01 Admin/Templates/ShoppingListto0.md @@ -0,0 +1,21 @@ +<%* +const listName = await tp.system.suggester(["Groceries", "Health", "Household"], ["Groceries", "Health", "Household"]) +let tempResult = ""; +let num = 0; +const {update} = this.app.plugins.plugins["metaedit"].api; +const {getPropertyValue} = this.app.plugins.plugins["metaedit"].api; +let itemList = await getPropertyValue(listName, tp.file.find_tfile("@Shopping list")) + +for (let i = 0; i < itemList.length; i++) { +let amount = itemList[i].split(" ")[0] + " " + num.toString(); +let radicale = itemList[i].replace(itemList[i].split(" ")[0] + " " + itemList[i].split(" ")[1], ""); +if (!i) { +tempResult = amount + radicale +} else +tempResult = tempResult + ", " + amount + radicale +} +} + +await update(listName, tempResult, tp.file.find_tfile("@Shopping list")); + +%> \ No newline at end of file diff --git a/00.01 Admin/Test sheet.md b/00.01 Admin/Test sheet.md index 5984ff3f..ae467136 100644 --- a/00.01 Admin/Test sheet.md +++ b/00.01 Admin/Test sheet.md @@ -9,6 +9,10 @@ ChildrenType: ["Note", "Task", "Recipe"]     +```dataviewjs +const {shoppingFunc} = customJS +shoppingFunc.getItems2Change({app: app, dv: dv, luxon: luxon, that:this, theme: "to0"}) +``` ```button name Create Note @@ -18,6 +22,11 @@ color blue templater true ``` +const {templaterFunc} = this.app.plugins.plugins["customjs"].api +templaterFunc.createNewFile(tp, tp.frontmatter.ChildrenType) +tp.file.content.replace(/[\w\W]+?\n+?/,"") +%> + const {templaterFunc} = this.app.plugins.plugins["CustomJS"].customJS templaterFunc.createNewFile(tp, tp.frontmatter.ChildrenType) tp.file.content.replace(/[\w\W]+?\n+?/,"") @@ -89,4 +98,25 @@ tR += templaterFunc.createNewFile(tp, tp.frontmatter.ChildrenType) const {templaterFunc} = tp.obsidian.plugins.plugins.CustomJS tR += templaterFunc.createNewFile(tp, tp.frontmatter.ChildrenType) -%> \ No newline at end of file +%> + +CollapseMetaTable: yes +Groceries: ["🍢 6 bottle(s) Coke 0", "🍿 1 whole Snacks", "🧈 packet(s) Beurre", "πŸ«’ 0 bottle(s) Olive oil", "🍺 0 bottle(s) Beers", "πŸ₯― 0 packet(s) Bagels", "🍯 1 jar(s) Bonne Maman", "🍌 6 whole Bananas", "πŸ§€ 0 packet(s) Fromage rape", "πŸ₯© 2 packet(s) Cured meat", "🍐 6 whole Fruit", "🍝 2 packet(s) Pasta", "🌢️ 1 bottle(s) Tabasco"] +Health: + - 🚿 1 whole shower gel + - 🧴 1 whole shampoo + - πŸͺ₯ whole toothbrush + - 🦷 1 whole toothpaste + - πŸ‘‚ whole earbuds + - πŸͺ’ 1 whole razor blades (mach3) + - 🍦 whole shaving cream + - 🧻 6 whole loo rolls + - 🦨 whole deo +Household: + - πŸ‘” 1 whole Washing gel + - 🧻 4 whole Kitchen towel + - 🧽 whole Sponge + - πŸ‘• 2 whole Softener + - 🍽️ whole Dishwasher tablets + - πŸ§‚ 1 whole Dishwasher salt + - 🚰 0 whole Dishwasher rinsing aid diff --git a/00.01 Admin/dv-views/ShoppingFunc.js b/00.01 Admin/dv-views/ShoppingFunc.js index 6bd325cf..93a496ce 100644 --- a/00.01 Admin/dv-views/ShoppingFunc.js +++ b/00.01 Admin/dv-views/ShoppingFunc.js @@ -1,64 +1,91 @@ class shoppingFunc { - getNewItems(args) { - const { - dv, - catItem - } = args; - return 0 + processItems(itemArr, itemLabel) { + + let tempAr = this.BuildList(this.updateShopIt(itemArr, itemLabel), ","); + + return "[" + tempAr + "]" } - getItems2Change(args) { + + updateShopIt(itemArr, itemLabel) { + + let tempAr = itemArr; + let num = 0; + + for (let i = 0; i < tempAr.length; i++) { + let amount = tempAr[i].split(" ")[0] + " "; + let radicale = tempAr[i].replace(tempAr[i].split(" ")[0] + " " + tempAr[i].split(" ")[1], ""); + + switch(itemLabel) { + + case !Boolean(itemLabel): + amount = amount + num.toString() + break; + + default: + if (radicale.contains(itemLabel)) { + amount = amount + (parseFloat(tempAr[i].split(" ")[1]) + 1).toString() + } + break; + } + tempAr[i] = "\"" + amount + radicale + "\"" + + } + return tempAr + } + + BuildList(arg1, construct) { + + let TempS = "" + + for (let i = 0; i < arg1.length; i++) { + if (Boolean(arg1[i])) { + if (TempS == "") { + TempS = arg1[i] + } else { + TempS = TempS + construct + arg1[i] + } + } + } + return TempS + } + + resetList(args) { const { that, app, dv, - luxon, theme, + listOfIt, } = args; - const { metaedit, buttons } = app.plugins.plugins - const { update } = metaedit.api - const { createButton } = buttons - const btnStr = this.getBtnName(theme) - const updateSct = "Groceries"// await app.obsidian.system.suggester(["groceries", "health", "household"], ["groceries", "health", "household"]); //"Groceries" - const updateStr = this.getPoint(dv, updateSct) + const { update } = app.plugins.plugins["metaedit"].api + const { createButton } = app.plugins.plugins["buttons"] + + 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 updateStr = this.processItems(itemAr, false); - return dv.el('p', + return dv.el('p', createButton({ app, el: that.container, args: { name: btnStr, color: 'blue' }, - clickOverride: { click: update, params: [updateSct, updateStr, dv.current().file.path]} + clickOverride: { click: update, params: [updateSct, updateStr, dv.page("01.02 Home/@Shopping list.md").file.path]} }), ) - } - getBtnStrings(dv, oprType) { - let categItems = ["groceries", "health", "household"]; - let tempRes1 = "Test" //await app.system.suggester(catItems, catItems); - let tempRes2 = "Test" - - switch(oprType) { - case 'to0': - tempRes2 = "Test" - break; - case 'add': - // const listItems = this.getNewItems(dv, catItem: updateSct); - tempRes2 = "Test" ////await dv.system.suggester(listItems, listItems); - break; - } - - return tempRes2 - } - getBtnName(arg1) { + + getBtnName(arg1, arg2) { let tempresult = "Test"; switch(arg1) { case 'to0': - tempresult = "Reset shopping list" + tempresult = "Reset " + arg2 + " list" break; case 'add': - tempresult = "Add an item" + tempresult = "Add a " + arg2 + " item" break; } return tempresult diff --git a/00.01 Admin/dv-views/print_shoppingitems.js b/00.01 Admin/dv-views/print_shoppingitems.js index 990578c1..1a92480f 100644 --- a/00.01 Admin/dv-views/print_shoppingitems.js +++ b/00.01 Admin/dv-views/print_shoppingitems.js @@ -4,7 +4,7 @@ let ing = []; let j = 0; if (!Boolean(items)) { - return "⚠️ Warning\nYou have not specified ahoppong items!\nThe shopping list cannot be printed." + return "⚠️ Warning\nYou have not specified shopping items!\nThe shopping list cannot be printed." } for (let i = 0; i < items.length; i++) { diff --git a/00.01 Admin/dv-views/working_file.js b/00.01 Admin/dv-views/working_file.js index bb295762..d4d14713 100644 --- a/00.01 Admin/dv-views/working_file.js +++ b/00.01 Admin/dv-views/working_file.js @@ -9,4 +9,6 @@ const dArray = ["invtype", "dateadded", "style", "stage", "ccy", "theme", "tradi const tablet = Boolean(tabletype) ? tabletype : 0; return globalFunc.getTable(dv, DataType, dArray, iArray, tablet) + + \ No newline at end of file diff --git a/01.01 Life Orga/Finances.md b/01.01 Life Orga/Finances.md index 6dacb629..2e7e9459 100644 --- a/01.01 Life Orga/Finances.md +++ b/01.01 Life Orga/Finances.md @@ -22,7 +22,7 @@ Parent:: [[@Life Organisation|Life Organisation]] name Edit Task parameters type command action MetaEdit: Run MetaEdit -id Edit Metadata +id EditMetaData ``` ^button-FinancesEdit @@ -30,6 +30,7 @@ id Edit Metadata name Save type command action Save current file +id Save ``` ^button-FinancesSave @@ -176,6 +177,8 @@ hide task count ### Dependencies +%%πŸ”Ξ± GVwoQnHMhoUoG79zYoNrHATnyNt4bJAM3MoU+GZDPV4sv+ymhDKmr+g4lhplMB355WC0u+HJopXDmDyzCTMiLkjmzp0kaMuXNdXV/0leisQ+1BIKkbUu02e4VZvmCPmbajUvffUJvWSrDBYtWF2naicaaZzpUTRfdwkEZcn03ZqhO9Pv/BzrqnYf7VI/PQwmcZkToRe2kEIW34xYzY+gd9lY8ApfehMLWpyBAJCEXTZW6o7T53iPv2iAbj8PA7kzabaYta/MCGtzzSm5rGNYB0w5cE8/353/tQDgPpfakHziHPLingQLsqSZY+4= πŸ”%% +     diff --git a/01.01 Life Orga/IT & Computer.md b/01.01 Life Orga/IT & Computer.md index 8945046f..d3b3ccb8 100644 --- a/01.01 Life Orga/IT & Computer.md +++ b/01.01 Life Orga/IT & Computer.md @@ -24,7 +24,7 @@ Parent:: [[@Life Organisation|Life organisation]] name Edit Task parameters type command action MetaEdit: Run MetaEdit -id Edit Metadata +id EditMetaData ``` ^button-ITEdit @@ -32,6 +32,7 @@ id Edit Metadata name Save type command action Save current file +id Save ``` ^button-ITSave diff --git a/01.01 Life Orga/Lifestyle.md b/01.01 Life Orga/Lifestyle.md index 2f77cc5c..9cbfe500 100644 --- a/01.01 Life Orga/Lifestyle.md +++ b/01.01 Life Orga/Lifestyle.md @@ -22,7 +22,7 @@ Parent:: [[@Life Organisation|Life Organisation]] name Edit Task parameters type command action MetaEdit: Run MetaEdit -id EditMetadata +id EditMetaData ``` ^button-LifestyleEdit @@ -30,6 +30,7 @@ id EditMetadata name Save type command action Save current file +id Save ``` ^button-LifestyleSave diff --git a/01.01 Life Orga/Personal projects.md b/01.01 Life Orga/Personal projects.md index 2b6e5e43..50a663b6 100644 --- a/01.01 Life Orga/Personal projects.md +++ b/01.01 Life Orga/Personal projects.md @@ -22,7 +22,7 @@ Parent:: [[@Life Organisation| Life Organisation]] name Edit Task parameters type command action MetaEdit: Run MetaEdit -id EditMetadata +id EditMetaData ``` ^button-PPEdit @@ -30,6 +30,7 @@ id EditMetadata name Save type command action Save current file +id Save ``` ^button-PPSave diff --git a/01.02 Home/@Shopping Admin.md b/01.02 Home/@Shopping Admin.md new file mode 100644 index 00000000..8aa1bcc6 --- /dev/null +++ b/01.02 Home/@Shopping Admin.md @@ -0,0 +1,88 @@ +--- + +Alias: ["Shoppimg Admin"] +Tag: ["Admin"] +Date: 2021-10-25 +DocType: "Admin" +Hierarchy: "NonRoot" +TimeStamp: +location: +CollapseMetaTable: Yes + +--- + +Parent:: [[@Shopping list|Shopping list]] + +--- + +  + +```button +name Save +type command +action Save current file +id Save +``` +^button-ShoppingAdminNSave + +  + +# Shopping Admin + +  + +```ad-abstract +title: Summary +collapse: open +Admin to dissociate the reset button from the actual shopping list. +``` + +  + +```toc +style: number +``` + +  + +--- + +  + +### Reset buttons + +  + +```dataview +const {shoppingFunc} = customJS +shoppingFunc.resetList({app: app, dv: dv, that:this, theme: "to0", listOfIt: "Groceries"}) +``` + +  + +```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" }) +``` + +  + +--- + +  + +### Header 2 + +  + +Loret ipsum + +  +  \ No newline at end of file diff --git a/01.02 Home/@Shopping list.md b/01.02 Home/@Shopping list.md index 32b47045..eaa0f009 100644 --- a/01.02 Home/@Shopping list.md +++ b/01.02 Home/@Shopping list.md @@ -1,69 +1,38 @@ --- -Alias: ["Shopping list"] -Tag: ["Groceries"] -Date: 2021-10-25 -DocType: "Groceries" -Hierarchy: "NonRoot" -TimeStamp: -location: -CollapseMetaTable: Yes -Groceries: - - 🍢 6 bottle(s) Coke 0 - - 🍿 1 whole Snacks - - 🧈 0 packet(s) Beurre - - πŸ«’ 0 bottle(s) Olive oil - - 🍺 0 bottle(s) Beers - - πŸ₯― 0 packet(s) Bagels - - 🍯 1 jar(s) Bonne Maman - - 🍌 6 whole Bananas - - πŸ§€ 0 packet(s) Fromage rape - - πŸ₯© 0 packet(s) Cured meat - - 🍐 6 whole Fruit - - 🍝 2 packet(s) Pasta - - 🌢️ 1 bottle(s) Tabasco -Health: - - 🚿 1 whole shower gel - - 🧴 1 whole shampoo - - πŸͺ₯ 1 whole toothbrush - - 🦷 1 whole toothpaste - - πŸ‘‚ 1 whole earbuds - - πŸͺ’ 1 whole razor blades (mach3) - - 🍦 1 whole shaving cream - - 🧻 1 whole loo rolls - - 🦨 1 whole deo -Household: - - πŸ‘” 1 whole Washing gel - - 🧻 1 whole Kitchen towel - - 🧽 1 whole Sponge - - πŸ‘• 1 whole Softener - - 🍽️ 1 whole Dishwasher tablets - - πŸ§‚ 1 whole Dishwasher salt - - 🚰 1 whole Dishwasher rinsing aid +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"] +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"] +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"] --- -Parent:: +parent:: [[@Life Organisation|Life Orga]] ---   +```button +name Reset Shopping list +type append template +action ShoppingListto0 +color blue +templater true +``` + +  + ```button name Save type command action Save current file id Save ``` -^button-ShoppinglistNSave +^button-ShoppingListSave   -```dataviewjs -const {shoppingFunc} = customJS -shoppingFunc.getItems2Change({app: app, dv: dv, luxon: luxon, that:this, theme: "to0"}) -``` - # Shopping list   @@ -91,7 +60,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 }) ```   @@ -105,7 +74,7 @@ dv.view("00.01 Admin/dv-views/print_shoppingitems", {items: dv.current().Groceri   ```dataviewjs -dv.view("00.01 Admin/dv-views/print_shoppingitems", {items: dv.current().Health}) +dv.view("00.01 Admin/dv-views/print_shoppingitems", { items: dv.current().Health}) ```   @@ -119,7 +88,7 @@ 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 }) ```   diff --git a/03.03 Food & Wine/$$Wine.md b/03.03 Food & Wine/$$Wine.md new file mode 100644 index 00000000..b5f9cf1c --- /dev/null +++ b/03.03 Food & Wine/$$Wine.md @@ -0,0 +1,115 @@ +--- + +Alias: ["Wine"] +Tag: ["Epicure"] +Date: 2021-10-26 +DocType: "Personal" +ChildrenType: ["Product", "Wine"] +Hierarchy: "Root" +location: +CollapseMetaTable: Yes + +--- + +Parent:: [[Lifestyle]] + +--- + +  + +```button +name Create Note +type append template +action NewFile +id CreateNote +``` +^button-undefinedNewNote + +```button +name Save +type command +action Save current file +id Save +``` +^button-undefinedSave + +  + +# 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 +``` + +  + +```toc +style: number +``` + +  + +--- + +  + +### Master Navigation +  + +```dataview + Table Date as "Creation Date" from "Admin" + Sort Date ascending +``` +  + +--- + +  + +### Tag Navigation +  + +```dataview + Table without id tags as "Tags" From "Admin" + Flatten file.tags as tags + Group by tags +``` + +  + +--- + +  + +### TimeStamp check +  + +```dataview + Table TimeStamp as "Time Stamp" from "Admin" + Where TimeStamp > date(today) - dur(100 years) + Sort TimeStamp ascending +``` + +  + +--- + +  + +### High Level tasks + +  + +```tasks +not done +path includes Life Admin +sort by due +hide backlink +hide task count +``` + +  +  \ No newline at end of file diff --git a/03.03 Recipes/@@Recipes.md b/03.03 Food & Wine/@@Recipes.md similarity index 100% rename from 03.03 Recipes/@@Recipes.md rename to 03.03 Food & Wine/@@Recipes.md diff --git a/03.03 Recipes/@Desserts.md b/03.03 Food & Wine/@Desserts.md similarity index 100% rename from 03.03 Recipes/@Desserts.md rename to 03.03 Food & Wine/@Desserts.md diff --git a/03.03 Recipes/@Main dishes.md b/03.03 Food & Wine/@Main dishes.md similarity index 100% rename from 03.03 Recipes/@Main dishes.md rename to 03.03 Food & Wine/@Main dishes.md diff --git a/03.03 Recipes/@Side dishes.md b/03.03 Food & Wine/@Side dishes.md similarity index 100% rename from 03.03 Recipes/@Side dishes.md rename to 03.03 Food & Wine/@Side dishes.md diff --git a/03.03 Recipes/@Snacks.md b/03.03 Food & Wine/@Snacks.md similarity index 100% rename from 03.03 Recipes/@Snacks.md rename to 03.03 Food & Wine/@Snacks.md diff --git a/03.03 Recipes/Aromatic Beef Pilaf.md b/03.03 Food & Wine/Aromatic Beef Pilaf.md similarity index 100% rename from 03.03 Recipes/Aromatic Beef Pilaf.md rename to 03.03 Food & Wine/Aromatic Beef Pilaf.md diff --git a/03.03 Recipes/Aspargus Pasta.md b/03.03 Food & Wine/Aspargus Pasta.md similarity index 100% rename from 03.03 Recipes/Aspargus Pasta.md rename to 03.03 Food & Wine/Aspargus Pasta.md diff --git a/03.03 Recipes/Bacon Parmesan Aspargus.md b/03.03 Food & Wine/Bacon Parmesan Aspargus.md similarity index 100% rename from 03.03 Recipes/Bacon Parmesan Aspargus.md rename to 03.03 Food & Wine/Bacon Parmesan Aspargus.md diff --git a/03.03 Recipes/Beef Enchiladas.md b/03.03 Food & Wine/Beef Enchiladas.md similarity index 100% rename from 03.03 Recipes/Beef Enchiladas.md rename to 03.03 Food & Wine/Beef Enchiladas.md diff --git a/03.03 Recipes/Beef Noodles with Beans.md b/03.03 Food & Wine/Beef Noodles with Beans.md similarity index 100% rename from 03.03 Recipes/Beef Noodles with Beans.md rename to 03.03 Food & Wine/Beef Noodles with Beans.md diff --git a/03.03 Recipes/Beef n Potatoes Keema Naans.md b/03.03 Food & Wine/Beef n Potatoes Keema Naans.md similarity index 100% rename from 03.03 Recipes/Beef n Potatoes Keema Naans.md rename to 03.03 Food & Wine/Beef n Potatoes Keema Naans.md diff --git a/03.03 Recipes/Beet n Goat Cheese Salad.md b/03.03 Food & Wine/Beet n Goat Cheese Salad.md similarity index 100% rename from 03.03 Recipes/Beet n Goat Cheese Salad.md rename to 03.03 Food & Wine/Beet n Goat Cheese Salad.md diff --git a/03.03 Recipes/Blueberry cheesecake.md b/03.03 Food & Wine/Blueberry cheesecake.md similarity index 100% rename from 03.03 Recipes/Blueberry cheesecake.md rename to 03.03 Food & Wine/Blueberry cheesecake.md diff --git a/03.03 Recipes/Braised Fennel.md b/03.03 Food & Wine/Braised Fennel.md similarity index 100% rename from 03.03 Recipes/Braised Fennel.md rename to 03.03 Food & Wine/Braised Fennel.md diff --git a/03.03 Recipes/Carne Asada.md b/03.03 Food & Wine/Carne Asada.md similarity index 100% rename from 03.03 Recipes/Carne Asada.md rename to 03.03 Food & Wine/Carne Asada.md diff --git a/03.03 Recipes/Chicken Curry w Limey Rice.md b/03.03 Food & Wine/Chicken Curry w Limey Rice.md similarity index 100% rename from 03.03 Recipes/Chicken Curry w Limey Rice.md rename to 03.03 Food & Wine/Chicken Curry w Limey Rice.md diff --git a/03.03 Recipes/Chicken Fried Rice.md b/03.03 Food & Wine/Chicken Fried Rice.md similarity index 100% rename from 03.03 Recipes/Chicken Fried Rice.md rename to 03.03 Food & Wine/Chicken Fried Rice.md diff --git a/03.03 Recipes/Chicken n Plum Noodles.md b/03.03 Food & Wine/Chicken n Plum Noodles.md similarity index 100% rename from 03.03 Recipes/Chicken n Plum Noodles.md rename to 03.03 Food & Wine/Chicken n Plum Noodles.md diff --git a/03.03 Recipes/Chilli Lime n Cumin Cod.md b/03.03 Food & Wine/Chilli Lime n Cumin Cod.md similarity index 100% rename from 03.03 Recipes/Chilli Lime n Cumin Cod.md rename to 03.03 Food & Wine/Chilli Lime n Cumin Cod.md diff --git a/03.03 Recipes/Chilli con Carne.md b/03.03 Food & Wine/Chilli con Carne.md similarity index 100% rename from 03.03 Recipes/Chilli con Carne.md rename to 03.03 Food & Wine/Chilli con Carne.md diff --git a/03.03 Recipes/Chinese Caramelised Pork Bowl.md b/03.03 Food & Wine/Chinese Caramelised Pork Bowl.md similarity index 100% rename from 03.03 Recipes/Chinese Caramelised Pork Bowl.md rename to 03.03 Food & Wine/Chinese Caramelised Pork Bowl.md diff --git a/03.03 Recipes/Chocolate Chip Cookie.md b/03.03 Food & Wine/Chocolate Chip Cookie.md similarity index 100% rename from 03.03 Recipes/Chocolate Chip Cookie.md rename to 03.03 Food & Wine/Chocolate Chip Cookie.md diff --git a/03.03 Recipes/Farro w Fennel, Lemon, Basil.md b/03.03 Food & Wine/Farro w Fennel, Lemon, Basil.md similarity index 100% rename from 03.03 Recipes/Farro w Fennel, Lemon, Basil.md rename to 03.03 Food & Wine/Farro w Fennel, Lemon, Basil.md diff --git a/03.03 Recipes/Indian Buttered Chicken.md b/03.03 Food & Wine/Indian Buttered Chicken.md similarity index 100% rename from 03.03 Recipes/Indian Buttered Chicken.md rename to 03.03 Food & Wine/Indian Buttered Chicken.md diff --git a/03.03 Recipes/Korean Beef Tacos.md b/03.03 Food & Wine/Korean Beef Tacos.md similarity index 100% rename from 03.03 Recipes/Korean Beef Tacos.md rename to 03.03 Food & Wine/Korean Beef Tacos.md diff --git a/03.03 Recipes/Lamb n Lentil Curry.md b/03.03 Food & Wine/Lamb n Lentil Curry.md similarity index 100% rename from 03.03 Recipes/Lamb n Lentil Curry.md rename to 03.03 Food & Wine/Lamb n Lentil Curry.md diff --git a/03.03 Recipes/Lemon tart.md b/03.03 Food & Wine/Lemon tart.md similarity index 100% rename from 03.03 Recipes/Lemon tart.md rename to 03.03 Food & Wine/Lemon tart.md diff --git a/03.03 Recipes/Loup de Mer Citron.md b/03.03 Food & Wine/Loup de Mer Citron.md similarity index 100% rename from 03.03 Recipes/Loup de Mer Citron.md rename to 03.03 Food & Wine/Loup de Mer Citron.md diff --git a/03.03 Recipes/Mexican Beef Wrap.md b/03.03 Food & Wine/Mexican Beef Wrap.md similarity index 100% rename from 03.03 Recipes/Mexican Beef Wrap.md rename to 03.03 Food & Wine/Mexican Beef Wrap.md diff --git a/03.03 Recipes/Mushroom FricassΓ©e.md b/03.03 Food & Wine/Mushroom FricassΓ©e.md similarity index 100% rename from 03.03 Recipes/Mushroom FricassΓ©e.md rename to 03.03 Food & Wine/Mushroom FricassΓ©e.md diff --git a/03.03 Recipes/Pancackes.md b/03.03 Food & Wine/Pancackes.md similarity index 100% rename from 03.03 Recipes/Pancackes.md rename to 03.03 Food & Wine/Pancackes.md diff --git a/03.03 Recipes/Pasta Puttanesca.md b/03.03 Food & Wine/Pasta Puttanesca.md similarity index 100% rename from 03.03 Recipes/Pasta Puttanesca.md rename to 03.03 Food & Wine/Pasta Puttanesca.md diff --git a/03.03 Recipes/Pork n Black Bean Tacos.md b/03.03 Food & Wine/Pork n Black Bean Tacos.md similarity index 100% rename from 03.03 Recipes/Pork n Black Bean Tacos.md rename to 03.03 Food & Wine/Pork n Black Bean Tacos.md diff --git a/03.03 Recipes/Salade Nicoise.md b/03.03 Food & Wine/Salade Nicoise.md similarity index 100% rename from 03.03 Recipes/Salade Nicoise.md rename to 03.03 Food & Wine/Salade Nicoise.md diff --git a/03.03 Recipes/Steak n Aspargus.md b/03.03 Food & Wine/Steak n Aspargus.md similarity index 100% rename from 03.03 Recipes/Steak n Aspargus.md rename to 03.03 Food & Wine/Steak n Aspargus.md diff --git a/03.03 Recipes/Teriyaki Sesame Chicken.md b/03.03 Food & Wine/Teriyaki Sesame Chicken.md similarity index 100% rename from 03.03 Recipes/Teriyaki Sesame Chicken.md rename to 03.03 Food & Wine/Teriyaki Sesame Chicken.md diff --git a/03.03 Recipes/TexMex Beef Tacos.md b/03.03 Food & Wine/TexMex Beef Tacos.md similarity index 100% rename from 03.03 Recipes/TexMex Beef Tacos.md rename to 03.03 Food & Wine/TexMex Beef Tacos.md diff --git a/03.03 Recipes/Thai Pork Rice Bowl.md b/03.03 Food & Wine/Thai Pork Rice Bowl.md similarity index 100% rename from 03.03 Recipes/Thai Pork Rice Bowl.md rename to 03.03 Food & Wine/Thai Pork Rice Bowl.md diff --git a/03.03 Recipes/Thai Pork Salad.md b/03.03 Food & Wine/Thai Pork Salad.md similarity index 100% rename from 03.03 Recipes/Thai Pork Salad.md rename to 03.03 Food & Wine/Thai Pork Salad.md diff --git a/03.03 Recipes/Tomato Salad.md b/03.03 Food & Wine/Tomato Salad.md similarity index 100% rename from 03.03 Recipes/Tomato Salad.md rename to 03.03 Food & Wine/Tomato Salad.md diff --git a/03.03 Recipes/Yellow Beef Meetball Curry.md b/03.03 Food & Wine/Yellow Beef Meetball Curry.md similarity index 100% rename from 03.03 Recipes/Yellow Beef Meetball Curry.md rename to 03.03 Food & Wine/Yellow Beef Meetball Curry.md diff --git a/05.01 Computer setup/Element.md b/05.01 Computer setup/Element.md index 92d4d2e0..53e28d94 100644 --- a/05.01 Computer setup/Element.md +++ b/05.01 Computer setup/Element.md @@ -138,7 +138,7 @@ Home | $10 | Free + dedicated server space; 5 users; server whitelabelling   -- [ ] [[Element]]: Implement 'Home' with bridges to retire iMessages, Whatsapp & Signal +- [x] [[Element]]: Implement 'Home' with bridges to retire iMessages, Whatsapp & Signal βœ… 2021-10-26 - [x] [[Selfhosting|Self-host]] an instance of Element βœ… 2021-09-14