From 46b0174d840812aa09970e922ef4c3b2647d98fe Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 20 Oct 2022 16:30:35 -0500 Subject: [PATCH 1/7] feat(tup-cms): tup-348 portal nav (minimal, rough) --- apps/tup-cms/Dockerfile | 2 +- apps/tup-cms/src/apps/portal_nav/__init__.py | 0 apps/tup-cms/src/apps/portal_nav/apps.py | 5 ++ .../templates/portal_nav/nav_portal.raw.html | 54 +++++++++++++++++++ apps/tup-cms/src/apps/portal_nav/urls.py | 7 +++ apps/tup-cms/src/apps/portal_nav/views.py | 10 ++++ .../src/taccsite_cms/custom_app_settings.py | 2 +- apps/tup-cms/src/taccsite_cms/urls_custom.py | 1 + 8 files changed, 79 insertions(+), 2 deletions(-) create mode 100644 apps/tup-cms/src/apps/portal_nav/__init__.py create mode 100644 apps/tup-cms/src/apps/portal_nav/apps.py create mode 100644 apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html create mode 100644 apps/tup-cms/src/apps/portal_nav/urls.py create mode 100644 apps/tup-cms/src/apps/portal_nav/views.py diff --git a/apps/tup-cms/Dockerfile b/apps/tup-cms/Dockerfile index 25e548ab2..371e0e96b 100644 --- a/apps/tup-cms/Dockerfile +++ b/apps/tup-cms/Dockerfile @@ -1,4 +1,4 @@ -FROM taccwma/core-cms:07426b3 +FROM taccwma/core-cms:977ecc0 WORKDIR /code diff --git a/apps/tup-cms/src/apps/portal_nav/__init__.py b/apps/tup-cms/src/apps/portal_nav/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/apps/tup-cms/src/apps/portal_nav/apps.py b/apps/tup-cms/src/apps/portal_nav/apps.py new file mode 100644 index 000000000..6bbe26fe5 --- /dev/null +++ b/apps/tup-cms/src/apps/portal_nav/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class PortalNavConfig(AppConfig): + name = 'portal_nav' diff --git a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html new file mode 100644 index 000000000..067f80ef7 --- /dev/null +++ b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html @@ -0,0 +1,54 @@ +{# @var user #} + + +{# GH-101: Remove style tag i.e. rely only on `site.header.css` #} + +{% if user.is_authenticated %} +
  • + + +
    • +{% else %} +
  • + + Log in + +
    • +{% endif %} diff --git a/apps/tup-cms/src/apps/portal_nav/urls.py b/apps/tup-cms/src/apps/portal_nav/urls.py new file mode 100644 index 000000000..421678c8a --- /dev/null +++ b/apps/tup-cms/src/apps/portal_nav/urls.py @@ -0,0 +1,7 @@ +from django.urls import re_path +from .views import PortalNavView + +app_name = 'portal_nav' +urlpatterns = [ + re_path('', PortalNavView, name='index'), +] diff --git a/apps/tup-cms/src/apps/portal_nav/views.py b/apps/tup-cms/src/apps/portal_nav/views.py new file mode 100644 index 000000000..97cd2113f --- /dev/null +++ b/apps/tup-cms/src/apps/portal_nav/views.py @@ -0,0 +1,10 @@ +from django.http import HttpResponse +from django.template import loader, Context +from django.contrib.auth import authenticate + + +def PortalNavView(request): + user = authenticate(request) + context = {'user': user} + template = loader.get_template('portal_nav/nav_portal.raw.html') + return HttpResponse(template.render(context, request)) diff --git a/apps/tup-cms/src/taccsite_cms/custom_app_settings.py b/apps/tup-cms/src/taccsite_cms/custom_app_settings.py index 676e06d27..245145567 100644 --- a/apps/tup-cms/src/taccsite_cms/custom_app_settings.py +++ b/apps/tup-cms/src/taccsite_cms/custom_app_settings.py @@ -1,3 +1,3 @@ -CUSTOM_APPS = ['apps.dashboard'] +CUSTOM_APPS = ['apps.portal_nav', 'apps.dashboard'] CUSTOM_MIDDLEWARE = [] STATICFILES_DIRS = () diff --git a/apps/tup-cms/src/taccsite_cms/urls_custom.py b/apps/tup-cms/src/taccsite_cms/urls_custom.py index b6f16bd35..6488e365a 100644 --- a/apps/tup-cms/src/taccsite_cms/urls_custom.py +++ b/apps/tup-cms/src/taccsite_cms/urls_custom.py @@ -1,5 +1,6 @@ from django.urls import path, include custom_urls = [ + path('core/markup/nav/', include('apps.portal_nav.urls', namespace='portal_nav')), path('dashboard/', include('apps.dashboard.urls', namespace='dashboard')), ] From e0bb6a3e7d38714c1f1d03989b8ee54d00a8631e Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Thu, 20 Oct 2022 19:05:12 -0500 Subject: [PATCH 2/7] feat(tup-cms): tup-348 nx format:write --- .../templates/portal_nav/nav_portal.raw.html | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html index 067f80ef7..77cac3cfc 100644 --- a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html +++ b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html @@ -12,13 +12,21 @@ vertical-align: text-bottom; /* tweaked to align better */ } .s-portal-nav .nav-link .icon { - font-size: 1.5em; - vertical-align: middle; /* tweaked to align better */ + font-size: 1.5em; + vertical-align: middle; /* tweaked to align better */ } {% if user.is_authenticated %}
  • - - - - - - {# WARNING: Some markup is duplicated in other repositories #} - {# SEE: https://confluence.tacc.utexas.edu/x/LoCnCQ #} - {# FAQ: Extra space makes eases comparison of similar templates #} - - - - + {# WARNING: Some markup is duplicated in other repositories #} {# SEE: + https://confluence.tacc.utexas.edu/x/LoCnCQ #} {# FAQ: Extra space makes + eases comparison of similar templates #} Log Out From 2e29bdab442fbb19478d6f1bdf73eb9143fb7db6 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 21 Oct 2022 09:43:41 -0500 Subject: [PATCH 3/7] fix(tup-cms): tup-348 template comment malformed --- .../apps/portal_nav/templates/portal_nav/nav_portal.raw.html | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html index 77cac3cfc..6e0f08700 100644 --- a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html +++ b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html @@ -36,9 +36,8 @@ My Dashboard - {# WARNING: Some markup is duplicated in other repositories #} {# SEE: - https://confluence.tacc.utexas.edu/x/LoCnCQ #} {# FAQ: Extra space makes - eases comparison of similar templates #} + {# WARNING: Some markup is duplicated in other repositories: + https://confluence.tacc.utexas.edu/x/LoCnCQ #} Log Out From 9cfa9f80eaf85397141797cd824529e31ade30a1 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 21 Oct 2022 09:45:36 -0500 Subject: [PATCH 4/7] fix(tup-cms): tup-348 template comment malformed 2 --- .../apps/portal_nav/templates/portal_nav/nav_portal.raw.html | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html index 6e0f08700..adc6f1eac 100644 --- a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html +++ b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html @@ -16,6 +16,7 @@ vertical-align: middle; /* tweaked to align better */ } +{# WARNING: Some markup is duplicated in other repositories: https://confluence.tacc.utexas.edu/x/LoCnCQ #} {% if user.is_authenticated %}
  • My Dashboard - - {# WARNING: Some markup is duplicated in other repositories: - https://confluence.tacc.utexas.edu/x/LoCnCQ #} - Log Out From b43378f1ae724cc662b47933d367cc7ee485ae49 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Fri, 21 Oct 2022 13:14:29 -0500 Subject: [PATCH 5/7] fix(tup-cms): tup-348 template comment malformed 3 --- .../apps/portal_nav/templates/portal_nav/nav_portal.raw.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html index adc6f1eac..f2ba384da 100644 --- a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html +++ b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html @@ -1,4 +1,5 @@ -{# @var user #} +{# @var user #} {# WARNING: Some markup is duplicated in other repositories: +https://confluence.tacc.utexas.edu/x/LoCnCQ #} @@ -16,7 +17,6 @@ vertical-align: middle; /* tweaked to align better */ } -{# WARNING: Some markup is duplicated in other repositories: https://confluence.tacc.utexas.edu/x/LoCnCQ #} {% if user.is_authenticated %}
  • Date: Wed, 2 Nov 2022 10:06:42 -0500 Subject: [PATCH 6/7] feat(tup-cms): tup-348 nx format:write MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The `nx format:write` is braking django HTML single-line comments into multi-line comments 😠. --- .../apps/portal_nav/templates/portal_nav/nav_portal.raw.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html index f2ba384da..fa2507651 100644 --- a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html +++ b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html @@ -1,5 +1,5 @@ -{# @var user #} {# WARNING: Some markup is duplicated in other repositories: -https://confluence.tacc.utexas.edu/x/LoCnCQ #} +{# @var user #} {% comment %}WARNING: Some markup is duplicated in other +repositories: https://confluence.tacc.utexas.edu/x/LoCnCQ {% endcomment %} From 03a6aae60f07869557b09de01d40a37958228de9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 2 Nov 2022 14:58:53 -0500 Subject: [PATCH 7/7] docs(tup-cms): tup-348 single-line comment Since 28dd2f0, single-line commits will not be broken by nx format. --- .../apps/portal_nav/templates/portal_nav/nav_portal.raw.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html index fa2507651..c90cbd1e2 100644 --- a/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html +++ b/apps/tup-cms/src/apps/portal_nav/templates/portal_nav/nav_portal.raw.html @@ -1,5 +1,5 @@ -{# @var user #} {% comment %}WARNING: Some markup is duplicated in other -repositories: https://confluence.tacc.utexas.edu/x/LoCnCQ {% endcomment %} +{# @var user #} +{# WARNING: Some markup is duplicated in other repositories: https://confluence.tacc.utexas.edu/x/LoCnCQ #}