Epo 8414

Dockerfile

@@ -1,20 +1,25 @@
 ARG BASE_TAG=latest
 # Composer dependencies
 FROM composer:2 as vendor
+
+LABEL maintainer="[email protected]"
+
 COPY api/composer.json composer.json
 COPY api/composer.lock composer.lock
 COPY api/plugins ./plugins
 RUN composer install --ignore-platform-reqs --no-interaction --prefer-dist
 
 FROM us-central1-docker.pkg.dev/skyviewer/public-images/craft-base-image:$BASE_TAG
 
-LABEL maintainer="[email protected]"
-
 USER root
+
 # Copy in custom code from the host machine.
 WORKDIR /var/www/html
 COPY --chown=www-data:www-data api/ ./
+
 COPY --from=vendor --chown=www-data:www-data /app/vendor ./vendor
 RUN mkdir /var/secrets && [ -d ./storage ] || mkdir storage
 
 USER www-data
+
+CMD ["supervisord"]

api/.gitignore

@@ -3,4 +3,6 @@
 
 # Miscellenious
 /log
-/tmp
+/tmp
+
+supervisor.log

api/composer.json

@@ -9,6 +9,7 @@
         "craftcms/google-cloud": "^2.0.0",
         "craftcms/redactor": "3.0.4",
         "jamesedmonston/graphql-authentication": "2.4.0",
+        "lsst-epo/canto-dam-assets": "^4.0",
         "lsst/canto-dam-integrator": "dev-EPO-7854#v0.3.2",
         "rynpsc/craft-phone-number": "^2.1.0",
         "sebastianlenz/linkfield": "^2.1.4",
@@ -23,6 +24,10 @@
             "type": "vcs",
             "url": "https://github.com/lsst-epo/craft-canto-dam-integrator.git"
         },
+        {
+            "type": "vcs",
+            "url": "https://github.com/lsst-epo/canto-dam-assets.git"
+        },
         {
             "type": "path",
             "url": "plugins/nextbuilds"

api/config/project/entryTypes/post--4729ad5e-485e-4f98-995d-79fa5254cd42.yaml

@@ -65,7 +65,19 @@ fieldLayouts:
             uid: 3855f60e-a753-427f-9244-8979083a7f3b
             userCondition: null
             warning: null
-            width: 100
+            width: 50
+          -
+            elementCondition: null
+            fieldUid: 61b9d842-7365-4bbf-883c-1b6433dc15f4 # Caption - rich text
+            instructions: null
+            label: 'Hero Caption'
+            required: false
+            tip: null
+            type: craft\fieldlayoutelements\CustomField
+            uid: 6b1526fd-da23-4704-a956-01ff8ed74f8b
+            userCondition: null
+            warning: null
+            width: 50
           -
             elementCondition: null
             fieldUid: 75f0b770-5006-4359-848f-96415196bfe0 # Date

api/config/project/fields/cantoDamAsset--676da0d6-dc63-48fd-a5cd-7253c956974c.yaml

@@ -0,0 +1,14 @@
+columnSuffix: vwsjafwg
+contentColumnType:
+  - 'cantoId:string'
+  - 'cantoAlbumId:string'
+  - 'cantoAssetData:text'
+  - 'cantoAlbumData:string'
+fieldGroup: df8c8d8a-c7d1-45bf-b551-ef790a5b59ad # Callouts
+handle: cantoDamAsset
+instructions: null
+name: 'Canto DAM Asset'
+searchable: false
+translationKeyFormat: null
+translationMethod: none
+type: lsst\cantodamassets\fields\CantoDamAsset

api/config/project/fields/captionRichText--61b9d842-7365-4bbf-883c-1b6433dc15f4.yaml

@@ -1,25 +1,24 @@
 columnSuffix: null
 contentColumnType: text
-fieldGroup: df8c8d8a-c7d1-45bf-b551-ef790a5b59ad # Callouts
+fieldGroup: 9940892d-32f4-4399-acac-ab559ce1c82b # Common
 handle: captionRichText
-instructions: ''
+instructions: null
 name: 'Caption - rich text'
 searchable: true
 settings:
-  availableTransforms: '*'
+  availableTransforms: ''
   availableVolumes: ''
-  cleanupHtml: true
   columnType: text
   configSelectionMode: choose
   defaultTransform: ''
   manualConfig: ''
-  purifierConfig: ''
-  purifyHtml: '1'
+  purifierConfig: null
+  purifyHtml: true
   redactorConfig: Simple.json
-  removeEmptyTags: '1'
-  removeInlineStyles: '1'
-  removeNbsp: '1'
-  showHtmlButtonForNonAdmins: ''
+  removeEmptyTags: true
+  removeInlineStyles: true
+  removeNbsp: true
+  showHtmlButtonForNonAdmins: false
   showUnpermittedFiles: false
   showUnpermittedVolumes: false
   uiMode: normal

api/config/project/project.yaml

@@ -1,4 +1,4 @@
-dateModified: 1691512708
+dateModified: 1694461991
 email:
   fromEmail: $EMAIL_FROM_ADDRESS
   fromName: $EMAIL_SENDER_NAME
@@ -220,6 +220,7 @@ meta:
     635a4a93-f10b-4d3c-bd44-2ea1474ad4cb: 'Vertical Alignment' # Vertical Alignment
     644c6b87-ac0c-4cdf-88be-744a5ee684bb: Description # Description
     657b9edd-b6d3-4b7f-af89-36117c5d98a8: 'Rich Text Description' # Rich Text Description
+    676da0d6-dc63-48fd-a5cd-7253c956974c: 'Canto DAM Asset' # Canto DAM Asset
     753b10b6-e9e6-44f5-a9d9-4a07788733e1: 'Content Ratio' # Content Ratio
     824d9ca2-e755-4e41-8f6a-18e573fec8e4: 'News Posts' # News Posts
     831db889-442e-4553-9076-fc3bc2843c8c: 'Hide title' # Hide title
@@ -398,6 +399,10 @@ meta:
     fcfd6cca-d4db-49ea-a864-b6582b85fbcf: 'End Date' # End Date
     fea30fc7-fc92-4268-961f-d514c1b903b8: 'Supporters'' Logos Alt' # Supporters' Logos Alt
 plugins:
+  _canto-dam-assets:
+    edition: standard
+    enabled: true
+    schemaVersion: 1.0.0
   asset-metadata:
     edition: standard
     enabled: true
@@ -2366,7 +2371,7 @@ plugins:
     schemaVersion: 2.0.0
   universal-dam-integrator:
     edition: standard
-    enabled: true
+    enabled: false
     schemaVersion: 1.0.0
     settings:
       appId: $CANTO_APP_ID