From e2a2d469e055c39b8cf06d5ac079793fce0f63e8 Mon Sep 17 00:00:00 2001 From: Kyle Pratuch Date: Tue, 27 Jun 2023 20:26:03 -0700 Subject: [PATCH 1/9] [F] Add Investigation entry types --- ...-65934563-c9b7-45d5-99e6-cc013e22b668.yaml | 43 +++++++++++++++++++ ...-bfaa63c2-dd2c-42c8-b68e-79d0180d5146.yaml | 43 +++++++++++++++++++ api/config/project/project.yaml | 3 ++ ...-1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml | 32 ++++++++++++++ 4 files changed, 121 insertions(+) create mode 100644 api/config/project/entryTypes/default--65934563-c9b7-45d5-99e6-cc013e22b668.yaml create mode 100644 api/config/project/entryTypes/investigationParent--bfaa63c2-dd2c-42c8-b68e-79d0180d5146.yaml create mode 100644 api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml diff --git a/api/config/project/entryTypes/default--65934563-c9b7-45d5-99e6-cc013e22b668.yaml b/api/config/project/entryTypes/default--65934563-c9b7-45d5-99e6-cc013e22b668.yaml new file mode 100644 index 0000000..1222d2a --- /dev/null +++ b/api/config/project/entryTypes/default--65934563-c9b7-45d5-99e6-cc013e22b668.yaml @@ -0,0 +1,43 @@ +fieldLayouts: + 48c2be3f-4055-4fca-af4d-4af4e6a6bde8: + tabs: + - + elementCondition: null + elements: + - + autocapitalize: true + autocomplete: false + autocorrect: true + class: null + disabled: false + elementCondition: null + id: null + instructions: null + label: null + max: null + min: null + name: null + orientation: null + placeholder: null + readonly: false + requirable: false + size: null + step: null + tip: null + title: null + type: craft\fieldlayoutelements\entries\EntryTitleField + uid: fbe101d7-65bd-4634-8dc2-0a7625bd0ba3 + userCondition: null + warning: null + width: 100 + name: Content + uid: b2e3d5d6-dfb0-43ec-a79a-6ed9ab053f98 + userCondition: null +handle: default +hasTitleField: true +name: 'Investigation Step (Child Entry)' +section: 1a93d10f-deca-4e6b-a3e8-9baae53e7c47 # Investigations +sortOrder: 1 +titleFormat: null +titleTranslationKeyFormat: null +titleTranslationMethod: site diff --git a/api/config/project/entryTypes/investigationParent--bfaa63c2-dd2c-42c8-b68e-79d0180d5146.yaml b/api/config/project/entryTypes/investigationParent--bfaa63c2-dd2c-42c8-b68e-79d0180d5146.yaml new file mode 100644 index 0000000..fab2887 --- /dev/null +++ b/api/config/project/entryTypes/investigationParent--bfaa63c2-dd2c-42c8-b68e-79d0180d5146.yaml @@ -0,0 +1,43 @@ +fieldLayouts: + 4a700090-db2f-4939-bba5-25774f989aca: + tabs: + - + elementCondition: null + elements: + - + autocapitalize: true + autocomplete: false + autocorrect: true + class: null + disabled: false + elementCondition: null + id: null + instructions: null + label: null + max: null + min: null + name: null + orientation: null + placeholder: null + readonly: false + requirable: false + size: null + step: null + tip: null + title: null + type: craft\fieldlayoutelements\entries\EntryTitleField + uid: d0fcdb2a-17db-4d73-85a3-7f234d9b21e7 + userCondition: null + warning: null + width: 100 + name: Content + uid: 0ed72b51-65ac-4bd9-964e-939ccf54eeff + userCondition: null +handle: investigationParent +hasTitleField: true +name: 'Investigation (Parent Entry)' +section: 1a93d10f-deca-4e6b-a3e8-9baae53e7c47 # Investigations +sortOrder: 2 +titleFormat: null +titleTranslationKeyFormat: null +titleTranslationMethod: site diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index e116a65..a880065 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -14,6 +14,7 @@ email: meta: __names__: 1a35bfab-6a39-4c03-b273-2d5e3151c335: 'Rubin Telescope Education and Public Outreach' # Rubin Telescope Education and Public Outreach + 1a93d10f-deca-4e6b-a3e8-9baae53e7c47: Investigations # Investigations 2c2e1c6a-eb4d-44f1-9a43-8d79b326f354: ES # ES 05b71c40-b1ec-4b33-ac48-b9b0c7fc81b6: Description # Description 6f0c128e-9978-41c2-b982-dcdf3933b0e2: Homepage # Homepage @@ -33,8 +34,10 @@ meta: 075467b0-0dee-453c-9df0-0de6d2443cf8: Homepage # Homepage 547128fa-4529-4483-9968-66425996b69f: EN # EN 04341069-ff31-4470-970a-8c7e82ec37eb: 'Student Schema' # Student Schema + 65934563-c9b7-45d5-99e6-cc013e22b668: 'Investigation Step (Child Entry)' # Investigation Step (Child Entry) a46e7379-7773-4ce4-9c59-434567870f0c: 'Content Blocks' # Content Blocks aee57b4f-2623-44fc-af2b-c670f6e1babe: 'Site information' # Site information + bfaa63c2-dd2c-42c8-b68e-79d0180d5146: 'Investigation (Parent Entry)' # Investigation (Parent Entry) c6d1924e-d9ec-4547-bb6d-bddb9b46b774: Description # Description c430001c-4bfc-4154-9e13-f5ada3b4a22d: Text # Text cec04a25-43ba-4f4c-81bd-b71f48731b5a: 'Public Schema' # Public Schema diff --git a/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml b/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml new file mode 100644 index 0000000..f2122fc --- /dev/null +++ b/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml @@ -0,0 +1,32 @@ +defaultPlacement: end +enableVersioning: true +handle: investigations +name: Investigations +previewTargets: + - + __assoc__: + - + - label + - 'Primary entry page' + - + - urlFormat + - '{url}' + - + - refresh + - '1' +propagationMethod: all +siteSettings: + 2c2e1c6a-eb4d-44f1-9a43-8d79b326f354: # ES + enabledByDefault: true + hasUrls: true + template: null + uriFormat: 'investigations/{slug}' + 547128fa-4529-4483-9968-66425996b69f: # EN + enabledByDefault: true + hasUrls: true + template: null + uriFormat: 'investigations/{slug}' +structure: + maxLevels: 2 + uid: 1d985018-c9fd-41f8-ad38-fd58f6c0fd3f +type: structure From 83e3a8d0aec76a0c9978e0e908db89dec0371d99 Mon Sep 17 00:00:00 2001 From: Kyle Pratuch Date: Tue, 27 Jun 2023 21:25:50 -0700 Subject: [PATCH 2/9] [C] Remove redundant key in compose --- docker-compose-local-db.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/docker-compose-local-db.yml b/docker-compose-local-db.yml index bc3177c..954ac54 100644 --- a/docker-compose-local-db.yml +++ b/docker-compose-local-db.yml @@ -6,8 +6,6 @@ services: image: memcached craft: build: ./ - depends_on: - - postgres volumes: - ./api:/var/www/html environment: From f1b952d6469e89afe43821d3a4eec466a3b66089 Mon Sep 17 00:00:00 2001 From: Kyle Pratuch Date: Tue, 27 Jun 2023 21:50:35 -0700 Subject: [PATCH 3/9] [F] Set up assets volume --- api/assets/.gitignore | 2 + api/assets/content/.gitkeep | 0 api/config/project/project.yaml | 16 +++++++ ...-2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml | 43 +++++++++++++++++++ api/web/assets | 1 + 5 files changed, 62 insertions(+) create mode 100644 api/assets/.gitignore create mode 100644 api/assets/content/.gitkeep create mode 100644 api/config/project/volumes/contentAssets--2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml create mode 120000 api/web/assets diff --git a/api/assets/.gitignore b/api/assets/.gitignore new file mode 100644 index 0000000..f8f13e2 --- /dev/null +++ b/api/assets/.gitignore @@ -0,0 +1,2 @@ +*/* +!content/.gitkeep diff --git a/api/assets/content/.gitkeep b/api/assets/content/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index a880065..85b313b 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -11,14 +11,27 @@ email: useAuthentication: '1' username: $EMAIL_SMTP_USERNAME transportType: craft\mail\transportadapters\Smtp +fs: + contentFilesystem: + hasUrls: true + name: Content + settings: + path: assets/content + type: craft\fs\Local + url: '@web/assets/content' meta: __names__: 1a35bfab-6a39-4c03-b273-2d5e3151c335: 'Rubin Telescope Education and Public Outreach' # Rubin Telescope Education and Public Outreach 1a93d10f-deca-4e6b-a3e8-9baae53e7c47: Investigations # Investigations + 1ed0caa3-b91f-442b-b313-f3eb54a8a0dc: 'Two Column Container' # Two Column Container + 2a5db1b1-d277-4741-affe-f6d39af9a8b6: 'Content Assets' # Content Assets 2c2e1c6a-eb4d-44f1-9a43-8d79b326f354: ES # ES + 2ec1a258-188f-43da-936b-78e95f910601: 'Color Tool' # Color Tool 05b71c40-b1ec-4b33-ac48-b9b0c7fc81b6: Description # Description + 5e096987-24f1-48a7-af6a-898905593ab5: 'Widget Container' # Widget Container 6f0c128e-9978-41c2-b982-dcdf3933b0e2: Homepage # Homepage 7bd60210-4767-46b3-b735-61a1499b90b7: 'Redirect Page' # Redirect Page + 7ebe493b-5e03-48c8-8375-c9f9582da77e: Containers # Containers 8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d: Pages # Pages 8f49c843-6aaa-49bf-ac19-21a9800c4760: Editors # Editors 074f7db9-8ff3-4016-ad34-bfe9c31d5543: Pages # Pages @@ -32,14 +45,17 @@ meta: 5548ce5c-5ad4-494e-93be-8ff129618d20: Text # Text 5599d188-862e-4717-b206-6aadd975c937: Common # Common 075467b0-0dee-453c-9df0-0de6d2443cf8: Homepage # Homepage + 513634e9-3389-4e41-b769-9433ac34e35e: Widgets # Widgets 547128fa-4529-4483-9968-66425996b69f: EN # EN 04341069-ff31-4470-970a-8c7e82ec37eb: 'Student Schema' # Student Schema 65934563-c9b7-45d5-99e6-cc013e22b668: 'Investigation Step (Child Entry)' # Investigation Step (Child Entry) + a21a42b0-7211-4d77-9071-47a06960fef4: Widgets # Widgets a46e7379-7773-4ce4-9c59-434567870f0c: 'Content Blocks' # Content Blocks aee57b4f-2623-44fc-af2b-c670f6e1babe: 'Site information' # Site information bfaa63c2-dd2c-42c8-b68e-79d0180d5146: 'Investigation (Parent Entry)' # Investigation (Parent Entry) c6d1924e-d9ec-4547-bb6d-bddb9b46b774: Description # Description c430001c-4bfc-4154-9e13-f5ada3b4a22d: Text # Text + c6109150-a89c-4f0b-aa79-8c1ca78be0ec: Template # Template cec04a25-43ba-4f4c-81bd-b71f48731b5a: 'Public Schema' # Public Schema d8be03ce-7aeb-4141-b40e-ec39ec1c796f: Educators # Educators e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee: 'Educator Schema' # Educator Schema diff --git a/api/config/project/volumes/contentAssets--2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml b/api/config/project/volumes/contentAssets--2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml new file mode 100644 index 0000000..b76645d --- /dev/null +++ b/api/config/project/volumes/contentAssets--2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml @@ -0,0 +1,43 @@ +fieldLayouts: + 2e6a4c1c-3e60-43f5-9ba5-be1f7a5a7159: + tabs: + - + elementCondition: null + elements: + - + autocapitalize: true + autocomplete: false + autocorrect: true + class: null + disabled: false + elementCondition: null + id: null + instructions: null + label: null + max: null + min: null + name: null + orientation: null + placeholder: null + readonly: false + requirable: false + size: null + step: null + tip: null + title: null + type: craft\fieldlayoutelements\assets\AssetTitleField + uid: 1afd5a5e-5ee8-46b0-a7a9-fb6cc3954b72 + userCondition: null + warning: null + width: 100 + name: Content + uid: f14b4192-0978-4735-994f-5a03e34dc25c + userCondition: null +fs: contentFilesystem +handle: contentAssets +name: 'Content Assets' +sortOrder: 1 +titleTranslationKeyFormat: null +titleTranslationMethod: site +transformFs: '' +transformSubpath: '' diff --git a/api/web/assets b/api/web/assets new file mode 120000 index 0000000..bae6859 --- /dev/null +++ b/api/web/assets @@ -0,0 +1 @@ +../assets/ \ No newline at end of file From 6009af834fb9bd41b02d36cff5a9d4edd64f3b2e Mon Sep 17 00:00:00 2001 From: Kyle Pratuch Date: Tue, 27 Jun 2023 21:52:21 -0700 Subject: [PATCH 4/9] [F] Add supporting fields for widgets --- .../a21a42b0-7211-4d77-9071-47a06960fef4.yaml | 1 + ...-c6109150-a89c-4f0b-aa79-8c1ca78be0ec.yaml | 45 +++++++ ...-a46e7379-7773-4ce4-9c59-434567870f0c.yaml | 2 +- ...-17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3.yaml | 16 +++ ...-c22e4947-7fbb-488a-994f-246c31e27b95.yaml | 48 ++++++++ ...-131ceffb-300f-415d-8cd5-a932d7529287.yaml | 14 +++ ...-a72ca793-6ee2-4a6f-b47e-06a35cf61e06.yaml | 16 +++ ...-d9df041c-3556-450e-94e1-f37369daf5f3.yaml | 19 +++ ...-10bfe164-c055-47a5-9acf-414d5c53b74a.yaml | 20 ++++ ...-31815ced-cfa3-4ed2-a002-5705a2c6be4b.yaml | 20 ++++ ...-852df24b-f90e-486b-a371-b47ca241a84e.yaml | 19 +++ ...-61e0fe59-d439-429c-b783-2d71fe4c5d44.yaml | 20 ++++ ...-8af07cbd-3ce8-4e4d-818f-261515be5ac7.yaml | 20 ++++ ...-8ef976e7-022d-4d12-97f7-5648dbca66b5.yaml | 78 ++++++++++++ ...-069834df-b9cb-47d6-9ff4-756fde01e084.yaml | 112 ++++++++++++++++++ .../513634e9-3389-4e41-b769-9433ac34e35e.yaml | 4 + .../7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml | 4 + ...-2ec1a258-188f-43da-936b-78e95f910601.yaml | 19 +++ ...-1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml | 20 ++++ ...-5e096987-24f1-48a7-af6a-898905593ab5.yaml | 19 +++ api/config/project/project.yaml | 17 +++ ...-1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml | 4 +- 22 files changed, 534 insertions(+), 3 deletions(-) create mode 100644 api/config/project/fieldGroups/a21a42b0-7211-4d77-9071-47a06960fef4.yaml create mode 100644 api/config/project/fields/colorToolTemplate--c6109150-a89c-4f0b-aa79-8c1ca78be0ec.yaml create mode 100644 api/config/project/fields/graphBars--17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3.yaml create mode 100644 api/config/project/fields/image--c22e4947-7fbb-488a-994f-246c31e27b95.yaml create mode 100644 api/config/project/fields/readOnly--131ceffb-300f-415d-8cd5-a932d7529287.yaml create mode 100644 api/config/project/fields/scatterplotItems--a72ca793-6ee2-4a6f-b47e-06a35cf61e06.yaml create mode 100644 api/config/project/fields/xAxisLabel--d9df041c-3556-450e-94e1-f37369daf5f3.yaml create mode 100644 api/config/project/fields/xAxisMax--10bfe164-c055-47a5-9acf-414d5c53b74a.yaml create mode 100644 api/config/project/fields/xAxisMin--31815ced-cfa3-4ed2-a002-5705a2c6be4b.yaml create mode 100644 api/config/project/fields/yAxisLabel--852df24b-f90e-486b-a371-b47ca241a84e.yaml create mode 100644 api/config/project/fields/yAxisMax--61e0fe59-d439-429c-b783-2d71fe4c5d44.yaml create mode 100644 api/config/project/fields/yAxisMin--8af07cbd-3ce8-4e4d-818f-261515be5ac7.yaml create mode 100644 api/config/project/matrixBlockTypes/bar--8ef976e7-022d-4d12-97f7-5648dbca66b5.yaml create mode 100644 api/config/project/matrixBlockTypes/item--069834df-b9cb-47d6-9ff4-756fde01e084.yaml create mode 100644 api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml create mode 100644 api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml create mode 100644 api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml create mode 100644 api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml create mode 100644 api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml diff --git a/api/config/project/fieldGroups/a21a42b0-7211-4d77-9071-47a06960fef4.yaml b/api/config/project/fieldGroups/a21a42b0-7211-4d77-9071-47a06960fef4.yaml new file mode 100644 index 0000000..9560a15 --- /dev/null +++ b/api/config/project/fieldGroups/a21a42b0-7211-4d77-9071-47a06960fef4.yaml @@ -0,0 +1 @@ +name: Widgets diff --git a/api/config/project/fields/colorToolTemplate--c6109150-a89c-4f0b-aa79-8c1ca78be0ec.yaml b/api/config/project/fields/colorToolTemplate--c6109150-a89c-4f0b-aa79-8c1ca78be0ec.yaml new file mode 100644 index 0000000..852272d --- /dev/null +++ b/api/config/project/fields/colorToolTemplate--c6109150-a89c-4f0b-aa79-8c1ca78be0ec.yaml @@ -0,0 +1,45 @@ +columnSuffix: stkozbee +contentColumnType: string +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: colorToolTemplate +instructions: null +name: Template +searchable: false +settings: + options: + - + __assoc__: + - + - label + - Primary + - + - value + - primary + - + - default + - '' + - + __assoc__: + - + - label + - 'Multiple Images' + - + - value + - multipleImages + - + - default + - '' + - + __assoc__: + - + - label + - 'Display Only' + - + - value + - displayOnly + - + - default + - '' +translationKeyFormat: null +translationMethod: none +type: craft\fields\Dropdown diff --git a/api/config/project/fields/contentBlocks--a46e7379-7773-4ce4-9c59-434567870f0c.yaml b/api/config/project/fields/contentBlocks--a46e7379-7773-4ce4-9c59-434567870f0c.yaml index 814fddc..90e0e7e 100644 --- a/api/config/project/fields/contentBlocks--a46e7379-7773-4ce4-9c59-434567870f0c.yaml +++ b/api/config/project/fields/contentBlocks--a46e7379-7773-4ce4-9c59-434567870f0c.yaml @@ -4,7 +4,7 @@ fieldGroup: 074f7db9-8ff3-4016-ad34-bfe9c31d5543 # Pages handle: contentBlocks instructions: null name: 'Content Blocks' -searchable: false +searchable: true settings: maxBlocks: null maxLevels: null diff --git a/api/config/project/fields/graphBars--17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3.yaml b/api/config/project/fields/graphBars--17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3.yaml new file mode 100644 index 0000000..cc01dfa --- /dev/null +++ b/api/config/project/fields/graphBars--17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3.yaml @@ -0,0 +1,16 @@ +columnSuffix: null +contentColumnType: string +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: graphBars +instructions: null +name: 'Graph Bars' +searchable: false +settings: + contentTable: '{{%matrixcontent_graphbars}}' + maxBlocks: null + minBlocks: null + propagationKeyFormat: null + propagationMethod: all +translationKeyFormat: null +translationMethod: site +type: craft\fields\Matrix diff --git a/api/config/project/fields/image--c22e4947-7fbb-488a-994f-246c31e27b95.yaml b/api/config/project/fields/image--c22e4947-7fbb-488a-994f-246c31e27b95.yaml new file mode 100644 index 0000000..7345951 --- /dev/null +++ b/api/config/project/fields/image--c22e4947-7fbb-488a-994f-246c31e27b95.yaml @@ -0,0 +1,48 @@ +columnSuffix: null +contentColumnType: string +fieldGroup: 5599d188-862e-4717-b206-6aadd975c937 # Common +handle: image +instructions: null +name: Image +searchable: false +settings: + allowSelfRelations: false + allowSubfolders: false + allowUploads: true + allowedKinds: null + branchLimit: null + defaultUploadLocationSource: 'volume:2a5db1b1-d277-4741-affe-f6d39af9a8b6' # Content Assets + defaultUploadLocationSubpath: null + localizeRelations: false + maintainHierarchy: false + maxRelations: 1 + minRelations: null + previewMode: full + restrictFiles: false + restrictLocation: false + restrictedDefaultUploadSubpath: null + restrictedLocationSource: 'volume:2a5db1b1-d277-4741-affe-f6d39af9a8b6' # Content Assets + restrictedLocationSubpath: null + selectionCondition: + __assoc__: + - + - elementType + - craft\elements\Asset + - + - fieldContext + - global + - + - class + - craft\elements\conditions\assets\AssetCondition + selectionLabel: null + showSiteMenu: false + showUnpermittedFiles: false + showUnpermittedVolumes: false + sources: + - 'volume:2a5db1b1-d277-4741-affe-f6d39af9a8b6' # Content Assets + targetSiteId: null + validateRelatedElements: false + viewMode: list +translationKeyFormat: null +translationMethod: site +type: craft\fields\Assets diff --git a/api/config/project/fields/readOnly--131ceffb-300f-415d-8cd5-a932d7529287.yaml b/api/config/project/fields/readOnly--131ceffb-300f-415d-8cd5-a932d7529287.yaml new file mode 100644 index 0000000..8f4215d --- /dev/null +++ b/api/config/project/fields/readOnly--131ceffb-300f-415d-8cd5-a932d7529287.yaml @@ -0,0 +1,14 @@ +columnSuffix: txbvxonc +contentColumnType: boolean +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: readOnly +instructions: null +name: 'Read Only' +searchable: false +settings: + default: false + offLabel: null + onLabel: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Lightswitch diff --git a/api/config/project/fields/scatterplotItems--a72ca793-6ee2-4a6f-b47e-06a35cf61e06.yaml b/api/config/project/fields/scatterplotItems--a72ca793-6ee2-4a6f-b47e-06a35cf61e06.yaml new file mode 100644 index 0000000..8c1a39c --- /dev/null +++ b/api/config/project/fields/scatterplotItems--a72ca793-6ee2-4a6f-b47e-06a35cf61e06.yaml @@ -0,0 +1,16 @@ +columnSuffix: null +contentColumnType: string +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: scatterplotItems +instructions: null +name: 'Scatterplot Items' +searchable: false +settings: + contentTable: '{{%matrixcontent_scatterplotitems}}' + maxBlocks: null + minBlocks: null + propagationKeyFormat: null + propagationMethod: all +translationKeyFormat: null +translationMethod: site +type: craft\fields\Matrix diff --git a/api/config/project/fields/xAxisLabel--d9df041c-3556-450e-94e1-f37369daf5f3.yaml b/api/config/project/fields/xAxisLabel--d9df041c-3556-450e-94e1-f37369daf5f3.yaml new file mode 100644 index 0000000..4aa3a5b --- /dev/null +++ b/api/config/project/fields/xAxisLabel--d9df041c-3556-450e-94e1-f37369daf5f3.yaml @@ -0,0 +1,19 @@ +columnSuffix: frlhtymi +contentColumnType: text +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: xAxisLabel +instructions: null +name: 'X-axis Label' +searchable: false +settings: + byteLimit: null + charLimit: null + code: false + columnType: null + initialRows: 4 + multiline: false + placeholder: null + uiMode: normal +translationKeyFormat: null +translationMethod: site +type: craft\fields\PlainText diff --git a/api/config/project/fields/xAxisMax--10bfe164-c055-47a5-9acf-414d5c53b74a.yaml b/api/config/project/fields/xAxisMax--10bfe164-c055-47a5-9acf-414d5c53b74a.yaml new file mode 100644 index 0000000..dabba41 --- /dev/null +++ b/api/config/project/fields/xAxisMax--10bfe164-c055-47a5-9acf-414d5c53b74a.yaml @@ -0,0 +1,20 @@ +columnSuffix: hyfrpkxs +contentColumnType: 'decimal(12,2)' +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: xAxisMax +instructions: null +name: 'X-axis Maximum' +searchable: false +settings: + decimals: 2 + defaultValue: null + max: null + min: 0 + prefix: null + previewCurrency: null + previewFormat: decimal + size: null + suffix: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Number diff --git a/api/config/project/fields/xAxisMin--31815ced-cfa3-4ed2-a002-5705a2c6be4b.yaml b/api/config/project/fields/xAxisMin--31815ced-cfa3-4ed2-a002-5705a2c6be4b.yaml new file mode 100644 index 0000000..b7008be --- /dev/null +++ b/api/config/project/fields/xAxisMin--31815ced-cfa3-4ed2-a002-5705a2c6be4b.yaml @@ -0,0 +1,20 @@ +columnSuffix: msinqoax +contentColumnType: 'decimal(12,2)' +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: xAxisMin +instructions: null +name: 'X-axis Minimum' +searchable: false +settings: + decimals: 2 + defaultValue: null + max: null + min: 0 + prefix: null + previewCurrency: null + previewFormat: decimal + size: null + suffix: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Number diff --git a/api/config/project/fields/yAxisLabel--852df24b-f90e-486b-a371-b47ca241a84e.yaml b/api/config/project/fields/yAxisLabel--852df24b-f90e-486b-a371-b47ca241a84e.yaml new file mode 100644 index 0000000..2657208 --- /dev/null +++ b/api/config/project/fields/yAxisLabel--852df24b-f90e-486b-a371-b47ca241a84e.yaml @@ -0,0 +1,19 @@ +columnSuffix: grdmnedh +contentColumnType: text +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: yAxisLabel +instructions: null +name: 'Y-axis Label' +searchable: false +settings: + byteLimit: null + charLimit: null + code: false + columnType: null + initialRows: 4 + multiline: false + placeholder: null + uiMode: normal +translationKeyFormat: null +translationMethod: site +type: craft\fields\PlainText diff --git a/api/config/project/fields/yAxisMax--61e0fe59-d439-429c-b783-2d71fe4c5d44.yaml b/api/config/project/fields/yAxisMax--61e0fe59-d439-429c-b783-2d71fe4c5d44.yaml new file mode 100644 index 0000000..f0139f8 --- /dev/null +++ b/api/config/project/fields/yAxisMax--61e0fe59-d439-429c-b783-2d71fe4c5d44.yaml @@ -0,0 +1,20 @@ +columnSuffix: rosjuxvv +contentColumnType: 'decimal(12,2)' +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: yAxisMax +instructions: null +name: 'Y-axis Maximum' +searchable: false +settings: + decimals: 2 + defaultValue: null + max: null + min: 0 + prefix: null + previewCurrency: null + previewFormat: decimal + size: null + suffix: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Number diff --git a/api/config/project/fields/yAxisMin--8af07cbd-3ce8-4e4d-818f-261515be5ac7.yaml b/api/config/project/fields/yAxisMin--8af07cbd-3ce8-4e4d-818f-261515be5ac7.yaml new file mode 100644 index 0000000..fff6064 --- /dev/null +++ b/api/config/project/fields/yAxisMin--8af07cbd-3ce8-4e4d-818f-261515be5ac7.yaml @@ -0,0 +1,20 @@ +columnSuffix: wndpmrys +contentColumnType: 'decimal(12,2)' +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: yAxisMin +instructions: null +name: 'Y-axis Minimum' +searchable: false +settings: + decimals: 2 + defaultValue: null + max: null + min: 0 + prefix: null + previewCurrency: null + previewFormat: decimal + size: null + suffix: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Number diff --git a/api/config/project/matrixBlockTypes/bar--8ef976e7-022d-4d12-97f7-5648dbca66b5.yaml b/api/config/project/matrixBlockTypes/bar--8ef976e7-022d-4d12-97f7-5648dbca66b5.yaml new file mode 100644 index 0000000..f22765a --- /dev/null +++ b/api/config/project/matrixBlockTypes/bar--8ef976e7-022d-4d12-97f7-5648dbca66b5.yaml @@ -0,0 +1,78 @@ +field: 17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3 # Graph Bars +fieldLayouts: + 8a95b17e-7545-4c01-9134-3976d2087dd0: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: 4e2a01a5-ed3f-4652-9d31-4c064ff91cc1 # Label + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 6ee7d3ff-995b-481a-9ee4-7412a780e98b + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: 4d4bea1a-66b1-4042-b30d-b5525fa9481d # Y-value + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: add357e9-ff1e-4020-9cd6-6fa6ab1d2ba7 + userCondition: null + warning: null + width: 100 + name: Content + uid: 2482d99f-61cc-4d08-8df8-96297ca5a297 + userCondition: null +fields: + 4d4bea1a-66b1-4042-b30d-b5525fa9481d: # Y-value + columnSuffix: jjbpkmpr + contentColumnType: text + fieldGroup: null + handle: yValue + instructions: null + name: Y-value + searchable: false + settings: + byteLimit: null + charLimit: null + code: false + columnType: null + initialRows: 4 + multiline: false + placeholder: null + uiMode: normal + translationKeyFormat: null + translationMethod: none + type: craft\fields\PlainText + 4e2a01a5-ed3f-4652-9d31-4c064ff91cc1: # Label + columnSuffix: fsbtlope + contentColumnType: text + fieldGroup: null + handle: label + instructions: null + name: Label + searchable: false + settings: + byteLimit: null + charLimit: null + code: false + columnType: null + initialRows: 4 + multiline: false + placeholder: null + uiMode: normal + translationKeyFormat: null + translationMethod: site + type: craft\fields\PlainText +handle: bar +name: Bar +sortOrder: 1 diff --git a/api/config/project/matrixBlockTypes/item--069834df-b9cb-47d6-9ff4-756fde01e084.yaml b/api/config/project/matrixBlockTypes/item--069834df-b9cb-47d6-9ff4-756fde01e084.yaml new file mode 100644 index 0000000..7d33a9a --- /dev/null +++ b/api/config/project/matrixBlockTypes/item--069834df-b9cb-47d6-9ff4-756fde01e084.yaml @@ -0,0 +1,112 @@ +field: a72ca793-6ee2-4a6f-b47e-06a35cf61e06 # Scatterplot Items +fieldLayouts: + 7eb67b7d-05c3-45c6-a4c8-c9bc5c5ac9e6: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: 43cffcf1-c54b-45c3-b157-9bdefaa3ce36 # Label + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: fe7e2a17-9e01-478a-aab0-de033a96d74b + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: b0af5e39-02aa-4d2b-97c8-3ef5ac7982fa # X-value + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: bafa6d84-d190-4e9a-898f-f7f8814aff61 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: 5bfc1518-54f5-4b2a-86e8-02a16537b8cf # Y-value + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 2fb43fe5-24da-4ddc-ac71-d784ed67b945 + userCondition: null + warning: null + width: 50 + name: Content + uid: 39efd691-217c-4c1c-8d55-9b4769efe837 + userCondition: null +fields: + 5bfc1518-54f5-4b2a-86e8-02a16537b8cf: # Y-value + columnSuffix: pfelvklk + contentColumnType: 'decimal(12,2)' + fieldGroup: null + handle: yValue + instructions: null + name: Y-value + searchable: false + settings: + decimals: 2 + defaultValue: null + max: null + min: 0 + prefix: null + previewCurrency: null + previewFormat: decimal + size: null + suffix: null + translationKeyFormat: null + translationMethod: none + type: craft\fields\Number + 43cffcf1-c54b-45c3-b157-9bdefaa3ce36: # Label + columnSuffix: ydhymbpu + contentColumnType: text + fieldGroup: null + handle: itemLabel + instructions: null + name: Label + searchable: false + settings: + byteLimit: null + charLimit: null + code: false + columnType: null + initialRows: 4 + multiline: false + placeholder: null + uiMode: normal + translationKeyFormat: null + translationMethod: site + type: craft\fields\PlainText + b0af5e39-02aa-4d2b-97c8-3ef5ac7982fa: # X-value + columnSuffix: wevueczn + contentColumnType: 'decimal(12,2)' + fieldGroup: null + handle: xValue + instructions: null + name: X-value + searchable: false + settings: + decimals: 2 + defaultValue: null + max: null + min: 0 + prefix: null + previewCurrency: null + previewFormat: decimal + size: null + suffix: null + translationKeyFormat: null + translationMethod: none + type: craft\fields\Number +handle: item +name: Item +sortOrder: 1 diff --git a/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml new file mode 100644 index 0000000..5efe49a --- /dev/null +++ b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml @@ -0,0 +1,4 @@ +alwaysShowDropdown: null +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +name: Widgets +sortOrder: 5 diff --git a/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml b/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml new file mode 100644 index 0000000..46d4764 --- /dev/null +++ b/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml @@ -0,0 +1,4 @@ +alwaysShowDropdown: null +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +name: Containers +sortOrder: 2 diff --git a/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml b/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml new file mode 100644 index 0000000..6f3b664 --- /dev/null +++ b/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml @@ -0,0 +1,19 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets +groupChildBlockTypes: true +handle: colorTool +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Color Tool' +sortOrder: 6 +topLevel: true diff --git a/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml b/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml new file mode 100644 index 0000000..ebedab5 --- /dev/null +++ b/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml @@ -0,0 +1,20 @@ +childBlocks: + - text +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +group: 7ebe493b-5e03-48c8-8375-c9f9582da77e # Containers +groupChildBlockTypes: true +handle: twoColumnContainer +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Two Column Container' +sortOrder: 3 +topLevel: true diff --git a/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml b/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml new file mode 100644 index 0000000..66115b3 --- /dev/null +++ b/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml @@ -0,0 +1,19 @@ +childBlocks: null +conditions: null +description: 'Use this to group several instances of some types of widgets.' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +group: 7ebe493b-5e03-48c8-8375-c9f9582da77e # Containers +groupChildBlockTypes: true +handle: widgetContainer +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Widget Container' +sortOrder: 4 +topLevel: true diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 85b313b..effdf3b 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -27,23 +27,36 @@ meta: 2a5db1b1-d277-4741-affe-f6d39af9a8b6: 'Content Assets' # Content Assets 2c2e1c6a-eb4d-44f1-9a43-8d79b326f354: ES # ES 2ec1a258-188f-43da-936b-78e95f910601: 'Color Tool' # Color Tool + 4d4bea1a-66b1-4042-b30d-b5525fa9481d: Y-value # Y-value + 4e2a01a5-ed3f-4652-9d31-4c064ff91cc1: Label # Label 05b71c40-b1ec-4b33-ac48-b9b0c7fc81b6: Description # Description + 5bfc1518-54f5-4b2a-86e8-02a16537b8cf: Y-value # Y-value 5e096987-24f1-48a7-af6a-898905593ab5: 'Widget Container' # Widget Container 6f0c128e-9978-41c2-b982-dcdf3933b0e2: Homepage # Homepage 7bd60210-4767-46b3-b735-61a1499b90b7: 'Redirect Page' # Redirect Page 7ebe493b-5e03-48c8-8375-c9f9582da77e: Containers # Containers + 8af07cbd-3ce8-4e4d-818f-261515be5ac7: 'Y-axis Minimum' # Y-axis Minimum 8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d: Pages # Pages + 8ef976e7-022d-4d12-97f7-5648dbca66b5: Bar # Bar 8f49c843-6aaa-49bf-ac19-21a9800c4760: Editors # Editors + 10bfe164-c055-47a5-9acf-414d5c53b74a: 'X-axis Maximum' # X-axis Maximum + 17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3: 'Graph Bars' # Graph Bars + 43cffcf1-c54b-45c3-b157-9bdefaa3ce36: Label # Label + 61e0fe59-d439-429c-b783-2d71fe4c5d44: 'Y-axis Maximum' # Y-axis Maximum 074f7db9-8ff3-4016-ad34-bfe9c31d5543: Pages # Pages 77f02908-0342-4917-9d14-38f769d15c39: Pages # Pages 90aa9610-a9c9-4531-95f8-d0068046ae25: 'Sort Options' # Sort Options + 131ceffb-300f-415d-8cd5-a932d7529287: 'Read Only' # Read Only 222de7cf-741d-4d1f-b274-acc85a3c454c: 'Link To' # Link To 461e1254-37f7-4aeb-81a1-3f08d2463d06: Students # Students 0481b024-bc6f-4104-bc1c-802615313aaa: 'Page Type' # Page Type + 852df24b-f90e-486b-a371-b47ca241a84e: 'Y-axis Label' # Y-axis Label 1601c7a8-2437-4b8f-b2f2-116f4c043402: 'Site Information' # Site Information 4994da56-0831-400d-b1d1-ade611fd5da1: Title # Title 5548ce5c-5ad4-494e-93be-8ff129618d20: Text # Text 5599d188-862e-4717-b206-6aadd975c937: Common # Common + 31815ced-cfa3-4ed2-a002-5705a2c6be4b: 'X-axis Minimum' # X-axis Minimum + 069834df-b9cb-47d6-9ff4-756fde01e084: Item # Item 075467b0-0dee-453c-9df0-0de6d2443cf8: Homepage # Homepage 513634e9-3389-4e41-b769-9433ac34e35e: Widgets # Widgets 547128fa-4529-4483-9968-66425996b69f: EN # EN @@ -51,13 +64,17 @@ meta: 65934563-c9b7-45d5-99e6-cc013e22b668: 'Investigation Step (Child Entry)' # Investigation Step (Child Entry) a21a42b0-7211-4d77-9071-47a06960fef4: Widgets # Widgets a46e7379-7773-4ce4-9c59-434567870f0c: 'Content Blocks' # Content Blocks + a72ca793-6ee2-4a6f-b47e-06a35cf61e06: 'Scatterplot Items' # Scatterplot Items aee57b4f-2623-44fc-af2b-c670f6e1babe: 'Site information' # Site information + b0af5e39-02aa-4d2b-97c8-3ef5ac7982fa: X-value # X-value bfaa63c2-dd2c-42c8-b68e-79d0180d5146: 'Investigation (Parent Entry)' # Investigation (Parent Entry) c6d1924e-d9ec-4547-bb6d-bddb9b46b774: Description # Description + c22e4947-7fbb-488a-994f-246c31e27b95: Image # Image c430001c-4bfc-4154-9e13-f5ada3b4a22d: Text # Text c6109150-a89c-4f0b-aa79-8c1ca78be0ec: Template # Template cec04a25-43ba-4f4c-81bd-b71f48731b5a: 'Public Schema' # Public Schema d8be03ce-7aeb-4141-b40e-ec39ec1c796f: Educators # Educators + d9df041c-3556-450e-94e1-f37369daf5f3: 'X-axis Label' # X-axis Label e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee: 'Educator Schema' # Educator Schema f8a590d0-db30-4e06-9d6d-6cfd7613147e: 'Hide Title' # Hide Title plugins: diff --git a/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml b/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml index f2122fc..2da5307 100644 --- a/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml +++ b/api/config/project/sections/investigations--1a93d10f-deca-4e6b-a3e8-9baae53e7c47.yaml @@ -20,12 +20,12 @@ siteSettings: enabledByDefault: true hasUrls: true template: null - uriFormat: 'investigations/{slug}' + uriFormat: '{parent.uri}/{slug}' 547128fa-4529-4483-9968-66425996b69f: # EN enabledByDefault: true hasUrls: true template: null - uriFormat: 'investigations/{slug}' + uriFormat: '{parent.uri}/{slug}' structure: maxLevels: 2 uid: 1d985018-c9fd-41f8-ad38-fd58f6c0fd3f From 2efca293cfba951eb808b900e16031bdce30073c Mon Sep 17 00:00:00 2001 From: Kyle Pratuch Date: Thu, 6 Jul 2023 17:40:55 -0700 Subject: [PATCH 5/9] [F] Add preliminary widget configuration --- ...-9fc49630-8ca5-4f95-be3e-cf1adc06e008.yaml | 16 +++ ...-d0f08c4c-40d1-444d-9a32-b1264d617636.yaml | 23 ++++ ...-9679727f-de58-43ae-9674-13827bb1e0b3.yaml | 106 ++++++++++++++++++ ...-a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml | 100 +++++++++++++++++ ...-2ec1a258-188f-43da-936b-78e95f910601.yaml | 82 +++++++++++++- ...-3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml | 52 +++++++++ ...-5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml | 100 +++++++++++++++++ ...-1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml | 5 + ...-5e096987-24f1-48a7-af6a-898905593ab5.yaml | 4 +- api/config/project/project.yaml | 8 ++ 10 files changed, 494 insertions(+), 2 deletions(-) create mode 100644 api/config/project/fields/images--9fc49630-8ca5-4f95-be3e-cf1adc06e008.yaml create mode 100644 api/config/project/fields/preSelectedColor--d0f08c4c-40d1-444d-9a32-b1264d617636.yaml create mode 100644 api/config/project/matrixBlockTypes/imageGroup--9679727f-de58-43ae-9674-13827bb1e0b3.yaml create mode 100644 api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml create mode 100644 api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml create mode 100644 api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml diff --git a/api/config/project/fields/images--9fc49630-8ca5-4f95-be3e-cf1adc06e008.yaml b/api/config/project/fields/images--9fc49630-8ca5-4f95-be3e-cf1adc06e008.yaml new file mode 100644 index 0000000..8b64371 --- /dev/null +++ b/api/config/project/fields/images--9fc49630-8ca5-4f95-be3e-cf1adc06e008.yaml @@ -0,0 +1,16 @@ +columnSuffix: null +contentColumnType: string +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: images +instructions: null +name: Images +searchable: false +settings: + contentTable: '{{%matrixcontent_images}}' + maxBlocks: null + minBlocks: null + propagationKeyFormat: null + propagationMethod: all +translationKeyFormat: null +translationMethod: site +type: craft\fields\Matrix diff --git a/api/config/project/fields/preSelectedColor--d0f08c4c-40d1-444d-9a32-b1264d617636.yaml b/api/config/project/fields/preSelectedColor--d0f08c4c-40d1-444d-9a32-b1264d617636.yaml new file mode 100644 index 0000000..27a760d --- /dev/null +++ b/api/config/project/fields/preSelectedColor--d0f08c4c-40d1-444d-9a32-b1264d617636.yaml @@ -0,0 +1,23 @@ +columnSuffix: letxbuph +contentColumnType: string +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: preSelectedColor +instructions: null +name: 'Pre-selected Color' +searchable: false +settings: + options: + - + __assoc__: + - + - label + - None + - + - value + - none + - + - default + - '1' +translationKeyFormat: null +translationMethod: site +type: craft\fields\Dropdown diff --git a/api/config/project/matrixBlockTypes/imageGroup--9679727f-de58-43ae-9674-13827bb1e0b3.yaml b/api/config/project/matrixBlockTypes/imageGroup--9679727f-de58-43ae-9674-13827bb1e0b3.yaml new file mode 100644 index 0000000..df37dd4 --- /dev/null +++ b/api/config/project/matrixBlockTypes/imageGroup--9679727f-de58-43ae-9674-13827bb1e0b3.yaml @@ -0,0 +1,106 @@ +field: 9fc49630-8ca5-4f95-be3e-cf1adc06e008 # Images +fieldLayouts: + a391c030-cb9b-4ffb-a78e-29b827be9272: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: be5b1aeb-8cbb-4460-a87d-d1ebe0a4fbf8 # Group Name + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 1a3cc5ec-6448-4413-8829-80496fb7e7c4 + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: 23ca3082-ab51-4658-9872-cf7f31a9bd56 # Images + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: a3e0f951-6031-4623-a078-29a0783a6d0e + userCondition: null + warning: null + width: 100 + name: Content + uid: 6d1e650f-e838-451a-9325-0e8bd4017a6f + userCondition: null +fields: + 23ca3082-ab51-4658-9872-cf7f31a9bd56: # Images + columnSuffix: null + contentColumnType: string + fieldGroup: null + handle: images + instructions: null + name: Images + searchable: false + settings: + allowSelfRelations: false + allowSubfolders: false + allowUploads: true + allowedKinds: null + branchLimit: null + defaultUploadLocationSource: 'volume:2a5db1b1-d277-4741-affe-f6d39af9a8b6' # Content Assets + defaultUploadLocationSubpath: null + localizeRelations: false + maintainHierarchy: false + maxRelations: null + minRelations: null + previewMode: full + restrictFiles: false + restrictLocation: false + restrictedDefaultUploadSubpath: null + restrictedLocationSource: 'volume:2a5db1b1-d277-4741-affe-f6d39af9a8b6' # Content Assets + restrictedLocationSubpath: null + selectionCondition: + __assoc__: + - + - elementType + - craft\elements\Asset + - + - fieldContext + - global + - + - class + - craft\elements\conditions\assets\AssetCondition + selectionLabel: null + showSiteMenu: false + showUnpermittedFiles: false + showUnpermittedVolumes: false + sources: '*' + targetSiteId: null + validateRelatedElements: false + viewMode: list + translationKeyFormat: null + translationMethod: site + type: craft\fields\Assets + be5b1aeb-8cbb-4460-a87d-d1ebe0a4fbf8: # Group Name + columnSuffix: xrmeempt + contentColumnType: text + fieldGroup: null + handle: groupName + instructions: null + name: 'Group Name' + searchable: false + settings: + byteLimit: null + charLimit: null + code: false + columnType: null + initialRows: 4 + multiline: false + placeholder: null + uiMode: normal + translationKeyFormat: null + translationMethod: none + type: craft\fields\PlainText +handle: imageGroup +name: 'Image Group' +sortOrder: 1 diff --git a/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml b/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml new file mode 100644 index 0000000..e31613e --- /dev/null +++ b/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml @@ -0,0 +1,100 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + 80dff751-12ba-4018-80c0-a031642798c1: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: c430001c-4bfc-4154-9e13-f5ada3b4a22d # Text + instructions: null + label: Title + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 71d7f4f0-767c-4d29-ae1f-e1b5fe113a56 + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: d9df041c-3556-450e-94e1-f37369daf5f3 # X-axis Label + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 683e825c-38ca-4dd9-b8a7-7e75dd27e985 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: 852df24b-f90e-486b-a371-b47ca241a84e # Y-axis Label + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 7db2463b-9664-4002-b1cc-5dd1ffe5a149 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: 8af07cbd-3ce8-4e4d-818f-261515be5ac7 # Y-axis Minimum + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: f15f5e5d-1e86-47c4-9d52-067ac196264c + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: 61e0fe59-d439-429c-b783-2d71fe4c5d44 # Y-axis Maximum + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 30c3bdca-a6d7-446d-820c-9bd9ff65cf97 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: 17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3 # Graph Bars + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: c65cd527-f57f-4f51-a78a-70d801cb7d2c + userCondition: null + warning: null + width: 100 + name: Content + uid: 6eb93f0e-4432-4dec-89a8-ea1f20480881 + userCondition: null +group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets +groupChildBlockTypes: true +handle: barGraphTool +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Bar Graph Tool' +sortOrder: 6 +topLevel: true diff --git a/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml b/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml index 6f3b664..d19d656 100644 --- a/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml +++ b/api/config/project/neoBlockTypes/colorTool--2ec1a258-188f-43da-936b-78e95f910601.yaml @@ -3,6 +3,86 @@ conditions: null description: '' enabled: true field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + dc576cae-30e9-4029-b574-433c7403cf1d: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec # Template + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: cfe0e1c7-2b86-4aa4-95d0-202e88bc5257 + userCondition: null + warning: null + width: 75 + - + elementCondition: null + fieldUid: 131ceffb-300f-415d-8cd5-a932d7529287 # Read Only + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 199847a1-9e41-4e91-aaab-19247a34fb5a + userCondition: null + warning: null + width: 25 + - + elementCondition: + class: benf\neo\elements\conditions\BlockCondition + conditionRules: + - + class: craft\fields\conditions\OptionsFieldConditionRule + fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec # Template + operator: in + uid: c0f19587-32fa-4c3e-969f-09c42cf85cd8 + values: + - primary + - displayOnly + elementType: benf\neo\elements\Block + fieldContext: global + fieldUid: c22e4947-7fbb-488a-994f-246c31e27b95 # Image + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 8d410382-4204-4256-857c-06bd91cada13 + userCondition: null + warning: null + width: 100 + - + elementCondition: + class: benf\neo\elements\conditions\BlockCondition + conditionRules: + - + class: craft\fields\conditions\OptionsFieldConditionRule + fieldUid: c6109150-a89c-4f0b-aa79-8c1ca78be0ec # Template + operator: in + uid: 4a741494-eae5-4407-b1ec-715379e26d0a + values: + - multipleImages + elementType: benf\neo\elements\Block + fieldContext: global + fieldUid: 9fc49630-8ca5-4f95-be3e-cf1adc06e008 # Images + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 411866f9-c2bc-4775-bf82-3fca61122ba7 + userCondition: null + warning: null + width: 100 + name: Content + uid: 7c9a9947-5bf7-4b38-9e3f-104ac356feca + userCondition: null group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets groupChildBlockTypes: true handle: colorTool @@ -15,5 +95,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Color Tool' -sortOrder: 6 +sortOrder: 7 topLevel: true diff --git a/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml b/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml new file mode 100644 index 0000000..6cb0448 --- /dev/null +++ b/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml @@ -0,0 +1,52 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + ffba8a00-b52c-4309-9a23-99475cbcc3b4: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: d0f08c4c-40d1-444d-9a32-b1264d617636 # Pre-selected Color + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 8f72c938-d70c-4466-b9ce-7508327496ac + userCondition: null + warning: null + width: 75 + - + elementCondition: null + fieldUid: 131ceffb-300f-415d-8cd5-a932d7529287 # Read Only + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: c0f7d268-66af-41ff-bf16-5ef40896345b + userCondition: null + warning: null + width: 25 + name: Content + uid: 9b6809bf-ed9f-43c6-b8a4-f93cdde5a5f5 + userCondition: null +group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets +groupChildBlockTypes: true +handle: filterTool +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Filter Tool' +sortOrder: 8 +topLevel: true diff --git a/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml b/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml new file mode 100644 index 0000000..61ed3ad --- /dev/null +++ b/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml @@ -0,0 +1,100 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + 7c3028af-718d-4e37-a4b8-c5eb916234cb: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: c430001c-4bfc-4154-9e13-f5ada3b4a22d # Text + instructions: null + label: Title + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 81e59c2b-c254-4f3e-92eb-fc9af8322ded + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: d9df041c-3556-450e-94e1-f37369daf5f3 # X-axis Label + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 1be540e4-1ce4-4b40-b180-0d6f478f9890 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: 852df24b-f90e-486b-a371-b47ca241a84e # Y-axis Label + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: be53ec5f-9f60-48e4-ad5b-c8f2da5c8c0b + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: 31815ced-cfa3-4ed2-a002-5705a2c6be4b # X-axis Minimum + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 1bd1c124-b417-410d-8b8c-daece8328288 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: 61e0fe59-d439-429c-b783-2d71fe4c5d44 # Y-axis Maximum + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 49f1cdda-1578-4399-b23f-f3cba90afae1 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: a72ca793-6ee2-4a6f-b47e-06a35cf61e06 # Scatterplot Items + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: f2842a95-4796-413c-8981-29ff8c64db44 + userCondition: null + warning: null + width: 100 + name: Content + uid: 219e2e73-d637-4b92-ab2c-c557a23ddd7f + userCondition: null +group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets +groupChildBlockTypes: true +handle: scatterplotTool +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Scatterplot Tool' +sortOrder: 9 +topLevel: true diff --git a/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml b/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml index ebedab5..4196c38 100644 --- a/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml +++ b/api/config/project/neoBlockTypes/twoColumnContainer--1ed0caa3-b91f-442b-b313-f3eb54a8a0dc.yaml @@ -1,5 +1,10 @@ childBlocks: - text + - widgetContainer + - barGraphTool + - colorTool + - filterTool + - scatterplotTool conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml b/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml index 66115b3..1346169 100644 --- a/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml +++ b/api/config/project/neoBlockTypes/widgetContainer--5e096987-24f1-48a7-af6a-898905593ab5.yaml @@ -1,4 +1,6 @@ -childBlocks: null +childBlocks: + - barGraphTool + - scatterplotTool conditions: null description: 'Use this to group several instances of some types of widgets.' enabled: true diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index effdf3b..8d4a8de 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -29,6 +29,7 @@ meta: 2ec1a258-188f-43da-936b-78e95f910601: 'Color Tool' # Color Tool 4d4bea1a-66b1-4042-b30d-b5525fa9481d: Y-value # Y-value 4e2a01a5-ed3f-4652-9d31-4c064ff91cc1: Label # Label + 5b8a79d6-e9d6-44d2-b986-36bf0bf74131: 'Scatterplot Tool' # Scatterplot Tool 05b71c40-b1ec-4b33-ac48-b9b0c7fc81b6: Description # Description 5bfc1518-54f5-4b2a-86e8-02a16537b8cf: Y-value # Y-value 5e096987-24f1-48a7-af6a-898905593ab5: 'Widget Container' # Widget Container @@ -39,8 +40,10 @@ meta: 8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d: Pages # Pages 8ef976e7-022d-4d12-97f7-5648dbca66b5: Bar # Bar 8f49c843-6aaa-49bf-ac19-21a9800c4760: Editors # Editors + 9fc49630-8ca5-4f95-be3e-cf1adc06e008: Images # Images 10bfe164-c055-47a5-9acf-414d5c53b74a: 'X-axis Maximum' # X-axis Maximum 17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3: 'Graph Bars' # Graph Bars + 23ca3082-ab51-4658-9872-cf7f31a9bd56: Images # Images 43cffcf1-c54b-45c3-b157-9bdefaa3ce36: Label # Label 61e0fe59-d439-429c-b783-2d71fe4c5d44: 'Y-axis Maximum' # Y-axis Maximum 074f7db9-8ff3-4016-ad34-bfe9c31d5543: Pages # Pages @@ -52,6 +55,7 @@ meta: 0481b024-bc6f-4104-bc1c-802615313aaa: 'Page Type' # Page Type 852df24b-f90e-486b-a371-b47ca241a84e: 'Y-axis Label' # Y-axis Label 1601c7a8-2437-4b8f-b2f2-116f4c043402: 'Site Information' # Site Information + 3912a1a0-e71b-44b3-bcf4-976c0564975e: 'Filter Tool' # Filter Tool 4994da56-0831-400d-b1d1-ade611fd5da1: Title # Title 5548ce5c-5ad4-494e-93be-8ff129618d20: Text # Text 5599d188-862e-4717-b206-6aadd975c937: Common # Common @@ -61,18 +65,22 @@ meta: 513634e9-3389-4e41-b769-9433ac34e35e: Widgets # Widgets 547128fa-4529-4483-9968-66425996b69f: EN # EN 04341069-ff31-4470-970a-8c7e82ec37eb: 'Student Schema' # Student Schema + 9679727f-de58-43ae-9674-13827bb1e0b3: 'Image Group' # Image Group 65934563-c9b7-45d5-99e6-cc013e22b668: 'Investigation Step (Child Entry)' # Investigation Step (Child Entry) a21a42b0-7211-4d77-9071-47a06960fef4: Widgets # Widgets a46e7379-7773-4ce4-9c59-434567870f0c: 'Content Blocks' # Content Blocks + a47f94c7-0a32-43be-863a-fa9d6636fff2: 'Bar Graph Tool' # Bar Graph Tool a72ca793-6ee2-4a6f-b47e-06a35cf61e06: 'Scatterplot Items' # Scatterplot Items aee57b4f-2623-44fc-af2b-c670f6e1babe: 'Site information' # Site information b0af5e39-02aa-4d2b-97c8-3ef5ac7982fa: X-value # X-value + be5b1aeb-8cbb-4460-a87d-d1ebe0a4fbf8: 'Group Name' # Group Name bfaa63c2-dd2c-42c8-b68e-79d0180d5146: 'Investigation (Parent Entry)' # Investigation (Parent Entry) c6d1924e-d9ec-4547-bb6d-bddb9b46b774: Description # Description c22e4947-7fbb-488a-994f-246c31e27b95: Image # Image c430001c-4bfc-4154-9e13-f5ada3b4a22d: Text # Text c6109150-a89c-4f0b-aa79-8c1ca78be0ec: Template # Template cec04a25-43ba-4f4c-81bd-b71f48731b5a: 'Public Schema' # Public Schema + d0f08c4c-40d1-444d-9a32-b1264d617636: 'Pre-selected Color' # Pre-selected Color d8be03ce-7aeb-4141-b40e-ec39ec1c796f: Educators # Educators d9df041c-3556-450e-94e1-f37369daf5f3: 'X-axis Label' # X-axis Label e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee: 'Educator Schema' # Educator Schema From bd504bb5798a20f1e2a613d0eebcd4be05b35d2a Mon Sep 17 00:00:00 2001 From: Kyle Pratuch Date: Thu, 6 Jul 2023 19:55:47 -0700 Subject: [PATCH 6/9] [F] Configure assets for widgets --- .../4e1884f2-7cc9-40d8-8426-f66da625d8cc.yaml | 1 + ...-cccddcb9-181f-4575-b6cd-62031c3d6d94.yaml | 45 ++++++++++++++++ ...-e5142c27-2288-47b7-bfad-14cd6b3a6653.yaml | 19 +++++++ api/config/project/project.yaml | 3 ++ ...-2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml | 53 +++++++++++++++++++ 5 files changed, 121 insertions(+) create mode 100644 api/config/project/fieldGroups/4e1884f2-7cc9-40d8-8426-f66da625d8cc.yaml create mode 100644 api/config/project/fields/availableFilters--cccddcb9-181f-4575-b6cd-62031c3d6d94.yaml create mode 100644 api/config/project/fields/displayName--e5142c27-2288-47b7-bfad-14cd6b3a6653.yaml diff --git a/api/config/project/fieldGroups/4e1884f2-7cc9-40d8-8426-f66da625d8cc.yaml b/api/config/project/fieldGroups/4e1884f2-7cc9-40d8-8426-f66da625d8cc.yaml new file mode 100644 index 0000000..3aeac7d --- /dev/null +++ b/api/config/project/fieldGroups/4e1884f2-7cc9-40d8-8426-f66da625d8cc.yaml @@ -0,0 +1 @@ +name: Assets diff --git a/api/config/project/fields/availableFilters--cccddcb9-181f-4575-b6cd-62031c3d6d94.yaml b/api/config/project/fields/availableFilters--cccddcb9-181f-4575-b6cd-62031c3d6d94.yaml new file mode 100644 index 0000000..f6de643 --- /dev/null +++ b/api/config/project/fields/availableFilters--cccddcb9-181f-4575-b6cd-62031c3d6d94.yaml @@ -0,0 +1,45 @@ +columnSuffix: aqxrdojz +contentColumnType: text +fieldGroup: 4e1884f2-7cc9-40d8-8426-f66da625d8cc # Assets +handle: availableFilters +instructions: null +name: 'Available Filters' +searchable: false +settings: + options: + - + __assoc__: + - + - label + - All + - + - value + - all + - + - default + - '1' + - + __assoc__: + - + - label + - 'Placeholder One' + - + - value + - placeholderOne + - + - default + - '' + - + __assoc__: + - + - label + - 'Placeholder Two' + - + - value + - placeholderTwo + - + - default + - '' +translationKeyFormat: null +translationMethod: none +type: craft\fields\Checkboxes diff --git a/api/config/project/fields/displayName--e5142c27-2288-47b7-bfad-14cd6b3a6653.yaml b/api/config/project/fields/displayName--e5142c27-2288-47b7-bfad-14cd6b3a6653.yaml new file mode 100644 index 0000000..eaa1a3d --- /dev/null +++ b/api/config/project/fields/displayName--e5142c27-2288-47b7-bfad-14cd6b3a6653.yaml @@ -0,0 +1,19 @@ +columnSuffix: nspcwsfq +contentColumnType: text +fieldGroup: 4e1884f2-7cc9-40d8-8426-f66da625d8cc # Assets +handle: displayName +instructions: null +name: 'Display Name' +searchable: false +settings: + byteLimit: null + charLimit: null + code: false + columnType: null + initialRows: 4 + multiline: false + placeholder: null + uiMode: normal +translationKeyFormat: null +translationMethod: none +type: craft\fields\PlainText diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 8d4a8de..de45e0a 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -29,6 +29,7 @@ meta: 2ec1a258-188f-43da-936b-78e95f910601: 'Color Tool' # Color Tool 4d4bea1a-66b1-4042-b30d-b5525fa9481d: Y-value # Y-value 4e2a01a5-ed3f-4652-9d31-4c064ff91cc1: Label # Label + 4e1884f2-7cc9-40d8-8426-f66da625d8cc: Assets # Assets 5b8a79d6-e9d6-44d2-b986-36bf0bf74131: 'Scatterplot Tool' # Scatterplot Tool 05b71c40-b1ec-4b33-ac48-b9b0c7fc81b6: Description # Description 5bfc1518-54f5-4b2a-86e8-02a16537b8cf: Y-value # Y-value @@ -79,11 +80,13 @@ meta: c22e4947-7fbb-488a-994f-246c31e27b95: Image # Image c430001c-4bfc-4154-9e13-f5ada3b4a22d: Text # Text c6109150-a89c-4f0b-aa79-8c1ca78be0ec: Template # Template + cccddcb9-181f-4575-b6cd-62031c3d6d94: 'Available Filters' # Available Filters cec04a25-43ba-4f4c-81bd-b71f48731b5a: 'Public Schema' # Public Schema d0f08c4c-40d1-444d-9a32-b1264d617636: 'Pre-selected Color' # Pre-selected Color d8be03ce-7aeb-4141-b40e-ec39ec1c796f: Educators # Educators d9df041c-3556-450e-94e1-f37369daf5f3: 'X-axis Label' # X-axis Label e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee: 'Educator Schema' # Educator Schema + e5142c27-2288-47b7-bfad-14cd6b3a6653: 'Display Name' # Display Name f8a590d0-db30-4e06-9d6d-6cfd7613147e: 'Hide Title' # Hide Title plugins: google-cloud: diff --git a/api/config/project/volumes/contentAssets--2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml b/api/config/project/volumes/contentAssets--2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml index b76645d..69cc4c1 100644 --- a/api/config/project/volumes/contentAssets--2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml +++ b/api/config/project/volumes/contentAssets--2a5db1b1-d277-4741-affe-f6d39af9a8b6.yaml @@ -30,9 +30,62 @@ fieldLayouts: userCondition: null warning: null width: 100 + - + attribute: alt + class: null + cols: null + disabled: false + elementCondition: null + id: null + instructions: null + label: null + name: null + orientation: null + placeholder: null + readonly: false + requirable: true + required: false + rows: null + tip: null + title: null + type: craft\fieldlayoutelements\assets\AltField + uid: 178c9ccb-1493-42bf-9b96-0f881a19c9b5 + userCondition: null + warning: null + width: 100 name: Content uid: f14b4192-0978-4735-994f-5a03e34dc25c userCondition: null + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: e5142c27-2288-47b7-bfad-14cd6b3a6653 # Display Name + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 61dd62c3-178b-4f2e-9b65-62f3a2b108d8 + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: cccddcb9-181f-4575-b6cd-62031c3d6d94 # Available Filters + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 5660daf7-cb71-4d92-a130-b4e2b88ec57b + userCondition: null + warning: null + width: 100 + name: 'Widget Features' + uid: 1aa41bc6-f042-4171-9a92-773d1a236179 + userCondition: null fs: contentFilesystem handle: contentAssets name: 'Content Assets' From 199aaa22be87d727dd45df78d38684eaecab6586 Mon Sep 17 00:00:00 2001 From: Kyle Pratuch Date: Thu, 13 Jul 2023 11:33:23 -0700 Subject: [PATCH 7/9] [C] Add Investigations to Next Builds --- api/config/project/project.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index de45e0a..85c553c 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1689271546 +dateModified: 1689273080 email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME @@ -356,6 +356,9 @@ plugins: - - homepage - '1' + - + - investigations + - '1' - - pages - '1' From 2c2c58de03fc54cf7b8582b040cd459066a6a3ac Mon Sep 17 00:00:00 2001 From: Kyle Pratuch Date: Thu, 13 Jul 2023 12:14:40 -0700 Subject: [PATCH 8/9] [F] Add some fields to investigation entry --- ...-65934563-c9b7-45d5-99e6-cc013e22b668.yaml | 24 +++++++++++++++++++ .../5dc7dc5c-2390-4eb4-9714-818aa35f5772.yaml | 1 + ...-25eb3834-cb4a-46d7-823a-a135a16b9677.yaml | 14 +++++++++++ api/config/project/project.yaml | 4 +++- 4 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 api/config/project/fieldGroups/5dc7dc5c-2390-4eb4-9714-818aa35f5772.yaml create mode 100644 api/config/project/fields/hasSavePoint--25eb3834-cb4a-46d7-823a-a135a16b9677.yaml diff --git a/api/config/project/entryTypes/default--65934563-c9b7-45d5-99e6-cc013e22b668.yaml b/api/config/project/entryTypes/default--65934563-c9b7-45d5-99e6-cc013e22b668.yaml index 1222d2a..788cf6e 100644 --- a/api/config/project/entryTypes/default--65934563-c9b7-45d5-99e6-cc013e22b668.yaml +++ b/api/config/project/entryTypes/default--65934563-c9b7-45d5-99e6-cc013e22b668.yaml @@ -29,6 +29,30 @@ fieldLayouts: uid: fbe101d7-65bd-4634-8dc2-0a7625bd0ba3 userCondition: null warning: null + width: 75 + - + elementCondition: null + fieldUid: 25eb3834-cb4a-46d7-823a-a135a16b9677 # Save Point + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 5352fe6b-119f-45f6-8e5b-fa3abc91754f + userCondition: null + warning: null + width: 25 + - + elementCondition: null + fieldUid: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 2d4057f6-85d6-4002-aa4d-f677025adfe8 + userCondition: null + warning: null width: 100 name: Content uid: b2e3d5d6-dfb0-43ec-a79a-6ed9ab053f98 diff --git a/api/config/project/fieldGroups/5dc7dc5c-2390-4eb4-9714-818aa35f5772.yaml b/api/config/project/fieldGroups/5dc7dc5c-2390-4eb4-9714-818aa35f5772.yaml new file mode 100644 index 0000000..d516827 --- /dev/null +++ b/api/config/project/fieldGroups/5dc7dc5c-2390-4eb4-9714-818aa35f5772.yaml @@ -0,0 +1 @@ +name: Investigations diff --git a/api/config/project/fields/hasSavePoint--25eb3834-cb4a-46d7-823a-a135a16b9677.yaml b/api/config/project/fields/hasSavePoint--25eb3834-cb4a-46d7-823a-a135a16b9677.yaml new file mode 100644 index 0000000..c2ec010 --- /dev/null +++ b/api/config/project/fields/hasSavePoint--25eb3834-cb4a-46d7-823a-a135a16b9677.yaml @@ -0,0 +1,14 @@ +columnSuffix: zjynfpiw +contentColumnType: boolean +fieldGroup: 5dc7dc5c-2390-4eb4-9714-818aa35f5772 # Investigations +handle: hasSavePoint +instructions: 'Users can save their progress on this page.' +name: 'Save Point' +searchable: false +settings: + default: false + offLabel: null + onLabel: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Lightswitch diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 85c553c..e1b4ae0 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1689273080 +dateModified: 1689274111 email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME @@ -33,6 +33,7 @@ meta: 5b8a79d6-e9d6-44d2-b986-36bf0bf74131: 'Scatterplot Tool' # Scatterplot Tool 05b71c40-b1ec-4b33-ac48-b9b0c7fc81b6: Description # Description 5bfc1518-54f5-4b2a-86e8-02a16537b8cf: Y-value # Y-value + 5dc7dc5c-2390-4eb4-9714-818aa35f5772: Investigations # Investigations 5e096987-24f1-48a7-af6a-898905593ab5: 'Widget Container' # Widget Container 6f0c128e-9978-41c2-b982-dcdf3933b0e2: Homepage # Homepage 7bd60210-4767-46b3-b735-61a1499b90b7: 'Redirect Page' # Redirect Page @@ -45,6 +46,7 @@ meta: 10bfe164-c055-47a5-9acf-414d5c53b74a: 'X-axis Maximum' # X-axis Maximum 17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3: 'Graph Bars' # Graph Bars 23ca3082-ab51-4658-9872-cf7f31a9bd56: Images # Images + 25eb3834-cb4a-46d7-823a-a135a16b9677: 'Save Point' # Save Point 43cffcf1-c54b-45c3-b157-9bdefaa3ce36: Label # Label 61e0fe59-d439-429c-b783-2d71fe4c5d44: 'Y-axis Maximum' # Y-axis Maximum 074f7db9-8ff3-4016-ad34-bfe9c31d5543: Pages # Pages From 76911326108a88053105d96f6efd867cf4846536 Mon Sep 17 00:00:00 2001 From: Dana Johnson Date: Mon, 7 Aug 2023 12:32:03 -0700 Subject: [PATCH 9/9] [C] Add investigation entries to public schema --- .../schemas/cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml | 5 ++++- api/config/project/project.yaml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/api/config/project/graphql/schemas/cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml b/api/config/project/graphql/schemas/cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml index f997105..79ec1fd 100644 --- a/api/config/project/graphql/schemas/cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml +++ b/api/config/project/graphql/schemas/cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml @@ -5,9 +5,12 @@ scope: - 'sites.2c2e1c6a-eb4d-44f1-9a43-8d79b326f354:read' # ES - 'sections.075467b0-0dee-453c-9df0-0de6d2443cf8:read' # Homepage - 'entrytypes.6f0c128e-9978-41c2-b982-dcdf3933b0e2:read' # Homepage + - 'sections.1a93d10f-deca-4e6b-a3e8-9baae53e7c47:read' # Investigations + - 'entrytypes.65934563-c9b7-45d5-99e6-cc013e22b668:read' # Investigation Step (Child Entry) + - 'entrytypes.bfaa63c2-dd2c-42c8-b68e-79d0180d5146:read' # Investigation (Parent Entry) - 'sections.8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d:read' # Pages - - 'entrytypes.7bd60210-4767-46b3-b735-61a1499b90b7:read' # Redirect Page - 'entrytypes.77f02908-0342-4917-9d14-38f769d15c39:read' # Pages + - 'entrytypes.7bd60210-4767-46b3-b735-61a1499b90b7:read' # Redirect Page - 'globalsets.aee57b4f-2623-44fc-af2b-c670f6e1babe:read' # Site information - 'usergroups.everyone:read' - 'categorygroups.90aa9610-a9c9-4531-95f8-d0068046ae25:read' # Sort Options diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index e1b4ae0..86ef86c 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1689274111 +dateModified: 1691436696 email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME