testing new menus

Author: soapdog

.github/workflows/build.yml

@@ -0,0 +1,34 @@
+name: Build/release
+
+on: push
+
+jobs:
+  release:
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
+
+    steps:
+      - name: Check out Git repository
+        uses: actions/checkout@v1
+
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v1
+        with:
+          node-version: 10
+
+      - name: Build/release Electron app
+        uses: samuelmeuli/action-electron-builder@v1
+        with:
+          # GitHub token, automatically provided to the action
+          # (No need to define this secret in the repo settings)
+          github_token: ${{ secrets.github_token }}
+
+          # If the commit is tagged with a version (e.g. "v1.0.0"),
+          # release the app after building
+          release: ${{ startsWith(github.ref, 'refs/tags/v') }}
+
+          # Maybe this works
+          args: "--config electron-builder.config.js"

.gitignore

@@ -16,3 +16,5 @@ desktop-old/
 *.sublime-workspace
 .vscode
 reference-*
+
+*.tgz

app.js

@@ -69,9 +69,9 @@ const createWindow = (data = false, windowState = false) => {
     }
   })
 
-//   const menu = defaultMenu(app, shell)
-// 
-//   Menu.setApplicationMenu(Menu.buildFromTemplate(menu))
+  //   const menu = defaultMenu(app, shell)
+  // 
+  //   Menu.setApplicationMenu(Menu.buildFromTemplate(menu))
 
   if (data?.pkg) {
     win.webContents.send("patchfox:event", { event: "package:go", data })
@@ -94,6 +94,8 @@ ipcMain.on("menu:set", (event, group) => {
   let newMenus = []
   let keys = Object.keys(group)
 
+    console.log(JSON.stringify(menu,null,2))
+
   const makeSubmenu = (subgroup) => {
     let toPush = []
     subgroup.forEach((m) => {
@@ -140,6 +142,7 @@ ipcMain.on("menu:set", (event, group) => {
       },
     ],
   }
+
   let helpMenu = newMenus.pop()
 
   menu.splice(1, 0, fileMenu)
@@ -149,7 +152,21 @@ ipcMain.on("menu:set", (event, group) => {
 
   menu.push(helpMenu) // insert our own help menu.
 
-  Menu.setApplicationMenu(Menu.buildFromTemplate(menu))
+  let patchfoxMenuIndex = menu.findIndex(e => e.label == "Application")
+
+  let patchfoxMenu = menu[patchfoxMenuIndex].submenu
+  let appMenu = menu[0].submenu
+
+  appMenu.splice(1,0,{type: "separator"}, ...patchfoxMenu)
+
+  menu[0].submenu = appMenu
+  menu.splice(patchfoxMenuIndex, 1)
+
+  console.log(JSON.stringify(menu,null,2))
+  let finalMenu = Menu.buildFromTemplate(menu)
+
+  Menu.setApplicationMenu(finalMenu)
+
 })
 
 // This method will be called when Electron has finished

docs/packages/README.md

@@ -6,9 +6,9 @@ These are the packages that Patchfox is loading.
 * [KoFiIntegration](/packages/KoFiIntegration/)
 * [blog](/packages/blog/)
 * [books](/packages/books/)
-* [contacts](/packages/contacts/)
 * [errorHandler](/packages/errorHandler/)
 * [calendar](/packages/calendar/)
+* [contacts](/packages/contacts/)
 * [githubIntegration](/packages/githubIntegration/)
 * [globalMenu](/packages/globalMenu/)
 * [helpMenu](/packages/helpMenu/)
@@ -21,7 +21,7 @@ These are the packages that Patchfox is loading.
 * [pub](/packages/pub/)
 * [search](/packages/search/)
 * [settings](/packages/settings/)
-* [sourcehutIntegration](/packages/sourcehutIntegration/)
 * [system](/packages/system/)
+* [sourcehutIntegration](/packages/sourcehutIntegration/)
 * [vote](/packages/vote/)
 * [zine](/packages/zine/)

docs/release_notes/2022.6.1-alpha.md docs/release_notes/2022.7.1-alpha.md

@@ -1,4 +1,4 @@
-# Release 2022.6.1-alpha
+# Release 2022.7.1-alpha
 
 This is a complete rework of Patchfox. I've outlined the challenges and decisions regarding the future of Patchfox in [Patchfox reborn as a desktop app](https://andregarzia.com/2022/05/Patchfox-reborn-as-a-desktop-app.html). 
 

electron-builder.config.js

@@ -124,12 +124,12 @@ module.exports = {
     publisherName: AUTHOR,
   },
 
-  nsis: {
-    artifactName: "${name}-${version}-windows-${arch}-nsis-installer.${ext}",
-    oneClick: false,
-    perMachine: false,
-    include: path.join(__dirname, "scripts", "installer.nsh"),
-  },
+  // nsis: {
+  //   artifactName: "${name}-${version}-windows-${arch}-nsis-installer.${ext}",
+  //   oneClick: false,
+  //   perMachine: false,
+  //   include: path.join(__dirname, "scripts", "installer.nsh"),
+  // },
 
   // Publish options -----------------------------------------------------------
   publish: {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "patchfox",
-  "version": "2022.6.1-alpha",
+  "version": "2022.7.1-alpha",
   "repository": {
     "url": "https://github.com/soapdog/patchfox"
   },
@@ -104,10 +104,11 @@
     "css": "npx tailwindcss -i ./ui/assets/css/patchfox.css -o ./ui/assets/css/tailwind.css",
     "pack": "electron-builder --config electron-builder.config.js --dir",
     "dist": "electron-builder --config electron-builder.config.js",
-    "build:windows": "electron-builder build --config electron-builder.config.js --win",
-    "build:linux": "electron-builder build --config electron-builder.config.js --linux",
-    "build:mac": "electron-builder build --config electron-builder.config.js --mac",
-    "build": "run-s css docs build:*",
-    "docs": "node scripts/copy-package-docs.js"
+    "builder:windows": "electron-builder build --config electron-builder.config.js --win",
+    "builder:linux": "electron-builder build --config electron-builder.config.js --linux",
+    "builder:mac": "electron-builder build --config electron-builder.config.js --mac",
+    "build": "run-s css docs",
+    "docs": "node scripts/copy-package-docs.js",
+    "localbuild": "run-s build builder:*"
   }
 }

ui/assets/css/tailwind.css

@@ -4163,9 +4163,6 @@ div img.is-image-from-blob {
 }
 
 @media (min-width: 1024px) {
-  .lg\:p-10 {
-    padding: 2.5rem;
-  }
 }
 
 @media (min-width: 1280px) {

ui/packages/launcher/launcher.js

@@ -7,7 +7,7 @@ patchfox.package({
   system: true,
   view: LauncherView,
   menu: {
-    group: "Patchfox",
+    group: "Application",
     items: [
       {
         label: "Launcher",

ui/packages/settings/settings.js

@@ -7,7 +7,7 @@ patchfox.package({
   icon: "icon.svg",
   view,
   menu: {
-    group: "Patchfox",
+    group: "Application",
     label: "Settings",
     items: [
       {

ui/packages/system/system.js

@@ -14,7 +14,7 @@ patchfox.package({
   httpAuth: HttpAuth,
   menu: [
     {
-      group: "Patchfox",
+      group: "Application",
       label: "System",
       items: [
         {