Merge branch 'main' into lvonlanthen/techstack-page

socialincome-san · Jan 24, 2025 · 5b19288 · 5b19288
2 parents cd6a1bd + 79b50af
commit 5b19288
Show file tree

Hide file tree

Showing 93 changed files with 6,155 additions and 835 deletions.
diff --git a/.github/workflows/actions/init/action.yml b/.github/workflows/actions/init/action.yml
@@ -24,10 +24,10 @@ runs:
         cache: npm
         cache-dependency-path: package-lock.json
 
-    - name: Install and set up firebase-tools
+    - name: Install and set up vercel & firebase-tools
       shell: bash
       run: |
-        npm -g install [email protected] && \
+        npm -g install [email protected] [email protected] && \
         firebase setup:emulators:firestore && \
         firebase setup:emulators:storage && \
         firebase setup:emulators:ui

diff --git a/.github/workflows/deploy-storybook.yml b/.github/workflows/deploy-storybook.yml
@@ -0,0 +1,55 @@
+name: Deploy Storybook to GitHub Pages
+
+on:
+  push:
+    branches:
+      - main # Or your default branch name
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment
+concurrency:
+  group: "pages"
+  cancel-in-progress: true
+
+jobs:
+  build-and-deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Read .nvmrc
+        id: nvm
+        run: echo "NVMRC=$(cat '.nvmrc')" >> $GITHUB_OUTPUT
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ steps.nvm.outputs.NVMRC }}
+          cache: "npm"
+
+      - name: Install Dependencies
+        run: npm ci
+
+      - name: Build Storybook
+        run: npm run ui:build
+
+      - name: Setup Pages
+        uses: actions/configure-pages@v4
+
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ui/storybook-static
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/production-deployment.yml b/.github/workflows/production-deployment.yml
@@ -34,6 +34,7 @@ jobs:
     env:
       VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
       VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+      SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
     steps:
       - name: Checkout repository
         uses: actions/checkout@v3

diff --git a/admin/src/collections/Campaigns.ts b/admin/src/collections/Campaigns.ts
@@ -69,45 +69,35 @@ export const campaignsCollection = buildAuditedCollection<Campaign>({
 			multiline: true,
 		},
 		link_website: {
-			title: 'Website Link',
+			name: 'Website Link',
 			dataType: 'string',
 			validation: { required: false },
 			description: 'The link to the website (optional)',
 		},
 		link_instagram: {
-			title: 'Instagram Link',
+			name: 'Instagram Link',
 			dataType: 'string',
 			validation: { required: false },
 			description: 'The link to the Instagram profile (optional)',
 		},
 		link_tiktok: {
-			title: 'TikTok Link',
+			name: 'TikTok Link',
 			dataType: 'string',
 			validation: { required: false },
 			description: 'The link to the TikTok profile (optional)',
 		},
 		link_facebook: {
-			title: 'Facebook Link',
+			name: 'Facebook Link',
 			dataType: 'string',
 			validation: { required: false },
 			description: 'The link to the Facebook profile (optional)',
 		},
 		link_x: {
-			title: 'X (formerly Twitter) Link',
+			name: 'X (formerly Twitter) Link',
 			dataType: 'string',
 			validation: { required: false },
 			description: 'The link to the X profile (optional)',
 		},
-		amount_collected_chf: {
-			dataType: 'number',
-			name: 'Collected amount in CHF',
-			readOnly: true,
-		},
-		contributions: {
-			dataType: 'number',
-			name: 'Contributions',
-			readOnly: true,
-		},
 		goal: {
 			dataType: 'number',
 			name: 'Optional Fundraising Goal',
@@ -121,6 +111,12 @@ export const campaignsCollection = buildAuditedCollection<Campaign>({
 				EUR: 'EUR',
 			},
 		},
+		additional_amount_chf: {
+			dataType: 'number',
+			name: 'Additional Amount CHF',
+			description:
+				'Amount that is added to the amount raised (e.g. estimated amount that was donated because of the campaign, but not through the campaign page)',
+		},
 		end_date: {
 			// @ts-ignore
 			dataType: 'date',
@@ -150,9 +146,8 @@ export const campaignsCollection = buildAuditedCollection<Campaign>({
 			dataType: 'string',
 			name: 'Url Slug',
 			validation: {
-				required: true,
 				matches: /^[a-z0-9]+(?:-[a-z0-9]+)*$/,
-				matchMessage: 'Slug must contain only lowercase letters, numbers, and hyphens',
+				matchesMessage: 'Slug must contain only lowercase letters, numbers, and hyphens',
 			},
 			description:
 				'URL-friendly version of the title. Must be unique and contain only lowercase letters, numbers, and hyphens.',