chore(base): rename information -> assistance

!43 #10

app/app/settings.py

@@ -114,6 +114,7 @@ INSTALLED_APPS = [
     'access.apps.AccessConfig',
     'itam.apps.ItamConfig',
     'itim.apps.ItimConfig',
+    'assistance.apps.AssistanceConfig',
     'settings.apps.SettingsConfig',
     'drf_spectacular',
     'drf_spectacular_sidecar',
@@ -358,7 +359,6 @@ if DEBUG:
 
     # Apps Under Development
     INSTALLED_APPS += [
-        'information.apps.InformationConfig',
         'project_management.apps.ProjectManagementConfig',
     ]
 

app/app/urls.py

@@ -42,6 +42,7 @@ urlpatterns = [
     path("account/", include("django.contrib.auth.urls")),
 
     path("organization/", include("access.urls")),
+    path("assistance/", include("assistance.urls")),
     path("itam/", include("itam.urls")),
     path("itim/", include("itim.urls")),
     path("config_management/", include("config_management.urls")),
@@ -73,8 +74,6 @@ if settings.DEBUG:
     urlpatterns += [
 
         path("__debug__/", include("debug_toolbar.urls"), name='_debug'),
-        # Apps Under Development
-        path("information/", include("information.urls")),
         path("project_management/", include("project_management.urls")),
     ]
 

app/assistance/apps.py

@@ -1,6 +1,6 @@
 from django.apps import AppConfig
 
 
-class InformationConfig(AppConfig):
+class AssistanceConfig(AppConfig):
     default_auto_field = 'django.db.models.BigAutoField'
-    name = 'information'
+    name = 'assistance'

app/assistance/urls.py

@@ -0,0 +1,11 @@
+from django.urls import path
+
+from assistance.views import knowledge_base
+
+app_name = "Assistance"
+
+urlpatterns = [
+
+    path("information", knowledge_base.Index.as_view(), name="Knowledge Base"),
+
+]

app/assistance/views/knowledge_base.py

@@ -7,9 +7,9 @@ from django.views import generic
 
 from access.mixin import OrganizationPermission
 
+from core.views.common import DisplayView
 
-
-class Index(generic.View):
+class Index(DisplayView):
 
     # permission_required = [
     #     'itil.view_knowledge_base'

app/information/urls.py

@@ -1,13 +0,0 @@
-from django.urls import path
-
-from . import views
-from .views import knowledge_base, playbooks
-
-app_name = "Information"
-
-urlpatterns = [
-
-    path("kb/", knowledge_base.Index.as_view(), name="Knowledge Base"),
-    path("playbook/", playbooks.Index.as_view(), name="Playbooks"),
-
-]

app/information/views/playbooks.py

@@ -1,29 +0,0 @@
-import json
-
-from django.db.models import Q
-from django.shortcuts import render
-from django.template import Template, Context
-from django.views import generic
-
-from access.mixin import OrganizationPermission
-
-
-
-class Index(generic.View):
-
-    # permission_required = [
-    #     'itil.view_playbook'
-    # ]
-
-    template_name = 'form.html.j2'
-
-    def get(self, request):
-        context = {}
-
-        user_string = Template("{% include 'icons/issue_link.html.j2' with issue=11 %}")
-        user_context = Context(context)
-        context['form'] = user_string.render(user_context)
-
-        context['content_title'] = 'Playbooks'
-
-        return render(request, self.template_name, context)

app/itim/urls.py

@@ -6,7 +6,7 @@ from itam.views import device, device_type, software, software_category, softwar
 app_name = "ITIM"
 urlpatterns = [
 
-    # path("clusters", device.IndexView.as_view(), name="Clusters"),
-    # path("services", device.IndexView.as_view(), name="Services"),
+    path("clusters", device.IndexView.as_view(), name="Clusters"),
+    path("services", device.IndexView.as_view(), name="Services"),
 
 ]

app/templates/icons/assistance.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M20 16V4H8V16H20M22 16C22 17.1 21.1 18 20 18H8C6.9 18 6 17.1 6 16V4C6 2.9 6.9 2 8 2H20C21.1 2 22 2.9 22 4V16M16 20V22H4C2.9 22 2 21.1 2 20V7H4V20H16M14.2 5C13.3 5 12.6 5.2 12.1 5.6C11.6 6 11.3 6.6 11.3 7.4H13.2C13.2 7.1 13.3 6.9 13.5 6.7C13.7 6.6 13.9 6.5 14.2 6.5C14.5 6.5 14.8 6.6 15 6.8C15.2 7 15.3 7.2 15.3 7.6C15.3 7.9 15.2 8.2 15.1 8.4C15 8.6 14.7 8.8 14.5 9C14 9.3 13.6 9.6 13.5 9.9C13.1 10.1 13 10.5 13 11H15C15 10.7 15 10.4 15.1 10.3C15.2 10.1 15.4 9.9 15.6 9.8C16 9.6 16.4 9.3 16.7 8.9C17 8.4 17.2 8 17.2 7.5C17.2 6.7 16.9 6.1 16.4 5.7C15.9 5.2 15.1 5 14.2 5M13 12V14H15V12H13Z" /></svg>

app/templates/icons/information.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 -960 960 960"><path d="M480-60q-72-68-165-104t-195-36v-440q101 0 194 36.5T480-498q73-69 166-105.5T840-640v440q-103 0-195.5 36T480-60Zm0-104q63-47 134-75t146-37v-276q-73 13-143.5 52.5T480-394q-66-66-136.5-105.5T200-552v276q75 9 146 37t134 75Zm0-436q-66 0-113-47t-47-113q0-66 47-113t113-47q66 0 113 47t47 113q0 66-47 113t-113 47Zm0-80q33 0 56.5-23.5T560-760q0-33-23.5-56.5T480-840q-33 0-56.5 23.5T400-760q0 33 23.5 56.5T480-680Zm0-80Zm0 366Z"/></svg>

app/templates/navigation.html.j2

@@ -24,7 +24,9 @@ span.navigation_icon {
 </style>
 <button class="collapsible{% if group.is_active %} active{% endif %}">
   <span class="navigation_icon">
-  {% if group.name == 'Access' %}
+  {% if group.name == 'Assistance' %}
+      {% include 'icons/assistance.svg' %}
+  {% elif group.name == 'Access' %}
       {% include 'icons/access.svg' %}
   {% elif group.name == 'Config Management' %}
       {% include 'icons/ansible.svg' %}
@@ -45,6 +47,8 @@ span.navigation_icon {
     <span class="navigation_icon">
     {% if group_urls.name == 'Devices' %}
         {% include 'icons/devices.svg' %}
+    {% elif group_urls.name == 'Knowledge Base' %}
+        {% include 'icons/information.svg' %}
     {% elif group_urls.name == 'Software' %}
         {% include 'icons/software.svg' %}
     {% elif group_urls.name == 'Groups' %}