Paramterize all emails

This commit is contained in:
roschaefer 2020-06-05 14:15:42 +02:00
parent 0ee3a308a7
commit 3a216226bc
7 changed files with 28 additions and 18 deletions

View File

@ -17,7 +17,7 @@ services:
environment:
- "APPLICATION_NAME={$APPLICATION_NAME:-'Human Connection'}"
- NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
- PUBLIC_REGISTRATION=false
- PUBLIC_REGISTRATION=true
command: yarn run dev
backend:
image: schoolsinmotion/backend:build-and-test
@ -33,7 +33,7 @@ services:
- SMTP_PORT=25
- SMTP_IGNORE_TLS=true
- "DEBUG=${DEBUG}"
- PUBLIC_REGISTRATION=false
- PUBLIC_REGISTRATION=true
maintenance:
image: schoolsinmotion/maintenance:latest
build:

View File

@ -49,8 +49,9 @@
</p>
<p>
{{ $t('components.password-reset.change-password.help') }}
<br />
<a href="mailto:support@human-connection.org">support@human-connection.org</a>
</p>
<p>
<a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
</p>
</ds-text>
</template>
@ -60,6 +61,7 @@
</template>
<script>
import emails from '../../constants/emails.js'
import PasswordStrength from '../Password/Strength'
import gql from 'graphql-tag'
import { SweetalertIcon } from 'vue-sweetalert-icons'
@ -77,6 +79,7 @@ export default {
data() {
const passwordForm = PasswordForm({ translate: this.$t })
return {
supportEmail: emails.SUPPORT,
formData: {
...passwordForm.formData,
},

View File

@ -16,7 +16,7 @@
</ds-text>
<ds-text align="center">
{{ $t('components.registration.create-user-account.help') }}
<a :href="supportEmail.href">{{ supportEmail.label }}</a>
<a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
</ds-text>
<ds-space centered>
<nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
@ -128,9 +128,9 @@
import PasswordStrength from '../Password/Strength'
import { SweetalertIcon } from 'vue-sweetalert-icons'
import PasswordForm from '~/components/utils/PasswordFormHelper'
import { SUPPORT_EMAIL } from '~/constants/emails.js'
import { VERSION } from '~/constants/terms-and-conditions-version.js'
import { SignupVerificationMutation } from '~/graphql/Registration.js'
import emails from '~/constants/emails'
export default {
components: {
@ -140,7 +140,7 @@ export default {
data() {
const passwordForm = PasswordForm({ translate: this.$t })
return {
supportEmail: SUPPORT_EMAIL,
supportEmail: emails.SUPPORT,
formData: {
name: '',
about: '',

View File

@ -1,4 +1,4 @@
export const SUPPORT_EMAIL = {
href: 'mailto:support@human-connection.org',
label: 'support@human-connection.org',
export default {
SUPPORT: 'support@human-connection.org',
MODERATION: 'moderation@human-connection.org',
}

View File

@ -20,10 +20,7 @@
<ds-text>{{ $t('maintenance.explanation') }}</ds-text>
<ds-text>
{{ $t('maintenance.questions') }}
<a href="mailto:support@human-connection.org" class="email-link">
support@human-connection.org
</a>
.
<a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
</ds-text>
</ds-space>
</ds-flex-item>
@ -35,6 +32,7 @@
</template>
<script>
import emails from '~/constants/emails.js'
import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
export default {
@ -42,5 +40,8 @@ export default {
components: {
LocaleSwitch,
},
data() {
return { supportEmail: emails.SUPPORT }
},
}
</script>

View File

@ -25,9 +25,7 @@
<p>
{{ $t('code-of-conduct.get-help') }}
<a class="hc-editor-link-blot" href="moderation@human-connection.org" target="_blank">
moderation@human-connection.org
</a>
<a :href="'mailto:' + moderationEmail">{{ moderationEmail }}</a>
</p>
<br />
</ds-container>
@ -35,6 +33,7 @@
</template>
<script>
import emails from '~/constants/emails.js'
export default {
layout: 'basic',
head() {
@ -44,6 +43,7 @@ export default {
},
data() {
return {
moderationEmail: emails.MODERATION,
sections: ['preamble', 'purpose'],
listSections: [
{

View File

@ -29,7 +29,7 @@
</ds-list-item>
</ds-list>
{{ $t('settings.email.verification-error.support') }}
<a href="mailto:support@human-connection.org">support@human-connection.org</a>
<a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
</ds-text>
</client-only>
</ds-space>
@ -38,6 +38,7 @@
</template>
<script>
import emails from '~/constants/emails.js'
import { VerifyEmailAddressMutation } from '~/graphql/EmailAddress.js'
import { SweetalertIcon } from 'vue-sweetalert-icons'
@ -57,6 +58,11 @@ export default {
}, 3000)
}
},
data() {
return {
supportEmail: emails.SUPPORT,
}
},
async asyncData(context) {
const {
store,