Merge branch 'master' into fix-subject-height

.github/ISSUE_TEMPLATE/bug_report.md

@@ -8,13 +8,15 @@ assignees: ''
 ---
 
 ## Package
-_Choose from the list:_
-- [ ] app-content-pages
-- [ ] app-project
-- [ ] lib-classifier
-- [ ] lib-panoptes-js
-- [ ] lib-react-components
-- [ ] unknown
+_Examples_
+- app-project
+- app-root
+- lib-classifier
+- lib-content
+- lib-panoptes-js
+- lib-react-components
+- lib-user
+- unknown
 
 ## Describe the bug
 A clear and concise description of what the bug is.

.github/ISSUE_TEMPLATE/feature-request--ux--ui--accessibility--design--etc.md

@@ -7,13 +7,15 @@ labels: enhancement
 ---
 
 ## Package
-_Choose from the list:_
-- [ ] app-content-pages
-- [ ] app-project
-- [ ] lib-classifier
-- [ ] lib-panoptes-js
-- [ ] lib-react-components
-- [ ] unknown
+_Examples_
+- app-project
+- app-root
+- lib-classifier
+- lib-content
+- lib-panoptes-js
+- lib-react-components
+- lib-user
+- unknown
 
 ## Is your feature request related to a problem? Please describe.
 A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]

README.md

@@ -75,7 +75,6 @@ docker-compose build
 
 `docker-compose up` runs local production builds as follows:
 
-- content pages app at http://localhost:3001
 - project app at http://localhost:3002
 - root app at http://localhost:3003
 
@@ -116,7 +115,6 @@ See each package's folder for more specific documentation.
 |---|---|---|
 | **@zooniverse/async-states** | `packages/lib-async-states` | Frozen object of async states to use in data stores |
 | **@zooniverse/classifier** | `packages/lib-classifier` | Classifier view components and state which can be exported modularly or altogether as a working classifier |
-| **@zooniverse/fe-content-pages** | `packages/app-content-pages` | Server-side rendered application for documentation / info pages, such as Publications. |
 | **@zooniverse/fe-project** | `packages/app-project` | Server-side rendered application for a project (anything at `/projects/owner/display_name`) |
 | **@zooniverse/grommet-theme** | `packages/lib-grommet-theme` | The style definitions for a Zooniverse theme to use with Grommet |
 | **@zooniverse/panoptes-js** | `packages/lib-panoptes-js` | Panoptes API javascript client. Functional HTTP request helpers built on top of superagent |

kubernetes/deployment-production.tmpl

@@ -141,17 +141,17 @@ spec:
               cpu: "1000m"
           startupProbe:
             httpGet:
-              path: /users
+              path: /about
               port: 3000
             failureThreshold: 6
           livenessProbe:
             httpGet:
-              path: /users
+              path: /about
               port: 3000
             timeoutSeconds: 10
           readinessProbe:
             httpGet:
-              path: /users
+              path: /about
               port: 3000
             initialDelaySeconds: 20
             timeoutSeconds: 10

kubernetes/deployment-staging.tmpl

@@ -131,17 +131,17 @@ spec:
               cpu: "1000m"
           startupProbe:
             httpGet:
-              path: /users
+              path: /about
               port: 3000
             failureThreshold: 6
           livenessProbe:
             httpGet:
-              path: /users
+              path: /about
               port: 3000
             timeoutSeconds: 10
           readinessProbe:
             httpGet:
-              path: /users
+              path: /about
               port: 3000
             initialDelaySeconds: 20
             timeoutSeconds: 10