Merge pull request #101 from NoName11234/fix/minor_fixes

Fix/minor fixes
flyndre · May 8, 2023 · c4958bf · c4958bf
2 parents 9b8b6ab + f9049a7
commit c4958bf
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 13 deletions.
diff --git a/flevents-frontend/src/views/accounts/ForgetPassword.vue b/flevents-frontend/src/views/accounts/ForgetPassword.vue
@@ -33,7 +33,7 @@
     <v-container class="d-flex flex-column flex-sm-row justify-end gap">
       <v-btn
         variant="text"
-        :to="{ name: 'accounts.login' }"
+        :to="{ name: 'accounts.login', query: route.query }"
       >
         Abbrechen
       </v-btn>

diff --git a/flevents-frontend/src/views/event/AcceptInvitation.vue b/flevents-frontend/src/views/event/AcceptInvitation.vue
@@ -67,10 +67,11 @@
       />
       <div>
         <v-btn
-          :to="{ name: 'accounts.forget', query: route.query }"
+          :to="{ name: 'accounts.forget' }"
           variant="plain"
+          target="_blank"
         >
-          Passwort zurücksetzen
+          Passwort vergessen
         </v-btn>
       </div>
       <div
@@ -84,7 +85,6 @@
 
       <v-btn
         @click="anon = true"
-        target="_blank"
         variant="text"
         prepend-icon="mdi-incognito"
       >

diff --git a/flevents-frontend/src/views/event/InviteFromOrganization.vue b/flevents-frontend/src/views/event/InviteFromOrganization.vue
@@ -98,6 +98,7 @@ async function submit() {
           return-object
           label="Mitglieder der Organisation"
           multiple
+          hide-details="auto"
         >
           <template v-slot:selection="data">
             <v-chip
@@ -133,9 +134,9 @@ async function submit() {
         <v-btn
           type="submit"
           color="primary"
-          prepend-icon="mdi-email-fast"
+          prepend-icon="mdi-account-plus"
         >
-          Einladen
+          Hinzufügen
         </v-btn>
       </v-container>
 

diff --git a/flevents-frontend/src/views/event/Overview.vue b/flevents-frontend/src/views/event/Overview.vue
@@ -639,7 +639,7 @@ async function updateMailConfig(config: MailConfig) {
         <v-container class="d-flex flex-column flex-sm-row justify-start gap">
           <v-btn
             :to="{ name: 'events.invite', params: { uuid: eventUuid } }"
-            prepend-icon="mdi-account-plus"
+            prepend-icon="mdi-email-fast"
             color="primary"
             variant="tonal"
             v-if="validateRole === EventRole.tutor || validateRole == EventRole.organizer"
@@ -653,7 +653,7 @@ async function updateMailConfig(config: MailConfig) {
             variant="tonal"
             v-if="validateRole === EventRole.tutor || validateRole == EventRole.organizer"
           >
-            Teilnehmer aus Organisation hinzufügen
+            Teilnehmer hinzufügen
           </v-btn>
         </v-container>
 
@@ -748,7 +748,7 @@ async function updateMailConfig(config: MailConfig) {
             variant="tonal"
             @click="addAnon = true"
           >
-            Unangemeldeten Teilnehmer hinzufügen
+            Unangemeldeter Teilnehmer
           </v-btn>
         </v-container>
 
@@ -802,7 +802,7 @@ async function updateMailConfig(config: MailConfig) {
         <v-container class="d-flex flex-column flex-sm-row justify-start gap">
           <v-btn
             :to="{ name: 'events.organizer', params: { uuid: eventUuid } }"
-            prepend-icon="mdi-account-plus"
+            prepend-icon="mdi-email-fast"
             color="primary"
             variant="tonal"
           >

diff --git a/flevents-frontend/src/views/organizations/AcceptInvitation.vue b/flevents-frontend/src/views/organizations/AcceptInvitation.vue
@@ -65,11 +65,13 @@
     <v-divider />
     <v-container class="d-flex flex-column flex-sm-row justify-end gap">
       <v-btn
-        :to="{ name: 'accounts.forget', query: route.query }"
+        :to="{ name: 'accounts.forget' }"
         variant="text"
+        target="_blank"
       >
         Passwort vergessen
       </v-btn>
+      <v-spacer />
       <v-btn
         :to="{ name: 'accounts.create' }"
         variant="text"

diff --git a/flevents-frontend/src/views/organizations/Overview.vue b/flevents-frontend/src/views/organizations/Overview.vue
@@ -95,11 +95,11 @@
         >
           <v-btn
             :to="{ name: 'organizations.invite', params: { uuid: organization?.uuid } }"
-            prepend-icon="mdi-account-plus"
+            prepend-icon="mdi-email-fast"
             color="primary"
             variant="tonal"
           >
-            Mitglieder hinzufügen
+            Mitglieder einladen
           </v-btn>
         </v-container>