clean up work

johnuberbacher · Aug 30, 2023 · 73fd7c3 · 73fd7c3
1 parent 577a9ea
commit 73fd7c3
Show file tree

Hide file tree

Showing 18 changed files with 131 additions and 236 deletions.
diff --git a/.gitignore b/.gitignore
@@ -38,6 +38,8 @@ bower_components
 # Compiled binary addons (https://nodejs.org/api/addons.html)
 build/Release
 release/
+dist/
+dist-electron/
 
 # Dependency directories
 node_modules/
@@ -90,8 +92,6 @@ out
 
 # Nuxt.js build / generate output
 .nuxt
-dist
-dist-electron
 
 # Gatsby files
 .cache/

diff --git a/dist-electron/main/index.js b/dist-electron/main/index.js
diff --git a/dist-electron/main/index.js.map b/dist-electron/main/index.js.map
diff --git a/dist-electron/preload/index.js b/dist-electron/preload/index.js
diff --git a/electron-builder.json b/electron-builder.json
diff --git a/electron/main/index.js b/electron/main/index.js
@@ -41,7 +41,7 @@ const store = new Store();
 let win = null;
 const preload = join(__dirname, "../preload/index.js");
 const url = process.env.VITE_DEV_SERVER_URL;
-const indexHtml = join(process.env.DIST, "index.html");
+const indexHtml = join(process.env.PUBLIC, "index.html");
 
 async function createWindow() {
   win = new BrowserWindow({
@@ -66,7 +66,6 @@ async function createWindow() {
       nodeIntegration: true,
       contextIsolation: false,
       enableRemoteModule: true,
-      devTools: false,
     },
   });
 

diff --git a/index.html b/index.html
@@ -2,7 +2,6 @@
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
-    <link rel="icon" type="image/svg+xml" href="/logo.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline';" />
     <title>Discord Bot Messenger</title>

diff --git a/package.json b/package.json
@@ -6,18 +6,6 @@
   "author": "John Uberbacher",
   "license": "MIT",
   "private": true,
-  "keywords": [
-    "electron",
-    "rollup",
-    "vite",
-    "vue3",
-    "vue"
-  ],
-  "debug": {
-    "env": {
-      "VITE_DEV_SERVER_URL": "http://127.0.0.1:3344/"
-    }
-  },
   "scripts": {
     "dev": "vite",
     "build": "vite build && electron-builder",
@@ -26,6 +14,40 @@
     "app:dist": "electron-builder",
     "postinstall": "electron-builder install-app-deps"
   },
+  "build": {
+    "productName": "Discord Bot Messenger",
+    "appId": "com.johnuberbacher.discordbotmessenger",
+    "asar": true,
+    "directories": {
+      "output": "release/${version}"
+    },
+    "mac": {
+      "artifactName": "${productName}.${ext}",
+      "target": [
+        "dmg"
+      ]
+    },
+    "win": {
+      "target": [
+        "portable", "zip"
+      ],
+      "icon": "public/favicon.ico",
+      "artifactName": "${productName}.${ext}",
+      "executableName": "Discord Bot Messenger"
+    },
+    "nsis": {
+      "shortcutName": "Discord Bot Messenger",
+      "oneClick": true,
+      "perMachine": false,
+      "allowToChangeInstallationDirectory": true,
+      "createStartMenuShortcut": true,
+      "deleteAppDataOnUninstall": false,
+			"installerIcon": "public/favicon.ico",
+			"uninstallerIcon": "public/favicon.ico",
+			"uninstallDisplayName": "Uninstall",
+			"license": "public/license.txt"
+    }
+  },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.1.0",
     "electron": "^25.0.1",

diff --git a/src/assets/discord-bot-messenger.png → public/assets/discord-bot-messenger.png b/src/assets/discord-bot-messenger.png → public/assets/discord-bot-messenger.png
diff --git a/src/assets/fonts/gg_sans_Bold.ttf → public/assets/fonts/gg_sans_Bold.ttf b/src/assets/fonts/gg_sans_Bold.ttf → public/assets/fonts/gg_sans_Bold.ttf
diff --git a/src/assets/fonts/gg_sans_Medium.ttf → public/assets/fonts/gg_sans_Medium.ttf b/src/assets/fonts/gg_sans_Medium.ttf → public/assets/fonts/gg_sans_Medium.ttf
diff --git a/src/assets/fonts/gg_sans_Normal.ttf → public/assets/fonts/gg_sans_Normal.ttf b/src/assets/fonts/gg_sans_Normal.ttf → public/assets/fonts/gg_sans_Normal.ttf
diff --git a/src/assets/fonts/gg_sans_Semibold.ttf → public/assets/fonts/gg_sans_Semibold.ttf b/src/assets/fonts/gg_sans_Semibold.ttf → public/assets/fonts/gg_sans_Semibold.ttf
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/LICENSE → public/license.txt b/LICENSE → public/license.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2023 johnuberbacher
+Copyright (c) 2023 John Uberbacher
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/src/App.vue b/src/App.vue
@@ -76,7 +76,6 @@ const messageSent = () => {
 
 // Function to connect to the Discord bot
 const connectToDiscordBot = async () => {
-  console.log("Fetching bot token from store...");
   botToken.value = store.get("discordBotTokenStorage");
 
   try {
@@ -101,8 +100,6 @@ const connectToDiscordBot = async () => {
           name: channel.name,
         }));
 
-      console.log(channels.value);
-
       connectedToBot.value = true;
     });
   } catch (error) {

diff --git a/src/components/Window.vue b/src/components/Window.vue
@@ -5,7 +5,7 @@
         <div
           class="bot-avatar"
           style="
-            background-image: url('./src/assets/discord-bot-messenger.png');
+            background-image: url('/assets/discord-bot-messenger.png');
           "
           :style="{ backgroundImage: `url(${props.botAvatar})` }">
           <div class="bot-status" :class="{ active: selectedGuild }"></div>
@@ -103,7 +103,7 @@
         </div>
       </div>
     </form>
-    <div>
+    <div class="footer">
       Discord Bot Messenger is a fan-made service created by John Uberbacher.
       This app is not affiliated with or endorsed by Discord, and no ownership
       or rights are claimed.