WG-66 - Seperated the config to project and app specific

bbacabcc · Daniel Bawag · d1eff105 · bbacabcc · bbacabcc · bbacabcc
Commit bbacabcc authored Sep 21, 2022 by Daniel Bawag
Showing with 28 additions and 11 deletions

login.html Web-GDE/login.html +3 -0

project_config.js Web-GDE/project_config.js +5 -0

script.js Web-GDE/script.js +3 -3

fetchConfig.js Web-GDE/src/fetchConfig/fetchConfig.js +17 -8

No files found.
--- a/Web-GDE/login.html
+++ b/Web-GDE/login.html
@@ -4,7 +4,10 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">  
 <title> Login Page </title>  
 <link rel="stylesheet" href="./login.css">  
+<script src="https://code.jquery.com/jquery-3.6.0.min.js"
+    integrity="sha256-/xUj+3OJU5yExlq6GSYGSHk7tPXikynS7ogEvDej/m4=" crossorigin="anonymous"></script>
 <script src="./src/fetchConfig/fetchConfig.js"></script>
+<script>fetchConfig()</script>
 </head>    
 <body>      
    <div class="main-div">

--- a/Web-GDE/project_config.js
+++ b/Web-GDE/project_config.js
+const ALLOWED_KPH = 8000;
+const ALLOWED_DIMENSION_WIDTH = 1366;
+const ALLOWED_DIMENSION_HEIGHT = 768;
+const ALLOWED_BROWSERS = "Chrome";
\ No newline at end of file
--- a/Web-GDE/script.js
+++ b/Web-GDE/script.js
@@ -13,9 +13,9 @@ console.log(getBrowserName());


 function validateForm() {
-    const reqWindowWidth  = 1366;
-    const reqWindowHeight = 768;
-    const reqBrowser = 'Chrome';
+    const reqWindowWidth  = ALLOWED_DIMENSION_WIDTH;
+    const reqWindowHeight = ALLOWED_DIMENSION_HEIGHT;
+    const reqBrowser = ALLOWED_BROWSERS;

    var windowWidth = getWindowWidth();
    var windowHeight = getWindowHeight();

--- a/Web-GDE/src/fetchConfig/fetchConfig.js
+++ b/Web-GDE/src/fetchConfig/fetchConfig.js
@@ -2,18 +2,27 @@ var found = true; //variable to return
 var embed = 0; //checker if which file is using the function
 const fetchConfig = () => {
    $.ajax({ //locates the config file
-        url: './config.js', 
+        url: './config.js',
        async: false,
-        success: function(data){},
-        error: function(data){
-          handleError();
+        success: function (data) { },
+        error: function (data) {
+            handleError("application config");
        },
-      })
+    })
+
+    $.ajax({ //locates the project config file
+        url: './project_config.js',
+        async: false,
+        success: function (data) { },
+        error: function (data) {
+            handleError("project config");
+        },
+    })
 }

-const handleError = () => {
+const handleError = (file) => {
    if (embed == 0) {//to ensure the prompt appears only once
-        if (confirm("config.js not found, application will not commence")) {}
-    } 
+        if (confirm(`${file} not found, application will not commence`)) { }
+    }
    found = false;
 }