Use CDN domains for asset prefixes (#2541)

* Move asset prefixes to CDN domains * Move static assets to /assets * Add robots.txt Disallow all agents from fe-project.zooniverse.org and fe-content-pages.zooniverse.org.
zooniverse · Nov 16, 2021 · 2759719 · 2759719
1 parent b8d77e1
commit 2759719
Show file tree

Hide file tree

Showing 9 changed files with 11 additions and 7 deletions.
diff --git a/kubernetes/deployment-production.tmpl b/kubernetes/deployment-production.tmpl
@@ -69,7 +69,7 @@ spec:
             - containerPort: 3000
           env:
             - name: PROJECT_ASSET_PREFIX
-              value: https://fe-project.zooniverse.org/projects
+              value: https://www.zooniverse.org/projects
             - name: COMMIT_ID
               value: __IMAGE_TAG__
             - name: NEWRELIC_LICENSE_KEY
@@ -169,7 +169,7 @@ spec:
             - containerPort: 3000
           env:
             - name: CONTENT_ASSET_PREFIX
-              value: https://fe-content-pages.zooniverse.org/about
+              value: https://www.zooniverse.org/about
             - name: COMMIT_ID
               value: __IMAGE_TAG__
             - name: CONTENTFUL_ACCESS_TOKEN

diff --git a/kubernetes/deployment-staging.tmpl b/kubernetes/deployment-staging.tmpl
@@ -59,7 +59,7 @@ spec:
             - containerPort: 3000
           env:
             - name: PROJECT_ASSET_PREFIX
-              value: https://fe-project.preview.zooniverse.org/projects
+              value: https://frontend.preview.zooniverse.org/projects
             - name: COMMIT_ID
               value: __IMAGE_TAG__
             - name: NEWRELIC_LICENSE_KEY
@@ -151,7 +151,7 @@ spec:
             - containerPort: 3000
           env:
             - name: CONTENT_ASSET_PREFIX
-              value: https://fe-content-pages.preview.zooniverse.org/about
+              value: https://frontend.preview.zooniverse.org/about
             - name: COMMIT_ID
               value: __IMAGE_TAG__
             - name: CONTENTFUL_ACCESS_TOKEN

diff --git a/packages/app-content-pages/public/robots.txt b/packages/app-content-pages/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
diff --git a/...ages/app-project/public/simple-avatar.png → ...p-project/public/assets/simple-avatar.png b/...ages/app-project/public/simple-avatar.png → ...p-project/public/assets/simple-avatar.png
diff --git a/...pp-project/public/subject-placeholder.png → ...ect/public/assets/subject-placeholder.png b/...pp-project/public/subject-placeholder.png → ...ect/public/assets/subject-placeholder.png
diff --git a/packages/app-project/public/robots.txt b/packages/app-project/public/robots.txt
@@ -0,0 +1,2 @@
+User-agent: *
+Disallow: /
diff --git a/packages/app-project/src/screens/ClassifyPage/components/RecentSubjects/RecentSubjects.js b/packages/app-project/src/screens/ClassifyPage/components/RecentSubjects/RecentSubjects.js
@@ -19,7 +19,7 @@ function RecentSubjects ({
   const height = (size === 1) ? '40vw' : '200px'
   const { publicRuntimeConfig = {} } = getConfig() || {}
   const assetPrefix = publicRuntimeConfig.assetPrefix || ''
-  const placeholderUrl = `${assetPrefix}/subject-placeholder.png`
+  const placeholderUrl = `${assetPrefix}/assets/subject-placeholder.png`
   const displayedRecents = recents.slice(0, size)
 
   return (

diff --git a/packages/app-project/src/screens/ProjectAboutPage/components/TeamMember/TeamMember.js b/packages/app-project/src/screens/ProjectAboutPage/components/TeamMember/TeamMember.js
@@ -66,7 +66,7 @@ const TeamMember = ({ user }) => {
 
   const { publicRuntimeConfig = {} } = getConfig() || {}
   const assetPrefix = publicRuntimeConfig.assetPrefix || ''
-  const placeholderAvatar = `${assetPrefix}/simple-avatar.png`
+  const placeholderAvatar = `${assetPrefix}/assets/simple-avatar.png`
 
   return (
     <StyledTeamMember as='li'>

diff --git a/...roject/src/shared/components/SubjectSetPicker/components/SubjectSetCard/SubjectSetCard.js b/...roject/src/shared/components/SubjectSetPicker/components/SubjectSetCard/SubjectSetCard.js
@@ -26,7 +26,7 @@ function SubjectSetCard ({
   const [subject] = subjects
   const { publicRuntimeConfig = {} } = getConfig() || {}
   const assetPrefix = publicRuntimeConfig.assetPrefix || ''
-  const placeholderUrl = `${assetPrefix}/subject-placeholder.png`
+  const placeholderUrl = `${assetPrefix}/assets/subject-placeholder.png`
   const subjectURLs = subject ? subject.locations.map(location => Object.values(location)[0]) : []
   const alt = subject ? `Subject ${subject.id}` : 'Loading'
   const percentComplete = parseInt(100 * completeness)