Add filetree option

oleeskild · Nov 3, 2022 · 1d6eca2 · 1d6eca2
1 parent 1e02f68
commit 1d6eca2
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 50 deletions.
diff --git a/main.ts b/main.ts
@@ -20,12 +20,14 @@ const DEFAULT_SETTINGS: DigitalGardenSettings = {
 	faviconPath: '',
 	showRibbonIcon: true,
 	noteSettingsIsInitialized: false,
+	siteName: 'Digital Garden',
 	defaultNoteSettings: {
 		dgHomeLink: true,
 		dgPassFrontmatter: false,
 		dgShowBacklinks: false,
 		dgShowLocalGraph: false,
-		dgShowInlineTitle: false
+		dgShowInlineTitle: false,
+		dgShowFileTree: false
 	}
 }
 

diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
     "id": "digitalgarden",
     "name": "Digital Garden",
-    "version": "2.21.0",
+    "version": "2.22.0",
     "minAppVersion": "0.12.0",
     "description": "Publish your notes to a digital garden for others to enjoy.",
     "author": "Ole Eskild Steensen",

diff --git a/src/DigitalGardenSettings.ts b/src/DigitalGardenSettings.ts
@@ -10,6 +10,8 @@ export default interface DigitalGardenSettings {
 	baseTheme: string;
 	faviconPath: string;
 
+	siteName: string;
+
 	noteSettingsIsInitialized: boolean;
 
 	defaultNoteSettings: {
@@ -18,5 +20,6 @@ export default interface DigitalGardenSettings {
 		dgShowBacklinks: boolean;
 		dgShowLocalGraph: boolean;
 		dgShowInlineTitle: boolean;
+		dgShowFileTree: boolean;
 	}
 }
diff --git a/src/DigitalGardenSiteManager.ts b/src/DigitalGardenSiteManager.ts
@@ -21,11 +21,13 @@ export default class DigitalGardenSiteManager implements IDigitalGardenSiteManag
         const octokit = new Octokit({ auth: this.settings.githubToken });
         const theme = JSON.parse(this.settings.theme);
         const baseTheme = this.settings.baseTheme;
+        const siteName = this.settings.siteName;
 
         let envSettings = '';
         if (theme.name !== 'default') {
-            envSettings = `THEME=${theme.cssUrl}\nBASE_THEME=${baseTheme}`
+            envSettings = `THEME=${theme.cssUrl}\nBASE_THEME=${baseTheme}`;
         }
+        envSettings+=`\nSITE_NAME_HEADER=${siteName}`;
 
         const defaultNoteSettings = {...this.settings.defaultNoteSettings};
         for(const key of Object.keys(defaultNoteSettings)) {
@@ -198,9 +200,14 @@ export default class DigitalGardenSiteManager implements IDigitalGardenSiteManag
             "src/site/_includes/components/pageheader.njk",
             "src/site/_includes/components/sidebar.njk",
             "src/site/_includes/components/graphScript.njk",
+            "src/site/_includes/components/filetree.njk",
+            "src/site/_includes/components/filetreeNavbar.njk",
+            "src/site/_includes/components/navbar.njk",
             "src/site/_data/versionednotes.js",
             "src/site/_data/meta.js",
-            "src/site/img/outgoing.svg"
+            "src/site/_data/filetree.js",
+            "src/site/img/outgoing.svg",
+            "src/helpers/constants.js",
         ];
 
         for (const file of filesToModify) {

diff --git a/src/SettingView.ts b/src/SettingView.ts
@@ -108,6 +108,16 @@ export default class SettingView {
                     this.saveNoteSettingsAndUpdateEnv();
                 })
             })
+        new Setting(noteSettingsModal.contentEl)
+            .setName("Show filetree sidebar (dg-show-file-tree)")
+            .setDesc("When turned on, a filetree will be shown on your site.")
+            .addToggle(t => {
+                t.setValue(this.settings.defaultNoteSettings.dgShowFileTree)
+                t.onChange((val) => {
+                    this.settings.defaultNoteSettings.dgShowFileTree = val;
+                    this.saveNoteSettingsAndUpdateEnv();
+                })
+            })
     }
 
 
@@ -118,7 +128,7 @@ export default class SettingView {
 
         new Setting(this.settingsRootElement)
             .setName("Appearance")
-            .setDesc("Manage themes and favicons on your site")
+            .setDesc("Manage themes, sitename and favicons on your site")
             .addButton(cb => {
                 cb.setButtonText("Manage");
                 cb.onClick(async () => {
@@ -156,6 +166,17 @@ export default class SettingView {
                 });
             });
 
+        new Setting(themeModal.contentEl)
+            .setName('Sitename')
+            .setDesc('The name of your site. This will be displayed as the site header.')
+            .addText(text =>
+                text.setValue(this.settings.siteName)
+                    .onChange(async (value) => {
+                        this.settings.siteName = value;
+                        await this.saveSettings();
+                    })
+            );
+
         new Setting(themeModal.contentEl)
             .setName("Favicon")
             .setDesc("Path to an svg in your vault you wish to use as a favicon. Leave blank to use default.")
@@ -193,6 +214,7 @@ export default class SettingView {
         await gardenManager.updateEnv();
 
         new Notice("Successfully applied theme");
+        new Notice("Successfully set sitename");
     }
 
     private async saveNoteSettingsAndUpdateEnv() {
@@ -211,48 +233,6 @@ export default class SettingView {
         }
     }
 
-    private async updateEnv(octokit: Octokit) {
-        const theme = JSON.parse(this.settings.theme);
-        const baseTheme = this.settings.baseTheme;
-
-        let envSettings = '';
-        if (theme.name !== 'default') {
-            envSettings = `THEME=${theme.cssUrl}\nBASE_THEME=${baseTheme}`
-        }
-
-        const defaultNoteSettings = { ...this.settings.defaultNoteSettings };
-        for (const key of Object.keys(defaultNoteSettings)) {
-            //@ts-ignore
-            envSettings += `\n${key}=${defaultNoteSettings[key]}`;
-        }
-
-        const base64Settings = Base64.encode(envSettings);
-
-        let fileExists = true;
-        let currentFile = null;
-        try {
-            currentFile = await octokit.request('GET /repos/{owner}/{repo}/contents/{path}', {
-                owner: this.settings.githubUserName,
-                repo: this.settings.githubRepo,
-                path: ".env",
-            });
-        } catch (error) {
-            fileExists = false;
-        }
-
-        //commit
-        await octokit.request('PUT /repos/{owner}/{repo}/contents/{path}', {
-            owner: this.settings.githubUserName,
-            repo: this.settings.githubRepo,
-            path: ".env",
-            message: `Update settings`,
-            content: base64Settings,
-            sha: fileExists ? currentFile.data.sha : null
-        });
-
-
-    }
-
     private async addFavicon(octokit: Octokit) {
         let base64SettingsFaviconContent = "";
         if (this.settings.faviconPath) {
@@ -299,7 +279,7 @@ export default class SettingView {
                 sha: faviconExists ? currentFaviconOnSite.data.sha : null
             });
 
-            new Notice(`Successfully set new favicon`)
+            new Notice(`Successfully set favicon`)
         }
 
     }
@@ -382,7 +362,7 @@ export default class SettingView {
                         await this.saveSettings();
                     })
             );
-    }
+    } 
 
     renderCreatePr(modal: Modal, handlePR: (button: ButtonComponent) => Promise<void>) {
 
@@ -443,7 +423,7 @@ export default class SettingView {
     renderLoading() {
         this.loading.show();
         const text = "Creating PR. This should take less than 1 minute";
-        const loadingText = this.loading.createEl('h2', { text });
+        const loadingText = this.loading.createEl('h4', { text });
         this.loadingInterval = setInterval(() => {
             if (loadingText.innerText === `${text}`) {
                 loadingText.innerText = `${text}.`;

diff --git a/versions.json b/versions.json
@@ -1,4 +1,5 @@
 {
+    "2.22.0": "0.12.0",
     "2.21.0": "0.12.0",
     "2.20.0": "0.12.0",
     "2.19.0": "0.12.0",