Merge branch 'dev'

PoliNetworkOrg · Oct 28, 2023 · 95aae9e · 95aae9e
2 parents 88c7dd7 + 2417468
commit 95aae9e
Show file tree

Hide file tree

Showing 31 changed files with 624 additions and 427 deletions.
diff --git a/.prettierignore b/.prettierignore
@@ -1 +1,2 @@
-src/assets/*
+src/assets/*
+public/js/*
diff --git a/.prettierrc.json b/.prettierrc.json
@@ -1 +1,3 @@
-{}
+{
+  "trailingComma": "none"
+}
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />
@@ -42,7 +42,6 @@
     <div id="app"></div>
     <script type="module" src="/src/main.js"></script>
     <script src="/js/jquery.min.js"></script>
-    <script src="/js/darkmode.min.js"></script>
     <script src="/js/bootstrap.bundle.min.js"></script>
   </body>
 </html>
diff --git a/public/404.html b/public/404.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <meta charset="utf-8" />

diff --git a/public/js/bootstrap.bundle.min.js b/public/js/bootstrap.bundle.min.js
diff --git a/public/js/darkmode.min.js b/public/js/darkmode.min.js
diff --git a/src/App.vue b/src/App.vue
@@ -19,18 +19,18 @@ const { loggedIn } = storeToRefs(store);
   <header>
     <meta charset="utf-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    <link
-      rel="stylesheet"
-      href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap-nightshade.min.css"
-    />
   </header>
 
   <nav
     id="navbar"
     class="navbar navbar-expand-md navbar-dark bg-dark sticky-top"
   >
     <RouterLink to="/" class="navbar-title">
-      <a class="navbar-brand ms-3">PoliFemo Dashboard</a>
+      <img
+        class="mb-1 ms-2 small-logo"
+        src="https://polinetwork.org/img/polinetwork.png"
+      />
+      <a class="navbar-brand ms-2">PoliFemo Dashboard</a>
     </RouterLink>
     <button
       class="navbar-toggler"
@@ -155,8 +155,8 @@ export default {
     hasPermission: function (permission) {
       const store = usePolifemoStore();
       return store.perms.includes(permission);
-    },
-  },
+    }
+  }
 };
 </script>
 

diff --git a/src/assets/styles/bootstrap-nightshade.min.css b/src/assets/styles/bootstrap-nightshade.min.css
diff --git a/src/assets/styles/bootstrap.min.css b/src/assets/styles/bootstrap.min.css
diff --git a/src/assets/styles/main.css b/src/assets/styles/main.css
@@ -50,4 +50,13 @@
 .dotted-underline {
   border-bottom: 2px dotted;
   display: inline;
+}
+
+.small-logo {
+  height: 40px;
+}
+
+.tooltip-inner {
+  max-width: 250px!important;
+  width: 250px!important;; 
 }
diff --git a/src/components/ArticleListItem.vue b/src/components/ArticleListItem.vue
@@ -3,28 +3,36 @@ import {
   faCalendar,
   faLocationDot,
   faTrashCan,
-  faEye,
+  faEye
 } from "@fortawesome/free-solid-svg-icons";
 import { library } from "@fortawesome/fontawesome-svg-core";
 import axios from "axios";
 import { API_BASE_URL } from "@/plugins/AuthUtils";
 defineProps({
   id: {
     type: Number,
-    required: true,
+    required: true
   },
   targettime: {
     type: String,
-    required: false,
+    required: false
   },
   location: {
     type: Boolean,
-    required: false,
+    required: false
   },
   content: {
     type: Object,
-    required: true,
+    required: true
   },
+  buttons: {
+    type: String,
+    required: true
+  },
+  formoccurrence: {
+    type: Number,
+    required: true
+  }
 });
 
 library.add(faCalendar, faLocationDot, faTrashCan, faEye);
@@ -40,8 +48,8 @@ library.add(faCalendar, faLocationDot, faTrashCan, faEye);
           <i class="fas fa-location-dot" v-if="location"></i>
           {{ content.it.title || content.en.title }}
         </h5>
-        <div class="col text-truncate" v-if="content.it.subtitle || content.en.subtitle">
-          {{ content.it.subtitle || content.en.subtitle }}
+        <div class="col text-truncate" v-if="content.it.subtitle">
+          {{ content.it.subtitle }}
         </div>
         <div class="col text-truncate" v-else>Nessun sottotitolo</div>
       </div>
@@ -51,6 +59,7 @@ library.add(faCalendar, faLocationDot, faTrashCan, faEye);
             type="button"
             id="btn-preview"
             v-on:click="preview"
+            v-if="displayedButtons.includes('preview')"
             class="btn no-border btn-info rounded-start h-100 btn-list-item-action"
           >
             <i class="fas fa-eye"></i>
@@ -59,38 +68,40 @@ library.add(faCalendar, faLocationDot, faTrashCan, faEye);
             type="button"
             v-on:click="remove"
             id="btn-delete"
+            v-if="displayedButtons.includes('delete')"
             class="btn no-border btn-danger rounded-end h-100 btn-list-item-action"
           >
             <i class="fas fa-trash-can"></i>
           </button>
         </div>
       </div>
     </div>
-    <div :id="'preview-box-' + id" class="mt-2 border rounded d-none"></div>
+    <div :id="'preview-box-' + id + '-' + formoccurrence" class="mt-2 border rounded d-none"></div>
   </div>
 </template>
 
 <script>
-import Cherry from 'cherry-markdown/dist/cherry-markdown.core';
+import Cherry from "cherry-markdown/dist/cherry-markdown.core";
 export default {
   data() {
     return {
       cherryEditor: null,
-      previewBox: null
+      previewBox: null,
+      displayedButtons: this.buttons.split(",") || []
     };
   },
   mounted() {
-    this.previewBox = this.$el.querySelector("#preview-box-" + this.id);
+    this.previewBox = this.$el.querySelector("#preview-box-" + this.id + "-" + this.formoccurrence);
   },
   methods: {
     preview() {
-      if (this.cherryEditor && $(this.previewbox).hasClass("d-none")) {
-        $(previewbox).removeClass("d-none");
+      if (this.cherryEditor && $(this.previewBox).hasClass("d-none")) {
+        $(this.previewBox).removeClass("d-none");
       } else if (this.cherryEditor && !$(this.previewBox).hasClass("d-none")) {
         $(this.previewBox).addClass("d-none");
       } else {
         this.cherryEditor = new Cherry({
-          id: "preview-box-" + this.id, // Need this trick to avoid a bug always creating the editor in the first element of the list
+          id: "preview-box-" + this.id + "-" + this.formoccurrence, // Need this trick to avoid a bug always creating the editor in the first element of the list
           value: this.content.it.content || this.content.en.content,
           locale: "en_US",
           editor: {
@@ -114,8 +125,8 @@ export default {
             headers: {
               "Content-Type": "application/json",
               Authorization:
-                "Bearer " + localStorage.getItem("polifemo_access_token"),
-            },
+                "Bearer " + localStorage.getItem("polifemo_access_token")
+            }
           })
           .then(() => {
             this.emitter.emit("article-deleted", this.id);
@@ -136,8 +147,17 @@ export default {
         btn.classList.add("pending");
         btn.classList.remove("btn-list-item-action");
         btn.innerHTML = "Sicuro?";
+        setTimeout(() => {
+          this.stopPendingDeletion();
+        }, 5000);
       }
     },
-  },
+    stopPendingDeletion() {
+      var btn = this.$el.querySelector("#btn-delete");
+      btn.classList.remove("pending");
+      btn.classList.add("btn-list-item-action");
+      btn.innerHTML = '<i class="fas fa-trash-can"></i>';
+    }
+  }
 };
 </script>