Merge pull request #13 from inkonchain/chore/streamline-repo

chore: streamline repo (part 1)

apps/web/.eslintrc.json → .eslintrc.json

@@ -53,7 +53,7 @@
   ],
   "settings": {
     "next": {
-      "rootDir": "apps/web"
+      "rootDir": "."
     }
   },
   "ignorePatterns": ["node_modules/", ".next/", "out/"],

.github/workflows/deploy_phrase.yml

@@ -3,7 +3,7 @@ on:
   push:
     branches: ["main", "feat/phrase"]
     paths:
-      - apps/web/messages/en-US.json
+      - messages/en-US.json
 jobs:
   deploy-phrase:
     if: github.repository == 'inkonchain/ink-web-app'

.github/workflows/pull_request.yml

@@ -71,35 +71,35 @@ jobs:
           INK_APP_SUBMISSION_SLACK_NOTIFICATION_CHANNEL: DUMMY_DO_NOT_REPLACE
           HCAPTCHA_SECRET: DUMMY_DO_NOT_REPLACE
         run: |
-          touch apps/web/.env.production
-          echo "NEXT_PUBLIC_WC_PROJECT_ID=$NEXT_PUBLIC_WC_PROJECT_ID" >> apps/web/.env.production
-          echo "NEXT_PUBLIC_FAUCET_API_URL=$NEXT_PUBLIC_FAUCET_API_URL" >> apps/web/.env.production
-          echo "NEXT_PUBLIC_GELATO_BRIDGE_URL=$NEXT_PUBLIC_GELATO_BRIDGE_URL" >> apps/web/.env.production
-          echo "NEXT_PUBLIC_SENTRY_DSN=$NEXT_PUBLIC_SENTRY_DSN" >> apps/web/.env.production
-          echo "NEXT_PUBLIC_GTM_ID=$NEXT_PUBLIC_GTM_ID" >> apps/web/.env.production
-          echo "NEXT_PUBLIC_SEGMENT_WRITE_KEY=$NEXT_PUBLIC_SEGMENT_WRITE_KEY" >> apps/web/.env.production
-          echo "BRAZE_INSTANCE_URL=$BRAZE_INSTANCE_URL" >> apps/web/.env.production
-          echo "BRAZE_API_KEY=$BRAZE_API_KEY" >> apps/web/.env.production
-          echo "BRAZE_GENERAL_WAITLIST_GROUP_ID=$BRAZE_GENERAL_WAITLIST_GROUP_ID" >> apps/web/.env.production
-          echo "BRAZE_DEVELOPERS_WAITLIST_GROUP_ID=$BRAZE_DEVELOPERS_WAITLIST_GROUP_ID" >> apps/web/.env.production
-          echo "MULTIPLIER_JWT_SECRET=$MULTIPLIER_JWT_SECRET" >> apps/web/.env.production
-          echo "ORIGIN=$ORIGIN" >> apps/web/.env.production
-          echo "INK_APP_SUBMISSION_BOT_GITHUB_APP_ID=$INK_APP_SUBMISSION_BOT_GITHUB_APP_ID" >> apps/web/.env.production
-          echo "INK_APP_SUBMISSION_BOT_GITHUB_PRIVATE_KEY=$INK_APP_SUBMISSION_BOT_GITHUB_PRIVATE_KEY" >> apps/web/.env.production
-          echo "INK_APP_SUBMISSION_BOT_GITHUB_INSTALLATION_ID=$INK_APP_SUBMISSION_BOT_GITHUB_INSTALLATION_ID" >> apps/web/.env.production
-          echo "INK_APP_SUBMISSION_SLACK_BOT_TOKEN=$INK_APP_SUBMISSION_SLACK_BOT_TOKEN" >> apps/web/.env.production
-          echo "INK_APP_SUBMISSION_TARGET_ORG=$INK_APP_SUBMISSION_TARGET_ORG" >> apps/web/.env.production
-          echo "INK_APP_SUBMISSION_TARGET_REPO=$INK_APP_SUBMISSION_TARGET_REPO" >> apps/web/.env.production
-          echo "INK_APP_SUBMISSION_TARGET_BRANCH=$INK_APP_SUBMISSION_TARGET_BRANCH" >> apps/web/.env.production
-          echo "INK_APP_SUBMISSION_SLACK_NOTIFICATION_CHANNEL=$INK_APP_SUBMISSION_SLACK_NOTIFICATION_CHANNEL" >> apps/web/.env.production
-          echo "HCAPTCHA_SECRET=$HCAPTCHA_SECRET" >> apps/web/.env.production
+          touch .env.production
+          echo "NEXT_PUBLIC_WC_PROJECT_ID=$NEXT_PUBLIC_WC_PROJECT_ID" >> .env.production
+          echo "NEXT_PUBLIC_FAUCET_API_URL=$NEXT_PUBLIC_FAUCET_API_URL" >> .env.production
+          echo "NEXT_PUBLIC_GELATO_BRIDGE_URL=$NEXT_PUBLIC_GELATO_BRIDGE_URL" >> .env.production
+          echo "NEXT_PUBLIC_SENTRY_DSN=$NEXT_PUBLIC_SENTRY_DSN" >> .env.production
+          echo "NEXT_PUBLIC_GTM_ID=$NEXT_PUBLIC_GTM_ID" >> .env.production
+          echo "NEXT_PUBLIC_SEGMENT_WRITE_KEY=$NEXT_PUBLIC_SEGMENT_WRITE_KEY" >> .env.production
+          echo "BRAZE_INSTANCE_URL=$BRAZE_INSTANCE_URL" >> .env.production
+          echo "BRAZE_API_KEY=$BRAZE_API_KEY" >> .env.production
+          echo "BRAZE_GENERAL_WAITLIST_GROUP_ID=$BRAZE_GENERAL_WAITLIST_GROUP_ID" >> .env.production
+          echo "BRAZE_DEVELOPERS_WAITLIST_GROUP_ID=$BRAZE_DEVELOPERS_WAITLIST_GROUP_ID" >> .env.production
+          echo "MULTIPLIER_JWT_SECRET=$MULTIPLIER_JWT_SECRET" >> .env.production
+          echo "ORIGIN=$ORIGIN" >> .env.production
+          echo "INK_APP_SUBMISSION_BOT_GITHUB_APP_ID=$INK_APP_SUBMISSION_BOT_GITHUB_APP_ID" >> .env.production
+          echo "INK_APP_SUBMISSION_BOT_GITHUB_PRIVATE_KEY=$INK_APP_SUBMISSION_BOT_GITHUB_PRIVATE_KEY" >> .env.production
+          echo "INK_APP_SUBMISSION_BOT_GITHUB_INSTALLATION_ID=$INK_APP_SUBMISSION_BOT_GITHUB_INSTALLATION_ID" >> .env.production
+          echo "INK_APP_SUBMISSION_SLACK_BOT_TOKEN=$INK_APP_SUBMISSION_SLACK_BOT_TOKEN" >> .env.production
+          echo "INK_APP_SUBMISSION_TARGET_ORG=$INK_APP_SUBMISSION_TARGET_ORG" >> .env.production
+          echo "INK_APP_SUBMISSION_TARGET_REPO=$INK_APP_SUBMISSION_TARGET_REPO" >> .env.production
+          echo "INK_APP_SUBMISSION_TARGET_BRANCH=$INK_APP_SUBMISSION_TARGET_BRANCH" >> .env.production
+          echo "INK_APP_SUBMISSION_SLACK_NOTIFICATION_CHANNEL=$INK_APP_SUBMISSION_SLACK_NOTIFICATION_CHANNEL" >> .env.production
+          echo "HCAPTCHA_SECRET=$HCAPTCHA_SECRET" >> .env.production
       - name: Building app
         run: pnpm run build
       - name: Cache build
         uses: actions/cache/save@v4
         with:
-          path: apps/web/.next
-          key: ${{ runner.os }}-build-store-${{ hashFiles('./apps/web/src') }}
+          path: .next
+          key: ${{ runner.os }}-build-store-${{ hashFiles('./src') }}
 
   # e2e-test:
   #   needs: build
@@ -112,8 +112,8 @@ jobs:
   #     - name: Restore build from cache
   #       uses: actions/cache/restore@v4
   #       with:
-  #         path: apps/web/.next
-  #         key: ${{ runner.os }}-build-store-${{ hashFiles('./apps/web/src') }}
+  #         path: .next
+  #         key: ${{ runner.os }}-build-store-${{ hashFiles('./src') }}
   #     - name: Get installed Playwright version
   #       id: playwright-version
   #       run: echo "PLAYWRIGHT_VERSION=$(node -e "console.log(require('./package.json').dependencies['@playwright/test'].version)")" >> $GITHUB_ENV
@@ -122,16 +122,14 @@ jobs:
   #       id: playwright-cache
   #       with:
   #         path: |
-  #           ~/apps/web/.cache/ms-playwright
+  #           ~/.cache/ms-playwright
   #         key: ${{ runner.os }}-playwright-${{ steps.playwright-version.outputs.PLAYWRIGHT_VERSION }}
   #     - name: Install Playwright Browsers
   #       run: npx playwright install --with-deps
   #       if: steps.playwright-cache.outputs.cache-hit != 'true'
   #     - name: Install Playwright Dependencies
   #       run: npx playwright install-deps
   #       if: steps.playwright-cache.outputs.cache-hit == 'true'
-  #     - name: Change dir
-  #       run: cd apps/web
   #     - name: Run Playwright tests
   #       run: pnpm run test
   #       env:
@@ -159,5 +157,5 @@ jobs:
   #       if: always()
   #       with:
   #         name: playwright-report
-  #         path: apps/web/playwright-report/
+  #         path: playwright-report/
   #         retention-days: 30

.gitignore

@@ -1,20 +1,44 @@
-.turbo
+# Dependencies
 node_modules
+.pnp
+.pnp.js
+.yarn/install-state.gz
+.pnpm-store
 
-# misc
-.DS_Store
-*.pem
+# Testing
+/coverage
+/test-results/
+/playwright-report/
+/blob-report/
+/playwright/.cache/
+
+# Build outputs
+.next/
+out/
+build
+*.tsbuildinfo
+next-env.d.ts
 
-# debug
+# Environment and local files
+.env*
+.env*.local
+.env.sentry-build-plugin
+
+# Debug logs
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# local env files
-.env*.local
+# System files
+.DS_Store
+*.pem
 
-# Git
+# Editor/IDE
+.scratchpad
 .gitconfig
 
-# scratchpad
-.scratchpad
+# Deployment
+.vercel
+
+# Cache
+cache/*

apps/web/next.config.mjs → next.config.mjs

@@ -22,7 +22,7 @@ export default withSentryConfig(withNextIntl(nextConfig), {
   // https://github.com/getsentry/sentry-webpack-plugin#options
 
   org: "payward-inc",
-  project: "ink-landingpage",
+  project: "ink-web-app",
 
   // Only print logs for uploading source maps in CI
   silent: !process.env.CI,