Skip to content

Commit 970264e

Browse files
committed
fix: enhance HappRoutingBuilder components for better UI and functionality
- Added 'visibleFrom' prop to Avatar in HappRoutingBuilderPageComponent - Refactored layout in HappRoutingBuilderWidget
1 parent cc80eca commit 970264e

File tree

2 files changed

+64
-76
lines changed

2 files changed

+64
-76
lines changed

src/pages/dashboard/utils/happ-routing-builder/ui/components/happ-routing-builder.page.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const HappRoutingBuilderPageComponent = () => {
5858
<Container fluid p={0} size="xl">
5959
<Paper mb="xl" p="md" radius="md" shadow="sm" withBorder>
6060
<Group align="flex-start" wrap="nowrap">
61-
<Avatar radius="md" size="lg" variant="transparent">
61+
<Avatar radius="md" size="lg" variant="transparent" visibleFrom="sm">
6262
<HappLogo />
6363
</Avatar>
6464

src/widgets/dashboard/utils/happ-routing-builder/happ-routing-builder.widget.tsx

Lines changed: 63 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -292,82 +292,70 @@ export const HappRoutingBuilderWidget = () => {
292292
</Paper>
293293

294294
<Paper mb="md" p="md" withBorder>
295-
<Text fw={700} mb="md" size="lg">
296-
{t('happ-routing-builder.widget.encoded-link')}
297-
</Text>
298-
<Box>
299-
<Group mb="xs">
300-
<Text fw={500}>
301-
{t('happ-routing-builder.widget.encoded-happ-link')}
302-
</Text>
303-
<CopyButton timeout={2000} value={generateHappLink()}>
304-
{({ copied, copy }) => (
305-
<Button
306-
color={copied ? 'teal' : 'blue'}
307-
leftSection={
308-
copied ? (
309-
<PiCheck size="1rem" />
310-
) : (
311-
<PiCopy size="1rem" />
312-
)
313-
}
314-
onClick={copy}
315-
size="sm"
316-
variant="light"
317-
>
318-
{copied
319-
? t('happ-routing-builder.widget.copied')
320-
: copiedText}
321-
</Button>
322-
)}
323-
</CopyButton>
324-
<Button
325-
leftSection={<PiQrCodeDuotone size="1rem" />}
326-
onClick={() => {
327-
const happLinkQrCode = renderSVG(generateHappLink(), {
328-
whiteColor: '#161B22',
329-
blackColor: '#3CC9DB'
330-
})
331-
modals.open({
332-
centered: true,
333-
title: 'Happ Routing QR Code',
334-
children: (
335-
<>
336-
<div
337-
dangerouslySetInnerHTML={{
338-
__html: happLinkQrCode
339-
}}
340-
/>
341-
<Button
342-
fullWidth
343-
mt="md"
344-
onClick={() => modals.closeAll()}
345-
>
346-
{t('happ-routing-builder.widget.close')}
347-
</Button>
348-
</>
349-
)
350-
})
351-
}}
352-
size="sm"
353-
variant="light"
354-
>
355-
{t('happ-routing-builder.widget.show-qr')}
356-
</Button>
357-
</Group>
358-
<Textarea
359-
autosize
360-
minRows={3}
361-
readOnly
362-
styles={{
363-
input: {
364-
fontFamily: 'monospace',
365-
wordBreak: 'break-all'
366-
}
295+
<Group mb="md">
296+
<Text fw={700}>{t('happ-routing-builder.widget.encoded-happ-link')}</Text>
297+
<CopyButton timeout={2000} value={generateHappLink()}>
298+
{({ copied, copy }) => (
299+
<Button
300+
color={copied ? 'teal' : 'blue'}
301+
leftSection={
302+
copied ? <PiCheck size="1rem" /> : <PiCopy size="1rem" />
303+
}
304+
onClick={copy}
305+
size="sm"
306+
variant="light"
307+
>
308+
{copied ? t('happ-routing-builder.widget.copied') : copiedText}
309+
</Button>
310+
)}
311+
</CopyButton>
312+
<Button
313+
leftSection={<PiQrCodeDuotone size="1rem" />}
314+
onClick={() => {
315+
const happLinkQrCode = renderSVG(generateHappLink(), {
316+
whiteColor: '#161B22',
317+
blackColor: '#3CC9DB'
318+
})
319+
modals.open({
320+
centered: true,
321+
title: 'Happ Routing QR Code',
322+
children: (
323+
<>
324+
<div
325+
dangerouslySetInnerHTML={{
326+
__html: happLinkQrCode
327+
}}
328+
/>
329+
<Button
330+
fullWidth
331+
mt="md"
332+
onClick={() => modals.closeAll()}
333+
>
334+
{t('happ-routing-builder.widget.close')}
335+
</Button>
336+
</>
337+
)
338+
})
367339
}}
368-
value={generateHappLink()}
369-
/>
370-
</Box>
340+
size="sm"
341+
variant="light"
342+
>
343+
{t('happ-routing-builder.widget.show-qr')}
344+
</Button>
345+
</Group>
346+
347+
<Textarea
348+
autosize
349+
minRows={3}
350+
readOnly
351+
styles={{
352+
input: {
353+
fontFamily: 'monospace',
354+
wordBreak: 'break-all'
355+
}
356+
}}
357+
value={generateHappLink()}
358+
/>
371359
</Paper>
372360

373361
<Grid gutter="md">

0 commit comments

Comments
 (0)