feeds-fun 0.2.0 → 0.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "author": "Aliaksei Yaletski (Tiendil) <a.eletsky@gmail.com> (https://tiendil.org/)",
   "description": "Frontend for the Feeds Fun — web-based news reader",
   "keywords": [

package/src/components/EntryForList.vue

@@ -41,7 +41,9 @@
 
       <template v-if="showTags">
         <br />
-        <tags-list :tags="entry.tags" />
+        <tags-list
+          :tags="entry.tags"
+          :contributions="entry.scoreContributions" />
       </template>
 
       <div

package/src/components/FfunTag.vue

@@ -77,7 +77,8 @@
   .tag {
     display: inline-block;
     cursor: pointer;
-    padding: 0.25rem;
+    padding: 0.1rem;
+    margin-right: 0.2rem;
     white-space: nowrap;
   }
 
@@ -92,4 +93,12 @@
   .tag.excluded {
     background-color: #ffcccc;
   }
+
+  .tag.positive {
+    color: darkgreen;
+  }
+
+  .tag.negative {
+    color: darkred;
+  }
 </style>

package/src/components/TagsList.vue

@@ -9,7 +9,7 @@
       v-for="tag of displayedTags"
       :key="tag"
       :uid="tag"
-      :mode="!!selectedTags[tag] ? 'selected' : null"
+      :mode="tagMode(tag)"
       :count="entriesStore.reportTagsCount[tag]"
       count-mode="tooltip"
       @tag:clicked="onTagClicked" />
@@ -41,7 +41,7 @@
 
   const selectedTags = ref<{[key: string]: boolean}>({});
 
-  const properties = defineProps<{tags: string[]}>();
+  const properties = defineProps<{tags: string[]; contributions: {[key: string]: number}}>();
 
   const tagsNumber = computed(() => {
     return properties.tags.length;
@@ -55,6 +55,32 @@
     return preparedTags.value.slice(0, showLimit.value);
   });
 
+  function tagMode(tag: string) {
+    if (!!selectedTags.value[tag]) {
+      return "selected";
+    }
+
+    // return null;
+
+    if (!properties.contributions) {
+      return null;
+    }
+
+    if (!(tag in properties.contributions)) {
+      return null;
+    }
+
+    if (properties.contributions[tag] == 0) {
+      return null;
+    }
+
+    if (properties.contributions[tag] > 0) {
+      return "positive";
+    }
+
+    return "negative";
+  }
+
   const preparedTags = computed(() => {
     const values = [];
 
@@ -63,6 +89,17 @@
     }
 
     values.sort((a, b) => {
+      const aContributions = Math.abs(properties.contributions[a] || 0);
+      const bContributions = Math.abs(properties.contributions[b] || 0);
+
+      if (aContributions > bContributions) {
+        return -1;
+      }
+
+      if (aContributions < bContributions) {
+        return 1;
+      }
+
       const aCount = entriesStore.reportTagsCount[a];
       const bCount = entriesStore.reportTagsCount[b];
 

package/src/logic/types.ts

@@ -114,6 +114,7 @@ export class Entry {
   readonly tags: string[];
   readonly markers: e.Marker[];
   readonly score: number;
+  readonly scoreContributions: {[key: string]: number};
   readonly scoreToZero: number;
   readonly publishedAt: Date;
   readonly catalogedAt: Date;
@@ -127,6 +128,7 @@ export class Entry {
     tags,
     markers,
     score,
+    scoreContributions,
     publishedAt,
     catalogedAt,
     body
@@ -138,6 +140,7 @@ export class Entry {
     tags: string[];
     markers: e.Marker[];
     score: number;
+    scoreContributions: {[key: string]: number};
     publishedAt: Date;
     catalogedAt: Date;
     body: string | null;
@@ -149,6 +152,7 @@ export class Entry {
     this.tags = tags;
     this.markers = markers;
     this.score = score;
+    this.scoreContributions = scoreContributions;
     this.publishedAt = publishedAt;
     this.catalogedAt = catalogedAt;
     this.body = body;
@@ -181,6 +185,7 @@ export function entryFromJSON({
   tags,
   markers,
   score,
+  scoreContributions,
   publishedAt,
   catalogedAt,
   body
@@ -192,6 +197,7 @@ export function entryFromJSON({
   tags: string[];
   markers: string[];
   score: number;
+  scoreContributions: {[key: string]: number};
   publishedAt: string;
   catalogedAt: string;
   body: string | null;
@@ -210,6 +216,7 @@ export function entryFromJSON({
       throw new Error(`Unknown marker: ${m}`);
     }),
     score: score,
+    scoreContributions: scoreContributions,
     publishedAt: new Date(publishedAt),
     catalogedAt: new Date(catalogedAt),
     body: body

package/src/values/Score.vue

@@ -36,7 +36,7 @@
   .score {
     display: inline-block;
     cursor: pointer;
-    padding: 0.25rem;
+    padding: 0.1rem;
     background-color: #c1c1ff;
   }
 </style>

package/src/views/RulesView.vue

@@ -67,7 +67,7 @@
       const valueB = _.get(b, orderField, null);
 
       if (valueA === null && valueB === null) {
-        return 0;
+        return utils.compareLexicographically(a.tags, b.tags);
       }
 
       if (valueA === null) {
@@ -86,7 +86,7 @@
         return -1 * direction;
       }
 
-      return 0;
+      return utils.compareLexicographically(a.tags, b.tags);
     });
 
     return sorted;