453

2026-03-26 23:12:34 +03:00 · 2023-10-10 16:14:19 +02:00
parent 9181cf6201
commit 7f7ef1a696
3 changed files with 228 additions and 188 deletions
--- a/src/App.svelte
+++ b/src/App.svelte
@@ -52,7 +52,7 @@
  let preventMove = false;
  let screenSize;
  const blobDebug = false;
-  const devMode = true;
+  const devMode = false;

  let percent;

@@ -115,6 +115,10 @@
  let paramsJson = {};

  let userdata = null;
+  let allmodeinfo = null;
+  let profile = null;
+
+  let serverOnline = false;

  let parsed = {
    itemsJson: false,
@@ -207,11 +211,14 @@
      });
      if (res.ok) {
        userdata = await res.json();
+        serverOnline = true;
      } else {
        console.log("error", res.statusText);
+        serverOnline = true;
      }
    } catch (e) {
      console.log("error", e);
+      serverOnline = false;
    }
  };

@@ -608,9 +615,67 @@
      clearParcedFlags();
      if (debug) console.log("✔✔", "profile page parced");
      pageReady.profile = true;
+      await getModInfo();
+      await getProfile();
    }
  }

+  const getModInfo = async () => {
+    try {
+      let res = await fetch("https://portal.iotmanager.org/compiler/allmodinfo", {
+        mode: "cors",
+        method: "GET",
+      });
+      if (res.ok) {
+        allmodeinfo = await res.json();
+        allmodeinfo = allmodeinfo.message;
+      } else {
+        console.log("error", res.statusText);
+      }
+    } catch (e) {
+      console.log("error", e);
+    }
+  };
+
+  const getProfile = async () => {
+    try {
+      const JWT = Cookies.get("token_iotm2");
+      let res = await fetch("https://portal.iotmanager.org/compiler/profile", {
+        headers: {
+          "Content-Type": "application/json",
+          Authorization: `Bearer ${JWT}`,
+        },
+        mode: "cors",
+        method: "GET",
+      });
+      if (res.ok) {
+        profile = await res.json();
+        profile = profile.message;
+        await markProfileAsPerThisDevProfile();
+      } else {
+        console.log("error", res.statusText);
+      }
+    } catch (e) {
+      console.log("error", e);
+    }
+  };
+
+  const markProfileAsPerThisDevProfile = async () => {
+    for (const [compilerCategory, compilerCategoryModules] of Object.entries(profile.modules)) {
+      let devCategoryModules = myProfileJson.modules[compilerCategory];
+      compilerCategoryModules.forEach((compilerModule) => {
+        compilerModule.active = false;
+        if (devCategoryModules) {
+          devCategoryModules.forEach((devModule) => {
+            if (devModule.path === compilerModule.path) {
+              compilerModule.active = devModule.active;
+            }
+          });
+        }
+      });
+    }
+  };
+
  async function initDevList() {
    if (firstDevListRequest) {
      //при первом запросе листа устройств запишем его целеком
@@ -1307,10 +1372,10 @@
          </Route>

          <Route path="/profile">
-            <Profile show={pageReady.profile} myProfileJson={myProfileJson} userdata={userdata} updateBuild={(path) => updateBuild(path)} />
+            <Profile show={pageReady.profile} myProfileJson={myProfileJson} userdata={userdata} updateBuild={(path) => updateBuild(path)} allmodeinfo={allmodeinfo} profile={profile} serverOnline={serverOnline} />
          </Route>
          <Route path="/login">
-            <Login show={true} />
+            <Login show={true} serverOnline={serverOnline} />
          </Route>
        {/if}
      </div>
--- a/src/pages/Login.svelte
+++ b/src/pages/Login.svelte
@@ -5,6 +5,7 @@
  import { router } from "tinro";
  import Cookies from "js-cookie";
  export let show = true;
+  export let serverOnline;

  let user = {};
  let errors = [];
@@ -42,28 +43,36 @@
 </script>

 {#if show}
-  <div class="flex h-screen m-2 md:m-4 lg:m-8 items-start justify-center">
-    <div class="w-full max-w-lg">
-      <form class="bg-white shadow-2xl rounded-xl px-8 pt-6 pb-8 mb-4">
-        <div class="mb-4">
-          <label class="block text-gray-700 text-sm font-bold mb-2" for="username">
-            {$t("login.email")}
-          </label>
-          <input bind:value={user.username} class="shadow appearance-none border rounded w-full h-10 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline" id="username" type="text" placeholder={"someone@example.com"} />
-        </div>
-        <div class="mb-6">
-          <label class="block text-gray-700 text-sm font-bold mb-2" for="password">
-            {$t("login.pass")}
-          </label>
-          <input bind:value={user.password} class="shadow appearance-none border rounded w-full h-10 px-3 text-gray-700 mb-0 leading-tight focus:outline-none focus:shadow-outline" id="password" type="password" placeholder="**********" />
-        </div>
-        {#each errors as e, i}
-          <p class="text-red-500 p-0 m-0 font-bold text-xs italic">{$t(e.msg)}</p>
-        {/each}
-        <button class="btn-lg mt-6" on:click={() => login(user)}>{$t("login.login")}</button>
-      </form>
+  {#if serverOnline}
+    <div class="flex h-screen m-2 md:m-4 lg:m-8 items-start justify-center">
+      <div class="w-full max-w-lg">
+        <form class="bg-white shadow-2xl rounded-xl px-8 pt-6 pb-8 mb-4">
+          <div class="mb-4">
+            <label class="block text-gray-700 text-sm font-bold mb-2" for="username">
+              {$t("login.email")}
+            </label>
+            <input bind:value={user.username} class="shadow appearance-none border rounded w-full h-10 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline" id="username" type="text" placeholder={"someone@example.com"} />
+          </div>
+          <div class="mb-6">
+            <label class="block text-gray-700 text-sm font-bold mb-2" for="password">
+              {$t("login.pass")}
+            </label>
+            <input bind:value={user.password} class="shadow appearance-none border rounded w-full h-10 px-3 text-gray-700 mb-0 leading-tight focus:outline-none focus:shadow-outline" id="password" type="password" placeholder="**********" />
+          </div>
+          {#each errors as e, i}
+            <p class="text-red-500 p-0 m-0 font-bold text-xs italic">{$t(e.msg)}</p>
+          {/each}
+          <button class="btn-lg mt-6" on:click={() => login(user)}>{$t("login.login")}</button>
+        </form>
+      </div>
    </div>
-  </div>
+  {:else}
+    <div class="my-4">
+      <div class="grd-1col1">
+        <Card title="Сервер недоступен" />
+      </div>
+    </div>
+  {/if}
 {:else}
  <Alarm title="Загрузка..." />
 {/if}
--- a/src/pages/Profile.svelte
+++ b/src/pages/Profile.svelte
@@ -7,18 +7,19 @@
  import Cookies from "js-cookie";
  export let show;
  export let myProfileJson;
+  export let allmodeinfo;
+  export let profile;
+
+  export let serverOnline;
+
  export let userdata;
  export let updateBuild = (path) => {};
  import CrossIcon from "../svg/Cross.svelte";
  let errors = [];
-  let allmodeinfo = null;
  let userBuilds = null;
-  let profile = null;
  var updateInterval;

  onMount(async () => {
-    await getProfile();
-    await getModInfo();
    await getUserBuilds();
  });

@@ -30,14 +31,16 @@
  };

  function checkStatus(userBuilds) {
-    if (userBuilds[0].processed) {
-      clearInterval(updateInterval);
-      console.log("no interval - all task done");
-    } else {
-      console.log("non completed task exist!");
-      if (!updateInterval) {
-        console.log("interval checking started");
-        updateInterval = setInterval(periodicTask, 10000);
+    if (userBuilds.length) {
+      if (userBuilds[0].processed) {
+        clearInterval(updateInterval);
+        console.log("no interval - all task done");
+      } else {
+        console.log("non completed task exist!");
+        if (!updateInterval) {
+          console.log("interval checking started");
+          updateInterval = setInterval(periodicTask, 10000);
+        }
      }
    }
  }
@@ -46,23 +49,6 @@
    await getUserBuilds();
  };

-  const getModInfo = async () => {
-    try {
-      let res = await fetch("https://portal.iotmanager.org/compiler/allmodinfo", {
-        mode: "cors",
-        method: "GET",
-      });
-      if (res.ok) {
-        allmodeinfo = await res.json();
-        allmodeinfo = allmodeinfo.message;
-      } else {
-        console.log("error", res.statusText);
-      }
-    } catch (e) {
-      console.log("error", e);
-    }
-  };
-
  const getUserBuilds = async () => {
    try {
      const JWT = Cookies.get("token_iotm2");
@@ -85,28 +71,6 @@
    }
  };

-  const getProfile = async () => {
-    try {
-      const JWT = Cookies.get("token_iotm2");
-      let res = await fetch("https://portal.iotmanager.org/compiler/profile", {
-        headers: {
-          "Content-Type": "application/json",
-          Authorization: `Bearer ${JWT}`,
-        },
-        mode: "cors",
-        method: "GET",
-      });
-      if (res.ok) {
-        profile = await res.json();
-        profile = profile.message;
-      } else {
-        console.log("error", res.statusText);
-      }
-    } catch (e) {
-      console.log("error", e);
-    }
-  };
-
  const delBuild = async (ord) => {
    try {
      const JWT = Cookies.get("token_iotm2");
@@ -129,9 +93,9 @@
  };

  const placeOrder = async () => {
-    delete myProfileJson["_id"];
+    delete profile["_id"];
    //добавим в тело имя пользователя
-    myProfileJson.username = userdata.username;
+    profile.username = userdata.username;
    const JWT = Cookies.get("token_iotm2");
    try {
      let res = await fetch("https://portal.iotmanager.org/compiler/order", {
@@ -141,7 +105,7 @@
          "Content-Type": "application/json",
          Authorization: `Bearer ${JWT}`,
        },
-        body: JSON.stringify(myProfileJson),
+        body: JSON.stringify(profile),
      });
      const content = await res.json();
      if (res.ok) {
@@ -166,129 +130,131 @@
 </script>

 {#if show}
-  {#if allmodeinfo && myProfileJson && profile}
-    <div class="my-4">
-      <div class="grd-1col1">
-        <Card title="">
-          <div class="grid grid-cols-2">
-            <p class="text-center text-gray-500 font-bold">{myProfileJson.projectProp.platformio.default_envs}</p>
-            <p class="text-center text-gray-500 font-bold">{userdata.username}</p>
-          </div>
-          <div class="grid my-4 grid-cols-2 sm:grid-cols-4 md:grid-cols-6 lg:grid-cols-8 xl:grid-cols-12 2xl:grid-cols-12 gap-4">
-            <!--{#each Object.entries(allmodeinfo) as [key, param]}
+  {#if serverOnline}
+    {#if allmodeinfo && myProfileJson && profile}
+      <div class="my-4">
+        <div class="grd-1col1">
+          <Card title="">
+            <div class="grid grid-cols-2">
+              <p class="text-center text-gray-500 font-bold">{myProfileJson.projectProp.platformio.default_envs}</p>
+              <p class="text-center text-gray-500 font-bold">{userdata.username}</p>
+            </div>
+            <div class="grid my-4 grid-cols-2 sm:grid-cols-4 md:grid-cols-6 lg:grid-cols-8 xl:grid-cols-12 2xl:grid-cols-12 gap-4">
+              <!--{#each Object.entries(allmodeinfo) as [key, param]}
              <div>
               
                <p class="cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{key.substring(key.lastIndexOf("/") + 1, key.length)}</p>
              </div>
            {/each}-->

-            {#each profile.modules.virtual_elments as m, i}
-              {#if allmodeinfo[m.path]?.usedLibs[profile.projectProp.platformio.default_envs]}
-                <div>
-                  <!-- svelte-ignore a11y-click-events-have-key-events -->
-                  <p on:click={() => (m.active = !m.active)} class="{m.active ? 'bg-green-100' : ''} cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{m.path.substring(m.path.lastIndexOf("/") + 1, m.path.length)}</p>
-                </div>
-              {/if}
+              {#each profile.modules.virtual_elments as m, i}
+                {#if allmodeinfo[m.path]?.usedLibs[profile.projectProp.platformio.default_envs]}
+                  <div>
+                    <!-- svelte-ignore a11y-click-events-have-key-events -->
+                    <p on:click={() => (m.active = !m.active)} class="{m.active ? 'bg-green-100' : ''} cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{m.path.substring(m.path.lastIndexOf("/") + 1, m.path.length)}</p>
+                  </div>
+                {/if}
+              {/each}
+              {#each profile.modules.sensors as m, i}
+                {#if allmodeinfo[m.path]?.usedLibs[profile.projectProp.platformio.default_envs]}
+                  <div>
+                    <!-- svelte-ignore a11y-click-events-have-key-events -->
+                    <p on:click={() => (m.active = !m.active)} class="{m.active ? 'bg-green-100' : ''} cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{m.path.substring(m.path.lastIndexOf("/") + 1, m.path.length)}</p>
+                  </div>
+                {/if}
+              {/each}
+              {#each profile.modules.executive_devices as m, i}
+                {#if allmodeinfo[m.path]?.usedLibs[profile.projectProp.platformio.default_envs]}
+                  <div>
+                    <!-- svelte-ignore a11y-click-events-have-key-events -->
+                    <p on:click={() => (m.active = !m.active)} class="{m.active ? 'bg-green-100' : ''} cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{m.path.substring(m.path.lastIndexOf("/") + 1, m.path.length)}</p>
+                  </div>
+                {/if}
+              {/each}
+              {#each profile.modules.screens as m, i}
+                {#if allmodeinfo[m.path]?.usedLibs[profile.projectProp.platformio.default_envs]}
+                  <div>
+                    <!-- svelte-ignore a11y-click-events-have-key-events -->
+                    <p on:click={() => (m.active = !m.active)} class="{m.active ? 'bg-green-100' : ''} cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{m.path.substring(m.path.lastIndexOf("/") + 1, m.path.length)}</p>
+                  </div>
+                {/if}
+              {/each}
+            </div>
+            {#each errors as e, i}
+              <p class="text-red-500 p-0 m-0 font-bold text-xs italic">{$t(e.msg)}</p>
            {/each}
-            {#each profile.modules.sensors as m, i}
-              {#if allmodeinfo[m.path]?.usedLibs[profile.projectProp.platformio.default_envs]}
-                <div>
-                  <!-- svelte-ignore a11y-click-events-have-key-events -->
-                  <p on:click={() => (m.active = !m.active)} class="{m.active ? 'bg-green-100' : ''} cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{m.path.substring(m.path.lastIndexOf("/") + 1, m.path.length)}</p>
-                </div>
-              {/if}
-            {/each}
-            {#each profile.modules.executive_devices as m, i}
-              {#if allmodeinfo[m.path]?.usedLibs[profile.projectProp.platformio.default_envs]}
-                <div>
-                  <!-- svelte-ignore a11y-click-events-have-key-events -->
-                  <p on:click={() => (m.active = !m.active)} class="{m.active ? 'bg-green-100' : ''} cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{m.path.substring(m.path.lastIndexOf("/") + 1, m.path.length)}</p>
-                </div>
-              {/if}
-            {/each}
-            {#each profile.modules.screens as m, i}
-              {#if allmodeinfo[m.path]?.usedLibs[profile.projectProp.platformio.default_envs]}
-                <div>
-                  <!-- svelte-ignore a11y-click-events-have-key-events -->
-                  <p on:click={() => (m.active = !m.active)} class="{m.active ? 'bg-green-100' : ''} cursor-pointer select-none text-black text-xs font-medium mr-2 px-0.5 py-0.5 rounded text-center">{m.path.substring(m.path.lastIndexOf("/") + 1, m.path.length)}</p>
-                </div>
-              {/if}
-            {/each}
-          </div>
-          {#each errors as e, i}
-            <p class="text-red-500 p-0 m-0 font-bold text-xs italic">{$t(e.msg)}</p>
-          {/each}
-          <button class="btn-lg mt-4" on:click={() => placeOrder()}>{$t("profile.update")}</button>
-          {#if userBuilds}
-            <table class="tbl mt-6 mb-0">
-              <thead class="bg-gray-100">
-                <tr class="txt-sz txt-pad">
-                  <th class="tbl-hd">Название</th>
-                  <th class="tbl-hd">Версия</th>
-                  <th class="tbl-hd">Время</th>
+            <button class="btn-lg mt-4" on:click={() => placeOrder()}>{$t("profile.update")}</button>
+            {#if userBuilds}
+              <table class="tbl mt-6 mb-0">
+                <thead class="bg-gray-100">
+                  <tr class="txt-sz txt-pad">
+                    <th class="tbl-hd">Название</th>
+                    <th class="tbl-hd">Версия</th>
+                    <th class="tbl-hd">Время</th>

-                  <th class="tbl-hd">Подготовка</th>
-                  <th class="tbl-hd">Сборка build</th>
-                  <th class="tbl-hd">Сборка fs</th>
-                  <th class="tbl-hd" />
-                  <th class="tbl-hd w-7" />
-                </tr>
-              </thead>
-              <tbody class="bg-white">
-                {#each userBuilds as build, i}
-                  {#if build.projectProp.platformio.default_envs === myProfileJson.projectProp.platformio.default_envs}
-                    <tr class="txt-sz txt-pad">
-                      <td class="tbl-bdy-lg ipt-lg w-full">{build.projectProp.platformio.default_envs}</td>
-                      <td class="tbl-bdy-lg ipt-lg w-full">{build.ver}</td>
-                      <td class="tbl-bdy-lg ipt-lg w-full">{new Date(build.dateAdded).toLocaleString("ru", { timeZone: "Europe/Vienna" })}</td>
-                      {#if build.status.preparation === 0 && build.status.build === 0 && build.status.fs === 0}
-                        <td class="tbl-bdy-lg ipt-lg w-full">
-                          <p class="text-green-500 font-bold truncate">{"Ожидание очереди..."}</p>
-                        </td>
-                        <td class="tbl-bdy-lg ipt-lg w-full" />
-                        <td class="tbl-bdy-lg ipt-lg w-full" />
-                        <td class="tbl-bdy-lg ipt-lg w-full" />
-                      {:else}
-                        <td class="tbl-bdy-lg ipt-lg w-full">
-                          <div onClick={() => showLog(build, "py.txt")}>
-                            {st[build.status.preparation]}
-                          </div>
-                        </td>
-                        <td class="tbl-bdy-lg ipt-lg w-full">
-                          <div onClick={() => showLog(build, "build.txt")}>
-                            {st[build.status.build]}
-                          </div>
-                        </td>
-                        <td class="tbl-bdy-lg ipt-lg w-full">
-                          <div onClick={() => showLog(build, "fs.txt")}>{st[build.status.fs]}</div>
-                        </td>
-                        {#if build.status.build === 2 && build.status.preparation === 2 && build.status.fs === 2}
-                          <!-- svelte-ignore a11y-click-events-have-key-events -->
-                          <td on:click={() => updateBuild("http://portal.iotmanager.org/compiler/userdata/builds/" + build.orderId)} class="tbl-bdy-lg ipt-lg w-full cursor-pointer select-none bg-green-100 hover:bg-green-200">
-                            <p class="w-fill">Установить</p>
-                          </td>
-                        {:else}
-                          <td class="tbl-bdy-lg ipt-lg w-full" />
-                        {/if}
-
-                        {#if build.processed}
+                    <th class="tbl-hd">Подготовка</th>
+                    <th class="tbl-hd">Сборка build</th>
+                    <th class="tbl-hd">Сборка fs</th>
+                    <th class="tbl-hd" />
+                    <th class="tbl-hd w-7" />
+                  </tr>
+                </thead>
+                <tbody class="bg-white">
+                  {#each userBuilds as build, i}
+                    {#if build.projectProp.platformio.default_envs === myProfileJson.projectProp.platformio.default_envs}
+                      <tr class="txt-sz txt-pad">
+                        <td class="tbl-bdy-lg ipt-lg w-full">{build.projectProp.platformio.default_envs}</td>
+                        <td class="tbl-bdy-lg ipt-lg w-full">{build.ver}</td>
+                        <td class="tbl-bdy-lg ipt-lg w-full">{new Date(build.dateAdded).toLocaleString("ru", { timeZone: "Europe/Vienna" })}</td>
+                        {#if build.status.preparation === 0 && build.status.build === 0 && build.status.fs === 0}
                          <td class="tbl-bdy-lg ipt-lg w-full">
-                            <CrossIcon click={() => delBuild(build)} />
+                            <p class="text-green-500 font-bold truncate">{"Ожидание очереди..."}</p>
                          </td>
-                        {:else}
                          <td class="tbl-bdy-lg ipt-lg w-full" />
+                          <td class="tbl-bdy-lg ipt-lg w-full" />
+                          <td class="tbl-bdy-lg ipt-lg w-full" />
+                        {:else}
+                          <td class="tbl-bdy-lg ipt-lg w-full">
+                            <div onClick={() => showLog(build, "py.txt")}>
+                              {st[build.status.preparation]}
+                            </div>
+                          </td>
+                          <td class="tbl-bdy-lg ipt-lg w-full">
+                            <div onClick={() => showLog(build, "build.txt")}>
+                              {st[build.status.build]}
+                            </div>
+                          </td>
+                          <td class="tbl-bdy-lg ipt-lg w-full">
+                            <div onClick={() => showLog(build, "fs.txt")}>{st[build.status.fs]}</div>
+                          </td>
+                          {#if build.status.build === 2 && build.status.preparation === 2 && build.status.fs === 2}
+                            <!-- svelte-ignore a11y-click-events-have-key-events -->
+                            <td on:click={() => updateBuild("http://portal.iotmanager.org/compiler/userdata/builds/" + build.orderId)} class="tbl-bdy-lg ipt-lg w-full cursor-pointer select-none bg-green-100 hover:bg-green-200">
+                              <p class="w-fill">Установить</p>
+                            </td>
+                          {:else}
+                            <td class="tbl-bdy-lg ipt-lg w-full" />
+                          {/if}
+
+                          {#if build.processed}
+                            <td class="tbl-bdy-lg ipt-lg w-full">
+                              <CrossIcon click={() => delBuild(build)} />
+                            </td>
+                          {:else}
+                            <td class="tbl-bdy-lg ipt-lg w-full" />
+                          {/if}
                        {/if}
-                      {/if}
-                    </tr>
-                  {/if}
-                {/each}
-              </tbody>
-            </table>
-          {/if}
-          <button class="btn-lg mt-6" on:click={() => exit()}>{$t("profile.exit")}</button>
-        </Card>
+                      </tr>
+                    {/if}
+                  {/each}
+                </tbody>
+              </table>
+            {/if}
+            <button class="btn-lg mt-6" on:click={() => exit()}>{$t("profile.exit")}</button>
+          </Card>
+        </div>
      </div>
-    </div>
+    {/if}
  {:else}
    <div class="my-4">
      <div class="grd-1col1">