Merge branch 'develop' into docs/cli-github-actions

.github/actions/spell-checker/ignore_words.txt

@@ -3,6 +3,7 @@
 2fa
 8f
 8fdevelop
+abi
 abtesting
 ach
 activedirectory
@@ -182,9 +183,9 @@ ipaddress
 ipfs
 ipns
 iq
+ir
 iran
 iraq
-ir
 isr
 january
 javascript
@@ -262,8 +263,8 @@ object-oriented
 objects
 ofac
 ok
-onboarding
 onboarded
+onboarding
 onchain
 online
 openssl
@@ -343,10 +344,11 @@ roguelike
 rollup
 rollups
 rsa
+ru
 ruby
 russia
-ru
 s3
+saas
 saml
 sandbox
 sanitizer
@@ -409,11 +411,11 @@ sunsetting
 svg
 swift
 swiss
+sy
 syria
 syslog
 system-admin
 systemctl
-sy
 table
 tag
 tags
@@ -429,6 +431,7 @@ thursday’s
 tld
 tls
 token
+toolset
 tooltip
 tooltips
 totp
@@ -517,4 +520,4 @@ zendesk's
 zero-trust
 zimbabwe
 zip
-zw
+zw

.github/workflows/release-by-develop-hash.yml

@@ -21,8 +21,8 @@ jobs:
   merge-by-develop-hash:
     runs-on: ubuntu-latest
     env:
-      RELEASE_BRANCH: "main"
-      PREPARE_RELEASE_BRANCH: "prepare_release"
+      RELEASE_BRANCH: main
+      PREPARE_RELEASE_BRANCH: prepare_release
     steps:
     - name: Date safe-guard verification
       run: |
@@ -117,13 +117,15 @@ jobs:
 
     - name: Dispatch Event
       env:
-        PAT: ${{ secrets.PAT }}
+        PAT: ${{ secrets.GITHUB_TOKEN }}
         ENDPOINT: 'https://api.github.com/repos/fleek-platform/website/dispatches'
-        EVENT_NAME: 'release-by-develop-hash-completed'
+        EVENT_NAME: 'Release'
       run: |
         if ! curl -H "Accept: application/vnd.github+json" \
           -H "Authorization: token $PAT" \
           --request POST \
-          --data '{ "event_type": "$EVENT_NAME" }' $ENDPOINT; then
+          --data "{ \"event_type\": \"$EVENT_NAME\" }" $ENDPOINT; then
           echo "⚠️ Warning: Failed to dispatch $EVENT_NAME. Since this triggers the indexer listener, you should dispatch the action manually. If this issue persists, report it internally."
+        else
+          echo "✅ Dispatched event $EVENT_NAME"
         fi

.github/workflows/search-indexer.yml

@@ -1,16 +1,21 @@
 name: 🚜 Search (Indexer)
 on:
   repository_dispatch:
-    types: release-by-develop-hash-completed
+    types: Release
+  workflow_dispatch:
 
 jobs:
   meilisearch:
     name: MeiliSearch Service
     runs-on: ubuntu-latest
+    env:
+      RELEASE_BRANCH: main
     environment: production
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v4
+        with:
+          ref: ${{ env.RELEASE_BRANCH }}
 
       - name: Install Dependencies
         run: npm ci
@@ -56,3 +61,10 @@ jobs:
         env:
           PRIVATE_MEILISEARCH_DOCUMENTS_ADMIN_API_KEY: ${{ secrets.PRIVATE_MEILISEARCH_DOCUMENTS_ADMIN_API_KEY}}
           PUBLIC_MEILISEARCH_HOST: ${{ vars.PUBLIC_MEILISEARCH_HOST }}
+
+      - name: Billing Indexation
+        run: |
+          npm run search:index_billing
+        env:
+          PRIVATE_MEILISEARCH_DOCUMENTS_ADMIN_API_KEY: ${{ secrets.PRIVATE_MEILISEARCH_DOCUMENTS_ADMIN_API_KEY}}
+          PUBLIC_MEILISEARCH_HOST: ${{ vars.PUBLIC_MEILISEARCH_HOST }}

.tailwind/tailwind.custom.config.mjs

@@ -81,11 +81,21 @@ export default function (usePx) {
             "100%": {
               transform: "rotate(-9deg)",
             },
-          }
+          },
+          'fade-in': {
+            '0%': { opacity: 0 },
+            '100%': { opacity: 1 },
+          },
+          'fade-in-down': {
+            '0%': { transform: 'translateY(2%)', opacity: 0 },
+            '100%': { transform: 'translateY(0)', opacity: 1 },
+          },
         },
         animation: {
           "blur-out": "blur 0.6s ease-out",
           "rock": "rock 1.2s infinite",
+          'fade-in': 'fade-in 100ms ease-out',
+          'fade-in-down': 'fade-in-down 120ms ease-out',
         },
       },
     },

README.md

@@ -45,12 +45,13 @@ This repository contains the source code and assets for the Fleek.xyz website, w
         - [Production Service Setup](#production-service-setup)
       - [Search](#🔎-search)
         - [Health Check](#health-check)
-        - [Indexer](#indexer)
+      - [Indexer](#indexer)
         - [Put markdown content](#put-markdown-content-development)
         - [Query via cURL](#query-via-curl)
         - [Multi-Index Search](#multi-index-search)
         - [Delete Indexes](#💣-delete-indexes)
-        - [Images (optimization)](#-images-optimization)
+        - [Manual Indexation](#manual-indexation-cicd)
+      - [Images (optimization)](#-images-optimization)
 - [Migration](#-migration)
     - [Migrate Gatsby content](#migrate-gatsby-content)
 - [Custom data](#custom-data)
@@ -845,7 +846,7 @@ curl \
   -X GET '<PROTOCOL>://<ADDRESS>:<PORT>/health'
 ```
 
-### Indexer
+## Indexer
 
 The Indexer's job referred to as indexation is the process of organizing and storing data in a structured manner to facilitate efficient search and retrieval.
 
@@ -928,6 +929,16 @@ npm run search:serve
 
 ⚠️ You'll see a warning message "No master key was found" that can be ignored for local environment development work. If for some reason you want to have a master key, modify the `search:serve` script to include it.
 
+### Manual Indexation (CI/CD)
+
+The indexation service should trigger on `push` to `main` branch. Alternatively, the repo admin can trigger the job manually.
+
+1) Open the Job runner [here](https://github.com/fleek-platform/website/actions/workflows/search-indexer.yml)
+
+2) Locate the row "This workflow has a workflow_dispatch event trigger." and open the **Run workflow** dropdown. In the option "Use workflow from" select `main` branch.
+
+The Job will index data that exists in the selected `main` branch. Learn how to release to production (main branch) [here](#🚀-release-to-production).
+
 ## 📸 Images (Optimization)
 
 The build process can optimize the images but that requires the user to use the correct image components. Use the instructions provided to optimize the images.

Services/ProxyServer/DeprecatedContentSitesRedirect/README.md

@@ -170,3 +170,26 @@ Ref:
 
 - Nginx location match tester
   https://nginx.viraptor.info
+
+## Certificate auto-renewal
+
+The certificates are auto-renewed by the certbot process. Cronjob's are located at:
+
+```
+/etc/cron.d/certbot
+```
+
+Here's an example of a `renew_hook`, for Lets Encrypt renewal.
+
+```sh
+# Trigger when renew successful
+renew_hook = systemctl reload nginx
+```
+
+The configuration file is located at `/etc/letsencrypt/renewal/docs.fleek.xyz.conf`.
+
+Alternatively, executable scripts can be stored in:
+
+```
+/etc/letsencrypt/renewal-hooks/deploy/
+```

package.json

@@ -61,10 +61,12 @@
     "@types/react": "^18.2.74",
     "@types/react-dom": "^18.2.24",
     "astro": "^4.15.3",
+    "class-variance-authority": "^0.7.0",
     "framer-motion": "^11.0.24",
     "hono": "^4.4.11",
     "lodash-es": "^4.17.21",
     "pixi.js": "^7.2.4",
+    "posthog-js": "^1.165.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-fast-marquee": "^1.6.4",
@@ -75,6 +77,7 @@
     "rehype-pretty-code": "^0.13.1",
     "remark-directive": "^3.0.0",
     "swiper": "^11.1.0",
+    "tailwind-merge": "^2.5.2",
     "tailwindcss": "^3.4.3",
     "typescript": "^5.4.3"
   },