Fixed issues with building

Untitled-Chat-App · Jul 27, 2022 · e368d72 · e368d72
1 parent 5da958a
commit e368d72
Show file tree

Hide file tree

Showing 7 changed files with 176 additions and 36 deletions.
diff --git a/package.json b/package.json
@@ -11,7 +11,9 @@
     "publish": "electron-forge publish",
     "lint": "echo \"No linting configured\"",
     "build-css": "tailwindcss build -i src/assets/tailwindcss/input.css -o src/assets/tailwindcss/styles.css --watch",
-    "build-osx": "electron-packager ./ --platform darwin --out ./dist --overwrite"
+    "build-osx": "electron-packager ./ untitled-chat-app --platform darwin --out ./dist/mac --overwrite",
+    "build-windows": "electron-packager ./ untitled-chat-app --overwrite --asar=true --platform=win32 --arch=ia32 --prune=true --out ./dist/windows --version-string.CompanyName=CE --version-string.FileDescription=CE --version-string.ProductName='Unititled Chat'",
+    "build-linux": "electron-packager ./ untitled-chat-app --overwrite --asar=true --platform=linux --arch=x64 --prune=true --out ./dist/linux"
   },
   "keywords": [],
   "author": {

diff --git a/src/html/create_room.html b/src/html/create_room.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Login</title>
+    <link rel="stylesheet" href="../assets/styles/login.css">
+</head>
+
+<body>
+    <div style="height: 15vh;"></div>
+    <div class="login-form">
+        <p id="alert" style="color: red;"></p>
+        <h1>Create new room</h1>
+        <form>
+            <label for="room_name">Room Name:</label><br>
+            <input class="text-input" type="text" id="room_name" name="room_name" placeholder="Rickrollers" required><br>
+
+            <br>
+
+            <label for="description">Room Description:</label><br>
+            <input class="text-input" type="text" id="description" name="description" placeholder="For people who like rickrolling"><br><br>
+
+            <input class="submit-button" type="submit" value="Create Room">
+        </form>
+    </div>
+
+    <script>
+        const { ipcRenderer } = require("electron");
+
+        const form = document.querySelector("form")
+
+        function submition(event) {
+            event.preventDefault();
+
+            var room_name = document.querySelector("#room_name")
+            var room_description = document.querySelector("#description")
+
+            data = {
+                room_name: room_name.value,
+                room_description: room_description.value
+            }
+
+            // Reset values
+            room_name.value = ""
+            room_description.value = ""
+
+            ipcRenderer.invoke("new-room-create:create_room", data).then((data) => {
+                const alertP = document.getElementById("alert")
+                alertP.innerHTML = data
+            });
+
+        }
+
+        form.addEventListener("submit", submition);
+    </script>
+</body>
+
+</html>
diff --git a/src/html/login.html b/src/html/login.html
@@ -64,4 +64,4 @@ <h1>Login to the app</h1>
     </script>
 </body>
 
-</html>
+</html>
diff --git a/src/html/signed_in.html b/src/html/signed_in.html
@@ -29,6 +29,12 @@ <h1>What would you like to do?</h1>
                 <span>Sign Out</span>
             </button>
         </form>
+
+        <form id="create-room-button" class="sl-button">
+            <button>
+                <span>Create Room</span>
+            </button>
+        </form>
     </div>
 
     <script>
@@ -52,6 +58,15 @@ <h1>What would you like to do?</h1>
         }
 
         form2.addEventListener("submit", submition2);
+
+        const form3 = document.querySelector("#create-room-button")
+
+        function submition3(event) {
+            event.preventDefault();
+            ipcRenderer.send("create-room:signed_in");
+        }
+
+        form3.addEventListener("submit", submition3);
     </script>
 </body>
 

diff --git a/src/index.js b/src/index.js
@@ -17,7 +17,8 @@ const {
     signupUser,
     getUserWithToken,
     updateUserDetails,
-    getRoomById
+    getRoomById,
+    createNewRoom,
 } = require("./scripts/requests");
 const {
     firstTimeUserPage,
@@ -26,6 +27,7 @@ const {
     createSignupWindow,
     createRoomWindow,
     createEnterRoomIDWindow,
+    createNewRoomWindow,
 } = require("./scripts/windows");
 const mainWindowMenuTemplate = require("./scripts/menu");
 
@@ -38,7 +40,7 @@ if (require("electron-squirrel-startup")) {
 require("dotenv").config();
 
 /* Constants */
-const API_URL = process.env.API_URL;
+const API_URL = "https://chatapi.fusionsid.xyz";
 const mainMenu = Menu.buildFromTemplate(mainWindowMenuTemplate);
 Menu.setApplicationMenu(mainMenu);
 
@@ -48,7 +50,13 @@ const store = new Store();
 global.app = app;
 
 // Define for later
-let firstTimeUserPageWindow, loginWindow, signupWindow, signedInWindow, enterRoomIDWindow, roomWindow;
+let firstTimeUserPageWindow,
+    loginWindow,
+    signupWindow,
+    signedInWindow,
+    enterRoomIDWindow,
+    roomWindow,
+    newRoomWindow;
 
 /* Electron App Events: */
 
@@ -91,9 +99,14 @@ app.on("window-all-closed", () => {
 });
 
 // If no windows are open launch one
-app.on("activate", () => {
+app.on("activate", async () => {
     if (BrowserWindow.getAllWindows().length === 0) {
-        firstTimeUserPageWindow = firstTimeUserPage();
+        let isFirstTimeUser = await checkIfFirstTimeUser();
+        if (isFirstTimeUser) {
+            signedInWindow = createSignedInWindow();
+        } else {
+            firstTimeUserPageWindow = firstTimeUserPage();
+        }
     }
 });
 
@@ -124,10 +137,7 @@ ipcMain.handle("new-login:login", async function (event, data) {
 
     store.set("private_key", privateKey);
 
-    let user = await getUserWithToken();
-    let user_id = user.id;
-
-    await updateUserDetails(user_id, "public_key", publicKey);
+    await updateUserDetails("public_key", publicKey);
 
     loginWindow.close();
     loginWindow = null;
@@ -163,45 +173,56 @@ ipcMain.on("sign-out:signed_in", async function (event) {
 ipcMain.on("join-room-window:signed_in", async function (event) {
     signedInWindow.close();
     signedInWindow = null;
-    enterRoomIDWindow = createEnterRoomIDWindow()
+    enterRoomIDWindow = createEnterRoomIDWindow();
 });
 
-
 ipcMain.handle("join-new-room:join_room", async function (event, room_id) {
     let room = null;
     try {
-        room = await getRoomById(room_id)
+        room = await getRoomById(room_id);
     } catch (e) {
-        console.log("Skill gap")
+        console.log("Skill gap");
     }
     if (room === null || room === undefined) {
-        return "Room not found (lil' dif in skill level ngl)"
+        return "Room not found (lil' dif in skill level ngl)";
     }
-    enterRoomIDWindow.close()
+    enterRoomIDWindow.close();
     enterRoomIDWindow = null;
 
-    connect_to_room(room.room_id)
+    connect_to_room(room.room_id);
 });
 
-
 // The real stuff
 async function connect_to_room(room_id) {
     let access_token = await getAccessToken(
         store.get("username"),
         store.get("password")
     );
 
-    roomWindow = createRoomWindow()
+    roomWindow = createRoomWindow();
 
     ipcMain.handle("gimme-connection:room", async function (event) {
-        let user = await getUserWithToken(access_token)
-        let room_data =  await getRoomById(room_id)
+        let user = await getUserWithToken(access_token);
+        let room_data = await getRoomById(room_id);
         data = {
             user: user,
             access_token: access_token,
             room_data: room_data,
-        }
-        return data
-    }) 
-
-}
+        };
+        return data;
+    });
+}
+
+ipcMain.on("create-room:signed_in", function (event) {
+    signedInWindow.close();
+    signedInWindow = null;
+    newRoomWindow = createNewRoomWindow();
+});
+
+ipcMain.handle("new-room-create:create_room", async function (event, data) {
+    let room_id;
+    console.log(data);
+    room = await createNewRoom(data.room_name, data.room_description);
+    room_id = room.room_id;
+    return `Room created successfully: ${room_id}`;
+});
diff --git a/src/scripts/requests.js b/src/scripts/requests.js
@@ -5,7 +5,7 @@ const { URLSearchParams } = require("url");
 
 const store = new Store();
 require("dotenv").config();
-const API_URL = process.env.API_URL;
+const API_URL = "https://chatapi.fusionsid.xyz";
 
 async function getAccessToken(username = null, password = null, admin = false) {
     let token;
@@ -38,8 +38,6 @@ async function getAccessToken(username = null, password = null, admin = false) {
 }
 
 async function signupUser(data) {
-    let access_token = await getAccessToken(null, null, (admin = true));
-
     let keys = new rsa().generateKeyPair();
     let publicKey = keys.exportKey("public");
     let privateKey = keys.exportKey("private");
@@ -51,7 +49,6 @@ async function signupUser(data) {
         method: "POST",
         headers: {
             "Content-Type": "application/json",
-            Authorization: `Bearer ${access_token}`,
         },
         body: JSON.stringify({
             username: data.username,
@@ -86,10 +83,10 @@ async function getUserWithToken(token) {
     return data;
 }
 
-async function updateUserDetails(user_id, attribute, new_value) {
-    let access_token = await getAccessToken(null, null, (admin = true));
+async function updateUserDetails(attribute, new_value) {
+    let access_token = await getAccessToken(store.get("password"), store.get("username"));
 
-    await fetch(`${API_URL}/api/users/${user_id}`, {
+    await fetch(`${API_URL}/api/user/me`, {
         method: "PATCH",
         headers: {
             "Content-Type": "application/json",
@@ -108,6 +105,28 @@ async function updateUserDetails(user_id, attribute, new_value) {
     return data;
 }
 
+async function createNewRoom(room_name, room_description=null) {
+    let access_token = await getAccessToken(store.get("username"), store.get("password"));
+
+    await fetch(`${API_URL}/api/chatroom/new`, {
+        method: "POST",
+        headers: {
+            "Content-Type": "application/json",
+            Authorization: `Bearer ${access_token}`,
+        },
+        body: JSON.stringify({
+            room_name: room_name,
+            room_description: room_description,
+        }),
+    })
+        .then((response) => response.json())
+        .then((json_data) => {
+            data = json_data;
+        });
+
+    return data;
+}
+
 async function getRoomById(room_id) {
     let access_token = await getAccessToken(
         store.get("username"),
@@ -134,6 +153,7 @@ module.exports = {
     signupUser,
     getUserWithToken,
     updateUserDetails,
+    createNewRoom,
     getRoomById,
 };
 

diff --git a/src/scripts/windows.js b/src/scripts/windows.js
@@ -8,7 +8,13 @@ Menu.setApplicationMenu(mainMenu);
 /* Window Creation */
 
 // Define for later because JS IS WEIRD AF
-let firstTimeWindow, loginWindow, signedInWindow, signupWindow, enterRoomIDWindow, roomWindow;
+let firstTimeWindow,
+    loginWindow,
+    signedInWindow,
+    signupWindow,
+    enterRoomIDWindow,
+    roomWindow,
+    newRoomWindow;
 
 // Creates first time user page, Launched if first time opening
 function firstTimeUserPage() {
@@ -27,6 +33,22 @@ function firstTimeUserPage() {
     return firstTimeWindow;
 }
 
+function createNewRoomWindow() {
+    newRoomWindow = new BrowserWindow({
+        webPreferences: {
+            contextIsolation: false,
+            nodeIntegration: true,
+        },
+        width: 1300,
+        height: 760,
+    });
+
+    // load in index.html file
+    newRoomWindow.loadFile(path.join(__dirname, "../html/create_room.html"));
+
+    return newRoomWindow;
+}
+
 function createLoginWindow() {
     loginWindow = new BrowserWindow({
         webPreferences: {
@@ -113,5 +135,6 @@ module.exports = {
     createSignedInWindow,
     createSignupWindow,
     createEnterRoomIDWindow,
-    createRoomWindow
+    createRoomWindow,
+    createNewRoomWindow
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -64,4 +64,4 @@ <h1>Login to the app</h1> @@
         </script>
     </body>
-    </html>
+    </html>