diff --git a/CHANGELOG.rst b/CHANGELOG.rst index bddf6cbe..36ef5988 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -2,10 +2,15 @@ Change log ########## +0.7.0 (unreleased) +================== + +- Add support for `Times Square `__. + 0.6.0 (2022-04-14) ================== -- Informational broadcast messages are now displayed ith Rubin's primary teal as the background color (see `lsst-sqre/semaphore#29 `__ for more information). +- Informational broadcast messages are now displayed with Rubin's primary teal as the background color (see `lsst-sqre/semaphore#29 `__ for more information). - Replaced custom fetch hook for the Semaphore broadcast message data with swr, enabling us to automatically refresh broadcast data. - Updated the component layout in the source code. diff --git a/next.config.js b/next.config.js index 3e62ecf7..d80b4c59 100644 --- a/next.config.js +++ b/next.config.js @@ -52,10 +52,28 @@ module.exports = (phase, { defaultConfig }) => { serverRuntimeConfig: { ...serverYamlConfig }, async rewrites() { return [ + // Mock Gafaelfawr (this is never triggered by a production ingress) { source: '/auth/api/v1/user-info', destination: '/api/dev/user-info', }, + // Mock Times Square (this is never triggered by a production ingress) + { + source: '/times-square/api/v1/pages', + destination: '/api/dev/times-square/v1/pages', + }, + { + source: '/times-square/api/v1/pages/:page/html', + destination: '/api/dev/times-square/v1/pages/:page/html', + }, + { + source: '/times-square/api/v1/pages/:page/htmlstatus', + destination: '/api/dev/times-square/v1/pages/:page/htmlstatus', + }, + { + source: '/times-square/api/v1/pages/:page', + destination: '/api/dev/times-square/v1/pages/:page', + }, ]; }, }; diff --git a/package-lock.json b/package-lock.json index bb749574..e29b817f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "squareone", - "version": "0.5.0", + "version": "0.7.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "squareone", - "version": "0.5.0", + "version": "0.7.0", "dependencies": { "@fontsource/source-sans-pro": "^4.5.9", "@fortawesome/fontawesome-svg-core": "^6.1.1", diff --git a/squareone.config.schema.json b/squareone.config.schema.json index 5aa1b60b..3e7e2e64 100644 --- a/squareone.config.schema.json +++ b/squareone.config.schema.json @@ -27,7 +27,12 @@ "semaphoreUrl": { "type": "string", "title": "Semaphore URL", - "description": "URL of the Semaphore API service for obtaining notifications and broadcasts" + "description": "URL prefix of the Semaphore API service for obtaining notifications and broadcasts. Does not end in /. Omit or set as null to disable Semaphore features." + }, + "timesSquareUrl": { + "type": "string", + "title": "Times Square API URL", + "description": "URL prefix of the Times Square API service. Does not end in /. Omit or set as null to disable the /times-square/ pages." } } } diff --git a/squareone.config.yaml b/squareone.config.yaml index 11f4ea8e..572fe093 100644 --- a/squareone.config.yaml +++ b/squareone.config.yaml @@ -3,3 +3,4 @@ baseUrl: 'http://localhost:3000' siteDescription: | The site description. semaphoreUrl: 'https://data-dev.lsst.cloud/semaphore' +timesSquareUrl: 'http://localhost:3000/times-square/api' diff --git a/src/components/Page/Page.js b/src/components/Page/Page.js index 1a0aa773..cb59487a 100644 --- a/src/components/Page/Page.js +++ b/src/components/Page/Page.js @@ -40,7 +40,7 @@ export default function Page({ children, semaphoreUrl }) {
- {children} + {children}