-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* edit pipeline to create a docker image for beta version. [skip ci] * Upgrade Batcher UI (#388) * 🚧 💥 init migration to NextJS * 🚧 🎨 💄 rewriting style without less & antd * 🚧 add redux & redux-loop to manage wallet connection * 🔧 update react-GA due to merge * 🔧 fix husky * 💥 organize global state with redux and write some types to represent smart contract types * 🚧 * 🚧 use both context and redux to manage wallet and tzkt instance * 💄 review choose pair component * cleaning... * 🚧 deposit token * 🚧 rework batcher infos ✨ * 🚧 impl oracle price * 🚧 trying to deploy with NextJS * 🚧 🔧 make nextjs/tailwind working in Docker * 🚧 test deploying * 🚧 run nextjs server on port 80 * 🚧 volumes * 🔥 clean code and add metadata * 🚧 websocket improvments * 🚧 fix warning * 🚧 * 💄 review styling * 💄 update style with feedbacks * ✨ volumes & holdings * ♻️ review some items && change contract address for ghostnet * 🐛 fix bugs on swap component * ♻️ change pair selecting * 🐛 fix some bugs * 🔥 remove useless files and clean ✨ * 🔧 fix issue with images * 🔥 move folders into src * ✨ add Copy & Tooltip component from tzsafe-ui * 🚧 * 🔥 remove useless file * 🐛 fix user balance fetching --------- Co-authored-by: Quentin <[email protected]> Co-authored-by: Quentin Burg <[email protected]> * 🔧 update github workflow with staging branch instead of feature branch && 🐛 fix bug with oracle price * 🐛 fix volumes update when received an event from bigmap * Improve requests (#398) * ⚡ improve number of requests to tzkt API && 🏷️ add types for contract * ⚡ decrease requests number to smart contract --------- Co-authored-by: Quentin Burg <[email protected]> * ♻️ remove tzkt SDK * 🐛 get fees amount from storage before deposit tokens * ♻️ improve check status from http request * 🔍 write open graph metadata * ✨ add token icon in swap selector * 🍱 add tzbtc icon in local * 🚧 test og metadata * :sparkles add tooltip on price strategy * ✨ select tokens both side * ✨ add toasts for error and info * 💚 try to fix CI failure * 🔧 choose the right network depending on network targeted * 🚧 try to fix CI * 🐛 fix issues with holdings and improve other things * ♻️ upgrade taquito * favicon is missing --------- Co-authored-by: Cyril B <[email protected]> Co-authored-by: Quentin <[email protected]> Co-authored-by: Quentin Burg <[email protected]>
- Loading branch information
1 parent
77a2499
commit 2013e58
Showing
114 changed files
with
12,894 additions
and
3,982 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
name: Docker ghostnet front staging | ||
|
||
on: | ||
push: | ||
branches: | ||
- 'release-ghostnet-staging' | ||
- 'release-ghostnet-beta' | ||
pull_request: | ||
branches: | ||
- 'release-ghostnet-staging' | ||
- 'release-ghostnet-beta' | ||
types: | ||
- closed | ||
workflow_dispatch: | ||
|
||
jobs: | ||
ui: | ||
strategy: | ||
matrix: | ||
network: [ghostnet] | ||
runs-on: ubuntu-latest | ||
steps: | ||
- uses: actions/[email protected] | ||
with: | ||
submodules: true | ||
|
||
- name: Set outputs | ||
id: vars | ||
run: | | ||
echo "date=$(date +%Y-%m-%dT%H-%M-%S)" >> "${GITHUB_OUTPUT}" | ||
echo "sha_short=$(git rev-parse --short HEAD)" >> "${GITHUB_OUTPUT}" | ||
- name: Set up Docker Buildx | ||
uses: docker/Setup-buildx-action@v2 | ||
|
||
- name: Login to GitHub Container Registry | ||
uses: docker/login-action@v2 | ||
with: | ||
registry: ghcr.io | ||
username: ${{ github.repository_owner }} | ||
password: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
- name: Build and push ui version release-ghostnet-staging | ||
if: github.ref == 'refs/heads/release-ghostnet-staging' | ||
uses: docker/build-push-action@v3 | ||
with: | ||
file: ./batcher-ui/Dockerfile.${{ matrix.network }} | ||
context: ./batcher-ui/ | ||
push: ${{ github.ref == 'refs/heads/release-ghostnet-staging' }} | ||
tags: | | ||
ghcr.io/marigold-dev/batcher-${{ matrix.network }}:staging | ||
ghcr.io/marigold-dev/batcher-${{ matrix.network }}:${{ steps.vars.outputs.date }}-${{ steps.vars.outputs.sha_short }}-staging | ||
cache-from: type=gha | ||
cache-to: type=gha,mode=max | ||
|
||
- name: Build and push ui version on release-ghostnet-beta | ||
if: github.ref == 'refs/heads/release-ghostnet-beta' | ||
uses: docker/build-push-action@v3 | ||
with: | ||
file: ./batcher-ui/Dockerfile.${{ matrix.network }} | ||
context: ./batcher-ui/ | ||
push: ${{ github.ref == 'refs/heads/release-ghostnet-beta' }} | ||
tags: | | ||
ghcr.io/marigold-dev/batcher-${{ matrix.network }}:beta | ||
ghcr.io/marigold-dev/batcher-${{ matrix.network }}:${{ steps.vars.outputs.date }}-${{ steps.vars.outputs.sha_short }}-beta | ||
cache-from: type=gha | ||
cache-to: type=gha,mode=max |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
{ | ||
"extends": [ | ||
"eslint:recommended", | ||
"next", | ||
"prettier" | ||
], | ||
// For more informations, see https://github.com/vercel/next.js/issues/40687#issuecomment-1378845989 | ||
"overrides": [ | ||
{ | ||
// Adapt to your needs (e.g. some might want to only override "next.config.js") | ||
"files": [ | ||
"*.js" | ||
], | ||
// This is the default parser of ESLint | ||
"parser": "espree", | ||
"parserOptions": { | ||
"ecmaVersion": 2020 | ||
} | ||
} | ||
], | ||
"rules": { | ||
"no-unused-vars": "off" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,4 +1,4 @@ | ||
#!/bin/sh | ||
. "$(dirname "$0")/_/husky.sh" | ||
|
||
npx --no-install lint-staged | ||
npx lint-staged |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
const path = require('path'); | ||
|
||
const buildEslintCommand = filenames => | ||
`next lint --fix --file ${filenames | ||
.map(f => path.relative(process.cwd(), f)) | ||
.join(' --file ')}`; | ||
|
||
module.exports = { | ||
'*.{js,jsx,ts,tsx}': [buildEslintCommand], | ||
}; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
**/*.svg | ||
package.json | ||
.umi | ||
.umi-production | ||
/dist | ||
.dockerignore | ||
.DS_Store | ||
|
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,7 @@ | ||
{ | ||
"singleQuote": true, | ||
"trailingComma": "es5", | ||
"jsxBracketSameLine": true, | ||
"arrowParens": "avoid", | ||
"tabWidth": 2 | ||
} |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
FROM node:latest as builder | ||
|
||
WORKDIR /app | ||
|
||
# ENV ENV=ghostnet | ||
|
||
COPY ./package.json ./ | ||
|
||
RUN npm install | ||
|
||
COPY ./tsconfig.json ./jsconfig.json ./ | ||
COPY ./pages ./pages | ||
COPY ./src ./src | ||
COPY ./styles ./styles | ||
COPY ./public ./public | ||
COPY ./postcss.config.js ./postcss.config.js | ||
COPY ./next.config.js ./next.config.js | ||
COPY ./tailwind.config.js ./tailwind.config.js | ||
|
||
|
||
RUN npm run build:staging | ||
|
||
EXPOSE 80 | ||
|
||
CMD ["npm", "run", "start:staging"] | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.