Merge branch 'develop' of 10.196.211.3:222]:maru21/templateGen

into develop
2023-09-23 14:05:30 +02:00 · 2023-09-23 14:05:30 +02:00 · ca697d40df
commit ca697d40df
parent cae8dfa68b eac9c04c4f
18 changed files with 3264 additions and 3239 deletions
--- a/css/styles.css
+++ b/css/styles.css
@ -49,3 +49,9 @@ a {text-decoration: none;}
 textarea {
  resize: none;
 }
+
+.logo {
+  border: #202e3f;
+  border-style: solid;
+
+}
--- a/index.html
+++ b/index.html
@ -16,7 +16,7 @@
  <link rel="stylesheet" href="css/font-awesome/css/all.min.css" />
  <link rel="stylesheet" href="css/styles.css" />

-  <script type="module" src="js/9.5/main.js"></script>
+  <script type="module" src="js/9.7/main.js"></script>


  <body>
@ -40,7 +40,7 @@
        >
          Show saved documents
        </li>
-        <!-- hidden since the data should only be stored on local machine -->
+        <!-- hidden since the data should only be stored on local machine  -->
        <li
          class="w3-bar-item w3-padding-large w3-button"
          style="display: none; border-bottom: 2px solid rgb(221, 221, 221)"
@ -93,7 +93,7 @@
          href="."
          id="siteTitle"
          class="w3-left-align w3-button w3-padding-large w3-flat-wet-asphalt"
-          >Template Gen</a
+          ><img class="logo" src="logo.png" alt="logo" height="30px"></a
        >
      </div>

@ -265,9 +265,6 @@
        <div class="w3-modal-content w3-margin-top">
          <div class="w3-container w3-padding-32 w3-flat-clouds">
            <form method="post" action="javascript:void(0)" id="loginForm">
-              <h1>Welcome to stenoDok</h1>
-              <br>
-              <br>
              <label> enter password: </label>
              <input
                type="password"
--- a/js/9.7/buildForm.js
+++ b/js/9.7/buildForm.js
--- a/js/9.7/createTemplate.js
+++ b/js/9.7/createTemplate.js
@ -69,7 +69,9 @@ function createTemplate(template = false) {
  function loadTemplateSidebar(templates) {
    let sidebarList = document.createElement("ul");
    sidebarList.classList.add("w3-ul");
-    templates.push('_textBlocks');
+    if (!templates.includes('_textBlocks')) {
+      templates.push('_textBlocks');
+    }


    for (let template of templates) {
--- a/js/9.7/evts.js
+++ b/js/9.7/evts.js
--- a/js/9.7/files.js
+++ b/js/9.7/files.js
--- a/js/9.7/form.js
+++ b/js/9.7/form.js
--- a/js/9.7/identify.js
+++ b/js/9.7/identify.js
--- a/js/9.7/init.js
+++ b/js/9.7/init.js
--- a/js/9.7/main.js
+++ b/js/9.7/main.js
--- a/js/9.7/parseForm.js
+++ b/js/9.7/parseForm.js
--- a/js/9.7/parseTemplate.js
+++ b/js/9.7/parseTemplate.js
--- a/js/9.7/scripts.js
+++ b/js/9.7/scripts.js
--- a/js/9.7/sha256.min.js
+++ b/js/9.7/sha256.min.js
--- a/js/9.7/storage.js
+++ b/js/9.7/storage.js
--- a/js/9.7/web.js
+++ b/js/9.7/web.js
@ -45,7 +45,14 @@ function loadTemplate(template, newFlag = false, loadOnly = false) {
        cdata = retrieveData("userInputForce");
      }
      if (cdata != "") {
-        retrieveForm(JSON.parse(cdata));
+        let res = "";
+        try {
+          res = JSON.parse(cdata);
+        } catch (e) {
+          console.log("error", cdata);
+          return;
+        }
+        retrieveForm(res);
      }

      //select first object and focus on it
@ -77,7 +84,14 @@ function loadNavBar() {
  var xhttp = new XMLHttpRequest();
  xhttp.onreadystatechange = function () {
    if (this.readyState == 4 && this.status == 200) {
-      let res = JSON.parse(this.responseText);
+      let res = "";
+      try {
+        res = JSON.parse(this.responseText);
+      } catch (e) {
+        console.log("error", this.responseText);
+        return;
+      }
+      
      let divMob = document.getElementById("navMob");
      for (let x in res) {
        let aMob = document.createElement("a");
@ -117,7 +131,13 @@ function initTextBlocks() {
  var xhttp = new XMLHttpRequest();
  xhttp.onreadystatechange = function () {
    if (this.readyState == 4 && this.status == 200) {
-      let res = JSON.parse(this.responseText);
+      let res = "";
+      try {
+        res = JSON.parse(this.responseText);
+      } catch (e) {
+        console.log("error", this.responseText)
+        return;
+      }
      const textBlocksHolder = document.getElementById("textBlocks");
      const divReg = document.getElementById("navTb");
      for (let x in res) {
--- a/js/9.7/xorc.js
+++ b/js/9.7/xorc.js
--- a/logo.png
+++ b/logo.png