From 6e4f44749e8a14c91425dd686ad42d27a52d7da9 Mon Sep 17 00:00:00 2001
From: kvakazyambra <kvakazyambra@gmail.com>
Date: Wed, 6 Sep 2023 23:45:12 +0300
Subject: [PATCH] Fix header subnavigation links

---
 src/components/Nav/Header/Header.tsx | 16 +++----
 src/components/Nav/Topics.tsx        | 67 +++++++++++++++++-----------
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/src/components/Nav/Header/Header.tsx b/src/components/Nav/Header/Header.tsx
index edb90465..b16f8697 100644
--- a/src/components/Nav/Header/Header.tsx
+++ b/src/components/Nav/Header/Header.tsx
@@ -274,13 +274,7 @@ export const Header = (props: Props) => {
                 <a href="/about/guide">Гид по дискурсу</a>
               </li>
               <li>
-                <a href="">Частые вопросы</a>
-              </li>
-              <li>
-                <a href="">Энциклопедия</a>
-              </li>
-              <li>
-                <a href="">Как поддержать?</a>
+                <a href="/about/manifest#participation">Как поддержать?</a>
               </li>
               <li>
                 <a href="/about/help">Как помочь?</a>
@@ -302,7 +296,7 @@ export const Header = (props: Props) => {
           >
             <ul class="nodash">
               <li>
-                <a href="">Искусство</a>
+                <a href="/expo/image">Искусство</a>
               </li>
               <li>
                 <a href="">Подкасты</a>
@@ -371,6 +365,12 @@ export const Header = (props: Props) => {
               <li>
                 <a href="">#Теории</a>
               </li>
+              <li class={styles.rightItem}>
+                <a href="/topics">
+                  {t('All topics')}
+                  <Icon name="arrow-right-black" class={clsx(styles.icon, styles.rightItemIcon)} />
+                </a>
+              </li>
             </ul>
           </div>
 
diff --git a/src/components/Nav/Topics.tsx b/src/components/Nav/Topics.tsx
index c2e0574e..1e014a5f 100644
--- a/src/components/Nav/Topics.tsx
+++ b/src/components/Nav/Topics.tsx
@@ -1,36 +1,51 @@
-import { For, Show } from 'solid-js'
-import type { Topic } from '../../graphql/types.gen'
 import { Icon } from '../_shared/Icon'
 import { useLocalize } from '../../context/localize'
 import './Topics.scss'
 
-export const NavTopics = (props: { topics: Topic[] }) => {
-  const { t, lang } = useLocalize()
-  const tag = (topic: Topic) =>
-    /[ЁА-яё]/.test(topic.title || '') && lang() !== 'ru' ? topic.slug : topic.title
-  // TODO: something about subtopics
+export const NavTopics = () => {
+  const { t } = useLocalize()
+
   return (
     <nav class="subnavigation wide-container text-2xl">
       <ul class="topics">
-        <Show when={props.topics.length > 0}>
-          <For each={props.topics}>
-            {(topic) => (
-              <li class="item">
-                <a href={`/topic/${topic.slug}`}>
-                  <span>#{tag(topic)}</span>
-                </a>
-              </li>
-            )}
-          </For>
-          <li class="item right">
-            <a href={`/topics`}>
-              <span>
-                {t('All topics')}
-                <Icon name="arrow-right-black" class={'icon'} />
-              </span>
-            </a>
-          </li>
-        </Show>
+        <li class="item">
+          <a href="/expo/image">Искусство</a>
+        </li>
+        <li class="item">
+          <a href="">Подкасты</a>
+        </li>
+        <li class="item">
+          <a href="">Спецпроекты</a>
+        </li>
+        <li class="item">
+          <a href="">#Интервью</a>
+        </li>
+        <li class="item">
+          <a href="">#Репортажи</a>
+        </li>
+        <li class="item">
+          <a href="">#Личный опыт</a>
+        </li>
+        <li class="item">
+          <a href="">#Общество</a>
+        </li>
+        <li class="item">
+          <a href="">#Культура</a>
+        </li>
+        <li class="item">
+          <a href="">#Теории</a>
+        </li>
+        <li class="item">
+          <a href="">#Поэзия</a>
+        </li>
+        <li class="item right">
+          <a href={`/topics`}>
+            <span>
+              {t('All topics')}
+              <Icon name="arrow-right-black" class={'icon'} />
+            </span>
+          </a>
+        </li>
       </ul>
     </nav>
   )