Skip to content

Commit

Permalink
Merge pull request #1453 from starknet-io/dev
Browse files Browse the repository at this point in the history
Merge dev into production
  • Loading branch information
lorcan-codes authored Sep 26, 2023
2 parents 1ad0fa6 + 23b39f0 commit 47bdb78
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
13 changes: 6 additions & 7 deletions .github/workflows/website.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ jobs:
name: Build and Deploy
environment:
name: Starknet Website ${{ github.ref_name }}
url: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-website.pages.dev
url: https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-websites.pages.dev
runs-on: ubuntu-22.04
steps:
- name: Checkout
Expand Down Expand Up @@ -55,7 +55,7 @@ jobs:
if [ "${{ env.GITHUB_REF_SLUG_URL }}" = "production" ]; then
echo "VITE_SITE_URL=https://www.starknet.io" >> $GITHUB_ENV
else
echo "VITE_SITE_URL=https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-website.pages.dev" >> $GITHUB_ENV
echo "VITE_SITE_URL=https://${{ env.GITHUB_REF_SLUG_URL }}.starknet-websites.pages.dev" >> $GITHUB_ENV
fi
- name: Build project
Expand All @@ -64,17 +64,16 @@ jobs:
VITE_ALGOLIA_INDEX: ${{ github.ref_name == 'production' && 'production' || 'dev' }}
VITE_ALGOLIA_APP_ID: ${{ secrets.ALGOLIA_APP_ID }}
VITE_ALGOLIA_SEARCH_API_KEY: ${{ secrets.ALGOLIA_SEARCH_API_KEY }}
VITE_CF_STREAM_URL: ${{ secrets.CF_STREAM_URL }}
VITE_CF_STREAM_URL: ${{ secrets.NEW_CF_STREAM_URL }}

- name: Publish
uses: cloudflare/pages-action@v1
with:
apiToken: ${{ secrets.CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.CLOUDFLARE_ACCOUNT_ID }}
projectName: starknet-website
apiToken: ${{ secrets.NEW_CLOUDFLARE_API_TOKEN }}
accountId: ${{ secrets.NEW_CLOUDFLARE_ACCOUNT_ID }}
projectName: starknet-websites
directory: dist/client
workingDirectory: workspaces/website
wranglerVersion: '3'
gitHubToken: ${{ secrets.GITHUB_TOKEN }}
branch: ${{ github.ref_name == 'production' && 'main' || github.ref_name }}

10 changes: 10 additions & 0 deletions _data/settings/wallets.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,24 @@ items:
via its Hardware Signer 2-factor authentication and multi-signer 3-factor
authentication capabilities.
- body: Earn, stake and trade with low fees, high speeds & strong security.

type_list:
- type: browser_extension
url: https://chrome.google.com/webstore/detail/argent-x/dlcobpjiigpikoobohmabehhmhfoodbb
- type: ios
url: https://apps.apple.com/us/app/argent-defi-in-a-tap/id1358741926
- type: android
url: https://play.google.com/store/apps/details?id=im.argent.contractwalletclient
- type: SDK
url: https://www.argent.xyz/web-wallet-sdk
name: Argent X
website_url: https://www.argent.xyz/argent-x/
discord: https://discord.gg/8yVmtsgtgm
twitter: https://twitter.com/argentHQ
type:
- browser_extension
- ios
- android
- SDK
image: /assets/argent.jpg
description: Earn, stake and trade with low fees, high speeds & strong security.
8 changes: 4 additions & 4 deletions workspaces/website/src/components/VideoPlayer/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,31 +12,31 @@ export const playlist: Chapter[] = [
title: "How Starknet scales Ethereum",
description: "Chapter 1 explains how Starknet works at a high level",
thumbnail: "/assets/video/chapter1.png",
videoId: "abd99c9696f1862f828c6e18136d75e5",
videoId: "2805da1fb7f9cd49888f680c26e386fd",
durationTime: "02:42",
},
{
id: "sequencer",
title: "The Starknet Sequencer",
description: "Chapter 2 explains about the Starknet Sequencer",
thumbnail: "/assets/video/chapter2.png",
videoId: "7ca4a89a8031a1737e4632ec498afb55",
videoId: "47d80010706a05bc4e4dae6cdd43b8be",
durationTime: "02:24",
},
{
id: "prover",
title: "The Starknet Prover",
description: "Chapter 3 explains how the Starknet Prover works",
thumbnail: "/assets/video/chapter3.png",
videoId: "b66a934468bf72606e60abd7d475acf3",
videoId: "a23465bbd7c3b27489a29abf4373a55d",
durationTime: "02:26",
},
{
id: "eth-settlement",
title: "Secure settlement on Ethereum",
description: "Chapter 4 explains how to secure settlement on Ethereum",
thumbnail: "/assets/video/chapter4.png",
videoId: "af654c93367a0d4eae7ea90252ac342e",
videoId: "69ba2bd9bdd2ba2970c0fbe3b75c3ec0",
durationTime: "03:28",
},
];
Expand Down

1 comment on commit 47bdb78

@vercel
Copy link

@vercel vercel bot commented on 47bdb78 Sep 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

starknet-summit-website – ./workspaces/starknet-summit

starknet-summit-website-git-production-yuki-labs.vercel.app
starknet-summit-website.vercel.app
summit23.starknet.io
starknet-summit-website-yuki-labs.vercel.app

Please sign in to comment.