From 379e3e96f58d3ce06c21b57a0de45d8eca474992 Mon Sep 17 00:00:00 2001 From: "deepsource-autofix[bot]" <62050782+deepsource-autofix[bot]@users.noreply.github.com> Date: Sat, 16 Dec 2023 00:06:02 +0000 Subject: [PATCH] style: format code with Prettier This commit fixes the style issues introduced in 9523c7b according to the output from Prettier. Details: None --- .../create-form-field-dialog.component.html | 30 +- .../form-builder/form-builder.component.html | 73 +- .../form-display/form-display.component.html | 42 +- .../navigation/navigation.component.html | 121 +-- .../event-header/event-header.component.html | 160 ++-- .../event-header/event-header.component.scss | 2 +- .../event-participants-table.component.html | 283 +++---- .../events-list-item.component.html | 300 ++++---- .../events-list-item.component.scss | 2 +- .../event-details-page.component.html | 677 +++++++++-------- .../event-manage-page.component.html | 711 +++++++++--------- .../event-run-page.component.html | 359 ++++----- .../profile-card/profile-card.component.html | 133 ++-- .../new-user-page/new-user-operations.graphql | 2 +- .../new-user-page.component.scss | 4 +- .../profile-page/profile-page.component.html | 535 ++++++------- .../settings-tabs.component.html | 25 +- .../settings-tabs.component.scss | 2 +- ...e-registration-settings-operations.graphql | 6 +- ...e-registration-settings-tab.component.scss | 4 +- ...istration-data-settings-operations.graphql | 4 +- ...istration-data-settings-tab.component.scss | 4 +- .../section-settings-operations.graphql | 4 +- .../section-settings-tab.component.html | 238 +++--- .../section-settings-tab.component.scss | 4 +- .../site-content-settings-operations.graphql | 4 +- .../site-content-settings-tab.component.scss | 4 +- .../user-chip/user-chip.component.html | 73 +- .../tenant-user-info-page.component.html | 198 ++--- 29 files changed, 2055 insertions(+), 1949 deletions(-) diff --git a/src/app/components/dynamicForms/form-builder/create-form-field-dialog/create-form-field-dialog.component.html b/src/app/components/dynamicForms/form-builder/create-form-field-dialog/create-form-field-dialog.component.html index f2d70947a..346ba4dab 100644 --- a/src/app/components/dynamicForms/form-builder/create-form-field-dialog/create-form-field-dialog.component.html +++ b/src/app/components/dynamicForms/form-builder/create-form-field-dialog/create-form-field-dialog.component.html @@ -12,22 +12,22 @@

Create form field

Field name - @if(type === 'select'){ -

Options for the select field

- @for(option of options.controls; track option; let i = $index){ -
- - Option {{ i + 1 }} - - - +
+ } + - - } - } diff --git a/src/app/components/dynamicForms/form-builder/form-builder.component.html b/src/app/components/dynamicForms/form-builder/form-builder.component.html index 4763d0673..243e0b53d 100644 --- a/src/app/components/dynamicForms/form-builder/form-builder.component.html +++ b/src/app/components/dynamicForms/form-builder/form-builder.component.html @@ -1,43 +1,44 @@ -@for (field of formFields();track field) { -
-
-
-

{{ field.label }}

-

- {{ field.type }} -

-
- @if (field.type === 'select') { -
-

Available options:

-
- @for (option of field.options;track option) { -

{{ option }}

- } +@for (field of formFields(); track field) { +
+
+
+

{{ field.label }}

+

+ {{ field.type }} +

+ @if (field.type === 'select') { +
+

Available options:

+
+ @for (option of field.options; track option) { +

{{ option }}

+ } +
+
+ }
- } +
- -
} @empty { -

- You have not added any fields to this form, add one to get started -

- -} @if (formFields().length) { - +

+ You have not added any fields to this form, add one to get started +

+ +} +@if (formFields().length) { + }
diff --git a/src/app/components/navigation/navigation.component.html b/src/app/components/navigation/navigation.component.html index 018353f2e..b6220c49a 100644 --- a/src/app/components/navigation/navigation.component.html +++ b/src/app/components/navigation/navigation.component.html @@ -3,58 +3,66 @@ data-testid="navigation" (click)="preventProp($event)" > - @if (tenantInfo$ | async;as tenant) { @if - (tenant?.settings?.brandIconUrl?.length) { - - } @else { - - - - } } + @if (tenantInfo$ | async; as tenant) { + @if (tenant?.settings?.brandIconUrl?.length) { + + } @else { + + } + }
- @if (tenantInfo$ | async;as tenant) { @switch (tenant.homePageStrategy) { - @case (HomePageStrategy.Static) { - - - Home - - } @case (HomePageStrategy.Markdown) { - - - Home - - } @case (HomePageStrategy.Link) { - - - Home - - } } } + @if (tenantInfo$ | async; as tenant) { + @switch (tenant.homePageStrategy) { + @case (HomePageStrategy.Static) { + + + Home + + } + @case (HomePageStrategy.Markdown) { + + + Home + + } + @case (HomePageStrategy.Link) { + + + Home + + } + } + } Settings - @if ((tenantInfo$ | async)?.settings?.showPWAInstall) { @if (installEvent$ | - async;as event) { - - } } + @if ((tenantInfo$ | async)?.settings?.showPWAInstall) { + @if (installEvent$ | async; as event) { + + } + } @if (event) { - -
- @if (event.userIsCreator || event.userIsOrganizer) { - - - } @if (!(event.userIsCreator || event.userIsOrganizer)) { -
- -
+ @if (event.userIsCreator || event.userIsOrganizer) { + + + } + @if (!(event.userIsCreator || event.userIsOrganizer)) { +
+ + +
+ } + + + + -
- } - - - - - }
@if (event) { - - } @if (!event) { -
+ + } + @if (!event) { +
}
@if (event) { - {{ event.title }} - } @if (!event) { - Event Title + {{ event.title }} + } + @if (!event) { + Event Title }
@if (event && !isSingleDayEvent()) { - -

Starts: {{ event.start | date: 'medium' }}

-

Ends: {{ event.end | date: 'medium' }}

- - } @else { @if (event) { -
- - {{ event.start | date: 'medium' }} - - {{ event.end | date: 'mediumTime' }} -
- } @if (!event) { -
- Phantom, XX XXX XXXX, XX:XX – XX:XX -
- } } @if (bestPrice) { - -
- - {{ bestPrice.amount | currency }} -
- - } @if ( event && event.participantRatingCount && event.participantRatingCount - > 0 ) { - -
-
★
- {{ event.participantRating | number: '1.1-1' }} ({{ - event.participantRatingCount - }} - rating{{ event.participantRatingCount === 1 ? '' : 's' }}) -
- - } @if (canShare) { - -
- -
- +

Starts: {{ event.start | date: 'medium' }}

+

Ends: {{ event.end | date: 'medium' }}

+ } @else { + @if (event) { +
+ + {{ event.start | date: 'medium' }} - + {{ event.end | date: 'mediumTime' }} +
+ } + @if (!event) { +
+ Phantom, XX XXX XXXX, XX:XX – XX:XX +
+ } + } + @if (bestPrice) { +
+ + {{ bestPrice.amount | currency }} +
+ } + @if ( + event && event.participantRatingCount && event.participantRatingCount > 0 + ) { +
+
★
+ {{ event.participantRating | number: '1.1-1' }} ({{ + event.participantRatingCount + }} + rating{{ event.participantRatingCount === 1 ? '' : 's' }}) +
+ } + @if (canShare) { +
+ +
}
diff --git a/src/app/modules/events/components/event-header/event-header.component.scss b/src/app/modules/events/components/event-header/event-header.component.scss index ac6d1a860..985797af6 100644 --- a/src/app/modules/events/components/event-header/event-header.component.scss +++ b/src/app/modules/events/components/event-header/event-header.component.scss @@ -1,6 +1,6 @@ :host { display: block; } -.event-icon{ +.event-icon { view-transition-name: event-icon; } diff --git a/src/app/modules/events/components/event-participants-table/event-participants-table.component.html b/src/app/modules/events/components/event-participants-table/event-participants-table.component.html index 505e7209c..2b36a44f8 100644 --- a/src/app/modules/events/components/event-participants-table/event-participants-table.component.html +++ b/src/app/modules/events/components/event-participants-table/event-participants-table.component.html @@ -1,136 +1,153 @@ @if (event) { -
- - - - - - - - - - - - - - - - - - - - - - - - - @for (submissionItem of event.submissionItems; track submissionItem) { - - } @for (field of formConfig; track field) { - +
+
- Event Name: - - {{ event.title }} -
- Date: - - {{ event.start | date }} -
- Organizers: - - {{ joinOrganizers(event.organizerRegistrations) }} -
- Participants (including organizers): - - {{ - event.participantRegistrationCount + - event.organizerRegistrations.length - }} -
Name - E-mail - - Check in - - {{ submissionItem.name }} - - {{ field.label }} -
+ + + + + + + + + + + + + + + + + + + + + + + + @for (submissionItem of event.submissionItems; track submissionItem) { + + } + @for (field of formConfig; track field) { + + } + + @for ( + registration of filterRegistrations(event.participantRegistrations); + track registration; + let i = $index; + let last = $last + ) { + + + + + + @for ( + submissionItem of event.submissionItems; + track submissionItem + ) { + + } + @for (field of formConfig; track field) { + + } + } - - @for ( registration of filterRegistrations( event.participantRegistrations - ); track registration; let i = $index; let last = $last) { - - - - - - @for (submissionItem of event.submissionItems; track submissionItem) { - - } @for (field of formConfig; track field) { - - } - - } - -
+ Event Name: + + {{ event.title }} +
+ Date: + + {{ event.start | date }} +
+ Organizers: + + {{ joinOrganizers(event.organizerRegistrations) }} +
+ Participants (including organizers): + + {{ + event.participantRegistrationCount + + event.organizerRegistrations.length + }} +
Name + E-mail + + Check in + + {{ submissionItem.name }} + + {{ field.label }} +
+ {{ i + 1 }} + + {{ registration.user.fullName }} + + {{ registration.user.email }} + + {{ registration.checkInTime | date: 'short' }} + + {{ getSubmissionValue(registration, submissionItem) }} + + {{ getAdditionalDataValue(registration, field) }} +
- {{ i + 1 }} - - {{ registration.user.fullName }} - - {{ registration.user.email }} - - {{ registration.checkInTime | date: 'short' }} - - {{ getSubmissionValue(registration, submissionItem) }} - - {{ getAdditionalDataValue(registration, field) }} -
-
+ + + } diff --git a/src/app/modules/events/components/events-list-item/events-list-item.component.html b/src/app/modules/events/components/events-list-item/events-list-item.component.html index 6465970d3..92b3d5f0a 100644 --- a/src/app/modules/events/components/events-list-item/events-list-item.component.html +++ b/src/app/modules/events/components/events-list-item/events-list-item.component.html @@ -10,167 +10,179 @@ matRipple >
- @if (event) { @if (RegistrationMode.External !== event.registrationMode) { - -
- @if (event.userIsOrganizer || event.userIsRegistered) { @if - (event.userIsOrganizer) { - - - Organizer - - } @if (event.userIsRegistered) { - - - Registered - - } } @if (!event.userIsRegistered) { @if (!notYetOpen()) { -
- - - {{ - freeSpotsString( - event.participantRegistrationCount, - event.participantLimit, - event.couldBeOrganizer - ) - }} - -
- } @if (notYetOpen()) { + @if (event) { + @if (RegistrationMode.External !== event.registrationMode) { +
+ @if (event.userIsOrganizer || event.userIsRegistered) { + @if (event.userIsOrganizer) { + + + Organizer + + } + @if (event.userIsRegistered) { + + + Registered + + } + } + @if (!event.userIsRegistered) { + @if (!notYetOpen()) { +
+ + + {{ + freeSpotsString( + event.participantRegistrationCount, + event.participantLimit, + event.couldBeOrganizer + ) + }} + +
+ } + @if (notYetOpen()) { +
+ + Opens {{ registrationDate() }} +
+ } + } +
+ } + } + @if (!event) {
- - Opens {{ registrationDate() }} + Event state phantom
- } } -
- - } } @if (!event) { -
- Event state phantom -
}
@if (event) { - - } @if (!event) { -
- } @if (event) { -

- {{ event.title }} -

- } @if (!event) { -
- Event Title Phantom -
+ + } + @if (!event) { +
+ } + @if (event) { +

+ {{ event.title }} +

+ } + @if (!event) { +
+ Event Title Phantom +
}
@if (event && event.internalEvent) { - -
- - Internal -
- - } @if (event) { @if ( event?.couldBeOrganizer && - RegistrationMode.External !== event.registrationMode ) { -
- - {{ event.organizersRegistered }}/{{ event.organizerLimit }} - organizers - -
- } } @if (event) { - -
- - {{ - event.start | date: 'shortTime' - }} -
- - } @if (!event) { - XX XX:XX - } @if (defaultPrice()) { - -
- - {{ - defaultPrice().amount | currency - }} -
- +
+ + Internal +
+ } + @if (event) { + @if ( + event?.couldBeOrganizer && + RegistrationMode.External !== event.registrationMode + ) { +
+ + {{ event.organizersRegistered }}/{{ event.organizerLimit }} + organizers + +
+ } + } + @if (event) { +
+ + {{ + event.start | date: 'shortTime' + }} +
+ } + @if (!event) { + XX XX:XX + } + @if (defaultPrice()) { +
+ + {{ + defaultPrice().amount | currency + }} +
}
@if (event && event.publicationState !== 'PUBLIC') { -

{{ - publicationStateString(event.publicationState) - }}

+

{{ + publicationStateString(event.publicationState) + }}

} diff --git a/src/app/modules/events/components/events-list-item/events-list-item.component.scss b/src/app/modules/events/components/events-list-item/events-list-item.component.scss index 393e1f887..199cbf039 100644 --- a/src/app/modules/events/components/events-list-item/events-list-item.component.scss +++ b/src/app/modules/events/components/events-list-item/events-list-item.component.scss @@ -28,6 +28,6 @@ } } -.selected{ +.selected { view-transition-name: event-icon; } diff --git a/src/app/modules/events/pages/event-details-page/event-details-page.component.html b/src/app/modules/events/pages/event-details-page/event-details-page.component.html index 4962c8653..251807e02 100644 --- a/src/app/modules/events/pages/event-details-page/event-details-page.component.html +++ b/src/app/modules/events/pages/event-details-page/event-details-page.component.html @@ -1,19 +1,25 @@ @if ((event$ | async) === null) { - + }
- @if (event$ | async; as event) { @if (event.userIsOrganizer) { - - - Run event - - } @if ( event.userIsRegistered && !event.isVirtual && !((eventOver$ | async) - && event.activeRegistration?.didAttend) ) { - - } } + @if (event$ | async; as event) { + @if (event.userIsOrganizer) { + + + Run event + + } + @if ( + event.userIsRegistered && + !event.isVirtual && + !((eventOver$ | async) && event.activeRegistration?.didAttend) + ) { + + } + } @if (event$ | async; as event) { - - - - Description - - - - @if (event.couldBeOrganizer) { - - - Information for organizing - -

- This event was created by - - - , they can answer any questions. -

- - - } @if ( (isAdmin$ | async) || (event.participantText.length > 10 && - (event.userIsRegistered || event.userIsOrganizer)) ) { - - - Info for participants - -
- @if (event.enablePhotoSharing) { -
- - - Photos for this event - -
- } @if (event.location) { -
- @if (!event.isVirtual) { -
-
- Meeting point: {{ event.location }} at - {{ event.start | date: 'mediumTime' }} -
- - - Open in Maps - -
- } @if (event.isVirtual) { -
-
- Online Meeting at - {{ event.start | date: 'mediumTime' }} -
- - - Open Meeting - -
- } -
- } + + + Description + - @if ((event$ | async)?.activeRegistration?.didAttend) { -
- approval - - You are checked in to the event! - -
- } -
- -
- Organizers -
-
- @for (organizer of event.organizers; track organizer) { + + @if (event.couldBeOrganizer) { + + + Information for organizing + +

+ This event was created by - } -

-

- Please contact them in case of any issues. We're looking forward - to seeing you soon! + , they can answer any questions.

-
-
- - } @if ( !event.excludeFromRatings && (event.ratingPending || - event.ratings.length > 0) ) { - - - Ratings - -
- @for (rating of event.ratings; track rating) { - - } -
- @if ( (ratingExpanded$ | async) && event.activeRegistration?.status === - 'SUCCESSFUL' ) { -
- + + } + @if ( + (isAdmin$ | async) || + (event.participantText.length > 10 && + (event.userIsRegistered || event.userIsOrganizer)) + ) { + - -
+ + Info for participants + +
+ @if (event.enablePhotoSharing) { +
+ + + Photos for this event + +
+ } + @if (event.location) { +
+ @if (!event.isVirtual) { +
+
+ Meeting point: {{ event.location }} at + {{ event.start | date: 'mediumTime' }} +
+ + + Open in Maps + +
+ } + @if (event.isVirtual) { +
+
+ Online Meeting at + {{ event.start | date: 'mediumTime' }} +
+ + + Open Meeting + +
+ } +
+ } + + @if ((event$ | async)?.activeRegistration?.didAttend) { +
+ approval + + You are checked in to the event! + +
+ } +
+ +
+ Organizers +
+
+ @for (organizer of event.organizers; track organizer) { + + + } +
+

+ Please contact them in case of any issues. We're looking + forward to seeing you soon! +

+
+
+ } - - } } @else { - - - - Description - -
- @for (line of [].constructor(12); track line) { -
T
- } -
- - + @if ( + !event.excludeFromRatings && + (event.ratingPending || event.ratings.length > 0) + ) { + + + Ratings + +
+ @for (rating of event.ratings; track rating) { + + } +
+ @if ( + (ratingExpanded$ | async) && + event.activeRegistration?.status === 'SUCCESSFUL' + ) { +
+ + +
+ } + + } + } @else { + + + Description + +
+ @for (line of [].constructor(12); track line) { +
T
+ } +
+ } @@ -233,7 +250,7 @@
@for (line of [].constructor(12); track line) { -
T
+
T
}
@@ -241,130 +258,142 @@ @if (event$ | async; as event) { - -
-

{{ event.organizer.text }}

-
-
- @if (event.couldBeParticipant) { - -

Registration

- - @switch (event.registrationMode) { @case (RegistrationMode.External) { - - - } @case (RegistrationMode.Stripe) { - - } @case (RegistrationMode.Online) { - - - } } - - - } @else { - -

You can not sign up for this event

- @if ((auth.isAuthenticated$ | async) === false) { - -

- To sign up for events, please log in or create an account. -

- - - } } -
- @if ( event.couldBeOrganizer && event.registrationMode !== - RegistrationMode.External ) { -
-

Sign up as an organizer

- +

{{ event.organizer.text }}

+
+
-
- @if (organizerCanDeRegister$ | async; as canDeRegister) { -
- @if (canDeRegister.result) { -

- You can de register from this event until - {{ lastOrganizerDeRegistration$ | async | date }} -

- } @if (!canDeRegister.result) { -

- You can not de register from this event: - {{ canDeRegister.reason }} + @if (event.couldBeParticipant) { +

Registration

+ + @switch (event.registrationMode) { + @case (RegistrationMode.External) { + + + } + @case (RegistrationMode.Stripe) { + + } + @case (RegistrationMode.Online) { + + + } + } + + } @else { +

You can not sign up for this event

+ @if ((auth.isAuthenticated$ | async) === false) { +

+ To sign up for events, please log in or create an account.

- } @if (event.organizerRegistrationPossible) { - } @if (canDeRegister.result && event.userIsOrganizer) { - - } -
} -
-

- Organizers already on this event ({{ event.organizers.length }}/{{ - event.organizerLimit - }}) -

- - @if (event.organizers.length === 0) { - Nobody yet - } @for (user of event.organizers; track user) { - - - - + } +
+ @if ( + event.couldBeOrganizer && + event.registrationMode !== RegistrationMode.External + ) { +
+

Sign up as an organizer

+ +
+ @if (organizerCanDeRegister$ | async; as canDeRegister) { +
+ @if (canDeRegister.result) { +

+ You can de register from this event until + {{ lastOrganizerDeRegistration$ | async | date }} +

+ } + @if (!canDeRegister.result) { +

+ You can not de register from this event: + {{ canDeRegister.reason }} +

+ } + @if (event.organizerRegistrationPossible) { + + } + @if (canDeRegister.result && event.userIsOrganizer) { + + } +
} - -
+
+

+ Organizers already on this event ({{ + event.organizers.length + }}/{{ event.organizerLimit }}) +

+ + @if (event.organizers.length === 0) { + Nobody yet + } + @for (user of event.organizers; track user) { + + + + + } + +
+
+
- -
- } } + } + }
diff --git a/src/app/modules/events/pages/event-manage-page/event-manage-page.component.html b/src/app/modules/events/pages/event-manage-page/event-manage-page.component.html index a04df38b0..4b423c0a0 100644 --- a/src/app/modules/events/pages/event-manage-page/event-manage-page.component.html +++ b/src/app/modules/events/pages/event-manage-page/event-manage-page.component.html @@ -1,384 +1,387 @@ @if (event$ | async; as event) { - -
Manage {{ event.title }}
- Go to template - +
Manage {{ event.title }}
+ Go to template } @if ((event$ | async) === null) { - -} @if (event$ | async; as event) { -
- - - - Finances - - - - - - - - - - - - - - - - - - @for (costItem of event.costItems; track costItem; let i = $index) { - - @if (i === 0) { - - - - - } @if (i !== 0) { - - - + +} +@if (event$ | async; as event) { +
+ + + + Finances + + +
DateNameItemCostParticipation feesSubsidiesLossWins
{{ event.start | date: 'dd.MM.yyyy' }}{{ event.title }}
+ + + + + + + + + + + + + + @for (costItem of event.costItems; track costItem; let i = $index) { + + @if (i === 0) { + + + } + @if (i !== 0) { + + + } + + + } - - - - } @if (event.costItems.length === 0) { - - - - - - - } - - - - - - - - - - - - - - - - -
DateNameItemCostParticipation feesSubsidiesLossWins
{{ event.start | date: 'dd.MM.yyyy' }}{{ event.title }}{{ costItem.name }}{{ costItem.submittedAmount | currency }}
{{ costItem.name }}{{ costItem.submittedAmount | currency }}
{{ event.start | date: 'dd.MM.yyyy' }}{{ event.title }}
{{ event.netAmountCollected | currency }}
- {{ event.submittedSpend - event.netAmountCollected | currency }} -
- - - - - Participants - -
-

Users registered:

-

- {{ event.participantRegistrationCount }} of - {{ event.participantLimit }} ({{ - event.participantLimit - event.participantRegistrationCount - }} - spots left) -

-

Users checked in:

-

- {{ event.participantsAttended }} of - {{ event.participantRegistrationCount }} ({{ - event.participantRegistrationCount - event.participantsAttended - }} - remaining) -

-

Organizers registered:

-

{{ event.organizerRegistrations.length }}

-
- -
- - - - - - - - - - - - - - - - - - - - - - + @if (event.costItems.length === 0) { + + + + + + + } + + + + + + + + + + + + + + + + +
Name - - - Status - {{ - getStatusOfRegistration(registration) - }} - Paid - - {{ registration.balance | currency }} - - Registered - {{ registration.createdAt | date: 'short' }} - Check in - @if (registration.checkInTime) { -
- {{ registration.checkInTime | date: 'short' }} -
- } @if (!registration.checkInTime) { - - } -
{{ event.start | date: 'dd.MM.yyyy' }}{{ event.title }}
{{ event.netAmountCollected | currency }}
+ {{ event.submittedSpend - event.netAmountCollected | currency }} +
+ - - -   - - - - - + + + Participants + +
+

Users registered:

+

+ {{ event.participantRegistrationCount }} of + {{ event.participantLimit }} ({{ + event.participantLimit - event.participantRegistrationCount + }} + spots left) +

+

Users checked in:

+

+ {{ event.participantsAttended }} of + {{ event.participantRegistrationCount }} ({{ + event.participantRegistrationCount - event.participantsAttended + }} + remaining) +

+

Organizers registered:

+

{{ event.organizerRegistrations.length }}

+
- - - -
-
-
-

Email:

-

{{ registration.user.email }}

+
+ + + + + + + + + + + + + + + + + -

Payment status:

- + + + + + + + + + + + + + - + + - - - -
Name + + + Status + {{ + getStatusOfRegistration(registration) + }} + Paid + + {{ registration.balance | currency }} + + Registered + {{ registration.createdAt | date: 'short' }} + Check in + @if (registration.checkInTime) { +
+ {{ registration.checkInTime | date: 'short' }}
- - - View registration - - @if ( event.registrationMode == 'STRIPE' && - !registration.transactions.length ) { + } + @if (!registration.checkInTime) { + } + 		+   + + - - + +
+
+
- Cancel with refund - -
+ - Cancel with refund less fees - + + View registration + + @if ( + event.registrationMode == 'STRIPE' && + !registration.transactions.length + ) { + + } - - @if (registration.submissions.length) { -
-

Additional Data

- @for (submission of registration.submissions; track - submission) { -
-

- {{ submission.submissionItem.name }}: - {{ submission.data.value }} -

-
+ + + + + + @if (registration.submissions.length) { +
+

Additional Data

+ @for ( + submission of registration.submissions; + track submission + ) { +
+

+ {{ submission.submissionItem.name }}: + {{ submission.data.value }} +

+
+ } +
}
- }
-
-
-
- + + + + +
+ - - - Registration codes - -
- - -
- - @for (code of event.eventRegistrationCodes; track code) { - -

- Registration code ({{ code.createdAt | date: 'short' }}) -

-

- {{ code.registrationToRemoveId ? 'regular' : 'admin code' }} ({{ - code.status - }}) Is public: {{ code.isPublic ? 'yes' : 'no' }}  - -

-

- Link for registration: - - {{ document.location.origin }}/profile?code={{ code.id }} - -

- - } - - + + + Registration codes + +
+ + +
+ + @for (code of event.eventRegistrationCodes; track code) { + +

+ Registration code ({{ code.createdAt | date: 'short' }}) +

+

+ {{ code.registrationToRemoveId ? 'regular' : 'admin code' }} ({{ + code.status + }}) Is public: {{ code.isPublic ? 'yes' : 'no' }}  + +

+

+ Link for registration: + + {{ document.location.origin }}/profile?code={{ code.id }} + +

+ + } + + - - - Event table - - - - -
+ + + Event table + + + + + } diff --git a/src/app/modules/events/pages/event-run-page/event-run-page.component.html b/src/app/modules/events/pages/event-run-page/event-run-page.component.html index 9a9923341..6473727ac 100644 --- a/src/app/modules/events/pages/event-run-page/event-run-page.component.html +++ b/src/app/modules/events/pages/event-run-page/event-run-page.component.html @@ -1,194 +1,209 @@ @if (event$ | async; as event) { - -
Run {{ event.title }}
- +
Run {{ event.title }}
} @if ((event$ | async) === null) { - -} @if (event$ | async; as event) { -
- - - Scan code - - -
- - - Generate mail template + +} +@if (event$ | async; as event) { +
+ + + Scan code - - - - -
- @if (event.costItems.length) { -
-
- + + + Generate mail template + + + + +
- - @for (costItem of event.costItems; track costItem) { - -

- {{ costItem.name }} -

-

- for {{ costItem.amount | currency }} ( - {{ costItem.submittedAmount | currency }} already submitted with - receipts) + + @if (event.costItems.length) { +

+
+ + +

Required receipts

+
+ + @for (costItem of event.costItems; track costItem) { + +

+ {{ costItem.name }} +

+

+ for {{ costItem.amount | currency }} ( + {{ costItem.submittedAmount | currency }} already submitted with + receipts) +

+ + } + +

+ You can upload multiple photos of receipts for each entry. Please make + sure to add all receipts! After you upload a receipt, please write the + Finance Coordinator to initiate the refund.

- - } - -

- You can upload multiple photos of receipts for each entry. Please make - sure to add all receipts! After you upload a receipt, please write the - Finance Coordinator to initiate the refund. -

-
- } +
+ } - -
-
- - -

Organizers

-
-
- @for (registration of event.organizerRegistrations; track registration) { -
- +
+ - + +

Organizers

+
+
+ @for ( + registration of event.organizerRegistrations; + track registration + ) { +
+ + +
+ }
- }
-
-
-
- - -

Participant overview

+
+
+ + +

Participant overview

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-
- - -

Data Submissions

+
+
+ + +

Data Submissions

+
+
- -
-
+ } diff --git a/src/app/modules/profile/components/profile-card/profile-card.component.html b/src/app/modules/profile/components/profile-card/profile-card.component.html index e47d2c45d..f1136733f 100644 --- a/src/app/modules/profile/components/profile-card/profile-card.component.html +++ b/src/app/modules/profile/components/profile-card/profile-card.component.html @@ -18,86 +18,89 @@ /> @if (!profile) { -
-
-
- } @if (profile) { - +
+
+
+ } + @if (profile) { + }
@if (!profile) { -
Phantom
- } @if (profile) { - {{ profile.fullName }} +
Phantom
+ } + @if (profile) { + {{ profile.fullName }} }
- @if ( profile && position(profile.position, profile.status); as position ) { -
- {{ position }} -
- } @if (!profile) { -
Phantom Country
+ @if (profile && position(profile.position, profile.status); as position) { +
+ {{ position }} +
+ } + @if (!profile) { +
Phantom Country
}
@if (!profile) { -
+
}
@if (profile && profile.organizedEventsCount > 0) { - - -
-
-
- {{ profile.organizedEventsCount }} -
-
- event{{ profile.organizedEventsCount === 1 ? '' : 's' }} organized -
-
- @if (profile.createdEventsCount > 0) { -
-
- {{ profile.createdEventsCount }} -
-
- event{{ profile.createdEventsCount === 1 ? '' : 's' }} created + +
+
+
+ {{ profile.organizedEventsCount }} +
+
+ event{{ profile.organizedEventsCount === 1 ? '' : 's' }} organized +
+ @if (profile.createdEventsCount > 0) { +
+
+ {{ profile.createdEventsCount }} +
+
+ event{{ profile.createdEventsCount === 1 ? '' : 's' }} created +
+
+ }
- } -
- }
@if (profile) { -
- - Manage user - -
+
+ + Manage user + +
}
diff --git a/src/app/modules/profile/pages/new-user-page/new-user-operations.graphql b/src/app/modules/profile/pages/new-user-page/new-user-operations.graphql index 803e96297..87d6a11c6 100644 --- a/src/app/modules/profile/pages/new-user-page/new-user-operations.graphql +++ b/src/app/modules/profile/pages/new-user-page/new-user-operations.graphql @@ -1,4 +1,4 @@ -query loadCompleteProfileData{ +query loadCompleteProfileData { currentTenant { id name diff --git a/src/app/modules/profile/pages/new-user-page/new-user-page.component.scss b/src/app/modules/profile/pages/new-user-page/new-user-page.component.scss index 1d0ae7e03..9e954ead6 100644 --- a/src/app/modules/profile/pages/new-user-page/new-user-page.component.scss +++ b/src/app/modules/profile/pages/new-user-page/new-user-page.component.scss @@ -1,4 +1,4 @@ -:host{ +:host { display: block; - padding: 1rem + padding: 1rem; } diff --git a/src/app/modules/profile/pages/profile-page/profile-page.component.html b/src/app/modules/profile/pages/profile-page/profile-page.component.html index c564a1c38..4977351c5 100644 --- a/src/app/modules/profile/pages/profile-page/profile-page.component.html +++ b/src/app/modules/profile/pages/profile-page/profile-page.component.html @@ -1,283 +1,290 @@ @if ((profile$ | async) === null) { - -} @if (profile$ | async;as profile) { -
- -
-
-
- - -

User Information

-
-
-

Mail:

-

{{ profile.email }}

-

Birthday:

-

{{ profile.birthdate | date: 'mediumDate' }}

- @for(entry of getEntries(profile.additionalData); track entry){ -

{{ entry[0] }}:

-

{{ entry[1] }}

- } -
-
- - - Update data - - - -
-

Calendar integration

- -

+} +@if (profile$ | async; as profile) { +

+ +
+
- - - https://{{ hostName }}/cal/private/{{ profile.calendarToken }} - -

- -

- You can use this link to subscribe to an iCal feed of the events you are - registered for. - Here's a how-to. -

-
-
-
- - -

ESNcard

-
- @if (!profile.esnCardNumber) { - -

- With an ESNcard, you can enjoy a discount on most of our events. Check - out all the offers on - - ESNcard.org ! -

- @if (esnCardLink$ | async;as esnCardLink) { -
-

You can get your ESNcard by clicking on the button below.

- - - Get your ESNcard - -
- } -
-

Add your ESNcard

-

If you already have an ESNcard, you can add it here to profit from - special prices.

-
- - ESNcard number - - -
+
+

Mail:

+

{{ profile.email }}

+

Birthday:

+

{{ profile.birthdate | date: 'mediumDate' }}

+ @for (entry of getEntries(profile.additionalData); track entry) { +

{{ entry[0] }}:

+

{{ entry[1] }}

+ } +
+
+ + + Update data + + +
- @if (esnCardErrorMessage$ | async;as message) { -

⚠️ There was an error: {{ message }}

- } -
- - } @if (profile.esnCardNumber) { +

Calendar integration

-

✅ You have an ESNcard

-

- You added a card with number - {{ profile.esnCardNumber }} to your - account. It is valid until - {{ profile.esnCardValidUntil | date: 'mediumDate' }}.
- You can change the card by adding a new one below. -

-
- - ESNcard number - - - + + + https://{{ hostName }}/cal/private/{{ profile.calendarToken }} + +

+ +

+ You can use this link to subscribe to an iCal feed of the events you + are registered for. + Here's a how-to. +

- @if (esnCardErrorMessage$ | async;as message) { -

⚠️ There was an error: {{ message }}

- } } -
- @if ((eventsToRate$ | async)?.length) { -
-
- -

Rate Events

+
+
+ + +

ESNcard

+
+ @if (!profile.esnCardNumber) { +

+ With an ESNcard, you can enjoy a discount on most of our events. + Check out all the offers on + + ESNcard.org ! +

+ @if (esnCardLink$ | async; as esnCardLink) { +
+

You can get your ESNcard by clicking on the button below.

+ + + Get your ESNcard + +
+ } +
+

Add your ESNcard

+

If you already have an ESNcard, you can add it here to profit + from special prices.

+
+ + ESNcard number + + + +
+ @if (esnCardErrorMessage$ | async; as message) { +

⚠️ There was an error: {{ message }}

+ } +
+ } + @if (profile.esnCardNumber) { +

✅ You have an ESNcard

+

+ You added a card with number + {{ profile.esnCardNumber }} to your + account. It is valid until + {{ profile.esnCardValidUntil | date: 'mediumDate' }}.
+ You can change the card by adding a new one below. +

+
+ + ESNcard number + + + +
+ @if (esnCardErrorMessage$ | async; as message) { +

⚠️ There was an error: {{ message }}

+ } + }
-

- Please take a little time to rate these events you took part in so we - can improve. -

- @if (eventsToRate$ | async;as events) { -
- @for (event of events;track event) { - - +
+ +

Rate Events

+
+

+ Please take a little time to rate these events you took part in so + we can improve. +

+ @if (eventsToRate$ | async; as events) { +
+ @for (event of events; track event) { + + + } +
+ } +
+ } + + @if (profileEvents$ | async; as profileEvents) { + @if (profileEvents.organizedEvents.length) { + + } + @if (profileEvents.createdEvents.length) { + } -
} -
- } - - @if (profileEvents$ | async;as profileEvents) { @if - (profileEvents.organizedEvents.length) { - - } @if (profileEvents.createdEvents.length) { - - } } @if (profile.status !== MembershipStatus.None && profile.status !== - MembershipStatus.Selected) { -
-
- -

Section membership

-
-
- Current status: -
- {{ profile.status | uppercase }} + @if ( + profile.status !== MembershipStatus.None && + profile.status !== MembershipStatus.Selected + ) { +
+
+ +

Section membership

+
+
+ Current status: +
+ {{ profile.status | uppercase }} +
+
-
+ }
- } -
-
- - - Give Feedback - - @if (this.auth.isAuthenticated$ | async) { - - } -
-
+
+ + + Give Feedback + + @if (this.auth.isAuthenticated$ | async) { + + } +
+
} @else { - + } diff --git a/src/app/modules/settings/settings-tabs/settings-tabs.component.html b/src/app/modules/settings/settings-tabs/settings-tabs.component.html index 4115a7489..5039e93ee 100644 --- a/src/app/modules/settings/settings-tabs/settings-tabs.component.html +++ b/src/app/modules/settings/settings-tabs/settings-tabs.component.html @@ -7,23 +7,26 @@ name="tabs" > - @for (tab of tabs; track tab.path){ - + @for (tab of tabs; track tab.path) { + } + @for (link of sectionHubLinks.controls; track link; let i = $index) { +
+ + Label + + + + Icon + + + + Link + + + +
} - + @for (link of socialLinks.controls; track link; let i = $index) { +
+ + Label + + + + Icon + + + + Link + + + +
} - -
-

User ID:

-

{{ user.id }}

-

First name:

-

{{ user.firstName }}

-

Last name:

-

{{ user.lastName }}

-

Role:

-

{{ user.currentTenant?.role | titlecase }}

-

Status:

-

{{ user.currentTenant?.status | titlecase }}

-

Email:

-

{{ user.email }}

-

Auth0 ID:

-

{{ user.authId }}

-

Birthday:

-

{{ user.birthdate | date: 'mediumDate' }}

-

ESNcard number:

-

{{ user.esnCardNumber }}

-

ESNcard valid until:

-

{{ user.esnCardValidUntil | date: 'mediumDate' }}

-

Registrations

-
+
+ + +
+

User ID:

+

{{ user.id }}

+

First name:

+

{{ user.firstName }}

+

Last name:

+

{{ user.lastName }}

+

Role:

+

{{ user.currentTenant?.role | titlecase }}

+

Status:

+

{{ user.currentTenant?.status | titlecase }}

+

Email:

+

{{ user.email }}

+

Auth0 ID:

+

{{ user.authId }}

+

Birthday:

+

{{ user.birthdate | date: 'mediumDate' }}

+

ESNcard number:

+

{{ user.esnCardNumber }}

+

ESNcard valid until:

+

{{ user.esnCardValidUntil | date: 'mediumDate' }}

+

Registrations

+
- - - Event - - - - + + + Event + + + + - - Event start - - {{ registration.event.start | date: 'mediumDate' }} - - + + Event start + + {{ registration.event.start | date: 'mediumDate' }} + + - - Type - - {{ registration.type | titlecase }} - - + + Type + + {{ registration.type | titlecase }} + + - - Status - - {{ registration.status | titlecase }} - - + + Status + + {{ registration.status | titlecase }} + + - - Registration date - - {{ registration.createdAt | date: 'mediumDate' }} - - + + Registration date + + {{ registration.createdAt | date: 'mediumDate' }} + + - - Check in date - - {{ registration.checkInTime | date: 'medium' }} - - + + Check in date + + {{ registration.checkInTime | date: 'medium' }} + + - - - - + + + + }