Merge pull request #53 from stepanzh/52-restructure-app-menu

52 restructure app menu
stepanzh · Feb 16, 2024 · 1681d65 · 1681d65
2 parents 3b5eae5 + ba7b7ec
commit 1681d65
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 49 deletions.
diff --git a/build.py b/build.py
@@ -24,23 +24,14 @@ class JqueryCDN:
     'repository': 'https://github.com/stepanzh/Proportio',
     'vk_community': 'https://vk.com/proportioapp',
 }
+
 PROJECT_CONTACTS = {
     'Stepan': Contact(
         firstname='Степан',
         secondname='Захаров',
         telegram='https://t.me/red_deer',
         github='https://github.com/stepanzh',
     ),
-    'Alexandra': Contact(
-        firstname='Александра',
-        secondname='Кобец',
-        telegram='https://t.me/kobets_dez',
-    ),
-    'Mariya': Contact(
-        firstname='Мария',
-        secondname='Лукьянова',
-        telegram='https://t.me/Marnia_made'
-    ),
 }
 
 JQUERY = {

diff --git a/static/icons/book_open.svg b/static/icons/book_open.svg
diff --git a/static/icons/newspaper.svg b/static/icons/newspaper.svg
diff --git a/templates/base.html b/templates/base.html
@@ -86,7 +86,7 @@
           <a class='nav-item' href='index.html'>Приложение</a>
           <a class='nav-item' href='promo.html'>Подарки</a>
           <a class='nav-item' href='examples.html'>Рецепты</a>
-          <a class='nav-item' href='{{ links.payment }}' target='_blank'>Задонатить</a>
+          <a class='nav-item' href='{{ links.payment }}' target='_blank'>Поддержать</a>
         </nav>
       </div>
     </div>

diff --git a/templates/index.html b/templates/index.html
@@ -79,60 +79,36 @@
           </div>
         </section>
 
-        <!-- Recipe examples -->
+        <!-- Support development -->
         <section class="app-menu-item-group">
           <div class="app-menu-item">
-            <a href="examples.html" target="_blank">
-              <span class="app-menu-item__icon">{{ icons.academic_hat }}</span>
-              <span class="app-menu-item__caption">Примеры рецептов</span>
+            <a href="{{ links.payment }}" target="_blank">
+              <span class="app-menu-item__icon">{{ icons.dollar }}</span>
+              <span class="app-menu-item__caption">Поблагодарить автора</span>
               <span class="app-menu-item__external-link-icon">{{ icons.external_link_mini }}</span>
             </a>
           </div>
         </section>
 
-        <!-- Project help -->
+        <!-- Site navigation -->
         <section class="app-menu-item-group">
-          <header>Помощь проекту</header>
-          <!-- Help by donation -->
-          <div class="app-menu-item">
-            <a href="{{ links.payment }}" target="_blank">
-              <span class="app-menu-item__icon">{{ icons.dollar }}</span>
-              <span class="app-menu-item__caption">Помочь монетой</span>
-              <span class="app-menu-item__external-link-icon">{{ icons.external_link_mini }}</span>
-            </a>
-          </div>
-          <!-- Help by developing -->
+          <header>Разделы сайта</header>
           <div class="app-menu-item">
-            <a href="{{ links.repository }}" target="_blank">
-              <span class="app-menu-item__icon">{{ icons.github }}</span>
-              <span class="app-menu-item__caption">Помочь разработкой</span>
-              <span class="app-menu-item__external-link-icon">{{ icons.external_link_mini }}</span>
+            <a href="promo.html" target="_blank">
+              <span class="app-menu-item__icon">{{ icons.gift }}</span>
+              <span class="app-menu-item__caption">Подарки</span>
             </a>
           </div>
-          <!-- Help by feedback -->
           <div class="app-menu-item">
-            <a href="{{ contacts.Stepan.telegram }}" target="_blank">
-              <span class="app-menu-item__icon">{{ icons.chat }}</span>
-              <span class="app-menu-item__caption">Помочь словом</span>
-              <span class="app-menu-item__external-link-icon">{{ icons.external_link_mini }}</span>
+            <a href="examples.html" target="_blank">
+              <span class="app-menu-item__icon">{{ icons.book_open }}</span>
+              <span class="app-menu-item__caption">Рецепты</span>
             </a>
           </div>
-        </section>
-
-        <!-- Feedback -->
-          <section class="app-menu-item-group">
-          <header>Обратная связь</header>
           <div class="app-menu-item">
             <a href="{{ links.vk_community }}" target="_blank">
-              <span class="app-menu-item__icon">{{ icons.vk }}</span>
-              <span class="app-menu-item__caption">ВК сообщество</span>
-              <span class="app-menu-item__external-link-icon">{{ icons.external_link_mini }}</span>
-            </a>
-          </div>
-          <div class="app-menu-item">
-            <a href="{{ contacts.Stepan.telegram }}" target="_blank">
-              <span class="app-menu-item__icon">{{ icons.telegram }}</span>
-              <span class="app-menu-item__caption">{{ contacts.Stepan.firstname}} {{ contacts.Stepan.secondname }}</span>
+              <span class="app-menu-item__icon">{{ icons.newspaper }}</span>
+              <span class="app-menu-item__caption">Новости (ВКонтакте)</span>
               <span class="app-menu-item__external-link-icon">{{ icons.external_link_mini }}</span>
             </a>
           </div>