Skip to content
This repository has been archived by the owner on Nov 4, 2024. It is now read-only.

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history
commit b4cad79
Author: HO <[email protected]>
Date:   Thu Apr 7 11:34:29 2022 +0200

    fix: mark incomplete data (#4162)

    * fix: mark incomplete data

    * fix: remove unused vars

commit a1ec9da
Author: J <[email protected]>
Date:   Thu Apr 7 11:01:08 2022 +0200

    Set behavior annotations live (#4160)

commit 4d01c5c
Author: MN <[email protected]>
Date:   Thu Apr 7 09:52:46 2022 +0200

    Fix/revert new build setup (#4159)

    * Revert "Dockerfile add WORKDIR (#4158)"

    This reverts commit 7b7da75.

    * Revert "Fix/dockerfile relative paths (#4157)"

    This reverts commit 3228c1e.

    * Revert "fix: use relative paths for build copy steps (#4154)"

    This reverts commit dedf734.

    * Revert "Feature/docker image optimizations (#4144)"

    This reverts commit 1f844fe.

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 1b8eb28
Author: HO <[email protected]>
Date:   Wed Apr 6 15:16:09 2022 +0200

    feat: aligned timeframe options on all charts (#4155)

    * feat: aligned timeframe options on all charts

    * feat: moved option list to a maintainable location

commit 7b7da75
Author: MN <[email protected]>
Date:   Wed Apr 6 14:59:13 2022 +0200

    Dockerfile add WORKDIR (#4158)

    * fix: use relative paths for build copy steps

    * fix: attempt to use correct paths for copy steps

    * fix: merge conflict

    * fix: add workdir

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit c867a42
Author: J <[email protected]>
Date:   Wed Apr 6 14:20:27 2022 +0200

    Feature/update actueel sewer with data driven text (#4156)

    * Added sanity text

    * Added sanity text

commit 3228c1e
Author: MN <[email protected]>
Date:   Wed Apr 6 13:51:19 2022 +0200

    Fix/dockerfile relative paths (#4157)

    * fix: use relative paths for build copy steps

    * fix: attempt to use correct paths for copy steps

    * fix: merge conflict

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit dedf734
Author: MN <[email protected]>
Date:   Wed Apr 6 11:15:57 2022 +0200

    fix: use relative paths for build copy steps (#4154)

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 1f844fe
Author: MN <[email protected]>
Date:   Wed Apr 6 10:13:23 2022 +0200

    Feature/docker image optimizations (#4144)

    * feat: use standalone build of NextJS and outputFileTracing to reduce image size

    * fix: improve download script

    * wip: file proxy to sanity

    * wip: rewrite headers

    * wip: rewrite middlewares

    * feat: removed helmet, custom next-server.js

    * fix: cleanup todos

    * fix: cleanup Dockerfile

    * fix: cleanup next config

    * fix: copy static folder after build to make it run locally

    * fix: merge conflicts

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit 897aab5
Author: J <[email protected]>
Date:   Wed Apr 6 09:58:38 2022 +0200

    Feature/add sewerdata to actueel (#4146)

    * added feature flag for sewage

    * added sewer to actueel nl

    * Added to VR and GM and set the right order and replace the postive test instead of IC and added redirect to domain page

    * turn feature off

    * added remaining lokalize texts

    * Adjusted according to PR feedback

    * Added key in sanity because of mismatch

commit 852c487
Author: HO <[email protected]>
Date:   Wed Apr 6 09:21:53 2022 +0200

    Revert to old download command (#4153)

    * fix: revert to old download command due to pipeline issues

    * fix: revert data structure change

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit d149798
Author: J <[email protected]>
Date:   Wed Apr 6 00:15:37 2022 +0200

    Feature/behavior annotations match be (#4150)

    * schema edit for Backend

    * Adjusted naming for backend input and added locale

commit 8627c00
Author: MN <[email protected]>
Date:   Tue Apr 5 17:02:50 2022 +0200

    fix: use generate-date-types instead of generate-typescript (#4151)

    Co-authored-by: VWSCoronaDashboard24 <[email protected]>

commit ea97fc3
Author: HO <[email protected]>
Date:   Tue Apr 5 11:06:39 2022 +0200

    fix: add halfbarwidth conditionally to chart (#4149)

commit 7872665
Author: VWSCoronaDashboard20 <[email protected]>
Date:   Mon Apr 4 13:06:09 2022 +0200

    feat: implement redirect and updated script (#4147)

    Co-authored-by: “MA” <“”>

commit 7a721ae
Author: HO <[email protected]>
Date:   Mon Apr 4 12:04:44 2022 +0200

    Feature/update scripts (#4148)

    * feat: update scripts so we can generate data types

    * feat: revert fault change

    * feat: change docs for data types

commit 2546160
Author: HO <[email protected]>
Date:   Mon Apr 4 10:02:50 2022 +0200

    feat: Upgrade to latest version of Sanity and update corresponding files (#4145)

commit d6b49c2
Author: A <[email protected]>
Date:   Thu Mar 31 14:34:40 2022 +0200

    feature flag added (#4143)

    Co-authored-by: VWSCoronaDashboard21 <[email protected]>

commit 22b52a8
Author: A <[email protected]>
Date:   Thu Mar 31 12:49:45 2022 +0200

    add vaccine novavax (#4138)

    * add vaccine novavax

    * added novavax to sanity

    Co-authored-by: VWSCoronaDashboard21 <[email protected]>

commit 4b1a7bb
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Thu Mar 31 10:57:27 2022 +0200

    Expanded timeframe options for most charts (#4142)

commit a73541c
Author: HO <[email protected]>
Date:   Thu Mar 31 10:21:10 2022 +0200

    Update scripts in monorepo and subprojects (#4141)

    * feat: update scripts

    - Updated scripts
    - Added shortcut scripts
    - Updated docs
    - Updated linter

    * fix: added missing changes

    * feat: rename lokalize scripts

    * feat: updated github workflow with new scripts

commit ab2367e
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed Mar 30 14:42:56 2022 +0200

    Added component for rich content input types to display styled validation messages (#4139)

commit 412a3ea
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Wed Mar 30 14:20:44 2022 +0200

    Added timeframe options of one week and six months (#4140)

    * Added timeframe options of one week and six months

    * Added new timeframe options to sanity

commit 75a3176
Author: J <[email protected]>
Date:   Wed Mar 30 09:43:26 2022 +0200

    Feature/behaviour annotations (#4128)

    * new data in schema

    * start changing timeline

    * Changing the logic and adding the dataconnection

    * Added x-axis date-range

    * Added Sanity keys

    * Fix TS warnings

    * Fixing Typescript errors

    * Fixing Typescript errors

    * Notify when wrong data is used

    * new data in schema

    * start changing timeline

    * Changing the logic and adding the dataconnection

    * Added x-axis date-range

    * Added Sanity keys

    * Fix TS warnings

    * Fixing Typescript errors

    * Fixing Typescript errors

    * Notify when wrong data is used

    * Update packages/app/src/pages/landelijk/gedrag.tsx

    Co-authored-by: MN <[email protected]>

    * Update packages/app/src/domain/behavior/behavior-line-chart-tile.tsx

    Co-authored-by: MN <[email protected]>

    * Update packages/app/src/domain/behavior/behavior-line-chart-tile.tsx

    Co-authored-by: MN <[email protected]>

    * new data in schema

    * Changing the logic and adding the dataconnection

    * Added x-axis date-range

    * Fix TS warnings

    * Fixing Typescript errors

    * Fixing Typescript errors

    * Notify when wrong data is used

    * Update packages/app/src/pages/landelijk/gedrag.tsx

    Co-authored-by: MN <[email protected]>

    * Update packages/app/src/domain/behavior/behavior-line-chart-tile.tsx

    Co-authored-by: MN <[email protected]>

    * Update packages/app/src/domain/behavior/behavior-line-chart-tile.tsx

    Co-authored-by: MN <[email protected]>

    * New sanity location

    * update sanity type errors

    Co-authored-by: MN <[email protected]>

commit 0712ba4
Author: HO <[email protected]>
Date:   Wed Mar 30 09:13:27 2022 +0200

    feat: updated imports (#4137)

    Compact imports by adding an index to modules

commit f795d6c
Author: VWSCoronaDashboard22 <[email protected]>
Date:   Mon Mar 28 15:46:13 2022 +0200

    Split lokalize texts into common and pages (#4119)

    * Split lokalize texts into common and pages

    * Fixed some type issues

    * More type fixes

    * Fixed repeating_shot_information_block

    * Merge branch 'develop' into feature/split-lokalize-text

    * Fixed types and references

    * Corrected references

    * Moved lokalize texts

    * Renamed some variables for consistency

    * Fixed text replace vars

commit 9c3b9c3
Author: J <[email protected]>
Date:   Fri Mar 25 11:13:44 2022 +0100

    removed date interval (#4133)
  • Loading branch information
Jorrik-Klijnsma-Work committed Apr 7, 2022
1 parent ccd7439 commit 722b4ed
Show file tree
Hide file tree
Showing 233 changed files with 4,149 additions and 2,283 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,18 +66,18 @@ jobs:
run: yarn install

- name: Build icon package
run: yarn workspace @corona-dashboard/icons build
run: yarn build:icons

- name: Build common module
run: yarn workspace @corona-dashboard/common build
run: yarn build:common

- name: Export texts (develop)
- name: Import texts (develop)
if: ${{ env.BRANCH_NAME != 'master' }}
run: yarn workspace @corona-dashboard/cms lokalize:export --clean-json
run: yarn cms:lokalize-import --clean-json

- name: Export texts (production)
- name: Import texts (production)
if: ${{ env.BRANCH_NAME == 'master' }}
run: yarn workspace @corona-dashboard/cms lokalize:export --dataset="production" --clean-json
run: yarn cms:lokalize-import:prd --clean-json

- name: Typecheck all code
run: yarn typecheck
Expand Down Expand Up @@ -106,13 +106,13 @@ jobs:
run: yarn install

- name: Build common module
run: yarn workspace @corona-dashboard/common build
run: yarn build:common

- name: Build icons module
run: yarn workspace @corona-dashboard/icons build
run: yarn build:icons

- name: Export texts
run: yarn workspace @corona-dashboard/cms lokalize:export --clean-json
run: yarn cms:lokalize-import --clean-json

- name: Run tests
run: yarn test:ci
2 changes: 1 addition & 1 deletion .github/workflows/sync-sanity-lokalize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
SANITY_TOKEN: ${{ secrets.sanity_token }}

- name: Export production texts
run: yarn workspace @corona-dashboard/cms lokalize:export --dataset=production --clean-json
run: yarn workspace @corona-dashboard/cms lokalize:import --dataset=production --clean-json

- name: Typecheck all code with production texts
run: yarn workspace @corona-dashboard/app typecheck
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ RUN apk add --no-cache --virtual \
FROM deps as builder
COPY . .
RUN yarn workspace @corona-dashboard/common build \
&& yarn workspace @corona-dashboard/cli generate-typescript \
&& yarn workspace @corona-dashboard/cli generate-data-types \
&& yarn workspace @corona-dashboard/icons build \
&& yarn test:ci

Expand All @@ -74,7 +74,7 @@ FROM builder
RUN yarn download \
&& yarn workspace @corona-dashboard/cli validate-json-all \
&& yarn workspace @corona-dashboard/cli validate-last-values --fail-early \
&& yarn workspace @corona-dashboard/cms lokalize:export --dataset=$NEXT_PUBLIC_SANITY_DATASET \
&& yarn workspace @corona-dashboard/cms lokalize:import --dataset=$NEXT_PUBLIC_SANITY_DATASET \
&& yarn workspace @corona-dashboard/app build \
&& mkdir -p /app/packages/app/public/images/choropleth \
&& addgroup -g 1001 -S nodejs \
Expand Down
2 changes: 1 addition & 1 deletion docs/ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ The build process follows these steps:
- Run the unit tests
- Download the server data files
- Run all the JSON data validations
- Run lokalize:export to retrieve all the translations from Sanity
- Run lokalize:import to retrieve all the translations from Sanity
- Run the NextJs build

[Back to index](index.md)
10 changes: 10 additions & 0 deletions docs/developers.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Developer Notes

## Shortcut scripts

The monorepo contains projects which the developer can access with shortcut scripts at the root of the project. Instead of writing the path in the CLI like `yarn workspace @corona-dashboard cms lokalize:import`, we can access the script by writing `yarn cms:lokalize-import` to bring your local JSON files up-to-date with the Sanity dataset. Another example is using `yarn build:app` instead of `yarn workspace @corona-dashboard/app build` to make a build during the release procedure. Lastly, running `yarn check-all` will make sure the code, data and tests work as expected, instead of running scripts individually.

Available shortcut scripts:

- `yarn check-all`
- `yarn cms:[command]`
- `yarn build:[command]`

## Common and icon packages

The monorepo contains two shared packages: common and icons.
Expand Down
3 changes: 0 additions & 3 deletions docs/feature-flags.md
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,4 @@ already existing metric, then declaring those properties will mean that only the
checks are performed on those. If the whole schema / metric is new, as it often
is, then specifying only the `metricName` is sufficient.

The script that validates the features (and runs at build-time) can be
triggered locally with `yarn workspace@corona-dashboard/cli validate-features`.

[Back to index](index.md)
28 changes: 14 additions & 14 deletions docs/lokalize-texts.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ our codebase. Even though these texts now live as documents in Sanity, we still
refer to them as "lokalize texts".

Each text string lives as a document in the CMS, of which each has a unique "key"
corresponding to a path. These documents are then exported as JSON files (one
corresponding to a path. These documents are then imported as JSON files (one
for each language) and consumed by the application as static data.

This document describes how to manage and make changes to these texts.
Expand All @@ -19,15 +19,15 @@ This document describes how to manage and make changes to these texts.
In summary these are the most important things you should be aware of:

- Commands are run with `yarn lokalize:[command]` from the `packages/cms` root
- The `export` command brings your local JSON files up-to-date with the Sanity
- The `import` command brings your local JSON files up-to-date with the Sanity
dataset. The TypeScript compiler will error when your JSON files do not
contain all the texts which are referenced in the code.
- The JSON export contains document ids as part of the keys. You can make
- The JSON import contains document ids as part of the keys. You can make
changes locally to the **app/src/locale/nl_export.json** file. Add new keys,
delete them or rename and move existing ones. After you make changes run the
`lokalize:apply-json-edits` script. This will give you a list of changes and
you can decide which ones to apply. Changes are written in a mutation log
file, and at the end the JSON is re-exported to reflect all changes.
file, and at the end the JSON is re-imported to reflect all changes.
It is recommended to run `lokalize:apply-json-edits` after the feature has
been finished, right before merging it to develop since during development
changes to the **nl_export.json** file might fluctuate.
Expand Down Expand Up @@ -63,26 +63,26 @@ scripts.
Merge conflicts in this file are common. You should always "accept both changes"
when resolving conflicts, so that none of the lines are ever deleted.

## Export
## Import

The application reads its locale strings from
**packages/app/public/nl_export.json** and **packages/app/public/en_export.json**.
These JSONs are exported from the Sanity lokalize documents, but they are not
part of the repository. Therefore, you will regularly need to run `yarn lokalize:export` in
These JSONs are imported from the Sanity lokalize documents, but they are not
part of the repository. Therefore, you will regularly need to run `yarn lokalize:import` in
order to keep your local JSON file up-to-date with the Sanity dataset.

The JSONs will include Sanity document ids in every leaf-key which are used to
detect add-/delete-/move-actions of texts (`some_key__@__{document_id}`). These
ids would result in compile- and run-time errors, but there's a workaround:

- compile-time: every export will also emit a `site-text.d.ts` with a `SiteText`
- compile-time: every import will also emit a `site-text.d.ts` with a `SiteText`
interface. This interface is used to type the imported JSONs.
- run-time: on load of the app all ids will be removed from the keys.

The runtime workaround would be a waste of resources on production, so for this
reason we use the `--clean-json` flag to ignore document ids.

### Export/Import technical details
### Technical details

In Sanity each lokalize value is stored as a separate `lokalizeText` document.
The key property in this document represents the flattened property path in **nl_export.json**
Expand All @@ -107,7 +107,7 @@ The root key (so in this case `accessibility`) will be saved as the subject prop
This allows us to filter on this subject under the Sanity `Lokalize` menu item. Making it a little
easier for an editor to lookup a specific key in the menu.

So, `yarn lokalize:export` simply retrieves all of the `lokalizeText` documents, replaces their ids in the root part of the path
So, `yarn lokalize:import` simply retrieves all of the `lokalizeText` documents, replaces their ids in the root part of the path
and unflattens this list of paths into a JSON file. (The Dutch texts are serialized as **nl_export.json**, the English as **en_export.json**).
`yarn lokalize:apply-json-edits` does the exact opposite, it takes the **nl_export.json** file, flattens the file into an array of
paths and saves those to Sanity. Obviously there is a bunch of logic involved that checks if a path is new or existing, but for those
Expand All @@ -116,7 +116,7 @@ details we refer to the source code.
## How to Add, Delete or Move Texts

First make sure the JSONs include document ids (`some_key__@__{document_id}`).
Run `yarn lokalize:export` if these are not yet present in your JSONs.
Run `yarn lokalize:import` if these are not yet present in your JSONs.

You can add, delete and move keys by mutating the **nl_export.json** file. The
sync script will automagically detect additions, deletions or moved lokalize
Expand All @@ -129,7 +129,7 @@ file.
New texts will only have an NL (Dutch) string when they are added and will use NL as a
fallback.

After syncing texts, the export script is called to update your local JSON file
After syncing texts, the import script is called to update your local JSON file
and re-generate the SiteText type interface.

### Delete/Move Mutations
Expand All @@ -139,7 +139,7 @@ dataset, we can not simply remove a lokalize text document from the dataset
without potentially breaking other branches.

For this reason, when you delete a lokalize text, it will append the delete
action to the mutations file but not actually delete the document. The export
action to the mutations file but not actually delete the document. The import
filters out any deletions that were logged to the mutations file. So in effect
you end up with a local JSON file that has the deleted key removed, and the TS
compiler sees the correct dataset.
Expand All @@ -148,7 +148,7 @@ The actual deletions from Sanity only happen in the `sync-after-feature` phase,
describe below.

The same goes for move mutations. When you apply the move in your feature branch
it will be simulated in the JSON export, but not yet applied to the CMS
it will be simulated in the JSON import, but not yet applied to the CMS
documents. During sync-after-feature the move is finalized by changing the key
and subject properties of the targeted document. This preserves the document
history and drafts.
Expand Down
9 changes: 5 additions & 4 deletions docs/release-procedure.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
2. Merge the develop branch into the release branch.
3. Do a full build with a Sanity export from production to make sure everything works.

Use `yarn lokalize:export --dataset=production` to create the Sanity export.
Use `yarn cms:lokalize-import:prd` to create the Sanity export.
Use `yarn build:app` to create a build with the latest production dataset

Test the build locally by running `yarn start`.

Expand All @@ -23,9 +24,9 @@
8. Hit the publish button in the GitHub release draft. This should tag the
correct commit in `master`.
9. Important before running the next step is building the common package to avoid any typescript errors,
so run `yarn workspace @corona-dashboard/common build`.
so run `yarn build:common`.
10. After we are sure we are moving to production with the release as it is,
run the `yarn workspace @corona-dashboard/cms lokalize:sync-after-release`
run the `yarn cms:sync-after-release`
script. This script will perform any necessary text mutations for keys that
have been moved, and also cleans up any deleted texts from the Sanity
production dataset. For more information [read this](/docs/lokalize-texts.md#sync-after-release).
Expand Down Expand Up @@ -99,7 +100,7 @@ the `key-mutations.csv` file and commit this to the release branch.
## CMS Deploy

Sometimes a release also contains new configurations for the CMS. These are
deployed via the Sanity CLI as `yarn deploy`. These deployments do
deployed via the Sanity CLI by running `yarn cms:deploy` in the root of the project. These deployments do
not usually need to be done simultaneously with the release. If they are
backwards-compatible they could be performed at any time and also repeatedly.

Expand Down
2 changes: 1 addition & 1 deletion docs/schema.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ that are referenced by the entry point.

The schemas are also used to generate Typescript interfaces from their `title`
attribute. This way the data shape is always synchronized with the frontend
implementations. To execute this functionality run the `yarn generate-typescript` command from the project root directory. The output of this
implementations. To execute this functionality run the `yarn generate-data-types` command from the project root directory. The output of this
script is saved to the **src/types/data.ts** file. The titles are
automatically PascalCased so spaces and \_ are replaced. In other to avoid
naming conflicts it is advised to prefix the titles. See [Guidelines For New
Expand Down
1 change: 1 addition & 0 deletions eslint-overrides.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
"@typescript-eslint/no-var-requires": 0,
"@typescript-eslint/explicit-module-boundary-types": 0,
"@typescript-eslint/no-use-before-define": 0,
"@typescript-eslint/triple-slash-reference": 0,
"@typescript-eslint/no-unused-vars": [
2,
{
Expand Down
19 changes: 14 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,21 +9,30 @@
"bootstrap": "yarn workspaces foreach run bootstrap",
"clean": "yarn workspaces foreach run clean && npx rimraf .build-cache",
"nuke": "yarn workspaces foreach run nuke && npx rimraf node_modules",
"typecheck": "yarn workspaces foreach run typecheck",
"lint": "yarn workspaces foreach run lint",
"typecheck": "echo 'Starting typecheck...' && yarn workspaces foreach run typecheck",
"lint": "echo 'Starting lint...' && yarn workspaces foreach run lint",
"lint:fix": "yarn workspaces foreach run lint --fix",
"format": "yarn workspaces foreach run format",
"dev": "yarn workspace @corona-dashboard/app dev",
"download": "yarn workspace @corona-dashboard/app download",
"start": "yarn workspace @corona-dashboard/app start",
"check-all": "yarn lint && yarn typecheck && yarn validate-json-all && yarn test",
"validate-json-all": "yarn workspace @corona-dashboard/cli validate-json-all",
"validate-json-single": "yarn workspace @corona-dashboard/cli validate-json-single",
"validate-last-values": "yarn workspace @corona-dashboard/cli validate-last-values",
"validate-features": "yarn workspace @corona-dashboard/cli validate-features",
"generate-typescript": "yarn workspace @corona-dashboard/cli generate-typescript",
"generate-data-types": "yarn workspace @corona-dashboard/cli generate-data-types",
"e2e": "yarn workspace @corona-dashboard/e2e e2e",
"e2e:ci": "yarn workspace @corona-dashboard/e2e e2e:ci",
"cms": "yarn workspace @corona-dashboard/cms dev"
"cms": "yarn workspace @corona-dashboard/cms dev",
"cms:lokalize-import": "yarn workspace @corona-dashboard/cms lokalize:import",
"cms:lokalize-import:prd": "yarn workspace @corona-dashboard/cms lokalize:import --dataset=production",
"cms:apply-json-edits": "yarn workspace @corona-dashboard/cms lokalize:apply-json-edits",
"cms:generate-types": "yarn workspace @corona-dashboard/cms lokalize:generate-types",
"cms:sync-after-release": "yarn workspace @corona-dashboard/cms lokalize:sync-after-release",
"cms:deploy": "yarn workspace @corona-dashboard/cms deploy",
"build:app": "yarn workspace @corona-dashboard/app build",
"build:common": "yarn workspace @corona-dashboard/common build",
"build:icons": "yarn workspace @corona-dashboard/icons build"
},
"workspaces": {
"packages": [
Expand Down
4 changes: 2 additions & 2 deletions packages/app/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ The "Lokalize" part of Sanity is exported and consumed by the app as JSON. You w
need to run this script regularly as an outdated JSON file will result in
compile or build-time errors.

`yarn workspace @corona-dashboard/cms lokalize:export`
`yarn cms:lokalize-import`

Alternatively you can run this from `packages/cms` as `yarn lokalize:export`
Alternatively you can run this from `packages/cms` as `yarn lokalize:import`

To learn more about the rationale behind Lokalize and how it works [read the documentation](/packages/cms/README.md#lokalize-texts).

Expand Down
5 changes: 5 additions & 0 deletions packages/app/next.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,11 @@ const nextConfig = {

async redirects() {
return [
{
source: '/over-risiconiveaus',
destination: '/',
permanent: false,
},
{
source: '/actueel',
destination: '/',
Expand Down
4 changes: 4 additions & 0 deletions packages/app/schema/nl/__index.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"title": "nl",
"required": [
"behavior",
"behavior_annotations",
"booster_and_third_shot_administered",
"booster_shot_administered",
"repeating_shot_administered",
Expand Down Expand Up @@ -177,6 +178,9 @@
"behavior_get_tested_support_per_age_group": {
"$ref": "behavior_get_tested_support_per_age_group.json"
},
"behavior_annotations": {
"$ref": "behavior_annotations.json"
},
"deceased_rivm": {
"$ref": "deceased_rivm.json"
},
Expand Down
Loading

0 comments on commit 722b4ed

Please sign in to comment.