Merge branch 'staging' of github.com:mgilangjanuar/teledrive into sta…

…ging
mgilangjanuar · May 12, 2022 · 01339ab · 01339ab
2 parents e998a1a + ba38709
commit 01339ab
Show file tree

Hide file tree

Showing 7 changed files with 1,301 additions and 1,510 deletions.
diff --git a/electron/.gitignore b/electron/.gitignore
@@ -1,4 +1,5 @@
 node_modules
 release-builds
 package-lock.json
-.DS_Store
+.DS_Store
+windowsinstaller
diff --git a/electron/config.json b/electron/config.json
@@ -0,0 +1,4 @@
+{
+  "dest": "D:/Onedrive/Documents/GitHub/teledrive/electron/windowsinstaller",
+  "icon": "assets/icons/win/icon.ico"
+}
diff --git a/electron/index.html b/electron/index.html
@@ -11,22 +11,19 @@
     />
   </head>
   <body>
-    <!-- Topbar -->
+    <!-- for later
     <div id="controls">
       <button id="home" title="Dashboard">Dashboard</button>
      
     </div>
-    <!-- End topbar -->
+ -->
 
     <!-- Webview -->
     <webview
       id="webview"
       autosize="on"
-      src="https://teledrive-web.vercel.app/startup"
-      data-home="https://teledrive-web.vercel.app/startup"
+      src="https://teledriveapp.herokuapp.com/startup"
+      data-home="https://teledriveapp.herokuapp.com/startup"
     ></webview>
-
-
-
   </body>
 </html>
diff --git a/electron/package.json b/electron/package.json
@@ -7,9 +7,9 @@
   "scripts": {
     "start": "electron .",
     "package-mac": "electron-packager . --overwrite --platform=darwin --arch=x64 --icon=assets/icons/mac/icon.icns --prune=true --out=release-builds",
-    "package-win": "electron-packager . --overwrite --asar=true --platform=win32 --arch=ia32 --icon=assets/icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"Electron Webview\"",
+    "package-win": "electron-packager . --overwrite --asar=true --platform=win32 --arch=ia32 --icon=assets/icons/win/icon.ico --prune=true --out=release-builds --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName=\"Teledrive\"",
     "package-linux": "electron-packager . --overwrite --platform=linux --arch=x64 --icon=assets/icons/png/1024x1024.png --prune=true --out=release-builds",
-    "create-installer-mac": "electron-installer-dmg ./release-builds/Electron\\ webview-darwin-x64/Electron\\ webview.app electron-webview --out=release-builds --overwrite --icon=assets/icons/mac/icon.icns"
+    "create-installer-mac": "electron-installer-dmg ./release-builds/Electron\\ webview-darwin-x64/Electron\\ webview.app teledrive --out=release-builds --overwrite --icon=assets/icons/mac/icon.icns"
   },
   "repository": "https://github.com/mgilangjanuar/teledrive",
   "keywords": [
@@ -26,6 +26,7 @@
   "devDependencies": {
     "electron": "^18.0.0",
     "electron-installer-dmg": "^3.0.0",
-    "electron-packager": "^15.5.1"
+    "electron-packager": "^15.5.1",
+    "electron-wix-msi": "^4.0.0"
   }
 }
diff --git a/electron/src/view.js b/electron/src/view.js
@@ -5,5 +5,5 @@ exports.createBrowserView = (mainWindow) => {
   const view = new BrowserView();
   mainWindow.setBrowserView(view);
   view.setBounds({ x: 0, y: 0, width: 1024, height: 768 });
-  view.webContents.loadURL("https://teledrive-web.vercel.app/startup");
+  view.webContents.loadURL("https://teledriveapp.herokuapp.com/startup");
 };