Merge dev into production

.github/workflows/netlify-cms-auth.yml

@@ -3,7 +3,8 @@ name: Build and Deploy Netlify CMS Auth
 on:
   push:
     branches:
-      - deploy/netlify-cms-auth
+    - deploy/netlify-cms-auth
+  workflow_dispatch:
 
 jobs:
   build_and_deploy:

.github/workflows/netlify-cms.yml

@@ -8,7 +8,7 @@ jobs:
     name: Build and Deploy
     environment:
       name: Netlify CMS ${{ github.ref_name }}
-      url: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-netlify-cms.pages.dev
+      url: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-netlify-cms-byd.pages.dev
     permissions:
       contents: read
       deployments: write
@@ -47,10 +47,11 @@ jobs:
       - name: Build Netlify CMS
         run: yarn workspace @starknet-io/netlify-cms build
         env:
-          VITE_LIVE_PREVIEW_URL: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-website.pages.dev
+          VITE_LIVE_PREVIEW_URL: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-websites.pages.dev
           VITE_GIT_BRANCH_NAME: ${{ github.ref_name }}
-          VITE_API_BASE_URL: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-website.pages.dev/api
-          VITE_DATA_URL: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-website.pages.dev/data
+          VITE_API_BASE_URL: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-websites.pages.dev/api
+          VITE_DATA_URL: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-websites.pages.dev/data
+          VITE_BACKEND_AUTH_URL: https://netlify-cms-auth.haim-6b2.workers.dev
 
       - name: Deploy Netlify CMS
         uses: cloudflare/pages-action@1
@@ -60,4 +61,4 @@ jobs:
           projectName: starknet-netlify-cms
           directory: workspaces/netlify-cms/dist
           gitHubToken: ${{ secrets.GITHUB_TOKEN }}
-          branch: ${{ github.ref_name }}
+          branch: main

.github/workflows/website.yml

@@ -64,17 +64,17 @@ jobs:
           VITE_ALGOLIA_INDEX: ${{ github.ref_name == 'production' && 'production' || 'dev' }}
           VITE_ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
           VITE_ALGOLIA_SEARCH_API_KEY: ${{ secrets.ALGOLIA_SEARCH_API_KEY }}
-          VITE_CF_STREAM_URL: ${{ secrets.NEW_CF_STREAM_URL }}
-          VITE_ED_VIDEO_ID_1: ${{ secrets.NEW_VITE_ED_VIDEO_ID_1 }}
-          VITE_ED_VIDEO_ID_2: ${{ secrets.NEW_VITE_ED_VIDEO_ID_2 }}
-          VITE_ED_VIDEO_ID_3: ${{ secrets.NEW_VITE_ED_VIDEO_ID_3 }}
-          VITE_ED_VIDEO_ID_4: ${{ secrets.NEW_VITE_ED_VIDEO_ID_4 }}
+          VITE_CF_STREAM_URL: ${{ secrets.CF_STREAM_URL }}
+          VITE_ED_VIDEO_ID_1: ${{ secrets.VITE_ED_VIDEO_ID_1 }}
+          VITE_ED_VIDEO_ID_2: ${{ secrets.VITE_ED_VIDEO_ID_2 }}
+          VITE_ED_VIDEO_ID_3: ${{ secrets.VITE_ED_VIDEO_ID_3 }}
+          VITE_ED_VIDEO_ID_4: ${{ secrets.VITE_ED_VIDEO_ID_4 }}
 
       - name: Publish
         uses: cloudflare/pages-action@v1
         with:
-          apiToken: ${{ secrets.NEW_CLOUDFLARE_API_TOKEN }}
-          accountId: ${{ secrets.NEW_CLOUDFLARE_ACCOUNT_ID }}
+          apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
+          accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
           projectName: starknet-websites
           directory: dist/client
           workingDirectory: workspaces/website

_data/pages/online-communities.yml

@@ -112,6 +112,10 @@ blocks:
           hasIcon: true
           custom_title: Starknet Ecosystem
           custom_external_link: https://twitter.com/StarknetEco
+      - link:
+          hasIcon: true
+          custom_title: Starknet France
+          custom_external_link: https://twitter.com/StarknetFr
       - link:
           hasIcon: true
           custom_title: "Starknet Gaming "

workspaces/cms-config/src/main.ts

@@ -12,7 +12,7 @@ export const CMSConfig = {
     name: "github-yuki",
     repo: "starknet-io/starknet-website",
     branch: "dev",
-    base_url: "https://netlify-cms-auth.yukilabs.workers.dev",
+    base_url: "https://netlify-cms-auth.haim-6b2.workers.dev",
     preview_context: "Vercel – starknet-website",
   },
   publish_mode: "editorial_workflow",

workspaces/netlify-cms-auth/src/callback.ts

@@ -62,6 +62,8 @@ function postMessageHTML({ status, data }: PostMessageHTMLArgs) {
         const allowedOrigin = (
           message.origin === 'http://localhost:1234' ||
           message.origin === 'http://127.0.0.1:1234' ||
+          message.origin === 'https://starknet-netlify-cms-byd.pages.dev' ||
+          /^https:\\/\\/[-_\\w]+\\.starknet-netlify-cms-byd\\.pages\\.dev$/.test(message.origin) ||
           /^https:\\/\\/[-_\\w]+\\.starknet-netlify-cms\\.pages\\.dev$/.test(message.origin)
         );
 

workspaces/netlify-cms-auth/src/env.ts

@@ -1,4 +1,4 @@
 export interface Env {
-  OAUTH_GITHUB_CLIENT_ID: string
-  OAUTH_GITHUB_CLIENT_SECRET: string
+  OAUTH_GITHUB_CLIENT_ID: string;
+  OAUTH_GITHUB_CLIENT_SECRET: string;
 }

workspaces/netlify-cms/src/App.tsx

@@ -110,6 +110,8 @@ export default function App() {
         backend: {
           ...CMSConfig.backend,
           branch,
+          base_url:
+          import.meta.env.VITE_BACKEND_AUTH_URL || CMSConfig.backend.base_url,
         },
       },
     });

workspaces/website/src/components/Button/ButtonStyles.ts

@@ -19,7 +19,7 @@ const outline = defineStyle({
     borderColor: "grey.morning",
     _dark: {
       color: "selected.100"
-    }
+    },
   },
   _active: {
     bg: "bg.200",