From d64b80b1188a7834933a618810845c4df23b0edb Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@nedap.com>
Date: Thu, 18 Mar 2021 09:08:39 +0100
Subject: [PATCH 1/2] 1292 - add help menu items related to budibase instead of
 electron

---
 packages/server/src/electron.js | 113 +++++++++++++++++++++++++++++++-
 1 file changed, 111 insertions(+), 2 deletions(-)

diff --git a/packages/server/src/electron.js b/packages/server/src/electron.js
index 290c13e6a0..f2770e1d49 100644
--- a/packages/server/src/electron.js
+++ b/packages/server/src/electron.js
@@ -1,4 +1,4 @@
-const { app, BrowserWindow, shell, dialog } = require("electron")
+const { app, BrowserWindow, shell, dialog, Menu } = require("electron")
 const { join } = require("./utilities/centralPath")
 const isDev = require("electron-is-dev")
 const { autoUpdater } = require("electron-updater")
@@ -8,7 +8,7 @@ const initialiseBudibase = require("./utilities/initialiseBudibase")
 const { budibaseAppsDir } = require("./utilities/budibaseDir")
 const { openNewGitHubIssue, debugInfo } = require("electron-util")
 const eventEmitter = require("./events")
-
+const isMac = process.platform === 'darwin';
 const budibaseDir = budibaseAppsDir()
 const envFile = join(budibaseDir, ".env")
 
@@ -87,6 +87,115 @@ async function startApp() {
     // dock icon is clicked and there are no other windows open.
     if (win === null) createWindow()
   })
+
+  const template = [
+    // { role: 'appMenu' }
+    ...(isMac ? [{
+      label: app.name,
+      submenu: [
+        { role: 'about' },
+        { type: 'separator' },
+        { role: 'services' },
+        { type: 'separator' },
+        { role: 'hide' },
+        { role: 'hideothers' },
+        { role: 'unhide' },
+        { type: 'separator' },
+        { role: 'quit' }
+      ]
+    }] : []),
+    // { role: 'fileMenu' }
+    {
+      label: 'File',
+      submenu: [
+        isMac ? { role: 'close' } : { role: 'quit' }
+      ]
+    },
+    // { role: 'editMenu' }
+    {
+      label: 'Edit',
+      submenu: [
+        { role: 'undo' },
+        { role: 'redo' },
+        { type: 'separator' },
+        { role: 'cut' },
+        { role: 'copy' },
+        { role: 'paste' },
+        ...(isMac ? [
+          { role: 'pasteAndMatchStyle' },
+          { role: 'delete' },
+          { role: 'selectAll' },
+          { type: 'separator' },
+          {
+            label: 'Speech',
+            submenu: [
+              { role: 'startSpeaking' },
+              { role: 'stopSpeaking' }
+            ]
+          }
+        ] : [
+          { role: 'delete' },
+          { type: 'separator' },
+          { role: 'selectAll' }
+        ])
+      ]
+    },
+    // { role: 'viewMenu' }
+    {
+      label: 'View',
+      submenu: [
+        { role: 'reload' },
+        { role: 'forceReload' },
+        { role: 'toggleDevTools' },
+        { type: 'separator' },
+        { role: 'resetZoom' },
+        { role: 'zoomIn' },
+        { role: 'zoomOut' },
+        { type: 'separator' },
+        { role: 'togglefullscreen' }
+      ]
+    },
+    // { role: 'windowMenu' }
+    {
+      label: 'Window',
+      submenu: [
+        { role: 'minimize' },
+        { role: 'zoom' },
+        ...(isMac ? [
+          { type: 'separator' },
+          { role: 'front' },
+          { type: 'separator' },
+          { role: 'window' }
+        ] : [
+          { role: 'close' }
+        ])
+      ]
+    },
+    {
+      role: 'help',
+      submenu: [
+        {
+          label: 'Learn More',
+          click: () => shell.openExternal('https://www.budibase.com/')
+        },
+        {
+          label: 'Documentation',
+          click: () => shell.openExternal('https://docs.budibase.com/')
+        },
+        {
+          label: 'Search issues',
+          click: () => shell.openExternal('https://github.com/Budibase/budibase/issues')
+        },
+        {
+          label: 'Community discussions',
+          click: () => shell.openExternal('https://github.com/Budibase/budibase/discussions')
+        },
+      ]
+    }
+  ]
+
+  const menu = Menu.buildFromTemplate(template)
+  Menu.setApplicationMenu(menu)
 }
 
 autoUpdater.on("update-downloaded", (event, releaseNotes, releaseName) => {

From cefd3b96432bcd56dd2be91d96e720d69b46a969 Mon Sep 17 00:00:00 2001
From: Maurits Lourens <maurits.lourens@gmail.com>
Date: Tue, 23 Mar 2021 20:32:22 +0100
Subject: [PATCH 2/2] fix build by running yarn format

---
 .../PropertyControls/ColorPicker.svelte       |  34 ++--
 packages/server/src/electron.js               | 155 +++++++++---------
 2 files changed, 97 insertions(+), 92 deletions(-)

diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
index 6235e744f8..c777f79666 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/ColorPicker.svelte
@@ -1,38 +1,42 @@
 <script>
-  import { createEventDispatcher } from 'svelte'
+  import { createEventDispatcher } from "svelte"
   import Colorpicker from "@budibase/colorpicker"
-  
-  const dispatch = createEventDispatcher();
+
+  const dispatch = createEventDispatcher()
 
   export let value
-  
-  const WAIT = 150;
-  
+
+  const WAIT = 150
+
   function throttle(callback, wait, immediate = false) {
-    let timeout = null 
+    let timeout = null
     let initialCall = true
-    
+
     return function() {
       const callNow = immediate && initialCall
       const next = () => {
         callback.apply(this, arguments)
         timeout = null
       }
-      
-      if (callNow) { 
+
+      if (callNow) {
         initialCall = false
         next()
       }
-  
+
       if (!timeout) {
         timeout = setTimeout(next, wait)
       }
     }
   }
-  
-  const onChange = throttle(e => {
-    dispatch('change', e.detail)
-  }, WAIT, true)
+
+  const onChange = throttle(
+    e => {
+      dispatch("change", e.detail)
+    },
+    WAIT,
+    true
+  )
 </script>
 
 <Colorpicker value={value || '#C4C4C4'} on:change={onChange} />
diff --git a/packages/server/src/electron.js b/packages/server/src/electron.js
index f2770e1d49..9f10384b10 100644
--- a/packages/server/src/electron.js
+++ b/packages/server/src/electron.js
@@ -8,7 +8,7 @@ const initialiseBudibase = require("./utilities/initialiseBudibase")
 const { budibaseAppsDir } = require("./utilities/budibaseDir")
 const { openNewGitHubIssue, debugInfo } = require("electron-util")
 const eventEmitter = require("./events")
-const isMac = process.platform === 'darwin';
+const isMac = process.platform === "darwin"
 const budibaseDir = budibaseAppsDir()
 const envFile = join(budibaseDir, ".env")
 
@@ -90,108 +90,109 @@ async function startApp() {
 
   const template = [
     // { role: 'appMenu' }
-    ...(isMac ? [{
-      label: app.name,
-      submenu: [
-        { role: 'about' },
-        { type: 'separator' },
-        { role: 'services' },
-        { type: 'separator' },
-        { role: 'hide' },
-        { role: 'hideothers' },
-        { role: 'unhide' },
-        { type: 'separator' },
-        { role: 'quit' }
-      ]
-    }] : []),
+    ...(isMac
+      ? [
+          {
+            label: app.name,
+            submenu: [
+              { role: "about" },
+              { type: "separator" },
+              { role: "services" },
+              { type: "separator" },
+              { role: "hide" },
+              { role: "hideothers" },
+              { role: "unhide" },
+              { type: "separator" },
+              { role: "quit" },
+            ],
+          },
+        ]
+      : []),
     // { role: 'fileMenu' }
     {
-      label: 'File',
-      submenu: [
-        isMac ? { role: 'close' } : { role: 'quit' }
-      ]
+      label: "File",
+      submenu: [isMac ? { role: "close" } : { role: "quit" }],
     },
     // { role: 'editMenu' }
     {
-      label: 'Edit',
+      label: "Edit",
       submenu: [
-        { role: 'undo' },
-        { role: 'redo' },
-        { type: 'separator' },
-        { role: 'cut' },
-        { role: 'copy' },
-        { role: 'paste' },
-        ...(isMac ? [
-          { role: 'pasteAndMatchStyle' },
-          { role: 'delete' },
-          { role: 'selectAll' },
-          { type: 'separator' },
-          {
-            label: 'Speech',
-            submenu: [
-              { role: 'startSpeaking' },
-              { role: 'stopSpeaking' }
+        { role: "undo" },
+        { role: "redo" },
+        { type: "separator" },
+        { role: "cut" },
+        { role: "copy" },
+        { role: "paste" },
+        ...(isMac
+          ? [
+              { role: "pasteAndMatchStyle" },
+              { role: "delete" },
+              { role: "selectAll" },
+              { type: "separator" },
+              {
+                label: "Speech",
+                submenu: [{ role: "startSpeaking" }, { role: "stopSpeaking" }],
+              },
             ]
-          }
-        ] : [
-          { role: 'delete' },
-          { type: 'separator' },
-          { role: 'selectAll' }
-        ])
-      ]
+          : [{ role: "delete" }, { type: "separator" }, { role: "selectAll" }]),
+      ],
     },
     // { role: 'viewMenu' }
     {
-      label: 'View',
+      label: "View",
       submenu: [
-        { role: 'reload' },
-        { role: 'forceReload' },
-        { role: 'toggleDevTools' },
-        { type: 'separator' },
-        { role: 'resetZoom' },
-        { role: 'zoomIn' },
-        { role: 'zoomOut' },
-        { type: 'separator' },
-        { role: 'togglefullscreen' }
-      ]
+        { role: "reload" },
+        { role: "forceReload" },
+        { role: "toggleDevTools" },
+        { type: "separator" },
+        { role: "resetZoom" },
+        { role: "zoomIn" },
+        { role: "zoomOut" },
+        { type: "separator" },
+        { role: "togglefullscreen" },
+      ],
     },
     // { role: 'windowMenu' }
     {
-      label: 'Window',
+      label: "Window",
       submenu: [
-        { role: 'minimize' },
-        { role: 'zoom' },
-        ...(isMac ? [
-          { type: 'separator' },
-          { role: 'front' },
-          { type: 'separator' },
-          { role: 'window' }
-        ] : [
-          { role: 'close' }
-        ])
-      ]
+        { role: "minimize" },
+        { role: "zoom" },
+        ...(isMac
+          ? [
+              { type: "separator" },
+              { role: "front" },
+              { type: "separator" },
+              { role: "window" },
+            ]
+          : [{ role: "close" }]),
+      ],
     },
     {
-      role: 'help',
+      role: "help",
       submenu: [
         {
-          label: 'Learn More',
-          click: () => shell.openExternal('https://www.budibase.com/')
+          label: "Learn More",
+          click: () => shell.openExternal("https://www.budibase.com/"),
         },
         {
-          label: 'Documentation',
-          click: () => shell.openExternal('https://docs.budibase.com/')
+          label: "Documentation",
+          click: () => shell.openExternal("https://docs.budibase.com/"),
         },
         {
-          label: 'Search issues',
-          click: () => shell.openExternal('https://github.com/Budibase/budibase/issues')
+          label: "Search issues",
+          click: () =>
+            shell.openExternal("https://github.com/Budibase/budibase/issues"),
         },
         {
-          label: 'Community discussions',
-          click: () => shell.openExternal('https://github.com/Budibase/budibase/discussions')
+          label: "Community discussions",
+          click: () =>
+            shell.openExternal(
+              "https://github.com/Budibase/budibase/discussions"
+            ),
         },
-      ]
-    }
+      ],
+    },
   ]
 
   const menu = Menu.buildFromTemplate(template)