Skip to content

Commit

Permalink
Merge branch 'master' into indexer
Browse files Browse the repository at this point in the history
# Conflicts:
#	.github/workflows/build-explorer-to-k8s.yml
#	.github/workflows/build-indexer-to-k8s.yml
  • Loading branch information
ElessarST committed Feb 29, 2024
2 parents 8c9bd7c + 629b199 commit dd377b3
Show file tree
Hide file tree
Showing 208 changed files with 10,862 additions and 57 deletions.
110 changes: 110 additions & 0 deletions .github/workflows/build-pinata-to-k8s.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
name: Pinata-proxy - Build and Deploy

on:
workflow_dispatch:
push:
branches: ['master', 'main', 'staging']
paths:
- pinata-proxy/**

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
ENVIRONMENT: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && 'prod' || 'stg' }}
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
AWS_REGION: ${{ secrets.AWS_REGION }}
KUBE_CONFIG_DATA: ${{ secrets.KUBE_CONFIG_DATA }}
KUBECTL_VERSION: 'v1.22.17'
KUBE_NAMESPACE: gear-dapps
KUBE_DEPLOYMENT_PREFIX: pinata-proxy
REGISTRY: ghcr.io/${{ github.repository }}

jobs:
prepair:
runs-on: ubuntu-latest
outputs:
image_name: ${{ steps.image.outputs.image_name }}
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Get branch
id: branch
run: |
branch_name=${GITHUB_REF#refs/heads/}
echo "branch_name=$branch_name" >> $GITHUB_ENV
- name: Get short SHA
id: sha
run: |
sha_short=$(git rev-parse --short HEAD)
echo "sha_short=$sha_short" >> $GITHUB_ENV
- name: Set IMAGE_NAME
id: image
run: |
image_name=${{ env.REGISTRY }}-${{ env.KUBE_DEPLOYMENT_PREFIX }}:${{ env.branch_name }}-${{ env.sha_short }}
echo "image_name=$image_name" >> $GITHUB_OUTPUT
build-and-push-image:
needs: [prepair]
runs-on: ubuntu-latest
environment: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && 'prod' || 'stg' }}
permissions:
contents: read
packages: write
steps:
- name: Checkout repository
uses: actions/checkout@v4

- name: Log in to the github container registry
uses: docker/login-action@v3
with:
registry: ${{ env.REGISTRY }}
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push image
uses: docker/build-push-action@v5
with:
file: indexer/Dockerfile-indexer
push: true
tags: ${{ needs.prepair.outputs.image_name }}

deploy-to-k8s:
needs: [prepair, build-and-push-image]
runs-on: ubuntu-latest
environment: ${{ (github.ref == 'refs/heads/master' || github.ref == 'refs/heads/main') && 'prod' || 'stg' }}
steps:
- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v4
with:
aws-access-key-id: ${{ env.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ env.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Update deployment image
uses: kodermax/kubectl-aws-eks@main
with:
args: |
set image deployment/${{ env.KUBE_DEPLOYMENT_PREFIX }}-${{ env.ENVIRONMENT }} \
${{ env.KUBE_DEPLOYMENT_PREFIX }}-${{ env.ENVIRONMENT }}=${{ needs.prepair.outputs.image_name }} \
-n ${{ env.KUBE_NAMESPACE }}
- name: Restart deployment
uses: kodermax/kubectl-aws-eks@main
with:
args: |
rollout restart deployment/${{ env.KUBE_DEPLOYMENT_PREFIX }}-${{ env.ENVIRONMENT }} \
-n ${{ env.KUBE_NAMESPACE }}
- name: Check deployment
uses: kodermax/kubectl-aws-eks@main
with:
args: |
rollout status deployment/${{ env.KUBE_DEPLOYMENT_PREFIX }}-${{ env.ENVIRONMENT }} \
--timeout=240s \
-n ${{ env.KUBE_NAMESPACE }}
3 changes: 3 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ gclient.workspace = true
tokio.workspace = true
gear-core.workspace = true
primitive-types.workspace = true
parity-scale-codec.workspace = true
scale-info.workspace = true
hex = "0.4.3"


[build-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions composable-nft/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -420,9 +420,9 @@ extern "C" fn init() {
};
msg::send(
owner,
ComposableNftEvent::Initialized {
Ok::<ComposableNftEvent, ComposableNftError>(ComposableNftEvent::Initialized {
config: config.clone(),
},
}),
0,
)
.expect("Error during send to owner `ComposableNftEvent::Initialized`");
Expand Down
3 changes: 3 additions & 0 deletions frontend/.env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
VITE_NODE_ADDRESS=
VITE_IPFS_ADDRESS=
VITE_CONTRACT_ADDRESS=
66 changes: 66 additions & 0 deletions frontend/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
{
"root": true,
"env": { "browser": true, "es2020": true },

"extends": [
"eslint:recommended",
"plugin:react/recommended",
"plugin:react-hooks/recommended",
"plugin:react/jsx-runtime",
"plugin:import/recommended",
"plugin:jsx-a11y/recommended",
"prettier"
],

"settings": {
"ecmaVersion": "latest",
"react": {
"version": "detect"
},
"import/resolver": {
"typescript": true
}
},

"plugins": ["react", "react-hooks", "import", "jsx-a11y", "react-refresh"],

"overrides": [
{
"files": ["*.ts", "*.tsx"],

"parser": "@typescript-eslint/parser",
"parserOptions": { "project": ["./tsconfig.json", "./tsconfig.node.json"] },

"extends": [
"plugin:@typescript-eslint/eslint-recommended",
"plugin:@typescript-eslint/recommended",
"plugin:@typescript-eslint/recommended-requiring-type-checking",
"plugin:import/typescript"
],

"plugins": ["@typescript-eslint/eslint-plugin"],

"rules": {
// airbnb cfg
"no-shadow": "error",
"no-shadow-restricted-names": "error",

// dx
"@typescript-eslint/no-unused-vars": "warn",

// react-hook-form onSubmit
"@typescript-eslint/no-misused-promises": [2, { "checksVoidReturn": { "attributes": false } }],

// import sort
"import/order": [
1,
{
"groups": ["external", "builtin", "internal", "parent", "sibling", "index"],
"newlines-between": "always",
"alphabetize": { "order": "asc" }
}
]
}
}
]
}
27 changes: 27 additions & 0 deletions frontend/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
pnpm-debug.log*
lerna-debug.log*

node_modules
dist
dist-ssr
*.local

.env*
!.env.example

# Editor directories and files
.vscode/*
!.vscode/extensions.json
.idea
.DS_Store
*.suo
*.ntvs*
*.njsproj
*.sln
*.sw?
1 change: 1 addition & 0 deletions frontend/.npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
save-exact=true
11 changes: 11 additions & 0 deletions frontend/.prettierrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"singleQuote": true,
"trailingComma": "all",
"endOfLine": "lf",
"printWidth": 120,
"semi": true,
"bracketSpacing": true,
"bracketSameLine": true,
"arrowParens": "always",
"tabWidth": 2
}
1 change: 1 addition & 0 deletions frontend/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# Vara NFT Marketplace
13 changes: 13 additions & 0 deletions frontend/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Vara NFT Marketplace</title>
</head>
<body>
<div id="root"></div>
<script type="module" src="/src/main.tsx"></script>
</body>
</html>
49 changes: 49 additions & 0 deletions frontend/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
{
"name": "frontend",
"private": true,
"version": "0.0.1",
"type": "module",
"scripts": {
"start": "vite --open",
"build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0",
"preview": "vite preview"
},
"dependencies": {
"@gear-js/api": "0.35.2",
"@gear-js/react-hooks": "0.9.5",
"@gear-js/vara-ui": "0.0.6",
"@hookform/resolvers": "3.3.3",
"@polkadot/api": "10.10.1",
"@polkadot/api-derive": "10.10.1",
"@polkadot/react-identicon": "3.6.4",
"@polkadot/types": "10.10.1",
"kubo-rpc-client": "3.0.2",
"react": "18.2.0",
"react-dom": "18.2.0",
"react-hook-form": "7.49.2",
"react-router-dom": "6.21.0",
"zod": "3.22.4"
},
"devDependencies": {
"@types/react": "18.2.43",
"@types/react-dom": "18.2.17",
"@typescript-eslint/eslint-plugin": "6.14.0",
"@typescript-eslint/parser": "6.14.0",
"@vitejs/plugin-react": "4.2.1",
"eslint": "8.55.0",
"eslint-config-prettier": "9.1.0",
"eslint-import-resolver-typescript": "3.6.1",
"eslint-plugin-import": "2.29.0",
"eslint-plugin-jsx-a11y": "6.8.0",
"eslint-plugin-react": "7.33.2",
"eslint-plugin-react-hooks": "4.6.0",
"eslint-plugin-react-refresh": "0.4.5",
"sass": "1.69.5",
"typescript": "5.2.2",
"vite": "5.0.8",
"vite-plugin-checker": "0.6.2",
"vite-plugin-node-polyfills": "0.17.0",
"vite-plugin-svgr": "4.2.0"
}
}
Loading

0 comments on commit dd377b3

Please sign in to comment.