Skip to content

Commit 7bced2b

Browse files
authored
Merge branch 'develop' into areta
2 parents fc77e78 + 364e348 commit 7bced2b

File tree

16 files changed

+1215
-232
lines changed

16 files changed

+1215
-232
lines changed

public/locales/en/translation.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,13 @@
111111
"scrollSepoliaBlockExplorer": "Scroll Sepolia Explorer",
112112
"sepoliaRollupExplorer": "Rollup Explorer",
113113
"sepoliaBlockExplorer": "Scrollscan Explorer",
114-
"canvasBadge": "Canvas & Badge Integration"
114+
"transactionJourney": "Checking Transaction Journey"
115+
},
116+
"whatToBuild": {
117+
"whatToBuild": "What to Build",
118+
"stablecoinPaymentsTutorial": "Stablecoin Payments Tutorial",
119+
"solidityCookbook": "Solidity Cookbook",
120+
"privacyDappsWithZk": "Privacy dApps with ZK"
115121
},
116122
"technology": {
117123
"introduction": "Introduction",

public/locales/es/translation.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,12 @@
111111
"sepoliaRollupExplorer": "Explorador de Rollup",
112112
"sepoliaBlockExplorer": "Explorador de bloques Scrollscan"
113113
},
114+
"whatToBuild": {
115+
"whatToBuild": "Qué construir",
116+
"stablecoinPaymentsTutorial": "Pagos con Stablecoins",
117+
"solidityCookbook": "Recetario de Solidity",
118+
"privacyDappsWithZk": "Dapps Privadas con ZK"
119+
},
114120
"technology": {
115121
"introduction": "Introducción",
116122
"principles": "Principios",
141 KB
Loading
208 KB
Loading
145 KB
Loading
118 KB
Loading

src/config/sidebar.ts

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,17 @@ export const getSidebar = () => {
163163
url: formatUrl("developers/guides/running-a-scroll-node"),
164164
},
165165
{
166+
<<<<<<< areta
166167
title: t("sidebar.developers.auditingYourCode"),
167168
url: formatUrl("developers/guides/auditing-your-code"),
168169
},
169170
{
170171
title: t("sidebar.developers.canvasBadge"),
171172
url: formatUrl("developers/guides/canvas-badge-integration"),
173+
=======
174+
title: t("sidebar.developers.transactionJourney"),
175+
url: formatUrl("developers/guides/checking-transaction-journey"),
176+
>>>>>>> develop
172177
},
173178
// {
174179
// title: t("sidebar.developers.bridgingERC721NftThroughCustomGateway"),
@@ -184,6 +189,23 @@ export const getSidebar = () => {
184189
// },
185190
],
186191
},
192+
{
193+
section: t("sidebar.whatToBuild.whatToBuild"),
194+
contents: [
195+
{
196+
title: t("sidebar.whatToBuild.stablecoinPaymentsTutorial"),
197+
url: formatUrl("developers/what-to-build/stablecoin-payments-tutorial"),
198+
},
199+
{
200+
title: t("sidebar.whatToBuild.solidityCookbook"),
201+
url: formatUrl("developers/what-to-build/solidity-cookbook"),
202+
},
203+
{
204+
title: t("sidebar.whatToBuild.privacyDappsWithZk"),
205+
url: formatUrl("developers/what-to-build/privacy-dapps-with-zk"),
206+
},
207+
],
208+
},
187209
{
188210
section: t("sidebar.developers.mainnetResources"),
189211
contents: [
Binary file not shown.
Binary file not shown.
175 KB
Loading

0 commit comments

Comments
 (0)