Skip to content

Commit

Permalink
Sync new app structure from develop
Browse files Browse the repository at this point in the history
  • Loading branch information
shanejearley committed Dec 15, 2023
2 parents a142e08 + 24795e6 commit c7e9999
Show file tree
Hide file tree
Showing 209 changed files with 11,198 additions and 10,930 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/promote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

# Skip any pushes from the act CLI
# Comment out for testing
if: ${{ github.actor != 'nektos/act' }}
if: ${{ github.actor != "nektos/act" }}

steps:
- uses: actions/checkout@v3
Expand Down
11 changes: 7 additions & 4 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ jobs:
name: Test
runs-on: ubuntu-latest
steps:
- name: Check out the repo
- name: Checkout the repo with submodules
uses: actions/checkout@v3
with:
submodules: 'recursive'
submodules: "recursive"

- name: Setup Node.js LTS
uses: actions/setup-node@v4
with:
node-version: "lts/*"

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
Expand All @@ -28,8 +33,6 @@ jobs:

- name: Install and build all package dependencies
run: npm ci
env:
PUBLIC_STAGE: ${{ env.STAGE }}

- name: Test cdk deployment
run: npm run test:cdk
23 changes: 13 additions & 10 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,31 +13,34 @@ jobs:
name: Deploy
runs-on: ubuntu-latest

# Skip any pushes with commit flag '(skip deploy)'
# Skip any pushes with commit flag "(skip deploy)"
# Comment out for testing
if: ${{ !contains(github.event.head_commit.message, '(skip deploy)') }}
if: ${{ !contains(github.event.head_commit.message, "(skip deploy)") }}

steps:
- name: Check out the repo
- name: Checkout the repo with submodules
uses: actions/checkout@v3
with:
submodules: 'recursive'

- name: Install action dependencies
run: |
curl -sSf https://atlasgo.sh | sh
submodules: "recursive"

- name: Setup Node.js LTS
uses: actions/setup-node@v4
with:
node-version: "lts/*"

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Install action dependencies
run: |
curl -sSf https://atlasgo.sh | sh
- name: Install and build all package dependencies
run: npm ci
env:
PUBLIC_STAGE: ${{ env.STAGE }}

- name: Deploy cdk infrastructure
run: npm run deploy:cdk
Expand Down
21 changes: 14 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,15 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Check out the repo
- name: Checkout the repo with submodules
uses: actions/checkout@v3
with:
submodules: 'recursive'
submodules: "recursive"

- name: Setup Node.js LTS
uses: actions/setup-node@v4
with:
node-version: "lts/*"

- name: Get the tag name
run: |
Expand All @@ -30,18 +35,20 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

# - name: Install action dependencies
# run: |
# curl -sSf https://atlasgo.sh | sh

- name: Install and build all package dependencies
run: npm ci
env:
PUBLIC_STAGE: ${{ env.STAGE }}

- name: Deploy cdk infrastructure
- name: Deploy CDK infrastructure
run: npm run deploy:cdk

# - name: Migrate users database
# run: npm run migrations:users

- name: Check out develop
- name: Checkout develop
uses: actions/checkout@v3
with:
ref: develop
Expand All @@ -52,7 +59,7 @@ jobs:
git fetch origin master:master
git reset --hard master
- name: Create Pull Request
- name: Create a pull request
uses: peter-evans/create-pull-request@v3
with:
base: develop
Expand Down
21 changes: 13 additions & 8 deletions .github/workflows/sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,20 @@ jobs:
name: Deploy
runs-on: ubuntu-latest

# Skip any pushes with commit flag '(skip deploy)'
# Skip any pushes with commit flag "(skip deploy)"
# Comment out for testing
if: ${{ !contains(github.event.head_commit.message, '(skip deploy)') }}
if: ${{ !contains(github.event.head_commit.message, "(skip deploy)") }}

steps:
- name: Check out the repo
- name: Checkout the repo with submodules
uses: actions/checkout@v3
with:
submodules: 'recursive'
submodules: "recursive"

- name: Install action dependencies
run: |
curl -sSf https://atlasgo.sh | sh
- name: Setup Node.js LTS
uses: actions/setup-node@v4
with:
node-version: "lts/*"

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
Expand All @@ -37,12 +38,16 @@ jobs:
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ${{ env.AWS_REGION }}

- name: Install action dependencies
run: |
curl -sSf https://atlasgo.sh | sh
- name: Install and build all package dependencies
run: npm ci
env:
PUBLIC_STAGE: ${{ env.STAGE }}

- name: Deploy cdk infrastructure
- name: Deploy CDK infrastructure
run: npm run deploy:cdk

- name: Migrate users database
Expand Down
10 changes: 5 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
{
"css.lint.unknownAtRules": "ignore",
"editor.codeActionsOnSave": {
"source.fixAll.eslint": "explicit"
},
"eslint.validate": [
"vue",
"typescript"
],
"[html]": {
"editor.defaultFormatter": "Vue.volar"
},
Expand All @@ -14,10 +19,5 @@
"[json]": {
"editor.defaultFormatter": "vscode.json-language-features"
},
"eslint.validate": [
"vue",
"typescript"
],
"css.lint.unknownAtRules": "ignore",
"volar.inlayHints.eventArgumentInInlineHandlers": false
}
20 changes: 19 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [v1.0.0-beta.4](https://github.com/consensusnetworks/casimir/compare/v1.0.0-beta.3...v1.0.0-beta.4)

- Promote develop to master [`#466`](https://github.com/consensusnetworks/casimir/pull/466)
- Minor changes to class names [`#465`](https://github.com/consensusnetworks/casimir/pull/465)
- Promote develop to master [`#451`](https://github.com/consensusnetworks/casimir/pull/451)
- Update/eslint rules [`#457`](https://github.com/consensusnetworks/casimir/pull/457)
- Fix rebalance bug and add sanity check [`#454`](https://github.com/consensusnetworks/casimir/pull/454)
- Fix undefined value in breakdown metrics [`#455`](https://github.com/consensusnetworks/casimir/pull/455)
- P.S. this closes #444 [`#456`](https://github.com/consensusnetworks/casimir/pull/456)
- UI Fixes to Operator Page and Stake/Withdraw Component [`#450`](https://github.com/consensusnetworks/casimir/pull/450)
- Merge pull request #456 from consensusnetworks/enhancement/no-dup-addresses [`#444`](https://github.com/consensusnetworks/casimir/issues/444)
- Merge pull request #463 from consensusnetworks/bug/build [`84aef1a`](https://github.com/consensusnetworks/casimir/commit/84aef1a2d185d513adc48b4f7c41675a0bd36493)
- Merge pull request #464 from consensusnetworks/bug/mobile-view [`b975a26`](https://github.com/consensusnetworks/casimir/commit/b975a26c9f82304cf76b3262b9173b59a2c5a46d)
- Enforce eslint rules while ignoring appropriate files && update Connect Wallet dropdown [`26ff60a`](https://github.com/consensusnetworks/casimir/commit/26ff60a3a3ad2c2128287287219b8e4f403fa20e)

#### [v1.0.0-beta.3](https://github.com/consensusnetworks/casimir/compare/v1.0.0-beta.2...v1.0.0-beta.3)

> 31 October 2023
- Release v1.0.0-beta.3 [`338c1a7`](https://github.com/consensusnetworks/casimir/commit/338c1a77e5a91f53d5c0824f58ae7ef7584fb60b)
- Fix nodes and blog cdk providers [`ff8a73a`](https://github.com/consensusnetworks/casimir/commit/ff8a73aff189602910ee53c4af742f18c27d3a13)

#### [v1.0.0-beta.2](https://github.com/consensusnetworks/casimir/compare/v1.0.0-beta.1...v1.0.0-beta.2)
Expand Down Expand Up @@ -155,7 +173,7 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
- Add initial Ethereum service notes and config [`#251`](https://github.com/consensusnetworks/casimir/pull/251)
- Add chart component prototypes [`#249`](https://github.com/consensusnetworks/casimir/pull/249)
- Revert "Feature/chart components" [`#248`](https://github.com/consensusnetworks/casimir/pull/248)
- Add polyfill for node stream to @casimir/web [`#242`](https://github.com/consensusnetworks/casimir/pull/242)
- Add polyfill for node stream to @casimir/app [`#242`](https://github.com/consensusnetworks/casimir/pull/242)
- Promote develop to master [`#241`](https://github.com/consensusnetworks/casimir/pull/241)
- Resovle issues [`7303036`](https://github.com/consensusnetworks/casimir/commit/73030369693d066f0f270242f195ddf95f59b6c3)
- Mock up Analytics component [`ba085a0`](https://github.com/consensusnetworks/casimir/commit/ba085a0cad75a0c5a53db0bcc3bbc3611025ae85)
Expand Down
Loading

0 comments on commit c7e9999

Please sign in to comment.