mirror of
https://github.com/IT4Change/gradido.git
synced 2025-12-13 07:45:54 +00:00
Registration in different communities II
This commit is contained in:
ogerly
parent
173dac51b1
commit
defabccf86
@ -1,7 +1,7 @@
|
||||
{
|
||||
"community": [
|
||||
{"id": 1, "name": "Community 1", "location": "Ort 1", "description":"description 1 description 1 description 1 description 1 description 1 description 1 description 1 ", "url": "http://localhost:3000/vue/"},
|
||||
{"id": 2, "name": "Community 2", "location": "Ort 2", "description":"description 2 description 2 description 2 description 2 description 2 description 2 description 2 ", "url": "https://stage1.gradido.net/vue/"},
|
||||
{"id": 3, "name": "Community 3", "location": "Ort 3", "description":"description 3 description 3 description 3 description 3 description 3 description 3 description 3 ", "url": "https://gdd1.gradido.net/vue/"}
|
||||
{"id": 1, "name": "Gradido Entwicklung", "url": "http://localhost:3000/vue/", "description":"Die lokale Entwicklungsumgebung von Gradido.", "registerUrl": "http://localhost:3000/vue/register"},
|
||||
{"id": 2, "name": "Gradido Staging", "url": "https://stage1.gradido.net/vue/", "description":"Der Testserver der Gradido Akademie.", "registerUrl": "https://stage1.gradido.net/vue/register"},
|
||||
{"id": 3, "name": "Gradido-Akademie", "url": "https://gdd1.gradido.com/vue/", "description":"Freies Institut für Wirtschaftsbionik.", "registerUrl": "https://gdd1.gradido.com/vue/register"}
|
||||
]
|
||||
}
|
||||
@ -14,8 +14,8 @@ export default {
|
||||
return {
|
||||
selected: null,
|
||||
options: [
|
||||
{ value: 'de', text: this.$t('languages.de') },
|
||||
{ value: 'en', text: this.$t('languages.en') },
|
||||
{ value: 'de', text: this.$t('settings.language.de') },
|
||||
{ value: 'en', text: this.$t('settings.language.en') },
|
||||
],
|
||||
}
|
||||
},
|
||||
|
||||
@ -12,9 +12,9 @@
|
||||
"submit": "Einreichen"
|
||||
}
|
||||
},
|
||||
"continue-to-registration": "weiter zur Registrierung",
|
||||
"continue-to-registration": "Weiter zur Registrierung",
|
||||
"current-community": "Aktuelle Gemeinschaft",
|
||||
"other-communities": "weitere Gemeinschaften",
|
||||
"other-communities": "Weitere Gemeinschaften",
|
||||
"switch-to-this-community": "zu dieser Gemeinschaft wechseln"
|
||||
},
|
||||
"decay": {
|
||||
|
||||
@ -68,13 +68,11 @@ export const store = new Vuex.Store({
|
||||
description: '',
|
||||
token: null,
|
||||
newsletterState: null,
|
||||
community_name: 'Community 1',
|
||||
community: {
|
||||
name: 'Community 1',
|
||||
name2: 'Community 1',
|
||||
location: 'Ort 1',
|
||||
description:
|
||||
'description 1 description 1 description 1 description 1 description 1 description 1',
|
||||
name: 'Gradido Entwicklung',
|
||||
url: 'http://localhost:3000/vue/',
|
||||
registerUrl: 'http://localhost:3000/vue/register',
|
||||
description: 'Die lokale Entwicklungsumgebung von Gradido.',
|
||||
},
|
||||
},
|
||||
getters: {},
|
||||
|
||||
@ -32,7 +32,7 @@
|
||||
</b-col>
|
||||
</b-row>
|
||||
<div class="text-center py-lg-4">
|
||||
<router-link to="/Login" class="mt-3">{{ $t('back') }}</router-link>
|
||||
<b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
|
||||
</div>
|
||||
</b-container>
|
||||
</div>
|
||||
|
||||
@ -19,14 +19,13 @@
|
||||
<b-card no-body class="border-0 mb-0" style="background-color: #ebebeba3 !important">
|
||||
<b-card-body class="p-4">
|
||||
<div class="text-center text-muted mb-4">
|
||||
<small>{{ $t('login') }}</small>
|
||||
</div>
|
||||
<div class="text-center text-muted mb-4">
|
||||
{{ $store.state.community_name }}
|
||||
</div>
|
||||
<div class="text-center text-muted mb-4">
|
||||
{{ $store.state.community.description }}
|
||||
<b>{{ $store.state.community.name }}</b>
|
||||
<p class="text-lead">
|
||||
{{ $store.state.community.description }}
|
||||
</p>
|
||||
{{ $t('login') }}
|
||||
</div>
|
||||
|
||||
<validation-observer ref="observer" v-slot="{ handleSubmit }">
|
||||
<b-form @submit.stop.prevent="handleSubmit(onSubmit)">
|
||||
<input-email v-model="form.email"></input-email>
|
||||
@ -44,15 +43,19 @@
|
||||
</b-card-body>
|
||||
</b-card>
|
||||
<b-row class="mt-3">
|
||||
<b-col cols="6">
|
||||
<router-link to="/password">
|
||||
<b-col cols="6" class="text-center text-sm-left col-12 col-sm-6 pb-5">
|
||||
<b-button variant="outline-secondary" to="/password">
|
||||
{{ $t('settings.password.forgot_pwd') }}
|
||||
</router-link>
|
||||
</b-button>
|
||||
</b-col>
|
||||
<b-col cols="6" class="text-right" v-show="allowRegister">
|
||||
<router-link to="/regist-community">
|
||||
<b-col
|
||||
cols="6"
|
||||
class="text-center text-sm-right col-12 col-sm-6"
|
||||
v-show="allowRegister"
|
||||
>
|
||||
<b-button variant="outline-secondary" to="/regist-community">
|
||||
{{ $t('site.login.new_wallet') }}
|
||||
</router-link>
|
||||
</b-button>
|
||||
</b-col>
|
||||
</b-row>
|
||||
</b-col>
|
||||
|
||||
@ -1,24 +1,5 @@
|
||||
<template>
|
||||
<div id="registerform">
|
||||
<div class="justify-content-center container">
|
||||
<b-card
|
||||
bg-variant="info"
|
||||
text-variant=""
|
||||
:header="$store.state.community_name"
|
||||
class="text-center"
|
||||
>
|
||||
<b-card-text>
|
||||
{{ $store.state.community.description }}, Location:
|
||||
{{ $store.state.community.location }}
|
||||
</b-card-text>
|
||||
</b-card>
|
||||
</div>
|
||||
<div class="text-center py-lg-4">
|
||||
<router-link to="/select-community" class="mt-3">
|
||||
{{ $t('community.choose-another-aommunity') }}
|
||||
</router-link>
|
||||
</div>
|
||||
|
||||
<!-- Header -->
|
||||
<div class="header p-4">
|
||||
<b-container class="container">
|
||||
@ -29,6 +10,14 @@
|
||||
<p class="text-lead">{{ $t('site.signup.subtitle') }}</p>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row class="justify-content-center pb-3">
|
||||
<b-col xl="5" lg="6" md="8" class="px-2">
|
||||
<b>{{ $store.state.community.name }}</b>
|
||||
<p class="text-lead">
|
||||
{{ $store.state.community.description }}
|
||||
</p>
|
||||
</b-col>
|
||||
</b-row>
|
||||
</div>
|
||||
</b-container>
|
||||
</div>
|
||||
@ -139,9 +128,7 @@
|
||||
|
||||
<div class="text-center">
|
||||
<div class="text-center">
|
||||
<b-button class="ml-2 test-button-back" to="/login">
|
||||
{{ $t('back') }}
|
||||
</b-button>
|
||||
<b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
|
||||
|
||||
<b-button
|
||||
:disabled="!(namesFilled && emailFilled && form.agree && languageFilled)"
|
||||
@ -159,6 +146,11 @@
|
||||
</b-col>
|
||||
</b-row>
|
||||
</b-container>
|
||||
<div class="text-center pt-4">
|
||||
<b-button variant="outline-secondary" to="/select-community">
|
||||
{{ $t('community.choose-another-aommunity') }}
|
||||
</b-button>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
|
||||
@ -1,35 +1,45 @@
|
||||
<template>
|
||||
<div id="register-select-community">
|
||||
<b-container class="container text-center">
|
||||
<div class="justify-content-center container">
|
||||
<b-card
|
||||
bg-variant="info"
|
||||
text-variant=""
|
||||
:header="$store.state.community_name"
|
||||
class="text-center"
|
||||
>
|
||||
<b-card-text>
|
||||
{{ $store.state.community.description }}, Location:
|
||||
{{ $store.state.community.location }}
|
||||
</b-card-text>
|
||||
<b-button size="sm" to="/register">
|
||||
{{ $t('community.continue-to-registration') }}
|
||||
</b-button>
|
||||
</b-card>
|
||||
</div>
|
||||
<!-- Header -->
|
||||
<div class="p-3">
|
||||
<b-container>
|
||||
<div class="text-center mb-7 header">
|
||||
<b-row class="justify-content-center">
|
||||
<b-col xl="5" lg="6" md="8" class="px-2">
|
||||
<h1>{{ $store.state.community.name }}</h1>
|
||||
<p class="text-lead">
|
||||
{{ $store.state.community.description }},
|
||||
<br />
|
||||
Location:
|
||||
{{ $store.state.community.url }}
|
||||
</p>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<b-row>
|
||||
<b-col class="text-center">
|
||||
<b-button variant="outline-secondary" to="/register">
|
||||
{{ $t('community.continue-to-registration') }}
|
||||
</b-button>
|
||||
</b-col>
|
||||
</b-row>
|
||||
|
||||
<hr />
|
||||
<div class="text-center py-lg-4">
|
||||
<router-link to="/select-community" class="mt-3">
|
||||
{{ $t('community.choose-another-aommunity') }}
|
||||
</router-link>
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
<div class="text-center py-lg-4">
|
||||
<router-link to="/login" class="mt-3">{{ $t('back') }}</router-link>
|
||||
</div>
|
||||
</b-container>
|
||||
<hr />
|
||||
<b-row>
|
||||
<b-col class="text-center">
|
||||
<b-button variant="outline-secondary" to="/select-community">
|
||||
{{ $t('community.choose-another-aommunity') }}
|
||||
</b-button>
|
||||
</b-col>
|
||||
</b-row>
|
||||
<hr />
|
||||
<b-row>
|
||||
<b-col class="text-center">
|
||||
<b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
|
||||
</b-col>
|
||||
</b-row>
|
||||
</div>
|
||||
</b-container>
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
|
||||
@ -1,44 +1,49 @@
|
||||
<template>
|
||||
<div id="register-select-community">
|
||||
<b-container class="justify-content-center text-center">
|
||||
<div class="mb-4">{{ $t('community.current-community') }}</div>
|
||||
<b-container class="text-center">
|
||||
<div class="pb-3">{{ $t('community.current-community') }}</div>
|
||||
|
||||
<div v-for="community in communitys.community" :key="community.id" class="pb-3">
|
||||
<div v-for="community in communitys.community" :key="community.name">
|
||||
<b-card
|
||||
v-show="community.name === $store.state.community_name"
|
||||
bg-variant="success"
|
||||
text-variant=""
|
||||
:header="community.name"
|
||||
v-show="community.name === $store.state.community.name"
|
||||
class="border-0 mb-0"
|
||||
bg-variant="primary"
|
||||
>
|
||||
<b-card-text>
|
||||
{{ $store.state.community.description }}, Location:
|
||||
{{ $store.state.community.location }}
|
||||
</b-card-text>
|
||||
<b-button size="sm" to="/register">
|
||||
<b>{{ community.name }}</b>
|
||||
<br />
|
||||
{{ $store.state.community.description }}
|
||||
<br />
|
||||
<b-button variant="outline-secondary" to="/register">
|
||||
{{ $t('community.continue-to-registration') }}
|
||||
</b-button>
|
||||
</b-card>
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
|
||||
<div>{{ $t('community.other-communities') }}</div>
|
||||
<div v-for="community in communitys.community" :key="community.id" class="pb-5">
|
||||
<b-card
|
||||
v-show="community.name != $store.state.community_name"
|
||||
bg-variant="info"
|
||||
text-variant=""
|
||||
:header="community.name"
|
||||
>
|
||||
<b-card-text>beschreibung für community 1, Location:</b-card-text>
|
||||
<b-button size="sm" :href="community.url">
|
||||
|
||||
<div v-for="community in communitys.community" :key="community.id" class="pb-3">
|
||||
<b-card v-show="community.name != $store.state.community.name" bg-variant="secondary">
|
||||
<b>{{ community.name }}</b>
|
||||
<br />
|
||||
{{ community.description }}
|
||||
<br />
|
||||
Location:
|
||||
<b>
|
||||
<small>
|
||||
<b-link :href="community.url">{{ community.url }}</b-link>
|
||||
</small>
|
||||
</b>
|
||||
<br />
|
||||
<b-button variant="outline-secondary" :href="community.url">
|
||||
{{ $t('community.switch-to-this-community') }}
|
||||
</b-button>
|
||||
</b-card>
|
||||
</div>
|
||||
|
||||
<hr />
|
||||
<div class="text-center py-lg-4">
|
||||
<router-link to="/login" class="mt-3">{{ $t('back') }}</router-link>
|
||||
<b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
|
||||
</div>
|
||||
</b-container>
|
||||
</div>
|
||||
@ -55,4 +60,20 @@ export default {
|
||||
},
|
||||
}
|
||||
</script>
|
||||
<style></style>
|
||||
<style>
|
||||
.alert-light {
|
||||
color: #424543;
|
||||
background-color: #bac1c84a;
|
||||
border-color: #ffffff00;
|
||||
}
|
||||
.bg-primary {
|
||||
background-color: #5e72e41f !important;
|
||||
}
|
||||
.bg-secondary {
|
||||
background-color: #525f7f0f !important;
|
||||
}
|
||||
|
||||
.card-footer {
|
||||
background-color: #ffffff5e !important;
|
||||
}
|
||||
</style>
|
||||
|
||||
@ -40,7 +40,7 @@
|
||||
</b-row>
|
||||
<b-row>
|
||||
<b-col class="text-center py-lg-4">
|
||||
<router-link to="/Login" class="mt-3">{{ $t('back') }}</router-link>
|
||||
<b-button variant="outline-secondary" to="/login">{{ $t('back') }}</b-button>
|
||||
</b-col>
|
||||
</b-row>
|
||||
</b-container>
|
||||
|
||||
@ -106,7 +106,7 @@ export default {
|
||||
},
|
||||
|
||||
buildTagFromLanguageString() {
|
||||
return 'languages.' + this.$store.state.language
|
||||
return 'settings.language.' + this.$store.state.language
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user