chore: bring ui to root

.github/_dependabot.yml

@@ -11,6 +11,6 @@ updates:
       interval: daily
     open-pull-requests-limit: 10
   - package-ecosystem: "npm"
-    directory: "/ui"
+    directory: "/"
     schedule:
       interval: "daily"

.github/workflows/ci-docker-image-pipeline.yaml

@@ -10,9 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       image: "sifchain/frontend"
-    defaults:
-      run:
-        working-directory: ui
 
     steps:
       - uses: actions/checkout@v2
@@ -32,7 +29,7 @@ jobs:
           TAG_NAME=$(git tag --points-at HEAD)
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
           echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
-          echo "VITE_APP_VERSION=$(cat ./ui/app/package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
+          echo "VITE_APP_VERSION=$(cat ./app/package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
           echo "VITE_APP_SHA=$GITHUB_SHA" >> $GITHUB_ENV
           if [[ $BRANCH_NAME == 'master' ]]
           then

.github/workflows/core.yml

@@ -5,9 +5,6 @@ on: [pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ui
 
     steps:
       - uses: actions/checkout@v2
@@ -38,6 +35,6 @@ jobs:
         if: ${{ always() }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./ui/core/coverage
+          directory: ./core/coverage
           flags: ui
           verbose: true

.github/workflows/docker-build.yml

@@ -10,9 +10,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       image: "sifchain/frontend"
-    defaults:
-      run:
-        working-directory: ui
 
     steps:
       - uses: actions/checkout@v2
@@ -32,7 +29,7 @@ jobs:
           TAG_NAME=$(git tag --points-at HEAD)
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
           echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
-          echo "VITE_APP_VERSION=$(cat ./ui/app/package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
+          echo "VITE_APP_VERSION=$(cat ./app/package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
           echo "VITE_APP_SHA=$GITHUB_SHA" >> $GITHUB_ENV
 
           if [[ $BRANCH_NAME == 'master' ]]
@@ -67,7 +64,7 @@ jobs:
         if: ${{ always() }}
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./ui/core/coverage
+          directory: ./core/coverage
           flags: ui
           verbose: true
 

.github/workflows/pinata-build-deploy-ui.yml

@@ -31,7 +31,7 @@ jobs:
           TAG_NAME=$(git tag --points-at HEAD)
           echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV
           echo "TAG_NAME=$TAG_NAME" >> $GITHUB_ENV
-          echo "VITE_APP_VERSION=$(cat ./ui/app/package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
+          echo "VITE_APP_VERSION=$(cat ./app/package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
           echo "VITE_APP_SHA=$GITHUB_SHA" >> $GITHUB_ENV
 
           if [[ $BRANCH_NAME == 'master' ]]
@@ -49,15 +49,14 @@ jobs:
           echo $(cat $GITHUB_ENV)
 
       - name: Build App
-        run: |
-          cd ui && yarn install --immutable && yarn build --tag $BRANCH_NAME --no-setup
+        run: yarn install --immutable && yarn build --tag $BRANCH_NAME --no-setup
 
       - name: Deploy App to IPFS/Pinata
         id: pinata
         uses: anantaramdas/[email protected]
         with:
           pin-name: "Sifchain ${{ github.sha }}"
-          path: "./ui/app/dist"
+          path: "./app/dist"
           pinata-api-key: ${{ secrets.PINATA_API_KEY }}
           pinata-secret-api-key: ${{ secrets.PINATA_SECRET_KEY }}
           verbose: true

.github/workflows/playwright-ui.yml

@@ -5,9 +5,6 @@ on: [pull_request]
 jobs:
   test:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: ui
 
     steps:
       - uses: actions/checkout@v2
@@ -44,13 +41,13 @@ jobs:
         with:
           name: fe-build-artifact-${{ github.sha }}
           path: |
-            ./ui/e2e/screenshots
-            ./ui/e2e/logs
+            ./e2e/screenshots
+            ./e2e/logs
 
       - name: Upload coverage report
         uses: codecov/codecov-action@v1
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          directory: ./ui/e2e/coverage
+          directory: ./e2e/coverage
           flags: ui
           verbose: true

.github/workflows/vercel-deploy-ui.yml

@@ -24,7 +24,7 @@ jobs:
         run: |
           echo "VITE_APP_SHA=$GITHUB_SHA" >> $GITHUB_ENV
           echo "BRANCH_NAME=${GITHUB_REF#refs/heads/}" >> $GITHUB_ENV
-          echo "VITE_APP_VERSION=$(cat ./ui/app/package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
+          echo "VITE_APP_VERSION=$(cat ./app/package.json | jq '.version' | tr -d '"')" >> $GITHUB_ENV
 
         id: extract_env
 
@@ -45,10 +45,10 @@ jobs:
             echo "BRANCH_NAME=develop" >> $GITHUB_ENV
           fi
 
-          echo VITE_APP_SHA=$VITE_APP_SHA >> ./ui/app/.env
+          echo VITE_APP_SHA=$VITE_APP_SHA >> ./app/.env
 
       - name: Build App
-        run: cd ./ui && yarn install --immutable
+        run: yarn install --immutable
 
       - uses: amondnet/vercel-action@v20
         with:
@@ -57,6 +57,5 @@ jobs:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           vercel-org-id: ${{ secrets.ORG_ID}}
           vercel-project-id: ${{ secrets.PROJECT_ID}}
-          working-directory: .
           alias-domains: |
             {{BRANCH}}.sifchain.vercel.app

.gitignore

@@ -20,3 +20,17 @@ nohup.out
 relayerdb
 smart-contracts/*
 node_modules
+.vercel
+.envrc
+
+# Yarn
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
+# Turbo
+.turbo

ui/.husky/pre-commit → .husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-cd ui && yarn lint --quick
+yarn lint --quick

ui/Dockerfile → Dockerfile

@@ -1,19 +1,19 @@
 FROM node:17.4.0 as builder
 
-RUN mkdir -p /ui/app
-RUN mkdir -p /ui/core
+RUN mkdir -p /app
+RUN mkdir -p /core
 
 ARG SIFNODE_API
 ARG SIFNODE_WS_API
 ENV VUE_APP_SIFNODE_API=$SIFNODE_API
 ENV VUE_APP_SIFNODE_WS_API=$SIFNODE_WS_API
 
-COPY ./package.json /ui/package.json
-COPY ./yarn.lock /ui/yarn.lock
-COPY ./app/package.json /ui/app/package.json
-COPY ./app/yarn.lock /ui/app/yarn.lock
-COPY ./core/package.json /ui/core/package.json
-COPY ./core/yarn.lock /ui/core/yarn.lock
+COPY ./package.json /package.json
+COPY ./yarn.lock /yarn.lock
+COPY ./app/package.json /app/package.json
+COPY ./app/yarn.lock /app/yarn.lock
+COPY ./core/package.json /core/package.json
+COPY ./core/yarn.lock /core/yarn.lock
 WORKDIR /ui
 RUN yarn
 
@@ -25,4 +25,4 @@ FROM flashspys/nginx-static
 RUN apk update && apk upgrade
 RUN rm -rf /etc/nginx/conf.d/default.conf
 COPY nginx.conf /etc/nginx/conf.d/default.conf
-COPY --from=builder  /ui/app/dist /static
+COPY --from=builder  /app/dist /static