Skip to content

Commit

Permalink
Merge branch 'develop' into next-streamline
Browse files Browse the repository at this point in the history
  • Loading branch information
camilovegag committed Jul 16, 2024
2 parents a7679c1 + 9df6d67 commit 69112cb
Show file tree
Hide file tree
Showing 68 changed files with 5,077 additions and 1,920 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/check-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 7 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,12 @@
"@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",
"lucide-react": "^0.395.0",
"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",
Expand All @@ -41,6 +44,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",
Expand All @@ -51,8 +55,8 @@
"eslint-plugin-react-hooks": "^4.6.0",
"eslint-plugin-react-refresh": "^0.4.4",
"prettier": "^3.1.1",
"typescript": "^5.2.2",
"typescript": "^5.5.2",
"vite": "^5.0.0",
"vite-plugin-node-polyfills": "^0.17.0"
}
}
}
17 changes: 17 additions & 0 deletions packages/berlin/components.json
Original file line number Diff line number Diff line change
@@ -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"
}
}
29 changes: 29 additions & 0 deletions packages/berlin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,36 @@
"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"
}
}
6 changes: 6 additions & 0 deletions packages/berlin/postcss.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export default {
plugins: {
tailwindcss: {},
autoprefixer: {},
},
};
3 changes: 0 additions & 3 deletions packages/berlin/public/icons/arrow-back-dark.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/berlin/public/icons/arrow-back-light.svg

This file was deleted.

10 changes: 0 additions & 10 deletions packages/berlin/public/icons/badge-bronze.svg

This file was deleted.

10 changes: 0 additions & 10 deletions packages/berlin/public/icons/badge-gold.svg

This file was deleted.

10 changes: 0 additions & 10 deletions packages/berlin/public/icons/badge-silver.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/berlin/public/icons/comments-dark.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/berlin/public/icons/comments-light.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/berlin/public/icons/copy-dark.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/berlin/public/icons/copy-light.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/berlin/public/icons/decentralized.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/berlin/public/icons/filter-dark.svg

This file was deleted.

3 changes: 0 additions & 3 deletions packages/berlin/public/icons/filter-light.svg

This file was deleted.

61 changes: 0 additions & 61 deletions packages/berlin/public/icons/heart-empty.svg

This file was deleted.

59 changes: 0 additions & 59 deletions packages/berlin/public/icons/heart-full.svg

This file was deleted.

Loading

0 comments on commit 69112cb

Please sign in to comment.