fix: let Templater own date-system templates
Leave the default Journal and Meeting systems without a raw Waypoint template so Templater folder triggers own interactive rendering. Their fallback frontmatter now matches the journal and meeting types. Document the required folder-trigger setup and selected-date filename contract.
This commit is contained in:
1 parent
26a1a481ac
commit
e027ac4a9e
5 files changed
+29
-10
No files matched your search
+10
-2
@@ -176,6 +176,14 @@ Configured systems live in `settings.dateSystems`, where array order is menu ord
|
|||||||
| `journal` | Journal | `periodic/journal` | `YYYY-MM-DD - [Journal]` | one |
|
| `journal` | Journal | `periodic/journal` | `YYYY-MM-DD - [Journal]` | one |
|
||||||
| `meetings` | Meeting | `periodic/meetings` | `YYYY-MM-DD - {title}` | many |
|
| `meetings` | Meeting | `periodic/meetings` | `YYYY-MM-DD - {title}` | many |
|
||||||
|
|
||||||
|
### Templater folder triggers
|
||||||
|
|
||||||
|
Waypoint deliberately does not evaluate Templater syntax. For an interactive Templater template, configure Templater's **Trigger Templater on new file creation** mode for the relevant folder, then leave that date system's `templateFile` blank in Waypoint. Waypoint creates a safe fallback note from `typeProperty` and the selected `YYYY-MM-DD` date; Templater's folder trigger owns the rendered content, prompts, scripts, and cursor placement.
|
||||||
|
|
||||||
|
The target filename is the contract between them. A calendar-created journal note is already named `YYYY-MM-DD - Journal`; a meeting is already `YYYY-MM-DD - {title}`. Templates must extract the date from `tp.file.title`, not `tp.date` or `tp.file.creation_date()`, because those refer to when Templater runs rather than the date selected in the calendar.
|
||||||
|
|
||||||
|
The journal template may retain a manual fallback: only prompt for a date and rename when `tp.file.title` does **not** match the date-system filename. That preserves manual note creation without a prompt or rename race on calendar creation.
|
||||||
|
|
||||||
### The `{title}` convention
|
### The `{title}` convention
|
||||||
|
|
||||||
`nameFormat` is a moment format string, so literal text needs bracket escaping — `YYYY-MM-DD - [Journal]` — the same convention the periodic formats `GGGG-[W]WW` and `YYYY-[Q]Q` already use.
|
`nameFormat` is a moment format string, so literal text needs bracket escaping — `YYYY-MM-DD - [Journal]` — the same convention the periodic formats `GGGG-[W]WW` and `YYYY-[Q]Q` already use.
|
||||||
@@ -239,8 +247,8 @@ openDateSystemNote(
|
|||||||
|
|
||||||
A single creation path shared by periodic notes and date systems; it replaced the period-only `createPeriodNote`.
|
A single creation path shared by periodic notes and date systems; it replaced the period-only `createPeriodNote`.
|
||||||
|
|
||||||
1. Read the template at `system.templateFile` (the `.md` extension is appended when omitted). If it exists, the note is created with the template's contents.
|
1. With a non-empty `system.templateFile`, reads it (appending `.md` when omitted) and creates the note with its raw contents. This is for plain, non-Templater templates.
|
||||||
2. With no template, the note is created with minimal frontmatter instead: `type: {system.typeProperty}` + `date: YYYY-MM-DD`.
|
2. With no template, the note is created with minimal frontmatter instead: `type: {system.typeProperty}` + `date: YYYY-MM-DD`. Use this mode with a Templater folder trigger, which replaces that fallback content with its rendered template.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@@ -83,6 +83,11 @@
|
|||||||
- [ ] Reorder and delete date systems → the day menu immediately follows the configured order and removes the deleted system
|
- [ ] Reorder and delete date systems → the day menu immediately follows the configured order and removes the deleted system
|
||||||
- [ ] Enter a non-empty name format with no date token → Settings shows the inline warning
|
- [ ] Enter a non-empty name format with no date token → Settings shows the inline warning
|
||||||
- [ ] Left-click a day still opens/creates its daily note; middle-click still opens it in a new tab
|
- [ ] Left-click a day still opens/creates its daily note; middle-click still opens it in a new tab
|
||||||
|
|
||||||
|
- [ ] With Templater folder mappings for journal and meetings, create a date-system note → Templater expands `<% … %>` syntax rather than leaving it literal
|
||||||
|
- [ ] Create a journal from the calendar → no duplicate date prompt and no rename; its frontmatter `date` equals the selected calendar day
|
||||||
|
- [ ] Create a meeting from the calendar for a non-today date → its frontmatter `date` equals the selected calendar day
|
||||||
|
|
||||||
## Recent Files (Regression)
|
## Recent Files (Regression)
|
||||||
|
|
||||||
- [ ] Opening a file adds it to recent files
|
- [ ] Opening a file adds it to recent files
|
||||||
|
|||||||
@@ -35,6 +35,12 @@ Configure systems in **Settings → Waypoint Sidebar → Date systems**. Each sy
|
|||||||
|
|
||||||
Ctrl/Cmd-click a menu entry opens it in a new tab.
|
Ctrl/Cmd-click a menu entry opens it in a new tab.
|
||||||
|
|
||||||
|
### Templater folder templates
|
||||||
|
|
||||||
|
If a date system uses a Templater folder mapping, leave its Waypoint **Template file** field blank. Waypoint then creates a safe fallback note while Templater owns prompts, scripts, cursors, and rendered content.
|
||||||
|
|
||||||
|
The selected calendar date is encoded in the filename. Templater templates should derive their `date` from `tp.file.title`, not from `tp.date` or `tp.file.creation_date()`. A journal template can retain a prompt-and-rename fallback for manual note creation, but it must skip that flow when the filename already follows `YYYY-MM-DD - Journal`.
|
||||||
|
|
||||||
## Installation
|
## Installation
|
||||||
|
|
||||||
### Via BRAT
|
### Via BRAT
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
|
THIS IS A GENERATED/BUNDLED FILE BY ESBUILD
|
||||||
*/
|
*/
|
||||||
|
|
||||||
var _=Object.defineProperty;var re=Object.getOwnPropertyDescriptor;var le=Object.getOwnPropertyNames;var ce=Object.prototype.hasOwnProperty;var de=(p,d)=>{for(var e in d)_(p,e,{get:d[e],enumerable:!0})},pe=(p,d,e,a)=>{if(d&&typeof d=="object"||typeof d=="function")for(let i of le(d))!ce.call(p,i)&&i!==e&&_(p,i,{get:()=>d[i],enumerable:!(a=re(d,i))||a.enumerable});return p};var me=p=>pe(_({},"__esModule",{value:!0}),p);var ve={};de(ve,{default:()=>q});module.exports=me(ve);var f=require("obsidian");var R={name:"",folder:"",nameFormat:"YYYY-MM-DD - {title}",templateFile:"",typeProperty:"",icon:"file"},E={calendar:{firstDayOfWeek:1,showNoteIndicators:!0},daily:{folder:"periodic/daily",templateFile:"Templates/Daily note",nameFormat:"YYYY-MM-DD",typeProperty:"daily-note"},weekly:{folder:"periodic/weekly",templateFile:"Templates/Weekly note",nameFormat:"GGGG-[W]WW",typeProperty:"weekly-note"},monthly:{folder:"periodic/monthly",templateFile:"Templates/Monthly note",nameFormat:"YYYY-MM",typeProperty:"monthly-note"},quarterly:{folder:"periodic/quarterly",templateFile:"Templates/Quarterly note",nameFormat:"YYYY-[Q]Q",typeProperty:"quarterly-note"},yearly:{folder:"periodic/yearly",templateFile:"Templates/Yearly note",nameFormat:"YYYY",typeProperty:"yearly-note"},dateSystems:[{id:"journal",name:"Journal",folder:"periodic/journal",nameFormat:"YYYY-MM-DD - [Journal]",templateFile:"resources/template/journal",typeProperty:"journal-note",icon:"book-open"},{id:"meetings",name:"Meeting",folder:"periodic/meetings",nameFormat:"YYYY-MM-DD - {title}",templateFile:"resources/template/meeting",typeProperty:"meeting-note",icon:"users"}],recentFiles:{maxItems:50,updateOn:"file-open",omittedPaths:[],omittedTags:[],filterTags:[]},display:{rowSize:26,rowSpacing:2,indentSize:16,fontSize:13,iconSize:16,calendarCellSize:32}};var k=require("obsidian");var X="{title}";function W(p){let d=p.indexOf(X);return d<0?{before:p,after:"",hasTitle:!1}:{before:p.slice(0,d),after:p.slice(d+X.length),hasTitle:!0}}function J(p,d){if(!d)return!0;let e=d.endsWith("/")?d:`${d}/`;return p.startsWith(e)}function ee(p,d,e,a){return a?!d||p.length<d.length+e.length?!1:p.startsWith(d)&&p.endsWith(e):p===d+e}function te(p,d,e){let a=p.startsWith(d)?d.length:0,i=e&&p.endsWith(e)?p.length-e.length:p.length;return i<=a?p:p.slice(a,i).trim()||p}var he=/[\\/:*?"<>|#^[\]]/g;function ne(p){return p.replace(he,"-").replace(/\s+/g," ").trim()}function N(p){let{before:d}=W(p),e=d.replace(/\[[^\]]*\]/g,"");return/[YMDQGWEwdgeo]/.test(e)}var O=class extends k.PluginSettingTab{constructor(e,a,i,t){super(e,a);this.activeTab="calendar";this.plugin=a,this.settings=i,this.onSettingsChange=t}display(){let{containerEl:e}=this;e.empty();let a=e.createDiv({cls:"waypoint-settings-tabs"}),i=[{key:"calendar",label:"Calendar"},{key:"periodic",label:"Periodic Notes"},{key:"systems",label:"Date systems"},{key:"recent",label:"Recent Files"},{key:"display",label:"Display"},{key:"about",label:"About"}];for(let n of i)a.createEl("button",{cls:`waypoint-settings-tab${this.activeTab===n.key?" is-active":""}`,text:n.label}).addEventListener("click",()=>{this.activeTab=n.key,this.display()});let t=e.createDiv({cls:"waypoint-settings-content"});switch(this.activeTab){case"calendar":this.renderCalendarTab(t);break;case"periodic":this.renderPeriodicTab(t);break;case"systems":this.renderSystemsTab(t);break;case"recent":this.renderRecentTab(t);break;case"display":this.renderDisplayTab(t);break;case"about":this.renderAboutTab(t);break}}renderCalendarTab(e){new k.Setting(e).setName("First day of week").setDesc("Which day the calendar week starts on.").addDropdown(a=>{a.addOption("0","Sunday").addOption("1","Monday").setValue(String(this.settings.calendar.firstDayOfWeek)).onChange(i=>{this.settings.calendar.firstDayOfWeek=parseInt(i,10),this.saveAndRefresh()})}),new k.Setting(e).setName("Show note indicators").setDesc("Show a dot on days that have existing notes.").addToggle(a=>{a.setValue(this.settings.calendar.showNoteIndicators).onChange(i=>{this.settings.calendar.showNoteIndicators=i,this.saveAndRefresh()})})}renderPeriodicTab(e){this.addPeriodNoteSettings(e,"Daily",this.settings.daily),this.addPeriodNoteSettings(e,"Weekly",this.settings.weekly),this.addPeriodNoteSettings(e,"Monthly",this.settings.monthly),this.addPeriodNoteSettings(e,"Quarterly",this.settings.quarterly),this.addPeriodNoteSettings(e,"Yearly",this.settings.yearly)}addPeriodNoteSettings(e,a,i){new k.Setting(e).setHeading().setName(a),new k.Setting(e).setName("Folder").setDesc(`Folder path for ${a.toLowerCase()} notes.`).addText(t=>{t.setPlaceholder("periodic/daily"),t.setValue(i.folder),t.onChange(n=>{i.folder=n,this.saveAndRefresh()})}),new k.Setting(e).setName("Name format").setDesc(`Date format for ${a.toLowerCase()} note filenames (moment.js format).`).addText(t=>{t.setPlaceholder("yyyy-MM-dd"),t.setValue(i.nameFormat),t.onChange(n=>{i.nameFormat=n,this.saveAndRefresh()})}),new k.Setting(e).setName("Template file").setDesc("Path tLine truncated
|
var _=Object.defineProperty;var re=Object.getOwnPropertyDescriptor;var le=Object.getOwnPropertyNames;var ce=Object.prototype.hasOwnProperty;var de=(p,d)=>{for(var e in d)_(p,e,{get:d[e],enumerable:!0})},pe=(p,d,e,a)=>{if(d&&typeof d=="object"||typeof d=="function")for(let i of le(d))!ce.call(p,i)&&i!==e&&_(p,i,{get:()=>d[i],enumerable:!(a=re(d,i))||a.enumerable});return p};var me=p=>pe(_({},"__esModule",{value:!0}),p);var ve={};de(ve,{default:()=>q});module.exports=me(ve);var f=require("obsidian");var R={name:"",folder:"",nameFormat:"YYYY-MM-DD - {title}",templateFile:"",typeProperty:"",icon:"file"},E={calendar:{firstDayOfWeek:1,showNoteIndicators:!0},daily:{folder:"periodic/daily",templateFile:"Templates/Daily note",nameFormat:"YYYY-MM-DD",typeProperty:"daily-note"},weekly:{folder:"periodic/weekly",templateFile:"Templates/Weekly note",nameFormat:"GGGG-[W]WW",typeProperty:"weekly-note"},monthly:{folder:"periodic/monthly",templateFile:"Templates/Monthly note",nameFormat:"YYYY-MM",typeProperty:"monthly-note"},quarterly:{folder:"periodic/quarterly",templateFile:"Templates/Quarterly note",nameFormat:"YYYY-[Q]Q",typeProperty:"quarterly-note"},yearly:{folder:"periodic/yearly",templateFile:"Templates/Yearly note",nameFormat:"YYYY",typeProperty:"yearly-note"},dateSystems:[{id:"journal",name:"Journal",folder:"periodic/journal",nameFormat:"YYYY-MM-DD - [Journal]",templateFile:"",typeProperty:"journal",icon:"book-open"},{id:"meetings",name:"Meeting",folder:"periodic/meetings",nameFormat:"YYYY-MM-DD - {title}",templateFile:"",typeProperty:"meeting",icon:"users"}],recentFiles:{maxItems:50,updateOn:"file-open",omittedPaths:[],omittedTags:[],filterTags:[]},display:{rowSize:26,rowSpacing:2,indentSize:16,fontSize:13,iconSize:16,calendarCellSize:32}};var k=require("obsidian");var X="{title}";function W(p){let d=p.indexOf(X);return d<0?{before:p,after:"",hasTitle:!1}:{before:p.slice(0,d),after:p.slice(d+X.length),hasTitle:!0}}function J(p,d){if(!d)return!0;let e=d.endsWith("/")?d:`${d}/`;return p.startsWith(e)}function ee(p,d,e,a){return a?!d||p.length<d.length+e.length?!1:p.startsWith(d)&&p.endsWith(e):p===d+e}function te(p,d,e){let a=p.startsWith(d)?d.length:0,i=e&&p.endsWith(e)?p.length-e.length:p.length;return i<=a?p:p.slice(a,i).trim()||p}var he=/[\\/:*?"<>|#^[\]]/g;function ne(p){return p.replace(he,"-").replace(/\s+/g," ").trim()}function N(p){let{before:d}=W(p),e=d.replace(/\[[^\]]*\]/g,"");return/[YMDQGWEwdgeo]/.test(e)}var O=class extends k.PluginSettingTab{constructor(e,a,i,t){super(e,a);this.activeTab="calendar";this.plugin=a,this.settings=i,this.onSettingsChange=t}display(){let{containerEl:e}=this;e.empty();let a=e.createDiv({cls:"waypoint-settings-tabs"}),i=[{key:"calendar",label:"Calendar"},{key:"periodic",label:"Periodic Notes"},{key:"systems",label:"Date systems"},{key:"recent",label:"Recent Files"},{key:"display",label:"Display"},{key:"about",label:"About"}];for(let n of i)a.createEl("button",{cls:`waypoint-settings-tab${this.activeTab===n.key?" is-active":""}`,text:n.label}).addEventListener("click",()=>{this.activeTab=n.key,this.display()});let t=e.createDiv({cls:"waypoint-settings-content"});switch(this.activeTab){case"calendar":this.renderCalendarTab(t);break;case"periodic":this.renderPeriodicTab(t);break;case"systems":this.renderSystemsTab(t);break;case"recent":this.renderRecentTab(t);break;case"display":this.renderDisplayTab(t);break;case"about":this.renderAboutTab(t);break}}renderCalendarTab(e){new k.Setting(e).setName("First day of week").setDesc("Which day the calendar week starts on.").addDropdown(a=>{a.addOption("0","Sunday").addOption("1","Monday").setValue(String(this.settings.calendar.firstDayOfWeek)).onChange(i=>{this.settings.calendar.firstDayOfWeek=parseInt(i,10),this.saveAndRefresh()})}),new k.Setting(e).setName("Show note indicators").setDesc("Show a dot on days that have existing notes.").addToggle(a=>{a.setValue(this.settings.calendar.showNoteIndicators).onChange(i=>{this.settings.calendar.showNoteIndicators=i,this.saveAndRefresh()})})}renderPeriodicTab(e){this.addPeriodNoteSettings(e,"Daily",this.settings.daily),this.addPeriodNoteSettings(e,"Weekly",this.settings.weekly),this.addPeriodNoteSettings(e,"Monthly",this.settings.monthly),this.addPeriodNoteSettings(e,"Quarterly",this.settings.quarterly),this.addPeriodNoteSettings(e,"Yearly",this.settings.yearly)}addPeriodNoteSettings(e,a,i){new k.Setting(e).setHeading().setName(a),new k.Setting(e).setName("Folder").setDesc(`Folder path for ${a.toLowerCase()} notes.`).addText(t=>{t.setPlaceholder("periodic/daily"),t.setValue(i.folder),t.onChange(n=>{i.folder=n,this.saveAndRefresh()})}),new k.Setting(e).setName("Name format").setDesc(`Date format for ${a.toLowerCase()} note filenames (moment.js format).`).addText(t=>{t.setPlaceholder("yyyy-MM-dd"),t.setValue(i.nameFormat),t.onChange(n=>{i.nameFormat=n,this.saveAndRefresh()})}),new k.Setting(e).setName("Template file").setDesc("Path to the template file (without .md extension).").addText(t=>{t.sLine truncated
|
||||||
\\.png$`),n.setValue(this.settings.recentFiles.omittedPaths.join(`
|
\\.png$`),n.setValue(this.settings.recentFiles.omittedPaths.join(`
|
||||||
`)),n.inputEl.onblur=()=>{this.settings.recentFiles.omittedPaths=n.getValue().split(`
|
`)),n.inputEl.onblur=()=>{this.settings.recentFiles.omittedPaths=n.getValue().split(`
|
||||||
`).filter(s=>s.trim()),this.saveAndRefresh()}});let i=new DocumentFragment;i.appendText("Regex patterns for frontmatter tags to exclude. One per line."),new k.Setting(e).setName("Omitted tags").setDesc(i).addTextArea(n=>{n.inputEl.setAttr("rows",4),n.setPlaceholder(`ignore
|
`).filter(s=>s.trim()),this.saveAndRefresh()}});let i=new DocumentFragment;i.appendText("Regex patterns for frontmatter tags to exclude. One per line."),new k.Setting(e).setName("Omitted tags").setDesc(i).addTextArea(n=>{n.inputEl.setAttr("rows",4),n.setPlaceholder(`ignore
|
||||||
@@ -13,7 +13,7 @@ person
|
|||||||
project`),n.setValue(this.settings.recentFiles.filterTags.join(`
|
project`),n.setValue(this.settings.recentFiles.filterTags.join(`
|
||||||
`)),n.inputEl.onblur=()=>{this.settings.recentFiles.filterTags=n.getValue().split(`
|
`)),n.inputEl.onblur=()=>{this.settings.recentFiles.filterTags=n.getValue().split(`
|
||||||
`).filter(s=>s.trim()),this.saveAndRefresh()}})}renderDisplayTab(e){new k.Setting(e).setHeading().setName("Bookmarks"),this.addSliderSetting(e,"Row size","Height of bookmark items.",this.settings.display,"rowSize",18,40,1,"px"),this.addSliderSetting(e,"Row spacing","Gap between bookmark items.",this.settings.display,"rowSpacing",0,12,1,"px"),this.addSliderSetting(e,"Indent size","Indent per nesting depth.",this.settings.display,"indentSize",8,32,2,"px"),this.addSliderSetting(e,"Font size","Label font size.",this.settings.display,"fontSize",10,18,1,"px"),this.addSliderSetting(e,"Icon size","Bookmark icon size.",this.settings.display,"iconSize",12,24,1,"px"),new k.Setting(e).setHeading().setName("Calendar"),this.addSliderSetting(e,"Cell size","Height of calendar day cells.",this.settings.display,"calendarCellSize",20,48,2,"px"),new k.Setting(e).addButton(a=>a.setButtonText("Reset to defaults").onClick(()=>{this.settings.display={...E.display},this.saveAndRefresh(),this.display()}))}addSliderSetting(e,a,i,t,n,s,o,r,c){let l=new k.Setting(e).setName(a).setDesc(`${i} (${t[n]}${c})`);l.addSlider(h=>{h.setLimits(s,o,r).setValue(t[n]).setDynamicTooltip().onChange(u=>{t[n]=u,l.setDesc(`${i} (${u}${c})`),this.saveAndRefresh()})})}async saveAndRefresh(){await this.plugin.saveSettings(),this.onSettingsChange()}renderAboutTab(e){let a=this.plugin.manifest.version,i=e.createDiv();i.style.display="flex",i.style.alignItems="center",i.style.gap="12px",i.style.marginBottom="16px";let t=i.createDiv();t.style.display="flex",t.style.alignItems="center",t.style.justifyContent="center",t.style.width="48px",t.style.height="48px",t.style.borderRadius="12px",t.style.background="var(--interactive-accent)",t.style.color="var(--text-on-accent)",t.style.fontSize="24px",(0,k.setIcon)(t,"compass");let n=i.createDiv(),s=n.createEl("h2",{text:"Waypoint Sidebar"});s.style.margin="0",s.style.lineHeight="1.2";let o=n.createDiv({text:`v${a}`});o.style.color="var(--text-muted)",o.style.fontSize="var(--font-ui-small)";let r=e.createDiv();r.style.marginBottom="20px",r.style.lineHeight="1.6",r.style.color="var(--text-normal)",r.innerHTML=["<p><strong>Waypoint</strong> is a sidebar plugin that brings three essential panels into one view:</p>",'<ul style="padding-left: 20px; margin: 8px 0;">',"<li><strong>Calendar</strong> \u2014 a monthly grid for your periodic notes (daily, weekly, monthly, quarterly, yearly). Click any day, week, or month to open or create the corresponding note.</li>","<li><strong>Recent Files</strong> \u2014 a list of recently opened files with type filtering, drag-and-drop, and right-click actions.</li>","<li><strong>Bookmarks</strong> \u2014 custom bookmarks with icons, groups, nesting, and drag-and-drop reordering. Separate from Obsidian's native bookmarks.</li>","</ul>",'<p style="color: var(--text-muted); font-size: var(--font-ui-small);">Made by Olivier. Licensed under MIT.</p>'].join(`
|
`).filter(s=>s.trim()),this.saveAndRefresh()}})}renderDisplayTab(e){new k.Setting(e).setHeading().setName("Bookmarks"),this.addSliderSetting(e,"Row size","Height of bookmark items.",this.settings.display,"rowSize",18,40,1,"px"),this.addSliderSetting(e,"Row spacing","Gap between bookmark items.",this.settings.display,"rowSpacing",0,12,1,"px"),this.addSliderSetting(e,"Indent size","Indent per nesting depth.",this.settings.display,"indentSize",8,32,2,"px"),this.addSliderSetting(e,"Font size","Label font size.",this.settings.display,"fontSize",10,18,1,"px"),this.addSliderSetting(e,"Icon size","Bookmark icon size.",this.settings.display,"iconSize",12,24,1,"px"),new k.Setting(e).setHeading().setName("Calendar"),this.addSliderSetting(e,"Cell size","Height of calendar day cells.",this.settings.display,"calendarCellSize",20,48,2,"px"),new k.Setting(e).addButton(a=>a.setButtonText("Reset to defaults").onClick(()=>{this.settings.display={...E.display},this.saveAndRefresh(),this.display()}))}addSliderSetting(e,a,i,t,n,s,o,r,c){let l=new k.Setting(e).setName(a).setDesc(`${i} (${t[n]}${c})`);l.addSlider(h=>{h.setLimits(s,o,r).setValue(t[n]).setDynamicTooltip().onChange(u=>{t[n]=u,l.setDesc(`${i} (${u}${c})`),this.saveAndRefresh()})})}async saveAndRefresh(){await this.plugin.saveSettings(),this.onSettingsChange()}renderAboutTab(e){let a=this.plugin.manifest.version,i=e.createDiv();i.style.display="flex",i.style.alignItems="center",i.style.gap="12px",i.style.marginBottom="16px";let t=i.createDiv();t.style.display="flex",t.style.alignItems="center",t.style.justifyContent="center",t.style.width="48px",t.style.height="48px",t.style.borderRadius="12px",t.style.background="var(--interactive-accent)",t.style.color="var(--text-on-accent)",t.style.fontSize="24px",(0,k.setIcon)(t,"compass");let n=i.createDiv(),s=n.createEl("h2",{text:"Waypoint Sidebar"});s.style.margin="0",s.style.lineHeight="1.2";let o=n.createDiv({text:`v${a}`});o.style.color="var(--text-muted)",o.style.fontSize="var(--font-ui-small)";let r=e.createDiv();r.style.marginBottom="20px",r.style.lineHeight="1.6",r.style.color="var(--text-normal)",r.innerHTML=["<p><strong>Waypoint</strong> is a sidebar plugin that brings three essential panels into one view:</p>",'<ul style="padding-left: 20px; margin: 8px 0;">',"<li><strong>Calendar</strong> \u2014 a monthly grid for your periodic notes (daily, weekly, monthly, quarterly, yearly). Click any day, week, or month to open or create the corresponding note.</li>","<li><strong>Recent Files</strong> \u2014 a list of recently opened files with type filtering, drag-and-drop, and right-click actions.</li>","<li><strong>Bookmarks</strong> \u2014 custom bookmarks with icons, groups, nesting, and drag-and-drop reordering. Separate from Obsidian's native bookmarks.</li>","</ul>",'<p style="color: var(--text-muted); font-size: var(--font-ui-small);">Made by Olivier. Licensed under MIT.</p>'].join(`
|
||||||
`)}};var m=require("obsidian");var C=require("obsidian");function ie(p,d,e){let a=(0,C.moment)({year:p,month:d,day:1}),i=(0,C.moment)(a).endOf("month"),t=(0,C.moment)(a).subtract((a.day()-e+7)%7,"days"),n=(0,C.moment)().startOf("day"),s=[],o=(0,C.moment)(t);for(;o.isBefore(i)||o.month()===d;){let r=[];for(let c=0;c<7;c++)r.push({date:(0,C.moment)(o),dayOfMonth:o.date(),isToday:o.isSame(n,"day"),isCurrentMonth:o.month()===d,isoWeekNumber:o.isoWeek()}),o.add(1,"day");if(s.push({weekNumber:r[0].isoWeekNumber,days:r}),s.length>=6)break}return s}var T="waypoint-view";function ue(p){return p.dragManager}var B=class extends m.ItemView{constructor(e,a){super(e);this.redraw=()=>{this.contentEl.empty(),this.contentEl.addClass("waypoint-view");let e=this.plugin.settings.display;this.contentEl.style.setProperty("--wp-row-size",e.rowSize+"px"),this.contentEl.style.setProperty("--wp-row-spacing",e.rowSpacing+"px"),this.contentEl.style.setProperty("--wp-indent-size",e.indentSize+"px"),this.contentEl.style.setProperty("--wp-font-size",e.fontSize+"px"),this.contentEl.style.setProperty("--wp-icon-size",e.iconSize+"px"),this.contentEl.style.setProperty("--wp-cal-cell-size",e.calendarCellSize+"px"),this.renderFavorites(),this.renderRecentFiles(),this.renderCalendar()};this.currentDisplayMonth=(0,m.moment)().month();this.currentDisplayYear=(0,m.moment)().year();this.dragId=null;this.dropZones=new WeakMap;this.recentFilesFilter=null;this.plugin=a}getViewType(){return T}getDisplayText(){return"Waypoint"}getIcon(){return"compass"}async onOpen(){this.redraw()}async onClose(){}renderCalendar(){let e=this.contentEl.createDiv({cls:"waypoint-section"});e.createDiv({cls:"waypoint-section-header",text:"Calendar"});let a=e.createDiv({cls:"waypoint-calendar"}),i=(0,m.moment)(),t=(0,m.moment)({year:this.currentDisplayYear,month:this.currentDisplayMonth,day:1}),n=a.createDiv({cls:"waypoint-calendar-top"}),s=n.createDiv({cls:"waypoint-calendar-breadcrumb"}),o=t.format("[Q]Q"),r=s.createSpan({cls:"waypoint-clickable",text:o});r.addEventListener("click",()=>{this.plugin.openPeriodNote("quarter",t)}),r.addEventListener("mousedown",D=>{D.button===1&&(D.preventDefault(),this.plugin.openPeriodNote("quarter",t,this.app.workspace.getLeaf("tab")))});let c=t.format("MMMM"),l=s.createSpan({cls:"waypoint-clickable",text:c});l.addEventListener("click",()=>{this.plugin.openPeriodNote("month",t)}),l.addEventListener("mousedown",D=>{D.button===1&&(D.preventDefault(),this.plugin.openPeriodNote("month",t,this.app.workspace.getLeaf("tab")))});let h=t.format("YYYY"),u=s.createSpan({cls:"waypoint-clickable",text:h});u.addEventListener("click",()=>{this.plugin.openPeriodNote("year",t)}),u.addEventListener("mousedown",D=>{D.button===1&&(D.preventDefault(),this.plugin.openPeriodNote("year",t,this.app.workspace.getLeaf("tab")))});let g=n.createDiv({cls:"waypoint-calendar-today-group"}),F=g.createEl("button",{cls:"waypoint-calendar-nav-btn"});(0,m.setIcon)(F,"chevron-left"),F.addEventListener("click",()=>this.navigateMonth(-1)),g.createEl("button",{cls:"waypoint-calendar-today-btn",text:"Today"}).addEventListener("click",()=>{this.currentDisplayMonth=(0,m.moment)().month(),this.currentDisplayYear=(0,m.moment)().year(),this.redraw()});let w=g.createEl("button",{cls:"waypoint-calendar-nav-btn"});(0,m.setIcon)(w,"chevron-right"),w.addEventListener("click",()=>this.navigateMonth(1));let b=a.createEl("table"),y=b.createEl("thead").createEl("tr");y.createEl("th",{text:""});let L=["sun","mon","tue","wed","thu","fri","sat"],V=this.plugin.settings.calendar.firstDayOfWeek;for(let D=0;D<7;D++){let Y=(V+D)%7;y.createEl("th",{text:L[Y]})}let M=b.createEl("tbody"),oe=ie(this.currentDisplayYear,this.currentDisplayMonth,this.plugin.settings.calendar.firstDayOfWeek);for(let D of oe){let Y=M.createEl("tr"),G=Y.createEl("td",{cls:"waypoint-weeknum"});G.setText(String(D.weekNumber));let Z=D.days[0].date;G.addEventListener("click",()=>{this.plugin.openPeriodNote("week",Z)}),G.addEventListener("mousedown",S=>{S.button===1&&(S.preventDefault(),this.plugin.openPeriodNote("week",Z,this.app.workspace.getLeaf("tab")))});for(let S of D.days){let I=Y.createEl("td",{cls:"waypoint-day"});if(I.setText(String(S.dayOfMonth)),S.isCurrentMonth||I.addClass("other-month"),S.isToday&&I.addClass("today"),this.plugin.settings.calendar.showNoteIndicators){let P=S.date.format("YYYY-MM-DD");this.plugin.hasNoteForDate(P)&&I.addClass("has-note")}I.addEventListener("click",()=>{this.plugin.openPeriodNote("day",S.date)}),I.addEventListener("mousedown",P=>{P.button===1&&(P.preventDefault(),this.plugin.openPeriodNote("day",S.date,this.app.workspace.getLeaf("tab")))}),I.addEventListener("contextmenu",P=>{P.preventDefault(),P.stopPropagation(),this.showDayContextMenu(P,S.date)})}}}navigateMonth(e){let a=(0,m.moment)({year:this.currentDisplayYear,month:this.currentDisplayMonth}).add(e,"month");this.currentDisplayMonth=a.month(),this.currentDisplayYear=a.year(),this.redraw()}showDayContextMenu(e,a){let i=new m.Menu;i.ad
Line truncated
|
`)}};var m=require("obsidian");var C=require("obsidian");function ie(p,d,e){let a=(0,C.moment)({year:p,month:d,day:1}),i=(0,C.moment)(a).endOf("month"),t=(0,C.moment)(a).subtract((a.day()-e+7)%7,"days"),n=(0,C.moment)().startOf("day"),s=[],o=(0,C.moment)(t);for(;o.isBefore(i)||o.month()===d;){let r=[];for(let c=0;c<7;c++)r.push({date:(0,C.moment)(o),dayOfMonth:o.date(),isToday:o.isSame(n,"day"),isCurrentMonth:o.month()===d,isoWeekNumber:o.isoWeek()}),o.add(1,"day");if(s.push({weekNumber:r[0].isoWeekNumber,days:r}),s.length>=6)break}return s}var T="waypoint-view";function ue(p){return p.dragManager}var B=class extends m.ItemView{constructor(e,a){super(e);this.redraw=()=>{this.contentEl.empty(),this.contentEl.addClass("waypoint-view");let e=this.plugin.settings.display;this.contentEl.style.setProperty("--wp-row-size",e.rowSize+"px"),this.contentEl.style.setProperty("--wp-row-spacing",e.rowSpacing+"px"),this.contentEl.style.setProperty("--wp-indent-size",e.indentSize+"px"),this.contentEl.style.setProperty("--wp-font-size",e.fontSize+"px"),this.contentEl.style.setProperty("--wp-icon-size",e.iconSize+"px"),this.contentEl.style.setProperty("--wp-cal-cell-size",e.calendarCellSize+"px"),this.renderFavorites(),this.renderRecentFiles(),this.renderCalendar()};this.currentDisplayMonth=(0,m.moment)().month();this.currentDisplayYear=(0,m.moment)().year();this.dragId=null;this.dropZones=new WeakMap;this.recentFilesFilter=null;this.plugin=a}getViewType(){return T}getDisplayText(){return"Waypoint"}getIcon(){return"compass"}async onOpen(){this.redraw()}async onClose(){}renderCalendar(){let e=this.contentEl.createDiv({cls:"waypoint-section"});e.createDiv({cls:"waypoint-section-header",text:"Calendar"});let a=e.createDiv({cls:"waypoint-calendar"}),i=(0,m.moment)(),t=(0,m.moment)({year:this.currentDisplayYear,month:this.currentDisplayMonth,day:1}),n=a.createDiv({cls:"waypoint-calendar-top"}),s=n.createDiv({cls:"waypoint-calendar-breadcrumb"}),o=t.format("[Q]Q"),r=s.createSpan({cls:"waypoint-clickable",text:o});r.addEventListener("click",()=>{this.plugin.openPeriodNote("quarter",t)}),r.addEventListener("mousedown",D=>{D.button===1&&(D.preventDefault(),this.plugin.openPeriodNote("quarter",t,this.app.workspace.getLeaf("tab")))});let c=t.format("MMMM"),l=s.createSpan({cls:"waypoint-clickable",text:c});l.addEventListener("click",()=>{this.plugin.openPeriodNote("month",t)}),l.addEventListener("mousedown",D=>{D.button===1&&(D.preventDefault(),this.plugin.openPeriodNote("month",t,this.app.workspace.getLeaf("tab")))});let h=t.format("YYYY"),u=s.createSpan({cls:"waypoint-clickable",text:h});u.addEventListener("click",()=>{this.plugin.openPeriodNote("year",t)}),u.addEventListener("mousedown",D=>{D.button===1&&(D.preventDefault(),this.plugin.openPeriodNote("year",t,this.app.workspace.getLeaf("tab")))});let g=n.createDiv({cls:"waypoint-calendar-today-group"}),F=g.createEl("button",{cls:"waypoint-calendar-nav-btn"});(0,m.setIcon)(F,"chevron-left"),F.addEventListener("click",()=>this.navigateMonth(-1)),g.createEl("button",{cls:"waypoint-calendar-today-btn",text:"Today"}).addEventListener("click",()=>{this.currentDisplayMonth=(0,m.moment)().month(),this.currentDisplayYear=(0,m.moment)().year(),this.redraw()});let w=g.createEl("button",{cls:"waypoint-calendar-nav-btn"});(0,m.setIcon)(w,"chevron-right"),w.addEventListener("click",()=>this.navigateMonth(1));let b=a.createEl("table"),y=b.createEl("thead").createEl("tr");y.createEl("th",{text:""});let L=["sun","mon","tue","wed","thu","fri","sat"],V=this.plugin.settings.calendar.firstDayOfWeek;for(let D=0;D<7;D++){let Y=(V+D)%7;y.createEl("th",{text:L[Y]})}let M=b.createEl("tbody"),oe=ie(this.currentDisplayYear,this.currentDisplayMonth,this.plugin.settings.calendar.firstDayOfWeek);for(let D of oe){let Y=M.createEl("tr"),G=Y.createEl("td",{cls:"waypoint-weeknum"});G.setText(String(D.weekNumber));let Z=D.days[0].date;G.addEventListener("click",()=>{this.plugin.openPeriodNote("week",Z)}),G.addEventListener("mousedown",S=>{S.button===1&&(S.preventDefault(),this.plugin.openPeriodNote("week",Z,this.app.workspace.getLeaf("tab")))});for(let S of D.days){let I=Y.createEl("td",{cls:"waypoint-day"});if(I.setText(String(S.dayOfMonth)),S.isCurrentMonth||I.addClass("other-month"),S.isToday&&I.addClass("today"),this.plugin.settings.calendar.showNoteIndicators){let P=S.date.format("YYYY-MM-DD");this.plugin.hasNoteForDate(P)&&I.addClass("has-note")}I.addEventListener("click",()=>{this.plugin.openPeriodNote("day",S.date)}),I.addEventListener("mousedown",P=>{P.button===1&&(P.preventDefault(),this.plugin.openPeriodNote("day",S.date,this.app.workspace.getLeaf("tab")))}),I.addEventListener("contextmenu",P=>{P.preventDefault(),P.stopPropagation(),this.showDayContextMenu(P,S.date)})}}}navigateMonth(e){let a=(0,m.moment)({year:this.currentDisplayYear,month:this.currentDisplayMonth}).add(e,"month");this.currentDisplayMonth=a.month(),this.currentDisplayYear=a.year(),this.redraw()}showDayContextMenu(e,a){let i=new m.Menu;i.ad
Line truncated
|
||||||
${U(h)}
|
${U(h)}
|
||||||
Check Settings \u2192 Waypoint Sidebar \u2192 Periodic Notes.`,A),null}let o=a.templateFile,r=this.resolveTemplateFile(o),c;if(r)try{c=await this.app.vault.read(r)}catch(h){return new f.Notice(`Waypoint: could not read the template "${r.path}" for the ${t} note.
|
Check Settings \u2192 Waypoint Sidebar \u2192 Periodic Notes.`,A),null}let o=a.templateFile,r=this.resolveTemplateFile(o),c;if(r)try{c=await this.app.vault.read(r)}catch(h){return new f.Notice(`Waypoint: could not read the template "${r.path}" for the ${t} note.
|
||||||
`+U(h),A),null}else c=`---
|
`+U(h),A),null}else c=`---
|
||||||
@@ -23,5 +23,5 @@ date: ${i.format("YYYY-MM-DD")}
|
|||||||
|
|
||||||
`;let l;try{l=await this.app.vault.create(e,c)}catch(h){return new f.Notice(`Waypoint: could not create the ${t} note at "${e}".
|
`;let l;try{l=await this.app.vault.create(e,c)}catch(h){return new f.Notice(`Waypoint: could not create the ${t} note at "${e}".
|
||||||
${U(h)}`,A),null}return o&&!r?new f.Notice(`Created ${t} note: ${l.basename}
|
${U(h)}`,A),null}return o&&!r?new f.Notice(`Created ${t} note: ${l.basename}
|
||||||
Template "${o}" was not found, so a basic note was created instead.`,A):new f.Notice(`Created ${t} note: ${l.basename}`),l}async ensureFolderExists(e){if(!e||this.app.vault.getAbstractFileByPath(e)instanceof f.TFolder)return;let a="";for(let i of e.split("/"))if(i&&(a=a?`${a}/${i}`:i,!(this.app.vault.getAbstractFileByPath(a)instanceof f.TFolder)))try{await this.app.vault.createFolder(a)}catch(t){if(!(this.app.vault.getAbstractFileByPath(a)instanceof f.TFolder))throw t}}resolveTemplateFile(e){if(!e)return null;let a=e.toLowerCase().endsWith(".md")?e:`${e}.md`;return this.app.vault.getFileByPath(a)}detectPeriodType(e){for(let a of ae){let i=this.settings[j[a].key].nameFormat;if(!i)continue;let t=(0,f.moment)(e,i,!0);if(t.isValid())return{period:a,date:t}}return null}async navigatePeriodNote(e){let a=this.app.workspace.getActiveFile();if(!a){new f.Notice("No active file");return}let i=this.detectPeriodType(a.basename);if(!i){let r=ae.map(c=>`${j[c].label.toLowerCase()} "${this.settings[j[c].key].nameFormat}"`).join(", ");new f.Notice(`Waypoint: "${a.basename}" does not match any configured periodic note format.
|
Template "${o}" was not found, so a basic note was created instead.`,A):new f.Notice(`Created ${t} note: ${l.basename}`),l}async ensureFolderExists(e){if(!e||this.app.vault.getAbstractFileByPath(e)instanceof f.TFolder)return;let a="";for(let i of e.split("/"))if(i&&(a=a?`${a}/${i}`:i,!(this.app.vault.getAbstractFileByPath(a)instanceof f.TFolder)))try{await this.app.vault.createFolder(a)}catch(t){if(!(this.app.vault.getAbstractFileByPath(a)instanceof f.TFolder))throw t}}resolveTemplateFile(e){if(!e)return null;let a=e.toLowerCase().endsWith(".md")?e:`${e}.md`;return this.app.vault.getFileByPath(a)}detectPeriodType(e){for(let a of ae){let i=this.settings[H[a].key].nameFormat;if(!i)continue;let t=(0,f.moment)(e,i,!0);if(t.isValid())return{period:a,date:t}}return null}async navigatePeriodNote(e){let a=this.app.workspace.getActiveFile();if(!a){new f.Notice("No active file");return}let i=this.detectPeriodType(a.basename);if(!i){let r=ae.map(c=>`${H[c].label.toLowerCase()} "${this.settings[H[c].key].nameFormat}"`).join(", ");new f.Notice(`Waypoint: "${a.basename}" does not match any configured periodic note format.
|
||||||
Expected one of: ${r}.`,A);return}let{period:t,date:n}=i,s=e==="next"?1:-1,o=t==="quarter"?n.clone().add(s*3,"months"):n.clone().add(s,`${t}s`);await this.openPeriodNote(t,o)}redrawAll(){this.broadcastRedraw()}broadcastRedraw(){let e=this.app.workspace.getLeavesOfType(T);for(let a of e)a.view instanceof B&&a.view.redraw()}},ye=["daily","weekly","monthly","quarterly","yearly"],j={day:{key:"daily",label:"Daily"},week:{key:"weekly",label:"Weekly"},month:{key:"monthly",label:"Monthly"},quarter:{key:"quarterly",label:"Quarterly"},year:{key:"yearly",label:"Yearly"}},ae=["day","week","month","quarter","year"];function se(p){return p.slice(p.lastIndexOf("/")+1).replace(/\.[^/.]+$/,"")}var A=1e4;function U(p){return p instanceof Error?p.message:String(p)}function H(p,d){return d?p.format(d):""}
|
Expected one of: ${r}.`,A);return}let{period:t,date:n}=i,s=e==="next"?1:-1,o=t==="quarter"?n.clone().add(s*3,"months"):n.clone().add(s,`${t}s`);await this.openPeriodNote(t,o)}redrawAll(){this.broadcastRedraw()}broadcastRedraw(){let e=this.app.workspace.getLeavesOfType(T);for(let a of e)a.view instanceof B&&a.view.redraw()}},ye=["daily","weekly","monthly","quarterly","yearly"],H={day:{key:"daily",label:"Daily"},week:{key:"weekly",label:"Weekly"},month:{key:"monthly",label:"Monthly"},quarter:{key:"quarterly",label:"Quarterly"},year:{key:"yearly",label:"Yearly"}},ae=["day","week","month","quarter","year"];function se(p){return p.slice(p.lastIndexOf("/")+1).replace(/\.[^/.]+$/,"")}var A=1e4;function U(p){return p instanceof Error?p.message:String(p)}function j(p,d){return d?p.format(d):""}
|
||||||
+4
-4
@@ -115,8 +115,8 @@ export const DEFAULT_SETTINGS: WaypointSettings = {
|
|||||||
name: 'Journal',
|
name: 'Journal',
|
||||||
folder: 'periodic/journal',
|
folder: 'periodic/journal',
|
||||||
nameFormat: 'YYYY-MM-DD - [Journal]',
|
nameFormat: 'YYYY-MM-DD - [Journal]',
|
||||||
templateFile: 'resources/template/journal',
|
templateFile: '',
|
||||||
typeProperty: 'journal-note',
|
typeProperty: 'journal',
|
||||||
icon: 'book-open',
|
icon: 'book-open',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
@@ -124,8 +124,8 @@ export const DEFAULT_SETTINGS: WaypointSettings = {
|
|||||||
name: 'Meeting',
|
name: 'Meeting',
|
||||||
folder: 'periodic/meetings',
|
folder: 'periodic/meetings',
|
||||||
nameFormat: 'YYYY-MM-DD - {title}',
|
nameFormat: 'YYYY-MM-DD - {title}',
|
||||||
templateFile: 'resources/template/meeting',
|
templateFile: '',
|
||||||
typeProperty: 'meeting-note',
|
typeProperty: 'meeting',
|
||||||
icon: 'users',
|
icon: 'users',
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in new issue
Block a user