Skip to content

Commit 7a5b458

Browse files
marcel-bitflymarcel-bitfly
committed
fix(products): layout due to false merge conflict resolution 
1 parent 37e8eca commit 7a5b458

File tree

1 file changed

+129
-246
lines changed
  • frontend/layers/products/app/pages/products

1 file changed

+129
-246
lines changed

‎frontend/layers/products/app/pages/products/index.vue‎

Lines changed: 129 additions & 246 deletions
Original file line numberDiff line numberDiff line change
@@ -108,266 +108,149 @@ const {
108108
@search="execute()"
109109
/>
110110
</section>
111-
<div class="flex flex-col gap-11xl">
112-
<section class="mt-11xl p-md">
113-
<h2 class="text-center">
114-
{{ $t('products.landing_page.search.title') }}
115-
</h2>
116-
</section>
117-
<ProductLandingpageSection class="mt-11xl p-md">
118-
<BaseHeading
119-
is="h2"
120-
:id="id.api"
121-
size="lg"
122-
>
123-
{{ $t('products.landing_page.api.title') }}
124-
</BaseHeading>
125-
<p>{{ $t('products.landing_page.api.description') }}</p>
126-
<BaseButton
127-
leading-icon="file-code-2"
128-
trailing-icon="arrow-up-right"
129-
variant="branded"
130-
size="xl"
131-
to="/products/pricing"
111+
<ProductLandingpageSection class="mt-11xl p-md">
112+
<BaseHeading
113+
is="h2"
114+
:id="id.api"
115+
size="lg"
116+
>
117+
{{ $t('products.landing_page.api.title') }}
118+
</BaseHeading>
119+
<p>{{ $t('products.landing_page.api.description') }}</p>
120+
<BaseButton
121+
leading-icon="file-code-2"
122+
trailing-icon="arrow-up-right"
123+
variant="branded"
124+
size="xl"
125+
to="/products/pricing"
126+
>
127+
{{ $t('products.landing_page.api.action.go_to_api') }}
128+
</BaseButton>
129+
<BaseCardLayout
130+
layout="2fr_1fr"
131+
>
132+
<BaseCard
133+
title-is="h3"
134+
:title="$t('products.landing_page.api.cards.api_docs.title')"
135+
:subtitle="$t('products.landing_page.api.cards.api_docs.subtitle')"
136+
title-icon="file-code-2"
137+
title-to="products/api/docs"
132138
>
133-
{{ $t('products.landing_page.api.action.go_to_api') }}
134-
</BaseButton>
135-
<BaseCardLayout
136-
layout="2fr_1fr"
139+
<div class="grid grid-cols-2 lg:grid-cols-3 gap-5xl mt-7xl">
140+
<article class="flex flex-col gap-4xl">
141+
<ProductLandingIconApiExplorer
142+
class="size-6xl"
143+
/>
144+
<BaseHeading
145+
is="h4"
146+
size="xs"
147+
>
148+
{{ $t('products.landing_page.api.cards.api_docs.explorer_api.title') }}
149+
</BaseHeading>
150+
<BaseList
151+
:items="[
152+
$t('products.landing_page.api.cards.api_docs.explorer_api.list.real_time_transactions'),
153+
$t('products.landing_page.api.cards.api_docs.explorer_api.list.historical_gas_prices'),
154+
$t('products.landing_page.api.cards.api_docs.explorer_api.list.address_and_contract_analytics'),
155+
]"
156+
/>
157+
</article>
158+
<article class="flex flex-col gap-4xl">
159+
<ProductLandingIconApiStakinghub
160+
class="size-6xl"
161+
/>
162+
<BaseHeading
163+
is="h4"
164+
size="xs"
165+
>
166+
{{ $t('products.landing_page.api.cards.api_docs.stakinghub_api.title') }}
167+
</BaseHeading>
168+
<BaseList
169+
:items="[
170+
$t('products.landing_page.api.cards.api_docs.stakinghub_api.list.validator_performance_metrics'),
171+
$t('products.landing_page.api.cards.api_docs.stakinghub_api.list.real_time_staking_rewards_data'),
172+
$t('products.landing_page.api.cards.api_docs.stakinghub_api.list.validator_status_and_lifecycle_events'),
173+
]"
174+
/>
175+
</article>
176+
<article class="flex flex-col gap-4xl">
177+
<ProductLandingIconApiResourceMgmt
178+
class="size-6xl"
179+
/>
180+
<BaseHeading
181+
is="h4"
182+
size="xs"
183+
>
184+
{{ $t('products.landing_page.api.cards.api_docs.resource_management_api.title') }}
185+
</BaseHeading>
186+
<BaseList
187+
:items="[
188+
$t('products.landing_page.api.cards.api_docs.resource_management_api.list.add_remove_dashboards'),
189+
$t('products.landing_page.api.cards.api_docs.resource_management_api.list.configure_validator_notifications'),
190+
]"
191+
/>
192+
</article>
193+
</div>
194+
</BaseCard>
195+
<BaseCard
196+
class="flex gap-3xl"
137197
>
138-
<BaseCard
139-
title-is="h3"
140-
:title="$t('products.landing_page.api.cards.api_docs.title')"
141-
:subtitle="$t('products.landing_page.api.cards.api_docs.subtitle')"
142-
title-icon="file-code-2"
143-
title-to="products/api/docs"
144-
>
145-
<div class="grid grid-cols-2 lg:grid-cols-3 gap-5xl mt-7xl">
146-
<article class="flex flex-col gap-4xl">
147-
<ProductLandingIconApiExplorer
148-
class="size-6xl"
149-
/>
150-
<BaseHeading
151-
is="h4"
152-
size="xs"
153-
>
154-
{{ $t('products.landing_page.api.cards.api_docs.explorer_api.title') }}
155-
</BaseHeading>
156-
<BaseList
157-
:items="[
158-
$t('products.landing_page.api.cards.api_docs.explorer_api.list.real_time_transactions'),
159-
$t('products.landing_page.api.cards.api_docs.explorer_api.list.historical_gas_prices'),
160-
$t('products.landing_page.api.cards.api_docs.explorer_api.list.address_and_contract_analytics'),
161-
]"
162-
/>
163-
</article>
164-
<article class="flex flex-col gap-4xl">
165-
<ProductLandingIconApiStakinghub
166-
class="size-6xl"
167-
/>
168-
<BaseHeading
169-
is="h4"
170-
size="xs"
171-
>
172-
{{ $t('products.landing_page.api.cards.api_docs.stakinghub_api.title') }}
173-
</BaseHeading>
174-
<BaseList
175-
:items="[
176-
$t('products.landing_page.api.cards.api_docs.stakinghub_api.list.validator_performance_metrics'),
177-
$t('products.landing_page.api.cards.api_docs.stakinghub_api.list.real_time_staking_rewards_data'),
178-
$t('products.landing_page.api.cards.api_docs.stakinghub_api.list.validator_status_and_lifecycle_events'),
179-
]"
180-
/>
181-
</article>
182-
<article class="flex flex-col gap-4xl">
183-
<ProductLandingIconApiResourceMgmt
184-
class="size-6xl"
185-
/>
186-
<BaseHeading
187-
is="h4"
188-
size="xs"
189-
>
190-
{{ $t('products.landing_page.api.cards.api_docs.resource_management_api.title') }}
191-
</BaseHeading>
192-
<BaseList
193-
:items="[
194-
$t('products.landing_page.api.cards.api_docs.resource_management_api.list.add_remove_dashboards'),
195-
$t('products.landing_page.api.cards.api_docs.resource_management_api.list.configure_validator_notifications'),
196-
]"
197-
/>
198-
</article>
199-
</div>
200-
</BaseCard>
201-
<BaseCard
202-
class="flex gap-3xl"
198+
<BaseHeading
199+
is="h3"
200+
size="2xl"
201+
class="mt-auto"
203202
>
204-
<BaseHeading
205-
is="h3"
206-
size="2xl"
207-
class="mt-auto"
203+
{{ $t('products.landing_page.api.cards.api_key.title') }}
204+
</BaseHeading>
205+
<p>
206+
{{ $t('products.landing_page.api.cards.api_key.subtitle') }}
207+
</p>
208+
<template #footer>
209+
<BaseButton
210+
size="xl"
211+
variant="branded"
212+
full
213+
class="mt-7xl"
214+
to="/products/api/key-management"
208215
>
209-
{{ $t('products.landing_page.api.cards.api_key.title') }}
210-
</BaseHeading>
211-
<p>
212-
{{ $t('products.landing_page.api.cards.api_key.subtitle') }}
213-
</p>
214-
<template #footer>
215-
<BaseButton
216-
size="xl"
217-
variant="branded"
218-
full
219-
class="mt-7xl"
220-
to="/products/api/key-management"
221-
>
222-
{{ $t('products.landing_page.api.cards.api_key.action.get_api_key') }}
223-
</BaseButton>
224-
</template>
225-
</BaseCard>
226-
<BaseCard
227-
title-is="h3"
228-
:title="$t('products.landing_page.api.cards.api_pricing_plan.title')"
229-
title-icon="file-code-2"
230-
:subtitle="$t('products.landing_page.api.cards.api_pricing_plan.subtitle')"
216+
{{ $t('products.landing_page.api.cards.api_key.action.get_api_key') }}
217+
</BaseButton>
218+
</template>
219+
</BaseCard>
220+
<BaseCard
221+
title-is="h3"
222+
:title="$t('products.landing_page.api.cards.api_pricing_plan.title')"
223+
title-icon="file-code-2"
224+
:subtitle="$t('products.landing_page.api.cards.api_pricing_plan.subtitle')"
225+
>
226+
<BaseButton
227+
v-if="sm"
228+
variant="quaternary"
229+
size="xl"
230+
trailing-icon="arrow-up-right"
231+
to="/products/pricing"
231232
>
233+
{{ $t('products.landing_page.api.cards.api_pricing_plan.action.compare_plans') }}
234+
</BaseButton>
235+
<template #footer>
232236
<BaseButton
233-
v-if="sm"
234-
variant="quaternary"
237+
v-if="!sm"
238+
variant="secondary"
235239
size="xl"
240+
full
236241
trailing-icon="arrow-up-right"
237242
to="/products/pricing"
238243
>
239244
{{ $t('products.landing_page.api.cards.api_pricing_plan.action.compare_plans') }}
240245
</BaseButton>
241-
<template #footer>
242-
<BaseButton
243-
v-if="!sm"
244-
variant="secondary"
245-
size="xl"
246-
full
247-
trailing-icon="arrow-up-right"
248-
to="/products/pricing"
249-
>
250-
{{ $t('products.landing_page.api.cards.api_pricing_plan.action.compare_plans') }}
251-
</BaseButton>
252-
</template>
253-
</BaseCard>
254-
</BaseCardLayout>
255-
</ProductLandingpageSection>
256-
<ProductLandingpageSection>
257-
<ProductLandingpageSectionStakinghub />
258-
</ProductLandingpageSection>
259-
<ProductLandingpageSection
260-
class="background-image"
261-
>
262-
<BaseHeading
263-
is="h2"
264-
:id="id.explorer"
265-
size="lg"
266-
>
267-
{{ $t('products.landing_page.explorer.title') }}
268-
</BaseHeading>
269-
<p>{{ $t('products.landing_page.explorer.description') }}</p>
270-
<BaseButton
271-
leading-icon="compass"
272-
trailing-icon="arrow-up-right"
273-
variant="branded"
274-
size="xl"
275-
to="/"
276-
>
277-
{{ $t('products.landing_page.explorer.action.go_to_explorer') }}
278-
</BaseButton>
279-
<div class="flex justify-center flex-wrap gap-6xl mt-7xl w-full font-semibold">
280-
<span class="flex flex-col items-center min-w-[224px]">
281-
<BaseIcon
282-
name="clock"
283-
class="size-6xl"
284-
/>
285-
<BaseText
286-
size="2xl"
287-
class="mt-4xl"
288-
>
289-
{{ $t('products.landing_page.explorer.transaction_tracking.title') }}
290-
</BaseText>
291-
<BaseText
292-
size="sm"
293-
class="mt-md"
294-
variant="secondary"
295-
>
296-
{{ $t('products.landing_page.explorer.transaction_tracking.description') }}
297-
</BaseText>
298-
</span>
299-
<span class="flex flex-col items-center min-w-[224px]">
300-
<BaseIcon
301-
name="wallet"
302-
class="size-6xl"
303-
/>
304-
<BaseText
305-
size="2xl"
306-
class="mt-4xl"
307-
>
308-
{{ $t('products.landing_page.explorer.wallet_tocken_insights.title') }}
309-
</BaseText>
310-
<BaseText
311-
size="sm"
312-
class="mt-md"
313-
variant="secondary"
314-
>
315-
{{ $t('products.landing_page.explorer.wallet_tocken_insights.description') }}
316-
</BaseText>
317-
</span>
318-
<span class="flex flex-col items-center min-w-[224px]">
319-
<BaseIcon
320-
name="code"
321-
class="size-6xl"
322-
/>
323-
<BaseText
324-
size="2xl"
325-
class="mt-4xl"
326-
>
327-
{{ $t('products.landing_page.explorer.smart_contract_analysis.title') }}
328-
</BaseText>
329-
<BaseText
330-
size="sm"
331-
class="mt-md"
332-
variant="secondary"
333-
>
334-
{{ $t('products.landing_page.explorer.smart_contract_analysis.description') }}
335-
</BaseText>
336-
</span>
337-
<span class="flex flex-col items-center min-w-[224px]">
338-
<BaseIcon
339-
name="gas-station"
340-
class="size-6xl"
341-
/>
342-
<BaseText
343-
size="2xl"
344-
class="mt-4xl"
345-
>
346-
{{ $t('products.landing_page.explorer.gas_fee_monitoring.title') }}
347-
</BaseText>
348-
<BaseText
349-
size="sm"
350-
class="mt-md"
351-
variant="secondary"
352-
>
353-
{{ $t('products.landing_page.explorer.gas_fee_monitoring.description') }}
354-
</BaseText>
355-
</span>
356-
</div>
357-
</ProductLandingpageSection>
358-
</div>
359-
<section class="mt-11xl p-md">
360-
<h2
361-
:id="id.api"
362-
class="text-center "
363-
>
364-
{{ $t('products.landing_page.api.title') }}
365-
</h2>
366-
</section>
367-
<ProductLandingpageSection>
246+
</template>
247+
</BaseCard>
248+
</BaseCardLayout>
249+
</ProductLandingpageSection>
250+
<ProductLandingpageSection class="mt-11xl p-md">
368251
<ProductLandingpageSectionStakinghub />
369252
</ProductLandingpageSection>
370-
<ProductLandingpageSection class="explorer-section">
253+
<ProductLandingpageSection class="mt-11xl p-md explorer-section">
371254
<BaseHeading
372255
is="h2"
373256
:id="id.explorer"

0 commit comments

Comments
 (0)