From 05f98b2738cb07a0156fccec5a330acf346f3249 Mon Sep 17 00:00:00 2001
From: Pax1601 <d.passoni92@gmail.com>
Date: Wed, 17 Jan 2024 20:14:22 +0100
Subject: [PATCH] Work on result page

---
 manager/ejs/result.ejs             | 17 +++++++++--------
 manager/ejs/wizard.ejs             |  1 -
 manager/javascripts/dcsinstance.js | 25 ++++++++++++-------------
 3 files changed, 21 insertions(+), 22 deletions(-)

diff --git a/manager/ejs/result.ejs b/manager/ejs/result.ejs
index bd5e12d1..2a3c60d8 100644
--- a/manager/ejs/result.ejs
+++ b/manager/ejs/result.ejs
@@ -4,6 +4,7 @@
         flex-direction: column;
         row-gap: 30px;
         padding: 60px 120px;
+        color: var(--offwhite);
     }
 
     #result-page .result-summary {
@@ -75,20 +76,20 @@
 </style>
 <div id="result-page">
     <div class="result-summary wait">
-        <div class="title"><img src="./icons/spinner-solid.svg">Please wait while Olympus is being added to <i><%= activeInstance["name"] %></i></div>
+        <div class="title"><img src="./icons/spinner-solid.svg" style="animation: rotate 2s linear infinite;">Please wait while Olympus is being added to <i><%= activeInstance["name"] %></i></div>
     </div>
-    <div class="result-summary success">
+    <div class="result-summary success hide">
         <div class="title"><img src="./icons/check-solid-background.svg">Olympus successfully added to <i><%= activeInstance["name"] %></i></div>
         <div class="description">See the <b>DCS Olympus Wiki</b> for more information on how to use Olympus and for troubleshooting issues. You may now close the installer.</div>
     </div>
-    <div class="result-summary error">
+    <div class="result-summary error hide">
         <div class="title"><img src="./icons/triangle-exclamation-solid-background.svg">An error occurred while adding Olympus to <i><%= activeInstance["name"] %></i></div>
         <div class="description">See the manager log located in TODO for more information.</div>
     </div>
-    <div>
+    <div style="font-size: 18px; font-weight: bold;">
         How to launch Olympus
     </div>
-    <div>
+    <div style="font-size: 13px;">
         To launch Olympus, there are shortcuts available in the DCS Olympus folder under Saved Games.
     </div>
     <div class="usage-instructions">
@@ -113,15 +114,15 @@
             </div>
         </div>
     </div>
-    <div>
+    <div style="font-size: 13px;">
         Alternatively, you can run the Olympus Client instead to replace the first two steps above.
     </div>
 
     <div class="buttons-footer">
-        <div class="button return">
+        <div class="button back" style="color: var(--offwhite); background-color: var(--background); border: 1px solid var(--offwhite);" onclick="signal('onReturnClicked')">
             Return to main menu
         </div>
-        <div class="button close">
+        <div class="button next" style="color: var(--background); background-color: var(--offwhite);" onclick="signal('onCloseManagerClicked')">
             Close manager
         </div>
     </div>
diff --git a/manager/ejs/wizard.ejs b/manager/ejs/wizard.ejs
index 38d9220d..23d4a6fe 100644
--- a/manager/ejs/wizard.ejs
+++ b/manager/ejs/wizard.ejs
@@ -68,7 +68,6 @@
         background-color: var(--background-warning);
         border-left: 5px solid var(--orange);
     }
-
 </style>
 <div class="wizard-page">
     <div class="cancel" style="font-size: 14px; font-weight: 600; color: var(--offwhite); display: flex; align-items: center; column-gap: 10px;">
diff --git a/manager/javascripts/dcsinstance.js b/manager/javascripts/dcsinstance.js
index f396a50b..b45b19dd 100644
--- a/manager/javascripts/dcsinstance.js
+++ b/manager/javascripts/dcsinstance.js
@@ -344,43 +344,42 @@ class DCSInstance {
     }
 
     /* Install this instance */
-    install() {
+    install() {        
         installHooks(getManager().getActiveInstance().folder).then(
-            () => {
-            },
+            () => {},
             (err) => {
                 return Promise.reject(err);
             }
         ).then(() => installMod(getManager().getActiveInstance().folder, getManager().getActiveInstance().name)).then(
-            () => {
-            },
+            () => {},
             (err) => {
                 return Promise.reject(err);
             }
         ).then(() => installJSON(getManager().getActiveInstance().folder)).then(
-            () => {
-            },
+            () => {},
             (err) => {
                 return Promise.reject(err);
             }
         ).then(() => applyConfiguration(getManager().getActiveInstance().folder, getManager().getActiveInstance())).then(
-            () => {
-            },
+            () => {},
             (err) => {
                 return Promise.reject(err);
             }
         ).then(() => installShortCuts(getManager().getActiveInstance().folder, getManager().getActiveInstance().name)).then(
-            () => {
-            },
+            () => {},
             (err) => {
                 return Promise.reject(err);
             }
         ).then(
             () => {
-                //getManager().resultPage.getElement()
+                getManager().resultPage.getElement().querySelector(".result-summary.wait").classList.add("hide");
+                getManager().resultPage.getElement().querySelector(".result-summary.success").classList.remove("hide");
+                getManager().resultPage.getElement().querySelector(".result-summary.error").classList.add("hide");
             },
             () => {
-                //getManager().resultPage.getElement()
+                getManager().resultPage.getElement().querySelector(".result-summary.wait").classList.add("hide");
+                getManager().resultPage.getElement().querySelector(".result-summary.success").classList.add("hide");
+                getManager().resultPage.getElement().querySelector(".result-summary.error").classList.remove("hide");
             }
         );
     }