Fix hide blocked resources (#299)

sonic16x · Nov 1, 2024 · 6a1a59d · 6a1a59d
1 parent b81a245
commit 6a1a59d
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 66 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "interslavic",
-  "version": "1.20.4",
+  "version": "1.21.0",
   "license": "MIT",
   "description": "Interslavic Dictionary",
   "author": "Sergey Cherebedov",

diff --git a/src/components/Header/Header.tsx b/src/components/Header/Header.tsx
@@ -1,5 +1,5 @@
 import classNames from 'classnames';
-import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
 
 import { t } from 'translations';
@@ -12,8 +12,6 @@ import { useInterfaceLang } from 'hooks/useInterfaceLang';
 import { usePage } from 'hooks/usePage';
 import { defaultPages, pages } from 'routing';
 
-import { useCookie } from "../../hooks/useCookie";
-
 import './Header.scss';
 
 import LogoIcon from './images/logo-icon.svg';
@@ -31,8 +29,6 @@ export const Header =
         const enabledPages = useEnabledPages();
         const navRef = useRef<HTMLDivElement>();
         const logoRef = useRef<HTMLDivElement>();
-        const countryCode = useCookie('country')
-        const isRU = useMemo(() => countryCode === 'RU', [countryCode])
 
         const onResize = useCallback(() => {
             if (navRef && navRef.current && logoRef && logoRef.current) {
@@ -94,7 +90,7 @@ export const Header =
                 >
                     {pages
                         .filter(({ value }) => {
-                            if (value === 'community' && isRU) {
+                            if (value === 'community' && IS_COM) {
                                 return false
                             }
 

diff --git a/src/components/Link/Link.tsx b/src/components/Link/Link.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames';
-import { useEffect, useState } from 'react';
 
 import './Link.scss';
 
@@ -23,36 +22,16 @@ export const Link = (
     }: ILinkProps,
 ) => {
     const clsName = classNames(['link', className]);
-    const [isAvailable, setAvailable] = useState(false);
 
-    useEffect(() => {
-        try {
-            fetch(href, {
-                mode: 'no-cors',
-                cache: 'no-cache',
-            }).then((res) => {
-                if (res) {
-                    setAvailable(true);
-                }
-            });
-        } catch (err) {
-
-        }
-    }, [href, setAvailable]);
-
-    if (isAvailable) {
-        return (
-            <a
-                className={clsName}
-                href={href}
-                title={title}
-                target={target}
-                rel={rel}
-            >
-                {children}
-            </a>
-        );
-    }
-
-    return null;
+    return (
+        <a
+            className={clsName}
+            href={href}
+            title={title}
+            target={target}
+            rel={rel}
+        >
+            {children}
+        </a>
+    );
 };
diff --git a/src/components/Pages/About/About.tsx b/src/components/Pages/About/About.tsx
@@ -1,10 +1,7 @@
-import { useMemo } from "react";
-
 import { tablesData } from 'consts';
 
 import { t } from 'translations';
 
-import { useCookie } from "hooks/useCookie";
 import { getTablePublicUrl } from 'utils/getTablePublicUrl';
 
 import { Link } from 'components/Link';
@@ -14,8 +11,6 @@ import './About.scss';
 export const About =
     () => {
         const worksheetUrl = getTablePublicUrl(tablesData[0].spreadsheetId, tablesData[0].sheetId);
-        const countryCode = useCookie('country')
-        const isRU = useMemo(() => countryCode === 'RU', [countryCode])
         const email = '[email protected]';
         const github = 'https://github.com/sonic16x/interslavic';
         const source = 'http://steen.free.fr/interslavic';
@@ -42,11 +37,11 @@ export const About =
                         <div className="about-page__author">
                             {t('aboutAuthorSergeyCherebedov')}:
                             <a target="_blank" rel="noreferrer" href="https://github.com/sonic16x">GitHub</a>
-                            {!isRU && (
+                            {IS_COM && (
                                 <a target="_blank" rel="noreferrer"
                                     href="https://www.linkedin.com/in/scherebedov/">LinkedIn</a>
                             )}
-                            {!isRU && (
+                            {IS_COM && (
                                 <Link
                                     href="https://www.facebook.com/profile.php?id=100009366550621"
                                     target="_blank"
@@ -61,7 +56,7 @@ export const About =
                         <div className="about-page__author">
                             {t('aboutAuthorDenisShabalin')}:
                             <a target="_blank" rel="noreferrer" href="https://github.com/ru-danko">GitHub</a>
-                            {!isRU && (
+                            {IS_COM && (
                                 <Link
                                     href="https://www.facebook.com/d.y.shabalin"
                                     target="_blank"
@@ -85,7 +80,7 @@ export const About =
                         <hr/>
                         <h6>{t('aboutOurFriends')}</h6>
                         <div className="about-page__community-links">
-                            {!isRU && (
+                            {IS_COM && (
                                 <Link
                                     title="Interslavic Facebook"
                                     href="https://www.facebook.com/groups/interslavic"
@@ -95,7 +90,7 @@ export const About =
                                     Facebook community
                                 </Link>
                             )}
-                            {!isRU && (
+                            {IS_COM && (
                                 <a
                                     title="Interslavic Discord"
                                     href="https://discord.com/invite/n3saqm27QW"
@@ -138,7 +133,7 @@ export const About =
                                 />
                             </a>*/}
 
-                            {!isRU && (
+                            {IS_COM && (
                                 <a
                                     href="https://discord.com/invite/n3saqm27QW"
                                     title="Get it on Discord"

diff --git a/src/custom.d.ts b/src/custom.d.ts
@@ -9,3 +9,4 @@ declare const GOOGLE_WORD_ERRORS_TABLE_ID: string;
 declare const GOOGLE_SERVICE_ACCOUNT_EMAIL: string;
 declare const GOOGLE_PRIVATE_KEY: string;
 declare const FB: any;
+declare const IS_COM: boolean;
diff --git a/src/hooks/useCookie.ts b/src/hooks/useCookie.ts