feeds-fun 1.22.6 → 1.22.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "feeds-fun",
-  "version": "1.22.6",
+  "version": "1.22.8",
   "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/RuleForList.vue

@@ -24,6 +24,7 @@
           v-for="tag of rule.tags"
           :key="tag"
           :uid="tag"
+          :excluded="rule.excludedTags.includes(tag)"
           :css-modifier="cssModifiers[tag]" />
       </div>
     </div>
@@ -80,11 +81,11 @@
 
   const cssModifiers: {[key: string]: string} = {};
 
+  const modifier = properties.rule.score > 0 ? "positive" : "negative";
+
+  console.log("score", properties.rule.score, "modifier", modifier);
+
   for (const tag of properties.rule.tags) {
-    if (properties.rule.excludedTags.includes(tag)) {
-      cssModifiers[tag] = "negative";
-      continue;
-    }
-    cssModifiers[tag] = "positive";
+    cssModifiers[tag] = modifier;
   }
 </script>

package/src/components/page_footer/Footer.vue

@@ -4,8 +4,6 @@
       <div class="flex flex-col col-span-2 items-center sm:items-start">
         <h3 class="text-lg font-semibold mb-4">Feeds Fun</h3>
         <div class="flex flex-col space-y-2">
-          <div class="font-medium"> The project is in demo mode and free of charge </div>
-
           <div>Version: {{ settings.version }}</div>
 
           <div>
@@ -73,6 +71,14 @@
             Privacy Policy
           </a>
 
+          <a
+            v-if="settings.crmImpressum"
+            :href="router.resolve({name: 'impressum'}).href"
+            class="ffun-normal-link"
+            @click.prevent="router.push({name: 'impressum'})">
+            Impressum
+          </a>
+
           <a
             v-if="!globalState.isSingleUserMode"
             href="#"

package/src/components/tags/Base.vue

@@ -1,4 +1,5 @@
 <template>
+  <strong v-if="excluded">not </strong>
   <span>
     {{ tagInfo.name }}
 
@@ -26,5 +27,6 @@
 
   const properties = defineProps<{
     tagInfo: t.TagInfo;
+    excluded?: boolean;
   }>();
 </script>

package/src/components/tags/RuleTag.vue

@@ -2,7 +2,9 @@
   <div
     :class="classes"
     @click.prevent="onClick()">
-    <tag-base :tag-info="tagInfo" />
+    <tag-base
+      :tag-info="tagInfo"
+      :excluded="excluded" />
   </div>
 </template>
 
@@ -26,6 +28,7 @@
   const properties = defineProps<{
     uid: string;
     cssModifier: string;
+    excluded: boolean;
   }>();
 
   const tagInfo = computed(() => {

package/src/logic/api.ts

@@ -41,6 +41,10 @@ export function logoutRedirect() {
   window.location.assign("/spa/auth/logout");
 }
 
+function handle503() {
+  window.location.reload();
+}
+
 let _refreshingAuth: Promise<void> | null = null;
 
 enum Ffun401Behaviour {
@@ -60,6 +64,10 @@ apiPrivate.interceptors.response.use(
       throw error;
     }
 
+    if (response.status === 503) {
+      return handle503();
+    }
+
     if (response.status !== 401) {
       throw error;
     }
@@ -99,6 +107,23 @@ apiPrivate.interceptors.response.use(
   }
 );
 
+apiPublic.interceptors.response.use(
+  (r) => r,
+  async (error: AxiosError) => {
+    const {response} = error;
+
+    if (!response) {
+      throw error;
+    }
+
+    if (response.status === 503) {
+      return handle503();
+    }
+
+    throw error;
+  }
+);
+
 async function postPublic({url, data}: {url: string; data: any}) {
   const response = await apiPublic.post(url, data);
   return response.data;

package/src/logic/settings.ts

@@ -20,6 +20,7 @@ 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 crmImpressum = import.meta.env.VITE_FFUN_CRM_IMPRESSUM || null;
 
 export const hasCollections = import.meta.env.VITE_FFUN_HAS_COLLECTIONS == "true" || false;
 

package/src/router/index.ts

@@ -69,6 +69,12 @@ const router = createRouter({
       component: CRMView,
       props: {content: settings.crmPrivacy, kind: "privacy"}
     },
+    {
+      path: "/impressum",
+      name: "impressum",
+      component: CRMView,
+      props: {content: settings.crmImpressum, kind: "impressum"}
+    },
     {
       path: "/:pathMatch(.*)*",
       redirect: "/"