From cb57322190fad8ac3f98e9d8346b5504669f4d1e Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Mon, 26 Feb 2024 22:13:32 -0600
Subject: [PATCH] Move and rename Files tab to be less prominent

---
 docs/source/about/advanced_usage.rst     | 185 +++++++++++------------
 src_assets/common/assets/web/config.html | 142 ++++++++---------
 2 files changed, 163 insertions(+), 164 deletions(-)

diff --git a/docs/source/about/advanced_usage.rst b/docs/source/about/advanced_usage.rst
index f376f658..f29e6d05 100644
--- a/docs/source/about/advanced_usage.rst
+++ b/docs/source/about/advanced_usage.rst
@@ -124,99 +124,6 @@ editing the `conf` file in a text editor. Use the examples as reference.
 
       global_prep_cmd = [{"do":"nircmd.exe setdisplay 1280 720 32 144","undo":"nircmd.exe setdisplay 2560 1440 32 144"}]
 
-`Files <https://localhost:47990/config/#files>`__
--------------------------------------------------
-
-`file_apps <https://localhost:47990/config/#file_apps>`__
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Description**
-   The application configuration file path. The file contains a json formatted list of applications that can be started
-   by Moonlight.
-
-**Default**
-   OS and package dependent
-
-**Example**
-   .. code-block:: text
-
-      file_apps = apps.json
-
-`credentials_file <https://localhost:47990/config/#credentials_file>`__
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Description**
-   The file where user credentials for the UI are stored.
-
-**Default**
-   ``sunshine_state.json``
-
-**Example**
-   .. code-block:: text
-
-      credentials_file = sunshine_state.json
-
-`log_path <https://localhost:47990/config/#log_path>`__
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Description**
-   The path where the sunshine log is stored.
-
-**Default**
-   ``sunshine.log``
-
-**Example**
-   .. code-block:: text
-
-      log_path = sunshine.log
-
-`pkey <https://localhost:47990/config/#pkey>`__
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Description**
-   The private key used for the web UI and Moonlight client pairing. For best compatibility, this should be an RSA-2048 private key.
-
-   .. warning:: Not all Moonlight clients support ECDSA keys or RSA key lengths other than 2048 bits.
-
-**Default**
-   ``credentials/cakey.pem``
-
-**Example**
-   .. code-block:: text
-
-      pkey = /dir/pkey.pem
-
-`cert <https://localhost:47990/config/#cert>`__
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Description**
-   The certificate used for the web UI and Moonlight client pairing. For best compatibility, this should have an RSA-2048 public key.
-
-   .. warning:: Not all Moonlight clients support ECDSA keys or RSA key lengths other than 2048 bits.
-
-**Default**
-   ``credentials/cacert.pem``
-
-**Example**
-   .. code-block:: text
-
-      cert = /dir/cert.pem
-
-`file_state <https://localhost:47990/config/#file_state>`__
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-**Description**
-   The file where current state of Sunshine is stored.
-
-**Default**
-   ``sunshine_state.json``
-
-**Example**
-   .. code-block:: text
-
-      file_state = sunshine_state.json
-
-
 `Input <https://localhost:47990/config/#input>`__
 -------------------------------------------------
 
@@ -928,6 +835,98 @@ keybindings
 
       ping_timeout = 10000
 
+`Config Files <https://localhost:47990/config/#files>`__
+--------------------------------------------------------
+
+`file_apps <https://localhost:47990/config/#file_apps>`__
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Description**
+   The application configuration file path. The file contains a json formatted list of applications that can be started
+   by Moonlight.
+
+**Default**
+   OS and package dependent
+
+**Example**
+   .. code-block:: text
+
+      file_apps = apps.json
+
+`credentials_file <https://localhost:47990/config/#credentials_file>`__
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Description**
+   The file where user credentials for the UI are stored.
+
+**Default**
+   ``sunshine_state.json``
+
+**Example**
+   .. code-block:: text
+
+      credentials_file = sunshine_state.json
+
+`log_path <https://localhost:47990/config/#log_path>`__
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Description**
+   The path where the sunshine log is stored.
+
+**Default**
+   ``sunshine.log``
+
+**Example**
+   .. code-block:: text
+
+      log_path = sunshine.log
+
+`pkey <https://localhost:47990/config/#pkey>`__
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Description**
+   The private key used for the web UI and Moonlight client pairing. For best compatibility, this should be an RSA-2048 private key.
+
+   .. warning:: Not all Moonlight clients support ECDSA keys or RSA key lengths other than 2048 bits.
+
+**Default**
+   ``credentials/cakey.pem``
+
+**Example**
+   .. code-block:: text
+
+      pkey = /dir/pkey.pem
+
+`cert <https://localhost:47990/config/#cert>`__
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Description**
+   The certificate used for the web UI and Moonlight client pairing. For best compatibility, this should have an RSA-2048 public key.
+
+   .. warning:: Not all Moonlight clients support ECDSA keys or RSA key lengths other than 2048 bits.
+
+**Default**
+   ``credentials/cacert.pem``
+
+**Example**
+   .. code-block:: text
+
+      cert = /dir/cert.pem
+
+`file_state <https://localhost:47990/config/#file_state>`__
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+**Description**
+   The file where current state of Sunshine is stored.
+
+**Default**
+   ``sunshine_state.json``
+
+**Example**
+   .. code-block:: text
+
+      file_state = sunshine_state.json
+
 `Advanced <https://localhost:47990/config/#advanced>`__
 -------------------------------------------------------
 
diff --git a/src_assets/common/assets/web/config.html b/src_assets/common/assets/web/config.html
index 3921f966..a072e101 100644
--- a/src_assets/common/assets/web/config.html
+++ b/src_assets/common/assets/web/config.html
@@ -124,65 +124,6 @@
         </div>
       </div>
 
-      <!-- Files Tab -->
-      <div id="files" v-if="currentTab === 'files'" class="config-page">
-        <!-- Apps File -->
-        <div class="mb-3">
-          <label for="file_apps" class="form-label">Apps File</label>
-          <input type="text" class="form-control" id="file_apps" placeholder="apps.json" v-model="config.file_apps" />
-          <div class="form-text">
-            The file where current apps of Sunshine are stored
-          </div>
-        </div>
-
-        <!-- Credentials File -->
-        <div class="mb-3">
-          <label for="credentials_file" class="form-label">Credentials File</label>
-          <input type="text" class="form-control" id="credentials_file" placeholder="sunshine_state.json" v-model="config.credentials_file" />
-          <div class="form-text">
-            Store Username/Password separately from Sunshine's state file.
-          </div>
-        </div>
-
-        <!-- Log Path -->
-        <div class="mb-3">
-          <label for="log_path" class="form-label">Logfile Path</label>
-          <input type="text" class="form-control" id="log_path" placeholder="sunshine.log" v-model="config.log_path" />
-          <div class="form-text">
-            The file where the current logs of Sunshine are stored.
-          </div>
-        </div>
-
-        <!-- Private Key -->
-        <div class="mb-3">
-          <label for="pkey" class="form-label">Private Key</label>
-          <input type="text" class="form-control" id="pkey" placeholder="/dir/pkey.pem" v-model="config.pkey" />
-          <div class="form-text">The private key used for the web UI and Moonlight client pairing. For best
-            compatibility, this should be an RSA-2048 private key.</div>
-        </div>
-
-        <!-- Certificate -->
-        <div class="mb-3">
-          <label for="cert" class="form-label">Certificate</label>
-          <input type="text" class="form-control" id="cert" placeholder="/dir/cert.pem" v-model="config.cert" />
-          <div class="form-text">
-            The certificate used for the web UI and Moonlight client pairing. For best compatibility, this should have
-            an RSA-2048 public key.
-          </div>
-        </div>
-
-        <!-- State File -->
-        <div class="mb-3">
-          <label for="file_state" class="form-label">State File</label>
-          <input type="text" class="form-control" id="file_state" placeholder="sunshine_state.json"
-            v-model="config.file_state" />
-          <div class="form-text">
-            The file where current state of Sunshine is stored
-          </div>
-        </div>
-
-      </div>
-
       <!-- Input Tab -->
       <div id="input" v-if="currentTab === 'input'" class="config-page">
         <!-- Enable Gamepad Input -->
@@ -729,6 +670,65 @@
 
       </div>
 
+      <!-- Files Tab -->
+      <div id="files" v-if="currentTab === 'files'" class="config-page">
+        <!-- Apps File -->
+        <div class="mb-3">
+          <label for="file_apps" class="form-label">Apps File</label>
+          <input type="text" class="form-control" id="file_apps" placeholder="apps.json" v-model="config.file_apps" />
+          <div class="form-text">
+            The file where current apps of Sunshine are stored
+          </div>
+        </div>
+
+        <!-- Credentials File -->
+        <div class="mb-3">
+          <label for="credentials_file" class="form-label">Credentials File</label>
+          <input type="text" class="form-control" id="credentials_file" placeholder="sunshine_state.json" v-model="config.credentials_file" />
+          <div class="form-text">
+            Store Username/Password separately from Sunshine's state file.
+          </div>
+        </div>
+
+        <!-- Log Path -->
+        <div class="mb-3">
+          <label for="log_path" class="form-label">Logfile Path</label>
+          <input type="text" class="form-control" id="log_path" placeholder="sunshine.log" v-model="config.log_path" />
+          <div class="form-text">
+            The file where the current logs of Sunshine are stored.
+          </div>
+        </div>
+
+        <!-- Private Key -->
+        <div class="mb-3">
+          <label for="pkey" class="form-label">Private Key</label>
+          <input type="text" class="form-control" id="pkey" placeholder="/dir/pkey.pem" v-model="config.pkey" />
+          <div class="form-text">The private key used for the web UI and Moonlight client pairing. For best
+            compatibility, this should be an RSA-2048 private key.</div>
+        </div>
+
+        <!-- Certificate -->
+        <div class="mb-3">
+          <label for="cert" class="form-label">Certificate</label>
+          <input type="text" class="form-control" id="cert" placeholder="/dir/cert.pem" v-model="config.cert" />
+          <div class="form-text">
+            The certificate used for the web UI and Moonlight client pairing. For best compatibility, this should have
+            an RSA-2048 public key.
+          </div>
+        </div>
+
+        <!-- State File -->
+        <div class="mb-3">
+          <label for="file_state" class="form-label">State File</label>
+          <input type="text" class="form-control" id="file_state" placeholder="sunshine_state.json"
+            v-model="config.file_state" />
+          <div class="form-text">
+            The file where current state of Sunshine is stored
+          </div>
+        </div>
+
+      </div>
+
       <!-- Advanced Tab -->
       <div v-if="currentTab === 'advanced'" class="config-page">
         <!-- FEC Percentage -->
@@ -1204,18 +1204,6 @@
               "global_prep_cmd": "[]",
             },
           },
-          {
-            id: "files",
-            name: "Files",
-            options: {
-              "file_apps": "",
-              "credentials_file": "",
-              "log_path": "",
-              "pkey": "",
-              "cert": "",
-              "file_state": "",
-            },
-          },
           {
             id: "input",
             name: "Input",
@@ -1264,6 +1252,18 @@
               "ping_timeout": 10000,
             },
           },
+          {
+            id: "files",
+            name: "Config Files",
+            options: {
+              "file_apps": "",
+              "credentials_file": "",
+              "log_path": "",
+              "pkey": "",
+              "cert": "",
+              "file_state": "",
+            },
+          },
           {
             id: "advanced",
             name: "Advanced",