From 15e8c9e79172ec6ba3d82bc0c4048f72f8ed8df1 Mon Sep 17 00:00:00 2001 From: Pax1601 Date: Fri, 22 Dec 2023 18:44:31 +0100 Subject: [PATCH] Completed installation procedure on wizard --- manager/ejs/managerconnections.ejs | 110 +++++++++ manager/ejs/managerinstallations.ejs | 107 ++++++++- manager/ejs/managerinstances.ejs | 159 +++++++++++++ manager/ejs/managermenu.ejs | 11 +- manager/ejs/managerpasswords.ejs | 73 ++++++ manager/ejs/managerresult.ejs | 160 +++++++++++++ manager/icons/check-solid-green.svg | 1 + manager/icons/spinner-solid.svg | 1 + manager/icons/square-check-solid.svg | 1 + manager/icons/square-regular.svg | 1 + manager/icons/triangle-exclamation-solid.svg | 1 + manager/index.html | 10 + manager/javascripts/dcsinstance.js | 180 ++++++++++++++ manager/javascripts/filesystem.js | 233 +++++++++++-------- manager/javascripts/managerconnections.js | 69 ++++++ manager/javascripts/managerinstallations.js | 47 +++- manager/javascripts/managerinstances.js | 55 +++++ manager/javascripts/managermenu.js | 10 +- manager/javascripts/managerpage.js | 11 +- manager/javascripts/managerpasswords.js | 42 ++++ manager/javascripts/managerresult.js | 113 +++++++++ manager/javascripts/net.js | 4 +- manager/javascripts/popup.js | 19 ++ manager/javascripts/preload.js | 173 ++++++++++++-- manager/package.json | 1 + manager/stylesheets/style.css | 99 +++++++- 26 files changed, 1541 insertions(+), 150 deletions(-) create mode 100644 manager/ejs/managerconnections.ejs create mode 100644 manager/ejs/managerinstances.ejs create mode 100644 manager/ejs/managerpasswords.ejs create mode 100644 manager/ejs/managerresult.ejs create mode 100644 manager/icons/check-solid-green.svg create mode 100644 manager/icons/spinner-solid.svg create mode 100644 manager/icons/square-check-solid.svg create mode 100644 manager/icons/square-regular.svg create mode 100644 manager/icons/triangle-exclamation-solid.svg create mode 100644 manager/javascripts/dcsinstance.js create mode 100644 manager/javascripts/managerconnections.js create mode 100644 manager/javascripts/managerinstances.js create mode 100644 manager/javascripts/managerpasswords.js create mode 100644 manager/javascripts/managerresult.js create mode 100644 manager/javascripts/popup.js diff --git a/manager/ejs/managerconnections.ejs b/manager/ejs/managerconnections.ejs new file mode 100644 index 00000000..9471b01c --- /dev/null +++ b/manager/ejs/managerconnections.ejs @@ -0,0 +1,110 @@ + +
+ +
+ Client port + This port is used to allow access to Olympus. Be sure to allow this port through your firewall if you want people to connect remotely. +
+ "> + +
+ Port already in use +
+
+
+
+ Backend port + This port is used to communicate with DCS. It is not necessary to allow this port through your firewall. +
+ "> + +
+ Port already in use +
+
+
+
+ Backend address + This is the backend address Olympus will listen on. Unless you know what you are doing, leave it as localhost, even for dedicated server installations. + "> +
+ +
\ No newline at end of file diff --git a/manager/ejs/managerinstallations.ejs b/manager/ejs/managerinstallations.ejs index 5cdb8b0e..acf8bde4 100644 --- a/manager/ejs/managerinstallations.ejs +++ b/manager/ejs/managerinstallations.ejs @@ -1,15 +1,21 @@
-
+
- Select the copies of DCS you want to install Olympus to. + Select the copy of DCS you want to install Olympus to. For most people, this is your main DCS installation. @@ -40,10 +102,33 @@ If you are running a dedicated server, you would also install Olympus to this DCS version.
- <%= instances[0] %> - <% for (let i = 0; i < instances.length; i++) {%> -
- <%= instances[i] %> +
+
+ <% for (let i = 0; i < instances.length; i++) {%> +
+ +
+ <%= instances[i].name %> + + <%= instances[i].installed? (instances[i].error? 'Corrupted/outdated Olympus installation': 'Olympus already installed'): 'Olympus not installed yet' %> + + + <%= instances[i].folder %> +
+
+ <% } %>
- <% } %> +
+ +
\ No newline at end of file diff --git a/manager/ejs/managerinstances.ejs b/manager/ejs/managerinstances.ejs new file mode 100644 index 00000000..77193735 --- /dev/null +++ b/manager/ejs/managerinstances.ejs @@ -0,0 +1,159 @@ + +
+ +
+ + Select the copy of DCS you want to install Olympus to. + + + For most people, this is your main DCS installation. + + + If you are running a dedicated server, you would also install Olympus to this DCS version. + +
+
+
+ <% for (let i = 0; i < instances.length; i++) {%> +
+
+ <%= instances[i].name %> + + <%= instances[i].installed? (instances[i].error? 'Corrupted/outdated Olympus installation': ''): '' %> + + <%= instances[i].folder %> +
+
Client port
+
<%= instances[i].clientPort %>
+
+
+
Backend port
+
<%= instances[i].backendPort %>
+
+
+
Backend address
+
<%= instances[i].backendAddress %>
+
+
+
+ <% } %> +
+
+ +
\ No newline at end of file diff --git a/manager/ejs/managermenu.ejs b/manager/ejs/managermenu.ejs index 21dc76ac..70f0ebee 100644 --- a/manager/ejs/managermenu.ejs +++ b/manager/ejs/managermenu.ejs @@ -16,6 +16,11 @@ padding-left: 15px; align-items: center; border-radius: 5px; + cursor: pointer; + } + + #manager-menu>.option * { + pointer-events: none; } .inverted { @@ -28,13 +33,13 @@ -
+
Install Olympus
-
+
Update/remove Olympus
-
+
View and manage instances
\ No newline at end of file diff --git a/manager/ejs/managerpasswords.ejs b/manager/ejs/managerpasswords.ejs new file mode 100644 index 00000000..7b46f7bb --- /dev/null +++ b/manager/ejs/managerpasswords.ejs @@ -0,0 +1,73 @@ + +
+ +
+ Enter your passwords to access Olympus + By using the passwords below, you can access different roles in Olympus. +
+ +
+ Game Master Password + This password is used to access Olympus as Game Master with full priviledges. + +
+
+ Blue Commander Password + This password is used to access Olympus as blue coalition Commander. + +
+
+ Red Commander Password + This password is used to access Olympus as red coalition Commander. + +
+ +
\ No newline at end of file diff --git a/manager/ejs/managerresult.ejs b/manager/ejs/managerresult.ejs new file mode 100644 index 00000000..623b82ce --- /dev/null +++ b/manager/ejs/managerresult.ejs @@ -0,0 +1,160 @@ + +
+ +
+ Installing hook scripts +
+
+ Installing mod folder +
+
+ Installing configuration file +
+
+ Applying configuration +
+
+ Creating shortcuts +
+ +
+ Olympus successfully installed in the following DCS instance +
+ +
+ An error has occurred while installing Olympus +
+ +
+ +
+ + <%= instance.name %> + + + <%= instance.folder %> + +
+
+ +
+ You may now start DCS and use Olympus either with the shortcuts or the "View and manage Olympus" entry in the + main menu +
+ +
+ Please make sure DCS is not currently being executed +
+ + +
\ No newline at end of file diff --git a/manager/icons/check-solid-green.svg b/manager/icons/check-solid-green.svg new file mode 100644 index 00000000..96b80e24 --- /dev/null +++ b/manager/icons/check-solid-green.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/manager/icons/spinner-solid.svg b/manager/icons/spinner-solid.svg new file mode 100644 index 00000000..061f1932 --- /dev/null +++ b/manager/icons/spinner-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/manager/icons/square-check-solid.svg b/manager/icons/square-check-solid.svg new file mode 100644 index 00000000..9be69184 --- /dev/null +++ b/manager/icons/square-check-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/manager/icons/square-regular.svg b/manager/icons/square-regular.svg new file mode 100644 index 00000000..88fabee2 --- /dev/null +++ b/manager/icons/square-regular.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/manager/icons/triangle-exclamation-solid.svg b/manager/icons/triangle-exclamation-solid.svg new file mode 100644 index 00000000..3b18b9a9 --- /dev/null +++ b/manager/icons/triangle-exclamation-solid.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/manager/index.html b/manager/index.html index 8ff23a37..001a5fab 100644 --- a/manager/index.html +++ b/manager/index.html @@ -29,6 +29,16 @@
+
+
+