From 34532c50229bdc8378e533fadb1fc7031c7f951a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 26 Jul 2022 12:19:42 -0500 Subject: [PATCH 01/10] =?UTF-8?q?feat:=20fp-1726=20load=20c-pub=E2=80=A6-p?= =?UTF-8?q?review=20&=20c-tag(-list)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 17 ++++++----------- package.json | 2 +- taccsite_cms/static/site_cms/css/src/site.css | 3 +++ 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/package-lock.json b/package-lock.json index 6a7d6c674..86817dc91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^0.8.0-beta", + "@tacc/core-styles": "github:TACC/Core-Styles#task/fp-1499-cms-pattern-library--fp-1726-publications-list", "minimist": "^1.2.6" }, "engines": { @@ -223,10 +223,10 @@ } }, "node_modules/@tacc/core-styles": { - "version": "0.8.0-beta", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-0.8.0-beta.tgz", - "integrity": "sha512-YHSVjeKAxABGVtULWNsFTv5lbIQHlmw08k3uptLFnSb0UbvxrXHyja1BHB9Hn8pXGSt/oJDQqpg9xHxkQgHpsw==", + "version": "0.7.1", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#1d5140c65446f54e8d6090a6e71722cb96e1d974", "dev": true, + "license": "MIT", "dependencies": { "commander": "^9.0.0", "cssnano": "^4.1.10", @@ -245,10 +245,6 @@ "engines": { "node": ">=15.x", "npm": ">=7.x" - }, - "peerDependencies": { - "@frctl/fractal": "^1.5.13", - "@frctl/mandelbrot": "^1.10.1" } }, "node_modules/@tacc/core-styles/node_modules/argparse": { @@ -10173,10 +10169,9 @@ } }, "@tacc/core-styles": { - "version": "0.8.0-beta", - "resolved": "https://registry.npmjs.org/@tacc/core-styles/-/core-styles-0.8.0-beta.tgz", - "integrity": "sha512-YHSVjeKAxABGVtULWNsFTv5lbIQHlmw08k3uptLFnSb0UbvxrXHyja1BHB9Hn8pXGSt/oJDQqpg9xHxkQgHpsw==", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#1d5140c65446f54e8d6090a6e71722cb96e1d974", "dev": true, + "from": "@tacc/core-styles@https://github.com/TACC/Core-Styles#task/fp-1499-cms-pattern-library--fp-1726-publications-list", "requires": { "commander": "^9.0.0", "cssnano": "^4.1.10", diff --git a/package.json b/package.json index db70c9da5..e3b93e4dd 100644 --- a/package.json +++ b/package.json @@ -11,7 +11,7 @@ "devDependencies": { "@frctl/fractal": "^1.5.13", "@frctl/mandelbrot": "^1.10.1", - "@tacc/core-styles": "^0.8.0-beta", + "@tacc/core-styles": "github:TACC/Core-Styles#task/fp-1499-cms-pattern-library--fp-1726-publications-list", "minimist": "^1.2.6" }, "repository": "git@github.com:TACC/Core-CMS.git", diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index 5bca6fd9b..1a08c00ab 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -29,12 +29,15 @@ /* COMPONENTS */ @import url("_imports/components/c-card.css"); +@import url("_imports/components/c-publication-preview.css"); @import url("_imports/components/c-callout.css"); @import url("_imports/components/c-data-list.css"); @import url("_imports/components/c-nav.css"); @import url("_imports/components/c-footer.css"); @import url("_imports/components/c-recognition.css"); @import url("_imports/components/c-see-all-link.css"); +@import url("_imports/components/c-tag.css"); +@import url("_imports/components/c-tag-list.css"); @import url("_imports/components/bootstrap.container.css"); @import url("_imports/components/bootstrap.figure.css"); /* Unique to CMS */ From e51f6ec5baca0da8d9e3cdfa148289d9b7c540df Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 25 Jul 2022 16:30:06 -0500 Subject: [PATCH 02/10] fix(taccsite_ui): do not let django serve patterns --- taccsite_cms/settings.py | 6 ------ taccsite_cms/urls.py | 2 -- 2 files changed, 8 deletions(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index 9b91b4f36..b3050c9e3 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -197,12 +197,6 @@ def gettext(s): return s TACC_BLOG_SHOW_CATEGORIES = True TACC_BLOG_SHOW_TAGS = True -######################## -# TACC: UI PATTERN DEMO -######################## - -TACC_UI_ROOT = os.path.join(DATA_DIR, 'taccsite_ui') - ######################## # CLIENT BUILD SETTINGS ######################## diff --git a/taccsite_cms/urls.py b/taccsite_cms/urls.py index 988ca3ac6..e94801532 100755 --- a/taccsite_cms/urls.py +++ b/taccsite_cms/urls.py @@ -43,8 +43,6 @@ except ImportError: pass -urlpatterns += static('/ui-patterns/', document_root=settings.TACC_UI_ROOT) - urlpatterns += [ url(r'^', include('cms.urls')), ] From ab944326a3a33dc4b411ba36f36ead883cb2f43a Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 26 Jul 2022 13:33:26 -0500 Subject: [PATCH 03/10] =?UTF-8?q?chore:=20fp-1726=20move=20c-pub=E2=80=A6-?= =?UTF-8?q?preview=20load?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taccsite_cms/static/site_cms/css/src/site.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index 1a08c00ab..eeda998f7 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -29,11 +29,11 @@ /* COMPONENTS */ @import url("_imports/components/c-card.css"); -@import url("_imports/components/c-publication-preview.css"); @import url("_imports/components/c-callout.css"); @import url("_imports/components/c-data-list.css"); @import url("_imports/components/c-nav.css"); @import url("_imports/components/c-footer.css"); +@import url("_imports/components/c-publication-preview.css"); @import url("_imports/components/c-recognition.css"); @import url("_imports/components/c-see-all-link.css"); @import url("_imports/components/c-tag.css"); From 722730d090ffd4e15c8a3f8d2e2c29d4cf12f957 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 26 Jul 2022 13:34:03 -0500 Subject: [PATCH 04/10] feat: fp-1726 load c-page globally --- taccsite_cms/static/site_cms/css/src/site.css | 1 + 1 file changed, 1 insertion(+) diff --git a/taccsite_cms/static/site_cms/css/src/site.css b/taccsite_cms/static/site_cms/css/src/site.css index eeda998f7..fcc8a5c6f 100644 --- a/taccsite_cms/static/site_cms/css/src/site.css +++ b/taccsite_cms/static/site_cms/css/src/site.css @@ -33,6 +33,7 @@ @import url("_imports/components/c-data-list.css"); @import url("_imports/components/c-nav.css"); @import url("_imports/components/c-footer.css"); +@import url("_imports/components/c-page.css"); @import url("_imports/components/c-publication-preview.css"); @import url("_imports/components/c-recognition.css"); @import url("_imports/components/c-see-all-link.css"); From 2e436cfe2afa415799d9c5a852800c06db15cac8 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 26 Jul 2022 13:37:24 -0500 Subject: [PATCH 05/10] Revert "fix(taccsite_ui): do not let django serve patterns" This reverts commit e51f6ec5baca0da8d9e3cdfa148289d9b7c540df. --- taccsite_cms/settings.py | 6 ++++++ taccsite_cms/urls.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index b3050c9e3..9b91b4f36 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -197,6 +197,12 @@ def gettext(s): return s TACC_BLOG_SHOW_CATEGORIES = True TACC_BLOG_SHOW_TAGS = True +######################## +# TACC: UI PATTERN DEMO +######################## + +TACC_UI_ROOT = os.path.join(DATA_DIR, 'taccsite_ui') + ######################## # CLIENT BUILD SETTINGS ######################## diff --git a/taccsite_cms/urls.py b/taccsite_cms/urls.py index e94801532..988ca3ac6 100755 --- a/taccsite_cms/urls.py +++ b/taccsite_cms/urls.py @@ -43,6 +43,8 @@ except ImportError: pass +urlpatterns += static('/ui-patterns/', document_root=settings.TACC_UI_ROOT) + urlpatterns += [ url(r'^', include('cms.urls')), ] From feac5303ed717773e42df7b3882e698ac01b35a9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Mon, 25 Jul 2022 16:30:06 -0500 Subject: [PATCH 06/10] fix(taccsite_ui): do not let django serve patterns --- taccsite_cms/settings.py | 6 ------ taccsite_cms/urls.py | 2 -- 2 files changed, 8 deletions(-) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index 9b91b4f36..b3050c9e3 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -197,12 +197,6 @@ def gettext(s): return s TACC_BLOG_SHOW_CATEGORIES = True TACC_BLOG_SHOW_TAGS = True -######################## -# TACC: UI PATTERN DEMO -######################## - -TACC_UI_ROOT = os.path.join(DATA_DIR, 'taccsite_ui') - ######################## # CLIENT BUILD SETTINGS ######################## diff --git a/taccsite_cms/urls.py b/taccsite_cms/urls.py index 988ca3ac6..e94801532 100755 --- a/taccsite_cms/urls.py +++ b/taccsite_cms/urls.py @@ -43,8 +43,6 @@ except ImportError: pass -urlpatterns += static('/ui-patterns/', document_root=settings.TACC_UI_ROOT) - urlpatterns += [ url(r'^', include('cms.urls')), ] From d69572c27921d4401ceb9ae0ba58355edaead619 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 26 Jul 2022 14:55:02 -0500 Subject: [PATCH 07/10] feat(core-styles): fp-1726 update branch commit --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 86817dc91..b278d0f52 100644 --- a/package-lock.json +++ b/package-lock.json @@ -224,7 +224,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.7.1", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#1d5140c65446f54e8d6090a6e71722cb96e1d974", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#39659efe04f90bbb25462b12eefc84682b868f9e", "dev": true, "license": "MIT", "dependencies": { @@ -10169,7 +10169,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#1d5140c65446f54e8d6090a6e71722cb96e1d974", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#39659efe04f90bbb25462b12eefc84682b868f9e", "dev": true, "from": "@tacc/core-styles@https://github.com/TACC/Core-Styles#task/fp-1499-cms-pattern-library--fp-1726-publications-list", "requires": { From 1cf99b93324d04bc0eae0495c5667a7e32ea9ff3 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Tue, 26 Jul 2022 19:03:16 -0500 Subject: [PATCH 08/10] feat(core-styles): fp-1726 update branch commit --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index b278d0f52..070910581 100644 --- a/package-lock.json +++ b/package-lock.json @@ -224,7 +224,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.7.1", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#39659efe04f90bbb25462b12eefc84682b868f9e", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#3299c606a3a5bd4b5ef44cd21f690e5f12a2547f", "dev": true, "license": "MIT", "dependencies": { @@ -10169,7 +10169,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#39659efe04f90bbb25462b12eefc84682b868f9e", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#3299c606a3a5bd4b5ef44cd21f690e5f12a2547f", "dev": true, "from": "@tacc/core-styles@https://github.com/TACC/Core-Styles#task/fp-1499-cms-pattern-library--fp-1726-publications-list", "requires": { From c3c8c3e05b7ade9f4cb104de6b5b97c4992c6950 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 27 Jul 2022 10:59:27 -0500 Subject: [PATCH 09/10] Revert "fix(taccsite_ui): do not let django serve patterns" This reverts commit feac5303ed717773e42df7b3882e698ac01b35a9. --- taccsite_cms/settings.py | 6 ++++++ taccsite_cms/urls.py | 2 ++ 2 files changed, 8 insertions(+) diff --git a/taccsite_cms/settings.py b/taccsite_cms/settings.py index b3050c9e3..9b91b4f36 100644 --- a/taccsite_cms/settings.py +++ b/taccsite_cms/settings.py @@ -197,6 +197,12 @@ def gettext(s): return s TACC_BLOG_SHOW_CATEGORIES = True TACC_BLOG_SHOW_TAGS = True +######################## +# TACC: UI PATTERN DEMO +######################## + +TACC_UI_ROOT = os.path.join(DATA_DIR, 'taccsite_ui') + ######################## # CLIENT BUILD SETTINGS ######################## diff --git a/taccsite_cms/urls.py b/taccsite_cms/urls.py index e94801532..988ca3ac6 100755 --- a/taccsite_cms/urls.py +++ b/taccsite_cms/urls.py @@ -43,6 +43,8 @@ except ImportError: pass +urlpatterns += static('/ui-patterns/', document_root=settings.TACC_UI_ROOT) + urlpatterns += [ url(r'^', include('cms.urls')), ] From 2a49ee4a51106223484f0062118e14f17c9713e9 Mon Sep 17 00:00:00 2001 From: Wesley Bomar Date: Wed, 27 Jul 2022 11:54:58 -0500 Subject: [PATCH 10/10] fix(core-styles): fp-1726 update branch commit --- package-lock.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index 070910581..651c9654e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -224,7 +224,7 @@ }, "node_modules/@tacc/core-styles": { "version": "0.7.1", - "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#3299c606a3a5bd4b5ef44cd21f690e5f12a2547f", + "resolved": "git+ssh://git@github.com/TACC/Core-Styles.git#6d945d31ff74a67cdfb843c4931bf04f59f59f4d", "dev": true, "license": "MIT", "dependencies": { @@ -10169,7 +10169,7 @@ } }, "@tacc/core-styles": { - "version": "git+ssh://git@github.com/TACC/Core-Styles.git#3299c606a3a5bd4b5ef44cd21f690e5f12a2547f", + "version": "git+ssh://git@github.com/TACC/Core-Styles.git#6d945d31ff74a67cdfb843c4931bf04f59f59f4d", "dev": true, "from": "@tacc/core-styles@https://github.com/TACC/Core-Styles#task/fp-1499-cms-pattern-library--fp-1726-publications-list", "requires": {