Merge pull request #38 from BreadchainCoop/development

Development
BreadchainCoop · Jun 4, 2024 · 598d64a · 598d64a
2 parents 17776ae + 71936c5
commit 598d64a
Show file tree

Hide file tree

Showing 71 changed files with 15,932 additions and 2,894 deletions.
diff --git a/.github/workflows/old-website.yml b/.github/workflows/old-website.yml
@@ -0,0 +1,126 @@
+name: Website CI OLD
+on:
+  workflow_dispatch:
+  pull_request:
+    branches:
+      - main
+      - development
+    paths:
+      - "apps/site/**"
+      - "packages/theme/**"
+      - "packages/site-ui/**"
+  push:
+    branches:
+      - main
+      - development
+    paths:
+      - "apps/site/**"
+      - "packages/theme/**"
+      - "packages/site-ui/**"
+
+jobs:
+  linting:
+    name: ESLint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8.8.0
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: "pnpm"
+
+      - name: Install Dependencies
+        run: pnpm site install
+
+      - name: Lint
+        run: pnpm site run lint
+
+  build:
+    name: Next Build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8.8.0
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: "pnpm"
+          # run: pnpm site install
+
+      # - name: Setup pnpm
+      #   uses: pnpm/action-setup@v2
+      #   with:
+      #     version: 8.8.0
+
+      - name: Install Dependencies
+        run: pnpm site install
+
+      - name: Run build
+        run: pnpm site run build
+
+  test:
+    name: Playwright Tests
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repo
+        uses: actions/checkout@v3
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 8.8.0
+
+      - name: Setup node
+        uses: actions/setup-node@v3
+        with:
+          node-version: 20
+          cache: "pnpm"
+          # run: pnpm site install
+
+      - name: Install Dependencies
+        run: pnpm site install
+
+      - name: Run build
+        run: pnpm site run build
+
+      # - name: Get pnpm store directory
+      #   id: pnpm-cache
+      #   shell: bash
+      #   run: |
+      #     echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
+
+      # - uses: actions/cache@v3
+      #   name: Setup pnpm cache
+      #   with:
+      #     path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
+      #     key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+      #     restore-keys: |
+      #       ${{ runner.os }}-pnpm-store-
+
+      - name: Install Playwright Browsers
+        run: pnpm site playwright install --with-deps
+
+      - name: Run Playwright tests
+        run: pnpm site playwright test
+
+      - uses: actions/upload-artifact@v3
+        if: always()
+        with:
+          name: playwright-report
+          path: apps/site/playwright-report/
+          retention-days: 30
diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml
@@ -6,17 +6,17 @@ on:
       - main
       - development
     paths:
-      - "apps/site/**"
+      - "apps/website/**"
       - "packages/theme/**"
-      - "packages/site-ui/**"
+      - "packages/shared/**"
   push:
     branches:
       - main
       - development
     paths:
-      - "apps/site/**"
+      - "apps/website/**"
       - "packages/theme/**"
-      - "packages/site-ui/**"
+      - "packages/shared/**"
 
 jobs:
   linting:
@@ -38,13 +38,13 @@ jobs:
           cache: "pnpm"
 
       - name: Install Dependencies
-        run: pnpm site install
+        run: pnpm website install
 
       - name: Lint
-        run: pnpm site run lint
+        run: pnpm website run lint
 
   build:
-    name: Next Build
+    name: Astro Build
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repo
@@ -60,67 +60,46 @@ jobs:
         with:
           node-version: 20
           cache: "pnpm"
-          # run: pnpm site install
-
-      # - name: Setup pnpm
-      #   uses: pnpm/action-setup@v2
-      #   with:
-      #     version: 8.8.0
-
-      - name: Install Dependencies
-        run: pnpm site install
-
-      - name: Run build
-        run: pnpm site run build
-
-  test:
-    name: Playwright Tests
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repo
-        uses: actions/checkout@v3
-
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v2
-        with:
-          version: 8.8.0
-
-      - name: Setup node
-        uses: actions/setup-node@v3
-        with:
-          node-version: 20
-          cache: "pnpm"
-          # run: pnpm site install
 
       - name: Install Dependencies
-        run: pnpm site install
+        run: pnpm website install
 
       - name: Run build
-        run: pnpm site run build
-
-      # - name: Get pnpm store directory
-      #   id: pnpm-cache
-      #   shell: bash
-      #   run: |
-      #     echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
-
-      # - uses: actions/cache@v3
-      #   name: Setup pnpm cache
-      #   with:
-      #     path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}
-      #     key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
-      #     restore-keys: |
-      #       ${{ runner.os }}-pnpm-store-
-
-      - name: Install Playwright Browsers
-        run: pnpm site playwright install --with-deps
-
-      - name: Run Playwright tests
-        run: pnpm site playwright test
-
-      - uses: actions/upload-artifact@v3
-        if: always()
-        with:
-          name: playwright-report
-          path: apps/site/playwright-report/
-          retention-days: 30
+        run: pnpm website run build
+
+  # test:
+  #   name: Playwright Tests
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - name: Checkout repo
+  #       uses: actions/checkout@v3
+
+  #     - name: Setup pnpm
+  #       uses: pnpm/action-setup@v2
+  #       with:
+  #         version: 8.8.0
+
+  #     - name: Setup node
+  #       uses: actions/setup-node@v3
+  #       with:
+  #         node-version: 20
+  #         cache: "pnpm"
+
+  #     - name: Install Dependencies
+  #       run: pnpm website install
+
+  #     - name: Run build
+  #       run: pnpm website run build
+
+  #     - name: Install Playwright Browsers
+  #       run: pnpm site playwright install --with-deps
+
+  #     - name: Run Playwright tests
+  #       run: pnpm site playwright test
+
+  #     - uses: actions/upload-artifact@v3
+  #       if: always()
+  #       with:
+  #         name: playwright-report
+  #         path: apps/site/playwright-report/
+  #         retention-days: 30
diff --git a/apps/app/.gitignore b/apps/app/.gitignore
@@ -34,3 +34,6 @@ yarn-error.log*
 # typescript
 *.tsbuildinfo
 next-env.d.ts
+
+# wagmi cli
+generated.ts
diff --git a/apps/app/package.json b/apps/app/package.json
@@ -4,25 +4,31 @@
   "version": "0.1.0",
   "private": true,
   "scripts": {
+    "predev": "wagmi generate",
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
     "lint": "next lint"
   },
   "dependencies": {
     "@breadchain.xyz/theme": "workspace:*",
+    "@rainbow-me/rainbowkit": "^2.1.0",
+    "@tanstack/react-query": "^5.37.1",
+    "next": "14.2.3",
     "react": "^18",
     "react-dom": "^18",
-    "next": "14.2.3"
+    "viem": "2.x",
+    "wagmi": "^2.9.2"
   },
   "devDependencies": {
-    "typescript": "^5",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
+    "@wagmi/cli": "^2.1.7",
+    "eslint": "^8",
+    "eslint-config-next": "14.2.3",
     "postcss": "^8",
     "tailwindcss": "^3.4.1",
-    "eslint": "^8",
-    "eslint-config-next": "14.2.3"
+    "typescript": "^5"
   }
 }