model-manager 0.0.3-1.0 → 0.0.5

package/administration/test_data.js

@@ -9,38 +9,38 @@
     //     console.log("1 document inserted");
     //     client.db.close();
     //   });
-    // // });
+    // });
 
-    // const { MongoClient, ServerApiVersion } = require('mongodb');
-    // const uri = "mongodb+srv://adminmn:eQJ62Cszrvi7VgD@mnmodeldatabase.zsxqn.mongodb.net/myFirstDatabase?retryWrites=true&w=majority";
-    // const client = new MongoClient(uri, { useNewUrlParser: true, useUnifiedTopology: true, serverApi: ServerApiVersion.v1 });
+    const { MongoClient, ServerApiVersion } = require('mongodb');
+    const uri = "mongodb+srv://adminmn:eQJ62Cszrvi7VgD@mnmodeldatabase.zsxqn.mongodb.net/myFirstDatabase?retryWrites=true&w=majority";
+    const client = new MongoClient(uri, { useNewUrlParser: true, useUnifiedTopology: true, serverApi: ServerApiVersion.v1 });
   
-    // const database = client.db("modeldatabase");
-    // const models = database.collection("models");
+    const database = client.db("modeldatabase");
+    const models = database.collection("models");
 
-    // client.connect(err => {
-    //     if (err) throw err;
+    client.connect(err => {
+        if (err) throw err;
 
-    //     models.deleteMany();
+        models.deleteMany();
 
-    //     var modelobj1 = {released: true, model_name: "Diamond Pickaxe", model_creator: "Prisemut", model_path: "./models/bird.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"], tags: ["test", "template"]}
-    //     var modelobj2 = {released: true, model_name: "Diamond Sword", model_creator: "Prisemut", model_path: "./models/jellyfish.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
-    //     var modelobj3 = {released: true, model_name: "Airplane", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
-    //     var modelobj4 = {released: true, model_name: "Jet", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
-    //     var modelobj5 = {released: true, model_name: "Jeep", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
-    //     var modelobj6 = {released: true, model_name: "Guy", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
-    //     var modelobj7 = {released: true, model_name: "Woman", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
-    //     models.insertOne(modelobj1);
-    //     models.insertOne(modelobj2);
-    //     models.insertOne(modelobj3);
-    //     models.insertOne(modelobj4);
-    //     models.insertOne(modelobj5);
-    //     models.insertOne(modelobj6);
-    //     models.insertOne(modelobj7);
+        var modelobj1 = {released: true, model_name: "Diamond Pickaxe", model_creator: "Prisemut", model_path: "./models/bird.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"], tags: ["test", "template"]}
+        var modelobj2 = {released: true, model_name: "Diamond Sword", model_creator: "Prisemut", model_path: "./models/jellyfish.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
+        var modelobj3 = {released: true, model_name: "Airplane", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
+        var modelobj4 = {released: true, model_name: "Jet", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
+        var modelobj5 = {released: true, model_name: "Jeep", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
+        var modelobj6 = {released: true, model_name: "Guy", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
+        var modelobj7 = {released: true, model_name: "Woman", model_creator: "Prisemut", model_path: "./models/stone_golem.geo.gltf", thumbnail: "./imgs/testing.png", has_anims: true, has_behavior: true, has_textures: true, animations: ["idle","walk"], behavior: ["hostile mob", "aggressive mob"], textures: ["red", "blue", "green", "orange", "yellow"],  tags: ["test", "template"]}
+        models.insertOne(modelobj1);
+        models.insertOne(modelobj2);
+        models.insertOne(modelobj3);
+        models.insertOne(modelobj4);
+        models.insertOne(modelobj5);
+        models.insertOne(modelobj6);
+        models.insertOne(modelobj7);
 
-    //     models.find().forEach( function(item) {
-    //         item.animations.forEach(function (item,index) {
-    //             console.log(item)
-    //         });
-    //     });
-    // });
+        models.find().forEach( function(item) {
+            item.animations.forEach(function (item,index) {
+                console.log(item)
+            });
+        });
+    });

package/administration.html

@@ -4,16 +4,14 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
     <link href="./assets/css/basic.css" rel="stylesheet">
-    <link href="./assets/css/dialog_admin.css" rel="stylesheet">
     <link href="./assets/css/admin.css" rel="stylesheet">
-    <title>Administration</title>
   </head>
   <body>
 
 
     <section id="head">
       <div class="drag-field-head">
-        <p class="drag-field-text">ModelManager</p>
+        <p class="drag-field-text">MN-Modelstore</p>
       </div>
       <div class="win-btn">
         <a class="btn-win" id="close-button">
@@ -54,35 +52,15 @@
     <section id="main-content">
       <div class="admin-content">
         <div class="div2">
-          <div class="order_list">
-            <h2>Current orders:</h2>
-            <ul id="order-listing">
-              <div id="loading">
-                <h3 id="loading-text">loading...</h3>
-                <img id="loading-image" src="assets/spinner_2.gif" alt="Loading..." width="70px"/>
-              </div>
-              
-            </ul>
-          </div>
+          <button>Create</button>
+        </div>
+        <div class="div3">
+          <button>Create</button>
         </div>
       </div>
-
     </section>
-        
-    <!--Popup renderer-->
-    <div id="body-overlay"></div>
-    <div class="dialog" id="dialog">  
-      <a href="#" role="button" class="dialog-close-button" id="dialog-close-button">
-        <image src="assets/white/close_white_24dp.svg"> </image>
-      </a>
-      <pre id="item-listing">
-        <h1>Items:</h1>
-      </pre>
-    </div>
-
-
+    
     <script>
-
       document.getElementById("close-button").addEventListener('click', event => {
         window.api.send("toMain", "closeWindow");
       });
@@ -92,58 +70,7 @@
       document.getElementById("home-side").onclick = function () {
         location.href = "./index_admin.html";
       };
-
-      var ul = document.getElementById('order-listing'); 
-      ul.addEventListener('click', function(e) {
-          if (e.target.tagName === 'LI'){
-            var target = e.target; // Clicked element
-            document.getElementById("dialog").classList.add("visable");
-            document.getElementById("body-overlay").classList.add("visable");
-
-            var items = document.createElement('code')
-            var splitted_text = target.dataset.item_obj.split(",")
-
-            for (item in splitted_text) {
-                items.innerHTML = items.innerHTML + "\n" + splitted_text[item]
-            }
-            
-
-            var h1 = document.createElement('h1')
-            h1.innerHTML = "Items ordered:"
-            document.getElementById("item-listing").innerHTML = ""
-            document.getElementById("item-listing").appendChild(h1)
-            document.getElementById("item-listing").appendChild(items)
-          }
-      });
- 
-      document.getElementById('body-overlay').addEventListener('click', function(e) {
-          document.getElementById("dialog").classList.remove("visable");
-          document.getElementById("body-overlay").classList.remove("visable");
-      });
-
-
-      document.getElementById('dialog-close-button').addEventListener('click', function(e) {
-          document.getElementById("dialog").classList.remove("visable");
-          document.getElementById("body-overlay").classList.remove("visable");
-      });
-
-      document.onkeydown = function(evt) {
-          evt = evt || window.event;
-          var isEscape = false;
-          if ("key" in evt) {
-              isEscape = (evt.key === "Escape" || evt.key === "Esc");
-          } else {
-              isEscape = (evt.keyCode === 27);
-          }
-          if (isEscape) {
-              document.getElementById("dialog").classList.remove("visable");
-              document.getElementById("body-overlay").classList.remove("visable");
-          }
-      };
-      
-
     </script>
-    <script src="js/load_admin.js"></script>
     
   </body>
 </html>

package/assets/css/admin.css

@@ -3,7 +3,7 @@
     -webkit-backdrop-filter: blur(25px) saturate(0%);
     background-color: #2C2F33;
     border-radius: 12px;
-    border: 1px solid #ffffff20;
+    border: 1px solid rgba(255, 255, 255, 0.125);
     width: 20%;
     height: 17%;
     position: relative;
@@ -51,13 +51,13 @@
     position:relative;
 }
 .div2 { 
-    grid-area: 1 / 1 / 6 / 7; 
+    grid-area: 1 / 1 / 6 / 4; 
     background-color: #2C2F33; 
     position: relative;
     border-radius: 15px;
 }
 .div3 { 
-    grid-area: 1 / 4 / 3 / 6; 
+    grid-area: 1 / 4 / 5 / 6; 
     background-color: #2C2F33;
     position: relative; 
     border-radius: 15px;
@@ -69,179 +69,11 @@ button {
     font-size: 15px;
     background: linear-gradient(348deg, #5353e6 0%, #5199b6 48%, #0ebcdf 85%); 
     border-radius: 25px;
-    height: 10%;
-    width: 20%;
+    height: 5%;
+    width: 15%;
     border: 0px;
     filter: drop-shadow(0 0 20px #121212);
     position: absolute;
     bottom: 1%;
     right: 1%;
-}
-
-.order_list {
-    width: 90%;
-    height: 90%;
-    margin: 0 auto;
-    padding: 10px;
-    position: relative;
-}
-
-ul {
-    list-style-type: none;
-    overflow:hidden; overflow-y:scroll;
-    width: 100%;
-    height: 95%;
-}
-li {
-    border-bottom: #5353e6 1px solid;
-    background: #2C2F33;
-    padding: 15px;
-    margin: 15px;
-    font-style: normal;
-    word-spacing: 38px;
-    border-radius: 25px;
-    filter: drop-shadow(0 0 4px #181818);
-}
-
-li:hover {
-    animation-name: hoverfadeli;
-    animation-duration: 0.3s;
-    animation-fill-mode: forwards;
-    border-radius: 25px;
-}
-
-@keyframes hoverfadeli {
-    from {
-        background: #2C2F33;
-    }
-    to {
-        background: #5a5d5e41;
-    }
-}
-
-
-
-::-webkit-scrollbar {
-    width: 7px;
-    height: 10px;
-}
-
-::-webkit-scrollbar-track {
-    background-color: #2C2F33;
-}
-
-::-webkit-scrollbar-thumb {
-    background: linear-gradient(348deg, #5353e6 0%, #5199b6 48%, #0ebcdf 85%); 
-}
-
-::-webkit-scrollbar-thumb {
-    background-color: #d6dee1;
-    border-radius: 20px;
-}
-::-webkit-scrollbar-thumb:hover {
-    background-color: #a8bbbf;
-}
-
-li a {
-    position: relative;
-    float: right;
-    border-radius: 55px;
-    transform: translateY(-20%);
-    width: 6%;
-}
-li a img {
-    transform: translateX(10%);
-    height: 80%;
-    width: 80%;
-}
-
-li a:hover {
-    animation-name: hoverfade;
-    animation-duration: 0.2s;
-    animation-fill-mode: forwards;
-}
-@keyframes hoverfade {
-    from {
-        opacity: 100%;
-    }
-    to{
-        opacity: 10%;
-    }
-}
-
-/* For large screens */
-@media only screen and (max-width: 1500px) {
-    li {
-        border-bottom: #5353e6 1px solid;
-        background: #2C2F33;
-        padding: 15px;
-        margin: 15px;
-        font-style: normal;
-        word-spacing: 22px;
-        border-radius: 25px;
-        filter: drop-shadow(0 0 4px #181818);
-    }
-    li a img {
-        transform: translateX(10%);
-        height: 80%;
-        width: 80%;
-    }
-}
-
-@media only screen and (min-width: 1501px) {
-    li {
-        border-bottom: #5353e6 1px solid;
-        background: #2C2F33;
-        padding: 15px;
-        margin: 15px;
-        font-style: normal;
-        word-spacing: 38px;
-        border-radius: 25px;
-        filter: drop-shadow(0 0 4px #181818);
-    }
-    li a img {
-        transform: translateX(10%);
-        height: 50%;
-        width: 50%;
-    }
-}
-
-
-input {
-    padding: 15px;
-    margin: 15px;
-    font-style: normal;
-    word-spacing: 38px;
-    border-radius: 25px;
-    font-size: 15px;
-    appearance: none;
-    display: inline-block;
-    background: #4e4f50;
-    border: 1px solid #4e4f50;
-    border-top: 1px solid #4e4f50;
-    box-sizing: border-box;
-    border-radius: 25px;
-    width: 80%;
-    color: #c2c2c2;
-    outline: none;
-}
-
-#loading {
-    pointer-events: none;
-    position: fixed;
-    display: block;
-    width: 100%;
-    height: 80%;
-    top: 0;
-    left: 0;
-    text-align: center;
-    opacity: 0.7;
-    z-index: 99;
-}
-
-p {
-    font-size: 20px;
-    font-style: italic;
-    margin: 14px;
-    margin-left: 20px;
 }

package/assets/css/checkout.css

@@ -22,7 +22,7 @@ ul {
 }
 
 li {
-    border-bottom: #5353e6 1px solid;
+    border-bottom: #242629 1px solid;
     padding: 15px;
     margin: 15px;
 }

package/assets/css/dialog_checkout.css

@@ -19,7 +19,7 @@
     padding: 10px;
     border-radius: 5px;
     width: 60%;
-    background-color: #2d3034;
+    background-color: rgb(45, 48, 52);
     z-index: 1000001;
     opacity: 0;
     pointer-events: none;
@@ -153,25 +153,4 @@
 }
 .control-checkbox input:checked + .control_indicator::before {
     animation-name: s-ripple-dup;
-}
-
-::-webkit-scrollbar {
-    width: 7px;
-    height: 10px;
-}
-
-::-webkit-scrollbar-track {
-    background-color: #2d3034;
-}
-
-::-webkit-scrollbar-thumb {
-    background: linear-gradient(348deg, #5353e6 0%, #5199b6 48%, #0ebcdf 85%); 
-}
-
-::-webkit-scrollbar-thumb {
-    background-color: #d6dee1;
-    border-radius: 20px;
-}
-::-webkit-scrollbar-thumb:hover {
-    background-color: #a8bbbf;
 }

package/checkout.html

@@ -5,14 +5,13 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
     <link href="assets/css/checkout.css" rel="stylesheet">
     <link href="assets/css/dialog_checkout.css" rel="stylesheet">
-    <title>Checkout</title>
   </head>
   <body>
 
 
     <section id="head">
       <div class="drag-field-head">
-        <p class="drag-field-text">ModelManager</p>
+        <p class="drag-field-text">MN-Modelstore [a0.1]</p>
       </div>
       <div class="win-btn">
         <a class="btn-win" id="close-button">

package/checkout_admin.html

@@ -5,14 +5,13 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
     <link href="assets/css/checkout.css" rel="stylesheet">
     <link href="assets/css/dialog_checkout.css" rel="stylesheet">
-    <title>Checkout</title>
   </head>
   <body>
 
 
     <section id="head">
       <div class="drag-field-head">
-        <p class="drag-field-text">ModelManager</p>
+        <p class="drag-field-text">MN-Modelstore [a0.1]</p>
       </div>
       <div class="win-btn">
         <a class="btn-win" id="close-button">

package/index.html

@@ -5,14 +5,13 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
     <link href="./assets/css/basic.css" rel="stylesheet">
     <link href="./assets/css/dialog.css" rel="stylesheet">
-    <title>Browse</title>
   </head>
   <body>
 
 
     <section id="head">
       <div class="drag-field-head">
-        <p class="drag-field-text">ModelManager</p>
+        <p class="drag-field-text">MN-Modelstore</p>
       </div>
       <div class="win-btn">
         <a class="btn-win" id="close-button">

package/index_admin.html

@@ -5,14 +5,13 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0"/>
     <link href="./assets/css/basic.css" rel="stylesheet">
     <link href="./assets/css/dialog.css" rel="stylesheet">
-    <title>Browse</title>
   </head>
   <body>
 
 
     <section id="head">
       <div class="drag-field-head">
-        <p class="drag-field-text">ModelManager</p>
+        <p class="drag-field-text">MN-Modelstore</p>
       </div>
       <div class="win-btn">
         <a class="btn-win" id="close-button">

package/js/load_items.js

@@ -248,7 +248,20 @@ window.api.receive('item_channel', function (data, evt) {
         const controls = new OrbitControls(camera,renderer.domElement);
   
 
-       
+        function resizeCanvasToDisplaySize() {
+          const canvas = renderer.domElement;
+          const width = canvas.clientWidth;
+          const height = canvas.clientHeight;
+          if (canvas.width !== width ||canvas.height !== height) {
+            // you must pass false here or three.js sadly fights the browser
+            renderer.setSize(width, height, false);
+            camera.aspect = width / height;
+            camera.updateProjectionMatrix();
+        
+            // set render target sizes here
+          }
+        }
+
   
         camera.position.y = 1;
         camera.position.x = 3;

package/login.html

@@ -1,10 +1,12 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
+  <!-- Design by foolishdeveloper.com -->
+    <title>Glassmorphism login Form Tutorial in html css</title>
+ 
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css">
     <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;500;600&display=swap" rel="stylesheet">
-    <title>Login</title>
     <!--Stylesheet-->
     <style media="screen">
       *,
@@ -259,10 +261,10 @@ button > span {
         window.api.receive('login_response', function (data, evt) {
             if (data == "n") {
               document.getElementById("alert").classList.remove("invis")
-            } else if (data == "y-0") {
+            } else if (data = "y-0") {
               location.href = "./index_admin.html";
               window.api.send("change_window", input)
-            } else if (data == "y-1") {
+            } else if (data = "y-1") {
               location.href = "./index.html";
               window.api.send("change_window", input)
             }

package/main.js

@@ -1,18 +1,10 @@
 const path = require('path')
-// todo: need to remove this before compiling the software
+// // todo: need to remove this before compiling the software
 // require('electron-reload')(__dirname, {
 //   electron: path.join(__dirname, 'node_modules', '.bin', 'electron')
 // });
 const { app, BrowserWindow, ipcMain, dialog } = require('electron');
-// const { autoUpdater } = require('electron-updater')
-
-const { autoUpdater } = require('electron-github-autoupdater')
-
-autoUpdater({
-  owner: "Mine-North",
-  repo: "Mine-North-Model-Tool",
-  accessToken: "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"
-})
+const { autoUpdater } = require('electron-updater')
 
 var cart = [];
 var logged_user;
@@ -36,7 +28,7 @@ const loginWindow = () => {
       preload: path.join(__dirname, 'preload.js')
     }
   })
-  win.webContents.openDevTools(true)
+  // win.webContents.openDevTools(true)
   win.loadURL(`file://${__dirname}/login.html`)
 
   ipcMain.on("change_window", (event, args) => {
@@ -44,7 +36,7 @@ const loginWindow = () => {
     createWindow();
   });
   
-  // autoUpdater.checkForUpdates();
+  autoUpdater.checkForUpdates();
 }
 
 
@@ -93,24 +85,12 @@ ipcMain.on("toMain", (event, args) => {
     const database = client.db("modeldatabase");
     const orders = database.collection("orders");
 
-    // lets clean the order array first
-    var final_cart = cart.filter(function(item, pos, self) {
-        return self.indexOf(item) == pos;
-    })
-
     client.connect(err => {
       if (err) {
         event.sender.send('order_response', "error")
         throw err
       }
-
-      var existing_order = 0;
-      // count existing orders
-      orders.find().forEach( function(item) {
-        existing_order++;
-      });
-
-      var modelobj1 = {order_by: logged_user, orders: final_cart, order_number: existing_order+1}
+      var modelobj1 = {order_by: logged_user, orders: cart}
       orders.insertOne(modelobj1);
       cart = [];
       event.sender.send('order_response', "success")
@@ -157,7 +137,6 @@ ipcMain.on("database_request", (event, args) => {
   const database = client.db("modeldatabase");
   const models = database.collection("models");
   const users = database.collection("users");
-  const orders = database.collection("orders");
 
   if(args == "rqID") {
     client.connect(err => {
@@ -244,42 +223,6 @@ ipcMain.on("database_request", (event, args) => {
       });
     }); 
   }
-
-  if (args == "rq_orderdata") {
-    client.connect(err => {
-      var data = []
-      var count = 0;
-      orders.find().forEach( function(item) {
-        data = []
-        var order_number = item.order_number
-        var orderer = item.order_by
-        var orders = item.orders
-        count = count+1;
-        data.push({
-          order_number,
-          orderer,
-          orders
-        })
-        event.sender.send('admin_channel', data)
-        if (count == 1) {
-          event.sender.send('renderer', "stop-spinner")
-        }
-        client.close();
-      });
-    }); 
-  }
-
-  if (args.includes("delete_order")) {
-    var splitted_data = args.split(":")
-    var order_id = splitted_data[1];
-
-    client.connect(err => {
-      console.log("looking to delete order number " + order_id);
-      orders.deleteOne({ order_number: parseInt(order_id) });
-      
-      event.sender.send('renderer', "reload_side")
-    });
-  }
 });
 
 
@@ -303,4 +246,32 @@ ipcMain.on("storage_request", (event, args) => {
 
 ipcMain.on("cart_request", (event, args) => {
   event.sender.send("cart_answer", cart)
+});
+
+
+
+// auto updater
+autoUpdater.on("update-available", (_event, releaseNotes, releaseName) => {
+  const dialogOpts = {
+    type: 'info',
+    buttons: ['Ok'],
+    title: 'Application Update',
+    message: process.platform === "win32" ? releaseNotes : releaseName,
+    detail: 'A new version is being downloaded.'
+  }
+  dialog.showMessageBox(dialogOpts, (response) => {
+  });
+});
+
+autoUpdater.on("update-downloaded", (_event, releaseNotes, releaseName) => {
+  const dialogOpts = {
+    type: 'info',
+    buttons: ['Restart'],
+    title: 'Application Update',
+    message: process.platform === "win32" ? releaseNotes : releaseName,
+    detail: 'A new version has been downloaded. You need to restart the tool!'
+  }
+  dialog.showMessageBox(dialogOpts).then((returnValue) => {
+    if (returnValue.response === 0) autoUpdater.quitAndInstall()
+  });
 });

package/package.json

@@ -1,18 +1,23 @@
 {
   "name": "model-manager",
-  "version": "0.0.31.0",
+  "version": "0.0.5",
   "main": "main.js",
-  "license": "ISC",
+  "license": null,
   "scripts": {
     "start": "electron .",
     "publish": "electron-builder --win --publish always"
   },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/Mine-North/Mine-North-Model-Tool"
+  },
   "keywords": [],
   "author": "Tristan H.",
   "description": "A Tool for managing all model assets of Mine-North.",
   "dependencies": {
-    "electron-builder": "17.3.1",
-    "electron-is-dev": "^2.0.0",
+    "electron-json-storage": "^4.5.0",
+    "electron-storage": "^1.0.7",
+    "electron-store": "^8.0.1",
     "electron-updater": "^5.0.5",
     "mongodb": "^4.5.0",
     "swup": "^2.0.14",
@@ -21,20 +26,20 @@
   },
   "devDependencies": {
     "electron": "^19.0.8",
-    "electron-github-autoupdater": "^2.0.0",
+    "electron-builder": "^23.1.0",
     "electron-reload": "^2.0.0-alpha.1"
   },
   "build": {
-    "appId": "com.mine-north.model-manager",
+    "appId": "model-manager",
     "productName": "ModelManager",
     "win": {
       "publish": [
         {
-          "provider": "github",
-          "private": true,
-          "owner": "Mine-North",
-          "repo": "Mine-North-Model-Tool",
-          "token": "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"
+            "provider": "github",
+            "private": true,
+            "owner": " Mine-North",
+            "repo": "Mine-North-Model-Tool",
+            "token": "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"
         }
       ]
     }

package/preload.js

@@ -16,7 +16,7 @@ contextBridge.exposeInMainWorld(
             }
         },
         receive: (channel, func) => {
-            let validChannels = ["fromMain", "item_channel", "item_channel2", "data_usage", "renderer", "login_response", "storage_answer", "cart_answer", "start_app", "order_response", "admin_channel"];
+            let validChannels = ["fromMain", "item_channel", "item_channel2", "data_usage", "renderer", "login_response", "storage_answer", "cart_answer", "start_app", "order_response"];
             if (validChannels.includes(channel)) {
                 // Deliberately strip event as it includes `sender` 
                 ipcRenderer.on(channel, (event, ...args) => func(...args));

package/update.html

@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:wght@300;500;600&display=swap" rel="stylesheet">
+    <!--Stylesheet-->
+    <style media="screen">
+        body {
+            background: #1a1a1a;
+            color: whitesmoke;
+        }
+        #control {
+            -webkit-app-region: drag;
+            width: 100%;
+            height: 100vh;
+            z-index: 99;
+            top: 0;
+            left: 0;
+            position: absolute;
+            background: transparent;
+        }
+        #download {
+            position: absolute;
+            bottom: 15px;
+            width: 80%;
+            left: 10%;
+            height: 25px;
+        }
+        #download-label {
+            position: absolute;
+            top: 10vh;
+            width: 97%;
+            text-align: center;
+            font-size: 48px;
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            font-weight: 300;
+        }
+    </style>
+</head>
+<body>
+
+    <div id="control"></div>
+    <label for="download" id="download-label"></label>
+    <progress id="download" max="100" value="20"></progress>
+    <script src="./js/update.js"></script>
+    <!-- start_app -> channel to send data -->
+</body>
+</html>

package/assets/css/dialog_admin.css

@@ -1,73 +0,0 @@
-#body-overlay {
-    position: fixed;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-    background-color: rgb(24, 24, 24, 0.8);
-    z-index: 100000;
-    opacity: 0;
-    pointer-events: none;
-}
-
-.dialog {
-    height: 60%;
-    position: fixed;
-    left: 50%;
-    top: 50%;
-    transform: translate(-50%, -50%);
-    padding: 10px;
-    width: 50%;
-    background-color: #2C2F33;
-    z-index: 1000001;
-    opacity: 0;
-    pointer-events: none;
-    border-radius: 25px;
-}
-
-#body-overlay.visable, .dialog.visable {
-    opacity: 1;
-    pointer-events: auto;
-}
-
-#item-dialog {
-    width: 45%;
-}
-.dialog-close-button {
-    position: absolute;
-    top: 6px;
-    right: 8px;
-    font-size: 32px;
-    line-height: 32px;
-    text-decoration: none;
-}
-
-pre {
-    width: 80%;
-    height: 80%;
-    margin-top: 5%;
-    border-radius: 25px;
-    margin-left: 10%;
-}
-
-code {
-    font-size: 20px;
-    position: relative;
-    transform: translateX(-50%);
-}
-@media only screen and (max-width: 1500px) {
-    code {
-        font-size: 16px;
-        position: relative;
-        transform: translateX(-50%);
-    }
-}
-
-@media only screen and (min-width: 1501px) {
-    code {
-        font-size: 20px;
-        position: relative;
-        transform: translateX(-50%);
-    }
-}
-

package/assets/white/admin/check.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" fill="#ECECEC"><path d="M18.9 35.7 7.7 24.5l2.15-2.15 9.05 9.05 19.2-19.2 2.15 2.15Z"/></svg>

package/js/load_admin.js

@@ -1,32 +0,0 @@
-window.api.send("database_request", "rq_orderdata");
-
-window.api.receive('admin_channel', function (data, evt) {
-    var list = document.getElementById("order-listing")
-    var a = document.createElement('a')
-    a.id = "finish_order"
-    var img_in_a = document.createElement('img')
-    img_in_a.src = "./assets/white/admin/check.svg"
-    a.appendChild(img_in_a);
-    var newLI = document.createElement('li')
-    newLI.id = "order-item"
-    newLI.dataset.order_id = data[0].order_number
-    a.dataset.order_id = data[0].order_number
-    newLI.dataset.item_obj = data[0].orders
-    newLI.innerHTML = "Ordercode: #" + data[0].order_number + " | Orderer: " + data[0].orderer + " | Items: " + data[0].orders.length
-    newLI.appendChild(a);
-    list.appendChild(newLI);
-    document.querySelectorAll("#finish_order").forEach(function (item) {
-            item.addEventListener('click', function() {
-                window.api.send("database_request", "delete_order:" + item.dataset.order_id);
-            });
-     });
-});
-
-window.api.receive('renderer', function (data, evt) {
-    if(data == "stop-spinner") {
-        document.getElementById("loading").remove();
-    } else if (data == "reload_side") {
-        
-        location.reload()
-    } 
-});