From 7d8f06d1090150ab1171bae0b95439bcf376eb0a Mon Sep 17 00:00:00 2001 From: Wesley B <62723358+wesleyboar@users.noreply.github.com> Date: Mon, 30 Sep 2024 18:49:23 -0500 Subject: [PATCH] =?UTF-8?q?enhance(ecep):=20ecep=5Fcms=20=E2=86=92=20ecep?= =?UTF-8?q?=5Fassets=20(#321)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * enhance(ecep): from _cms to _assets * chore(ecep): remove unnecessary CSS No need to hide branding via CS. We now hide via setting — `PORTAL_BRANDING = False` — in Core-Portal-Deloyments. --- .../ecep_cms => ecep_assets}/css/site.css | 10 ---- .../html}/snippets/page-members-css-old.html | 0 .../html}/snippets/page-members-css.html | 0 .../html}/snippets/page-members-js-old.html | 0 .../html}/snippets/page-members-js.html | 0 .../img/ecep-purple-has_words.svg | 0 .../img/ecep-purple-no_words-padded.jpeg | Bin .../img/ecep-purple-no_words.svg | 0 .../img/ecep-white-has_words.svg | 0 .../img/ecep-white-no_words.svg | 0 .../ecep_cms => ecep_assets}/img/favicon.ico | Bin ecep_cms/.dockerignore | 4 -- ecep_cms/Dockerfile | 6 -- ecep_cms/Makefile | 39 ------------- ecep_cms/README.md | 7 --- ecep_cms/docker-compose.dev.yml | 54 ------------------ .../src/taccsite_cms/custom_app_settings.py | 25 -------- .../taccsite_cms/templates/assets_custom.html | 22 ------- ecep_cms/src/taccsite_cms/urls_custom.py | 6 -- .../src/taccsite_custom/ecep_cms/__init__.py | 0 .../ecep_cms/templates/snippets/site-css.html | 3 - 21 files changed, 176 deletions(-) rename {ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms => ecep_assets}/css/site.css (86%) rename {ecep_cms/src/taccsite_custom/ecep_cms/templates => ecep_assets/html}/snippets/page-members-css-old.html (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/templates => ecep_assets/html}/snippets/page-members-css.html (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/templates => ecep_assets/html}/snippets/page-members-js-old.html (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/templates => ecep_assets/html}/snippets/page-members-js.html (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms => ecep_assets}/img/ecep-purple-has_words.svg (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms => ecep_assets}/img/ecep-purple-no_words-padded.jpeg (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms => ecep_assets}/img/ecep-purple-no_words.svg (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms => ecep_assets}/img/ecep-white-has_words.svg (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms => ecep_assets}/img/ecep-white-no_words.svg (100%) rename {ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms => ecep_assets}/img/favicon.ico (100%) delete mode 100644 ecep_cms/.dockerignore delete mode 100644 ecep_cms/Dockerfile delete mode 100644 ecep_cms/Makefile delete mode 100644 ecep_cms/README.md delete mode 100644 ecep_cms/docker-compose.dev.yml delete mode 100644 ecep_cms/src/taccsite_cms/custom_app_settings.py delete mode 100644 ecep_cms/src/taccsite_cms/templates/assets_custom.html delete mode 100644 ecep_cms/src/taccsite_cms/urls_custom.py delete mode 100755 ecep_cms/src/taccsite_custom/ecep_cms/__init__.py delete mode 100644 ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/site-css.html diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/css/site.css b/ecep_assets/css/site.css similarity index 86% rename from ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/css/site.css rename to ecep_assets/css/site.css index cc31e4b6..a2beb2f6 100644 --- a/ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/css/site.css +++ b/ecep_assets/css/site.css @@ -55,13 +55,3 @@ article.post-detail .byline { .s-header .navbar-brand { min-width: 76px; } - - - - - -/* UNORGANIZED */ - -/* SEE: TACC/Core-Styles/blob/main/source/_imports/branding_logos.css */ -/* NOTE: This is ONLY allowed because branding was added to Footer via CMS */ -#header-branding { display: none; } diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/page-members-css-old.html b/ecep_assets/html/snippets/page-members-css-old.html similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/page-members-css-old.html rename to ecep_assets/html/snippets/page-members-css-old.html diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/page-members-css.html b/ecep_assets/html/snippets/page-members-css.html similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/page-members-css.html rename to ecep_assets/html/snippets/page-members-css.html diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/page-members-js-old.html b/ecep_assets/html/snippets/page-members-js-old.html similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/page-members-js-old.html rename to ecep_assets/html/snippets/page-members-js-old.html diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/page-members-js.html b/ecep_assets/html/snippets/page-members-js.html similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/page-members-js.html rename to ecep_assets/html/snippets/page-members-js.html diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-purple-has_words.svg b/ecep_assets/img/ecep-purple-has_words.svg similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-purple-has_words.svg rename to ecep_assets/img/ecep-purple-has_words.svg diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-purple-no_words-padded.jpeg b/ecep_assets/img/ecep-purple-no_words-padded.jpeg similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-purple-no_words-padded.jpeg rename to ecep_assets/img/ecep-purple-no_words-padded.jpeg diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-purple-no_words.svg b/ecep_assets/img/ecep-purple-no_words.svg similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-purple-no_words.svg rename to ecep_assets/img/ecep-purple-no_words.svg diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-white-has_words.svg b/ecep_assets/img/ecep-white-has_words.svg similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-white-has_words.svg rename to ecep_assets/img/ecep-white-has_words.svg diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-white-no_words.svg b/ecep_assets/img/ecep-white-no_words.svg similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/ecep-white-no_words.svg rename to ecep_assets/img/ecep-white-no_words.svg diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/favicon.ico b/ecep_assets/img/favicon.ico similarity index 100% rename from ecep_cms/src/taccsite_custom/ecep_cms/static/ecep_cms/img/favicon.ico rename to ecep_assets/img/favicon.ico diff --git a/ecep_cms/.dockerignore b/ecep_cms/.dockerignore deleted file mode 100644 index a64885d2..00000000 --- a/ecep_cms/.dockerignore +++ /dev/null @@ -1,4 +0,0 @@ -.git -.cache -**/secrets.py -**/settings_local.py diff --git a/ecep_cms/Dockerfile b/ecep_cms/Dockerfile deleted file mode 100644 index c82c89f0..00000000 --- a/ecep_cms/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -FROM taccwma/core-cms:v4.14.0 - -WORKDIR /code - -COPY /src/taccsite_custom /code/taccsite_custom -COPY /src/taccsite_cms /code/taccsite_cms diff --git a/ecep_cms/Makefile b/ecep_cms/Makefile deleted file mode 100644 index 095a7d38..00000000 --- a/ecep_cms/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -DOCKERHUB_REPO := $(shell cat ./docker_repo.var) -DOCKER_TAG ?= $(shell git rev-parse --short HEAD) -DOCKER_IMAGE := $(DOCKERHUB_REPO):$(DOCKER_TAG) -DOCKER_IMAGE_LATEST := $(DOCKERHUB_REPO):latest -DOCKER_COMPOSE_CMD := $(shell if command -v docker-compose > /dev/null; then echo "docker-compose"; else echo "docker compose"; fi) - -# `DOCKER_IMAGE_BRANCH` tag is the git tag for the commit if it exists, else the branch on which the commit exists -DOCKER_IMAGE_BRANCH := $(DOCKERHUB_REPO):$(shell git describe --exact-match --tags 2> /dev/null || git symbolic-ref --short HEAD) - -#.PHONY: build -build: - $(DOCKER_COMPOSE_CMD) -f docker-compose.dev.yml build - -.PHONY: build-full -build-full: - docker build -t $(DOCKER_IMAGE) --target production -f Dockerfile . - docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_BRANCH) # Note: Currently broken for branches with slashes - -.PHONY: publish -publish: - docker push $(DOCKER_IMAGE) - docker push $(DOCKER_IMAGE_BRANCH) - -.PHONY: publish-latest -publish-latest: - docker tag $(DOCKER_IMAGE) $(DOCKER_IMAGE_LATEST) - docker push $(DOCKER_IMAGE_LATEST) - -.PHONY: start -start: - $(DOCKER_COMPOSE_CMD) -f docker-compose.dev.yml up - -.PHONY: stop -stop: - $(DOCKER_COMPOSE_CMD) -f docker-compose.dev.yml down - -.PHONY: stop-full -stop-v: - $(DOCKER_COMPOSE_CMD) -f docker-compose.dev.yml down -v diff --git a/ecep_cms/README.md b/ecep_cms/README.md deleted file mode 100644 index 59a51232..00000000 --- a/ecep_cms/README.md +++ /dev/null @@ -1,7 +0,0 @@ -# Example - -An extension of the [Core CMS](https://github.com/TACC/Core-CMS) project - -## Basics - -See [Core-CMS-Custom](../README.md). diff --git a/ecep_cms/docker-compose.dev.yml b/ecep_cms/docker-compose.dev.yml deleted file mode 100644 index 8c16426e..00000000 --- a/ecep_cms/docker-compose.dev.yml +++ /dev/null @@ -1,54 +0,0 @@ -version: "3" -services: - cms: - build: . - ports: - - 127.0.0.1:8000:8000 - command: ["python3", "manage.py", "runserver", "0.0.0.0:8000"] - container_name: core_cms - hostname: core_cms - volumes: - - ./src/taccsite_custom:/code/taccsite_custom - - ./src/taccsite_cms/custom_app_settings.py:/code/taccsite_cms/custom_app_settings.py - - ./src/taccsite_cms/urls_custom.py:/code/taccsite_cms/urls_custom.py - - ./src/taccsite_cms/settings_custom.py:/code/taccsite_cms/settings_custom.py - - ./src/taccsite_cms/settings_local.py:/code/taccsite_cms/settings_local.py - - ./src/taccsite_cms/secrets.py:/code/taccsite_cms/secrets.py - networks: - - core_cms_net - - postgres: - image: postgres:11.5 - environment: - - POSTGRES_PASSWORD=taccforever - - POSTGRES_USER=postgresadmin - - POSTGRES_DB=taccsite - - PGDATA=/var/lib/postgresql/data/taccsite - volumes: - - core_cms_postgres_data:/var/lib/postgresql/data - hostname: core_cms_postgres - container_name: core_cms_postgres - networks: - - core_cms_net - - elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:7.17.0 - ulimits: - memlock: -1 - environment: - - ES_HEAP_SIZE:1g - - discovery.type=single-node - volumes: - - core_cms_es_data:/usr/share/elasticsearch/data - container_name: core_cms_elasticsearch - ports: - - 127.0.0.1:9201:9200 - networks: - - core_cms_net - -volumes: - core_cms_postgres_data: - core_cms_es_data: - -networks: - core_cms_net: diff --git a/ecep_cms/src/taccsite_cms/custom_app_settings.py b/ecep_cms/src/taccsite_cms/custom_app_settings.py deleted file mode 100644 index c831a4cf..00000000 --- a/ecep_cms/src/taccsite_cms/custom_app_settings.py +++ /dev/null @@ -1,25 +0,0 @@ -CUSTOM_APPS = [ - - # ... - - ######################## - # DJANGOCMS_BLOG - ######################## - - # 'filer', # already in Core - # 'easy_thumbnails', # already in Core - 'parler', - 'taggit', - 'taggit_autosuggest', - # 'meta', # already in Core - 'sortedm2m', - 'djangocms_blog', - - # REQ: 'taggit_autosuggest' requires the following is added to `urls_custom.py` - # custom_urls = [ - # # Support `taggit_autosuggest` (from `djangocms-blog`) - # url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), - # ] -] -CUSTOM_MIDDLEWARE = [] -STATICFILES_DIRS = () diff --git a/ecep_cms/src/taccsite_cms/templates/assets_custom.html b/ecep_cms/src/taccsite_cms/templates/assets_custom.html deleted file mode 100644 index dffdb1e5..00000000 --- a/ecep_cms/src/taccsite_cms/templates/assets_custom.html +++ /dev/null @@ -1,22 +0,0 @@ -{# This template overwrites the original from TACC/Core-CMS #} -{# NOTE: This should extend taccsite_cms via taccsite_custom, not overwrite #} -{# FAQ: To extend, via app template inheritance, see TACC/Core-CMS#492 #} - - - -{# COPIED FROM CORE #} -{# https://github.com/TACC/Core-CMS/blob/c8844e1/taccsite_cms/templates/assets_custom.html #} - -{% load static %} - - -{% with settings.PORTAL_FAVICON as favicon %} - -{% endwith %} - - - -{# NEW CODE #} - - - diff --git a/ecep_cms/src/taccsite_cms/urls_custom.py b/ecep_cms/src/taccsite_cms/urls_custom.py deleted file mode 100644 index 9d6ea003..00000000 --- a/ecep_cms/src/taccsite_cms/urls_custom.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.urls import include, re_path - -custom_urls = [ - # Support `taggit_autosuggest` (from `djangocms-blog`) - re_path(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')), -] diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/__init__.py b/ecep_cms/src/taccsite_custom/ecep_cms/__init__.py deleted file mode 100755 index e69de29b..00000000 diff --git a/ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/site-css.html b/ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/site-css.html deleted file mode 100644 index 085c5985..00000000 --- a/ecep_cms/src/taccsite_custom/ecep_cms/templates/snippets/site-css.html +++ /dev/null @@ -1,3 +0,0 @@ -{% load static %} - -