Skip to content

Commit

Permalink
Merge branch 'staging' into deployments/staging/makerdao
Browse files Browse the repository at this point in the history
  • Loading branch information
froid1911 committed Apr 19, 2024
2 parents 3783e2e + e41734f commit e657a2c
Show file tree
Hide file tree
Showing 39 changed files with 3,010 additions and 4,669 deletions.
5 changes: 5 additions & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@
},
"plugins": ["react", "@typescript-eslint"],
"rules": {
"no-restricted-imports": ["error", {
"name": "jotai/utils",
"importNames": ["atomWithStorage"],
"message": "Please use atomWithStorage from 'src/store/utils' instead."
}],
"react/prop-types": "off",
"react/react-in-jsx-scope": "off",
"@typescript-eslint/explicit-function-return-type": "off",
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-arbitrum-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
email: ${{ secrets.HEROKU_EMAIL }}
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
docker_options: "--build-arg BASE_PATH=/arbitrum/connect --build-arg VITE_BASE_HREF=/arbitrum/connect/ --build-arg VITE_ROUTER_BASENAME=/arbitrum/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}"
docker_options: "--build-arg BASE_PATH=/arbitrum/connect --build-arg VITE_BASE_HREF=/arbitrum/connect/ --build-arg VITE_ROUTER_BASENAME=/arbitrum/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }} --build-arg VITE_ENABLED_EDITORS=ARBLTIPGrantee --build-arg VITE_DISABLE_ADD_PUBLIC_DRIVES=true --build-arg VITE_DISABLE_ADD_CLOUD_DRIVES=true --build-arg VITE_DISABLE_ADD_LOCAL_DRIVES=true --build-arg VITE_DISABLE_DELETE_PUBLIC_DRIVES=true --build-arg VITE_DISABLE_DELETE_CLOUD_DRIVES=true --build-arg VITE_DISABLE_DELETE_LOCAL_DRIVES=true --build-arg VITE_LOCAL_DRIVES_ENABLED=false --build-arg VITE_DEFAULT_DRIVE_URL=https://apps.powerhouse.io/arbitrum/switchboard/d/arbitrum --build-arg VITE_RENOWN_CHAIN_ID=42161"
process_type: web
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-arbitrum-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
email: ${{ secrets.HEROKU_EMAIL }}
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
docker_options: "--build-arg BASE_PATH=/alpha/arbitrum/connect --build-arg VITE_BASE_HREF=/alpha/arbitrum/connect/ --build-arg VITE_ROUTER_BASENAME=/alpha/arbitrum/connect --build-arg VITE_RENOWN_NETWORK_ID=42161 --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}"
docker_options: "--build-arg BASE_PATH=/alpha/arbitrum/connect --build-arg VITE_BASE_HREF=/alpha/arbitrum/connect/ --build-arg VITE_ROUTER_BASENAME=/alpha/arbitrum/connect --build-arg VITE_ENABLED_EDITORS=ARBLTIPGrantee --build-arg VITE_DISABLE_ADD_PUBLIC_DRIVES=true --build-arg VITE_DISABLE_ADD_CLOUD_DRIVES=true --build-arg VITE_DISABLE_ADD_LOCAL_DRIVES=true --build-arg VITE_DISABLE_DELETE_PUBLIC_DRIVES=true --build-arg VITE_DISABLE_DELETE_CLOUD_DRIVES=true --build-arg VITE_DISABLE_DELETE_LOCAL_DRIVES=true --build-arg VITE_LOCAL_DRIVES_ENABLED=false --build-arg VITE_DEFAULT_DRIVE_URL=https://apps.powerhouse.io/alpha/arbitrum/switchboard/d/arbitrum --build-arg VITE_RENOWN_CHAIN_ID=42161 --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}"
process_type: web
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-makerdao-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
email: ${{ secrets.HEROKU_EMAIL }}
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
docker_options: "--build-arg BASE_PATH=/makerdao/connect --build-arg VITE_BASE_HREF=/makerdao/connect/ --build-arg VITE_ROUTER_BASENAME=/makerdao/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}"
docker_options: "--build-arg BASE_PATH=/makerdao/connect --build-arg VITE_BASE_HREF=/makerdao/connect/ --build-arg VITE_ROUTER_BASENAME=/makerdao/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }} --build-arg VITE_DEFAULT_DRIVE_URL=https://apps.powerhouse.io/makerdao/switchboard/d/monetalis"
process_type: web
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-makerdao-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
email: ${{ secrets.HEROKU_EMAIL }}
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
docker_options: "--build-arg BASE_PATH=/alpha/makerdao/connect --build-arg VITE_BASE_HREF=/alpha/makerdao/connect/ --build-arg VITE_ROUTER_BASENAME=/alpha/makerdao/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}"
docker_options: "--build-arg BASE_PATH=/alpha/makerdao/connect --build-arg VITE_BASE_HREF=/alpha/makerdao/connect/ --build-arg VITE_ROUTER_BASENAME=/alpha/makerdao/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }} --build-arg VITE_DEFAULT_DRIVE_URL=https://apps.powerhouse.io/alpha/makerdao/switchboard/d/monetalis"
process_type: web
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-powerhouse-prod.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
email: ${{ secrets.HEROKU_EMAIL }}
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
docker_options: "--build-arg BASE_PATH=/powerhouse/connect --build-arg VITE_BASE_HREF=/powerhouse/connect/ --build-arg VITE_ROUTER_BASENAME=/powerhouse/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}"
docker_options: "--build-arg BASE_PATH=/powerhouse/connect --build-arg VITE_BASE_HREF=/powerhouse/connect/ --build-arg VITE_ROUTER_BASENAME=/powerhouse/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }} VITE_DEFAULT_DRIVE_URL=https://apps.powerhouse.io/powerhouse/switchboard/d/powerhouse"
process_type: web
2 changes: 1 addition & 1 deletion .github/workflows/build-and-deploy-powerhouse-staging.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ jobs:
email: ${{ secrets.HEROKU_EMAIL }}
heroku_api_key: ${{ secrets.HEROKU_API_KEY }}
heroku_app_name: ${{ secrets.HEROKU_APP_NAME }}
docker_options: "--build-arg BASE_PATH=/alpha/powerhouse/connect --build-arg VITE_BASE_HREF=/alpha/powerhouse/connect/ --build-arg VITE_ROUTER_BASENAME=/alpha/powerhouse/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }}"
docker_options: "--build-arg BASE_PATH=/alpha/powerhouse/connect --build-arg VITE_BASE_HREF=/alpha/powerhouse/connect/ --build-arg VITE_ROUTER_BASENAME=/alpha/powerhouse/connect --build-arg VITE_SENTRY_DSN=${{ secrets.SENTRY_DSN }} --build-arg VITE_SENTRY_ENV=${{ secrets.SENTRY_ENV }} --build-arg VITE_DEFAULT_DRIVE_URL=https://apps.powerhouse.io/alpha/powerhouse/switchboard/d/powerhouse"
process_type: web
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -62,4 +62,6 @@ out/
.vercel

# Generated assets
public/icons.svg
public/icons.svg

.env.local
35 changes: 34 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,45 @@ ENV VITE_BASE_HREF=${VITE_BASE_HREF}
ARG VITE_ROUTER_BASENAME=/alpha/powerhouse/connect
ENV VITE_ROUTER_BASENAME=${VITE_ROUTER_BASENAME}

ARG VITE_RENOWN_NETWORK_ID=1
ARG VITE_RENOWN_NETWORK_ID="eip155"
ENV VITE_RENOWN_NETWORK_ID=${VITE_RENOWN_NETWORK_ID}

ARG VITE_RENOWN_CHAIN_ID=1
ENV VITE_RENOWN_CHAIN_ID=${VITE_RENOWN_CHAIN_ID}

ARG VITE_SENTRY_DSN=""
ENV VITE_SENTRY_DSN=${VITE_SENTRY_DSN}

ARG VITE_SENTRY_ENV="dev"
ENV VITE_SENTRY_ENV=${VITE_SENTRY_ENV}

ARG VITE_DEFAULT_DRIVE_URL=""
ENV VITE_DEFAULT_DRIVE_URL=${VITE_DEFAULT_DRIVE_URL}

ARG VITE_ENABLED_EDITORS=undefined
ENV VITE_ENABLED_EDITORS=${VITE_ENABLED_EDITORS}

ARG VITE_DISABLE_ADD_PUBLIC_DRIVES=false
ENV VITE_DISABLE_ADD_PUBLIC_DRIVES=${VITE_DISABLE_ADD_PUBLIC_DRIVES}

ARG VITE_DISABLE_ADD_CLOUD_DRIVES=false
ENV VITE_DISABLE_ADD_CLOUD_DRIVES=${VITE_DISABLE_ADD_CLOUD_DRIVES}

ARG VITE_DISABLE_ADD_LOCAL_DRIVES=false
ENV VITE_DISABLE_ADD_LOCAL_DRIVES=${VITE_DISABLE_ADD_LOCAL_DRIVES}

ARG VITE_DISABLE_DELETE_PUBLIC_DRIVES=false
ENV VITE_DISABLE_DELETE_PUBLIC_DRIVES=${VITE_DISABLE_DELETE_PUBLIC_DRIVES}

ARG VITE_DISABLE_DELETE_CLOUD_DRIVES=false
ENV VITE_DISABLE_DELETE_CLOUD_DRIVES=${VITE_DISABLE_DELETE_CLOUD_DRIVES}

ARG VITE_DISABLE_DELETE_LOCAL_DRIVES=false
ENV VITE_DISABLE_DELETE_LOCAL_DRIVES=${VITE_DISABLE_DELETE_LOCAL_DRIVES}

ARG VITE_LOCAL_DRIVES_ENABLED=true
ENV VITE_LOCAL_DRIVES_ENABLED=${VITE_LOCAL_DRIVES_ENABLED}

WORKDIR /opt/app
COPY . .
RUN npm install -g husky vite
Expand Down
Loading

0 comments on commit e657a2c

Please sign in to comment.