diff --git a/js/.env b/js/.env deleted file mode 100644 index 2b749cb2d..000000000 --- a/js/.env +++ /dev/null @@ -1 +0,0 @@ -VUE_APP_INJECT_COMMENT = \ No newline at end of file diff --git a/js/public/index.html b/js/public/index.html index 7a8eae898..19244db53 100644 --- a/js/public/index.html +++ b/js/public/index.html @@ -6,8 +6,6 @@ - - diff --git a/js/src/common.scss b/js/src/common.scss index 172e5d1cc..c1682e0b7 100644 --- a/js/src/common.scss +++ b/js/src/common.scss @@ -10,7 +10,8 @@ a { &[href="#comments"], &.router-link-active, &.comment-link, - &.pagination-link { + &.pagination-link, + &.datepicker-cell { text-decoration: none; } } diff --git a/js/src/components/Comment/Comment.vue b/js/src/components/Comment/Comment.vue index 1b84aee3b..884b7ea35 100644 --- a/js/src/components/Comment/Comment.vue +++ b/js/src/components/Comment/Comment.vue @@ -100,7 +100,7 @@ {{ $t("Post a reply") }} diff --git a/js/src/components/Event/EventListCard.vue b/js/src/components/Event/EventListCard.vue index 541b8abf6..df9558abe 100644 --- a/js/src/components/Event/EventListCard.vue +++ b/js/src/components/Event/EventListCard.vue @@ -60,10 +60,17 @@ > {{ - $t("{approved} / {total} seats", { - approved: participation.event.participantStats.participant, - total: participation.event.options.maximumAttendeeCapacity, - }) + $tc( + "{available}/{capacity} available places", + participation.event.options.maximumAttendeeCapacity - + (participation.event.participantStats.going - 1), + { + available: + participation.event.options.maximumAttendeeCapacity - + (participation.event.participantStats.going - 1), + capacity: participation.event.options.maximumAttendeeCapacity, + } + ) }} @@ -79,6 +86,7 @@ @click=" gotToWithCheck(participation, { name: RouteName.PARTICIPATIONS, + query: { role: ParticipantRole.NOT_APPROVED }, params: { eventId: participation.event.uuid }, }) " diff --git a/js/src/components/Event/ParticipationTable.vue b/js/src/components/Event/ParticipationTable.vue deleted file mode 100644 index 38622ef3b..000000000 --- a/js/src/components/Event/ParticipationTable.vue +++ /dev/null @@ -1,205 +0,0 @@ - - - diff --git a/js/src/graphql/actor.ts b/js/src/graphql/actor.ts index fe00d8345..981d2a87d 100644 --- a/js/src/graphql/actor.ts +++ b/js/src/graphql/actor.ts @@ -212,6 +212,7 @@ export const LOGGED_USER_PARTICIPATIONS = gql` } } participantStats { + going notApproved participant } diff --git a/js/src/graphql/event.ts b/js/src/graphql/event.ts index bc97e7985..41e8274be 100644 --- a/js/src/graphql/event.ts +++ b/js/src/graphql/event.ts @@ -1,5 +1,4 @@ import gql from "graphql-tag"; -import { COMMENT_FIELDS_FRAGMENT } from "@/graphql/comment"; const participantQuery = ` role, @@ -466,6 +465,8 @@ export const PARTICIPANTS = gql` query($uuid: UUID!, $page: Int, $limit: Int, $roles: String, $actorId: ID!) { event(uuid: $uuid) { id, + uuid, + title, participants(page: $page, limit: $limit, roles: $roles, actorId: $actorId) { ${participantsQuery} }, diff --git a/js/src/router/user.ts b/js/src/router/user.ts index 92126205d..e5f5e98e0 100644 --- a/js/src/router/user.ts +++ b/js/src/router/user.ts @@ -7,6 +7,7 @@ export enum UserRouteName { RESEND_CONFIRMATION = "ResendConfirmation", SEND_PASSWORD_RESET = "SendPasswordReset", PASSWORD_RESET = "PasswordReset", + EMAIL_VALIDATE = "EMAIL_VALIDATE", VALIDATE = "Validate", LOGIN = "Login", } @@ -54,7 +55,7 @@ export const userRoutes: RouteConfig[] = [ }, { path: "/validate/email/:token", - name: UserRouteName.VALIDATE, + name: UserRouteName.EMAIL_VALIDATE, component: () => import("@/views/User/EmailValidate.vue"), props: true, meta: { requiresAuth: false }, diff --git a/js/src/views/Event/Event.vue b/js/src/views/Event/Event.vue index 37f97ddc6..e0e9c9dfe 100644 --- a/js/src/views/Event/Event.vue +++ b/js/src/views/Event/Event.vue @@ -168,14 +168,17 @@ v-if="actorIsOrganizer && event.draft === false" :to="{ name: RouteName.PARTICIPATIONS, params: { eventId: event.uuid } }" > + {{ $tc( "{available}/{capacity} available places", - event.options.maximumAttendeeCapacity - event.participantStats.going, + event.options.maximumAttendeeCapacity - + (event.participantStats.going - 1), { available: - event.options.maximumAttendeeCapacity - event.participantStats.going, + event.options.maximumAttendeeCapacity - + (event.participantStats.going - 1), capacity: event.options.maximumAttendeeCapacity, } ) @@ -183,8 +186,8 @@ {{ - $tc("No one is going to this event", event.participantStats.going, { - going: event.participantStats.going, + $tc("No one is going to this event", event.participantStats.going - 1, { + going: event.participantStats.going - 1, }) }} @@ -226,7 +229,7 @@

- Actions + {{ $t("Actions") }}
- - -