diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..4e09885 --- /dev/null +++ b/Makefile @@ -0,0 +1,8 @@ +start: + docker-compose -f docker-compose-local-db.yml up --build + +clean: + docker system prune -f && docker volume prune -f + +clean-images: + docker images prune \ No newline at end of file diff --git a/README.md b/README.md index baacd53..b64b5ee 100644 --- a/README.md +++ b/README.md @@ -30,6 +30,11 @@ docker-compose -f docker-compose-local-db.yml up 8. Go to to administer the site 9. Default admin username and password, as included in the db.sql file, is `example / password` +These and other most used docker commands for bringing containers up/down are aliased in a Makefile: + * `make start` is equivalent to `docker-compose -f docker-compose-local-db.yml up --build` + * `make clean` is equivalent to `docker system prune -f && docker volume prune -f` + * `make clean-images` is equivalent to `docker images prune` + #### Useful docker commands for local development 1. Cleaning house: `docker volume prune` `docker system prune` diff --git a/api/composer.json b/api/composer.json index 4549582..72ed0cd 100755 --- a/api/composer.json +++ b/api/composer.json @@ -4,7 +4,7 @@ "craftcms/cms": "4.5.6.1", "craftcms/redactor": "3.0.4", "jamesedmonston/graphql-authentication": "2.5.0", - "lsst-epo/canto-dam-assets": "^4.0.0", + "lsst-epo/canto-dam-assets": "4.0.11", "sebastianlenz/linkfield": "^2.1.4", "spicyweb/craft-neo": "3.9.5", "verbb/super-table": "^3.0", diff --git a/api/composer.lock b/api/composer.lock index 791c4f1..7bd4280 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": "a8660b40de1a44376ed726ed93b4c199", + "content-hash": "29b572e7d89f5f1279db24523cdebfa6", "packages": [ { "name": "abraham/twitteroauth", @@ -2084,16 +2084,16 @@ }, { "name": "lsst-epo/canto-dam-assets", - "version": "4.0.7", + "version": "4.0.11", "source": { "type": "git", "url": "https://github.com/lsst-epo/canto-dam-assets.git", - "reference": "13f2077e41ab679c21dee0d850a92101a55bb5a3" + "reference": "363d270b3fa6439aa06c8a99f530a3ce648eeafd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/13f2077e41ab679c21dee0d850a92101a55bb5a3", - "reference": "13f2077e41ab679c21dee0d850a92101a55bb5a3", + "url": "https://api.github.com/repos/lsst-epo/canto-dam-assets/zipball/363d270b3fa6439aa06c8a99f530a3ce648eeafd", + "reference": "363d270b3fa6439aa06c8a99f530a3ce648eeafd", "shasum": "" }, "require": { @@ -2145,7 +2145,7 @@ "issues": "https://github.com/lsst-epo/canto-dam-assets/issues", "source": "https://github.com/lsst-epo/canto-dam-assets/" }, - "time": "2023-11-10T18:28:24+00:00" + "time": "2023-12-27T22:40:03+00:00" }, { "name": "mikehaertl/php-shellcommand", diff --git a/api/config/general.php b/api/config/general.php index 7017281..e92a2c8 100755 --- a/api/config/general.php +++ b/api/config/general.php @@ -33,7 +33,7 @@ 'aliases' => [ '@webroot' => dirname(__DIR__) . '/web', '@webBaseUrl' => App::env('WEB_BASE_URL'), - '@previewUrlFormat' => App::env('ALIAS_PREVIEW_URL_FORMAT'), + '@previewUrlFormat' => App::env('ALIAS_PREVIEW_URL_FORMAT') . '&secret=' . App::env('NEXT_SECRET_TOKEN'), '@assetsGeneralBaseURL' => sprintf( $gcsBucketPathFormat, App::env('GCS_GENERAL_BUCKET') diff --git a/api/config/project/fields/latex--bf080076-0029-4fb7-9562-4da97d31c0b4.yaml b/api/config/project/fields/latex--bf080076-0029-4fb7-9562-4da97d31c0b4.yaml new file mode 100644 index 0000000..0f1df8f --- /dev/null +++ b/api/config/project/fields/latex--bf080076-0029-4fb7-9562-4da97d31c0b4.yaml @@ -0,0 +1,19 @@ +columnSuffix: jpgoyubw +contentColumnType: text +fieldGroup: 5599d188-862e-4717-b206-6aadd975c937 # Common +handle: latex +instructions: 'LaTeX format input' +name: LaTeX +searchable: false +settings: + byteLimit: null + charLimit: null + code: true + columnType: null + initialRows: 4 + multiline: false + placeholder: null + uiMode: normal +translationKeyFormat: null +translationMethod: none +type: craft\fields\PlainText diff --git a/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml index 4b00a05..d17306b 100644 --- a/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml +++ b/api/config/project/neoBlockTypeGroups/513634e9-3389-4e41-b769-9433ac34e35e.yaml @@ -1,4 +1,4 @@ alwaysShowDropdown: null field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks name: Widgets -sortOrder: 11 +sortOrder: 12 diff --git a/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml b/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml index fcb0ae0..69d878c 100644 --- a/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml +++ b/api/config/project/neoBlockTypeGroups/7ebe493b-5e03-48c8-8375-c9f9582da77e.yaml @@ -1,4 +1,4 @@ alwaysShowDropdown: null field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks name: Containers -sortOrder: 6 +sortOrder: 7 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 index beb44c8..e657837 100644 --- a/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml +++ b/api/config/project/neoBlockTypes/barGraphTool--a47f94c7-0a32-43be-863a-fa9d6636fff2.yaml @@ -96,5 +96,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Bar Graph Tool' -sortOrder: 13 +sortOrder: 14 topLevel: true diff --git a/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml b/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml index 5a58ccb..c1d7901 100644 --- a/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml +++ b/api/config/project/neoBlockTypes/cameraFilterTool--87fc48a5-a399-4ce1-a7ca-2dadfd1e1445.yaml @@ -15,5 +15,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Camera Filter Tool' -sortOrder: 15 +sortOrder: 16 topLevel: true 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 4a7787c..d21ffd7 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 @@ -1,6 +1,7 @@ childBlocks: - questionBlock - text + - equation - table - image - referenceModalBlock @@ -26,5 +27,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Left Column' -sortOrder: 9 +sortOrder: 10 topLevel: false 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 46ecb7d..28ea7d3 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 @@ -1,6 +1,7 @@ childBlocks: - questionBlock - text + - equation - table - image - referenceModalBlock @@ -26,5 +27,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Right Column' -sortOrder: 10 +sortOrder: 11 topLevel: false diff --git a/api/config/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml b/api/config/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml index 7c83da4..6476c56 100644 --- a/api/config/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml +++ b/api/config/project/neoBlockTypes/colorFilterToolBlock--0d06751e-ecf9-4281-a754-8c818fb9353b.yaml @@ -44,5 +44,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Color Filter Tool Block' -sortOrder: 16 +sortOrder: 17 topLevel: true diff --git a/api/config/project/neoBlockTypes/equation--dc1c3484-f028-4653-982b-a84e287d4c61.yaml b/api/config/project/neoBlockTypes/equation--dc1c3484-f028-4653-982b-a84e287d4c61.yaml new file mode 100644 index 0000000..565d958 --- /dev/null +++ b/api/config/project/neoBlockTypes/equation--dc1c3484-f028-4653-982b-a84e287d4c61.yaml @@ -0,0 +1,40 @@ +childBlocks: null +conditions: null +description: 'Mathematical equation' +enabled: true +field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks +fieldLayouts: + 4317e51b-a554-4107-8929-70f27dbad4f6: + tabs: + - + elementCondition: null + elements: + - + elementCondition: null + fieldUid: bf080076-0029-4fb7-9562-4da97d31c0b4 # LaTeX + instructions: 'LaTeX format input, reference the Temml documentation for help formatting: https://temml.org/docs/en/supported' + label: null + required: false + tip: null + type: craft\fieldlayoutelements\CustomField + uid: 4533dacc-7e3b-4879-95aa-3cb13c875278 + userCondition: null + warning: null + width: 100 + name: 'Tab 1' + uid: 66641481-a919-4ae4-9632-e146c1530f72 + userCondition: null +group: null +groupChildBlockTypes: true +handle: equation +icon: null +ignorePermissions: true +maxBlocks: 0 +maxChildBlocks: 0 +maxSiblingBlocks: 0 +minBlocks: 0 +minChildBlocks: 0 +minSiblingBlocks: 0 +name: Equation +sortOrder: 3 +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 index a6216f6..18270e8 100644 --- a/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml +++ b/api/config/project/neoBlockTypes/filterTool--3912a1a0-e71b-44b3-bcf4-976c0564975e.yaml @@ -48,5 +48,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Filter Tool' -sortOrder: 12 +sortOrder: 13 topLevel: 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 ad86414..3a22ff9 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 @@ -1,6 +1,7 @@ childBlocks: - questionBlock - text + - equation - table - image - referenceModalBlock @@ -25,5 +26,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Interaction Group' -sortOrder: 7 +sortOrder: 8 topLevel: true diff --git a/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml b/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml index aaf7d81..ee0aca1 100644 --- a/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml +++ b/api/config/project/neoBlockTypes/image--59560b67-c194-46fc-9404-cb790a44800a.yaml @@ -60,5 +60,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: Image -sortOrder: 4 +sortOrder: 5 topLevel: true diff --git a/api/config/project/neoBlockTypes/referenceModalBlock--53df9537-d85e-4fd3-9e4c-b203594ada7c.yaml b/api/config/project/neoBlockTypes/referenceModalBlock--53df9537-d85e-4fd3-9e4c-b203594ada7c.yaml index 81e964d..8d3bd47 100644 --- a/api/config/project/neoBlockTypes/referenceModalBlock--53df9537-d85e-4fd3-9e4c-b203594ada7c.yaml +++ b/api/config/project/neoBlockTypes/referenceModalBlock--53df9537-d85e-4fd3-9e4c-b203594ada7c.yaml @@ -36,5 +36,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Reference Modal Block' -sortOrder: 5 +sortOrder: 6 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 index 5a12848..7914677 100644 --- a/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml +++ b/api/config/project/neoBlockTypes/scatterplotTool--5b8a79d6-e9d6-44d2-b986-36bf0bf74131.yaml @@ -96,5 +96,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Scatterplot Tool' -sortOrder: 14 +sortOrder: 15 topLevel: true diff --git a/api/config/project/neoBlockTypes/table--7b30c218-6328-41a2-a3e3-2575559f4c9c.yaml b/api/config/project/neoBlockTypes/table--7b30c218-6328-41a2-a3e3-2575559f4c9c.yaml index 3f57af0..77198d0 100644 --- a/api/config/project/neoBlockTypes/table--7b30c218-6328-41a2-a3e3-2575559f4c9c.yaml +++ b/api/config/project/neoBlockTypes/table--7b30c218-6328-41a2-a3e3-2575559f4c9c.yaml @@ -60,5 +60,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: Table -sortOrder: 3 +sortOrder: 4 topLevel: true diff --git a/api/config/project/neoBlockTypes/text--5548ce5c-5ad4-494e-93be-8ff129618d20.yaml b/api/config/project/neoBlockTypes/text--5548ce5c-5ad4-494e-93be-8ff129618d20.yaml index 56decde..22de442 100644 --- a/api/config/project/neoBlockTypes/text--5548ce5c-5ad4-494e-93be-8ff129618d20.yaml +++ b/api/config/project/neoBlockTypes/text--5548ce5c-5ad4-494e-93be-8ff129618d20.yaml @@ -4,7 +4,7 @@ description: '' enabled: true field: a46e7379-7773-4ce4-9c59-434567870f0c # Content Blocks fieldLayouts: - a93487b5-2ef3-45c3-aedc-ded481b860a9: + 99d26e6b-6e25-4045-8bda-933cc4e4ee2c: tabs: - elementCondition: null 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 118d24c..57ad95a 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 @@ -17,5 +17,5 @@ minBlocks: 0 minChildBlocks: 0 minSiblingBlocks: 0 name: 'Two Column Container' -sortOrder: 8 +sortOrder: 9 topLevel: true diff --git a/api/config/project/project.yaml b/api/config/project/project.yaml index 19ef678..bbedc53 100644 --- a/api/config/project/project.yaml +++ b/api/config/project/project.yaml @@ -1,4 +1,4 @@ -dateModified: 1703112709 +dateModified: 1704736417 elementSources: craft\elements\Entry: - @@ -9,9 +9,9 @@ elementSources: key: 'section:1a93d10f-deca-4e6b-a3e8-9baae53e7c47' # Investigations tableAttributes: - postDate - - expiryDate - author - link + - parent type: native - defaultSort: @@ -24,11 +24,12 @@ elementSources: type: native - defaultSort: - - structure - - asc - disabled: false - key: 'section:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages + - postDate + - desc + disabled: true + key: '*' tableAttributes: + - section - postDate - expiryDate - author @@ -36,17 +37,28 @@ elementSources: type: native - defaultSort: - - postDate - - desc + - structure + - asc disabled: true - key: '*' + key: 'section:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages tableAttributes: - - section - postDate - expiryDate - author - link type: native + - + heading: '' + type: heading + - + key: 'section:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions + type: native + - + key: 'section:c2356ed1-1e49-4056-83c7-ed615a2694b1' # Reference Modals + type: native + - + key: 'section:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets + type: native email: fromEmail: $EMAIL_FROM_ADDRESS fromName: $EMAIL_SENDER_NAME @@ -180,6 +192,7 @@ meta: ba6494d9-36e8-40ee-9284-c56783357043: 'Interaction Group' # Interaction Group bad8a706-ea60-4282-b1da-3c9ee5f2111a: Caption # Caption be5b1aeb-8cbb-4460-a87d-d1ebe0a4fbf8: 'Group Name' # Group Name + bf080076-0029-4fb7-9562-4da97d31c0b4: LaTeX # LaTeX bfaa63c2-dd2c-42c8-b68e-79d0180d5146: 'Investigation (Parent Entry)' # Investigation (Parent Entry) c1c8acb5-0649-4dca-a7c8-1d03e98097cf: 'Help URL' # Help URL c1d3dd5f-2677-4a76-8db8-9a2b4db13536: Min # Min @@ -198,6 +211,7 @@ meta: d8be03ce-7aeb-4141-b40e-ec39ec1c796f: Educators # Educators d8ed7ca8-514f-4a3e-8675-c5a6e8d6c4f5: Min # Min d9df041c-3556-450e-94e1-f37369daf5f3: 'X-axis Label' # X-axis Label + dc1c3484-f028-4653-982b-a84e287d4c61: Equation # Equation dd3a1151-8de9-46f6-995f-c721fa29a07b: Option # Option dd4f7c39-ff32-47e4-b4eb-129bbf44b4a7: 'RTE Caption' # RTE Caption dd362aa4-c24c-4d2f-a867-d0baceacd50d: 'Object Name' # Object Name @@ -807,7 +821,7 @@ plugins: - widgets - '1' nextApiBaseUrl: $NEXT_API_BASE_URL - nextSecretToken: $NEXT_REVALIDATE_SECRET_TOKEN + nextSecretToken: $NEXT_SECRET_TOKEN redactor: edition: standard enabled: true 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 8604cc7..3f89d8a 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 @@ -10,7 +10,7 @@ previewTargets: - 'Primary entry page' - - urlFormat - - '{url}' + - '@previewUrlFormat' - - refresh - '1' 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 58f241c..c109dc2 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 @@ -1,17 +1,136 @@ -description: null +description: '' handle: editors name: Editors permissions: - accesscp + - accessplugin-_canto-dam-assets + - 'createentries:1a93d10f-deca-4e6b-a3e8-9baae53e7c47' # Investigations + - 'createentries:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets - 'createentries:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages + - 'createentries:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions + - 'createentries:c2356ed1-1e49-4056-83c7-ed615a2694b1' # Reference Modals + - 'deleteentries:1a93d10f-deca-4e6b-a3e8-9baae53e7c47' # Investigations + - 'deleteentries:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets - 'deleteentries:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages + - 'deleteentries:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions + - 'deleteentries:c2356ed1-1e49-4056-83c7-ed615a2694b1' # Reference Modals + - 'editglobalset:0edce3a2-c596-4238-9dde-212c83d5a65f' # Menu Content - 'editglobalset:aee57b4f-2623-44fc-af2b-c670f6e1babe' # Site information - 'editsite:2c2e1c6a-eb4d-44f1-9a43-8d79b326f354' # ES - 'editsite:547128fa-4529-4483-9968-66425996b69f' # EN + - 'neo-createblocks:010dc3f6-c369-4937-adc7-1948204aaf97' # Group + - 'neo-createblocks:0601483c-a943-42a3-b1a5-e003b05618dc' # Question Block + - 'neo-createblocks:0d06751e-ecf9-4281-a754-8c818fb9353b' # Color Filter Tool Block + - 'neo-createblocks:11f12958-c08d-4f26-9466-1a8ba7011b34' # Camera Filter Tool + - 'neo-createblocks:1ed0caa3-b91f-442b-b313-f3eb54a8a0dc' # Two Column Container + - 'neo-createblocks:220292c8-0330-4dd4-aa84-f0eeec38fa4e' # Text + - '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: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: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 + - 'neo-createblocks:87fc48a5-a399-4ce1-a7ca-2dadfd1e1445' # Camera Filter Tool + - 'neo-createblocks:947400f5-3c2d-403a-b94e-68715e48a9c0' # Left Column + - 'neo-createblocks:9748bbea-73ac-46cc-90b1-e6b8a6da31cd' # Image + - 'neo-createblocks:a1eeb085-4a92-48ba-92f5-65b9f5ebfc72' # Text + - 'neo-createblocks:a3f93249-e386-43c7-b2dd-5da2cda1eb03' # Object + - '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: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 + - 'neo-createblocks:f7ef882a-9d5d-4247-9e24-27d4a2702508' # FilterImage + - 'neo-createblocks:fcfc14fd-28c8-4445-9f56-7c0fe24c0acf' # Table + - 'neo-deleteblocks:010dc3f6-c369-4937-adc7-1948204aaf97' # Group + - 'neo-deleteblocks:0601483c-a943-42a3-b1a5-e003b05618dc' # Question Block + - 'neo-deleteblocks:0d06751e-ecf9-4281-a754-8c818fb9353b' # Color Filter Tool Block + - 'neo-deleteblocks:11f12958-c08d-4f26-9466-1a8ba7011b34' # Camera Filter Tool + - 'neo-deleteblocks:1ed0caa3-b91f-442b-b313-f3eb54a8a0dc' # Two Column Container + - 'neo-deleteblocks:220292c8-0330-4dd4-aa84-f0eeec38fa4e' # Text + - '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: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: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 + - 'neo-deleteblocks:87fc48a5-a399-4ce1-a7ca-2dadfd1e1445' # Camera Filter Tool + - 'neo-deleteblocks:947400f5-3c2d-403a-b94e-68715e48a9c0' # Left Column + - 'neo-deleteblocks:9748bbea-73ac-46cc-90b1-e6b8a6da31cd' # Image + - 'neo-deleteblocks:a1eeb085-4a92-48ba-92f5-65b9f5ebfc72' # Text + - 'neo-deleteblocks:a3f93249-e386-43c7-b2dd-5da2cda1eb03' # Object + - '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: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 + - 'neo-deleteblocks:f7ef882a-9d5d-4247-9e24-27d4a2702508' # FilterImage + - 'neo-deleteblocks:fcfc14fd-28c8-4445-9f56-7c0fe24c0acf' # Table + - 'neo-editblocks:010dc3f6-c369-4937-adc7-1948204aaf97' # Group + - 'neo-editblocks:0601483c-a943-42a3-b1a5-e003b05618dc' # Question Block + - 'neo-editblocks:0d06751e-ecf9-4281-a754-8c818fb9353b' # Color Filter Tool Block + - 'neo-editblocks:11f12958-c08d-4f26-9466-1a8ba7011b34' # Camera Filter Tool + - 'neo-editblocks:1ed0caa3-b91f-442b-b313-f3eb54a8a0dc' # Two Column Container + - 'neo-editblocks:220292c8-0330-4dd4-aa84-f0eeec38fa4e' # Text + - '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: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: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 + - 'neo-editblocks:87fc48a5-a399-4ce1-a7ca-2dadfd1e1445' # Camera Filter Tool + - 'neo-editblocks:947400f5-3c2d-403a-b94e-68715e48a9c0' # Left Column + - 'neo-editblocks:9748bbea-73ac-46cc-90b1-e6b8a6da31cd' # Image + - 'neo-editblocks:a1eeb085-4a92-48ba-92f5-65b9f5ebfc72' # Text + - 'neo-editblocks:a3f93249-e386-43c7-b2dd-5da2cda1eb03' # Object + - '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: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 + - 'neo-editblocks:f7ef882a-9d5d-4247-9e24-27d4a2702508' # FilterImage + - 'neo-editblocks:fcfc14fd-28c8-4445-9f56-7c0fe24c0acf' # Table - 'saveentries:075467b0-0dee-453c-9df0-0de6d2443cf8' # Homepage + - 'saveentries:1a93d10f-deca-4e6b-a3e8-9baae53e7c47' # Investigations + - 'saveentries:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets - 'saveentries:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages + - 'saveentries:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions + - 'saveentries:c2356ed1-1e49-4056-83c7-ed615a2694b1' # Reference Modals - 'viewentries:075467b0-0dee-453c-9df0-0de6d2443cf8' # Homepage + - 'viewentries:1a93d10f-deca-4e6b-a3e8-9baae53e7c47' # Investigations + - 'viewentries:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets - 'viewentries:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages + - 'viewentries:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions + - 'viewentries:c2356ed1-1e49-4056-83c7-ed615a2694b1' # Reference Modals + - 'viewpeerentries:1a93d10f-deca-4e6b-a3e8-9baae53e7c47' # Investigations + - 'viewpeerentries:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets - 'viewpeerentries:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages + - 'viewpeerentries:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions + - 'viewpeerentries:c2356ed1-1e49-4056-83c7-ed615a2694b1' # Reference Modals - 'viewpeerentrydrafts:075467b0-0dee-453c-9df0-0de6d2443cf8' # Homepage + - 'viewpeerentrydrafts:1a93d10f-deca-4e6b-a3e8-9baae53e7c47' # Investigations + - 'viewpeerentrydrafts:28704998-935a-423b-a405-d4ad8b38efa2' # Widgets - 'viewpeerentrydrafts:8dc1c6cb-eb37-4ad7-b9c8-7d0891fcd42d' # Pages + - 'viewpeerentrydrafts:9068dd8e-ad92-4925-ba1d-1fe180598462' # Questions + - 'viewpeerentrydrafts:c2356ed1-1e49-4056-83c7-ed615a2694b1' # Reference Modals diff --git a/clean b/clean deleted file mode 100644 index 3ce2659..0000000 --- a/clean +++ /dev/null @@ -1,2 +0,0 @@ -#! bin/bash -docker system prune -f && docker volume prune -f \ No newline at end of file diff --git a/clean-images b/clean-images deleted file mode 100644 index 9cdb7ba..0000000 --- a/clean-images +++ /dev/null @@ -1,2 +0,0 @@ -#! bin/bash -docker images prune \ No newline at end of file diff --git a/dev b/dev deleted file mode 100644 index 443f787..0000000 --- a/dev +++ /dev/null @@ -1,2 +0,0 @@ -#! bin/bash -docker-compose -f docker-compose-local-db.yml up --build \ No newline at end of file diff --git a/docker-compose-local-db.sample.yml b/docker-compose-local-db.sample.yml index 068acad..a4babad 100644 --- a/docker-compose-local-db.sample.yml +++ b/docker-compose-local-db.sample.yml @@ -24,13 +24,13 @@ services: DB_PORT: 5432 PRIMARY_SITE_URL: http://localhost:8080 WEB_BASE_URL: http://localhost:3000 - ALIAS_PREVIEW_URL_FORMAT: http://localhost:3000/api/preview?site={site}&entryUid={sourceUid} + ALIAS_PREVIEW_URL_FORMAT: http://localhost:3000/api/preview?site={site}&uri={uri} ENABLE_MEMCACHED: "true" MEMCACHED_IP: cache MEMCACHED_PORT: 11211 PORT: 8080 NEXT_API_BASE_URL: gateway.docker.internal:3000/api - NEXT_REVALIDATE_SECRET_TOKEN: super-secret-token + NEXT_SECRET_TOKEN: super-secret-token ports: - "8080:8080" depends_on: diff --git a/package.json b/package.json deleted file mode 100644 index cf697a2..0000000 --- a/package.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "dependencies": { - "npm-run-all": "^4.1.5" - }, - "scripts": { - "dev": "docker-compose -f docker-compose-local-db.yml up --build", - "clean": "docker system prune -f && docker volume prune -f", - "clean-images": "docker images prune -f" - } -}