feeds-fun 1.3.0 → 1.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.3.0",
+  "version": "1.4.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/NotificationCreateRuleHelp.vue

@@ -0,0 +1,13 @@
+<template>
+  <div class="ffun-info-attention">
+    <p> Make your first rule to experience the reader's full capabilities! </p>
+
+    <ul class="list-decimal list-inside">
+      <li>Click a tag under a news.</li>
+      <li>Select more tags if needed.</li>
+      <li>Set a score for the rule.</li>
+      <li>Click "Create Rule".</li>
+      <li>See how the news gets organized based on your preferences!</li>
+    </ul>
+  </div>
+</template>

package/src/components/Notifications.vue

@@ -1,6 +1,7 @@
 <template>
   <notification-openai-api-key v-if="showOpenAIKeyNotification" />
   <notification-collections v-if="showCollectionsNotification" />
+  <notification-create-rule-help v-if="showCreateRuleHelpNotification" />
 </template>
 
 <script lang="ts" setup>
@@ -10,6 +11,7 @@
   const properties = defineProps<{
     openaiApiKey: boolean;
     collections: boolean;
+    createRuleHelp: boolean;
   }>();
 
   const globalSettings = useGlobalSettingsStore();
@@ -26,7 +28,16 @@
     return properties.collections;
   });
 
+  const showCreateRuleHelpNotification = computed(() => {
+    return !showCollectionsNotification.value && properties.createRuleHelp;
+  });
+
   const showOpenAIKeyNotification = computed(() => {
-    return !showCollectionsNotification.value && properties.openaiApiKey && showApiKeyMessage.value;
+    return (
+      !showCollectionsNotification.value &&
+      !showCreateRuleHelpNotification.value &&
+      properties.openaiApiKey &&
+      showApiKeyMessage.value
+    );
   });
 </script>

package/src/main.ts

@@ -28,6 +28,7 @@ import OpenaiTokensUsage from "./components/OpenaiTokensUsage.vue";
 import FaviconElement from "./components/FaviconElement.vue";
 import NotificationCollections from "./components/NotificationCollections.vue";
 import NotificationOpenaiApiKey from "./components/NotificationOpenaiApiKey.vue";
+import NotificationCreateRuleHelp from "./components/NotificationCreateRuleHelp.vue";
 import Notifications from "./components/Notifications.vue";
 import RuleForList from "./components/RuleForList.vue";
 import UserSettingForNotification from "./components/UserSettingForNotification.vue";
@@ -71,6 +72,7 @@ app.component("OpenaiTokensUsage", OpenaiTokensUsage);
 app.component("FaviconElement", FaviconElement);
 app.component("NotificationCollections", NotificationCollections);
 app.component("NotificationOpenaiApiKey", NotificationOpenaiApiKey);
+app.component("NotificationCreateRuleHelp", NotificationCreateRuleHelp);
 app.component("Notifications", Notifications);
 app.component("RuleForList", RuleForList);
 app.component("UserSettingForNotification", UserSettingForNotification);

package/src/views/NewsView.vue

@@ -47,6 +47,7 @@
 
     <notifications
       v-if="entriesStore.loadedEntriesReport !== null"
+      :create-rule-help="hasEntries && !hasRules"
       :openai-api-key="true"
       :collections="!hasEntries" />
 
@@ -167,6 +168,21 @@
     return entriesNumber.value > 0;
   });
 
+  const hasRules = computed(() => {
+    if (!hasEntries.value) {
+      return false;
+    }
+
+    // TODO: is is heuristics (score could be 0 even with rules)
+    //       must be refactored to something more stable
+    for (const entryId of entriesReport.value) {
+      if (entriesStore.entries[entryId].score != 0) {
+        return true;
+      }
+    }
+    return false;
+  });
+
   const timeField = computed(() => {
     const orderProperties = e.EntriesOrderProperties.get(globalSettings.entriesOrder);