mirror of
https://github.com/IT4Change/gradido.git
synced 2026-02-06 09:56:05 +00:00
Merge branch 'master' into 3293-x-com-tx-per-link-concept
This commit is contained in:
clauspeterhuebner
GitHub
commit
62e84e784e
@ -1,21 +1,9 @@
|
||||
<template>
|
||||
<div v-if="humhubAllowed" class="mb-3 p-3 card-circles">
|
||||
<div class="mb-3 p-3 card-circles">
|
||||
<BContainer class="bg-white app-box-shadow gradido-border-radius p-4 mt--3">
|
||||
<div class="h3">{{ $t('card-circles.headline') }}</div>
|
||||
<div v-if="humhubAllowed" class="my-3 text-small">
|
||||
<span
|
||||
v-for="(line, lineNumber) of $t('card-circles.allowed.text').split('\n')"
|
||||
:key="lineNumber"
|
||||
>
|
||||
{{ line }}
|
||||
<br />
|
||||
</span>
|
||||
</div>
|
||||
<div v-else class="my-3 text-small">
|
||||
<span
|
||||
v-for="(line, lineNumber) of $t('card-circles.not-allowed.text').split('\n')"
|
||||
:key="lineNumber"
|
||||
>
|
||||
<div class="my-3 text-small">
|
||||
<span v-for="(line, lineNumber) of $t('card-circles.text').split('\n')" :key="lineNumber">
|
||||
{{ line }}
|
||||
<br />
|
||||
</span>
|
||||
@ -44,7 +32,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue'
|
||||
import { ref, computed } from 'vue'
|
||||
import { useQuery } from '@vue/apollo-composable'
|
||||
import { useStore } from 'vuex'
|
||||
import { authenticateHumhubAutoLogin } from '@/graphql/queries'
|
||||
@ -56,11 +44,7 @@ const humhubUri = ref('')
|
||||
|
||||
const humhubAllowed = computed(() => store.state.humhubAllowed)
|
||||
|
||||
const {
|
||||
refetch: refetchAuthenticateHumhub,
|
||||
onResult,
|
||||
onError,
|
||||
} = useQuery(authenticateHumhubAutoLogin, null, {
|
||||
const { onResult, onError } = useQuery(authenticateHumhubAutoLogin, null, {
|
||||
fetchPolicy: 'network-only',
|
||||
enabled: true,
|
||||
})
|
||||
@ -77,16 +61,6 @@ onError(() => {
|
||||
humhubUri.value = ''
|
||||
store.commit('humhubAllowed', false)
|
||||
})
|
||||
|
||||
const handleAuthenticateHumhubAutoLogin = async () => {
|
||||
enableButton.value = false
|
||||
humhubUri.value = null
|
||||
await refetchAuthenticateHumhub()
|
||||
}
|
||||
|
||||
onMounted(() => {
|
||||
handleAuthenticateHumhubAutoLogin()
|
||||
})
|
||||
</script>
|
||||
<style scoped>
|
||||
.card {
|
||||
|
||||
@ -62,6 +62,7 @@ const { toastError } = useAppToast()
|
||||
const store = useStore()
|
||||
|
||||
const gmsUri = ref('not initialized')
|
||||
const isUserSearchDisabled = ref(true)
|
||||
/*
|
||||
console.log(
|
||||
'store.state: gmsAllowed userLocation=',
|
||||
@ -69,24 +70,29 @@ console.log(
|
||||
store.state.userLocation,
|
||||
)
|
||||
*/
|
||||
const gmsAllowed = store.state.gmsAllowed
|
||||
// use computed to react on state change, when user goes to settings and change something an get back here
|
||||
const gmsAllowed = computed(() => store.state.gmsAllowed)
|
||||
// console.log('gmsAllowed=', gmsAllowed)
|
||||
const gmsUserLocationExists = store.state.userLocation !== null
|
||||
const gmsUserLocationExists = computed(() => store.state.userLocation !== null)
|
||||
// console.log('gmsUserLocationExists=', gmsUserLocationExists)
|
||||
const isUserSearchDisabled = computed(() => gmsUri.value !== null)
|
||||
|
||||
const { onResult, result, loading, onError } = useQuery(authenticateGmsUserSearch)
|
||||
const { onResult, result, loading, onError } = useQuery(authenticateGmsUserSearch, null, {
|
||||
fetchPolicy: 'network-only',
|
||||
enabled: true,
|
||||
})
|
||||
|
||||
onResult(({ data }) => {
|
||||
if (gmsAllowed && gmsUserLocationExists && data !== undefined) {
|
||||
if (gmsAllowed.value && gmsUserLocationExists.value && data !== undefined) {
|
||||
gmsUri.value = `${data.authenticateGmsUserSearch.url}?accesstoken=${data.authenticateGmsUserSearch.token}`
|
||||
isUserSearchDisabled.value = false
|
||||
}
|
||||
})
|
||||
|
||||
onError(() => {
|
||||
if (gmsAllowed && gmsUserLocationExists) {
|
||||
isUserSearchDisabled.value = true
|
||||
if (gmsAllowed.value && gmsUserLocationExists.value) {
|
||||
toastError('authenticateGmsUserSearch failed!')
|
||||
} else if (gmsAllowed && !gmsUserLocationExists) {
|
||||
} else if (gmsAllowed.value && !gmsUserLocationExists.value) {
|
||||
// toastError('capture your location first!')
|
||||
// eslint-disable-next-line no-console
|
||||
console.log('capture your location first...')
|
||||
|
||||
@ -31,20 +31,19 @@
|
||||
},
|
||||
"back": "Zurück",
|
||||
"card-circles": {
|
||||
"headline": "Gemeinsam unterstützen wir einander – achtsam in Kreiskultur.",
|
||||
"headline": "Kooperationsplattform »Gradido-Kreise«",
|
||||
"text": "Lokale Kreise, Studienkreise, Projekte, Events und Kongresse",
|
||||
"allowed": {
|
||||
"button": "Kreise starten...",
|
||||
"text": "Mit Klick auf den Button öffnest Du die Kooperationsplattform in einem neuen Browser-Fenster."
|
||||
"button": "Kreise starten..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Konfiguration starten...",
|
||||
"text": "Du hast Kreise noch nicht konfiguriert! Öffne zuerst die Kreise-Konfiguration."
|
||||
"button": "Konfigurieren..."
|
||||
}
|
||||
},
|
||||
"card-user-search": {
|
||||
"headline": "Geografische Nutzersuche (experimentell)",
|
||||
"headline": "Geografische Mitgliedssuche (experimentell)",
|
||||
"allowed": {
|
||||
"button": "Öffne Nutzersuche...",
|
||||
"button": "Öffne Mitgliedsuche...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Finde Mitglieder aller Communities auf einer Landkarte."
|
||||
},
|
||||
@ -323,7 +322,7 @@
|
||||
"settings": "Einstellungen",
|
||||
"circles": "Gradido Kreise",
|
||||
"transactions": "Deine Transaktionen",
|
||||
"usersearch": "Geografische Nutzersuche"
|
||||
"usersearch": "Geografische Mitgliedssuche (experimentell)"
|
||||
},
|
||||
"qrCode": "QR Code",
|
||||
"send_gdd": "GDD versenden",
|
||||
|
||||
@ -31,20 +31,19 @@
|
||||
},
|
||||
"back": "Back",
|
||||
"card-circles": {
|
||||
"headline": "Together we support each other - mindful in circle culture.",
|
||||
"headline": "Cooperation platform “Gradido Circles”",
|
||||
"text": "Local circles, study circles, projects, events and congresses",
|
||||
"allowed": {
|
||||
"button": "Start Circles...",
|
||||
"text": "Click on the button to open the cooperation platform in a new browser window."
|
||||
"button": "Start Circles..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Start Circles-Configuration...",
|
||||
"text": "Your Circles are not configured yet! Please open the Circles-Configuration first."
|
||||
"button": "Configurate..."
|
||||
}
|
||||
},
|
||||
"card-user-search": {
|
||||
"headline": "Geografice Usersearch (experimentel)",
|
||||
"headline": "Geographic member search (experimental)",
|
||||
"allowed": {
|
||||
"button": "Start Usersearch...",
|
||||
"button": "Start Membersearch...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Find Members of all Communities on a Map."
|
||||
},
|
||||
@ -323,7 +322,7 @@
|
||||
"settings": "Settings",
|
||||
"transactions": "Your transactions",
|
||||
"circles": "Gradido Circles",
|
||||
"usersearch": "Geographical User Search"
|
||||
"usersearch": "Geographic member search (experimental)"
|
||||
},
|
||||
"qrCode": "QR Code",
|
||||
"send_gdd": "Send GDD",
|
||||
|
||||
@ -20,6 +20,28 @@
|
||||
}
|
||||
},
|
||||
"back": "Volver",
|
||||
"card-circles": {
|
||||
"headline": "Plataforma de cooperación «Círculos Gradido»",
|
||||
"text": "Círculos locales, círculos de estudio, proyectos, ev entos y congresos",
|
||||
"allowed": {
|
||||
"button": "Iniciar círculos..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configurar..."
|
||||
}
|
||||
},
|
||||
"card-user-search": {
|
||||
"headline": "Búsqueda geográfica de miembros",
|
||||
"allowed": {
|
||||
"button": "Iniciar Búsqueda de Miembros...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Encuentra Miembros de todas las Comunidades en un Mapa."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configuración de ubicación...",
|
||||
"text": "Encuentra Miembros de todas las Comunidades en un Mapa? Entonces tienes que establecer tu ubicación primero."
|
||||
}
|
||||
},
|
||||
"circles": {
|
||||
"headline": "Juntos nos apoyamos - atentos a la cultura de los círculos.",
|
||||
"text": "Haga clic en el botón para abrir la plataforma de cooperación en una nueva ventana del navegador.",
|
||||
@ -262,7 +284,7 @@
|
||||
"settings": "Soporte",
|
||||
"transactions": "Tu Transacciones",
|
||||
"circles": "Círculos Gradido",
|
||||
"usersearch": "Búsqueda geográfica de usuarios"
|
||||
"usersearch": "Búsqueda geográfica de miembros (experimental)"
|
||||
},
|
||||
"qrCode": "Código QR",
|
||||
"send_gdd": "Enviar GDD",
|
||||
|
||||
@ -22,6 +22,28 @@
|
||||
}
|
||||
},
|
||||
"back": "Retour",
|
||||
"card-circles": {
|
||||
"headline": "Plate-forme de coopération «Cercles Gradido»",
|
||||
"text": "Cercles locaux, cercles d'études, projets, événements et congrès",
|
||||
"allowed": {
|
||||
"button": "Démarrer les cercles..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configurer..."
|
||||
}
|
||||
},
|
||||
"card-user-search": {
|
||||
"headline": "Recherche géographique de membres (expérimentale)",
|
||||
"allowed": {
|
||||
"button": "Commencer la recherche de membres...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Trouve des membres de toutes les communautés sur une carte."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configuration de l'emplacement...",
|
||||
"text": "Trouve des membres de toutes les communautés sur une carte? Alors tu dois d'abord définir ton emplacement."
|
||||
}
|
||||
},
|
||||
"circles": {
|
||||
"headline": "Ensemble, nous nous soutenons mutuellement - attentifs à la culture du cercle.",
|
||||
"text": "En cliquant sur le bouton, tu ouvres la plateforme de coopération dans une nouvelle fenêtre de navigation.",
|
||||
@ -270,7 +292,7 @@
|
||||
"settings": "Configuration",
|
||||
"transactions": "Vos transactions",
|
||||
"circles": "Cercles Gradido",
|
||||
"usersearch": "Recherche géographique d'utilisateurs"
|
||||
"usersearch": "Recherche géographique de membres (expérimentale)"
|
||||
},
|
||||
"qrCode": "QR Code",
|
||||
"send_gdd": "Envoyer GDD",
|
||||
|
||||
@ -20,6 +20,28 @@
|
||||
}
|
||||
},
|
||||
"back": "Terug",
|
||||
"card-circles": {
|
||||
"headline": "Samenwerkingsplatform “Gradido Kringen”",
|
||||
"text": "Lokale kringen, studiekringen, projecten, evenementen en congressen",
|
||||
"allowed": {
|
||||
"button": "Kringen starten..."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Configureren..."
|
||||
}
|
||||
},
|
||||
"card-user-search": {
|
||||
"headline": "Geografisch leden zoeken (experimenteel)",
|
||||
"allowed": {
|
||||
"button": "Zoeken naar leden starten...",
|
||||
"disabled-button": "GMS offline...",
|
||||
"text": "Vind leden van alle gemeenschappen op een kaart."
|
||||
},
|
||||
"not-allowed": {
|
||||
"button": "Locatie instellen...",
|
||||
"text": "Vind leden van alle gemeenschappen op een kaart? Dan moet je eerst je locatie instellen."
|
||||
}
|
||||
},
|
||||
"circles": {
|
||||
"headline": "Samen ondersteunen we elkaar - mindful in de cirkelcultuur.",
|
||||
"text": "Klik op de knop om het samenwerkingsplatform te openen in een nieuw browservenster.",
|
||||
@ -261,8 +283,8 @@
|
||||
"send": "Send Gradidos",
|
||||
"settings": "Settings",
|
||||
"transactions": "Your transactions",
|
||||
"circles": "Gradido Cirkels",
|
||||
"usersearch": "Geografisch zoeken naar gebruikers"
|
||||
"circles": "Gradido Kringen",
|
||||
"usersearch": "Geografisch leden zoeken (experimenteel)"
|
||||
},
|
||||
"qrCode": "QR Code",
|
||||
"send_gdd": "GDD sturen",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user