Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge branch test to master #22

Merged
merged 14 commits into from
Aug 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .github/workflows/deploy-prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,40 +6,40 @@ on:
- master

jobs:
ci:
deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Read .nvmrc
run: echo ::set-output name=NVMRC::$(cat .nvmrc)
id: nvm
run: echo "NVMRC=$(cat .nvmrc)" >> "$GITHUB_OUTPUT"

- name: Setup Node
uses: actions/setup-node@v2.1.2
uses: actions/setup-node@v4
with:
node-version: '${{ steps.nvm.outputs.NVMRC }}'

- name: Cache node_modules
uses: actions/cache@v2
with:
path: node_modules
key: ubuntu-node-v${{ steps.nvm.outputs.NVMRC }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
key: ubuntu-node-v${{ steps.nvm.outputs.NVMRC }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package.json')) }}

- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn
run: npm install

- name: Build
run: yarn build
run: npm run build
env:
NITRO_PRESET: cloudflare
NITRO_PRESET: cloudflare_module
NODE_OPTIONS: "--max_old_space_size=4096"

- name: Publish to Cloudflare
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
environment: 'production'
18 changes: 9 additions & 9 deletions .github/workflows/deploy-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,39 +6,39 @@ on:
- test

jobs:
ci:
deploy:
runs-on: ubuntu-latest

steps:
- name: Checkout
uses: actions/checkout@master
uses: actions/checkout@v4

- name: Read .nvmrc
run: echo ::set-output name=NVMRC::$(cat .nvmrc)
id: nvm
run: echo "NVMRC=$(cat .nvmrc)" >> "$GITHUB_OUTPUT"

- name: Setup Node
uses: actions/setup-node@v2.1.2
uses: actions/setup-node@v4
with:
node-version: '${{ steps.nvm.outputs.NVMRC }}'

- name: Cache node_modules
uses: actions/cache@v2
with:
path: node_modules
key: ubuntu-node-v${{ steps.nvm.outputs.NVMRC }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/yarn.lock')) }}
key: ubuntu-node-v${{ steps.nvm.outputs.NVMRC }}-deps-${{ hashFiles(format('{0}{1}', github.workspace, '/package.json')) }}

- name: Install Dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn
run: npm install

- name: Build
run: yarn build
run: npm run build
env:
NITRO_PRESET: cloudflare
NITRO_PRESET: cloudflare_module
NODE_OPTIONS: "--max_old_space_size=4096"

- name: Publish to Cloudflare
uses: cloudflare/wrangler-action@2.0.0
uses: cloudflare/wrangler-action@v3
with:
apiToken: ${{ secrets.CF_API_TOKEN }}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ dist
.DS_Store
.vscode
.vercel
.wrangler
1 change: 1 addition & 0 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v18
28 changes: 28 additions & 0 deletions assets/images/dao/bulb.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
18 changes: 18 additions & 0 deletions assets/images/dao/chart.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions assets/images/dao/intro.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/images/dao/thumb.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
16 changes: 16 additions & 0 deletions assets/images/dao/user.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions assets/styles/main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@ $radius: 12px;
}

.buttons {
position: relative;
z-index: 99;
gap: 12px;

@include mobile {
Expand Down
6 changes: 6 additions & 0 deletions components/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,12 @@ function toggleMenu(target: string | null) {
</div>
</div>

<div class="navbar-item no-dropdown root-item">
<NuxtLink class="navbar-link is-arrowless goto" to="/dao">
DAO
</NuxtLink>
</div>

<div class="navbar-item no-dropdown root-item">
<NuxtLink class="navbar-link is-arrowless goto" to="/ecosystem">
Ecosystem
Expand Down
6 changes: 5 additions & 1 deletion content/links.json
Original file line number Diff line number Diff line change
Expand Up @@ -170,5 +170,9 @@
"en": "https://medium.com/vitelabs/updated-list-of-sbp-who-pay-vite-voters-b461da8e1542"
}
},
"mainnetRelease": "https://forum.vite.net/topic/2753/announcing-the-vite-mainnet-launch"
"mainnetRelease": "https://forum.vite.net/topic/2753/announcing-the-vite-mainnet-launch",
"dao": {
"home": "https://dao.vite.org/",
"more": "https://medium.com/vitelabs/empoweringcommunity-governance-introducing-vdao-token-airdrop-on-the-vite-network-727820fa41a7"
}
}
Loading
Loading