Merge pull request #104 from marmelab/shadcn

Replace react admin with shadcn admin kit

Author: fzaninotto

.eslintrc.json

@@ -13,8 +13,47 @@ permissions:
     contents: write
 
 jobs:
-    deploy:
-        name: 🚀 Deploy
+    deploy-demo:
+        name: 🚀 Deploy (demo)
+        runs-on: ubuntu-latest
+        timeout-minutes: 10
+
+        env:
+            VITE_IS_DEMO: true
+            VITE_INBOUND_EMAIL: ${{ vars.VITE_INBOUND_EMAIL }}
+            PRODUCTION_REMOTE: https://git:${{ secrets.DEPLOY_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ vars.DEMO_DEPLOY_REPOSITORY }}
+
+        steps:
+            - name: 📥 Checkout repo
+              uses: actions/checkout@v4
+
+            - name: ⚙️ Setup node
+              uses: actions/setup-node@v4
+              with:
+                  node-version: 22
+                  cache: npm
+
+            - name: ⚙️ Setup git
+              run: |
+                  echo Deploying to pages to ${{ vars.DEMO_DEPLOY_REPOSITORY }}
+                  git remote set-url origin https://git:${{ secrets.DEPLOY_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ vars.DEMO_DEPLOY_REPOSITORY }}
+                  git remote add production $PRODUCTION_REMOTE
+                  git config --global user.email [email protected]
+                  git config --global user.name github-actions-bot
+
+            - name: 📥 Download deps
+              run: npm install
+
+            - name: 🔨 Build
+              run: npm run build:demo
+
+            - name: 📡 Deploy GitHub pages
+              run: npx gh-pages --remote production -d dist -b ${{ vars.DEPLOY_BRANCH || 'gh-pages' }}
+              env:
+                  GITHUB_TOKEN: ${{ secrets.DEPLOY_TOKEN || secrets.GITHUB_TOKEN }}
+
+    deploy-supabase:
+        name: 🚀 Deploy (supabase)
         runs-on: ubuntu-latest
         timeout-minutes: 10
 
@@ -27,7 +66,7 @@ jobs:
             IS_SUPABASE_CONFIGURED: ${{ secrets.SUPABASE_ACCESS_TOKEN && secrets.SUPABASE_DB_PASSWORD && secrets.SUPABASE_PROJECT_ID && secrets.SUPABASE_URL && secrets.SUPABASE_ANON_KEY }}
             VITE_IS_DEMO: ${{ vars.VITE_IS_DEMO }}
             VITE_INBOUND_EMAIL: ${{ vars.VITE_INBOUND_EMAIL }}
-            PRODUCTION_REMOTE: https://git:${{ secrets.DEPLOY_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ vars.DEPLOY_REPOSITORY || github.repository }}
+            PRODUCTION_REMOTE: https://git:${{ secrets.DEPLOY_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ vars.DEPLOY_REPOSITORY }}
             POSTMARK_WEBHOOK_USER: ${{secrets.POSTMARK_WEBHOOK_USER}}
             POSTMARK_WEBHOOK_PASSWORD: ${{secrets.POSTMARK_WEBHOOK_PASSWORD}}
             POSTMARK_WEBHOOK_AUTHORIZED_IPS: ${{secrets.POSTMARK_WEBHOOK_AUTHORIZED_IPS}}
@@ -39,13 +78,13 @@ jobs:
             - name: ⚙️ Setup node
               uses: actions/setup-node@v4
               with:
-                  node-version: 20
+                  node-version: 22
                   cache: npm
 
             - name: ⚙️ Setup git
               run: |
-                  echo Deploying to pages to $PRODUCTION_REMOTE
-                  git remote set-url origin https://git:${{ secrets.GITHUB_TOKEN }}@github.com/${GITHUB_REPOSITORY}
+                  echo Deploying to pages to ${{ vars.DEPLOY_REPOSITORY }}
+                  git remote set-url origin https://git:${{ secrets.DEPLOY_TOKEN || secrets.GITHUB_TOKEN }}@github.com/${{ vars.DEPLOY_REPOSITORY }}
                   git remote add production $PRODUCTION_REMOTE
                   git config --global user.email [email protected]
                   git config --global user.name github-actions-bot
@@ -58,7 +97,7 @@ jobs:
 
             - name: 🔨 Build
               run: npm run build
-            
+
             - if: ${{ env.IS_SUPABASE_CONFIGURED }}
               name: 🔗 Supabase Link
               run: npx supabase link --project-ref $SUPABASE_PROJECT_ID

.github/workflows/deploy.yml

@@ -1,5 +1,10 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
+# editors
+.idea/
+*.iml
+.vscode/
+
 # dependencies
 /node_modules
 
@@ -25,6 +30,6 @@ supabase/.branches
 supabase/.temp
 
 dist/
-lib/
+/lib/
 .env
-*storybook.log
+*storybook.log

.gitignore

@@ -1 +1 @@
-v20
+v22

.nvmrc

@@ -1,15 +1 @@
-export default {
-    arrowParens: 'avoid',
-    bracketSpacing: true,
-    bracketSameLine: false,
-    jsxSingleQuote: false,
-    printWidth: 80,
-    quoteProps: 'as-needed',
-    rangeStart: 0,
-    rangeEnd: Infinity,
-    semi: true,
-    singleQuote: true,
-    tabWidth: 4,
-    trailingComma: 'es5',
-    useTabs: false,
-};
+export default {};

.prettierrc.mjs

@@ -1,10 +1,10 @@
 # Atomic CRM
 
-A full-featured CRM built with React, react-admin, and Supabase.
+A full-featured CRM built with React, shadcn-admin-kit, and Supabase.
 
-https://user-images.githubusercontent.com/99944/116970434-4a926480-acb8-11eb-8ce2-0602c680e45e.mp4
+https://github.com/user-attachments/assets/0d7554b5-49ef-41c6-bcc9-a76214fc5c99
 
-Atomic CRM is free and open-source. You can test it online at https://marmelab.com/react-admin-crm.
+Atomic CRM is free and open-source. You can test it online at https://marmelab.com/atomic-crm-demo.
 
 ## Features
 
@@ -24,7 +24,7 @@ Atomic CRM is free and open-source. You can test it online at https://marmelab.c
 To run this project locally, you will need the following tools installed on your computer:
 
 - Make
-- Node 20 LTS
+- Node 22 LTS
 - Docker (required by Supabase)
 
 Fork the [`marmelab/atomic-crm`](https://github.com/marmelab/atomic-crm) repository to your user/organization, then clone it locally:

.storybook/main.ts

@@ -0,0 +1,21 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": false,
+  "tsx": true,
+  "tailwind": {
+    "config": "",
+    "css": "src/index.css",
+    "baseColor": "neutral",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "aliases": {
+    "components": "@/components",
+    "utils": "@/lib/utils",
+    "ui": "@/components/ui",
+    "lib": "@/lib",
+    "hooks": "@/hooks"
+  },
+  "iconLibrary": "lucide"
+}