Merge pull request #81 from Simple2B/svyat/feat/favicon

Svyat/feat/favicon
2023-05-26 16:55:38 +03:00 · 2023-05-26 16:55:38 +03:00 · 99b3590dd5
parent bb7281f928 4e03dc64af
commit 99b3590dd5
22 changed files with 86 additions and 25 deletions
--- a/app/templates/auth/login.html
+++ b/app/templates/auth/login.html
@ -1,7 +1,10 @@
 {% extends "base.html" %}
 <!-- prettier-ignore -->
-{% block body %}

+{% block title %}Login{% endblock %}
+
+
+{% block body %}
 <!-- component -->
 <div class="bg-gray-50 dark:bg-gray-900 h-screen pt-20">
  <section>
--- a/app/templates/base.html
+++ b/app/templates/base.html
@ -2,13 +2,21 @@
 <html lang="en">
  <head>
    <meta charset="utf-8" />
-    <title>{{ config.APP_NAME }}</title>
+
+    <title>{% block title %}{{ config.APP_NAME }}{% endblock %}</title>
+
    <!-- meta -->
    <meta name="description" content="OpenLaw Flask App" />
    <meta name="author" content="Simple2B" />
    <meta name="viewport" content="width=device-width,initial-scale=1" />

    {% block meta %}{% endblock %}
+    <!-- favicon -->
+    <link
+      rel="icon"
+      type="image/x-icon"
+      href="{{ url_for('static', filename='img/logo.svg') }}"
+    />

    <!-- styles -->
    <!-- prettier-ignore -->
@ -35,7 +43,7 @@
    {% endblock %}
  </head>

-  <body class="bg-white dark:bg-gray-800">
+  <body class="bg-white dark:bg-gray-800" >
    <!-- Header -->
    <!-- prettier-ignore -->
    {% include 'header.html' %}
--- a/app/templates/book/all.html
+++ b/app/templates/book/all.html
@ -1,7 +1,9 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
-{% block content %}

+{% block title %}Books{% endblock %}
+
+{% block content %}
 <div class="md:mr-64 relative overflow-x-auto shadow-md sm:rounded-lg mt-1">
  <!-- prettier-ignore -->
  <div class="p-5 flex border-b-2 border-gray-200 border-solid dark:border-gray-700 text-gray-900 dark:text-white dark:divide-gray-700">
--- a/app/templates/book/collection_view.html
+++ b/app/templates/book/collection_view.html
@ -12,6 +12,8 @@
 {% include 'book/delete_section_modal.html' %}
 {% endif %}

+{% block title %}{{book.label[:32]}}{% endblock %}
+

 {% block content %}
 <div class="flex overflow-hidden">
--- a/app/templates/book/favorite_books.html
+++ b/app/templates/book/favorite_books.html
@ -1,8 +1,10 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
 {% set selected_tab='favorite_books' %}
-{% block content %}

+{% block title %}Favorite Books{% endblock %}
+
+{% block content %}
 <div
  class="md:mr-64 pt-1 relative overflow-x-auto shadow-md sm:rounded-lg mt-1 h-box w-box flex">
  {% if not current_user.is_authenticated %}
--- a/app/templates/book/interpretation_view.html
+++ b/app/templates/book/interpretation_view.html
@ -7,6 +7,7 @@
  {% endblock %}
 {% endif %}

+{% block title %}{{section.label}}{% endblock %}

 {% block content %}
 {% include 'book/breadcrumbs_navigation.html'%}
--- a/app/templates/book/my_contributions.html
+++ b/app/templates/book/my_contributions.html
@ -1,8 +1,10 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
 {% set selected_tab='my_contributions' %}
-{% block content %}

+{% block title %}My Contributions{% endblock %}
+
+{% block content %}
 <div
  class="md:mr-64 pt-1 relative overflow-x-auto shadow-md sm:rounded-lg mt-1 h-box w-box flex">
  {% if not current_user.is_authenticated %}
--- a/app/templates/book/my_library.html
+++ b/app/templates/book/my_library.html
@ -1,6 +1,9 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
 {% set selected_tab='my_library' %}
+
+{% block title %}My Library{% endblock %}
+
 {% block content %}

 {% if current_user.is_authenticated %}
@ -110,7 +113,7 @@
  </div>
  {% endif %}
  </div>
-</div>  
+</div>
 <!-- prettier-ignore -->
 {% endblock %}
 <!-- prettier-ignore -->
--- a/app/templates/book/qa_view.html
+++ b/app/templates/book/qa_view.html
@ -10,6 +10,7 @@
 {% endblock %}
 {% endif %}

+{% block title %}{{ section.label[:32] }}{% endblock %}

 {% block content %}
 {% include 'book/breadcrumbs_navigation.html'%}
--- a/app/templates/book/settings.html
+++ b/app/templates/book/settings.html
@ -3,6 +3,9 @@
 {% include 'book/add_contributor_modal.html' %}
 {% include 'book/delete_book_modal.html' %}

+
+{% block title %}Book Settings{% endblock %}
+
 {% block content %}
 <!-- Hide right_sidebar -->
 <!-- prettier-ignore -->
--- a/app/templates/book/stat.html
+++ b/app/templates/book/stat.html
@ -1,5 +1,8 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
+
+{% block title %}Statistics{% endblock %}
+
 {% block content %}
 <div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
  <!-- prettier-ignore -->
--- a/app/templates/book/sub_collection_view.html
+++ b/app/templates/book/sub_collection_view.html
@ -14,6 +14,7 @@
 {% include 'book/add_section_modal.html' %}
 {% endif %}

+{% block title %}{{book.label[:32]}}{% endblock %}

 {% block right_sidebar %}
  {% include 'book/right_sidebar.html' %}
--- a/app/templates/searchResultsBooks.html
+++ b/app/templates/searchResultsBooks.html
@ -1,5 +1,8 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
+
+{% block title %}Search results{% endblock %}
+
 {% block content %}
 <div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
  <!-- prettier-ignore -->
@ -10,9 +13,9 @@
  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Showing {{count}} results </p>
  <!-- prettier-ignore -->
  <div class="border-b border-gray-200 dark:border-gray-700">
-    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">   
+    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">
        <li class="mr-2">
-            <a href="{{url_for('search.search_interpretations',q=query)}}" class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 group" > 
+            <a href="{{url_for('search.search_interpretations',q=query)}}" class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 group" >
                <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 mr-2 text-gray-400 group-hover:text-gray-500 dark:text-gray-500 dark:group-hover:text-gray-300" fill="currentColor" viewBox="0 0 24 24" stroke-width="1.5" > <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z" /> </svg>
                Interpretations
            </a>
--- a/app/templates/searchResultsInterpretations.html
+++ b/app/templates/searchResultsInterpretations.html
@ -1,5 +1,8 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
+
+{% block title %}Search results{% endblock %}
+
 {% block content %}
 <div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
  <!-- prettier-ignore -->
@ -10,9 +13,9 @@
  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Showing {{count}} results </p>
  <!-- prettier-ignore -->
 <div class="border-b border-gray-200 dark:border-gray-700">
-    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">   
+    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">
        <li class="mr-2">
-            <a  class="inline-flex p-4 text-blue-600 border-b-2 border-blue-600 rounded-t-lg active dark:text-blue-500 dark:border-blue-500 group" aria-current="page"> 
+            <a  class="inline-flex p-4 text-blue-600 border-b-2 border-blue-600 rounded-t-lg active dark:text-blue-500 dark:border-blue-500 group" aria-current="page">
                <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24" stroke-width="1.5" class="w-5 h-5 mr-2 text-blue-600 dark:text-blue-500"> <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z" /> </svg>
                Interpretations
            </a>
--- a/app/templates/searchResultsTags.html
+++ b/app/templates/searchResultsTags.html
@ -1,5 +1,8 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
+
+{% block title %}Search results{% endblock %}
+
 {% block content %}
 <div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
  <!-- prettier-ignore -->
@ -10,9 +13,9 @@
  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Showing {{count}} results </p>
  <!-- prettier-ignore -->
  <div class="border-b border-gray-200 dark:border-gray-700">
-    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">   
+    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">
        <li class="mr-2">
-            <a href="{{url_for('search.search_interpretations',q=query)}}" class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 group" > 
+            <a href="{{url_for('search.search_interpretations',q=query)}}" class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 group" >
                <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 mr-2 text-gray-400 group-hover:text-gray-500 dark:text-gray-500 dark:group-hover:text-gray-300" fill="currentColor" viewBox="0 0 24 24" stroke-width="1.5" > <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z" /> </svg>
                Interpretations
            </a>
--- a/app/templates/searchResultsUsers.html
+++ b/app/templates/searchResultsUsers.html
@ -1,5 +1,8 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
+
+{% block title %}Search results{% endblock %}
+
 {% block content %}
 <div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
  <!-- prettier-ignore -->
@ -10,9 +13,9 @@
  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Showing {{count}} results </p>
  <!-- prettier-ignore -->
  <div class="border-b border-gray-200 dark:border-gray-700">
-    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">   
+    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">
        <li class="mr-2">
-            <a href="{{url_for('search.search_interpretations',q=query)}}" class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 group" > 
+            <a href="{{url_for('search.search_interpretations',q=query)}}" class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 group" >
                <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 mr-2 text-gray-400 group-hover:text-gray-500 dark:text-gray-500 dark:group-hover:text-gray-300" fill="currentColor" viewBox="0 0 24 24" stroke-width="1.5" > <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z" /> </svg>
                Interpretations
            </a>
@ -53,7 +56,7 @@
                    <div class="pl-3">
                        <div class="text-base font-semibold">{{user.username}}</div>
                        <div class="font-normal text-gray-500">{{user.wallet_id}}</div>
-                    </div>  
+                    </div>
                </th>
                <td class="px-6 py-4">
                    <a href="{{ url_for('user.profile',user_id=user.id) }}" class="font-medium text-blue-600 dark:text-blue-500 hover:underline">Go to {{user.username}}'s library</a>
--- a/app/templates/section/all.html
+++ b/app/templates/section/all.html
@ -1,7 +1,9 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
-{% block content %}

+{% block title %}Sections{% endblock %}
+
+{% block content %}
 <div class="md:mr-64 relative overflow-x-auto shadow-md sm:rounded-lg mt-1">
  <!-- prettier-ignore -->
  <div class="p-5 flex border-b-2 border-gray-200 border-solid dark:border-gray-700 text-gray-900 dark:text-white dark:divide-gray-700">
--- a/app/templates/tagSearchResultsBooks.html
+++ b/app/templates/tagSearchResultsBooks.html
@ -1,18 +1,21 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
+
+{% block title %}Tag search results{% endblock %}
+
 {% block content %}
 <div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
  <!-- prettier-ignore -->
-  <h1 class="hidden md:inline font-extrabold text-lg dark:text-white ml-4 mt-5">Search results</h1>
+  <h1 class="hidden md:inline font-extrabold text-lg dark:text-white ml-4 mt-5">Tag search results</h1>
  <!-- prettier-ignore -->
-  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Search result for {{tag_name}} </p>
+  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400">Tag search result for {{tag_name}} </p>
  <!-- prettier-ignore -->
  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Showing {{count}} results </p>
  <!-- prettier-ignore -->
  <div class="border-b border-gray-200 dark:border-gray-700">
-    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">   
+    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">
        <li class="mr-2">
-            <a href="{{url_for('search.tag_search_interpretations',tag_name=tag_name)}}" class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 group" > 
+            <a href="{{url_for('search.tag_search_interpretations',tag_name=tag_name)}}" class="inline-flex p-4 border-b-2 border-transparent rounded-t-lg hover:text-gray-600 hover:border-gray-300 dark:hover:text-gray-300 group" >
                <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" class="w-5 h-5 mr-2 text-gray-400 group-hover:text-gray-500 dark:text-gray-500 dark:group-hover:text-gray-300" fill="currentColor" viewBox="0 0 24 24" stroke-width="1.5" > <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z" /> </svg>
                Interpretations
            </a>
--- a/app/templates/tagSearchResultsInterpretations.html
+++ b/app/templates/tagSearchResultsInterpretations.html
@ -1,18 +1,21 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
+
+{% block title %}Tag search results{% endblock %}
+
 {% block content %}
 <div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
  <!-- prettier-ignore -->
-  <h1 class="hidden md:inline font-extrabold text-lg dark:text-white ml-4 mt-5">Search results</h1>
+  <h1 class="hidden md:inline font-extrabold text-lg dark:text-white ml-4 mt-5">Tag search results</h1>
  <!-- prettier-ignore -->
-  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Search result for {{tag_name}} </p>
+  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Tag search result for {{tag_name}} </p>
  <!-- prettier-ignore -->
  <p class="hidden md:block text-sm ml-4 w-1/2 text-gray-500 text-center md:text-left dark:text-gray-400"> Showing {{count}} results </p>
  <!-- prettier-ignore -->
 <div class="border-b border-gray-200 dark:border-gray-700">
-    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">   
+    <ul class="flex flex-wrap -mb-px text-sm font-medium text-center text-gray-500 dark:text-gray-400">
        <li class="mr-2">
-            <a  class="inline-flex p-4 text-blue-600 border-b-2 border-blue-600 rounded-t-lg active dark:text-blue-500 dark:border-blue-500 group" aria-current="page"> 
+            <a  class="inline-flex p-4 text-blue-600 border-b-2 border-blue-600 rounded-t-lg active dark:text-blue-500 dark:border-blue-500 group" aria-current="page">
                <svg aria-hidden="true" xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="0 0 24 24" stroke-width="1.5" class="w-5 h-5 mr-2 text-blue-600 dark:text-blue-500"> <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 13.5l10.5-11.25L12 10.5h8.25L9.75 21.75 12 13.5H3.75z" /> </svg>
                Interpretations
            </a>
--- a/app/templates/user/edit_profile.html
+++ b/app/templates/user/edit_profile.html
@ -1,6 +1,9 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
 {% include 'user/delete_profile_modal.html' %}
+
+{% block title %}Edit Profile{% endblock %}
+
 {% block content %}
 <!-- component -->
 <section>
--- a/app/templates/user/profile.html
+++ b/app/templates/user/profile.html
@ -1,5 +1,9 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
+
+{% block title %}{{user.username.strip() + "'s profile" or user.wallet_id}}{% endblock %}
+
+
 {% block content %}
 <div class="border-b border-gray-200 dark:border-gray-700 md:mr-64">
  {% if user.is_deleted %}
--- a/app/templates/user/reactivate.html
+++ b/app/templates/user/reactivate.html
@ -1,6 +1,9 @@
 <!-- prettier-ignore -->
 {% extends 'base.html' %}
 {% include 'user/delete_profile_modal.html' %}
+
+{% block title %}Reactivate Profile{% endblock %}
+
 {% block content %}
 <!-- component -->
 <section>