Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
version: 2
updates:
- package-ecosystem: "composer"
directory: "/backend"
schedule:
interval: "weekly"

- package-ecosystem: "npm"
directory: "/frontend"
schedule:
interval: "weekly"
2 changes: 1 addition & 1 deletion backend/composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
"nette/php-generator": "^4.0",
"php-open-source-saver/jwt-auth": "^2.1",
"sentry/sentry-laravel": "^4.13",
"spatie/icalendar-generator": "^2.8",
"spatie/icalendar-generator": "^3.0",
"spatie/laravel-data": "^4.11",
"spatie/laravel-webhook-server": "^3.8",
"stripe/stripe-php": "^17.0"
Expand Down
514 changes: 224 additions & 290 deletions backend/composer.lock

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@
"@dnd-kit/utilities": "^3.2.1",
"@lingui/macro": "^4.7.0",
"@lingui/react": "^4.7.0",
"@mantine/carousel": "7.17.0",
"@mantine/charts": "7.17.0",
"@mantine/core": "7.17.0",
"@mantine/dates": "7.17.0",
"@mantine/dropzone": "7.17.0",
"@mantine/form": "7.17.0",
"@mantine/hooks": "7.17.0",
"@mantine/modals": "7.17.0",
"@mantine/notifications": "7.17.0",
"@mantine/nprogress": "7.17.0",
"@mantine/tiptap": "7.17.0",
"@mantine/carousel": "^8.0.1",
"@mantine/charts": "^8.0.1",
"@mantine/core": "^8.0.1",
"@mantine/dates": "^8.0.1",
"@mantine/dropzone": "^8.0.1",
"@mantine/form": "^8.0.1",
"@mantine/hooks": "^8.0.1",
"@mantine/modals": "^8.0.1",
"@mantine/notifications": "^8.0.1",
"@mantine/nprogress": "^8.0.1",
"@mantine/tiptap": "^8.0.1",
"@react-pdf/renderer": "^3.3.4",
"@react-router/node": "^7.1.5",
"@remix-run/node": "^2.8.1",
"@stripe/react-stripe-js": "^2.1.1",
"@stripe/stripe-js": "^1.54.1",
"@tabler/icons-react": "^2.44.0",
"@tanstack/react-query": "5.52.2",
"@tanstack/react-query": "5.76.1",
"@tiptap/extension-color": "^2.11.7",
"@tiptap/extension-image": "^2.11.5",
"@tiptap/extension-link": "^2.1.13",
Expand Down Expand Up @@ -72,7 +72,7 @@
},
"devDependencies": {
"@lingui/vite-plugin": "^4.14.1",
"@swc/core": "1.3.105",
"@swc/core": "1.11.24",
"@types/express": "^4.17.21",
"@types/lodash": "^4.17.0",
"@types/node": "^20.12.2",
Expand All @@ -90,7 +90,7 @@
"postcss": "^8.4.24",
"postcss-preset-mantine": "^1.6.0",
"postcss-simple-vars": "^7.0.1",
"sass": "^1.63.4",
"sass": "^1.89.0",
"typescript": "^5.0.2",
"vite": "^5.4.19",
"vite-bundle-visualizer": "^1.2.1",
Expand Down
8 changes: 4 additions & 4 deletions frontend/src/components/layouts/AuthLayout/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const GenericFeatures = () => {
const allFeatures = [
{
icon: IconChartBar,
title: t`Smart Dashboard`,
title: t`In-depth Analytics`,
description: t`Track revenue, page views, and sales with detailed analytics and exportable reports`
},
{
Expand All @@ -65,7 +65,7 @@ const GenericFeatures = () => {
},
{
icon: IconBuildingStore,
title: t`Complete Store`,
title: t`Sell Anything`,
description: t`Sell merchandise alongside tickets with integrated tax and promo code support`
},
{
Expand All @@ -80,12 +80,12 @@ const GenericFeatures = () => {
},
{
icon: IconPalette,
title: t`Brand Control`,
title: t`Match Your Brand`,
description: t`Customize your event page and widget design to match your brand perfectly`
},
{
icon: IconWebhook,
title: t`Auto Workflow`,
title: t`Fully Integrated`,
description: t`Connect with CRM and automate tasks using webhooks and integrations`
}
];
Expand Down
44 changes: 27 additions & 17 deletions frontend/src/components/routes/auth/AcceptInvitation/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {useAcceptInvitation} from "../../../../mutations/useAcceptInvitation.ts"
import {showError, showSuccess} from "../../../../utilites/notifications.tsx";
import {AcceptInvitationRequest} from "../../../../types.ts";
import {Card} from "../../../common/Card";
import {InputGroup} from "../../../common/InputGroup";

const AcceptInvitation = () => {
const navigate = useNavigate();
Expand Down Expand Up @@ -86,29 +87,38 @@ const AcceptInvitation = () => {
</Alert>
<form onSubmit={form.onSubmit(handleSubmit)}>
<fieldset disabled={!isFetched}>
<TextInput required {...form.getInputProps('first_name')}
label={t`First Name`}/>
<TextInput required {...form.getInputProps('last_name')}
label={t`Last Name`}/>
<TextInput disabled required {...form.getInputProps('email')} label={t`Email`}/>
<InputGroup>
<TextInput required {...form.getInputProps('first_name')}
label={t`First Name`}/>
<TextInput required {...form.getInputProps('last_name')}
label={t`Last Name`}/>
</InputGroup>

<Select
required
searchable
data={timezones}
{...form.getInputProps('timezone')}
label={t`Timezone`}
placeholder={t`UTC`}
/>
<InputGroup>
<TextInput disabled required {...form.getInputProps('email')} label={t`Email`}/>

<PasswordInput {...form.getInputProps('password')} label={t`New Password`} required/>
<PasswordInput {...form.getInputProps('password_confirmation')} label={t`Confirm Password`}
required/>
<Select
required
searchable
data={timezones}
{...form.getInputProps('timezone')}
label={t`Timezone`}
placeholder={t`UTC`}
/>
</InputGroup>

<InputGroup>
<PasswordInput {...form.getInputProps('password')} label={t`New Password`} required/>
<PasswordInput {...form.getInputProps('password_confirmation')} label={t`Confirm Password`}
required/>
</InputGroup>

<Switch {...form.getInputProps('terms', {type: 'checkbox'})}
label={(
<Trans>
I agree to the <Anchor target={'_blank'} href={'https://hi.events/terms-of-service'}>terms and conditions</Anchor>
I agree to the <Anchor target={'_blank'}
href={'https://hi.events/terms-of-service'}>terms and
conditions</Anchor>
</Trans>
)}/>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -274,27 +274,84 @@ const SelectProducts = (props: SelectProductsProps) => {
</div>
)}
{orderInProcessOverlayVisible && (
<Modal withCloseButton={false} opened={true} onClose={() => setOrderInProcessOverlayVisible(false)}>
<div style={{textAlign: 'center', padding: '20px'}}>
<img style={{width: '110px'}} src={'/stopwatch-product-icon.svg'} alt={''}/>
<div>
<h4 style={{margin: '0'}}>
<Modal
withCloseButton={false}
opened={true}
onClose={() => setOrderInProcessOverlayVisible(false)}
styles={{
body: {
padding: '30px 24px'
},
content: {
borderRadius: '8px',
backgroundColor: props.colors?.background || 'white'
}
}}
>
<div style={{
textAlign: 'center',
display: 'flex',
flexDirection: 'column',
alignItems: 'center',
gap: '16px',
color: props.colors?.primaryText || 'inherit'
}}>
<div style={{width: '100%'}}>
<h3 style={{
margin: '0 0 12px 0',
fontSize: '20px',
fontWeight: '600',
color: props.colors?.primaryText || 'inherit'
}}>
{t`Please continue in the new tab`}
</h4>
<Trans>
If a new tab did not open, please {' '}
<a href={'/checkout/' + eventId + '/' + productMutation.data?.data.short_id + '/details' + '?session_identifier=' + productMutation.data?.data.session_identifier}
target={'_blank'} rel={'noopener noreferrer'}>
<b>{t`click here`}</b>.
</a>
</Trans>
</h3>

<p style={{
margin: '0 0 20px 0',
fontSize: '15px',
lineHeight: '1.5',
color: props.colors?.primaryText || 'inherit'
}}>
{t`If a new tab did not open automatically, please click the button below to continue to checkout.`}
</p>

<Button
component="a"
href={'/checkout/' + eventId + '/' + productMutation.data?.data.short_id + '/details' + '?session_identifier=' + productMutation.data?.data.session_identifier}
target={'_blank'}
rel={'noopener noreferrer'}
fullWidth
size="md"
styles={{
root: {
backgroundColor: props.colors?.secondary || '#228be6',
color: props.colors?.secondaryText || 'white',
fontWeight: 600,
marginBottom: '12px',
'&:hover': {
backgroundColor: props.colors?.secondary || '#1c7ed6',
}
}
}}
>
{t`Continue to Checkout`}
</Button>

<Button
style={{marginTop: '20px'}}
onClick={() => setOrderInProcessOverlayVisible(false)}
variant={'transparent'}
size={'xs'}
variant={'subtle'}
size={'sm'}
styles={{
root: {
color: props.colors?.primaryText || '#228be6',
'&:hover': {
backgroundColor: 'transparent',
textDecoration: 'underline'
}
}
}}
>
{t`Dismiss`}
{t`Dismiss this message`}
</Button>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/locales/de.js

Large diffs are not rendered by default.

Loading