From ddd8857cf6bd30537f4abff58d49fab0ec409fa7 Mon Sep 17 00:00:00 2001
From: Musubi42 <thibaut.raphael@protonmail.com>
Date: Sun, 17 Dec 2023 21:12:12 +0100
Subject: [PATCH 1/4] =?UTF-8?q?=E2=9C=A8[Commit=20config=20to=20Github]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

A commit allow to trigger a rebuild of Dashy, and publish changes automatically
---
 .../InteractiveEditor/EditModeSaveMenu.vue    |   8 +-
 src/mixins/ConfigSaving.js                    | 152 ++++++++++++++++++
 2 files changed, 158 insertions(+), 2 deletions(-)

diff --git a/src/components/InteractiveEditor/EditModeSaveMenu.vue b/src/components/InteractiveEditor/EditModeSaveMenu.vue
index e2b574c4db..d71633f1b3 100644
--- a/src/components/InteractiveEditor/EditModeSaveMenu.vue
+++ b/src/components/InteractiveEditor/EditModeSaveMenu.vue
@@ -27,11 +27,12 @@
         <SaveLocallyIcon />
       </Button>
       <Button
-        :click="writeToDisk"
+        :click="CommitToGithub"
         :disallow="!permissions.allowWriteToDisk"
         v-tooltip="tooltip($t('interactive-editor.menu.save-disk-tooltip'))"
       >
-        {{ $t('interactive-editor.menu.save-disk-btn') }}
+        Commit to Github
+        <!-- {{ $t('interactive-editor.menu.save-disk-btn') }} -->
         <SaveToDiskIcon />
       </Button>
       <Button
@@ -174,6 +175,9 @@ export default {
     writeToDisk() {
       this.writeConfigToDisk(this.config);
     },
+    CommitToGithub() {
+      this.CommitConfigToGithub(this.config);
+    },
   },
 };
 </script>
diff --git a/src/mixins/ConfigSaving.js b/src/mixins/ConfigSaving.js
index afe38607c7..08418c768d 100644
--- a/src/mixins/ConfigSaving.js
+++ b/src/mixins/ConfigSaving.js
@@ -33,6 +33,7 @@ export default {
       const headers = { 'Content-Type': 'text/plain' };
       const filename = isSubPag
         ? (this.$store.state.currentConfigInfo.confPath || '') : '';
+
       const body = { config: yaml, timestamp: new Date(), filename };
       const request = axios.post(endpoint, body, headers);
       // 4. Make the request, and handle response
@@ -58,6 +59,157 @@ export default {
           this.progress.end();
         });
     },
+    async CommitConfigToGithub(config) {
+      // 1. Get the config, and strip appConfig if is sub-page
+      const isSubPag = !!this.$store.state.currentConfigInfo;
+      const jsonConfig = config;
+      if (isSubPag) delete jsonConfig.appConfig;
+      // 2. Convert JSON into YAML
+      const yamlOptions = {};
+      const configFileYaml = jsYaml.dump(jsonConfig, yamlOptions);
+
+      const accessToken = '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';
+      const repoName = 'Musubi42/dashy-commit-config-from-ui';
+      const filePath = 'public/conf.yml';
+      // 3. Prepare the request
+      const baseUrl = `https://api.github.com/repos/${repoName}`;
+      // const endpoint = `${baseUrl}${serviceEndpoints.save}`;
+      const headers = {
+        headers: {
+          Authorization: `token ${accessToken}`,
+          Accept: 'application/vnd.github.v3+json',
+        },
+      };
+
+      // Declare all the variables
+      let lastCommitSha = null;
+      let baseTreeSha = null;
+      let blobSha = null;
+      let treeSha = null;
+      let newCommitSha = null;
+      let referenceUpdated = null;
+
+      // Step 1: Get the last commit sha
+      try {
+        const endpointLastCommitSha = `${baseUrl}/git/refs/heads/master`;
+        const requestLastCommitSha = await axios.get(endpointLastCommitSha, headers);
+
+        if (requestLastCommitSha.status !== 200) {
+          this.showToast(this.$t('config-editor.error-msg-cannot-save'), false);
+          return;
+        }
+
+        lastCommitSha = requestLastCommitSha.data.object.sha;
+      } catch (error) {
+        this.showToast(error, false);
+        ErrorHandler(`Failed to get last commit SHA. ${error}`);
+      }
+
+      // Step 2: Get the base tree SHA
+      try {
+        const endpointBaseTreeSha = `${baseUrl}/git/commits/${lastCommitSha}`;
+        const requestBaseTreeSha = await axios.get(endpointBaseTreeSha, headers);
+
+        if (requestBaseTreeSha.status !== 200) {
+          this.showToast(this.$t('config-editor.error-msg-cannot-save'), false);
+          return;
+        }
+
+        baseTreeSha = requestBaseTreeSha.data.tree.sha;
+      } catch (error) {
+        this.showToast(error, false);
+        ErrorHandler(`Failed to get base tree SHA. ${error}`);
+      }
+
+      // Step 3: Create a blob
+      try {
+        const endpointCreateBlob = `${baseUrl}/git/blobs`;
+        const blobData = { content: configFileYaml, encoding: 'utf-8' };
+        const requestCreateBlob = await axios.post(endpointCreateBlob, blobData, headers);
+
+        if (requestCreateBlob.status !== 201) {
+          this.showToast(this.$t('config-editor.error-msg-cannot-save'), false);
+          return;
+        }
+
+        blobSha = requestCreateBlob.data.sha;
+      } catch (error) {
+        this.showToast(error, false);
+        ErrorHandler(`Failed to create blob. ${error}`);
+      }
+
+      // Step 4: Create a tree
+      try {
+        const endpointCreateTree = `${baseUrl}/git/trees`;
+        const treeData = {
+          base_tree: baseTreeSha,
+          tree: [
+            {
+              path: filePath, mode: '100644', type: 'blob', sha: blobSha,
+            },
+          ],
+        };
+
+        const requestCreateTree = await axios.post(endpointCreateTree, treeData, headers);
+
+        if (requestCreateTree.status !== 201) {
+          this.showToast(this.$t('config-editor.error-msg-cannot-save'), false);
+          return;
+        }
+
+        treeSha = requestCreateTree.data.sha;
+      } catch (error) {
+        this.showToast(error, false);
+        ErrorHandler(`Failed to create blob. ${error}`);
+      }
+
+      // Step 5: Create a commit
+      try {
+        const endpointCreateCommit = `${baseUrl}/git/commits`;
+        const commitData = {
+          message: 'Add file via API',
+          tree: treeSha,
+          parents: [lastCommitSha],
+        };
+        const requestCreateCommit = await axios.post(endpointCreateCommit, commitData, headers);
+
+        if (requestCreateCommit.status !== 201) {
+          this.showToast(this.$t('config-editor.error-msg-cannot-save'), false);
+          return;
+        }
+
+        newCommitSha = requestCreateCommit.data.sha;
+      } catch (error) {
+        this.showToast(error, false);
+        ErrorHandler(`Failed to create commit. ${error}`);
+      }
+
+      // // Step 6: Update the reference
+      try {
+        const endpointUpdateReference = `${baseUrl}/git/refs/heads/master`;
+        const refData = { sha: newCommitSha };
+        const requestCreateCommit = await axios.patch(endpointUpdateReference, refData, headers);
+
+        if (requestCreateCommit.status !== 200) {
+          this.showToast(this.$t('config-editor.error-msg-cannot-save'), false);
+          return;
+        }
+
+        referenceUpdated = requestCreateCommit.data;
+      } catch (error) {
+        this.showToast(error, false);
+        ErrorHandler(`Failed to update reference. ${error}`);
+      }
+
+      if (referenceUpdated) {
+        this.carefullyClearLocalStorage();
+        this.showToast(`Config has been commit to ${repoName}/${filePath}`, true);
+      } else {
+        this.showToast(this.$t('config-editor.error-msg-cannot-save'), false);
+      }
+
+      InfoHandler(`Config has been commit to ${filePath}`, referenceUpdated);
+    },
     saveConfigLocally(config) {
       if (!this.permissions.allowSaveLocally) {
         ErrorHandler('Unable to save changes locally, this feature has been disabled');

From 4b3b59a075ca1c55ff3d43a9bb32321be8626534 Mon Sep 17 00:00:00 2001
From: Musubi42 <thibaut.raphael@protonmail.com>
Date: Sun, 17 Dec 2023 21:35:02 +0100
Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=9A=A8[PublicHolidays]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The linter was already broken, line 93 too long and strict equality added
---
 src/components/Widgets/PublicHolidays.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/Widgets/PublicHolidays.vue b/src/components/Widgets/PublicHolidays.vue
index 424160cf65..5d47b02a99 100644
--- a/src/components/Widgets/PublicHolidays.vue
+++ b/src/components/Widgets/PublicHolidays.vue
@@ -90,7 +90,8 @@ export default {
       const formatType = (ht) => capitalize(ht.replaceAll('_', ' '));
       holidays.forEach((holiday) => {
         results.push({
-          name: holiday.name.filter(p => p.lang == this.options.lang)[0].text || holiday.name[0].text,
+          name: holiday.name.filter(p => p.lang === this.options.lang)[0].text
+          || holiday.name[0].text,
           date: makeDate(holiday.date),
           type: formatType(holiday.holidayType),
           observed: holiday.observedOn ? makeDate(holiday.observedOn) : '',

From 918b7fc5c691bed4950322dc07112281c4ae4f41 Mon Sep 17 00:00:00 2001
From: Musubi42 <thibaut.raphael@protonmail.com>
Date: Sun, 17 Dec 2023 21:36:04 +0100
Subject: [PATCH 3/4] =?UTF-8?q?=F0=9F=94=96=20[commit=20config=20to=20Gith?=
 =?UTF-8?q?ub]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Upgrade minor version to 2
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 30faa648e0..1da56a8fa6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Dashy",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "license": "MIT",
   "main": "server",
   "author": "Alicia Sykes <alicia@omg.lol> (https://aliciasykes.com)",

From ac49329e2807bb39db2cc98ff0d1f9b32a317ef4 Mon Sep 17 00:00:00 2001
From: Musubi42 <thibaut.raphael@protonmail.com>
Date: Sun, 17 Dec 2023 22:16:27 +0100
Subject: [PATCH 4/4] =?UTF-8?q?=F0=9F=94=92=EF=B8=8F=20[Delete=20access=20?=
 =?UTF-8?q?token]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I have revoked the access token from my Github account
---
 src/mixins/ConfigSaving.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mixins/ConfigSaving.js b/src/mixins/ConfigSaving.js
index 08418c768d..3a6937a250 100644
--- a/src/mixins/ConfigSaving.js
+++ b/src/mixins/ConfigSaving.js
@@ -68,9 +68,10 @@ export default {
       const yamlOptions = {};
       const configFileYaml = jsYaml.dump(jsonConfig, yamlOptions);
 
-      const accessToken = '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';
+      const accessToken = '<YOUR_ACCESS_TOKEN>';
       const repoName = 'Musubi42/dashy-commit-config-from-ui';
       const filePath = 'public/conf.yml';
+
       // 3. Prepare the request
       const baseUrl = `https://api.github.com/repos/${repoName}`;
       // const endpoint = `${baseUrl}${serviceEndpoints.save}`;