From 233644b371047d15d000e2ae5528938e7dde29bf Mon Sep 17 00:00:00 2001 From: Alexandra Goff Date: Wed, 21 Feb 2024 15:38:44 -0700 Subject: [PATCH 01/10] [F] Supernova Distance & Distribution --- ...-a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml | 20 +++++ .../a46e7379-7773-4ce4-9c59-434567870f0c.yaml | 1 + ...-947400f5-3c2d-403a-b94e-68715e48a9c0.yaml | 1 + ...-efbf1b30-4cb7-4361-9f45-016d119aec06.yaml | 1 + ...-ba6494d9-36e8-40ee-9284-c56783357043.yaml | 1 + ...-7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml | 88 +++++++++++++++++++ api/config/project/project.yaml | 4 +- ...-8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml | 12 +++ 8 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml create mode 100644 api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml diff --git a/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml b/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml new file mode 100644 index 0000000..4d3b412 --- /dev/null +++ b/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml @@ -0,0 +1,20 @@ +columnSuffix: gsgeljzc +contentColumnType: integer(10) +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: binSize +instructions: null +name: 'Bin Size' +searchable: false +settings: + decimals: 0 + defaultValue: null + max: null + min: 0 + prefix: null + previewCurrency: null + previewFormat: none + size: null + suffix: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Number diff --git a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml index 63153a3..1d88266 100644 --- a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml +++ b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml @@ -16,3 +16,4 @@ - 'blockType:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool - 'blockType:87fc48a5-a399-4ce1-a7ca-2dadfd1e1445' # Camera Filter Tool - 'blockType:0d06751e-ecf9-4281-a754-8c818fb9353b' # Color Filter Tool Block +- 'blockType:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution diff --git a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml index b108167..a4d5ca5 100644 --- a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml +++ b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml @@ -12,6 +12,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml index 4d6c97f..afaae49 100644 --- a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml +++ b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml @@ -12,6 +12,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml index eab6ecf..cf438bc 100644 --- a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml +++ b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml @@ -11,6 +11,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml b/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml new file mode 100644 index 0000000..b655558 --- /dev/null +++ b/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml @@ -0,0 +1,88 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + 5356eb6d-927d-4e45-aecb-5a8c09f8bb0f: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: 0fd14cd3-7b23-4230-adce-9cfa16050740 # Widget Instructions + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: e9b740dd-dd8f-4057-bf69-e2bb93e0650b + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: a4afde15-f983-4c30-b0d7-e0b56871e4de # Dataset + instructions: 'Supernovae from previous user interactions to show in widget' + label: 'User Supernovae' + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 13f3d27b-b03b-485e-99c6-be3f946f3ac9 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: a03e80f0-77ce-4b03-abf5-76a0deb264a9 # JSON + instructions: 'JSON array of supernovae for each histogram bin' + label: 'Histogram data' + required: true + tip: null + type: craft\fieldlayoutelements\CustomField + uid: b5f8c77f-6f50-4790-ac02-31ad3f222f29 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: c489f84c-509c-4078-9b71-1e3493e17620 # Image Album + instructions: null + label: null + required: true + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 92315654-a2af-4b87-82d5-743dfdddb35d + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: a81f2835-5fbe-4fa9-a636-eafeaee155c3 # Bin Size + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 7823e640-d754-4d1d-945e-7a5d8ce35616 + userCondition: null + warning: null + width: 50 + name: Content + uid: e77a6988-d8aa-4c49-be3f-51ace608f209 + userCondition: null +group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets +groupChildBlockTypes: true +handle: supernovaDistanceDistribution +icon: null +iconFilename: '' +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Supernova Distance & Distribution' +topLevel: true diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 4f80223..d27615d 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1708033699 +dateModified: 1708554891 elementSources: craft\elements\Entry: - @@ -193,6 +193,7 @@ meta: 3173102a-6f80-4a4f-954b-1d3e151fb21a: 'Cell Content' # Cell Content 04341069-ff31-4470-970a-8c7e82ec37eb: 'Student Schema' # Student Schema 4941158b-702a-45b4-8da5-12ed4202efae: Name # Name + 7033117c-c3b9-4794-9a6d-cbbbae2010af: 'Supernova Distance & Distribution' # Supernova Distance & Distribution 8365851b-c952-499c-84dc-c9e054b83e84: Select # Select 9679727f-de58-43ae-9674-13827bb1e0b3: 'Image Group' # Image Group 28704998-935a-423b-a405-d4ad8b38efa2: Widgets # Widgets @@ -207,6 +208,7 @@ meta: 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 + a81f2835-5fbe-4fa9-a636-eafeaee155c3: 'Bin Size' # Bin Size a966d509-84b0-43ab-9a5b-42590a5fb537: 'Answer Type' # Answer Type ad74ba83-53f4-4102-94e9-e9eea0d31171: 'Galactic longitude' # Galactic longitude ad6237ea-0d14-4e5b-880e-767316434bcd: isEnabled # isEnabled diff --git a/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml b/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml index 399e044..d6ea820 100644 --- a/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml +++ b/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml @@ -29,12 +29,14 @@ permissions: - 'neo-createblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-createblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-createblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool + - 'neo-createblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-createblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-createblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-createblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-createblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-createblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-createblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool + - 'neo-createblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-createblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-createblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-createblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -46,6 +48,8 @@ permissions: - 'neo-createblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-createblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-createblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group + - 'neo-createblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video + - 'neo-createblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-createblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-createblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-createblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid @@ -60,12 +64,14 @@ permissions: - 'neo-deleteblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-deleteblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-deleteblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool + - 'neo-deleteblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-deleteblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-deleteblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-deleteblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-deleteblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-deleteblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-deleteblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool + - 'neo-deleteblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-deleteblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-deleteblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-deleteblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -77,6 +83,8 @@ permissions: - 'neo-deleteblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-deleteblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-deleteblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group + - 'neo-deleteblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video + - 'neo-deleteblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-deleteblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-deleteblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-deleteblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid @@ -91,12 +99,14 @@ permissions: - 'neo-editblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-editblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-editblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool + - 'neo-editblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-editblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-editblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-editblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-editblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-editblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-editblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool + - 'neo-editblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-editblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-editblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-editblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -108,6 +118,8 @@ permissions: - 'neo-editblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-editblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-editblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group + - 'neo-editblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video + - 'neo-editblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-editblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-editblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-editblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid From ee52f38bc557cd0c7befef8700c7bfbc5940bded Mon Sep 17 00:00:00 2001 From: Alexandra Goff Date: Wed, 21 Feb 2024 15:39:25 -0700 Subject: [PATCH 02/10] Revert "[F] Supernova Distance & Distribution" This reverts commit f7f0a7056d0c441c62f825348dac40008da52e05. --- ...-a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml | 20 ----- .../a46e7379-7773-4ce4-9c59-434567870f0c.yaml | 1 - ...-947400f5-3c2d-403a-b94e-68715e48a9c0.yaml | 1 - ...-efbf1b30-4cb7-4361-9f45-016d119aec06.yaml | 1 - ...-ba6494d9-36e8-40ee-9284-c56783357043.yaml | 1 - ...-7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml | 88 ------------------- api/config/project/project.yaml | 4 +- ...-8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml | 12 --- 8 files changed, 1 insertion(+), 127 deletions(-) delete mode 100644 api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml delete mode 100644 api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml diff --git a/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml b/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml deleted file mode 100644 index 4d3b412..0000000 --- a/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml +++ /dev/null @@ -1,20 +0,0 @@ -columnSuffix: gsgeljzc -contentColumnType: integer(10) -fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets -handle: binSize -instructions: null -name: 'Bin Size' -searchable: false -settings: - decimals: 0 - defaultValue: null - max: null - min: 0 - prefix: null - previewCurrency: null - previewFormat: none - size: null - suffix: null -translationKeyFormat: null -translationMethod: none -type: craft\fields\Number diff --git a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml index 1d88266..63153a3 100644 --- a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml +++ b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml @@ -16,4 +16,3 @@ - 'blockType:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool - 'blockType:87fc48a5-a399-4ce1-a7ca-2dadfd1e1445' # Camera Filter Tool - 'blockType:0d06751e-ecf9-4281-a754-8c818fb9353b' # Color Filter Tool Block -- 'blockType:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution diff --git a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml index a4d5ca5..b108167 100644 --- a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml +++ b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml @@ -12,7 +12,6 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock - - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml index afaae49..4d6c97f 100644 --- a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml +++ b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml @@ -12,7 +12,6 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock - - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml index cf438bc..eab6ecf 100644 --- a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml +++ b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml @@ -11,7 +11,6 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock - - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml b/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml deleted file mode 100644 index b655558..0000000 --- a/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml +++ /dev/null @@ -1,88 +0,0 @@ -childBlocks: null -conditions: null -description: '' -enabled: true -field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks -fieldLayouts: - 5356eb6d-927d-4e45-aecb-5a8c09f8bb0f: - tabs: - - - elementCondition: null - elements: - - - elementCondition: null - fieldUid: 0fd14cd3-7b23-4230-adce-9cfa16050740 # Widget Instructions - instructions: null - label: null - required: false - tip: null - type: craft\fieldlayoutelements\CustomField - uid: e9b740dd-dd8f-4057-bf69-e2bb93e0650b - userCondition: null - warning: null - width: 100 - - - elementCondition: null - fieldUid: a4afde15-f983-4c30-b0d7-e0b56871e4de # Dataset - instructions: 'Supernovae from previous user interactions to show in widget' - label: 'User Supernovae' - required: false - tip: null - type: craft\fieldlayoutelements\CustomField - uid: 13f3d27b-b03b-485e-99c6-be3f946f3ac9 - userCondition: null - warning: null - width: 50 - - - elementCondition: null - fieldUid: a03e80f0-77ce-4b03-abf5-76a0deb264a9 # JSON - instructions: 'JSON array of supernovae for each histogram bin' - label: 'Histogram data' - required: true - tip: null - type: craft\fieldlayoutelements\CustomField - uid: b5f8c77f-6f50-4790-ac02-31ad3f222f29 - userCondition: null - warning: null - width: 50 - - - elementCondition: null - fieldUid: c489f84c-509c-4078-9b71-1e3493e17620 # Image Album - instructions: null - label: null - required: true - tip: null - type: craft\fieldlayoutelements\CustomField - uid: 92315654-a2af-4b87-82d5-743dfdddb35d - userCondition: null - warning: null - width: 50 - - - elementCondition: null - fieldUid: a81f2835-5fbe-4fa9-a636-eafeaee155c3 # Bin Size - instructions: null - label: null - required: false - tip: null - type: craft\fieldlayoutelements\CustomField - uid: 7823e640-d754-4d1d-945e-7a5d8ce35616 - userCondition: null - warning: null - width: 50 - name: Content - uid: e77a6988-d8aa-4c49-be3f-51ace608f209 - userCondition: null -group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets -groupChildBlockTypes: true -handle: supernovaDistanceDistribution -icon: null -iconFilename: '' -ignorePermissions: true -maxBlocks: 0 -maxChildBlocks: 0 -maxSiblingBlocks: 0 -minBlocks: 0 -minChildBlocks: 0 -minSiblingBlocks: 0 -name: 'Supernova Distance & Distribution' -topLevel: true diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index d27615d..4f80223 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1708554891 +dateModified: 1708033699 elementSources: craft\elements\Entry: - @@ -193,7 +193,6 @@ meta: 3173102a-6f80-4a4f-954b-1d3e151fb21a: 'Cell Content' # Cell Content 04341069-ff31-4470-970a-8c7e82ec37eb: 'Student Schema' # Student Schema 4941158b-702a-45b4-8da5-12ed4202efae: Name # Name - 7033117c-c3b9-4794-9a6d-cbbbae2010af: 'Supernova Distance & Distribution' # Supernova Distance & Distribution 8365851b-c952-499c-84dc-c9e054b83e84: Select # Select 9679727f-de58-43ae-9674-13827bb1e0b3: 'Image Group' # Image Group 28704998-935a-423b-a405-d4ad8b38efa2: Widgets # Widgets @@ -208,7 +207,6 @@ meta: 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 - a81f2835-5fbe-4fa9-a636-eafeaee155c3: 'Bin Size' # Bin Size a966d509-84b0-43ab-9a5b-42590a5fb537: 'Answer Type' # Answer Type ad74ba83-53f4-4102-94e9-e9eea0d31171: 'Galactic longitude' # Galactic longitude ad6237ea-0d14-4e5b-880e-767316434bcd: isEnabled # isEnabled diff --git a/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml b/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml index d6ea820..399e044 100644 --- a/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml +++ b/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml @@ -29,14 +29,12 @@ permissions: - 'neo-createblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-createblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-createblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool - - 'neo-createblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-createblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-createblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-createblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-createblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-createblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-createblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool - - 'neo-createblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-createblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-createblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-createblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -48,8 +46,6 @@ permissions: - 'neo-createblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-createblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-createblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group - - 'neo-createblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video - - 'neo-createblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-createblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-createblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-createblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid @@ -64,14 +60,12 @@ permissions: - 'neo-deleteblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-deleteblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-deleteblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool - - 'neo-deleteblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-deleteblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-deleteblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-deleteblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-deleteblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-deleteblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-deleteblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool - - 'neo-deleteblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-deleteblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-deleteblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-deleteblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -83,8 +77,6 @@ permissions: - 'neo-deleteblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-deleteblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-deleteblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group - - 'neo-deleteblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video - - 'neo-deleteblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-deleteblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-deleteblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-deleteblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid @@ -99,14 +91,12 @@ permissions: - 'neo-editblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-editblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-editblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool - - 'neo-editblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-editblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-editblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-editblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-editblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-editblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-editblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool - - 'neo-editblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-editblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-editblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-editblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -118,8 +108,6 @@ permissions: - 'neo-editblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-editblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-editblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group - - 'neo-editblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video - - 'neo-editblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-editblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-editblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-editblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid From e9718e8afabdeaa5dafc43aef96df71e7969ac16 Mon Sep 17 00:00:00 2001 From: Alexandra Goff Date: Wed, 21 Feb 2024 15:38:44 -0700 Subject: [PATCH 03/10] [F] Supernova Distance & Distribution --- ...-a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml | 20 +++++ .../a46e7379-7773-4ce4-9c59-434567870f0c.yaml | 1 + ...-947400f5-3c2d-403a-b94e-68715e48a9c0.yaml | 1 + ...-efbf1b30-4cb7-4361-9f45-016d119aec06.yaml | 1 + ...-ba6494d9-36e8-40ee-9284-c56783357043.yaml | 1 + ...-7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml | 88 +++++++++++++++++++ api/config/project/project.yaml | 4 +- ...-8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml | 12 +++ 8 files changed, 127 insertions(+), 1 deletion(-) create mode 100644 api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml create mode 100644 api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml diff --git a/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml b/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml new file mode 100644 index 0000000..4d3b412 --- /dev/null +++ b/api/config/project/fields/binSize--a81f2835-5fbe-4fa9-a636-eafeaee155c3.yaml @@ -0,0 +1,20 @@ +columnSuffix: gsgeljzc +contentColumnType: integer(10) +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: binSize +instructions: null +name: 'Bin Size' +searchable: false +settings: + decimals: 0 + defaultValue: null + max: null + min: 0 + prefix: null + previewCurrency: null + previewFormat: none + size: null + suffix: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Number diff --git a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml index 63153a3..1d88266 100644 --- a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml +++ b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml @@ -16,3 +16,4 @@ - 'blockType:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool - 'blockType:87fc48a5-a399-4ce1-a7ca-2dadfd1e1445' # Camera Filter Tool - 'blockType:0d06751e-ecf9-4281-a754-8c818fb9353b' # Color Filter Tool Block +- 'blockType:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution diff --git a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml index b108167..a4d5ca5 100644 --- a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml +++ b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml @@ -12,6 +12,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml index 4d6c97f..afaae49 100644 --- a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml +++ b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml @@ -12,6 +12,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml index eab6ecf..cf438bc 100644 --- a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml +++ b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml @@ -11,6 +11,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - supernovaDistanceDistribution conditions: null description: '' enabled: true diff --git a/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml b/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml new file mode 100644 index 0000000..b655558 --- /dev/null +++ b/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml @@ -0,0 +1,88 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + 5356eb6d-927d-4e45-aecb-5a8c09f8bb0f: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: 0fd14cd3-7b23-4230-adce-9cfa16050740 # Widget Instructions + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: e9b740dd-dd8f-4057-bf69-e2bb93e0650b + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: a4afde15-f983-4c30-b0d7-e0b56871e4de # Dataset + instructions: 'Supernovae from previous user interactions to show in widget' + label: 'User Supernovae' + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 13f3d27b-b03b-485e-99c6-be3f946f3ac9 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: a03e80f0-77ce-4b03-abf5-76a0deb264a9 # JSON + instructions: 'JSON array of supernovae for each histogram bin' + label: 'Histogram data' + required: true + tip: null + type: craft\fieldlayoutelements\CustomField + uid: b5f8c77f-6f50-4790-ac02-31ad3f222f29 + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: c489f84c-509c-4078-9b71-1e3493e17620 # Image Album + instructions: null + label: null + required: true + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 92315654-a2af-4b87-82d5-743dfdddb35d + userCondition: null + warning: null + width: 50 + - + elementCondition: null + fieldUid: a81f2835-5fbe-4fa9-a636-eafeaee155c3 # Bin Size + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 7823e640-d754-4d1d-945e-7a5d8ce35616 + userCondition: null + warning: null + width: 50 + name: Content + uid: e77a6988-d8aa-4c49-be3f-51ace608f209 + userCondition: null +group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets +groupChildBlockTypes: true +handle: supernovaDistanceDistribution +icon: null +iconFilename: '' +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Supernova Distance & Distribution' +topLevel: true diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 4f80223..d27615d 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1708033699 +dateModified: 1708554891 elementSources: craft\elements\Entry: - @@ -193,6 +193,7 @@ meta: 3173102a-6f80-4a4f-954b-1d3e151fb21a: 'Cell Content' # Cell Content 04341069-ff31-4470-970a-8c7e82ec37eb: 'Student Schema' # Student Schema 4941158b-702a-45b4-8da5-12ed4202efae: Name # Name + 7033117c-c3b9-4794-9a6d-cbbbae2010af: 'Supernova Distance & Distribution' # Supernova Distance & Distribution 8365851b-c952-499c-84dc-c9e054b83e84: Select # Select 9679727f-de58-43ae-9674-13827bb1e0b3: 'Image Group' # Image Group 28704998-935a-423b-a405-d4ad8b38efa2: Widgets # Widgets @@ -207,6 +208,7 @@ meta: 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 + a81f2835-5fbe-4fa9-a636-eafeaee155c3: 'Bin Size' # Bin Size a966d509-84b0-43ab-9a5b-42590a5fb537: 'Answer Type' # Answer Type ad74ba83-53f4-4102-94e9-e9eea0d31171: 'Galactic longitude' # Galactic longitude ad6237ea-0d14-4e5b-880e-767316434bcd: isEnabled # isEnabled diff --git a/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml b/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml index 399e044..d6ea820 100644 --- a/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml +++ b/api/config/project/users/groups/editors--8f49c843-6aaa-49bf-ac19-21a9800c4760.yaml @@ -29,12 +29,14 @@ permissions: - 'neo-createblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-createblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-createblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool + - 'neo-createblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-createblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-createblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-createblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-createblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-createblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-createblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool + - 'neo-createblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-createblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-createblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-createblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -46,6 +48,8 @@ permissions: - 'neo-createblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-createblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-createblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group + - 'neo-createblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video + - 'neo-createblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-createblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-createblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-createblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid @@ -60,12 +64,14 @@ permissions: - 'neo-deleteblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-deleteblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-deleteblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool + - 'neo-deleteblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-deleteblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-deleteblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-deleteblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-deleteblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-deleteblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-deleteblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool + - 'neo-deleteblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-deleteblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-deleteblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-deleteblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -77,6 +83,8 @@ permissions: - 'neo-deleteblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-deleteblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-deleteblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group + - 'neo-deleteblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video + - 'neo-deleteblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-deleteblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-deleteblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-deleteblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid @@ -91,12 +99,14 @@ permissions: - 'neo-editblocks:28bf8eda-b10b-4aaa-98fd-d52d6c95ef57' # Multiselect - 'neo-editblocks:367fe8fa-1963-4fe0-9e02-3c0866c0b5bb' # Color Filter Tool Block - 'neo-editblocks:3912a1a0-e71b-44b3-bcf4-976c0564975e' # Filter Tool + - 'neo-editblocks:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block - 'neo-editblocks:485a4230-6aac-41b7-8524-da6232e226ae' # Filter Tool - 'neo-editblocks:4e9ea915-78e8-4b28-b44e-fe2af60c77f8' # Image - 'neo-editblocks:53df9537-d85e-4fd3-9e4c-b203594ada7c' # Reference Modal Block - 'neo-editblocks:5548ce5c-5ad4-494e-93be-8ff129618d20' # Text - 'neo-editblocks:59560b67-c194-46fc-9404-cb790a44800a' # Image - 'neo-editblocks:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool + - 'neo-editblocks:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution - 'neo-editblocks:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'neo-editblocks:7b30c218-6328-41a2-a3e3-2575559f4c9c' # Table - 'neo-editblocks:8365851b-c952-499c-84dc-c9e054b83e84' # Select @@ -108,6 +118,8 @@ permissions: - 'neo-editblocks:a47f94c7-0a32-43be-863a-fa9d6636fff2' # Bar Graph Tool - 'neo-editblocks:af9748aa-9a7c-49c2-bf48-d1417664104b' # Text - 'neo-editblocks:ba6494d9-36e8-40ee-9284-c56783357043' # Interaction Group + - 'neo-editblocks:d022e61b-75d2-4c3e-88f1-198bd9978ae1' # Video + - 'neo-editblocks:dc1c3484-f028-4653-982b-a84e287d4c61' # Equation - 'neo-editblocks:e7b953ca-6424-4d14-bc2c-393d3f8410a4' # Question Text - 'neo-editblocks:efbf1b30-4cb7-4361-9f45-016d119aec06' # Right Column - 'neo-editblocks:f4b5a1d9-424f-4bc1-a2ea-37b302b8dc32' # Investigation Grid From 47e8d86034620a5f1b86d09da2bda9cbb133f873 Mon Sep 17 00:00:00 2001 From: Alexandra Goff Date: Thu, 22 Feb 2024 11:46:54 -0700 Subject: [PATCH 04/10] [C] better instructions + type safety --- ...eDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml | 6 +++--- api/config/project/project.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml b/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml index b655558..c2fe23b 100644 --- a/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml +++ b/api/config/project/neoBlockTypes/supernovaDistanceDistribution--7033117c-c3b9-4794-9a6d-cbbbae2010af.yaml @@ -48,8 +48,8 @@ fieldLayouts: - elementCondition: null fieldUid: c489f84c-509c-4078-9b71-1e3493e17620 # Image Album - instructions: null - label: null + instructions: 'Images must have their bin start in the filename.' + label: 'Supernova Distribution Images' required: true tip: null type: craft\fieldlayoutelements\CustomField @@ -62,7 +62,7 @@ fieldLayouts: fieldUid: a81f2835-5fbe-4fa9-a636-eafeaee155c3 # Bin Size instructions: null label: null - required: false + required: true tip: null type: craft\fieldlayoutelements\CustomField uid: 7823e640-d754-4d1d-945e-7a5d8ce35616 diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index d27615d..90c8ac9 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1708554891 +dateModified: 1708626550 elementSources: craft\elements\Entry: - From 3f0aa4ae5e61cd543a0b27f82f0f32b2c9d9a664 Mon Sep 17 00:00:00 2001 From: Eric Rosas Date: Mon, 4 Mar 2024 13:06:54 -0600 Subject: [PATCH 05/10] Upgraded DAM plugin version to `v4.1.0` Upgraded DAM plugin version to `v4.1.0` --- api/composer.json | 2 +- api/composer.lock | 71 +++++++++++------------------------------------ 2 files changed, 17 insertions(+), 56 deletions(-) diff --git a/api/composer.json b/api/composer.json index e93646f..089ed36 100755 --- a/api/composer.json +++ b/api/composer.json @@ -5,7 +5,7 @@ "craftcms/google-cloud": "2.0.0", "craftcms/redactor": "3.0.4", "jamesedmonston/graphql-authentication": "2.5.0", - "lsst-epo/canto-dam-assets": "4.0.12", + "lsst-epo/canto-dam-assets": "4.1.0", "sebastianlenz/linkfield": "^2.1.4", "spicyweb/craft-neo": "4.0.5", "verbb/super-table": "^3.0", diff --git a/api/composer.lock b/api/composer.lock index 9eb42c4..1279bf4 100755 --- a/api/composer.lock +++ b/api/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "59339b20eb47727c2286a3416d34f89d", + "content-hash": "c4244addc5933360fc69287c0e6ac120", "packages": [ { "name": "abraham/twitteroauth", @@ -1001,46 +1001,6 @@ ], "time": "2015-01-27T10:53:51+00:00" }, - { - "name": "daccess1/yii2-json-query-helper", - "version": "v1.0.0-stable", - "source": { - "type": "git", - "url": "https://github.com/daccess1/yii2-json-query-helper.git", - "reference": "d0308456a019ffb2b56258b70c83325e35414a88" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/daccess1/yii2-json-query-helper/zipball/d0308456a019ffb2b56258b70c83325e35414a88", - "reference": "d0308456a019ffb2b56258b70c83325e35414a88", - "shasum": "" - }, - "require": { - "yiisoft/yii2": "~2.0.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "daccess1\\JSONQueryHelper\\": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "b.kruchinkin", - "email": "b.kruchinkin@yandex.ru" - } - ], - "description": "Yii2 helper class, used to generate query expressions for JSON columns.", - "support": { - "issues": "https://github.com/daccess1/yii2-json-query-helper/issues", - "source": "https://github.com/daccess1/yii2-json-query-helper/tree/v1.0.0-stable" - }, - "time": "2020-12-21T20:21:29+00:00" - }, { "name": "defuse/php-encryption", "version": "v2.4.0", @@ -2670,27 +2630,28 @@ }, { "name": "lsst-epo/canto-dam-assets", - "version": "4.0.12", + "version": "4.1.0", "source": { "type": "git", "url": "https://github.com/lsst-epo/canto-dam-assets.git", - "reference": "6b953210872f65faf1471dd2aa273a4668624755" + "reference": "37d03858f193378f8731a801e62fce75a0fc109a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/6b953210872f65faf1471dd2aa273a4668624755", - "reference": "6b953210872f65faf1471dd2aa273a4668624755", + "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/37d03858f193378f8731a801e62fce75a0fc109a", + "reference": "37d03858f193378f8731a801e62fce75a0fc109a", "shasum": "" }, "require": { - "craftcms/cms": "^4.4.0", - "daccess1/yii2-json-query-helper": "^1.0.0", + "craftcms/cms": "^4.6.0", "nystudio107/craft-plugin-vite": "^4.0.0", "php": ">=8.0.2" }, "require-dev": { "craftcms/ecs": "dev-main", - "craftcms/phpstan": "dev-main" + "craftcms/phpstan": "dev-main", + "craftcms/rector": "dev-main", + "verbb/super-table": "^3.0.0" }, "type": "craft-plugin", "extra": { @@ -2731,7 +2692,7 @@ "issues": "https://github.com/lsst-epo/canto-dam-assets/issues", "source": "https://github.com/lsst-epo/canto-dam-assets/" }, - "time": "2024-01-16T18:32:00+00:00" + "time": "2024-02-25T06:02:11+00:00" }, { "name": "mikehaertl/php-shellcommand", @@ -2890,11 +2851,11 @@ }, { "name": "nystudio107/craft-plugin-vite", - "version": "4.0.8", + "version": "4.0.10", "dist": { "type": "zip", - "url": "https://api.github.com/repos/nystudio107/craft-plugin-vite/zipball/eb05b1cc7dc9eeecbdfe8cd3cd3d119e83c62619", - "reference": "eb05b1cc7dc9eeecbdfe8cd3cd3d119e83c62619", + "url": "https://api.github.com/repos/nystudio107/craft-plugin-vite/zipball/4ff8dfabd51663fcb081f092eeeba1ed2ed88a50", + "reference": "4ff8dfabd51663fcb081f092eeeba1ed2ed88a50", "shasum": "" }, "require": { @@ -2922,10 +2883,10 @@ "vite" ], "support": { - "docs": "https://github.com/nystudio107/craft-plugin-vite/blob/v1/README.md", + "docs": "https://github.com/nystudio107/craft-plugin-vite/blob/v4/README.md", "issues": "https://github.com/nystudio107/craft-plugin-vite/issues" }, - "time": "2023-01-25T21:09:10+00:00" + "time": "2024-03-02T05:06:52+00:00" }, { "name": "paragonie/constant_time_encoding", @@ -6963,5 +6924,5 @@ "platform-overrides": { "php": "8.1.10" }, - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.1.0" } From 73a885e400fad873196854d1862962e95317ce9f Mon Sep 17 00:00:00 2001 From: Alexandra Goff Date: Wed, 28 Feb 2024 15:43:53 -0700 Subject: [PATCH 06/10] [F] light curve tool setup --- ...-24e5bfd8-45a1-4e03-a9ee-e013a26057ec.yaml | 101 ++++++++++++++++++ ...-297d2268-f298-40a1-bec3-a1c836a69e38.yaml | 58 +++++++++- ...-5e789abf-cfef-4ed4-b795-a4dcfe4fd284.yaml | 18 ++-- ...-907a99bf-dc51-40c8-8117-c9686eddea0d.yaml | 14 +++ ...-466246f6-753b-4198-8067-18acf1a7d4cb.yaml | 53 +++++++++ ...-b78d733b-bfca-4d0c-9474-d40c87566945.yaml | 2 +- .../04341069-ff31-4470-970a-8c7e82ec37eb.yaml | 1 + .../cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml | 1 + .../e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee.yaml | 1 + .../2599f40c-bfbc-4db6-bf56-cb9f48ad01bf.yaml | 1 + .../a46e7379-7773-4ce4-9c59-434567870f0c.yaml | 1 + ...-947400f5-3c2d-403a-b94e-68715e48a9c0.yaml | 1 + ...-efbf1b30-4cb7-4361-9f45-016d119aec06.yaml | 1 + ...-721d7a12-d399-4504-bbeb-0fa6d88d72b7.yaml | 2 +- ...-ba6494d9-36e8-40ee-9284-c56783357043.yaml | 1 + ...-528d82d4-91db-4ee9-9fa2-8d8c7c871c5e.yaml | 40 +++++++ ...-a02a930a-9f54-4ae2-8bb2-0e0ab7713759.yaml | 40 +++++++ ...-430f132d-8145-4e49-ba49-e9b839f7898e.yaml | 2 +- api/config/project/project.yaml | 7 +- 19 files changed, 330 insertions(+), 15 deletions(-) create mode 100644 api/config/project/entryTypes/lightCurveTool--24e5bfd8-45a1-4e03-a9ee-e013a26057ec.yaml create mode 100644 api/config/project/fields/includeScatterPlot--907a99bf-dc51-40c8-8117-c9686eddea0d.yaml create mode 100644 api/config/project/fields/lightCurveTool--466246f6-753b-4198-8067-18acf1a7d4cb.yaml create mode 100644 api/config/project/neoBlockTypes/lightCurveBlock--528d82d4-91db-4ee9-9fa2-8d8c7c871c5e.yaml create mode 100644 api/config/project/neoBlockTypes/magnitudeScatterPlot--a02a930a-9f54-4ae2-8bb2-0e0ab7713759.yaml diff --git a/api/config/project/entryTypes/lightCurveTool--24e5bfd8-45a1-4e03-a9ee-e013a26057ec.yaml b/api/config/project/entryTypes/lightCurveTool--24e5bfd8-45a1-4e03-a9ee-e013a26057ec.yaml new file mode 100644 index 0000000..9c2df56 --- /dev/null +++ b/api/config/project/entryTypes/lightCurveTool--24e5bfd8-45a1-4e03-a9ee-e013a26057ec.yaml @@ -0,0 +1,101 @@ +fieldLayouts: + e86a8755-f86d-48b0-9f4f-787d41b33053: + tabs: + - + elementCondition: null + elements: + - + autocapitalize: true + autocomplete: false + autocorrect: true + class: null + disabled: false + elementCondition: null + id: null + inputType: 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: 2663dfa8-c4ce-413b-b86b-bfa1f3477a22 + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: e5142c27-2288-47b7-bfad-14cd6b3a6653 # Display Name + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: c30b1ba2-8069-4629-8bc8-a18519945d31 + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: a4afde15-f983-4c30-b0d7-e0b56871e4de # Dataset + instructions: null + label: null + required: true + tip: null + type: craft\fieldlayoutelements\CustomField + uid: facfe9fc-a5c1-4e50-a961-f067cf9474a6 + userCondition: null + warning: null + width: 100 + name: Content + uid: 11aa6c30-e830-4439-8291-7d23c7c219e7 + userCondition: null + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: 8af07cbd-3ce8-4e4d-818f-261515be5ac7 # Y-axis Minimum + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 9321a2e1-0a2c-42da-a3d8-b14a86bf5ae6 + userCondition: null + warning: null + width: 100 + - + elementCondition: null + fieldUid: 61e0fe59-d439-429c-b783-2d71fe4c5d44 # Y-axis Maximum + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 8a46f79c-a6d3-45e0-9e2c-3aef24a91f0a + userCondition: null + warning: null + width: 100 + name: 'Plot Configuration' + uid: 0ea412ea-00e0-4ce5-8aef-faa4c92bcc99 + userCondition: null +handle: lightCurveTool +hasTitleField: true +name: 'Light Curve Tool' +section: 28704998-935a-423b-a405-d4ad8b38efa2 # Widgets +showStatusField: true +slugTranslationKeyFormat: null +slugTranslationMethod: none +sortOrder: 3 +titleFormat: null +titleTranslationKeyFormat: null +titleTranslationMethod: none diff --git a/api/config/project/entryTypes/sourceSelector--297d2268-f298-40a1-bec3-a1c836a69e38.yaml b/api/config/project/entryTypes/sourceSelector--297d2268-f298-40a1-bec3-a1c836a69e38.yaml index 100b097..d991fa1 100644 --- a/api/config/project/entryTypes/sourceSelector--297d2268-f298-40a1-bec3-a1c836a69e38.yaml +++ b/api/config/project/entryTypes/sourceSelector--297d2268-f298-40a1-bec3-a1c836a69e38.yaml @@ -48,13 +48,67 @@ fieldLayouts: fieldUid: a4afde15-f983-4c30-b0d7-e0b56871e4de # Dataset instructions: null label: null - required: false + required: true tip: null type: craft\fieldlayoutelements\CustomField uid: cc45dfcd-e889-46fe-8ffb-d27de894632a userCondition: null warning: null - width: 100 + width: 50 + - + elementCondition: null + fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot + instructions: 'Check to include the light curve scatterplot' + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 8419c053-d101-476e-bdf4-84634fb53991 + userCondition: null + warning: null + width: 50 + - + elementCondition: + class: craft\elements\conditions\entries\EntryCondition + conditionRules: + - + class: craft\fields\conditions\LightswitchFieldConditionRule + fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot + uid: 883b118b-023a-4c20-956e-1717464edd26 + value: true + elementType: craft\elements\Entry + fieldContext: global + fieldUid: 8af07cbd-3ce8-4e4d-818f-261515be5ac7 # Y-axis Minimum + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 352316f2-ae0c-42e8-b5d6-329a277e6b8c + userCondition: null + warning: null + width: 50 + - + elementCondition: + class: craft\elements\conditions\entries\EntryCondition + conditionRules: + - + class: craft\fields\conditions\LightswitchFieldConditionRule + fieldUid: 907a99bf-dc51-40c8-8117-c9686eddea0d # Include Scatter Plot + uid: f3cd8447-372b-4498-a9ca-bfc82a6e12e1 + value: true + elementType: craft\elements\Entry + fieldContext: global + fieldUid: 61e0fe59-d439-429c-b783-2d71fe4c5d44 # Y-axis Maximum + instructions: null + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 0e1e1d41-ac17-48fa-b435-8428acc2af44 + userCondition: null + warning: null + width: 50 name: Content uid: 897c373a-7e95-45dd-bcb4-8b0d2d51eced userCondition: null diff --git a/api/config/project/entryTypes/supernovaGalaxyObservations--5e789abf-cfef-4ed4-b795-a4dcfe4fd284.yaml b/api/config/project/entryTypes/supernovaGalaxyObservations--5e789abf-cfef-4ed4-b795-a4dcfe4fd284.yaml index c73544d..37a5247 100644 --- a/api/config/project/entryTypes/supernovaGalaxyObservations--5e789abf-cfef-4ed4-b795-a4dcfe4fd284.yaml +++ b/api/config/project/entryTypes/supernovaGalaxyObservations--5e789abf-cfef-4ed4-b795-a4dcfe4fd284.yaml @@ -45,25 +45,25 @@ fieldLayouts: width: 100 - elementCondition: null - fieldUid: f5a2bb9c-1491-4439-a169-d9b2891433a1 # Declination + fieldUid: 0e914cfb-a2de-4721-b23b-3b1268529baf # Right Ascension instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField - uid: 2df6dc1b-e93a-4118-a050-c628c5390253 + uid: af316f09-67fc-4593-bec1-d37239168d50 userCondition: null warning: null width: 50 - elementCondition: null - fieldUid: 0e914cfb-a2de-4721-b23b-3b1268529baf # Right Ascension + fieldUid: f5a2bb9c-1491-4439-a169-d9b2891433a1 # Declination instructions: null label: null required: false tip: null type: craft\fieldlayoutelements\CustomField - uid: af316f09-67fc-4593-bec1-d37239168d50 + uid: 2df6dc1b-e93a-4118-a050-c628c5390253 userCondition: null warning: null width: 50 @@ -72,7 +72,7 @@ fieldLayouts: fieldUid: ad74ba83-53f4-4102-94e9-e9eea0d31171 # Galactic longitude instructions: null label: null - required: true + required: false tip: null type: craft\fieldlayoutelements\CustomField uid: 32cd02b9-680f-43bc-bcfa-cdeceb86c463 @@ -84,7 +84,7 @@ fieldLayouts: fieldUid: 693f669b-ba6e-4c91-adad-2543fcd62554 # Galactic Latitude instructions: null label: null - required: true + required: false tip: null type: craft\fieldlayoutelements\CustomField uid: 77aaa931-33c4-45e6-9783-420dd22903f4 @@ -96,7 +96,7 @@ fieldLayouts: fieldUid: 6dbf8441-fd70-4b44-a2f8-7b9ba10b20d9 # Distance instructions: null label: null - required: true + required: false tip: null type: craft\fieldlayoutelements\CustomField uid: 45c9e0b9-fc28-4dec-8bd6-f8b0b7bb835f @@ -136,9 +136,9 @@ fieldLayouts: - elementCondition: null fieldUid: c489f84c-509c-4078-9b71-1e3493e17620 # Image Album - instructions: null + instructions: 'Images must be included to be used in a Source Selector' label: null - required: true + required: false tip: null type: craft\fieldlayoutelements\CustomField uid: df335b0d-254e-41c4-aa02-bd147b6bf3c5 diff --git a/api/config/project/fields/includeScatterPlot--907a99bf-dc51-40c8-8117-c9686eddea0d.yaml b/api/config/project/fields/includeScatterPlot--907a99bf-dc51-40c8-8117-c9686eddea0d.yaml new file mode 100644 index 0000000..117c239 --- /dev/null +++ b/api/config/project/fields/includeScatterPlot--907a99bf-dc51-40c8-8117-c9686eddea0d.yaml @@ -0,0 +1,14 @@ +columnSuffix: gjnqolwr +contentColumnType: boolean +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: includeScatterPlot +instructions: null +name: 'Include Scatter Plot' +searchable: false +settings: + default: false + offLabel: null + onLabel: null +translationKeyFormat: null +translationMethod: none +type: craft\fields\Lightswitch diff --git a/api/config/project/fields/lightCurveTool--466246f6-753b-4198-8067-18acf1a7d4cb.yaml b/api/config/project/fields/lightCurveTool--466246f6-753b-4198-8067-18acf1a7d4cb.yaml new file mode 100644 index 0000000..ef972e0 --- /dev/null +++ b/api/config/project/fields/lightCurveTool--466246f6-753b-4198-8067-18acf1a7d4cb.yaml @@ -0,0 +1,53 @@ +columnSuffix: null +contentColumnType: string +fieldGroup: a21a42b0-7211-4d77-9071-47a06960fef4 # Widgets +handle: lightCurveTool +instructions: null +name: 'Light Curve Tool' +searchable: false +settings: + allowSelfRelations: false + branchLimit: null + localizeRelations: false + maintainHierarchy: false + maxRelations: 1 + minRelations: 1 + selectionCondition: + __assoc__: + - + - elementType + - craft\elements\Entry + - + - fieldContext + - global + - + - class + - craft\elements\conditions\entries\EntryCondition + - + - conditionRules + - + - + __assoc__: + - + - class + - craft\elements\conditions\entries\TypeConditionRule + - + - uid + - 19948eb4-3899-42a0-997b-de2e4dce4ea5 + - + - operator + - in + - + - values + - + - 24e5bfd8-45a1-4e03-a9ee-e013a26057ec # Light Curve Tool + selectionLabel: null + showSiteMenu: false + sources: + - 'section:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets + targetSiteId: null + validateRelatedElements: false + viewMode: null +translationKeyFormat: null +translationMethod: site +type: craft\fields\Entries diff --git a/api/config/project/fields/mjd--b78d733b-bfca-4d0c-9474-d40c87566945.yaml b/api/config/project/fields/mjd--b78d733b-bfca-4d0c-9474-d40c87566945.yaml index 078f8c5..a90fb21 100644 --- a/api/config/project/fields/mjd--b78d733b-bfca-4d0c-9474-d40c87566945.yaml +++ b/api/config/project/fields/mjd--b78d733b-bfca-4d0c-9474-d40c87566945.yaml @@ -12,7 +12,7 @@ settings: min: null prefix: null previewCurrency: null - previewFormat: decimal + previewFormat: none size: null suffix: null translationKeyFormat: null diff --git a/api/config/project/graphql/schemas/04341069-ff31-4470-970a-8c7e82ec37eb.yaml b/api/config/project/graphql/schemas/04341069-ff31-4470-970a-8c7e82ec37eb.yaml index bb34ec2..41f338b 100644 --- a/api/config/project/graphql/schemas/04341069-ff31-4470-970a-8c7e82ec37eb.yaml +++ b/api/config/project/graphql/schemas/04341069-ff31-4470-970a-8c7e82ec37eb.yaml @@ -22,6 +22,7 @@ scope: - 'sections.28704998-935a-423b-a405-d4ad8b38efa2:read' # Widgets - 'entrytypes.d2e48b83-d161-48b9-b0a9-5c21914b5931:read' # Color Filter Tool - 'entrytypes.297d2268-f298-40a1-bec3-a1c836a69e38:read' # Source Selector + - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read' # Light Curve Tool - 'volumes.7a4c811e-eb74-4c4b-ae64-134f2a4e2c3e:read' # Datasets - 'globalsets.aee57b4f-2623-44fc-af2b-c670f6e1babe:read' # Site information - 'globalsets.0edce3a2-c596-4238-9dde-212c83d5a65f:read' # Menu Content 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 08f861e..be424ff 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 @@ -22,6 +22,7 @@ scope: - 'sections.28704998-935a-423b-a405-d4ad8b38efa2:read' # Widgets - 'entrytypes.d2e48b83-d161-48b9-b0a9-5c21914b5931:read' # Color Filter Tool - 'entrytypes.297d2268-f298-40a1-bec3-a1c836a69e38:read' # Source Selector + - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read' # Light Curve Tool - 'volumes.7a4c811e-eb74-4c4b-ae64-134f2a4e2c3e:read' # Datasets - 'globalsets.aee57b4f-2623-44fc-af2b-c670f6e1babe:read' # Site information - 'globalsets.0edce3a2-c596-4238-9dde-212c83d5a65f:read' # Menu Content diff --git a/api/config/project/graphql/schemas/e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee.yaml b/api/config/project/graphql/schemas/e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee.yaml index 1f962c2..4f5fd3b 100644 --- a/api/config/project/graphql/schemas/e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee.yaml +++ b/api/config/project/graphql/schemas/e2951ac7-e91a-4d8a-964f-50c6b6e0b1ee.yaml @@ -22,6 +22,7 @@ scope: - 'sections.28704998-935a-423b-a405-d4ad8b38efa2:read' # Widgets - 'entrytypes.d2e48b83-d161-48b9-b0a9-5c21914b5931:read' # Color Filter Tool - 'entrytypes.297d2268-f298-40a1-bec3-a1c836a69e38:read' # Source Selector + - 'entrytypes.24e5bfd8-45a1-4e03-a9ee-e013a26057ec:read' # Light Curve Tool - 'volumes.7a4c811e-eb74-4c4b-ae64-134f2a4e2c3e:read' # Datasets - 'globalsets.aee57b4f-2623-44fc-af2b-c670f6e1babe:read' # Site information - 'globalsets.0edce3a2-c596-4238-9dde-212c83d5a65f:read' # Menu Content diff --git a/api/config/project/neo/orders/2599f40c-bfbc-4db6-bf56-cb9f48ad01bf.yaml b/api/config/project/neo/orders/2599f40c-bfbc-4db6-bf56-cb9f48ad01bf.yaml index 8ceb94d..5bcaac4 100644 --- a/api/config/project/neo/orders/2599f40c-bfbc-4db6-bf56-cb9f48ad01bf.yaml +++ b/api/config/project/neo/orders/2599f40c-bfbc-4db6-bf56-cb9f48ad01bf.yaml @@ -1,3 +1,4 @@ - 'blockTypeGroup:6efbdc96-00f5-4e37-953b-d36344f6e1fb' # Configured Widgets - 'blockType:721d7a12-d399-4504-bbeb-0fa6d88d72b7' # Color Filter Tool Block - 'blockType:430f132d-8145-4e49-ba49-e9b839f7898e' # Source Selector Block +- 'blockType:528d82d4-91db-4ee9-9fa2-8d8c7c871c5e' # Light Curve Block diff --git a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml index 1d88266..b406513 100644 --- a/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml +++ b/api/config/project/neo/orders/a46e7379-7773-4ce4-9c59-434567870f0c.yaml @@ -16,4 +16,5 @@ - 'blockType:5b8a79d6-e9d6-44d2-b986-36bf0bf74131' # Scatterplot Tool - 'blockType:87fc48a5-a399-4ce1-a7ca-2dadfd1e1445' # Camera Filter Tool - 'blockType:0d06751e-ecf9-4281-a754-8c818fb9353b' # Color Filter Tool Block +- 'blockType:a02a930a-9f54-4ae2-8bb2-0e0ab7713759' # Magnitude Scatter Plot - 'blockType:7033117c-c3b9-4794-9a6d-cbbbae2010af' # Supernova Distance & Distribution diff --git a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml index a4d5ca5..af61424 100644 --- a/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml +++ b/api/config/project/neoBlockTypes/colLeft--947400f5-3c2d-403a-b94e-68715e48a9c0.yaml @@ -12,6 +12,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - magnitudeScatterPlot - supernovaDistanceDistribution conditions: null description: '' diff --git a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml index afaae49..ff019c8 100644 --- a/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml +++ b/api/config/project/neoBlockTypes/colRight--efbf1b30-4cb7-4361-9f45-016d119aec06.yaml @@ -12,6 +12,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - magnitudeScatterPlot - supernovaDistanceDistribution conditions: null description: '' diff --git a/api/config/project/neoBlockTypes/colorFilterToolBlock--721d7a12-d399-4504-bbeb-0fa6d88d72b7.yaml b/api/config/project/neoBlockTypes/colorFilterToolBlock--721d7a12-d399-4504-bbeb-0fa6d88d72b7.yaml index 656844f..a2339b0 100644 --- a/api/config/project/neoBlockTypes/colorFilterToolBlock--721d7a12-d399-4504-bbeb-0fa6d88d72b7.yaml +++ b/api/config/project/neoBlockTypes/colorFilterToolBlock--721d7a12-d399-4504-bbeb-0fa6d88d72b7.yaml @@ -14,7 +14,7 @@ fieldLayouts: fieldUid: b9fc39fa-b5b7-4c0d-ab6d-b2f035451482 # Color Filter Tool instructions: null label: null - required: false + required: true tip: null type: craft\fieldlayoutelements\CustomField uid: 291f8bfa-50c4-4f89-bfc9-0a44f33d40fe diff --git a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml index cf438bc..e5d7235 100644 --- a/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml +++ b/api/config/project/neoBlockTypes/group--ba6494d9-36e8-40ee-9284-c56783357043.yaml @@ -11,6 +11,7 @@ childBlocks: - scatterplotTool - cameraFilterTool - colorFilterToolBlock + - magnitudeScatterPlot - supernovaDistanceDistribution conditions: null description: '' diff --git a/api/config/project/neoBlockTypes/lightCurveBlock--528d82d4-91db-4ee9-9fa2-8d8c7c871c5e.yaml b/api/config/project/neoBlockTypes/lightCurveBlock--528d82d4-91db-4ee9-9fa2-8d8c7c871c5e.yaml new file mode 100644 index 0000000..ee08488 --- /dev/null +++ b/api/config/project/neoBlockTypes/lightCurveBlock--528d82d4-91db-4ee9-9fa2-8d8c7c871c5e.yaml @@ -0,0 +1,40 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: 2599f40c-bfbc-4db6-bf56-cb9f48ad01bf # Question Widgets Block +fieldLayouts: + a20913f8-e4d3-4634-8ffd-0a13652003c7: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: 466246f6-753b-4198-8067-18acf1a7d4cb # Light Curve Tool + instructions: null + label: null + required: true + tip: null + type: craft\fieldlayoutelements\CustomField + uid: eb94c622-70a3-46e0-b962-05a28aceca95 + userCondition: null + warning: null + width: 100 + name: Content + uid: 53afdafe-8898-42f9-94f3-d892eeda5d82 + userCondition: null +group: 6efbdc96-00f5-4e37-953b-d36344f6e1fb # Configured Widgets +groupChildBlockTypes: true +handle: lightCurveBlock +icon: null +iconFilename: '' +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Light Curve Block' +topLevel: true diff --git a/api/config/project/neoBlockTypes/magnitudeScatterPlot--a02a930a-9f54-4ae2-8bb2-0e0ab7713759.yaml b/api/config/project/neoBlockTypes/magnitudeScatterPlot--a02a930a-9f54-4ae2-8bb2-0e0ab7713759.yaml new file mode 100644 index 0000000..84e4da5 --- /dev/null +++ b/api/config/project/neoBlockTypes/magnitudeScatterPlot--a02a930a-9f54-4ae2-8bb2-0e0ab7713759.yaml @@ -0,0 +1,40 @@ +childBlocks: null +conditions: null +description: '' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + a02dbc96-7e04-4fc7-bf73-ccc523ed3a62: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: 466246f6-753b-4198-8067-18acf1a7d4cb # Light Curve Tool + instructions: null + label: null + required: true + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 6fe1e356-d221-43d2-9039-efdae1729f70 + userCondition: null + warning: null + width: 100 + name: Content + uid: 729b9a44-aadb-492d-91e3-bb55e97959c6 + userCondition: null +group: 513634e9-3389-4e41-b769-9433ac34e35e # Widgets +groupChildBlockTypes: true +handle: magnitudeScatterPlot +icon: null +iconFilename: '' +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: 'Magnitude Scatter Plot' +topLevel: true diff --git a/api/config/project/neoBlockTypes/sourceSelectorBlock--430f132d-8145-4e49-ba49-e9b839f7898e.yaml b/api/config/project/neoBlockTypes/sourceSelectorBlock--430f132d-8145-4e49-ba49-e9b839f7898e.yaml index d38ba92..b22ad9d 100644 --- a/api/config/project/neoBlockTypes/sourceSelectorBlock--430f132d-8145-4e49-ba49-e9b839f7898e.yaml +++ b/api/config/project/neoBlockTypes/sourceSelectorBlock--430f132d-8145-4e49-ba49-e9b839f7898e.yaml @@ -14,7 +14,7 @@ fieldLayouts: fieldUid: e17c94af-1953-42af-939c-e3ed84c62a95 # Source Selector instructions: null label: null - required: false + required: true tip: null type: craft\fieldlayoutelements\CustomField uid: 18b5c6dc-eddb-4aa9-9857-a2d97305259a diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 90c8ac9..d7f8e3d 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1708626550 +dateModified: 1709153806 elementSources: craft\elements\Entry: - @@ -133,6 +133,7 @@ meta: 17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3: 'Graph Bars' # Graph Bars 021f7cc6-93ec-4da4-9566-8d05c64d1725: Default # Default 23ca3082-ab51-4658-9872-cf7f31a9bd56: Images # Images + 24e5bfd8-45a1-4e03-a9ee-e013a26057ec: 'Light Curve Tool' # Light Curve Tool 25c0fbe7-5180-4842-bb9e-d530e9fb2042: Radius # Radius 25eb3834-cb4a-46d7-823a-a135a16b9677: 'Save Point' # Save Point 27af84b2-9ccb-416c-ae38-872fdca1f5c0: Layout # Layout @@ -162,10 +163,12 @@ meta: 461e1254-37f7-4aeb-81a1-3f08d2463d06: Students # Students 0481b024-bc6f-4104-bc1c-802615313aaa: 'Page Type' # Page Type 485a4230-6aac-41b7-8524-da6232e226ae: 'Filter Tool' # Filter Tool + 528d82d4-91db-4ee9-9fa2-8d8c7c871c5e: 'Light Curve Block' # Light Curve Block 693f669b-ba6e-4c91-adad-2543fcd62554: 'Galactic Latitude' # Galactic Latitude 721d7a12-d399-4504-bbeb-0fa6d88d72b7: 'Color Filter Tool Block' # Color Filter Tool Block 839bfa4f-5a09-4b32-b1eb-e0fef7b7beda: 'Table Row' # Table Row 852df24b-f90e-486b-a371-b47ca241a84e: 'Y-axis Label' # Y-axis Label + 907a99bf-dc51-40c8-8117-c9686eddea0d: 'Include Scatter Plot' # Include Scatter Plot 919ed98f-d33e-4fae-adc0-2253a155246f: 'Question Text' # Question Text 986be506-1a98-4a56-9a16-1e2270071a95: isActive # isActive 1601c7a8-2437-4b8f-b2f2-116f4c043402: 'Site Information' # Site Information @@ -186,6 +189,7 @@ meta: 069834df-b9cb-47d6-9ff4-756fde01e084: Item # Item 075467b0-0dee-453c-9df0-0de6d2443cf8: Homepage # Homepage 220292c8-0330-4dd4-aa84-f0eeec38fa4e: Text # Text + 466246f6-753b-4198-8067-18acf1a7d4cb: 'Light Curve Tool' # Light Curve Tool 513634e9-3389-4e41-b769-9433ac34e35e: Widgets # Widgets 547128fa-4529-4483-9968-66425996b69f: EN # EN 0601483c-a943-42a3-b1a5-e003b05618dc: 'Question Block' # Question Block @@ -199,6 +203,7 @@ meta: 28704998-935a-423b-a405-d4ad8b38efa2: Widgets # Widgets 65934563-c9b7-45d5-99e6-cc013e22b668: 'Investigation Step (Child Entry)' # Investigation Step (Child Entry) 67592534-b8cb-4b2f-9826-d7c9300d9a2b: Widgets # Widgets + a02a930a-9f54-4ae2-8bb2-0e0ab7713759: 'Magnitude Scatter Plot' # Magnitude Scatter Plot a03e80f0-77ce-4b03-abf5-76a0deb264a9: JSON # JSON a1eeb085-4a92-48ba-92f5-65b9f5ebfc72: Text # Text a3f93249-e386-43c7-b2dd-5da2cda1eb03: Object # Object From 5c3e724f3e4592077c36a5d8281a27dfaaaec186 Mon Sep 17 00:00:00 2001 From: Blake Mason Date: Tue, 5 Mar 2024 13:36:43 -0800 Subject: [PATCH 07/10] [C] Bump project.yaml dateModified --- api/config/project/project.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index d7f8e3d..717a0c2 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1709153806 +dateModified: 1709674561 elementSources: craft\elements\Entry: - From f5c29c3abeb91260d663112d4b847895546852af Mon Sep 17 00:00:00 2001 From: Blake Mason Date: Thu, 29 Feb 2024 16:48:07 -0800 Subject: [PATCH 08/10] [B] PublicRegistration enabled & publicSchema viewable users narrowed - publicRegistration seems to be needed to allow Oauth registration - public graphql schema only needs to view educator and student groups --- .../schemas/cec04a25-43ba-4f4c-81bd-b71f48731b5a.yaml | 3 ++- api/config/project/project.yaml | 5 ----- api/config/project/users/users.yaml | 5 +++-- 3 files changed, 5 insertions(+), 8 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 be424ff..35dc4a6 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 @@ -26,5 +26,6 @@ scope: - 'volumes.7a4c811e-eb74-4c4b-ae64-134f2a4e2c3e:read' # Datasets - 'globalsets.aee57b4f-2623-44fc-af2b-c670f6e1babe:read' # Site information - 'globalsets.0edce3a2-c596-4238-9dde-212c83d5a65f:read' # Menu Content - - 'usergroups.everyone:read' + - 'usergroups.d8be03ce-7aeb-4141-b40e-ec39ec1c796f:read' # Educators + - 'usergroups.461e1254-37f7-4aeb-81a1-3f08d2463d06:read' # Students - 'categorygroups.90aa9610-a9c9-4531-95f8-d0068046ae25:read' # Sort Options diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 717a0c2..761ace2 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -133,7 +133,6 @@ meta: 17b9b8a2-978a-4cd8-a7da-f5b3d77e1ed3: 'Graph Bars' # Graph Bars 021f7cc6-93ec-4da4-9566-8d05c64d1725: Default # Default 23ca3082-ab51-4658-9872-cf7f31a9bd56: Images # Images - 24e5bfd8-45a1-4e03-a9ee-e013a26057ec: 'Light Curve Tool' # Light Curve Tool 25c0fbe7-5180-4842-bb9e-d530e9fb2042: Radius # Radius 25eb3834-cb4a-46d7-823a-a135a16b9677: 'Save Point' # Save Point 27af84b2-9ccb-416c-ae38-872fdca1f5c0: Layout # Layout @@ -163,12 +162,10 @@ meta: 461e1254-37f7-4aeb-81a1-3f08d2463d06: Students # Students 0481b024-bc6f-4104-bc1c-802615313aaa: 'Page Type' # Page Type 485a4230-6aac-41b7-8524-da6232e226ae: 'Filter Tool' # Filter Tool - 528d82d4-91db-4ee9-9fa2-8d8c7c871c5e: 'Light Curve Block' # Light Curve Block 693f669b-ba6e-4c91-adad-2543fcd62554: 'Galactic Latitude' # Galactic Latitude 721d7a12-d399-4504-bbeb-0fa6d88d72b7: 'Color Filter Tool Block' # Color Filter Tool Block 839bfa4f-5a09-4b32-b1eb-e0fef7b7beda: 'Table Row' # Table Row 852df24b-f90e-486b-a371-b47ca241a84e: 'Y-axis Label' # Y-axis Label - 907a99bf-dc51-40c8-8117-c9686eddea0d: 'Include Scatter Plot' # Include Scatter Plot 919ed98f-d33e-4fae-adc0-2253a155246f: 'Question Text' # Question Text 986be506-1a98-4a56-9a16-1e2270071a95: isActive # isActive 1601c7a8-2437-4b8f-b2f2-116f4c043402: 'Site Information' # Site Information @@ -189,7 +186,6 @@ meta: 069834df-b9cb-47d6-9ff4-756fde01e084: Item # Item 075467b0-0dee-453c-9df0-0de6d2443cf8: Homepage # Homepage 220292c8-0330-4dd4-aa84-f0eeec38fa4e: Text # Text - 466246f6-753b-4198-8067-18acf1a7d4cb: 'Light Curve Tool' # Light Curve Tool 513634e9-3389-4e41-b769-9433ac34e35e: Widgets # Widgets 547128fa-4529-4483-9968-66425996b69f: EN # EN 0601483c-a943-42a3-b1a5-e003b05618dc: 'Question Block' # Question Block @@ -203,7 +199,6 @@ meta: 28704998-935a-423b-a405-d4ad8b38efa2: Widgets # Widgets 65934563-c9b7-45d5-99e6-cc013e22b668: 'Investigation Step (Child Entry)' # Investigation Step (Child Entry) 67592534-b8cb-4b2f-9826-d7c9300d9a2b: Widgets # Widgets - a02a930a-9f54-4ae2-8bb2-0e0ab7713759: 'Magnitude Scatter Plot' # Magnitude Scatter Plot a03e80f0-77ce-4b03-abf5-76a0deb264a9: JSON # JSON a1eeb085-4a92-48ba-92f5-65b9f5ebfc72: Text # Text a3f93249-e386-43c7-b2dd-5da2cda1eb03: Object # Object diff --git a/api/config/project/users/users.yaml b/api/config/project/users/users.yaml index 56daf27..a84d7fd 100644 --- a/api/config/project/users/users.yaml +++ b/api/config/project/users/users.yaml @@ -1,6 +1,7 @@ -allowPublicRegistration: false +allowPublicRegistration: true deactivateByDefault: false -defaultGroup: null +defaultGroup: '' photoSubpath: null photoVolumeUid: null requireEmailVerification: true +validateOnPublicRegistration: false From 658514696b46ef6eff5db877f6e06b321a22e474 Mon Sep 17 00:00:00 2001 From: Blake Mason Date: Mon, 4 Mar 2024 14:12:33 -0800 Subject: [PATCH 09/10] [F] Publicly registered users are Students by default --- api/config/project/users/users.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/config/project/users/users.yaml b/api/config/project/users/users.yaml index a84d7fd..a019d22 100644 --- a/api/config/project/users/users.yaml +++ b/api/config/project/users/users.yaml @@ -1,6 +1,6 @@ allowPublicRegistration: true deactivateByDefault: false -defaultGroup: '' +defaultGroup: 461e1254-37f7-4aeb-81a1-3f08d2463d06 # Students photoSubpath: null photoVolumeUid: null requireEmailVerification: true From 6610b0151bf4e3dddf541b3c0376c409d1b383dd Mon Sep 17 00:00:00 2001 From: Blake Mason Date: Tue, 5 Mar 2024 13:54:17 -0800 Subject: [PATCH 10/10] [F] Sets DAM plugin settings using env vars --- api/config/project/project.yaml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 761ace2..c97d7da 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1709674561 +dateModified: 1709675539 elementSources: craft\elements\Entry: - @@ -277,10 +277,9 @@ plugins: settings: appId: $CANTO_APP_ID authEndpoint: $CANTO_AUTH_ENDPOINT - retrieveAssetMetadataEndpoint: $CANTO_ASSET_ENDPOINT secretKey: $CANTO_SECRET_KEY - tenantHostName: rubin.canto.com - webhookSecureToken: '' + tenantHostName: $CANTO_HOSTNAME + webhookSecureToken: $CANTO_WEBHOOK_TOKEN google-cloud: edition: standard enabled: true