Merge pull request #691 from lexicongovernance/develop

backmerge edge esmeralda features
lexicongovernance · Jul 22, 2024 · e5ea2a8 · e5ea2a8
2 parents 00e0773 + 948fabd
commit e5ea2a8
Show file tree

Hide file tree

Showing 91 changed files with 3,086 additions and 1,172 deletions.
diff --git a/.github/workflows/check-formatting.yml b/.github/workflows/check-formatting.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
           version: 8
       - name: Setup Node.js environment

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -20,7 +20,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - uses: pnpm/action-setup@v2
+      - uses: pnpm/action-setup@v4
         with:
           version: 8
       - name: Setup Node.js environment

diff --git a/package.json b/package.json
@@ -4,15 +4,12 @@
   "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "core:dev": "pnpm -r --filter core dev",
-    "core:build": "pnpm -r --filter core build",
-    "core:preview": "pnpm -r --filter core preview",
     "berlin:dev": "pnpm -r --filter berlin dev",
     "berlin:build": "pnpm -r --filter berlin build",
     "berlin:preview": "pnpm -r --filter berlin preview",
-    "format": "prettier --check \"packages/**/*.{ts,tsx,json,md}\"",
-    "format:fix": "prettier --write \"packages/**/*.{ts,tsx,json,md}\"",
-    "lint": "eslint ."
+    "format": "pnpm exec prettier --check \"packages/**/*.{ts,tsx,json,md}\"",
+    "format:fix": "pnpm exec prettier --write \"packages/**/*.{ts,tsx,json,md}\"",
+    "lint": "pnpm exec eslint ."
   },
   "keywords": [],
   "author": "",
@@ -27,13 +24,18 @@
     "@pcd/semaphore-identity-pcd": "^0.8.0",
     "@pcd/semaphore-signature-pcd": "^0.9.0",
     "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-icons": "^1.3.0",
     "@tanstack/react-query": "^5.13.4",
     "@tanstack/react-query-devtools": "^5.13.5",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.0",
+    "lucide-react": "^0.397.0",
     "react": "^18.2.0",
     "react-content-loader": "^7.0.0",
     "react-dom": "^18.2.0",
     "react-hook-form": "^7.49.3",
     "react-hot-toast": "^2.4.1",
+    "react-joyride": "^2.8.2",
     "react-markdown": "^9.0.1",
     "react-router-dom": "^6.20.1",
     "styled-components": "^6.1.1",
@@ -43,6 +45,7 @@
   "devDependencies": {
     "@hookform/devtools": "^4.3.1",
     "@tanstack/eslint-plugin-query": "^5.18.0",
+    "@types/node": "^20.12.4",
     "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.15",
     "@typescript-eslint/eslint-plugin": "^6.19.0",
@@ -57,4 +60,4 @@
     "vite": "^5.0.0",
     "vite-plugin-node-polyfills": "^0.17.0"
   }
-}
+}
diff --git a/packages/berlin/components.json b/packages/berlin/components.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://ui.shadcn.com/schema.json",
+  "style": "new-york",
+  "rsc": true,
+  "tsx": true,
+  "tailwind": {
+    "config": "tailwind.config.js",
+    "css": "src/index.css",
+    "baseColor": "slate",
+    "cssVariables": true,
+    "prefix": ""
+  },
+  "aliases": {
+    "components": "@/_components",
+    "utils": "@/lib/utils"
+  }
+}
diff --git a/packages/berlin/index.html b/packages/berlin/index.html
@@ -12,9 +12,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <meta
       name="description"
-      content="Plural Research Experiment. An experiment in collective intelligence and innovation"
+      content="Tools built by Lexicon Governance"
     />
-    <title>Plural Research Experiment</title>
+    <title>Plurality Demo</title>
   </head>
   <body>
     <div id="root"></div>

diff --git a/packages/berlin/package.json b/packages/berlin/package.json
@@ -6,12 +6,42 @@
   "scripts": {
     "dev": "vite",
     "build": "vite build",
-    "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
-    "format": "npx prettier . --write",
+    "lint": "pnpm exec eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
+    "format": "pnpm exec prettier --check \"src/**/*.{ts,md}\"",
+    "format:fix": "pnpm exec prettier --write \"src/**/*.{ts,md}\"",
     "preview": "vite preview"
   },
   "dependencies": {
+    "@radix-ui/react-dialog": "^1.0.5",
+    "@radix-ui/react-icons": "^1.3.0",
+    "@radix-ui/react-navigation-menu": "^1.2.0",
+    "@radix-ui/react-popover": "^1.0.7",
+    "@radix-ui/react-separator": "^1.1.0",
+    "@radix-ui/react-slot": "^1.0.2",
     "api": "workspace:*",
+    "class-variance-authority": "^0.7.0",
+    "clsx": "^2.1.0",
+    "cmdk": "^1.0.0",
+    "lucide-react": "^0.397.0",
+    "tailwind-merge": "^2.2.2",
+    "tailwindcss-animate": "^1.0.7",
     "ui": "workspace:*"
+  },
+  "devDependencies": {
+    "@types/node": "^20.12.4",
+    "@types/react-dom": "^18.2.22",
+    "@types/react": "^18.3.3",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
+    "@vitejs/plugin-react": "^4.2.1",
+    "autoprefixer": "^10.4.19",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-react-refresh": "^0.4.6",
+    "eslint": "^8.57.0",
+    "postcss-cli": "^11.0.0",
+    "postcss": "^8.4.38",
+    "tailwindcss": "^3.4.3",
+    "vite-plugin-dts": "^3.8.1",
+    "vite": "^5.2.0"
   }
 }
diff --git a/packages/berlin/postcss.config.js b/packages/berlin/postcss.config.js
@@ -0,0 +1,6 @@
+export default {
+  plugins: {
+    tailwindcss: {},
+    autoprefixer: {},
+  },
+};
diff --git a/packages/berlin/public/favicon.ico b/packages/berlin/public/favicon.ico
diff --git a/packages/berlin/public/icons/arrow-back-dark.svg b/packages/berlin/public/icons/arrow-back-dark.svg
diff --git a/packages/berlin/public/icons/arrow-back-light.svg b/packages/berlin/public/icons/arrow-back-light.svg
diff --git a/packages/berlin/public/icons/badge-bronze.svg b/packages/berlin/public/icons/badge-bronze.svg
diff --git a/packages/berlin/public/icons/badge-gold.svg b/packages/berlin/public/icons/badge-gold.svg
diff --git a/packages/berlin/public/icons/badge-silver.svg b/packages/berlin/public/icons/badge-silver.svg
diff --git a/packages/berlin/public/icons/comments-dark.svg b/packages/berlin/public/icons/comments-dark.svg
diff --git a/packages/berlin/public/icons/comments-light.svg b/packages/berlin/public/icons/comments-light.svg
diff --git a/packages/berlin/public/icons/copy-dark.svg b/packages/berlin/public/icons/copy-dark.svg
diff --git a/packages/berlin/public/icons/copy-light.svg b/packages/berlin/public/icons/copy-light.svg
diff --git a/packages/berlin/public/icons/decentralized.svg b/packages/berlin/public/icons/decentralized.svg
diff --git a/packages/berlin/public/icons/filter-dark.svg b/packages/berlin/public/icons/filter-dark.svg
diff --git a/packages/berlin/public/icons/filter-light.svg b/packages/berlin/public/icons/filter-light.svg
diff --git a/packages/berlin/public/icons/heart-empty.svg b/packages/berlin/public/icons/heart-empty.svg