From d8ada0956377f54ed89c87c4c393f1e2312885f9 Mon Sep 17 00:00:00 2001
From: Quentin Legot <legotquentin@gmail.com>
Date: Fri, 3 Sep 2021 17:39:13 +0200
Subject: [PATCH] Added icon on menubar + updated style of login content

---
 launcher.json                     | 70 -------------------------------
 src/client/assets/css/login.css   |  4 +-
 src/client/assets/css/menubar.css |  8 ++++
 src/client/index.html             |  1 +
 src/client/login.html             |  1 +
 src/server/main.js                |  3 +-
 6 files changed, 15 insertions(+), 72 deletions(-)
 delete mode 100644 launcher.json

diff --git a/launcher.json b/launcher.json
deleted file mode 100644
index a8fe133..0000000
--- a/launcher.json
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-    "chapters": [
-        {
-            "title": "Chapitre 1",
-            "description": "Egypte",
-            "minecraftVersion": "1.16.5",
-            "type": "release",
-            "customVersion": "fabric-loader-0.11.3-1.16.5",
-            "modspack": {
-                "mods": [
-                    "https://www.dropbox.com/s/ww6a052nzzgojdm/modpack.zip?dl=1",
-                    "https://www.dropbox.com/s/rn72wq0qxd5xk8a/building-blocks-1.0.0.zip?dl=1",
-                    "https://www.dropbox.com/s/ty7ry9dr8m81upv/worldedit-mod-7.2.5-dist.zip?dl=1"
-                ],
-                "sha1sum": [ 
-                    "97de8fab9a1a3448fcded5dd33b0d3b879e1caa2",
-                    "a9ff83d9e8c814d6393a8b4c9e610dda5b952195",
-                    "d00de0e4b4d2e9a2130119282a5ce3391d6e0537"
-                ]
-            },
-            "java": {
-                "platform": {
-                    "win32": {
-                        "x64": {
-                            "name": "jdk8u292-b10-jre",
-                            "link": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x64_windows_hotspot_8u292b10.zip",
-                            "sha256sum": "df79660dbc00687928d870d5f9ac91d5dfdd69be2131d5b4b2457b77fc486f54"
-                        },
-                        "ia32": {
-                            "name": "jdk8u292-b10-jre",
-                            "link": "https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u292-b10/OpenJDK8U-jre_x86-32_windows_hotspot_8u292b10.zip",
-                            "sha256sum": "ee1c52c109bb5b05acb3304f9a9494de01ee7e9a95f33e16627ea916e0f48a2f"
-                        }
-                    }
-                }
-            }
-        },
-        {
-            "title": "Dev",
-            "description": "Dev",
-            "minecraftVersion": "21w19a",
-            "type": "snapshot",
-            "customVersion": "fabric-loader-0.11.3-21w19a",
-            "modspack": {
-                "mods": [
-                    "https://www.dropbox.com/s/dcs3euf1l6xs6er/dev.zip?dl=1"
-                ],
-                "sha1sum": [ 
-                    "5ba97cf05d43250bd94210ad085f8ff2278c55be"
-                ]
-            },
-            "java": {
-                "platform": {
-                    "win32": {
-                        "x64": {
-                            "name": "jdk-16.0.1+9-jre",
-                            "link": "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x64_windows_hotspot_16.0.1_9.zip",
-                            "sha256sum": "169b7975e01bd6573062d29a5f2a1c7c4b659ada9de69c4a63328f2936d0f3f9"
-                        },
-                        "ia32": {
-                            "name": "jdk-16.0.1+9-jre",
-                            "link" : "https://github.com/AdoptOpenJDK/openjdk16-binaries/releases/download/jdk-16.0.1%2B9/OpenJDK16U-jre_x86-32_windows_hotspot_16.0.1_9.zip",
-                            "sha256sum" : "b58fa948e50d1822c50bf45cc34e58eaf4018e0ae41d0221746313077ac336fe"
-                        }
-                    }
-                }
-            }
-        }
-    ]
-}
diff --git a/src/client/assets/css/login.css b/src/client/assets/css/login.css
index b2b38af..91d27f2 100644
--- a/src/client/assets/css/login.css
+++ b/src/client/assets/css/login.css
@@ -26,7 +26,8 @@ body{
     top:50%;
     left:50%;
     transform: translate(-50%, -50%);
-    background-color: white;
+    background: linear-gradient(70deg, #AE6826, 15%, #DFA74D, 85%, #AE6826);
+    border-radius: 5px;
     padding: 8px;
 }
 
@@ -49,6 +50,7 @@ body{
     background-color: white;
     border: 1px solid lightgrey;
     transition: background 0.1s linear, border 0.2s;
+    border-radius: 3px;
     cursor: pointer;
 }
 
diff --git a/src/client/assets/css/menubar.css b/src/client/assets/css/menubar.css
index a5dd079..5cc61b8 100644
--- a/src/client/assets/css/menubar.css
+++ b/src/client/assets/css/menubar.css
@@ -1,4 +1,5 @@
 *, *::after, *::before {
+	user-select: none;
 	-webkit-user-select: none;
 	/*-webkit-user-drag: none; */
 }
@@ -13,6 +14,7 @@
 	color:white;
 	cursor: move;
 	-webkit-app-region: drag;
+	user-select: none;
 	-webkit-user-select: none;
 	z-index: 100;
 }
@@ -26,6 +28,12 @@
 	float:left;
 }
 
+.left > img {
+	padding-left: 15px;
+	height: 28px;
+	width: auto;
+}
+
 #menubar .right{
 	float: right;
 	-webkit-app-region: no-drag;
diff --git a/src/client/index.html b/src/client/index.html
index 8b5f349..ebb48d6 100644
--- a/src/client/index.html
+++ b/src/client/index.html
@@ -12,6 +12,7 @@
 <body>
 	<div id="menubar">
         <ul class="left">
+            <img src="../../icon.ico">
         </ul>
         <ul class="right">
             <!-- Mettre ce code en ligne pour éviter que chrome ne met un espace automatiquement entre les éléments -->
diff --git a/src/client/login.html b/src/client/login.html
index 50f4247..40ccd6c 100644
--- a/src/client/login.html
+++ b/src/client/login.html
@@ -12,6 +12,7 @@
 <body>
     <div id="menubar">
         <ul class="left">
+            <img src="../../icon.ico">
         </ul>
         <ul class="right">
             <!-- Mettre ce code en ligne pour éviter que chrome ne met un espace automatiquement entre les éléments -->
diff --git a/src/server/main.js b/src/server/main.js
index 393fb01..d4cf973 100644
--- a/src/server/main.js
+++ b/src/server/main.js
@@ -27,8 +27,9 @@ function createWindow () {
         contextIsolation: false
         },
         frame: false,
+        nativeWindowOpen: true
     })
-    // Menu.setApplicationMenu(null)
+    Menu.setApplicationMenu(null)
     win.loadFile('src/client/login.html')
     win.on("close", () => {
         app.quit()