Merge branch 'main' into admin-submenu-permission

.changeset/config.json

@@ -7,7 +7,15 @@
     "access": "restricted",
     "baseBranch": "main",
     "updateInternalDependencies": "patch",
-    "ignore": ["comet-storybook", "comet-demo-api", "comet-demo-admin", "comet-demo-site", "comet-docs"],
+    "ignore": [
+        "comet-storybook",
+        "comet-demo-api",
+        "comet-demo-admin",
+        "comet-demo-admin-server",
+        "comet-demo-site",
+        "comet-demo-site-pages",
+        "comet-docs"
+    ],
     "snapshot": {
         "useCalculatedVersion": true
     }

.env

@@ -31,48 +31,57 @@ S3_BUCKET=
 
 # imgproxy
 IMGPROXY_PORT=6080
-IMGPROXY_URL=http://localhost:$IMGPROXY_PORT
+IMGPROXY_URL=http://${DEV_DOMAIN:-localhost}:$IMGPROXY_PORT
 IMGPROXY_KEY=943b421c9eb07c830af81030552c86009268de4e532ba2ee2eab8247c6da0881
 IMGPROXY_SALT=520f986b998545b4785e0defbc4f3c1203f22de2374a3d53cb7a7fe9fea309c5
 IMGPROXY_USE_ABS=false
 IMGPROXY_USE_S3=false
 
 # api
 API_PORT=4000
-API_URL=http://localhost:$API_PORT
+API_URL=http://${DEV_DOMAIN:-localhost}:$API_PORT
 API_URL_INTERNAL=http://localhost:$API_PORT
-CORS_ALLOWED_ORIGINS="^http:\/\/localhost:\d+,^http://192.168.\d+.\d+:80[0-9]{2}"
+CORS_ALLOWED_ORIGINS="^http:\/\/localhost:\d+,.*\.dev\.vivid-planet\.cloud,^http://192.168.\d+.\d+:80[0-9]{2}"
+BASIC_AUTH_SYSTEM_USER_PASSWORD=password
 
 # blob storage
 BLOB_STORAGE_DRIVER="file"
 BLOB_STORAGE_DIRECTORY_PREFIX="comet-demo"
 
 # dam
 DAM_SECRET=6a9e8a185b513363bc89ec0b96eed8f70c759bc86b97319f60365c4b7f8593dc
-DAM_CDN_ENABLED="false"
-DAM_CDN_DOMAIN=
-DAM_CDN_ORIGIN_HEADER=
-DAM_DISABLE_CDN_ORIGIN_HEADER_CHECK=false
 
 # admin
 ADMIN_PORT=8000
-ADMIN_URL=http://localhost:$ADMIN_PORT
-SITES_CONFIG='{"main": {"url": "$SITE_URL", "preloginEnabled": false}, "secondary": {"url": "$SITE_URL", "preloginEnabled": false}}'
+ADMIN_URL=http://${DEV_DOMAIN:-localhost}:$ADMIN_PORT
+SITES_CONFIG='{"main": {"url": "$SITE_URL", "preloginEnabled": false}, "secondary": {"url": "$SITE_PAGES_URL", "preloginEnabled": false}}'
 
 # site
 SITE_PORT=3000
-SITE_URL=http://localhost:$SITE_PORT
+SITE_URL=http://${DEV_DOMAIN:-localhost}:$SITE_PORT
 SITE_PRELOGIN_ENABLED=false
 SITE_PRELOGIN_PASSWORD=password
-PREVIEW_URL=$SITE_URL/preview
-# no gtm in dev mode
-NEXT_PUBLIC_GTM_ID=
 NEXT_PUBLIC_SITE_DOMAIN=main
-NEXT_PUBLIC_SITE_LANGUAGES=en
+NEXT_PUBLIC_API_URL=$API_URL
+
+# site-pages
+SITE_PAGES_PORT=3001
+SITE_PAGES_URL=http://localhost:$SITE_PAGES_PORT
+SITE_PREVIEW_SECRET=zPoURKLHPcMnV7E9
+NEXT_PUBLIC_SITE_LANGUAGES=en,de
 NEXT_PUBLIC_SITE_DEFAULT_LANGUAGE=en
+NEXT_PUBLIC_SITE_PAGES_DOMAIN=secondary
 
 # jaegertracing
 JAEGER_UI_PORT=16686
 JAEGER_OLTP_PORT=4318
-TRACING_ENABLED=1
+TRACING=dev
+
+# file uploads
+FILE_UPLOADS_DOWNLOAD_SECRET=gPM8DTrrAdCMPYaNM99sH6hgtJfPWuEV
 
+# redis
+REDIS_ENABLED=true
+REDIS_PORT=6379
+REDIS_HOST=localhost
+REDIS_PASSWORD=vivid

.env.site-configs.tpl

@@ -0,0 +1,3 @@
+PRIVATE_SITE_CONFIGS='{{ site://configs/private/local }}'
+PUBLIC_SITE_CONFIGS='{{ site://configs/public/local }}'
+NEXT_PUBLIC_SITE_CONFIGS=$PUBLIC_SITE_CONFIGS

.github/pull_request_template.md

@@ -1,6 +1,118 @@
+<!--
 
+PLEASE MAKE SURE TO KEEP THE PR SIZE AT A MINIMUM!
+Smaller PRs are easier to review and tend to get merged faster.
+Unrelated changes, refactorings, fixes etc. should be made in separate PRs.
 
+--->
 
+## Description
 
+<!--
 
-- [ ] Add changeset (if necessary)
+The description should describe the change you're making.
+It will be used as the commit message for the squashed commit once the PR gets merged.
+Therefore, make sure to keep the description up-to-date as the PR changes.
+
+PLEASE DESCRIBE WHY YOU'RE MAKING THE CHANGE, NOT WHAT YOU'RE CHANGING.
+Reviewers see what you're changing when reviewing the code.
+However, they might not understand your motives as to why you're making the change.
+
+Your description should include:
+-   The problem you're facing
+-   Your solution to the problem
+-   An example usage of your change
+
+--->
+
+<!--
+
+Everything below this is intended to help ease reviewing this PR.
+Remove all unrelated sections.
+
+-->
+
+## Example
+
+<!--
+
+Make sure to provide an example of your change if your change includes a new API.
+
+This can be either:
+-   The implementation in Demo
+-   A dev story in Storybook
+-   A unit test
+
+--->
+
+-   [ ] I have verified if my change requires an example
+
+## Screenshots/screencasts
+
+<!--
+
+When making a visual change, please provide either screenshots or screencasts.
+
+Hint: For before/after views, you can use a table:
+
+| Before   | After   |
+| -------- | ------- |
+| Link     | Link    |
+
+-->
+
+## Changeset
+
+<!--
+
+When making a notable change, make sure to add a changeset.
+See [CONTRIBUTING.md](https://github.com/vivid-planet/comet/blob/HEAD/CONTRIBUTING.md) for more information.
+
+TL;DR
+
+Add a changeset when:
+-   changing the package's public API (`src/index.ts`)
+-   fixing a bug
+-   making a visual change
+
+Changeset writing guidelines:
+-   Use active voice: "Add new thing" vs. "A new thing is added"
+-   First line should be the title: "Add new alert component"
+-   Provide additional information in the description
+-   Use backticks to highlight code: Add new `Alert` component
+-   Use bold formatting for "headlines" in the description: **Example**
+
+--->
+
+-   [ ] I have verified if my change requires a changeset
+
+## Related tasks and documents
+
+<!--
+
+Link to related tasks and documents, for instance, https://vivid-planet.atlassian.net/browse/COM-XXX.
+
+MAKE SURE THAT EVERYTHING REQUIRED TO UNDERSTAND YOUR CHANGE IS IN THE PR DESCRIPTION.
+Reviewers shouldn't need to review tasks, JIRA conversations etc. to understand what you're doing.
+
+-->
+
+## Open TODOs/questions
+
+<!--
+
+-   [ ] Need to validate that this actually works
+-   [ ] Merge parent PR
+
+-->
+
+## Further information
+
+<!--
+
+Further information that helps reviewing the PR, for instance:
+-   Alternative solutions you have considered
+-   Dependent PRs
+-   Links to relevant documentation, blog posts etc.
+
+-->

.github/workflows/build-docs.yml

@@ -21,14 +21,12 @@ jobs:
         steps:
             - run: echo "${{ github.actor }}"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
 
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: 18
                   registry-url: "https://registry.npmjs.org"

.github/workflows/i18n.yml

@@ -11,33 +11,24 @@ jobs:
         steps:
             - run: echo "${{ github.actor }}"
 
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
               with:
                   token: ${{ secrets.GITHUB_TOKEN }}
             - run: |
                   git config user.name github-actions
                   git config user.email [email protected]
 
             - name: "Library: Clone translations"
-              uses: actions/checkout@v3
+              uses: actions/checkout@v4
               with:
                   repository: vivid-planet/comet-lang
                   token: ${{ secrets.VIVID_PLANET_BOT_TOKEN }}
                   path: "demo/admin/lang/comet-lang"
 
-            - name: "Demo: Clone translations"
-              uses: actions/checkout@v3
-              with:
-                  repository: vivid-planet/comet-demo-lang
-                  token: ${{ secrets.VIVID_PLANET_BOT_TOKEN }}
-                  path: "demo/admin/lang/comet-demo-lang"
-
-            - uses: pnpm/action-setup@v2
-              with:
-                  version: 8
+            - uses: pnpm/action-setup@v4
 
             - name: Use Node.js 18.x
-              uses: actions/setup-node@v3
+              uses: actions/setup-node@v4
               with:
                   node-version: 18
                   registry-url: "https://registry.npmjs.org"
@@ -50,18 +41,43 @@ jobs:
                   pnpm run intl:extract
                   cp -r lang/* demo/admin/lang/comet-lang/
 
-            - name: "Library: Update translateable strings"
+            - name: "Library: Update translatable strings"
               uses: EndBug/add-and-commit@v9
               with:
                   cwd: "./demo/admin/lang/comet-lang"
 
-            - name: "Demo: Extract i18n strings"
+            - name: "Demo Admin: Clone translations"
+              uses: actions/checkout@v4
+              with:
+                  repository: vivid-planet/comet-demo-lang
+                  token: ${{ secrets.VIVID_PLANET_BOT_TOKEN }}
+                  path: "demo/admin/lang/comet-demo-lang"
+
+            - name: "Demo Admin: Extract i18n strings"
               run: |
                   cd demo/admin
                   pnpm run intl:extract
-                  cp -r lang-extracted/* lang/comet-demo-lang
+                  cp -r lang-extracted/* lang/comet-demo-lang/admin
 
-            - name: "Demo: Update translateable strings"
+            - name: "Demo Admin: Update translatable strings"
               uses: EndBug/add-and-commit@v9
               with:
                   cwd: "./demo/admin/lang/comet-demo-lang"
+
+            - name: "Demo Site: Clone translations"
+              uses: actions/checkout@v4
+              with:
+                  repository: vivid-planet/comet-demo-lang
+                  token: ${{ secrets.VIVID_PLANET_BOT_TOKEN }}
+                  path: "demo/site/lang/comet-demo-lang"
+
+            - name: "Demo Site: Extract i18n strings"
+              run: |
+                  cd demo/site
+                  pnpm run intl:extract
+                  cp -r lang-extracted/* lang/comet-demo-lang/site
+
+            - name: "Demo Site: Update translatable strings"
+              uses: EndBug/add-and-commit@v9
+              with:
+                  cwd: "./demo/site/lang/comet-demo-lang"