Skip to content

Commit

Permalink
Merge branch 'feat/tailwind-4' into ops/preview-1
Browse files Browse the repository at this point in the history
  • Loading branch information
fran-ink committed Feb 24, 2025
2 parents b2ab949 + 21a2470 commit 2229a96
Show file tree
Hide file tree
Showing 79 changed files with 830 additions and 1,659 deletions.
8 changes: 1 addition & 7 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ INK_APP_SUBMISSION_TARGET_BRANCH=
INK_APP_SUBMISSION_SLACK_NOTIFICATION_CHANNEL=
INK_APP_SUBMISSION_SLACK_BOT_TOKEN=

# Smart Account Experiment
NEXT_PUBLIC_BUNDLER_URL=
NEXT_PUBLIC_PASSKEY_SERVER_URL=
NEXT_PUBLIC_PAYMASTER_URL=
NEXT_PUBLIC_GELATO_BRIDGE_URL=
NEXT_PUBLIC_FAUCET_API_URL=

# Testnet Faucet Experiment
NEXT_PUBLIC_FAUCET_API_URL=
MULTIPLIER_JWT_SECRET=
8 changes: 1 addition & 7 deletions .github/workflows/ship.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,14 +66,8 @@ jobs:
INK_APP_SUBMISSION_SLACK_NOTIFICATION_CHANNEL=${{ secrets.INK_APP_SUBMISSION_SLACK_NOTIFICATION_CHANNEL }}
INK_APP_SUBMISSION_SLACK_BOT_TOKEN=${{ secrets.INK_APP_SUBMISSION_SLACK_BOT_TOKEN }}
# Smart Account Experiment
NEXT_PUBLIC_BUNDLER_URL=${{ secrets.NEXT_PUBLIC_BUNDLER_URL }}
NEXT_PUBLIC_PASSKEY_SERVER_URL=${{ secrets.NEXT_PUBLIC_PASSKEY_SERVER_URL }}
NEXT_PUBLIC_PAYMASTER_URL=${{ secrets.NEXT_PUBLIC_PAYMASTER_URL }}
NEXT_PUBLIC_GELATO_BRIDGE_URL=${{ secrets.NEXT_PUBLIC_GELATO_BRIDGE_URL }}
NEXT_PUBLIC_FAUCET_API_URL=${{ secrets.NEXT_PUBLIC_FAUCET_API_URL }}
# Testnet Faucet Experiment
NEXT_PUBLIC_FAUCET_API_URL=${{ secrets.NEXT_PUBLIC_FAUCET_API_URL }}
MULTIPLIER_JWT_SECRET=${{ secrets.MULTIPLIER_JWT_SECRET }}
EOF
Expand Down
26 changes: 20 additions & 6 deletions messages/en-US.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,9 @@
"pre": "Ink, the Ethereum L2 unleashed by Kraken, is live on the Superchain",
"title": "Ink the future",
"tagLine": "Simplified DeFi for|builders,degens,gigachads,institutions,normies,ALL",
"cta:exploreApps": "Explore Apps"
"cta:exploreApps": "Explore Apps",
"appsTitle": "Featured apps on Ink",
"appsCta": "View all apps"
},
"Community": {
"title": "Join the Ink Community",
Expand All @@ -64,7 +66,7 @@
"description": "Join the Ink community, vibe with fellow developers and get support"
},
"twitter": {
"title": "Follow us on Twitter",
"title": "Follow us on X",
"description": "Stay tuned to receive all ink updates first hand"
},
"discord": {
Expand All @@ -87,7 +89,7 @@
},
"Verify": {
"title": "Get Verified and Start Your On-Chain Journey Today",
"description": "Ink Verify — Seamlessly authenticate your activity, unlock rewards, and explore the limitless potential of Ink",
"description": "Ink Verify — Seamlessly authenticate your activity, unlock rewards, and explore the limitless potential of Ink.",
"cta": "Connect to verify",
"whatIsVerify": {
"title": "What is Ink Verify?",
Expand All @@ -103,12 +105,12 @@
},
"haveASuggestion": {
"title": "Have a suggestion?",
"description": "Ink Verify is a tool for both users and developers! Have a suggestion? Reach out to the Ink team to request additional categories here",
"description": "Ink Verify is a tool for both users and developers! Have a suggestion? Reach out to the Ink team to request additional categories here.",
"contactTeam": "Contact Team"
},
"verifications": {
"title": "Available verifications",
"description": "Discover the latest verifications on Ink"
"description": "Discover the latest verifications on Ink."
}
},
"About": {
Expand All @@ -117,7 +119,19 @@
},
"Builders": {
"title": "Start building on Ink",
"description": "Our commitment to builders: Ink will provide you with a world class development environment, complete with the tools, support, and users you need to bring your ideas to life."
"description": "Our commitment to builders: Ink will provide you with a world class development environment, complete with the tools, support, and users you need to bring your ideas to life.",
"grants": {
"title": "Grants",
"description": "Recognizing Ink builders"
},
"applyForGrant": {
"title": "Apply for Grant",
"description": "Do you have an amazing project you want to deploy on Ink? Apply to receive a grant!"
},
"applyForRetroGrant": {
"title": "Apply for Retro Grant",
"description": "Saw something amazing deployed on Ink? Submit a project, team, or builder for a retroactive grant."
}
},
"events": {
"ethdenver": {
Expand Down
8 changes: 3 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,6 @@
"@types/react-dom": "19.0.3",
"@types/three": "0.170.0",
"@walletconnect/ethereum-provider": "2.13.3",
"@zerodev/passkey-validator": "5.5.0-beta.0",
"@zerodev/sdk": "5.4.0-beta.0",
"class-variance-authority": "0.7.1",
"cookies-next": "4.2.1",
"ethers": "6.13.1",
Expand Down Expand Up @@ -66,10 +64,10 @@
},
"devDependencies": {
"@playwright/test": "1.45.0",
"@tailwindcss/postcss": "^4.0.8",
"@types/node": "22",
"@typescript-eslint/eslint-plugin": "8.23.0",
"@typescript-eslint/parser": "8.23.0",
"autoprefixer": "10.4.20",
"clsx": "2.1.1",
"dotenv": "16.4.5",
"eslint": "9.14.0",
Expand All @@ -83,8 +81,8 @@
"postcss": "8",
"prettier": "3.3.3",
"schema-dts": "1.1.2",
"tailwind-merge": "2.3.0",
"tailwindcss": "3.4.4",
"tailwind-merge": "3.0.2",
"tailwindcss": "4.0.8",
"typescript": "5.7.3"
},
"packageManager": "[email protected]",
Expand Down
Loading

0 comments on commit 2229a96

Please sign in to comment.