Port change function added and some translations fixed. Created a function named tryload to fix repetitive code lines.

Author: Eta06

main.py

@@ -1,16 +1,16 @@
 # Description: Main file for the LockDown project
 import webbrowser
 from flask import Flask, render_template, request, redirect, url_for
-from modules.config import readAppConfig, updateAppConfig, loadLanguageFiles
+from modules.config import readAppConfig, updateAppConfig, loadLanguageFiles, tryLoad
 
 
 app = Flask(__name__)
 appcfg = readAppConfig()
-language = appcfg["app_language"]
+language = tryLoad("app_language")
 language_files = loadLanguageFiles(language)
-print(language_files)
-version = appcfg["app_version"]
-author = appcfg["app_author"]
+version = tryLoad("app_version")
+author = tryLoad("app_author")
+port = tryLoad("app_port")
 
 
 @app.route("/set_language", methods=["POST"])
@@ -38,6 +38,7 @@ def reset_everything():
 
     appcfg["app_language"] = ""
     updateAppConfig("app_language", "")
+    updateAppConfig("app_port", "4900")
     language_files = loadLanguageFiles("")
     language = ""
 
@@ -57,6 +58,8 @@ def status():
 
 
 if __name__ == "__main__":
-    webbrowser.open("http://localhost:4900/")
-    app.run(debug=True, port=4900, host="0.0.0.0")
+    appcfg = readAppConfig()
+    app_port = tryLoad("app_port")
+    webbrowser.open("http://localhost:" + str(app_port))
+    app.run(debug=True, port=app_port, host="0.0.0.0")
 

modules/config.py

@@ -1,25 +1,41 @@
 import json
 
 
+# noinspection PyBroadException
+def tryLoad(key):
+    appcfg = readAppConfig()
+    try:
+        data = appcfg[key]
+    except:
+        data = getDefaultConfig()[key]
+    return data
+
+
+def getDefaultConfig():
+    data = {
+        "app_name": "FastCode.Ninja LockDown",
+        "app_version": "0.0.1",
+        "app_author": "Emir Tunahan Alim",
+        "app_author_email": "emrtnhalim@gmail.com",
+        "app_description": "Cross-platform multi-lingual screen locker app for computers and smart boards.",
+        "github_user": "https://github.com/Eta06",
+        "github_repo": "https://github.com/Eta06/LockDown",
+        "app_license": "Apache License 2.0",
+        "app_license_url": "https://github.com/Eta06/LockDown/blob/main/LICENSE",
+        "app_language": "",
+        "app_port": "4900"
+    }
+    return data
+
+
 def readAppConfig():
     try:
         with open("appconfig.json", "r") as f:
             data = json.load(f)
             return data
     except FileNotFoundError:
         with open("appconfig.json", "w") as f:
-            data = {
-                "app_name": "FastCode.Ninja LockDown",
-                "app_version": "0.0.1",
-                "app_author": "Emir Tunahan Alim",
-                "app_author_email": "emrtnhalim@gmail.com",
-                "app_description": "Cross-platform multi-lingual screen locker app for computers and smart boards.",
-                "github_user": "https://github.com/Eta06",
-                "github_repo": "https://github.com/Eta06/LockDown",
-                "app_license": "Apache License 2.0",
-                "app_license_url": "https://github.com/Eta06/LockDown/blob/main/LICENSE",
-                "app_language": "",
-            }
+            data = getDefaultConfig()
             json.dump(data, f, indent=4)
             return data
 

templates/index.html

@@ -154,6 +154,7 @@
 
         .tab-content {
             display: none;
+            padding: 10px;
         }
 
         .tab-content.active {
@@ -192,6 +193,9 @@
         }
 
         .settings-card {
+            display: flex;
+            flex-direction: column;
+            flex-wrap: nowrap;
             max-width: 550px;
             width: 70%;
             margin: 10px auto;
@@ -209,7 +213,11 @@
             border-radius: 5px;
         }
 
-        .reset-card button {
+        .click-buttons:hover {
+            background-color: #7a3131;
+        }
+
+        .click-buttons {
             background-color: #F25D5D;
             color: #fff;
             padding: 5px 10px;
@@ -220,12 +228,8 @@
             margin-bottom: 20px;
         }
 
-        .reset-card button:hover {
-            background-color: #7a3131;
-        }
-
         .reset-card p {
-            margin-top: 10px;
+            margin: 0 0 20px 0;
             font-size: 14px;
         }
 
@@ -265,6 +269,9 @@
             .tabs {
                 width: 90%; /* Set the width to 90% on mobile devices */
             }
+            .settings-card{
+                width: 90%;
+            }
         }
     </style>
 </head>
@@ -300,19 +307,24 @@ <h1>{{ language_files.home }}</h1>
                     <div class="settings-card language-card">
                         <h3>{{ language_files.language }}</h3>
                         <label>
-                            <select name="language">
+                            <select name="language" style="margin-bottom: 10px;">
                                 <option value="en">English</option>
                                 <option value="tr">Turkish</option>
                                 <option value="es">Spanish</option>
                                 <option value="ru">Russian</option>
                             </select>
                         </label>
-                        <button id="save-language">{{ language_files.save }}</button>
+                        <button class="click-buttons" id="save-language">{{ language_files.save }}</button>
                     </div>
                     <div class="settings-card reset-card">
                         <h3>{{ language_files.reset }}</h3>
                         <p>{{ language_files.resetinfo }}</p>
-                        <button id="confirm-reset">{{ language_files.reset }}</button>
+                        <button class="click-buttons" id="confirm-reset">{{ language_files.reset }}</button>
+                    </div>
+                    <div class="settings-card">
+                        <h3>{{ language_files.port }}</h3>
+                        <p>{{ language_files.portinfo }}</p>
+                        <input type="number" name="port" value="{{ port }}" min="1" max="65535" step="1">
                     </div>
                 </cardwidget>
             </div>

translations/en.json

@@ -15,6 +15,8 @@
   "reset": "Reset",
   "yesreset": "Yes, reset!",
   "areyousure": "Are you sure?",
+  "port": "Server Port",
+  "portinfo": "Port number to use for the application",
   "irreversibleAction": "This action cannot be undone!",
   "resetinfo": "Are you sure you want to reset all settings?",
   "infotext1": "This is the web UI for LockDown App.",

translations/es.json

@@ -15,6 +15,8 @@
   "reset": "Restablecer",
   "yesreset": "Si, restablecer!",
   "areyousure": "¿Está seguro?",
+  "port": "Puerto del servidor",
+  "portinfo": "Número de puerto para usar la aplicación",
   "irreversibleAction": "Esta acción no se puede deshacer!",
   "resetinfo": "¿Está seguro de que desea restablecer todas las configuraciones?",
   "infotext1": "Esta es la interfaz web de la aplicación LockDown.",

translations/ru.json

@@ -15,6 +15,8 @@
   "reset": "Сброс",
   "yesreset": "Да, сбросить!",
   "areyousure": "Вы уверены?",
+  "port": "Порт сервера",
+  "portinfo": "",
   "irreversibleAction": "Эта операция не может быть отменена!",
   "resetinfo": "Вы уверены, что хотите сбросить все настройки?",
   "infotext1": "Это веб-интерфейс приложения LockDown.",

translations/tr.json

@@ -15,6 +15,8 @@
   "reset": "Sıfırla",
   "yesreset": "Evet, sıfırla!",
   "areyousure": "Emin misiniz?",
+  "port": "Sunucu Portu",
+  "portinfo": "Uygulama için kullanılacak port numarasıdır. Varsayılan: 4900",
   "irreversibleAction": "Bu işlem geri alınamaz!",
   "resetinfo": "Tüm ayarları sıfırlamak istediğinizden emin misiniz?",
   "infotext1": "Bu, LockDown uygulamasının web arayüzüdür.",