feeds-fun 1.19.0 → 1.19.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.19.0",
+  "version": "1.19.2",
   "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/notifications/Block.vue

@@ -11,6 +11,7 @@
   import {useGlobalSettingsStore} from "@/stores/globalSettings";
   import {useCollectionsStore} from "@/stores/collections";
   import * as tagsFilterState from "@/logic/tagsFilterState";
+  import * as settings from "@/logic/settings";
 
   const properties = defineProps<{
     apiKey: boolean;
@@ -38,7 +39,8 @@
       properties.collectionsNotification_ &&
       globalSettings.userSettings &&
       !globalSettings.userSettings.hide_message_about_adding_collections.value &&
-      !tagsStates?.value.hasSelectedTags
+      !tagsStates?.value.hasSelectedTags &&
+      settings.hasCollections
     );
   });
 

package/src/logic/enums.ts

@@ -1,4 +1,5 @@
 import * as c from "@/logic/constants";
+import * as settings from "@/logic/settings";
 
 export type AnyEnum = {
   [key in keyof any]: string | number;
@@ -24,7 +25,7 @@ export const MainPanelModeProperties = new Map<MainPanelMode, MainPanelModePrope
   [MainPanelMode.Feeds, {text: "Feeds", showInMenu: true}],
   [MainPanelMode.Rules, {text: "Rules", showInMenu: true}],
   [MainPanelMode.Discovery, {text: "Discovery", showInMenu: true}],
-  [MainPanelMode.Collections, {text: "Collections", showInMenu: true}],
+  [MainPanelMode.Collections, {text: "Collections", showInMenu: settings.hasCollections}],
   [MainPanelMode.PublicCollection, {text: "Public Collection", showInMenu: false}],
   [MainPanelMode.Settings, {text: "Settings", showInMenu: true}]
 ]);

package/src/logic/settings.ts

@@ -29,6 +29,8 @@ export const utmLifetime = import.meta.env.VITE_FFUN_UTM_LIFETIME || 7; // days
 export const crmTerms = import.meta.env.VITE_FFUN_CRM_TERMS || null;
 export const crmPrivacy = import.meta.env.VITE_FFUN_CRM_PRIVACY || null;
 
+export const hasCollections = import.meta.env.VITE_FFUN_HAS_COLLECTIONS == "true" || false;
+
 console.log("settings.appName", appName);
 console.log("settings.appDomain", appDomain);
 console.log("settings.appPort", appPort);
@@ -55,4 +57,6 @@ console.log("settings.utmLifetime", utmLifetime);
 console.log("settings.crmTerms", crmTerms ? "set" : "not set");
 console.log("settings.crmPrivacy", crmPrivacy ? "set" : "not set");
 
+console.log("settings.hasCollections", hasCollections);
+
 export const isSingleUserMode = authMode === AuthMode.SingleUser;

package/src/views/MainView.vue

@@ -179,11 +179,11 @@
       </main-description>
     </main-block>
 
-    <main-header-line v-if="collections.collectionsOrder.length > 0">
+    <main-header-line v-if="settings.hasCollections">
       Curated news collections <br class="md:hidden" />for easy start
     </main-header-line>
 
-    <main-block>
+    <main-block v-if="settings.hasCollections">
       <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
         <template
           v-for="collectionId in collections.collectionsOrder"