Bump version to 2.0.0

This lets you choose the custom page to load when you start the app.

.github/workflows/build.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
 
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v4

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
 
     steps:
       - name: Checkout code
-        uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
+        uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4
 
       - name: Install Node.js, NPM and Yarn
         uses: actions/setup-node@v4

.yarnrc.yml

@@ -1,3 +1,3 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.1.1.cjs
+yarnPath: .yarn/releases/yarn-4.2.1.cjs

README.md

@@ -40,6 +40,8 @@
     - [Installation on Ubuntu/Debian based distributions](#installation-on-ubuntudebian-based-distributions)
     - [Installation on Red Hat/Fedora based distributions](#installation-on-red-hatfedora-based-distributions)
     - [Installation on Arch Linux based distributions](#installation-on-arch-linux-based-distributions)
+    - [Installation on Void Linux](#installation-on-void-linux)
+      - [Maintained by: @xHyroM](#maintained-by-xhyrom)
     - [Installation on Gentoo Linux (Unmaintained)](#installation-on-gentoo-linux-unmaintained)
 - [💻 Developing Locally](#-developing-locally)
 - [📃 MIT License](#-mit-license)
@@ -61,9 +63,10 @@ Supported Platforms
 3. Ubuntu/Debian based distributions (DEB File)
 4. Red Hat Linux/Fedora based distributions (RPM File)
 5. Arch Linux based distributions (Uploaded on AUR)
-6. Gentoo Linux (Unofficial overlay) **[MAINTAINER NEEDED]**
-7. All Distributions supporting AppImage (AppImage File); and
-8. All Distributions supporting Snap (Uploaded on Snap Store)
+6. Void Linux (Maintained by: [@xHyroM](https://github.com/xHyroM))
+7. Gentoo Linux (Unofficial overlay) **[MAINTAINER NEEDED]**
+8. All Distributions supporting AppImage (AppImage File); and
+9. All Distributions supporting Snap (Uploaded on Snap Store)
 
 # List of Features
 
@@ -163,6 +166,29 @@ For Installing in Red Hat/Fedora based distribution :-
 
 4. Wait for it to install and tada! The app is installed.
 
+### Installation on Void Linux
+#### Maintained by: [@xHyroM](https://github.com/xHyroM)
+
+1. In order to install the package, create a new .conf file in the /etc/xbps.d directory containing the repository URL:
+
+    ```bash
+    $ sudo nano /etc/xbps.d/99-xhyrom-dev.conf
+
+    repository=https://void-repo.xhyrom.dev
+    ```
+
+2. Synchronize the repository and import the RSA key:
+
+    ```bash
+    sudo xbps-install -S
+    ```
+
+3. Install the package:
+   
+    ```bash
+    sudo xbps-install -S ms-365-electron
+    ```
+
 ### Installation on Gentoo Linux (Unmaintained)
 
 _Maintainer needed_

app/main.js

@@ -1,74 +1,68 @@
-const { app, Menu, BrowserWindow, dialog, nativeImage } = require("electron");
-const { autoUpdater } = require("electron-updater");
-const checkInternetConnected = require("check-internet-connected");
-const ElectronDl = require("electron-dl");
-const contextMenu = require("electron-context-menu");
-const path = require("path");
-const log = require("electron-log");
-const { setActivity, loginToRPC, clearActivity } = require("./rpc");
-const useragents = require("./useragents.json");
-const { ElectronBlocker } = require("@cliqz/adblocker-electron");
-const { getValue } = require("./store");
-const { menulayout } = require("./menu");
+import { app, Menu, BrowserWindow, dialog, nativeImage } from "electron";
+import { clearActivity, setActivity, loginToRPC } from './rpc.js';
+import { initialize, trackEvent } from "@aptabase/electron/main";
+import { ElectronBlocker } from "@cliqz/adblocker-electron";
+import { getValue } from './store.js';
+import { fileURLToPath } from 'url';
+import { dirname } from 'path';
+import { join } from "path";
 
-log.transports.file.level = "verbose";
-console.log = log.log;
-Object.assign(console, log.functions);
+import Windows from "./useragents.json" with { type: "json" };
+import checkInternetConnected from "check-internet-connected";
+import contextMenu from "electron-context-menu";
+import updaterpkg from "electron-updater";
+import ElectronDl from "electron-dl";
+import menulayout from './menu.js'
+import logpkg from 'electron-log';
+
+const { transports, log: _log, functions } = logpkg;
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const { autoUpdater } = updaterpkg;
+
+transports.file.level = "verbose";
+console.log = _log;
+Object.assign(console, functions);
+
+initialize("A-US-2528580917");
 
 function createWindow() {
-  if (getValue("enterprise-or-normal") === "https://microsoft365.com/?auth=1") {
-    var win = new BrowserWindow({
-      width: 1181,
-      height: 670,
-      icon: path.join(__dirname, "/assets/icons/png/1024x1024.png"),
-      show: false,
-      webPreferences: {
-        nodeIntegration: true,
-        devTools: true,
-        partition: "persist:personal",
-      },
-    });
-  } else if (
-    getValue("enterprise-or-normal") === "https://microsoft365.com/?auth=2"
-  ) {
-    var win = new BrowserWindow({
-      width: 1181,
-      height: 670,
-      icon: path.join(__dirname, "/assets/icons/png/1024x1024.png"),
-      show: false,
-      webPreferences: {
-        nodeIntegration: true,
-        devTools: true,
-        partition: "persist:work",
-      },
-    });
-  }
-
-  if (getValue("autohide-menubar") === "true") {
-    win.setAutoHideMenuBar(true);
-  } else {
-    win.setAutoHideMenuBar(false);
-  }
+  const enterpriseOrNormal = getValue("enterprise-or-normal");
+  const custompage = getValue("custompage");
+  const partition = enterpriseOrNormal === "?auth=1" ? "persist:personal" : "persist:work";
+  
+  const win = new BrowserWindow({
+    width: 1181,
+    height: 670,
+    icon: join(__dirname, "/assets/icons/png/1024x1024.png"),
+    show: false,
+    webPreferences: {
+      nodeIntegration: true,
+      devTools: true,
+      partition: partition,
+    },
+  });  
+  
+  win.setAutoHideMenuBar(getValue("autohide-menubar") === "true");
 
   const splash = new BrowserWindow({
     width: 810,
     height: 610,
     transparent: true,
     frame: false,
-    icon: path.join(__dirname, "/assets/icons/png/1024x1024.png"),
+    icon: join(__dirname, "/assets/icons/png/1024x1024.png"),
   });
 
   splash.loadURL(`https://agam778.github.io/MS-365-Electron/loading`);
-  win.loadURL(
-    `${getValue("enterprise-or-normal") || "https://microsoft365.com/?auth=1"}`,
-    {
-      userAgent: getValue("useragentstring") || useragents.Windows,
-    }
-  );
+
+  win.loadURL(`https://microsoft365.com/${custompage}/${enterpriseOrNormal}`, {
+    userAgent: getValue("useragentstring") || Windows,
+  });
 
   win.webContents.on("did-finish-load", () => {
     splash.destroy();
     win.show();
+    trackEvent("app_started");
     if (getValue("discordrpcstatus") === "true") {
       setActivity(`On "${win.webContents.getTitle()}"`);
     }
@@ -143,7 +137,7 @@ app.on("web-contents-created", (event, contents) => {
           `On "${BrowserWindow.getFocusedWindow().webContents.getTitle()}"`
         );
       }
-      return { action: "allow" };
+      return { action: "allow", overrideBrowserWindowOptions: { width: 1081, height: 610 } };
     }
   });
   contents.on("did-finish-load", () => {
@@ -159,11 +153,11 @@ app.on("web-contents-created", (event, contents) => {
         ) {
           if (process.platform === "darwin") {
             app.dock.setIcon(
-              path.join(__dirname, "../assets/icons/apps/powerpoint-mac.png")
+              join(__dirname, "../assets/icons/apps/powerpoint-mac.png")
             );
           } else if (process.platform === "win32") {
             let nimage = nativeImage.createFromPath(
-              path.join(__dirname, "../assets/icons/apps/powerpoint.png")
+              join(__dirname, "../assets/icons/apps/powerpoint.png")
             );
             BrowserWindow.getAllWindows().forEach((window) => {
               window.setOverlayIcon(nimage, "PowerPoint");
@@ -179,11 +173,11 @@ app.on("web-contents-created", (event, contents) => {
         ) {
           if (process.platform === "darwin") {
             app.dock.setIcon(
-              path.join(__dirname, "../assets/icons/apps/word-mac.png")
+              join(__dirname, "../assets/icons/apps/word-mac.png")
             );
           } else if (process.platform === "win32") {
             let nimage = nativeImage.createFromPath(
-              path.join(__dirname, "../assets/icons/apps/word.png")
+              join(__dirname, "../assets/icons/apps/word.png")
             );
             BrowserWindow.getAllWindows().forEach((window) => {
               window.setOverlayIcon(nimage, "Word");
@@ -199,11 +193,11 @@ app.on("web-contents-created", (event, contents) => {
         ) {
           if (process.platform === "darwin") {
             app.dock.setIcon(
-              path.join(__dirname, "../assets/icons/apps/excel-mac.png")
+              join(__dirname, "../assets/icons/apps/excel-mac.png")
             );
           } else if (process.platform === "win32") {
             let nimage = nativeImage.createFromPath(
-              path.join(__dirname, "../assets/icons/apps/excel.png")
+              join(__dirname, "../assets/icons/apps/excel.png")
             );
             BrowserWindow.getAllWindows().forEach((window) => {
               window.setOverlayIcon(nimage, "Excel");
@@ -219,11 +213,11 @@ app.on("web-contents-created", (event, contents) => {
         ) {
           if (process.platform === "darwin") {
             app.dock.setIcon(
-              path.join(__dirname, "../assets/icons/apps/outlook-mac.png")
+              join(__dirname, "../assets/icons/apps/outlook-mac.png")
             );
           } else if (process.platform === "win32") {
             let nimage = nativeImage.createFromPath(
-              path.join(__dirname, "../assets/icons/apps/outlook.png")
+              join(__dirname, "../assets/icons/apps/outlook.png")
             );
             BrowserWindow.getAllWindows().forEach((window) => {
               window.setOverlayIcon(nimage, "Outlook");
@@ -239,11 +233,11 @@ app.on("web-contents-created", (event, contents) => {
         ) {
           if (process.platform === "darwin") {
             app.dock.setIcon(
-              path.join(__dirname, "../assets/icons/apps/onedrive-mac.png")
+              join(__dirname, "../assets/icons/apps/onedrive-mac.png")
             );
           } else if (process.platform === "win32") {
             let nimage = nativeImage.createFromPath(
-              path.join(__dirname, "../assets/icons/apps/onedrive.png")
+              join(__dirname, "../assets/icons/apps/onedrive.png")
             );
             BrowserWindow.getAllWindows().forEach((window) => {
               window.setOverlayIcon(nimage, "OneDrive");
@@ -256,11 +250,11 @@ app.on("web-contents-created", (event, contents) => {
         ) {
           if (process.platform === "darwin") {
             app.dock.setIcon(
-              path.join(__dirname, "../assets/icons/apps/teams-mac.png")
+              join(__dirname, "../assets/icons/apps/teams-mac.png")
             );
           } else if (process.platform === "win32") {
             let nimage = nativeImage.createFromPath(
-              path.join(__dirname, "../assets/icons/apps/teams.png")
+              join(__dirname, "../assets/icons/apps/teams.png")
             );
             BrowserWindow.getAllWindows().forEach((window) => {
               window.setOverlayIcon(nimage, "Teams");
@@ -273,11 +267,11 @@ app.on("web-contents-created", (event, contents) => {
         ) {
           if (process.platform === "darwin") {
             app.dock.setIcon(
-              path.join(__dirname, "../assets/icons/apps/onenote-mac.png")
+              join(__dirname, "../assets/icons/apps/onenote-mac.png")
             );
           } else if (process.platform === "win32") {
             let nimage = nativeImage.createFromPath(
-              path.join(__dirname, "../assets/icons/apps/onenote.png")
+              join(__dirname, "../assets/icons/apps/onenote.png")
             );
             BrowserWindow.getAllWindows().forEach((window) => {
               window.setOverlayIcon(nimage, "OneNote");
@@ -294,6 +288,27 @@ app.on("web-contents-created", (event, contents) => {
         }
       }
     }
+    contents.insertCSS(
+      `
+      ::-webkit-scrollbar {
+        width: 8px;
+        height: 8px;
+      }
+
+      ::-webkit-scrollbar-track {
+        background: transparent;
+      }
+
+      ::-webkit-scrollbar-thumb {
+        background: transparent;
+        border-radius: 5px;
+      }
+
+      ::-webkit-scrollbar-thumb:hover {
+        background: #555;
+      }      
+      `
+    );
   });
 });
 

app/menu.js

@@ -1,20 +1,21 @@
-const useragents = require("./useragents.json");
-const {
-  app,
-  dialog,
-  BrowserWindow,
-  ShareMenu,
-  clipboard,
-} = require("electron");
-const axios = require("axios");
-const { clearActivity, setActivity } = require("./rpc");
-const { shell } = require("electron");
-const { autoUpdater } = require("electron-updater");
-const { ElectronBlocker } = require("@cliqz/adblocker-electron");
-const fetch = require("cross-fetch");
-const openAboutWindow = require("about-window").default;
-const path = require("path");
-const { getValue, setValue, getValueOrDefault } = require("./store");
+import { app, dialog, BrowserWindow, ShareMenu, clipboard } from "electron";
+import { getValue, setValue, getValueOrDefault } from './store.js';
+import { ElectronBlocker } from "@cliqz/adblocker-electron";
+import { clearActivity, setActivity } from './rpc.js';
+import { fileURLToPath } from 'url';
+import { shell } from "electron";
+import { dirname } from 'path';
+
+import useragents from "./useragents.json" with { type: "json" }
+import updaterpkg from "electron-updater";
+import fetch from "cross-fetch";
+import axios from "axios";
+import path from "path";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const { autoUpdater } = updaterpkg;
+
 
 async function checkForUpdates() {
   try {
@@ -65,12 +66,10 @@ async function checkForUpdates() {
 }
 
 async function openExternalLink(url) {
-  const { shell } = require("electron");
   await shell.openExternal(url);
 }
 
 async function openLogsFolder() {
-  const { shell } = require("electron");
   if (process.platform === "win32") {
     await shell.openPath(
       "C:\\Users\\" +
@@ -102,7 +101,7 @@ function setUserAgent(useragent) {
   }
 }
 
-getValueOrDefault("enterprise-or-normal", "https://microsoft365.com/?auth=1");
+getValueOrDefault("enterprise-or-normal", "?auth=1");
 getValueOrDefault("websites-in-new-window", "true");
 getValueOrDefault("autohide-menubar", "false");
 getValueOrDefault("useragentstring", useragents.Windows);
@@ -110,6 +109,16 @@ getValueOrDefault("discordrpcstatus", "false");
 getValueOrDefault("blockadsandtrackers", "false");
 getValueOrDefault("dynamicicons", "true");
 getValueOrDefault("autoupdater", "true");
+getValueOrDefault("custompage", "home");
+
+// temporary code to change the value of enterprise-or-normal to the new values for the update, will be removed in the next update.
+if (getValue("enterprise-or-normal") === "https://microsoft365.com/?auth=1") {
+  setValue("enterprise-or-normal", "?auth=1");
+} else if (
+  getValue("enterprise-or-normal") === "https://microsoft365.com/?auth=2"
+) {
+  setValue("enterprise-or-normal", "?auth=2");
+}
 
 const menulayout = [
   ...(process.platform === "darwin"
@@ -119,19 +128,10 @@ const menulayout = [
           submenu: [
             {
               label: "About MS-365-Electron",
-              click: () => {
-                openAboutWindow({
-                  icon_path: path.join(__dirname, "../assets/about.png"),
-                  product_name: "MS-365-Electron",
-                  copyright:
-                    "Copyright (c) 2021-2023 Agampreet Singh\nMicrosoft 365, the name, website, images/icons\nare the intellectual properties of Microsoft.",
-                  package_json_dir: __dirname + "/../",
-                  bug_report_url:
-                    "https://github.com/agam778/MS-365-Electron/issues/",
-                  bug_link_text: "Report an issue",
-                  adjust_window_size: "2",
-                  show_close_button: "Close",
-                });
+              click: async () => {
+                await openExternalLink(
+                  "https://github.com/agam778/MS-365-Electron"
+                );
               },
             },
             {
@@ -142,14 +142,6 @@ const menulayout = [
               },
             },
             { type: "separator" },
-            {
-              label: "Learn More",
-              click: async () => {
-                await openExternalLink(
-                  "https://github.com/agam778/MS-365-Electron"
-                );
-              },
-            },
             {
               label: "Open Logs Folder",
               click: async () => {
@@ -166,7 +158,7 @@ const menulayout = [
                   click() {
                     setValue(
                       "enterprise-or-normal",
-                      "https://microsoft365.com/?auth=1"
+                      "?auth=1"
                     );
                     dialog.showMessageBoxSync({
                       type: "info",
@@ -178,7 +170,7 @@ const menulayout = [
                   },
                   checked:
                     getValue("enterprise-or-normal") ===
-                    "https://microsoft365.com/?auth=1",
+                    "?auth=1",
                 },
                 {
                   label: "Open MS 365 with Work/School Account",
@@ -186,7 +178,7 @@ const menulayout = [
                   click() {
                     setValue(
                       "enterprise-or-normal",
-                      "https://microsoft365.com/?auth=2"
+                      "?auth=2"
                     );
                     dialog.showMessageBoxSync({
                       type: "info",
@@ -198,7 +190,7 @@ const menulayout = [
                   },
                   checked:
                     getValue("enterprise-or-normal") ===
-                    "https://microsoft365.com/?auth=2",
+                    "?auth=2",
                 },
                 { type: "separator" },
                 {
@@ -232,6 +224,72 @@ const menulayout = [
                   checked: getValue("websites-in-new-window") === "false",
                 },
                 { type: "separator" },
+                {
+                  label: "Custom Home Page",
+                  submenu: [
+                    {
+                      label: "Home (Default)",
+                      type: "radio",
+                      click: () => {
+                        setValue("custompage", "home");
+                        dialog.showMessageBoxSync({
+                          type: "info",
+                          title: "Custom Home Page",
+                          message:
+                            "You have set the home page to the default home page. Please restart the app to apply the changes.",
+                          buttons: ["OK"],
+                        });
+                      },
+                      checked: getValue("custompage") === "home",
+                    },
+                    {
+                      label: "Create",
+                      type: "radio",
+                      click: () => {
+                        setValue("custompage", "create");
+                        dialog.showMessageBoxSync({
+                          type: "info",
+                          title: "Custom Home Page",
+                          message:
+                            "You have set the home page to the \"Create\" page. Please restart the app to apply the changes.",
+                          buttons: ["OK"],
+                        });
+                      },
+                      checked: getValue("custompage") === "create",
+                    },
+                    {
+                      label: "My Content",
+                      type: "radio",
+                      click: () => {
+                        setValue("custompage", "mycontent");
+                        dialog.showMessageBoxSync({
+                          type: "info",
+                          title: "Custom Home Page",
+                          message:
+                            "You have set the home page to the \"My Content\" page. Please restart the app to apply the changes.",
+                          buttons: ["OK"],
+                        });
+                      },
+                      checked: getValue("custompage") === "mycontent",
+                    },
+                    {
+                      label: "Apps",
+                      type: "radio",
+                      click: () => {
+                        setValue("custompage", "apps");
+                        dialog.showMessageBoxSync({
+                          type: "info",
+                          title: "Custom Home Page",
+                          message:
+                            "You have set the home page to the \"Apps\" page. Please restart the app to apply the changes.",
+                          buttons: ["OK"],
+                        });
+                      },
+                      checked: getValue("custompage") === "apps",
+                    },
+                  ],
+                },
+                { type: "separator" },
                 {
                   label: "Enable Discord RPC",
                   type: "checkbox",
@@ -336,13 +394,15 @@ const menulayout = [
                         message: "Ads and trackers will no longer be blocked.",
                         buttons: ["OK"],
                       });
-                      ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then(
-                        (blocker) => {
-                          blocker.disableBlockingInSession(
-                            BrowserWindow.getFocusedWindow().webContents.session
-                          );
+                      ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then((blocker) => {
+                        BrowserWindow.getAllWindows().forEach(window => {
+                            blocker.disableBlockingInSession(window.webContents.session);
+                        });
+                    }).catch((error) => {
+                        if (error.message !== "Trying to disable blocking which was not enabled") {
+                          console.error(error);
                         }
-                      );
+                      });
                       return;
                     }
                     if (
@@ -350,11 +410,10 @@ const menulayout = [
                       getValue("blockadsandtrackers") === undefined
                     ) {
                       setValue("blockadsandtrackers", "true");
-                      ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then(
-                        (blocker) => {
-                          blocker.enableBlockingInSession(
-                            BrowserWindow.getFocusedWindow().webContents.session
-                          );
+                      ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then((blocker) => {
+                        BrowserWindow.getAllWindows().forEach(window => {
+                            blocker.enableBlockingInSession(window.webContents.session);
+                        })
                           dialog.showMessageBoxSync({
                             type: "info",
                             title: "Block Ads and Trackers",
@@ -429,19 +488,10 @@ const menulayout = [
           submenu: [
             {
               label: "About MS-365-Electron",
-              click: () => {
-                openAboutWindow({
-                  icon_path: path.join(__dirname, "../assets/about.png"),
-                  product_name: "MS-365-Electron",
-                  copyright:
-                    "Copyright (c) 2021-2023 Agampreet Singh\nMicrosoft 365, the name, website, images/icons\nare the intellectual properties of Microsoft.",
-                  package_json_dir: __dirname + "/../",
-                  bug_report_url:
-                    "https://github.com/agam778/MS-365-Electron/issues/",
-                  bug_link_text: "Report an issue",
-                  adjust_window_size: "2",
-                  show_close_button: "Close",
-                });
+              click: async () => {
+                await openExternalLink(
+                  "https://github.com/agam778/MS-365-Electron"
+                );
               },
             },
             {
@@ -451,14 +501,6 @@ const menulayout = [
               },
             },
             { type: "separator" },
-            {
-              label: "Learn More",
-              click: async () => {
-                await openExternalLink(
-                  "https://github.com/agam778/MS-365-Electron"
-                );
-              },
-            },
             {
               label: "Open Logs Folder",
               click: async () => {
@@ -472,7 +514,7 @@ const menulayout = [
               click() {
                 setValue(
                   "enterprise-or-normal",
-                  "https://microsoft365.com/?auth=1"
+                  "?auth=1"
                 );
                 dialog.showMessageBoxSync({
                   type: "info",
@@ -484,7 +526,7 @@ const menulayout = [
               },
               checked:
                 getValue("enterprise-or-normal") ===
-                "https://microsoft365.com/?auth=1",
+                "?auth=1",
             },
             {
               label: "Open MS 365 with Work/School Account",
@@ -492,7 +534,7 @@ const menulayout = [
               click() {
                 setValue(
                   "enterprise-or-normal",
-                  "https://microsoft365.com/?auth=2"
+                  "?auth=2"
                 );
                 dialog.showMessageBoxSync({
                   type: "info",
@@ -504,7 +546,7 @@ const menulayout = [
               },
               checked:
                 getValue("enterprise-or-normal") ===
-                "https://microsoft365.com/?auth=2",
+                "?auth=2",
             },
             { type: "separator" },
             {
@@ -538,6 +580,72 @@ const menulayout = [
               checked: getValue("websites-in-new-window") === "false",
             },
             { type: "separator" },
+            {
+              label: "Custom Home Page",
+              submenu: [
+                {
+                  label: "Home (Default)",
+                  type: "radio",
+                  click: () => {
+                    setValue("custompage", "home");
+                    dialog.showMessageBoxSync({
+                      type: "info",
+                      title: "Custom Home Page",
+                      message:
+                        "You have set the home page to the default home page. Please restart the app to apply the changes.",
+                      buttons: ["OK"],
+                    });
+                  },
+                  checked: getValue("custompage") === "home",
+                },
+                {
+                  label: "Create",
+                  type: "radio",
+                  click: () => {
+                    setValue("custompage", "create");
+                    dialog.showMessageBoxSync({
+                      type: "info",
+                      title: "Custom Home Page",
+                      message:
+                        "You have set the home page to the \"Create\" page. Please restart the app to apply the changes.",
+                      buttons: ["OK"],
+                    });
+                  },
+                  checked: getValue("custompage") === "create",
+                },
+                {
+                  label: "My Content",
+                  type: "radio",
+                  click: () => {
+                    setValue("custompage", "mycontent");
+                    dialog.showMessageBoxSync({
+                      type: "info",
+                      title: "Custom Home Page",
+                      message:
+                        "You have set the home page to the \"My Content\" page. Please restart the app to apply the changes.",
+                      buttons: ["OK"],
+                    });
+                  },
+                  checked: getValue("custompage") === "mycontent",
+                },
+                {
+                  label: "Apps",
+                  type: "radio",
+                  click: () => {
+                    setValue("custompage", "apps");
+                    dialog.showMessageBoxSync({
+                      type: "info",
+                      title: "Custom Home Page",
+                      message:
+                        "You have set the home page to the \"Apps\" page. Please restart the app to apply the changes.",
+                      buttons: ["OK"],
+                    });
+                  },
+                  checked: getValue("custompage") === "apps",
+                },
+              ],
+            },
+            { type: "separator" },
             {
               label: "Enable Discord RPC",
               type: "checkbox",
@@ -642,13 +750,15 @@ const menulayout = [
                     message: "Ads and trackers will no longer be blocked.",
                     buttons: ["OK"],
                   });
-                  ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then(
-                    (blocker) => {
-                      blocker.disableBlockingInSession(
-                        BrowserWindow.getFocusedWindow().webContents.session
-                      );
+                  ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then((blocker) => {
+                    BrowserWindow.getAllWindows().forEach(window => {
+                        blocker.disableBlockingInSession(window.webContents.session);
+                    });
+                }).catch((error) => {
+                    if (error.message !== "Trying to disable blocking which was not enabled") {
+                      console.error(error);
                     }
-                  );
+                  });
                   return;
                 }
                 if (
@@ -656,11 +766,10 @@ const menulayout = [
                   getValue("blockadsandtrackers") === undefined
                 ) {
                   setValue("blockadsandtrackers", "true");
-                  ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then(
-                    (blocker) => {
-                      blocker.enableBlockingInSession(
-                        BrowserWindow.getFocusedWindow().webContents.session
-                      );
+                  ElectronBlocker.fromPrebuiltAdsAndTracking(fetch).then((blocker) => {
+                    BrowserWindow.getAllWindows().forEach(window => {
+                        blocker.enableBlockingInSession(window.webContents.session);
+                    })
                       dialog.showMessageBoxSync({
                         type: "info",
                         title: "Block Ads and Trackers",
@@ -735,7 +844,7 @@ const menulayout = [
               partition: "persist:personal",
             },
           });
-          newWindow.loadURL("https://microsoft365.com/?auth=1");
+          newWindow.loadURL(`https://microsoft365.com/${getValue("custompage")}/?auth=1`);
         },
       },
       {
@@ -751,7 +860,7 @@ const menulayout = [
               partition: "persist:work",
             },
           });
-          newWindow.loadURL("https://microsoft365.com/?auth=2");
+          newWindow.loadURL(`https://microsoft365.com/${getValue("custompage")}/?auth=2`);
         },
       },
       { type: "separator" },
@@ -881,7 +990,7 @@ const menulayout = [
         click: () => {
           if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=2"
+            "?auth=2"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let wordwindow = new BrowserWindow({
@@ -901,7 +1010,7 @@ const menulayout = [
             }
           } else if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=1"
+            "?auth=1"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let wordwindow = new BrowserWindow({
@@ -927,7 +1036,7 @@ const menulayout = [
         click: () => {
           if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=2"
+            "?auth=2"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let excelwindow = new BrowserWindow({
@@ -949,7 +1058,7 @@ const menulayout = [
             }
           } else if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=1"
+            "?auth=1"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let excelwindow = new BrowserWindow({
@@ -977,7 +1086,7 @@ const menulayout = [
         click: () => {
           if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=2"
+            "?auth=2"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let powerpointwindow = new BrowserWindow({
@@ -999,7 +1108,7 @@ const menulayout = [
             }
           } else if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=1"
+            "?auth=1"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let powerpointwindow = new BrowserWindow({
@@ -1027,7 +1136,7 @@ const menulayout = [
         click: () => {
           if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=2"
+            "?auth=2"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let outlookwindow = new BrowserWindow({
@@ -1047,7 +1156,7 @@ const menulayout = [
             }
           } else if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=1"
+            "?auth=1"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let outlookwindow = new BrowserWindow({
@@ -1075,7 +1184,7 @@ const menulayout = [
         click: () => {
           if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=2"
+            "?auth=2"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let onedrivewindow = new BrowserWindow({
@@ -1097,7 +1206,7 @@ const menulayout = [
             }
           } else if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=1"
+            "?auth=1"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let onedrivewindow = new BrowserWindow({
@@ -1125,7 +1234,7 @@ const menulayout = [
         click: () => {
           if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=2"
+            "?auth=2"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let onenotewindow = new BrowserWindow({
@@ -1147,7 +1256,7 @@ const menulayout = [
             }
           } else if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=1"
+            "?auth=1"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let onenotewindow = new BrowserWindow({
@@ -1173,7 +1282,7 @@ const menulayout = [
         click: () => {
           if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=2"
+            "?auth=2"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let allappswindow = new BrowserWindow({
@@ -1193,7 +1302,7 @@ const menulayout = [
             }
           } else if (
             getValue("enterprise-or-normal") ===
-            "https://microsoft365.com/?auth=1"
+            "?auth=1"
           ) {
             if (getValue("websites-in-new-window") === "true") {
               let allappswindow = new BrowserWindow({
@@ -1262,4 +1371,5 @@ const menulayout = [
     ],
   },
 ];
-module.exports = { menulayout };
+
+export default menulayout;

app/rpc.js

@@ -1,12 +1,12 @@
-const { Client } = require("@xhayper/discord-rpc");
-const { dialog, BrowserWindow } = require("electron");
-const { setValue } = require("./store");
+import { dialog, BrowserWindow } from "electron";
+import { Client } from "@xhayper/discord-rpc";
+import { setValue } from "./store.js";
 
 const client = new Client({
   clientId: "942637872530460742",
 });
 
-async function rpcError(status) {
+export async function rpcError(status) {
   const rpcerror = dialog.showMessageBoxSync(BrowserWindow.getFocusedWindow(), {
     type: "error",
     title: "Discord RPC Error",
@@ -19,14 +19,14 @@ async function rpcError(status) {
   }
 }
 
-async function clearActivity() {
+export async function clearActivity() {
   await client.user?.clearActivity().catch((err) => {
     rpcError("clearing");
     console.error(err);
   });
 }
 
-async function setActivity(details) {
+export async function setActivity(details) {
   if (!client.user) {
     await loginToRPC();
   }
@@ -43,15 +43,9 @@ async function setActivity(details) {
     });
 }
 
-async function loginToRPC() {
+export async function loginToRPC() {
   await client.login().catch((err) => {
     rpcError("logging into");
     console.error(err);
   });
 }
-
-module.exports = {
-  clearActivity,
-  setActivity,
-  loginToRPC,
-};

app/store.js

@@ -1,15 +1,15 @@
-const Store = require("electron-store");
+import Store from "electron-store";
 const store = new Store();
 
-function getValue(key) {
+export function getValue(key) {
   return store.get(key);
 }
 
-function setValue(key, value) {
+export function setValue(key, value) {
   store.set(key, value);
 }
 
-function getValueOrDefault(key, defaultValue) {
+export function getValueOrDefault(key, defaultValue) {
   const value = store.get(key);
   if (value === undefined) {
     store.set(key, defaultValue);
@@ -17,5 +17,3 @@ function getValueOrDefault(key, defaultValue) {
   }
   return value;
 }
-
-module.exports = { getValue, setValue, getValueOrDefault };

app/useragents.json

@@ -1,5 +1,5 @@
 {
-  "Windows": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
-  "macOS": "Mozilla/5.0 (Macintosh; Intel Mac OS X 14_4_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36",
-  "Linux": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"
+  "Windows": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+  "macOS": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36",
+  "Linux": "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36"
 }

docs/loading/index.html

@@ -1,19 +1,6 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <script
-      async
-      src="https://www.googletagmanager.com/gtag/js?id=G-THHP5S04GF"
-    ></script>
-    <script>
-      window.dataLayer = window.dataLayer || [];
-      function gtag() {
-        dataLayer.push(arguments);
-      }
-      gtag("js", new Date());
-
-      gtag("config", "G-THHP5S04GF");
-    </script>
     <meta charset="UTF-8" />
     <title>Loading MS-365-Electron</title>
     <link

package.json

@@ -1,8 +1,9 @@
 {
   "name": "ms-365-electron",
-  "version": "1.2.0",
+  "version": "2.0.0",
+  "type": "module",
   "description": "Unofficial Microsoft 365 Web Desktop Wrapper made with Electron",
-  "main": "app/main.js",
+  "main": "./app/main.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/agam778/MS-365-Electron.git"
@@ -66,23 +67,23 @@
   },
   "license": "MIT",
   "devDependencies": {
-    "electron": "^29.0.0",
+    "electron": "^30.0.0",
     "electron-builder": "^24.6.3",
-    "eslint": "^8.45.0"
+    "eslint": "^9.0.0"
   },
   "dependencies": {
+    "@aptabase/electron": "^0.3.1",
     "@cliqz/adblocker-electron": "^1.26.6",
     "@xhayper/discord-rpc": "^1.0.21",
-    "about-window": "^1.15.2",
     "axios": "^1.4.0",
     "check-internet-connected": "^2.0.6",
     "cross-fetch": "^4.0.0",
-    "electron-context-menu": "^3.6.1",
-    "electron-dl": "^3.5.0",
+    "electron-context-menu": "^4.0.0",
+    "electron-dl": "^4.0.0",
     "electron-log": "^5.0.0-beta.25",
-    "electron-store": "^8.1.0",
+    "electron-store": "^9.0.0",
     "electron-updater": "^6.1.4",
     "node-gyp": "^10.0.0"
   },
-  "packageManager": "yarn@4.1.1"
+  "packageManager": "yarn@4.2.1"
 }