fix: statistics (#13)

fix statistics bug, manager is only able to fetch users from same org div change icons close #12 Co-authored-by: Cristian Ayala <[email protected]>
Cristian-Ayala · Feb 25, 2023 · 7318ffd · 7318ffd
1 parent 04ac721
commit 7318ffd
Show file tree

Hide file tree

Showing 18 changed files with 24 additions and 36 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -490,4 +490,13 @@ module.exports = {
     //   https://eslint.org/docs/rules/template-curly-spacing
     "vue/template-curly-spacing": "error",
   },
+  overrides: [
+    {
+      files: ["*.html"],
+      rules: {
+        "vue/comment-directive": "off",
+        "max-len": "off",
+      }
+    }
+  ]
 };
diff --git a/index.html b/index.html
@@ -1,17 +1,16 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" href="src/assets/img/icons/icon.png" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <meta charset="UTF-8">
+    <link rel="icon" href="src/assets/img/icons/icon.png">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Acosta Repuestos</title>
     <link rel="stylesheet" href="src/assets/css/bootstrap.min.css">
-    <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" as="style" onload="this.onload=null;this.rel='stylesheet'"/>
-    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins:300,400,800&display=swap">
+    <link rel="preload" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" integrity="sha512-1ycn6IcaQQ40/MKBW2W4Rhis/DbILU74C1vSrLJxCq57o941Ym01SwNsOMqvEBFlcgUa6xLiPY/NS5R+E6ztJQ==" crossorigin="anonymous" referrerpolicy="no-referrer" as="style" onload="this.onload=null;this.rel='stylesheet'">
+    <link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Poppins:300,400,800&amp;display=swap">
     <link rel="stylesheet" href="src/assets/css/style.default.min.css" id="theme-stylesheet">
     <link rel="stylesheet" href="src/assets/css/custom.min.css">
     <meta name="description" content="Manage inventory and catalogs">
-    <link rel="apple-touch-icon" href="src/assets/img/icons/192x192.png" sizes="180x180">
     <link rel="mask-icon" href="src/assets/img/icons/192x192.png" color="#FFFFFF">
     <meta name="theme-color" content="#e94c63">
     <link rel="stylesheet" href="src/assets/css/element_plus_overwrite.css">
@@ -29,4 +28,4 @@
       window.process.nextTick = setTimeout;
     </script>
   </body>
-</html>
+</html>
diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/img/192x192.png b/public/img/192x192.png
diff --git a/public/img/512x512.png b/public/img/512x512.png
diff --git a/public/img/maskable_icon_x192.png b/public/img/maskable_icon_x192.png
diff --git a/public/img/maskable_icon_x512.png b/public/img/maskable_icon_x512.png
diff --git a/public/robots.txt b/public/robots.txt
diff --git a/src/assets/img/icons/16x16.png b/src/assets/img/icons/16x16.png
diff --git a/src/assets/img/icons/192x192.png b/src/assets/img/icons/192x192.png
diff --git a/src/assets/img/icons/32x32.png b/src/assets/img/icons/32x32.png
diff --git a/src/assets/img/icons/512x512.png b/src/assets/img/icons/512x512.png
diff --git a/src/assets/img/icons/icon.png b/src/assets/img/icons/icon.png
diff --git a/src/assets/img/icons/motor-sport.svg b/src/assets/img/icons/motor-sport.svg
diff --git a/src/components/Left-SideBar.vue b/src/components/Left-SideBar.vue
@@ -96,7 +96,7 @@
       @click="logout()"
     >
       <i class="fas fa-door-open mr-3 text-black my-2" aria-hidden="true"></i>
-      <span v-if="actualUser">Salir {{ userName }}</span>
+      <span v-if="actualUser">Salir <br>{{ userName }}</span>
     </a>
   </div>
 </template>

diff --git a/src/store/modules/categorias.js b/src/store/modules/categorias.js
@@ -155,28 +155,9 @@ export default (app) => ({
               live: true,
               retry: true,
             })
-            .on("change", (change) => {
-              console.log("yo, something changed!", change);
+            .on("change", () => {
               dispatch("getAllCategorias");
             })
-            .on("paused", (info) => {
-              console.log(
-                "replication was paused, usually because of a lost connection",
-                info,
-              );
-            })
-            .on("active", (info) => {
-              console.log("replication was resumed", info);
-            })
-            .on("denied", (err) => {
-              console.log(
-                "a document failed to replicate (e.g. due to permissions)",
-                err,
-              );
-            })
-            .on("complete", (info) => {
-              console.log("Completado", info);
-            })
             .on("error", (err) => {
               console.log("totally unhandled error (shouldn't happen)", err);
             });

diff --git a/src/store/modules/estadisticas.js b/src/store/modules/estadisticas.js
@@ -18,7 +18,9 @@ export default (app) => ({
         method: "GET",
         credentials: "include",
       };
-      if (searchParameters.userSelected === "Todos" && localStorage.getItem("role") !== "manager") return dispatch("getStatisticsByOrgDiv", { searchParameters, settings });
+      const role = localStorage.getItem("role");
+      if (searchParameters.userSelected === "Todos" && role === "manager") return dispatch("getStatisticsByOrgDiv", { searchParameters, settings });
+      if (searchParameters.typeOfFilter === "Por cede") return dispatch("getStatisticsByOrgDiv", { searchParameters, settings });
       return dispatch("getStatisticsByUser", { searchParameters, settings });
     },
     getStatisticsByUser(store, {searchParameters, settings}) {

diff --git a/vite.config.js b/vite.config.js
@@ -30,7 +30,7 @@ export default defineConfig({
         globPatterns: ["**/*.{js,css,html,ico,png,svg}"],
       },
       manifest: {
-        id: "1.0.0",
+        id: "2.0.0",
         version: "1.0.0",
         manifest_version: 1,
         name: "Acosta Repuestos",
@@ -39,7 +39,7 @@ export default defineConfig({
         description: "Manage inventory and catalogs",
         theme_color: "#e94c63",
         start_url: "/",
-        display: "fullscreen",
+        display: "standalone",
         background_color: "#e94c63",
         icons: [
           {
@@ -49,7 +49,7 @@ export default defineConfig({
             purpose: "any",
           },
           {
-            src: "img/192x192.png",
+            src: "img/maskable_icon_x192.png",
             sizes: "192x192",
             type: "image/png",
             purpose: "maskable",
@@ -61,7 +61,7 @@ export default defineConfig({
             purpose: "any",
           },
           {
-            src: "img/512x512.png",
+            src: "img/maskable_icon_x512.png",
             sizes: "512x512",
             type: "image/png",
             purpose: "maskable",