Skip to content

Commit fe21007

Browse files
daveearleydaveearley
authored
Merge pull request #573 from HiEventsDev/develop
2 parents cbfcb10 + 6a02589 commit fe21007

File tree

32 files changed

+2633
-2225
lines changed

32 files changed

+2633
-2225
lines changed

‎.github/dependabot.yml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "composer"
4+
directory: "/backend"
5+
schedule:
6+
interval: "weekly"
7+
8+
- package-ecosystem: "npm"
9+
directory: "/frontend"
10+
schedule:
11+
interval: "weekly"

‎backend/composer.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"nette/php-generator": "^4.0",
2323
"php-open-source-saver/jwt-auth": "^2.1",
2424
"sentry/sentry-laravel": "^4.13",
25-
"spatie/icalendar-generator": "^2.8",
25+
"spatie/icalendar-generator": "^3.0",
2626
"spatie/laravel-data": "^4.11",
2727
"spatie/laravel-webhook-server": "^3.8",
2828
"stripe/stripe-php": "^17.0"

‎backend/composer.lock‎

Lines changed: 224 additions & 290 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎frontend/package.json‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,24 @@
2323
"@dnd-kit/utilities": "^3.2.1",
2424
"@lingui/macro": "^4.7.0",
2525
"@lingui/react": "^4.7.0",
26-
"@mantine/carousel": "7.17.0",
27-
"@mantine/charts": "7.17.0",
28-
"@mantine/core": "7.17.0",
29-
"@mantine/dates": "7.17.0",
30-
"@mantine/dropzone": "7.17.0",
31-
"@mantine/form": "7.17.0",
32-
"@mantine/hooks": "7.17.0",
33-
"@mantine/modals": "7.17.0",
34-
"@mantine/notifications": "7.17.0",
35-
"@mantine/nprogress": "7.17.0",
36-
"@mantine/tiptap": "7.17.0",
26+
"@mantine/carousel": "^8.0.1",
27+
"@mantine/charts": "^8.0.1",
28+
"@mantine/core": "^8.0.1",
29+
"@mantine/dates": "^8.0.1",
30+
"@mantine/dropzone": "^8.0.1",
31+
"@mantine/form": "^8.0.1",
32+
"@mantine/hooks": "^8.0.1",
33+
"@mantine/modals": "^8.0.1",
34+
"@mantine/notifications": "^8.0.1",
35+
"@mantine/nprogress": "^8.0.1",
36+
"@mantine/tiptap": "^8.0.1",
3737
"@react-pdf/renderer": "^3.3.4",
3838
"@react-router/node": "^7.1.5",
3939
"@remix-run/node": "^2.8.1",
4040
"@stripe/react-stripe-js": "^2.1.1",
4141
"@stripe/stripe-js": "^1.54.1",
4242
"@tabler/icons-react": "^2.44.0",
43-
"@tanstack/react-query": "5.52.2",
43+
"@tanstack/react-query": "5.76.1",
4444
"@tiptap/extension-color": "^2.11.7",
4545
"@tiptap/extension-image": "^2.11.5",
4646
"@tiptap/extension-link": "^2.1.13",
@@ -72,7 +72,7 @@
7272
},
7373
"devDependencies": {
7474
"@lingui/vite-plugin": "^4.14.1",
75-
"@swc/core": "1.3.105",
75+
"@swc/core": "1.11.24",
7676
"@types/express": "^4.17.21",
7777
"@types/lodash": "^4.17.0",
7878
"@types/node": "^20.12.2",
@@ -90,7 +90,7 @@
9090
"postcss": "^8.4.24",
9191
"postcss-preset-mantine": "^1.6.0",
9292
"postcss-simple-vars": "^7.0.1",
93-
"sass": "^1.63.4",
93+
"sass": "^1.89.0",
9494
"typescript": "^5.0.2",
9595
"vite": "^5.4.19",
9696
"vite-bundle-visualizer": "^1.2.1",

‎frontend/src/components/layouts/AuthLayout/index.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const GenericFeatures = () => {
5050
const allFeatures = [
5151
{
5252
icon: IconChartBar,
53-
title: t`Smart Dashboard`,
53+
title: t`In-depth Analytics`,
5454
description: t`Track revenue, page views, and sales with detailed analytics and exportable reports`
5555
},
5656
{
@@ -65,7 +65,7 @@ const GenericFeatures = () => {
6565
},
6666
{
6767
icon: IconBuildingStore,
68-
title: t`Complete Store`,
68+
title: t`Sell Anything`,
6969
description: t`Sell merchandise alongside tickets with integrated tax and promo code support`
7070
},
7171
{
@@ -80,12 +80,12 @@ const GenericFeatures = () => {
8080
},
8181
{
8282
icon: IconPalette,
83-
title: t`Brand Control`,
83+
title: t`Match Your Brand`,
8484
description: t`Customize your event page and widget design to match your brand perfectly`
8585
},
8686
{
8787
icon: IconWebhook,
88-
title: t`Auto Workflow`,
88+
title: t`Fully Integrated`,
8989
description: t`Connect with CRM and automate tasks using webhooks and integrations`
9090
}
9191
];

‎frontend/src/components/routes/auth/AcceptInvitation/index.tsx‎

Lines changed: 27 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import {useAcceptInvitation} from "../../../../mutations/useAcceptInvitation.ts"
1010
import {showError, showSuccess} from "../../../../utilites/notifications.tsx";
1111
import {AcceptInvitationRequest} from "../../../../types.ts";
1212
import {Card} from "../../../common/Card";
13+
import {InputGroup} from "../../../common/InputGroup";
1314

1415
const AcceptInvitation = () => {
1516
const navigate = useNavigate();
@@ -86,29 +87,38 @@ const AcceptInvitation = () => {
8687
</Alert>
8788
<form onSubmit={form.onSubmit(handleSubmit)}>
8889
<fieldset disabled={!isFetched}>
89-
<TextInput required {...form.getInputProps('first_name')}
90-
label={t`First Name`}/>
91-
<TextInput required {...form.getInputProps('last_name')}
92-
label={t`Last Name`}/>
93-
<TextInput disabled required {...form.getInputProps('email')} label={t`Email`}/>
90+
<InputGroup>
91+
<TextInput required {...form.getInputProps('first_name')}
92+
label={t`First Name`}/>
93+
<TextInput required {...form.getInputProps('last_name')}
94+
label={t`Last Name`}/>
95+
</InputGroup>
9496

95-
<Select
96-
required
97-
searchable
98-
data={timezones}
99-
{...form.getInputProps('timezone')}
100-
label={t`Timezone`}
101-
placeholder={t`UTC`}
102-
/>
97+
<InputGroup>
98+
<TextInput disabled required {...form.getInputProps('email')} label={t`Email`}/>
10399

104-
<PasswordInput {...form.getInputProps('password')} label={t`New Password`} required/>
105-
<PasswordInput {...form.getInputProps('password_confirmation')} label={t`Confirm Password`}
106-
required/>
100+
<Select
101+
required
102+
searchable
103+
data={timezones}
104+
{...form.getInputProps('timezone')}
105+
label={t`Timezone`}
106+
placeholder={t`UTC`}
107+
/>
108+
</InputGroup>
109+
110+
<InputGroup>
111+
<PasswordInput {...form.getInputProps('password')} label={t`New Password`} required/>
112+
<PasswordInput {...form.getInputProps('password_confirmation')} label={t`Confirm Password`}
113+
required/>
114+
</InputGroup>
107115

108116
<Switch {...form.getInputProps('terms', {type: 'checkbox'})}
109117
label={(
110118
<Trans>
111-
I agree to the <Anchor target={'_blank'} href={'https://hi.events/terms-of-service'}>terms and conditions</Anchor>
119+
I agree to the <Anchor target={'_blank'}
120+
href={'https://hi.events/terms-of-service'}>terms and
121+
conditions</Anchor>
112122
</Trans>
113123
)}/>
114124

‎frontend/src/components/routes/product-widget/SelectProducts/index.tsx‎

Lines changed: 74 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -274,27 +274,84 @@ const SelectProducts = (props: SelectProductsProps) => {
274274
</div>
275275
)}
276276
{orderInProcessOverlayVisible && (
277-
<Modal withCloseButton={false} opened={true} onClose={() => setOrderInProcessOverlayVisible(false)}>
278-
<div style={{textAlign: 'center', padding: '20px'}}>
279-
<img style={{width: '110px'}} src={'/stopwatch-product-icon.svg'} alt={''}/>
280-
<div>
281-
<h4 style={{margin: '0'}}>
277+
<Modal
278+
withCloseButton={false}
279+
opened={true}
280+
onClose={() => setOrderInProcessOverlayVisible(false)}
281+
styles={{
282+
body: {
283+
padding: '30px 24px'
284+
},
285+
content: {
286+
borderRadius: '8px',
287+
backgroundColor: props.colors?.background || 'white'
288+
}
289+
}}
290+
>
291+
<div style={{
292+
textAlign: 'center',
293+
display: 'flex',
294+
flexDirection: 'column',
295+
alignItems: 'center',
296+
gap: '16px',
297+
color: props.colors?.primaryText || 'inherit'
298+
}}>
299+
<div style={{width: '100%'}}>
300+
<h3 style={{
301+
margin: '0 0 12px 0',
302+
fontSize: '20px',
303+
fontWeight: '600',
304+
color: props.colors?.primaryText || 'inherit'
305+
}}>
282306
{t`Please continue in the new tab`}
283-
</h4>
284-
<Trans>
285-
If a new tab did not open, please {' '}
286-
<a href={'/checkout/' + eventId + '/' + productMutation.data?.data.short_id + '/details' + '?session_identifier=' + productMutation.data?.data.session_identifier}
287-
target={'_blank'} rel={'noopener noreferrer'}>
288-
<b>{t`click here`}</b>.
289-
</a>
290-
</Trans>
307+
</h3>
308+
309+
<p style={{
310+
margin: '0 0 20px 0',
311+
fontSize: '15px',
312+
lineHeight: '1.5',
313+
color: props.colors?.primaryText || 'inherit'
314+
}}>
315+
{t`If a new tab did not open automatically, please click the button below to continue to checkout.`}
316+
</p>
317+
318+
<Button
319+
component="a"
320+
href={'/checkout/' + eventId + '/' + productMutation.data?.data.short_id + '/details' + '?session_identifier=' + productMutation.data?.data.session_identifier}
321+
target={'_blank'}
322+
rel={'noopener noreferrer'}
323+
fullWidth
324+
size="md"
325+
styles={{
326+
root: {
327+
backgroundColor: props.colors?.secondary || '#228be6',
328+
color: props.colors?.secondaryText || 'white',
329+
fontWeight: 600,
330+
marginBottom: '12px',
331+
'&:hover': {
332+
backgroundColor: props.colors?.secondary || '#1c7ed6',
333+
}
334+
}
335+
}}
336+
>
337+
{t`Continue to Checkout`}
338+
</Button>
339+
291340
<Button
292-
style={{marginTop: '20px'}}
293341
onClick={() => setOrderInProcessOverlayVisible(false)}
294-
variant={'transparent'}
295-
size={'xs'}
342+
variant={'subtle'}
343+
size={'sm'}
344+
styles={{
345+
root: {
346+
color: props.colors?.primaryText || '#228be6',
347+
'&:hover': {
348+
backgroundColor: 'transparent',
349+
textDecoration: 'underline'
350+
}
351+
}
352+
}}
296353
>
297-
{t`Dismiss`}
354+
{t`Dismiss this message`}
298355
</Button>
299356
</div>
300357
</div>

‎frontend/src/locales/de.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)