Relocate faq app into about app

Author: sdelquin

apps/about/admin.py

@@ -11,3 +11,6 @@ class AllyAdmin(admin.ModelAdmin):
         'twitter',
         'email',
     )
+
+
+admin.site.register(models.FAQItem)

apps/faq/migrations/0001_initial.py apps/about/migrations/0003_faqitem.pyapps/faq/migrations/0001_initial.py renamed to apps/about/migrations/0003_faqitem.py

@@ -1,13 +1,12 @@
-# Generated by Django 2.2.24 on 2021-10-22 18:11
+# Generated by Django 2.2.24 on 2021-10-26 17:43
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
-    initial = True
-
     dependencies = [
+        ('about', '0002_auto_20211019_2054'),
     ]
 
     operations = [

apps/about/models.py

@@ -16,3 +16,13 @@ def __str__(self):
 
     class Meta:
         ordering = ['name']
+
+
+class FAQItem(models.Model):
+    '''Preguntas frecuentes'''
+
+    question = models.CharField(max_length=200)
+    answer = models.TextField()
+
+    def __str__(self):
+        return self.question

apps/about/static/about/css/faq.scss

@@ -0,0 +1,10 @@
+.faq-index {
+  p {
+    padding-top: 0.5rem;
+    padding-bottom: 0.5rem;
+  }
+
+  .dyn-anchor-link i:hover {
+    color: tomato;
+  }
+}

apps/about/static/about/css/main.scss

@@ -2,3 +2,4 @@
 
 @import './about-us';
 @import './allies';
+@import './faq';

apps/faq/templates/faq/faq_list.html apps/about/templates/about/faq_list.htmlapps/faq/templates/faq/faq_list.html renamed to apps/about/templates/about/faq_list.html

@@ -1,4 +1,4 @@
-{% extends "faq/base.html" %}
+{% extends "about/base.html" %}
 
 {% block title %}Asociación - {{ block.super }}{% endblock %}
 
@@ -13,9 +13,8 @@ <h1 class="title">FAQ</h1>
 {% for faq in faqs %}
     <article class="faq" id="faq{{ faq.id }}">
         <div class="message-header dyn-anchor-heading">
-            <a id="#faq{{ faq.id }}">
-                Q: {{ faq.question }}
-            </a>
+            {{ faq.question }}
+            <a class="dyn-anchor-link" href="#faq{{ faq.id }}"><i class="fas fa-link"></i></a>
         </div>
         <div class="faq-answer">
             <p>{{ faq.answer|linebreaksbr }}</p>

apps/about/urls.py

@@ -10,4 +10,5 @@
     path('join/', views.join, name='join'),
     path('history/', views.history, name='history'),
     path('allies/', views.allies, name='allies'),
+    path('faq/', views.faq_list, name='faq'),
 ]

apps/about/views.py

@@ -4,7 +4,7 @@
 
 from apps.members.models import Position
 
-from .models import Ally
+from .models import Ally, FAQItem
 
 logger = logging.getLogger(__name__)
 
@@ -35,3 +35,8 @@ def history(request):
 def allies(request):
     allies = Ally.objects.all()
     return render(request, 'about/allies.html', {'allies': allies})
+
+
+def faq_list(request):
+    faqs = FAQItem.objects.order_by('id')
+    return render(request, 'about/faq_list.html', {'faqs': faqs})

apps/commons/templates/header.html

@@ -25,7 +25,7 @@
               <a class="navbar-item {% is_active 'about:history' %}" href="{% url 'about:history' %}">Historia</a>
               <a class="navbar-item {% is_active 'about:join' %}" href="{% url 'about:join' %}">¡Únete!</a>
               <a class="navbar-item {% is_active 'about:allies' %}" href="{% url 'about:allies' %}">Aliados</a>
-              <a class="navbar-item {% is_active 'faq:faq_list' %}" href="{% url 'faq:faq_list' %}">FAQ</a>
+              <a class="navbar-item {% is_active 'about:faq' %}" href="{% url 'about:faq' %}">FAQ</a>
           </div>
       </div>
       <div class="navbar-item has-dropdown is-hoverable">